diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 14:47:48 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-02 14:47:48 -0400 |
| commit | 5c7695d8103b5933a442fca623c7c18806aafa35 (patch) | |
| tree | 9eb68c194d3066fa9dbe1559acf3f5d4cab6157f | |
| parent | dfae19bd5858f51c9b21b50d909fc070a58ff94d (diff) | |
| download | longterm-queue-4.12-5c7695d8103b5933a442fca623c7c18806aafa35.tar.gz | |
re-export patches to catch SOB lines
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
85 files changed, 279 insertions, 212 deletions
diff --git a/queue/ACPI-APEI-ERST-Fix-missing-error-handling-in-erst_re.patch b/queue/ACPI-APEI-ERST-Fix-missing-error-handling-in-erst_re.patch index 31a252f..d6d357b 100644 --- a/queue/ACPI-APEI-ERST-Fix-missing-error-handling-in-erst_re.patch +++ b/queue/ACPI-APEI-ERST-Fix-missing-error-handling-in-erst_re.patch @@ -1,4 +1,4 @@ -From bb82e0b4a7e96494f0c1004ce50cec3d7b5fb3d1 Mon Sep 17 00:00:00 2001 +From 812d466245d2b834d421e33c9285de6d1fce8e44 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Thu, 14 Dec 2017 13:31:16 +0100 Subject: [PATCH] ACPI: APEI / ERST: Fix missing error handling in @@ -34,9 +34,10 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de> Acked-by: Kees Cook <keescook@chromium.org> Reviewed-by: Borislav Petkov <bp@suse.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c -index 6742f6c68034..9bff853e85f3 100644 +index 2c462beee551..a943cf17faa7 100644 --- a/drivers/acpi/apei/erst.c +++ b/drivers/acpi/apei/erst.c @@ -1007,7 +1007,7 @@ static ssize_t erst_reader(struct pstore_record *record) diff --git a/queue/ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch b/queue/ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch index e40a975..355bc3d 100644 --- a/queue/ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch +++ b/queue/ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch @@ -1,4 +1,4 @@ -From 095f613c6b386a1704b73a549e9ba66c1d5381ae Mon Sep 17 00:00:00 2001 +From dea3d1dc825b8191f29059635aa41926a329ee84 Mon Sep 17 00:00:00 2001 From: Jan Beulich <JBeulich@suse.com> Date: Mon, 25 Sep 2017 02:06:19 -0600 Subject: [PATCH] ACPI / APEI: adjust a local variable type in @@ -12,12 +12,13 @@ type for ARMv8") did for ghes_ioremap_pfn_nmi(). Signed-off-by: Jan Beulich <jbeulich@suse.com> Reviewed-by: Borislav Petkov <bp@suse.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c -index 3c3a37b8503b..69ef0b6bf25d 100644 +index d0855c09f32f..3f1f63f04d98 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c -@@ -174,7 +174,8 @@ static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn) +@@ -163,7 +163,8 @@ static void __iomem *ghes_ioremap_pfn_nmi(u64 pfn) static void __iomem *ghes_ioremap_pfn_irq(u64 pfn) { diff --git a/queue/ALSA-rawmidi-Avoid-racy-info-ioctl-via-ctl-device.patch b/queue/ALSA-rawmidi-Avoid-racy-info-ioctl-via-ctl-device.patch index a473442..6d0d748 100644 --- a/queue/ALSA-rawmidi-Avoid-racy-info-ioctl-via-ctl-device.patch +++ b/queue/ALSA-rawmidi-Avoid-racy-info-ioctl-via-ctl-device.patch @@ -1,4 +1,4 @@ -From c1cfd9025cc394fd137a01159d74335c5ac978ce Mon Sep 17 00:00:00 2001 +From 53442d756ba8fd39f20a691ecf9427c14336917b Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Thu, 14 Dec 2017 16:44:12 +0100 Subject: [PATCH] ALSA: rawmidi: Avoid racy info ioctl via ctl device @@ -20,9 +20,10 @@ it shouldn't matter from the performance POV. Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c -index b3b353d72527..f055ca10bbc1 100644 +index ab890336175f..cf54c83ad9d5 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c @@ -579,15 +579,14 @@ static int snd_rawmidi_info_user(struct snd_rawmidi_substream *substream, diff --git a/queue/ALSA-usb-audio-Add-native-DSD-support-for-Esoteric-D.patch b/queue/ALSA-usb-audio-Add-native-DSD-support-for-Esoteric-D.patch index 94a371e..4be6d68 100644 --- a/queue/ALSA-usb-audio-Add-native-DSD-support-for-Esoteric-D.patch +++ b/queue/ALSA-usb-audio-Add-native-DSD-support-for-Esoteric-D.patch @@ -1,4 +1,4 @@ -From 866f7ed7d67936dcdbcddc111c8af878c918fe7c Mon Sep 17 00:00:00 2001 +From 22fef76f90e46850fe8771337e906f1316710512 Mon Sep 17 00:00:00 2001 From: Jussi Laako <jussi@sonarnerd.net> Date: Thu, 7 Dec 2017 12:58:33 +0200 Subject: [PATCH] ALSA: usb-audio: Add native DSD support for Esoteric D-05X @@ -13,12 +13,13 @@ audio implementation. Signed-off-by: Jussi Laako <jussi@sonarnerd.net> Cc: <stable@vger.kernel.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c -index 77eecaa4db1f..a66ef5777887 100644 +index f910c4fd932b..7ac7c7bfd04b 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1166,10 +1166,11 @@ static bool is_marantz_denon_dac(unsigned int id) +@@ -1170,10 +1170,11 @@ static bool is_marantz_denon_dac(unsigned int id) /* TEAC UD-501/UD-503/NT-503 USB DACs need a vendor cmd to switch * between PCM/DOP and native DSD mode */ @@ -31,7 +32,7 @@ index 77eecaa4db1f..a66ef5777887 100644 return true; } return false; -@@ -1202,7 +1203,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, +@@ -1206,7 +1207,7 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, break; } mdelay(20); @@ -40,7 +41,7 @@ index 77eecaa4db1f..a66ef5777887 100644 /* Vendor mode switch cmd is required. */ switch (fmt->altsetting) { case 3: /* DSD mode (DSD_U32) requested */ -@@ -1392,7 +1393,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, +@@ -1396,7 +1397,7 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, } /* TEAC devices with USB DAC functionality */ diff --git a/queue/ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch b/queue/ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch index 9154c34..cc4f801 100644 --- a/queue/ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch +++ b/queue/ASoC-codecs-msm8916-wcd-analog-fix-module-autoload.patch @@ -1,4 +1,4 @@ -From 46d69e141d479585c105a4d5b2337cd2ce6967e5 Mon Sep 17 00:00:00 2001 +From 2e54c909d63e7e21f105b9b4eaaa68d8f73168ed Mon Sep 17 00:00:00 2001 From: Nicolas Dechesne <nicolas.dechesne@linaro.org> Date: Tue, 3 Oct 2017 11:49:51 +0200 Subject: [PATCH] ASoC: codecs: msm8916-wcd-analog: fix module autoload @@ -24,12 +24,13 @@ alias: of:N*T*Cqcom,pm8916-wcd-analog-codec Signed-off-by: Nicolas Dechesne <nicolas.dechesne@linaro.org> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c -index f562f2d86907..3593c578e3e7 100644 +index d8e8590746af..bc1a8a5d2356 100644 --- a/sound/soc/codecs/msm8916-wcd-analog.c +++ b/sound/soc/codecs/msm8916-wcd-analog.c -@@ -1239,6 +1239,8 @@ static const struct of_device_id pm8916_wcd_analog_spmi_match_table[] = { +@@ -874,6 +874,8 @@ static const struct of_device_id pm8916_wcd_analog_spmi_match_table[] = { { } }; diff --git a/queue/ASoC-img-parallel-out-Add-pm_runtime_get-put-to-set_.patch b/queue/ASoC-img-parallel-out-Add-pm_runtime_get-put-to-set_.patch index 70cb9f2..0abb4ec 100644 --- a/queue/ASoC-img-parallel-out-Add-pm_runtime_get-put-to-set_.patch +++ b/queue/ASoC-img-parallel-out-Add-pm_runtime_get-put-to-set_.patch @@ -1,4 +1,4 @@ -From c70458890ff15d858bd347fa9f563818bcd6e457 Mon Sep 17 00:00:00 2001 +From 57b13ed4cb1774b9da42c468c54b45fe17775b9f Mon Sep 17 00:00:00 2001 From: Ed Blake <ed.blake@sondrel.com> Date: Mon, 2 Oct 2017 11:00:33 +0100 Subject: [PATCH] ASoC: img-parallel-out: Add pm_runtime_get/put to set_fmt @@ -13,9 +13,10 @@ disabled and device registers are accessed while the clock is disabled. Signed-off-by: Ed Blake <ed.blake@sondrel.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/img/img-parallel-out.c b/sound/soc/img/img-parallel-out.c -index 23b0f0f6ec9c..2fc8a6372206 100644 +index 33ceb207ee70..821c29937dd5 100644 --- a/sound/soc/img/img-parallel-out.c +++ b/sound/soc/img/img-parallel-out.c @@ -164,9 +164,11 @@ static int img_prl_out_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) diff --git a/queue/Bluetooth-BT_HCIUART-now-depends-on-SERIAL_DEV_BUS.patch b/queue/Bluetooth-BT_HCIUART-now-depends-on-SERIAL_DEV_BUS.patch index 06f8023..e895859 100644 --- a/queue/Bluetooth-BT_HCIUART-now-depends-on-SERIAL_DEV_BUS.patch +++ b/queue/Bluetooth-BT_HCIUART-now-depends-on-SERIAL_DEV_BUS.patch @@ -1,4 +1,4 @@ -From 05e89fb576f580ac95e7a5d00bdb34830b09671a Mon Sep 17 00:00:00 2001 +From 81622f3f6e195d4c87efc848bf635900eb81f5cd Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Wed, 11 Oct 2017 15:47:54 +0200 Subject: [PATCH] Bluetooth: BT_HCIUART now depends on SERIAL_DEV_BUS @@ -18,9 +18,10 @@ This adds a dependency to avoid the broken configuration. Fixes: 7841d554809b ("Bluetooth: hci_uart_set_flow_control: Fix NULL deref when using serdev") Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/Kconfig b/drivers/bluetooth/Kconfig -index 082e1c7329de..6475f8c0d3b2 100644 +index 737d93ef27c5..964162eb6423 100644 --- a/drivers/bluetooth/Kconfig +++ b/drivers/bluetooth/Kconfig @@ -65,6 +65,7 @@ config BT_HCIBTSDIO diff --git a/queue/Bluetooth-hci_uart_set_flow_control-Fix-NULL-deref-w.patch b/queue/Bluetooth-hci_uart_set_flow_control-Fix-NULL-deref-w.patch index fc93aa6..0aafa28 100644 --- a/queue/Bluetooth-hci_uart_set_flow_control-Fix-NULL-deref-w.patch +++ b/queue/Bluetooth-hci_uart_set_flow_control-Fix-NULL-deref-w.patch @@ -1,4 +1,4 @@ -From 7841d554809b518a22349e7e39b6b63f8a48d0fb Mon Sep 17 00:00:00 2001 +From b4e0a1ab8f33a83a60064585ae90c6f615bff5a5 Mon Sep 17 00:00:00 2001 From: Hans de Goede <hdegoede@redhat.com> Date: Wed, 4 Oct 2017 20:43:35 +0200 Subject: [PATCH] Bluetooth: hci_uart_set_flow_control: Fix NULL deref when @@ -11,9 +11,10 @@ on hci_uart-s using serdev. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c -index a746627e784e..eec95019f15c 100644 +index e0590e456eb5..09c566cbed42 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -41,6 +41,7 @@ @@ -24,7 +25,7 @@ index a746627e784e..eec95019f15c 100644 #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -@@ -298,6 +299,12 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable) +@@ -280,6 +281,12 @@ void hci_uart_set_flow_control(struct hci_uart *hu, bool enable) unsigned int set = 0; unsigned int clear = 0; diff --git a/queue/IB-opa_vnic-Properly-clear-Mac-Table-Digest.patch b/queue/IB-opa_vnic-Properly-clear-Mac-Table-Digest.patch index 430f811..d4a20b8 100644 --- a/queue/IB-opa_vnic-Properly-clear-Mac-Table-Digest.patch +++ b/queue/IB-opa_vnic-Properly-clear-Mac-Table-Digest.patch @@ -1,4 +1,4 @@ -From 4bbdfe25600c1909c26747d0b5c39fd0e409bb87 Mon Sep 17 00:00:00 2001 +From 0916ac361ab5ff0185ac3054992b8103ee0bf031 Mon Sep 17 00:00:00 2001 From: Scott Franco <safranco@intel.com> Date: Tue, 26 Sep 2017 06:44:13 -0700 Subject: [PATCH] IB/opa_vnic: Properly clear Mac Table Digest @@ -11,9 +11,10 @@ Reviewed-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Signed-off-by: Scott Franco <safranco@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c -index afa938bd26d6..a72278e9cd27 100644 +index 2e8fee982436..88c3de23b51d 100644 --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c @@ -139,6 +139,7 @@ void opa_vnic_release_mac_tbl(struct opa_vnic_adapter *adapter) diff --git a/queue/IB-opa_vnic-Properly-return-the-total-MACs-in-UC-MAC.patch b/queue/IB-opa_vnic-Properly-return-the-total-MACs-in-UC-MAC.patch index dc37db7..f6460ce 100644 --- a/queue/IB-opa_vnic-Properly-return-the-total-MACs-in-UC-MAC.patch +++ b/queue/IB-opa_vnic-Properly-return-the-total-MACs-in-UC-MAC.patch @@ -1,4 +1,4 @@ -From b77eb45e0d9c324245d165656ab3b38b6f386436 Mon Sep 17 00:00:00 2001 +From b8639cb1e68ad37c87ca1a827f1fae4ecf5016de Mon Sep 17 00:00:00 2001 From: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Date: Tue, 26 Sep 2017 06:44:07 -0700 Subject: [PATCH] IB/opa_vnic: Properly return the total MACs in UC MAC list @@ -12,12 +12,13 @@ Reviewed-by: Sudeep Dutt <sudeep.dutt@intel.com> Signed-off-by: Niranjana Vishwanathapura <niranjana.vishwanathapura@intel.com> Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c -index 5856ae3a0d7b..5553900848e3 100644 +index a51bf977f4d6..b97956dd551e 100644 --- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c +++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema_iface.c -@@ -342,7 +342,7 @@ void opa_vnic_query_mcast_macs(struct opa_vnic_adapter *adapter, +@@ -348,7 +348,7 @@ void opa_vnic_query_mcast_macs(struct opa_vnic_adapter *adapter, void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, struct opa_veswport_iface_macs *macs) { @@ -26,7 +27,7 @@ index 5856ae3a0d7b..5553900848e3 100644 struct netdev_hw_addr *ha; start_idx = be16_to_cpu(macs->start_idx); -@@ -353,8 +353,10 @@ void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, +@@ -359,8 +359,10 @@ void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, /* Do not include EM specified MAC address */ if (!memcmp(adapter->info.vport.base_mac_addr, ha->addr, @@ -38,7 +39,7 @@ index 5856ae3a0d7b..5553900848e3 100644 if (start_idx > idx++) continue; -@@ -377,7 +379,7 @@ void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, +@@ -383,7 +385,7 @@ void opa_vnic_query_ucast_macs(struct opa_vnic_adapter *adapter, } tot_macs = netdev_hw_addr_list_count(&adapter->netdev->dev_addrs) + diff --git a/queue/IB-rxe-check-for-allocation-failure-on-elem.patch b/queue/IB-rxe-check-for-allocation-failure-on-elem.patch index ff983a0..8beb312 100644 --- a/queue/IB-rxe-check-for-allocation-failure-on-elem.patch +++ b/queue/IB-rxe-check-for-allocation-failure-on-elem.patch @@ -1,4 +1,4 @@ -From 4831ca9e4a8e48cb27e0a792f73250390827a228 Mon Sep 17 00:00:00 2001 +From d4ac135a00158065c02f824804f48b309194113e Mon Sep 17 00:00:00 2001 From: Colin Ian King <colin.king@canonical.com> Date: Fri, 8 Sep 2017 15:37:45 +0100 Subject: [PATCH] IB/rxe: check for allocation failure on elem @@ -14,9 +14,10 @@ Detected by CoverityScan CID#1357507 ("Dereference null return value") Fixes: 8700e3e7c485 ("Soft RoCE driver") Signed-off-by: Colin Ian King <colin.king@canonical.com> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c -index c1b5f38f31a5..3b4916680018 100644 +index 75d11ee635ec..a0530391710f 100644 --- a/drivers/infiniband/sw/rxe/rxe_pool.c +++ b/drivers/infiniband/sw/rxe/rxe_pool.c @@ -404,6 +404,8 @@ void *rxe_alloc(struct rxe_pool *pool) diff --git a/queue/IB-rxe-put-the-pool-on-allocation-failure.patch b/queue/IB-rxe-put-the-pool-on-allocation-failure.patch index 087e482..e296a34 100644 --- a/queue/IB-rxe-put-the-pool-on-allocation-failure.patch +++ b/queue/IB-rxe-put-the-pool-on-allocation-failure.patch @@ -1,4 +1,4 @@ -From 6b9f8970cd30929cb6b372fa44fa66da9e59c650 Mon Sep 17 00:00:00 2001 +From 26f136472802e6e473fc432bbdab07c7d19a70f1 Mon Sep 17 00:00:00 2001 From: Doug Ledford <dledford@redhat.com> Date: Mon, 9 Oct 2017 09:11:32 -0400 Subject: [PATCH] IB/rxe: put the pool on allocation failure @@ -13,9 +13,10 @@ be able to free it. Fixes: 4831ca9e4a8e ("IB/rxe: check for allocation failure on elem") Suggested-by: Leon Romanovsky <leon@kernel.org> Signed-off-by: Doug Ledford <dledford@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/infiniband/sw/rxe/rxe_pool.c b/drivers/infiniband/sw/rxe/rxe_pool.c -index 3b4916680018..b4a8acc7bb7d 100644 +index a0530391710f..eff5ccfb279d 100644 --- a/drivers/infiniband/sw/rxe/rxe_pool.c +++ b/drivers/infiniband/sw/rxe/rxe_pool.c @@ -394,23 +394,25 @@ void *rxe_alloc(struct rxe_pool *pool) diff --git a/queue/Linux-4.12.28.patch b/queue/Linux-4.12.28.patch index 6d4ad98..c6558c0 100644 --- a/queue/Linux-4.12.28.patch +++ b/queue/Linux-4.12.28.patch @@ -1,4 +1,4 @@ -From 46943ce1a3c4cfce4887e9137a69b8ea7a70fe87 Mon Sep 17 00:00:00 2001 +From ed5ba891ce17908aa9d5d3e626fffa82395bff38 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Thu, 2 Aug 2018 12:35:15 -0400 Subject: [PATCH] Linux 4.12.28 diff --git a/queue/PCI-AER-Report-non-fatal-errors-only-to-the-affected.patch b/queue/PCI-AER-Report-non-fatal-errors-only-to-the-affected.patch index 696ef7b..3e47553 100644 --- a/queue/PCI-AER-Report-non-fatal-errors-only-to-the-affected.patch +++ b/queue/PCI-AER-Report-non-fatal-errors-only-to-the-affected.patch @@ -1,4 +1,4 @@ -From 86acc790717fb60fb51ea3095084e331d8711c74 Mon Sep 17 00:00:00 2001 +From bc6797a17df0290e9e04204bc436b8c0680da011 Mon Sep 17 00:00:00 2001 From: Gabriele Paoloni <gabriele.paoloni@huawei.com> Date: Thu, 28 Sep 2017 15:33:05 +0100 Subject: [PATCH] PCI/AER: Report non-fatal errors only to the affected @@ -40,9 +40,10 @@ Signed-off-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> Signed-off-by: Dongdong Liu <liudongdong3@huawei.com> [bhelgaas: changelog] Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c -index 890efcc574cb..744805232155 100644 +index b1303b32053f..057465adf0b6 100644 --- a/drivers/pci/pcie/aer/aerdrv_core.c +++ b/drivers/pci/pcie/aer/aerdrv_core.c @@ -390,7 +390,14 @@ static pci_ers_result_t broadcast_error_message(struct pci_dev *dev, diff --git a/queue/PCI-Avoid-bus-reset-if-bridge-itself-is-broken.patch b/queue/PCI-Avoid-bus-reset-if-bridge-itself-is-broken.patch index f2e5ab5..45b6f24 100644 --- a/queue/PCI-Avoid-bus-reset-if-bridge-itself-is-broken.patch +++ b/queue/PCI-Avoid-bus-reset-if-bridge-itself-is-broken.patch @@ -1,4 +1,4 @@ -From 357027786f3523d26f42391aa4c075b8495e5d28 Mon Sep 17 00:00:00 2001 +From 0b3952c1b69ae8fdf1abcc6172371d2b6a4859eb Mon Sep 17 00:00:00 2001 From: David Daney <david.daney@cavium.com> Date: Fri, 8 Sep 2017 10:10:31 +0200 Subject: [PATCH] PCI: Avoid bus reset if bridge itself is broken @@ -22,9 +22,10 @@ Signed-off-by: David Daney <david.daney@cavium.com> Signed-off-by: Jan Glauber <jglauber@cavium.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Alex Williamson <alex.williamson@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c -index 6078dfc11b11..74f1c57ab93b 100644 +index 9e5483780c97..7ece02f50a9c 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -4356,6 +4356,10 @@ static bool pci_bus_resetable(struct pci_bus *bus) diff --git a/queue/PCI-Create-SR-IOV-virtfn-physfn-links-before-attachi.patch b/queue/PCI-Create-SR-IOV-virtfn-physfn-links-before-attachi.patch index fa62e91..6973f9d 100644 --- a/queue/PCI-Create-SR-IOV-virtfn-physfn-links-before-attachi.patch +++ b/queue/PCI-Create-SR-IOV-virtfn-physfn-links-before-attachi.patch @@ -1,4 +1,4 @@ -From 27d6162944b9b34c32cd5841acd21786637ee743 Mon Sep 17 00:00:00 2001 +From d2bed104a729a7d43177057ba7e93241cc4ca754 Mon Sep 17 00:00:00 2001 From: Stuart Hayes <stuart.w.hayes@gmail.com> Date: Wed, 4 Oct 2017 10:57:52 -0500 Subject: [PATCH] PCI: Create SR-IOV virtfn/physfn links before attaching @@ -15,12 +15,13 @@ tries to look at these links. Signed-off-by: Stuart Hayes <stuart.w.hayes@gmail.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c -index 7492a65baba9..ce24cf235f01 100644 +index d9dc7363ac77..ae9dd6233635 100644 --- a/drivers/pci/iov.c +++ b/drivers/pci/iov.c -@@ -159,7 +159,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) +@@ -162,7 +162,6 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) pci_device_add(virtfn, virtfn->bus); @@ -28,7 +29,7 @@ index 7492a65baba9..ce24cf235f01 100644 sprintf(buf, "virtfn%u", id); rc = sysfs_create_link(&dev->dev.kobj, &virtfn->dev.kobj, buf); if (rc) -@@ -170,6 +169,8 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id) +@@ -173,6 +172,8 @@ int pci_iov_add_virtfn(struct pci_dev *dev, int id, int reset) kobject_uevent(&virtfn->dev.kobj, KOBJ_CHANGE); diff --git a/queue/PM-OPP-Move-error-message-to-debug-level.patch b/queue/PM-OPP-Move-error-message-to-debug-level.patch index 15f3de0..6ac77df 100644 --- a/queue/PM-OPP-Move-error-message-to-debug-level.patch +++ b/queue/PM-OPP-Move-error-message-to-debug-level.patch @@ -1,4 +1,4 @@ -From 1e527c76785c65e04ec93e50b16e651cce060f3c Mon Sep 17 00:00:00 2001 +From 07c9e29a8c3c0856bfbedd7e62aaa1244a07b9f0 Mon Sep 17 00:00:00 2001 From: Fabio Estevam <fabio.estevam@nxp.com> Date: Fri, 29 Sep 2017 14:39:49 -0300 Subject: [PATCH] PM / OPP: Move error message to debug level diff --git a/queue/Revert-parisc-Re-enable-interrupts-early.patch b/queue/Revert-parisc-Re-enable-interrupts-early.patch index 52c08ea..d710fc0 100644 --- a/queue/Revert-parisc-Re-enable-interrupts-early.patch +++ b/queue/Revert-parisc-Re-enable-interrupts-early.patch @@ -1,4 +1,4 @@ -From 9352aeada4d8d8753fc0e414fbfe8fdfcb68a12c Mon Sep 17 00:00:00 2001 +From ddc9edb6130b9c77579d8e8bf0a1dd56e5fe7097 Mon Sep 17 00:00:00 2001 From: John David Anglin <dave.anglin@bell.net> Date: Mon, 13 Nov 2017 19:35:33 -0500 Subject: [PATCH] Revert "parisc: Re-enable interrupts early" @@ -35,6 +35,7 @@ Fixes: 5c38602d83e5 ("parisc: Re-enable interrupts early") Signed-off-by: John David Anglin <dave.anglin@bell.net> Cc: <stable@vger.kernel.org> # v4.10+ Signed-off-by: Helge Deller <deller@gmx.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S index a4fd296c958e..f3cecf5117cf 100644 diff --git a/queue/acpi-nfit-fix-health-event-notification.patch b/queue/acpi-nfit-fix-health-event-notification.patch index 980b1b7..9bcff92 100644 --- a/queue/acpi-nfit-fix-health-event-notification.patch +++ b/queue/acpi-nfit-fix-health-event-notification.patch @@ -1,4 +1,4 @@ -From adf6895754e2503d994a765535fd1813f8834674 Mon Sep 17 00:00:00 2001 +From 00b71e3f2aaf205557a76acdc490be2dc71fda79 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams@intel.com> Date: Thu, 30 Nov 2017 19:42:52 -0800 Subject: [PATCH] acpi, nfit: fix health event notification @@ -24,12 +24,13 @@ Fixes: ba9c8dd3c222 ("acpi, nfit: add dimm device notification support") Reported-by: Daniel Osawa <daniel.k.osawa@intel.com> Tested-by: Daniel Osawa <daniel.k.osawa@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c -index ff2580e7611d..abeb4df4f22e 100644 +index f3c3e9d4563c..e4d7ff4e4125 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c -@@ -1670,6 +1670,11 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, +@@ -1440,6 +1440,11 @@ static int acpi_nfit_add_dimm(struct acpi_nfit_desc *acpi_desc, dev_name(&adev_dimm->dev)); return -ENXIO; } @@ -41,7 +42,7 @@ index ff2580e7611d..abeb4df4f22e 100644 /* * Until standardization materializes we need to consider 4 -@@ -1752,9 +1757,11 @@ static void shutdown_dimm_notify(void *data) +@@ -1499,9 +1504,11 @@ static void shutdown_dimm_notify(void *data) sysfs_put(nfit_mem->flags_attr); nfit_mem->flags_attr = NULL; } diff --git a/queue/backlight-pwm_bl-Fix-overflow-condition.patch b/queue/backlight-pwm_bl-Fix-overflow-condition.patch index c786bda..afa1a4f 100644 --- a/queue/backlight-pwm_bl-Fix-overflow-condition.patch +++ b/queue/backlight-pwm_bl-Fix-overflow-condition.patch @@ -1,4 +1,4 @@ -From 5d0c49acebc9488e37db95f1d4a55644e545ffe7 Mon Sep 17 00:00:00 2001 +From 1db20848620a7b337af790c2f54a1f8e5ae60afb Mon Sep 17 00:00:00 2001 From: Derek Basehore <dbasehore@chromium.org> Date: Tue, 29 Aug 2017 13:34:34 -0700 Subject: [PATCH] backlight: pwm_bl: Fix overflow condition @@ -13,9 +13,10 @@ Signed-off-by: Derek Basehore <dbasehore@chromium.org> Acked-by: Thierry Reding <thierry.reding@gmail.com> Reviewed-by: Brian Norris <briannorris@chromium.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/backlight/pwm_bl.c b/drivers/video/backlight/pwm_bl.c -index 9bd17682655a..1c2289ddd555 100644 +index 002f1ce22bd0..ed9054ba3b40 100644 --- a/drivers/video/backlight/pwm_bl.c +++ b/drivers/video/backlight/pwm_bl.c @@ -79,14 +79,17 @@ static void pwm_backlight_power_off(struct pwm_bl_data *pb) diff --git a/queue/block-bfq-Disable-writeback-throttling.patch b/queue/block-bfq-Disable-writeback-throttling.patch index 856b155..6a1df96 100644 --- a/queue/block-bfq-Disable-writeback-throttling.patch +++ b/queue/block-bfq-Disable-writeback-throttling.patch @@ -1,4 +1,4 @@ -From b5dc5d4d1f4ff9032eb6c21a3c571a1317dc9289 Mon Sep 17 00:00:00 2001 +From d593eb0bfb654b0fdb44e7ce08e21feac18f2e38 Mon Sep 17 00:00:00 2001 From: Luca Miccio <lucmiccio@gmail.com> Date: Mon, 9 Oct 2017 16:27:21 +0200 Subject: [PATCH] block,bfq: Disable writeback throttling @@ -16,9 +16,10 @@ Signed-off-by: Paolo Valente <paolo.valente@linaro.org> Tested-by: Oleksandr Natalenko <oleksandr@natalenko.name> Tested-by: Lee Tibbert <lee.tibbert@gmail.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c -index 70f9177c4f5b..261f98695910 100644 +index ed93da2462ab..112f1b24cc8f 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c @@ -108,6 +108,7 @@ @@ -29,7 +30,7 @@ index 70f9177c4f5b..261f98695910 100644 #define BFQ_BFQQ_FNS(name) \ void bfq_mark_bfqq_##name(struct bfq_queue *bfqq) \ -@@ -4810,7 +4811,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) +@@ -4736,7 +4737,7 @@ static int bfq_init_queue(struct request_queue *q, struct elevator_type *e) bfq_init_root_group(bfqd->root_group, bfqd); bfq_init_entity(&bfqd->oom_bfqq.entity, bfqd->root_group); @@ -39,7 +40,7 @@ index 70f9177c4f5b..261f98695910 100644 out_free: diff --git a/block/blk-wbt.c b/block/blk-wbt.c -index 6a9a0f03a67b..e59d59c11ebb 100644 +index 17676f4d7fd1..afc7a85795a3 100644 --- a/block/blk-wbt.c +++ b/block/blk-wbt.c @@ -654,7 +654,7 @@ void wbt_set_write_cache(struct rq_wb *rwb, bool write_cache_on) diff --git a/queue/bpf-fix-incorrect-sign-extension-in-check_alu_op.patch b/queue/bpf-fix-incorrect-sign-extension-in-check_alu_op.patch index 3df39e6..c7329a2 100644 --- a/queue/bpf-fix-incorrect-sign-extension-in-check_alu_op.patch +++ b/queue/bpf-fix-incorrect-sign-extension-in-check_alu_op.patch @@ -1,10 +1,8 @@ -From f7c965238207eb18d933f0305e9d851995557cb7 Mon Sep 17 00:00:00 2001 -From: Daniel Borkmann <daniel@iogearbox.net> +From d461d43574c373e0773a12031abb23841b5a7658 Mon Sep 17 00:00:00 2001 +From: Jann Horn <jannh@google.com> Date: Fri, 22 Dec 2017 16:29:05 +0100 Subject: [PATCH] bpf: fix incorrect sign extension in check_alu_op() -From: Jann Horn <jannh@google.com> - commit 95a762e2c8c942780948091f8f2a4f32fce1ac6f upstream Distinguish between diff --git a/queue/bpf-ppc64-do-not-reload-skb-pointers-in-non-skb-cont.patch b/queue/bpf-ppc64-do-not-reload-skb-pointers-in-non-skb-cont.patch index f99cad9..6264d33 100644 --- a/queue/bpf-ppc64-do-not-reload-skb-pointers-in-non-skb-cont.patch +++ b/queue/bpf-ppc64-do-not-reload-skb-pointers-in-non-skb-cont.patch @@ -1,4 +1,4 @@ -From 87338c8e2cbb317b5f757e6172f94e2e3799cd20 Mon Sep 17 00:00:00 2001 +From 5d6687fd922bf1804dd486766eb5f94d882725ad Mon Sep 17 00:00:00 2001 From: Daniel Borkmann <daniel@iogearbox.net> Date: Thu, 14 Dec 2017 21:07:24 +0100 Subject: [PATCH] bpf, ppc64: do not reload skb pointers in non-skb context @@ -22,12 +22,13 @@ Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> Acked-by: Alexei Starovoitov <ast@kernel.org> Tested-by: Sandipan Das <sandipan@linux.vnet.ibm.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/net/bpf_jit_comp64.c b/arch/powerpc/net/bpf_jit_comp64.c -index 46d74e81aff1..d183b4801bdb 100644 +index aee2bb817ac6..4de5ebab9376 100644 --- a/arch/powerpc/net/bpf_jit_comp64.c +++ b/arch/powerpc/net/bpf_jit_comp64.c -@@ -763,7 +763,8 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, +@@ -766,7 +766,8 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, func = (u8 *) __bpf_call_base + imm; /* Save skb pointer if we need to re-cache skb data */ @@ -37,7 +38,7 @@ index 46d74e81aff1..d183b4801bdb 100644 PPC_BPF_STL(3, 1, bpf_jit_stack_local(ctx)); bpf_jit_emit_func_call(image, ctx, (u64)func); -@@ -772,7 +773,8 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, +@@ -775,7 +776,8 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, PPC_MR(b2p[BPF_REG_0], 3); /* refresh skb cache */ diff --git a/queue/bpf-s390x-do-not-reload-skb-pointers-in-non-skb-cont.patch b/queue/bpf-s390x-do-not-reload-skb-pointers-in-non-skb-cont.patch index f73fb28..6865831 100644 --- a/queue/bpf-s390x-do-not-reload-skb-pointers-in-non-skb-cont.patch +++ b/queue/bpf-s390x-do-not-reload-skb-pointers-in-non-skb-cont.patch @@ -1,4 +1,4 @@ -From 6d59b7dbf72ed20d0138e2f9b75ca3d4a9d4faca Mon Sep 17 00:00:00 2001 +From 29acc3c55bda4964d0508e3664c9de390be636ef Mon Sep 17 00:00:00 2001 From: Daniel Borkmann <daniel@iogearbox.net> Date: Thu, 14 Dec 2017 21:07:23 +0100 Subject: [PATCH] bpf, s390x: do not reload skb pointers in non-skb context @@ -21,12 +21,13 @@ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: Alexei Starovoitov <ast@kernel.org> Cc: Michael Holzheu <holzheu@linux.vnet.ibm.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c -index e81c16838b90..9557d8b516df 100644 +index 8cea684f1f53..5aa8f9ff10be 100644 --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s390/net/bpf_jit_comp.c -@@ -55,8 +55,7 @@ struct bpf_jit { +@@ -54,8 +54,7 @@ struct bpf_jit { #define SEEN_LITERAL 8 /* code uses literals */ #define SEEN_FUNC 16 /* calls C functions */ #define SEEN_TAIL_CALL 32 /* code uses tail calls */ @@ -36,7 +37,7 @@ index e81c16838b90..9557d8b516df 100644 #define SEEN_STACK (SEEN_FUNC | SEEN_MEM | SEEN_SKB) /* -@@ -448,12 +447,12 @@ static void bpf_jit_prologue(struct bpf_jit *jit, u32 stack_depth) +@@ -447,12 +446,12 @@ static void bpf_jit_prologue(struct bpf_jit *jit) EMIT6_DISP_LH(0xe3000000, 0x0024, REG_W1, REG_0, REG_15, 152); } @@ -51,7 +52,7 @@ index e81c16838b90..9557d8b516df 100644 } /* -@@ -983,8 +982,8 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i +@@ -982,8 +981,8 @@ static noinline int bpf_jit_insn(struct bpf_jit *jit, struct bpf_prog *fp, int i EMIT2(0x0d00, REG_14, REG_W1); /* lgr %b0,%r2: load return value into %b0 */ EMIT4(0xb9040000, BPF_REG_0, REG_2); diff --git a/queue/bpf-sparc-fix-usage-of-wrong-reg-for-load_skb_regs-a.patch b/queue/bpf-sparc-fix-usage-of-wrong-reg-for-load_skb_regs-a.patch index 935d530..e61a75c 100644 --- a/queue/bpf-sparc-fix-usage-of-wrong-reg-for-load_skb_regs-a.patch +++ b/queue/bpf-sparc-fix-usage-of-wrong-reg-for-load_skb_regs-a.patch @@ -1,4 +1,4 @@ -From 07aee94394547721ac168cbf4e1c09c14a5fe671 Mon Sep 17 00:00:00 2001 +From 5016eb3f6fc498570759f82e456aee54246e7417 Mon Sep 17 00:00:00 2001 From: Daniel Borkmann <daniel@iogearbox.net> Date: Thu, 14 Dec 2017 21:07:26 +0100 Subject: [PATCH] bpf, sparc: fix usage of wrong reg for load_skb_regs after @@ -21,12 +21,13 @@ Signed-off-by: Daniel Borkmann <daniel@iogearbox.net> Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Alexei Starovoitov <ast@kernel.org> Signed-off-by: Alexei Starovoitov <ast@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/sparc/net/bpf_jit_comp_64.c b/arch/sparc/net/bpf_jit_comp_64.c -index 5765e7e711f7..ff5f9cb3039a 100644 +index 21de77419f48..f346c1cb8386 100644 --- a/arch/sparc/net/bpf_jit_comp_64.c +++ b/arch/sparc/net/bpf_jit_comp_64.c -@@ -1245,14 +1245,16 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) +@@ -1205,14 +1205,16 @@ static int build_insn(const struct bpf_insn *insn, struct jit_ctx *ctx) u8 *func = ((u8 *)__bpf_call_base) + imm; ctx->saw_call = true; diff --git a/queue/clk-sunxi-ng-nm-Check-if-requested-rate-is-supported.patch b/queue/clk-sunxi-ng-nm-Check-if-requested-rate-is-supported.patch index 6413819..dad1d51 100644 --- a/queue/clk-sunxi-ng-nm-Check-if-requested-rate-is-supported.patch +++ b/queue/clk-sunxi-ng-nm-Check-if-requested-rate-is-supported.patch @@ -1,4 +1,4 @@ -From 4cdbc40d64d4b8303a97e29a52862e4d99502beb Mon Sep 17 00:00:00 2001 +From 850c0dd427026d87d6f067f8326562ec0c4ec6e5 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Thu, 12 Oct 2017 16:36:58 +0800 Subject: [PATCH] clk: sunxi-ng: nm: Check if requested rate is supported by @@ -18,9 +18,10 @@ callback. Fixes: 6174a1e24b0d ("clk: sunxi-ng: Add N-M-factor clock support") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/sunxi-ng/ccu_nm.c b/drivers/clk/sunxi-ng/ccu_nm.c -index a32158e8f2e3..84a5e7f17f6f 100644 +index 5e5e90a4a50c..99f5b96330d3 100644 --- a/drivers/clk/sunxi-ng/ccu_nm.c +++ b/drivers/clk/sunxi-ng/ccu_nm.c @@ -99,6 +99,9 @@ static long ccu_nm_round_rate(struct clk_hw *hw, unsigned long rate, diff --git a/queue/clk-sunxi-ng-sun5i-Fix-bit-offset-of-audio-PLL-post-.patch b/queue/clk-sunxi-ng-sun5i-Fix-bit-offset-of-audio-PLL-post-.patch index 6a05589..3852d89 100644 --- a/queue/clk-sunxi-ng-sun5i-Fix-bit-offset-of-audio-PLL-post-.patch +++ b/queue/clk-sunxi-ng-sun5i-Fix-bit-offset-of-audio-PLL-post-.patch @@ -1,4 +1,4 @@ -From d51fe3ba9773c8b6fc79f82bbe75d64baf604292 Mon Sep 17 00:00:00 2001 +From 0bfe7e22b7176fae60dccf943c4ba61a6fe093ab Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Thu, 12 Oct 2017 16:36:57 +0800 Subject: [PATCH] clk: sunxi-ng: sun5i: Fix bit offset of audio PLL @@ -20,12 +20,13 @@ certain value. Fixes: 5e73761786d6 ("clk: sunxi-ng: Add sun5i CCU driver") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/sunxi-ng/ccu-sun5i.c b/drivers/clk/sunxi-ng/ccu-sun5i.c -index ab9e850b3707..2f385a57cd91 100644 +index 31d7ffda9aab..59454b264dbf 100644 --- a/drivers/clk/sunxi-ng/ccu-sun5i.c +++ b/drivers/clk/sunxi-ng/ccu-sun5i.c -@@ -982,8 +982,8 @@ static void __init sun5i_ccu_init(struct device_node *node, +@@ -983,8 +983,8 @@ static void __init sun5i_ccu_init(struct device_node *node, /* Force the PLL-Audio-1x divider to 4 */ val = readl(reg + SUN5I_PLL_AUDIO_REG); diff --git a/queue/clk-sunxi-ng-sun6i-Rename-HDMI-DDC-clock-to-avoid-na.patch b/queue/clk-sunxi-ng-sun6i-Rename-HDMI-DDC-clock-to-avoid-na.patch index 46151fb..d1edead 100644 --- a/queue/clk-sunxi-ng-sun6i-Rename-HDMI-DDC-clock-to-avoid-na.patch +++ b/queue/clk-sunxi-ng-sun6i-Rename-HDMI-DDC-clock-to-avoid-na.patch @@ -1,4 +1,4 @@ -From 7f3ed79188f2f094d0ee366fa858857fb7f511ba Mon Sep 17 00:00:00 2001 +From 943dcebf75e4d5bdd6ebebbd74beb979113e741a Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Fri, 29 Sep 2017 16:22:54 +0800 Subject: [PATCH] clk: sunxi-ng: sun6i: Rename HDMI DDC clock to avoid name @@ -15,9 +15,10 @@ the one in the HDMI controller to something else. Fixes: c6e6c96d8fa6 ("clk: sunxi-ng: Add A31/A31s clocks") Signed-off-by: Chen-Yu Tsai <wens@csie.org> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c -index 8af434815fba..241fb13f1c06 100644 +index df97e25aec76..9fe0939c1273 100644 --- a/drivers/clk/sunxi-ng/ccu-sun6i-a31.c +++ b/drivers/clk/sunxi-ng/ccu-sun6i-a31.c @@ -608,7 +608,7 @@ static SUNXI_CCU_M_WITH_MUX_GATE(hdmi_clk, "hdmi", lcd_ch1_parents, diff --git a/queue/clk-sunxi-sun9i-mmc-Implement-reset-callback-for-res.patch b/queue/clk-sunxi-sun9i-mmc-Implement-reset-callback-for-res.patch index db86027..33bc127 100644 --- a/queue/clk-sunxi-sun9i-mmc-Implement-reset-callback-for-res.patch +++ b/queue/clk-sunxi-sun9i-mmc-Implement-reset-callback-for-res.patch @@ -1,4 +1,4 @@ -From 61d2f2a05765a5f57149efbd93e3e81a83cbc2c1 Mon Sep 17 00:00:00 2001 +From 787138d4dfe032e821b7d03e30e61b227948a3bf Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai <wens@csie.org> Date: Mon, 18 Dec 2017 11:57:51 +0800 Subject: [PATCH] clk: sunxi: sun9i-mmc: Implement reset callback for reset @@ -21,9 +21,10 @@ Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Michael Turquette <mturquette@baylibre.com> Link: lkml.kernel.org/r/20171218035751.20661-1-wens@csie.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/sunxi/clk-sun9i-mmc.c b/drivers/clk/sunxi/clk-sun9i-mmc.c -index a1a634253d6f..f00d8758ba24 100644 +index 6041bdba2e97..f69f9e8c6f38 100644 --- a/drivers/clk/sunxi/clk-sun9i-mmc.c +++ b/drivers/clk/sunxi/clk-sun9i-mmc.c @@ -16,6 +16,7 @@ diff --git a/queue/cpuidle-fix-broadcast-control-when-broadcast-can-not.patch b/queue/cpuidle-fix-broadcast-control-when-broadcast-can-not.patch index 866972e..a307293 100644 --- a/queue/cpuidle-fix-broadcast-control-when-broadcast-can-not.patch +++ b/queue/cpuidle-fix-broadcast-control-when-broadcast-can-not.patch @@ -1,4 +1,4 @@ -From f187851b9b4a76952b1158b86434563dd2031103 Mon Sep 17 00:00:00 2001 +From 387b99185de9129472579af212c6f0b44ae29038 Mon Sep 17 00:00:00 2001 From: Nicholas Piggin <npiggin@gmail.com> Date: Fri, 1 Sep 2017 14:29:56 +1000 Subject: [PATCH] cpuidle: fix broadcast control when broadcast can not be @@ -19,9 +19,10 @@ to violate the interface so should be fixed. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c -index 484cc8909d5c..ed4df58a855e 100644 +index 2706be7ed334..6a2a59b84f82 100644 --- a/drivers/cpuidle/cpuidle.c +++ b/drivers/cpuidle/cpuidle.c @@ -208,6 +208,7 @@ int cpuidle_enter_state(struct cpuidle_device *dev, struct cpuidle_driver *drv, diff --git a/queue/crypto-crypto4xx-increase-context-and-scatter-ring-b.patch b/queue/crypto-crypto4xx-increase-context-and-scatter-ring-b.patch index f7becbc..52c1ef3 100644 --- a/queue/crypto-crypto4xx-increase-context-and-scatter-ring-b.patch +++ b/queue/crypto-crypto4xx-increase-context-and-scatter-ring-b.patch @@ -1,4 +1,4 @@ -From 778f81d6cdb7d25360f082ac0384d5103f04eca5 Mon Sep 17 00:00:00 2001 +From bef87c4b3a3fea5778d4387707aad6a1c0862651 Mon Sep 17 00:00:00 2001 From: Christian Lamparter <chunkeey@gmail.com> Date: Wed, 4 Oct 2017 01:00:08 +0200 Subject: [PATCH] crypto: crypto4xx - increase context and scatter ring buffer @@ -27,12 +27,13 @@ constant. Signed-off-by: Christian Lamparter <chunkeey@gmail.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/crypto/amcc/crypto4xx_core.h b/drivers/crypto/amcc/crypto4xx_core.h -index 97fb8288ab30..27e439c1f5bf 100644 +index ecfdcfe3698d..4f41d6da5acc 100644 --- a/drivers/crypto/amcc/crypto4xx_core.h +++ b/drivers/crypto/amcc/crypto4xx_core.h -@@ -36,12 +36,12 @@ +@@ -34,12 +34,12 @@ #define PPC405EX_CE_RESET 0x00000008 #define CRYPTO4XX_CRYPTO_PRIORITY 300 diff --git a/queue/crypto-lrw-Fix-an-error-handling-path-in-create.patch b/queue/crypto-lrw-Fix-an-error-handling-path-in-create.patch index e7f03a7..bcfe7ab 100644 --- a/queue/crypto-lrw-Fix-an-error-handling-path-in-create.patch +++ b/queue/crypto-lrw-Fix-an-error-handling-path-in-create.patch @@ -1,4 +1,4 @@ -From 616129cc6e75fb4da6681c16c981fa82dfe5e4c7 Mon Sep 17 00:00:00 2001 +From c6f06a588872e3bf9d4448066b91299fa770862b Mon Sep 17 00:00:00 2001 From: Christophe Jaillet <christophe.jaillet@wanadoo.fr> Date: Sun, 8 Oct 2017 11:39:49 +0200 Subject: [PATCH] crypto: lrw - Fix an error handling path in 'create()' @@ -11,6 +11,7 @@ In order to avoid some resources leak, we should do it as well here. Fixes: 700cb3f5fe75 ("crypto: lrw - Convert to skcipher") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/lrw.c b/crypto/lrw.c index a8bfae4451bf..eb681e9fe574 100644 diff --git a/queue/crypto-mcryptd-protect-the-per-CPU-queue-with-a-lock.patch b/queue/crypto-mcryptd-protect-the-per-CPU-queue-with-a-lock.patch index f2ccc22..c12a992 100644 --- a/queue/crypto-mcryptd-protect-the-per-CPU-queue-with-a-lock.patch +++ b/queue/crypto-mcryptd-protect-the-per-CPU-queue-with-a-lock.patch @@ -1,4 +1,4 @@ -From 9abffc6f2efe46c3564c04312e52e07622d40e51 Mon Sep 17 00:00:00 2001 +From 60cc8d37e6a63eb6a87caf31bc656843b73b5b8a Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Date: Thu, 30 Nov 2017 13:39:27 +0100 Subject: [PATCH] crypto: mcryptd - protect the per-CPU queue with a lock @@ -33,6 +33,7 @@ to queue_work_on(). Cc: stable@vger.kernel.org Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index 4e6472658852..eca04d3729b3 100644 @@ -97,10 +98,10 @@ index 4e6472658852..eca04d3729b3 100644 void mcryptd_flusher(struct work_struct *__work) diff --git a/include/crypto/mcryptd.h b/include/crypto/mcryptd.h -index cceafa01f907..b67404fc4b34 100644 +index 4a53c0d38cd2..e045722a69aa 100644 --- a/include/crypto/mcryptd.h +++ b/include/crypto/mcryptd.h -@@ -27,6 +27,7 @@ static inline struct mcryptd_ahash *__mcryptd_ahash_cast( +@@ -26,6 +26,7 @@ static inline struct mcryptd_ahash *__mcryptd_ahash_cast( struct mcryptd_cpu_queue { struct crypto_queue queue; diff --git a/queue/drm-Add-retries-for-lspcon-mode-detection.patch b/queue/drm-Add-retries-for-lspcon-mode-detection.patch index b38e513..01a2178 100644 --- a/queue/drm-Add-retries-for-lspcon-mode-detection.patch +++ b/queue/drm-Add-retries-for-lspcon-mode-detection.patch @@ -1,4 +1,4 @@ -From f687e25a7a245952349f1f9f9cc238ac5a3be258 Mon Sep 17 00:00:00 2001 +From 5968b39ad59e5fa99bfc4eeeeab647df952c2070 Mon Sep 17 00:00:00 2001 From: Shashank Sharma <shashank.sharma@intel.com> Date: Thu, 12 Oct 2017 22:10:08 +0530 Subject: [PATCH] drm: Add retries for lspcon mode detection @@ -33,9 +33,10 @@ Acked-by: Dave Airlie <airlied@gmail.com> Signed-off-by: Shashank Sharma <shashank.sharma@intel.com> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/1507826408-19322-1-git-send-email-shashank.sharma@intel.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_dp_dual_mode_helper.c b/drivers/gpu/drm/drm_dp_dual_mode_helper.c -index 0ef9011a1856..02a50929af67 100644 +index 80e62f669321..42611ec932fe 100644 --- a/drivers/gpu/drm/drm_dp_dual_mode_helper.c +++ b/drivers/gpu/drm/drm_dp_dual_mode_helper.c @@ -410,6 +410,7 @@ int drm_lspcon_get_mode(struct i2c_adapter *adapter, diff --git a/queue/drm-i915-Flush-pending-GTT-writes-before-unbinding.patch b/queue/drm-i915-Flush-pending-GTT-writes-before-unbinding.patch index 92591f8..7730a29 100644 --- a/queue/drm-i915-Flush-pending-GTT-writes-before-unbinding.patch +++ b/queue/drm-i915-Flush-pending-GTT-writes-before-unbinding.patch @@ -1,4 +1,4 @@ -From 2797c4a11f373b2545c2398ccb02e362ee66a142 Mon Sep 17 00:00:00 2001 +From 5d5f62d0acf31d7f503768ca5df03408dc189098 Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris@chris-wilson.co.uk> Date: Mon, 4 Dec 2017 13:25:13 +0000 Subject: [PATCH] drm/i915: Flush pending GTT writes before unbinding @@ -26,12 +26,13 @@ Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20171204132513.7303-1-chris@chris-wilson.co.uk (cherry picked from commit 5888fc9eac3c2ff96e76aeeb865fdb46ab2d711e) Signed-off-by: Jani Nikula <jani.nikula@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c -index ad4050f7ab3b..18de6569d04a 100644 +index 615f0a855222..047b030f164a 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c -@@ -330,17 +330,10 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj) +@@ -320,17 +320,10 @@ int i915_gem_object_unbind(struct drm_i915_gem_object *obj) * must wait for all rendering to complete to the object (as unbinding * must anyway), and retire the requests. */ diff --git a/queue/drm-sun4i-Fix-error-path-handling.patch b/queue/drm-sun4i-Fix-error-path-handling.patch index 71b5755..d8dab93 100644 --- a/queue/drm-sun4i-Fix-error-path-handling.patch +++ b/queue/drm-sun4i-Fix-error-path-handling.patch @@ -1,4 +1,4 @@ -From 4bde918a3eac902736f4afee58e101ee59d59b6c Mon Sep 17 00:00:00 2001 +From ea83bec80fffc0739bf6425b95d2b71c1c7fb853 Mon Sep 17 00:00:00 2001 From: Maxime Ripard <maxime.ripard@free-electrons.com> Date: Thu, 7 Dec 2017 16:58:50 +0100 Subject: [PATCH] drm/sun4i: Fix error path handling diff --git a/queue/fm10k-ensure-we-process-SM-mbx-when-processing-VF-mb.patch b/queue/fm10k-ensure-we-process-SM-mbx-when-processing-VF-mb.patch index a3a6e25..d229986 100644 --- a/queue/fm10k-ensure-we-process-SM-mbx-when-processing-VF-mb.patch +++ b/queue/fm10k-ensure-we-process-SM-mbx-when-processing-VF-mb.patch @@ -1,4 +1,4 @@ -From 17a91809942ca32c70026d2d5ba3348a2c4fdf8f Mon Sep 17 00:00:00 2001 +From 978a68c9968f98641c4376f0a6c58aad9349f944 Mon Sep 17 00:00:00 2001 From: Jacob Keller <jacob.e.keller@intel.com> Date: Mon, 2 Oct 2017 07:17:50 -0700 Subject: [PATCH] fm10k: ensure we process SM mbx when processing VF mbx @@ -18,9 +18,10 @@ each VF message is received and handled. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c -index 5f4dac0d36ef..2ec49116fe91 100644 +index f919199944a0..e72fd52bacfe 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c @@ -126,6 +126,9 @@ s32 fm10k_iov_mbx(struct fm10k_intfc *interface) diff --git a/queue/fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch b/queue/fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch index dfdea1c..d1913f3 100644 --- a/queue/fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch +++ b/queue/fm10k-fix-mis-ordered-parameters-in-declaration-for-.patch @@ -1,4 +1,4 @@ -From 3e256ac5b1ec307e5dd5a4c99fbdbc651446c738 Mon Sep 17 00:00:00 2001 +From a36017d55e92fecc6f1f74ce2e8a4fb63482dc44 Mon Sep 17 00:00:00 2001 From: Jacob Keller <jacob.e.keller@intel.com> Date: Fri, 11 Aug 2017 11:14:58 -0700 Subject: [PATCH] fm10k: fix mis-ordered parameters in declaration for @@ -22,12 +22,13 @@ support setting the maximum rate. Signed-off-by: Jacob Keller <jacob.e.keller@intel.com> Tested-by: Krishneil Singh <krishneil.k.singh@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/fm10k/fm10k.h b/drivers/net/ethernet/intel/fm10k/fm10k.h -index 40856bc0f3b9..46973fb234c5 100644 +index 689c413b7782..d2f9a2dd76a2 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k.h +++ b/drivers/net/ethernet/intel/fm10k/fm10k.h -@@ -562,8 +562,8 @@ s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid); +@@ -526,8 +526,8 @@ s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid); int fm10k_ndo_set_vf_mac(struct net_device *netdev, int vf_idx, u8 *mac); int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid, u8 qos, __be16 vlan_proto); @@ -39,10 +40,10 @@ index 40856bc0f3b9..46973fb234c5 100644 int vf_idx, struct ifla_vf_info *ivi); diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c -index 4a17cc903eed..ea3ab24265ee 100644 +index 5f4dac0d36ef..f919199944a0 100644 --- a/drivers/net/ethernet/intel/fm10k/fm10k_iov.c +++ b/drivers/net/ethernet/intel/fm10k/fm10k_iov.c -@@ -613,7 +613,7 @@ int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid, +@@ -482,7 +482,7 @@ int fm10k_ndo_set_vf_vlan(struct net_device *netdev, int vf_idx, u16 vid, } int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx, @@ -51,7 +52,7 @@ index 4a17cc903eed..ea3ab24265ee 100644 { struct fm10k_intfc *interface = netdev_priv(netdev); struct fm10k_iov_data *iov_data = interface->iov_data; -@@ -624,14 +624,15 @@ int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx, +@@ -493,14 +493,15 @@ int fm10k_ndo_set_vf_bw(struct net_device *netdev, int vf_idx, return -EINVAL; /* rate limit cannot be less than 10Mbs or greater than link speed */ diff --git a/queue/i40e-fix-client-notify-of-VF-reset.patch b/queue/i40e-fix-client-notify-of-VF-reset.patch index b2fdb6a..353a23d 100644 --- a/queue/i40e-fix-client-notify-of-VF-reset.patch +++ b/queue/i40e-fix-client-notify-of-VF-reset.patch @@ -1,4 +1,4 @@ -From c53d11f669c0e7d0daf46a717b6712ad0b09de99 Mon Sep 17 00:00:00 2001 +From 3728071521d528bc48562240dc25a384dda64ec6 Mon Sep 17 00:00:00 2001 From: Alan Brady <alan.brady@intel.com> Date: Tue, 22 Aug 2017 06:57:53 -0400 Subject: [PATCH] i40e: fix client notify of VF reset @@ -22,12 +22,13 @@ reflect the behavior we want. Signed-off-by: Alan Brady <alan.brady@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c -index 989a65d60ac9..04568137e029 100644 +index de056aff9e04..3204f30d55d2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c -@@ -1050,8 +1050,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf) +@@ -1007,8 +1007,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf) set_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states); clear_bit(I40E_VF_STATE_DISABLED, &vf->vf_states); /* Do not notify the client during VF init */ diff --git a/queue/i40e-use-the-safe-hash-table-iterator-when-deleting-.patch b/queue/i40e-use-the-safe-hash-table-iterator-when-deleting-.patch index 09b680c..340536b 100644 --- a/queue/i40e-use-the-safe-hash-table-iterator-when-deleting-.patch +++ b/queue/i40e-use-the-safe-hash-table-iterator-when-deleting-.patch @@ -1,4 +1,4 @@ -From 784548c40d6f43eff2297220ad7800dc04be03c6 Mon Sep 17 00:00:00 2001 +From 3ffca1ae1e1c86427cc4029137f2426853a1e884 Mon Sep 17 00:00:00 2001 From: Lihong Yang <lihong.yang@intel.com> Date: Thu, 7 Sep 2017 08:05:46 -0400 Subject: [PATCH] i40e: use the safe hash table iterator when deleting mac @@ -16,12 +16,13 @@ Detected by CoverityScan, CID 1402048 Read from pointer after free Signed-off-by: Lihong Yang <lihong.yang@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c -index 04568137e029..c062d74d21f3 100644 +index 0fb38ca78900..de056aff9e04 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c -@@ -2883,6 +2883,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) +@@ -2862,6 +2862,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) struct i40e_mac_filter *f; struct i40e_vf *vf; int ret = 0; @@ -29,7 +30,7 @@ index 04568137e029..c062d74d21f3 100644 int bkt; /* validate the request */ -@@ -2921,7 +2922,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) +@@ -2900,7 +2901,7 @@ int i40e_ndo_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) /* Delete all the filters for this VSI - we're going to kill it * anyway. */ diff --git a/queue/ibmvnic-Set-state-UP.patch b/queue/ibmvnic-Set-state-UP.patch index 19439a7..f79ddd6 100644 --- a/queue/ibmvnic-Set-state-UP.patch +++ b/queue/ibmvnic-Set-state-UP.patch @@ -1,4 +1,4 @@ -From ecdea16d9237c99ead490e19e59812c00253d2b8 Mon Sep 17 00:00:00 2001 +From 15dd861198bccf51f6554f4d911582fb86a41ca1 Mon Sep 17 00:00:00 2001 From: Mick Tarsel <mjtarsel@linux.vnet.ibm.com> Date: Thu, 28 Sep 2017 13:53:18 -0700 Subject: [PATCH] ibmvnic: Set state UP diff --git a/queue/igb-check-memory-allocation-failure.patch b/queue/igb-check-memory-allocation-failure.patch index 0004cc9..0b7dc8d 100644 --- a/queue/igb-check-memory-allocation-failure.patch +++ b/queue/igb-check-memory-allocation-failure.patch @@ -1,4 +1,4 @@ -From 18eb86362a52f0af933cc0fd5e37027317eb2d1c Mon Sep 17 00:00:00 2001 +From c23a6fe4e29e74e6acc8333b250a1b5d4bbdbff4 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Date: Sun, 27 Aug 2017 08:39:51 +0200 Subject: [PATCH] igb: check memory allocation failure @@ -14,12 +14,13 @@ Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Tested-by: Aaron Brown <aaron.f.brown@intel.com Acked-by: PJ Waskiewicz <peter.waskiewicz.jr@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c -index fd4a46b03cc8..837d9b46a390 100644 +index 5d48de3c417c..fd9dc20b1a7f 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c -@@ -3162,6 +3162,8 @@ static int igb_sw_init(struct igb_adapter *adapter) +@@ -3164,6 +3164,8 @@ static int igb_sw_init(struct igb_adapter *adapter) /* Setup and initialize a copy of the hw vlan table array */ adapter->shadow_vfta = kcalloc(E1000_VLAN_FILTER_TBL_SIZE, sizeof(u32), GFP_ATOMIC); diff --git a/queue/ixgbe-fix-use-of-uninitialized-padding.patch b/queue/ixgbe-fix-use-of-uninitialized-padding.patch index 8f5e63a..672104a 100644 --- a/queue/ixgbe-fix-use-of-uninitialized-padding.patch +++ b/queue/ixgbe-fix-use-of-uninitialized-padding.patch @@ -1,4 +1,4 @@ -From dcfd6b839c998bc9838e2a47f44f37afbdf3099c Mon Sep 17 00:00:00 2001 +From f82367f2084a6a128cc90cdc4367e5bdbc86f40b Mon Sep 17 00:00:00 2001 From: Emil Tantilov <emil.s.tantilov@intel.com> Date: Mon, 11 Sep 2017 14:21:31 -0700 Subject: [PATCH] ixgbe: fix use of uninitialized padding @@ -15,12 +15,13 @@ be used uninitialized. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Andrew Bowers <andrewx.bowers@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c -index 2c19070d2a0b..041940c4bb2b 100644 +index c38d50c1fcf7..d6a7ddf08282 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_common.c -@@ -3800,10 +3800,10 @@ s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min, +@@ -3783,10 +3783,10 @@ s32 ixgbe_set_fw_drv_ver_generic(struct ixgbe_hw *hw, u8 maj, u8 min, fw_cmd.ver_build = build; fw_cmd.ver_sub = sub; fw_cmd.hdr.checksum = 0; @@ -34,7 +35,7 @@ index 2c19070d2a0b..041940c4bb2b 100644 for (i = 0; i <= FW_CEM_MAX_RETRIES; i++) { ret_val = ixgbe_host_interface_command(hw, &fw_cmd, diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c -index 8cea53b62e1b..cb7da5f9c4da 100644 +index 2ba024b575ea..a6aec0ececea 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c @@ -900,6 +900,8 @@ static s32 ixgbe_read_ee_hostif_buffer_X550(struct ixgbe_hw *hw, diff --git a/queue/libnvdimm-btt-Fix-an-incompatibility-in-the-log-layo.patch b/queue/libnvdimm-btt-Fix-an-incompatibility-in-the-log-layo.patch index 468b2bc..f08f488 100644 --- a/queue/libnvdimm-btt-Fix-an-incompatibility-in-the-log-layo.patch +++ b/queue/libnvdimm-btt-Fix-an-incompatibility-in-the-log-layo.patch @@ -1,4 +1,4 @@ -From 3ba1900f47525ad22d41b371cc12e7fa511a9809 Mon Sep 17 00:00:00 2001 +From 3ff72bf8746aa30282dded8379806bf142eabe98 Mon Sep 17 00:00:00 2001 From: Vishal Verma <vishal.l.verma@intel.com> Date: Mon, 18 Dec 2017 09:28:39 -0700 Subject: [PATCH] libnvdimm, btt: Fix an incompatibility in the log layout diff --git a/queue/libnvdimm-dax-fix-1GB-aligned-namespaces-vs-physical.patch b/queue/libnvdimm-dax-fix-1GB-aligned-namespaces-vs-physical.patch index ffffffc..7498b76 100644 --- a/queue/libnvdimm-dax-fix-1GB-aligned-namespaces-vs-physical.patch +++ b/queue/libnvdimm-dax-fix-1GB-aligned-namespaces-vs-physical.patch @@ -1,4 +1,4 @@ -From 41fce90f26333c4fa82e8e43b9ace86c4e8a0120 Mon Sep 17 00:00:00 2001 +From 78969fe277e27f5c22880c4e1e5a387f07969dc5 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams@intel.com> Date: Mon, 4 Dec 2017 14:07:43 -0800 Subject: [PATCH] libnvdimm, dax: fix 1GB-aligned namespaces vs physical @@ -30,12 +30,13 @@ Cc: <stable@vger.kernel.org> Fixes: 315c562536c4 ("libnvdimm, pfn: add 'align' attribute...") Reported-and-tested-by: Jane Chu <jane.chu@oracle.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c -index db2fc7c02e01..2adada1a5855 100644 +index d7274abd1a9f..022558fa71d2 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c -@@ -583,6 +583,12 @@ static struct vmem_altmap *__nvdimm_setup_pfn(struct nd_pfn *nd_pfn, +@@ -562,6 +562,12 @@ static struct vmem_altmap *__nvdimm_setup_pfn(struct nd_pfn *nd_pfn, return altmap; } @@ -48,7 +49,7 @@ index db2fc7c02e01..2adada1a5855 100644 static int nd_pfn_init(struct nd_pfn *nd_pfn) { u32 dax_label_reserve = is_nd_dax(&nd_pfn->dev) ? SZ_128K : 0; -@@ -638,13 +644,16 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) +@@ -617,13 +623,16 @@ static int nd_pfn_init(struct nd_pfn *nd_pfn) start = nsio->res.start; size = PHYS_SECTION_ALIGN_UP(start + size) - start; if (region_intersects(start, size, IORESOURCE_SYSTEM_RAM, diff --git a/queue/libnvdimm-pfn-fix-start_pad-handling-for-aligned-nam.patch b/queue/libnvdimm-pfn-fix-start_pad-handling-for-aligned-nam.patch index e4af80d..ff008c2 100644 --- a/queue/libnvdimm-pfn-fix-start_pad-handling-for-aligned-nam.patch +++ b/queue/libnvdimm-pfn-fix-start_pad-handling-for-aligned-nam.patch @@ -1,4 +1,4 @@ -From 19deaa217bc04e83b59b5e8c8229eb0e53ad9efc Mon Sep 17 00:00:00 2001 +From b5048c2d052c6e5adc466d6005fcb0af308866d5 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams@intel.com> Date: Tue, 19 Dec 2017 15:07:10 -0800 Subject: [PATCH] libnvdimm, pfn: fix start_pad handling for aligned namespaces @@ -17,12 +17,13 @@ Cc: <stable@vger.kernel.org> Fixes: 1ee6667cd8d1 ("libnvdimm, pfn, dax: fix initialization vs autodetect...") Reported-by: Jane Chu <jane.chu@oracle.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvdimm/pfn_devs.c b/drivers/nvdimm/pfn_devs.c -index 65cc171c721d..db2fc7c02e01 100644 +index 022558fa71d2..ba08c22eb83a 100644 --- a/drivers/nvdimm/pfn_devs.c +++ b/drivers/nvdimm/pfn_devs.c -@@ -364,9 +364,9 @@ struct device *nd_pfn_create(struct nd_region *nd_region) +@@ -352,9 +352,9 @@ struct device *nd_pfn_create(struct nd_region *nd_region) int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) { u64 checksum, offset; @@ -33,7 +34,7 @@ index 65cc171c721d..db2fc7c02e01 100644 struct nd_pfn_sb *pfn_sb = nd_pfn->pfn_sb; struct nd_namespace_common *ndns = nd_pfn->ndns; const u8 *parent_uuid = nd_dev_to_uuid(&ndns->dev); -@@ -410,6 +410,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) +@@ -398,6 +398,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) align = le32_to_cpu(pfn_sb->align); offset = le64_to_cpu(pfn_sb->dataoff); @@ -41,7 +42,7 @@ index 65cc171c721d..db2fc7c02e01 100644 if (align == 0) align = 1UL << ilog2(offset); mode = le32_to_cpu(pfn_sb->mode); -@@ -468,7 +469,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) +@@ -456,7 +457,7 @@ int nd_pfn_validate(struct nd_pfn *nd_pfn, const char *sig) return -EBUSY; } diff --git a/queue/md-always-set-THREAD_WAKEUP-and-wake-up-wqueue-if-th.patch b/queue/md-always-set-THREAD_WAKEUP-and-wake-up-wqueue-if-th.patch index 13a85d7..2a9d4da 100644 --- a/queue/md-always-set-THREAD_WAKEUP-and-wake-up-wqueue-if-th.patch +++ b/queue/md-always-set-THREAD_WAKEUP-and-wake-up-wqueue-if-th.patch @@ -1,4 +1,4 @@ -From d1d90147c9680aaec4a5757932c2103c42c9c23b Mon Sep 17 00:00:00 2001 +From a67553cb08de9496cdc61a0a08eaaaf8f7ca8feb Mon Sep 17 00:00:00 2001 From: Guoqing Jiang <gqjiang@suse.com> Date: Mon, 9 Oct 2017 10:32:48 +0800 Subject: [PATCH] md: always set THREAD_WAKEUP and wake up wqueue if thread @@ -38,12 +38,13 @@ we can't get lots of benefits of previous change. Fixes: 4ad23a976413 ("MD: use per-cpu counter for writes_pending") Signed-off-by: Guoqing Jiang <gqjiang@suse.com> Signed-off-by: Shaohua Li <shli@fb.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/md.c b/drivers/md/md.c -index 8b2eb0f4122f..707471e3cb01 100644 +index 1e125f68c326..24050706b861 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c -@@ -7468,8 +7468,8 @@ void md_wakeup_thread(struct md_thread *thread) +@@ -7437,8 +7437,8 @@ void md_wakeup_thread(struct md_thread *thread) { if (thread) { pr_debug("md: waking up MD thread %s.\n", thread->tsk->comm); diff --git a/queue/mfd-cros-ec-spi-Don-t-send-first-message-too-soon.patch b/queue/mfd-cros-ec-spi-Don-t-send-first-message-too-soon.patch index fb46360..4095c0d 100644 --- a/queue/mfd-cros-ec-spi-Don-t-send-first-message-too-soon.patch +++ b/queue/mfd-cros-ec-spi-Don-t-send-first-message-too-soon.patch @@ -1,4 +1,4 @@ -From 15d8374874ded0bec37ef27f8301a6d54032c0e5 Mon Sep 17 00:00:00 2001 +From 177b76291a7b87ca45e2dbeba8b5839957bba09c Mon Sep 17 00:00:00 2001 From: Jon Hunter <jonathanh@nvidia.com> Date: Tue, 14 Nov 2017 14:43:27 +0000 Subject: [PATCH] mfd: cros ec: spi: Don't send first message too soon @@ -27,6 +27,7 @@ Reviewed-by: Brian Norris <briannorris@chromium.org> Reviewed-by: Douglas Anderson <dianders@chromium.org> Acked-by: Benson Leung <bleung@chromium.org> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mfd/cros_ec_spi.c b/drivers/mfd/cros_ec_spi.c index c9714072e224..a14196e95e9b 100644 diff --git a/queue/mfd-twl4030-audio-Fix-sibling-node-lookup.patch b/queue/mfd-twl4030-audio-Fix-sibling-node-lookup.patch index 6f66534..8aea742 100644 --- a/queue/mfd-twl4030-audio-Fix-sibling-node-lookup.patch +++ b/queue/mfd-twl4030-audio-Fix-sibling-node-lookup.patch @@ -1,4 +1,4 @@ -From 0a423772de2f3d7b00899987884f62f63ae00dcb Mon Sep 17 00:00:00 2001 +From 57b96172e0643b8195672b3504f2a2452166648f Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Sat, 11 Nov 2017 16:38:43 +0100 Subject: [PATCH] mfd: twl4030-audio: Fix sibling-node lookup @@ -18,9 +18,10 @@ Cc: stable <stable@vger.kernel.org> # 3.7 Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c -index da16bf45fab4..dc94ffc6321a 100644 +index 0a1606480023..cc832d309599 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c @@ -159,13 +159,18 @@ unsigned int twl4030_audio_get_mclk(void) diff --git a/queue/mfd-twl6040-Fix-child-node-lookup.patch b/queue/mfd-twl6040-Fix-child-node-lookup.patch index 5ad6cd4..ab6043d 100644 --- a/queue/mfd-twl6040-Fix-child-node-lookup.patch +++ b/queue/mfd-twl6040-Fix-child-node-lookup.patch @@ -1,4 +1,4 @@ -From 85e9b13cbb130a3209f21bd7933933399c389ffe Mon Sep 17 00:00:00 2001 +From 0fb7a1aa249f61a0bc0523996714288348018c32 Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Sat, 11 Nov 2017 16:38:44 +0100 Subject: [PATCH] mfd: twl6040: Fix child-node lookup @@ -22,6 +22,7 @@ Fixes: ca2cad6ae38e ("mfd: Fix twl6040 build failure") Signed-off-by: Johan Hovold <johan@kernel.org> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c index d66502d36ba0..dd19f17a1b63 100644 diff --git a/queue/net-add-rb_to_skb-and-other-rb-tree-helpers.patch b/queue/net-add-rb_to_skb-and-other-rb-tree-helpers.patch index abfdcef..a6cef33 100644 --- a/queue/net-add-rb_to_skb-and-other-rb-tree-helpers.patch +++ b/queue/net-add-rb_to_skb-and-other-rb-tree-helpers.patch @@ -1,4 +1,4 @@ -From d6a7b11b874d61f7bf35dfec18b24490ccedd491 Mon Sep 17 00:00:00 2001 +From ae40ccec4120b725765efb3ca4101b89a1d21ee3 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Thu, 5 Oct 2017 22:21:21 -0700 Subject: [PATCH] net: add rb_to_skb() and other rb tree helpers diff --git a/queue/net-ipv6-send-NS-for-DAD-when-link-operationally-up.patch b/queue/net-ipv6-send-NS-for-DAD-when-link-operationally-up.patch index ad709c3..1205a05 100644 --- a/queue/net-ipv6-send-NS-for-DAD-when-link-operationally-up.patch +++ b/queue/net-ipv6-send-NS-for-DAD-when-link-operationally-up.patch @@ -1,4 +1,4 @@ -From 1f372c7bfb23286d2bf4ce0423ab488e86b74bb2 Mon Sep 17 00:00:00 2001 +From 208331659a7dcc56d512a151508a206bd9ee0d7d Mon Sep 17 00:00:00 2001 From: Mike Manning <mmanning@brocade.com> Date: Mon, 25 Sep 2017 22:01:36 +0100 Subject: [PATCH] net: ipv6: send NS for DAD when link operationally up @@ -19,9 +19,10 @@ desirable. Signed-off-by: Mike Manning <mmanning@brocade.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c -index 13c3b697f8c0..f553f72d0bee 100644 +index 09ea6360dc40..50503ffab744 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -303,10 +303,10 @@ static struct ipv6_devconf ipv6_devconf_dflt __read_mostly = { @@ -47,7 +48,7 @@ index 13c3b697f8c0..f553f72d0bee 100644 ndev->if_flags |= IF_READY; ipv6_mc_init_dev(ndev); -@@ -3403,7 +3403,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, +@@ -3421,7 +3421,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, /* restore routes for permanent addresses */ addrconf_permanent_addr(dev); @@ -56,7 +57,7 @@ index 13c3b697f8c0..f553f72d0bee 100644 /* device is not ready yet. */ pr_info("ADDRCONF(NETDEV_UP): %s: link is not ready\n", dev->name); -@@ -3418,7 +3418,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, +@@ -3436,7 +3436,7 @@ static int addrconf_notify(struct notifier_block *this, unsigned long event, run_pending = 1; } } else if (event == NETDEV_CHANGE) { diff --git a/queue/net-mvneta-clear-interface-link-status-on-port-disab.patch b/queue/net-mvneta-clear-interface-link-status-on-port-disab.patch index 3281ee6..7f6b9bf 100644 --- a/queue/net-mvneta-clear-interface-link-status-on-port-disab.patch +++ b/queue/net-mvneta-clear-interface-link-status-on-port-disab.patch @@ -1,4 +1,4 @@ -From 4423c18e466afdfb02a36ee8b9f901d144b3c607 Mon Sep 17 00:00:00 2001 +From ee2fc5bf15474a2ba69284c0d18c0d009c2b59cd Mon Sep 17 00:00:00 2001 From: Yelena Krivosheev <yelena@marvell.com> Date: Tue, 19 Dec 2017 17:59:45 +0100 Subject: [PATCH] net: mvneta: clear interface link status on port disable @@ -16,12 +16,13 @@ Signed-off-by: Yelena Krivosheev <yelena@marvell.com> Tested-by: Dmitri Epshtein <dima@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c -index bc93b69cfd1e..16b2bfb2cf51 100644 +index 93de6f4feb95..f0ee0b49fe71 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -1214,6 +1214,10 @@ static void mvneta_port_disable(struct mvneta_port *pp) +@@ -1217,6 +1217,10 @@ static void mvneta_port_disable(struct mvneta_port *pp) val &= ~MVNETA_GMAC0_PORT_ENABLE; mvreg_write(pp, MVNETA_GMAC_CTRL_0, val); diff --git a/queue/net-mvneta-eliminate-wrong-call-to-handle-rx-descrip.patch b/queue/net-mvneta-eliminate-wrong-call-to-handle-rx-descrip.patch index 1255b5b..fedbae7 100644 --- a/queue/net-mvneta-eliminate-wrong-call-to-handle-rx-descrip.patch +++ b/queue/net-mvneta-eliminate-wrong-call-to-handle-rx-descrip.patch @@ -1,4 +1,4 @@ -From 2eecb2e04abb62ef8ea7b43e1a46bdb5b99d1bf8 Mon Sep 17 00:00:00 2001 +From d128ff906fc0b1a3bb5c30e7208b876e2be3f820 Mon Sep 17 00:00:00 2001 From: Yelena Krivosheev <yelena@marvell.com> Date: Tue, 19 Dec 2017 17:59:47 +0100 Subject: [PATCH] net: mvneta: eliminate wrong call to handle rx descriptor @@ -17,12 +17,13 @@ Signed-off-by: Yelena Krivosheev <yelena@marvell.com> Tested-by: Dmitri Epshtein <dima@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c -index 1e0835655c93..a539263cd79c 100644 +index c770c90059c1..f29a3fe41311 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -1962,9 +1962,9 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, +@@ -1965,9 +1965,9 @@ static int mvneta_rx_swbm(struct mvneta_port *pp, int rx_todo, if (!mvneta_rxq_desc_is_first_last(rx_status) || (rx_status & MVNETA_RXD_ERR_SUMMARY)) { diff --git a/queue/net-mvneta-use-proper-rxq_number-in-loop-on-rx-queue.patch b/queue/net-mvneta-use-proper-rxq_number-in-loop-on-rx-queue.patch index e56ec7a..f6204a3 100644 --- a/queue/net-mvneta-use-proper-rxq_number-in-loop-on-rx-queue.patch +++ b/queue/net-mvneta-use-proper-rxq_number-in-loop-on-rx-queue.patch @@ -1,4 +1,4 @@ -From ca5902a6547f662419689ca28b3c29a772446caa Mon Sep 17 00:00:00 2001 +From 09c8e71d4d0353d9a76cf81d49386bc71a6c69bf Mon Sep 17 00:00:00 2001 From: Yelena Krivosheev <yelena@marvell.com> Date: Tue, 19 Dec 2017 17:59:46 +0100 Subject: [PATCH] net: mvneta: use proper rxq_number in loop on rx queues @@ -15,12 +15,13 @@ Signed-off-by: Yelena Krivosheev <yelena@marvell.com> Tested-by: Dmitri Epshtein <dima@marvell.com> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c -index 16b2bfb2cf51..1e0835655c93 100644 +index f0ee0b49fe71..c770c90059c1 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -3015,7 +3015,7 @@ static void mvneta_cleanup_rxqs(struct mvneta_port *pp) +@@ -3020,7 +3020,7 @@ static void mvneta_cleanup_rxqs(struct mvneta_port *pp) { int queue; diff --git a/queue/net-phy-at803x-Change-error-to-EINVAL-for-invalid-MA.patch b/queue/net-phy-at803x-Change-error-to-EINVAL-for-invalid-MA.patch index 2d4ef26..5cb02b5 100644 --- a/queue/net-phy-at803x-Change-error-to-EINVAL-for-invalid-MA.patch +++ b/queue/net-phy-at803x-Change-error-to-EINVAL-for-invalid-MA.patch @@ -1,4 +1,4 @@ -From fc7556877d1748ac00958822a0a3bba1d4bd9e0d Mon Sep 17 00:00:00 2001 +From 3b99f4dd79c91bffe1769c454a973c934b4d7cbe Mon Sep 17 00:00:00 2001 From: Dan Murphy <dmurphy@ti.com> Date: Tue, 10 Oct 2017 12:42:56 -0500 Subject: [PATCH] net: phy: at803x: Change error to EINVAL for invalid MAC @@ -10,6 +10,7 @@ address is not valid in the set_wol function. Signed-off-by: Dan Murphy <dmurphy@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c index c1e52b9dc58d..5f93e6add563 100644 diff --git a/queue/optee-fix-invalid-of_node_put-in-optee_driver_init.patch b/queue/optee-fix-invalid-of_node_put-in-optee_driver_init.patch index ba83ecb..6c51829 100644 --- a/queue/optee-fix-invalid-of_node_put-in-optee_driver_init.patch +++ b/queue/optee-fix-invalid-of_node_put-in-optee_driver_init.patch @@ -1,4 +1,4 @@ -From f044113113dd95ba73916bde10e804d3cdfa2662 Mon Sep 17 00:00:00 2001 +From 299d00f62e331bce238c1c001409a1f0d4ecf089 Mon Sep 17 00:00:00 2001 From: Jens Wiklander <jens.wiklander@linaro.org> Date: Mon, 9 Oct 2017 11:11:49 +0200 Subject: [PATCH] optee: fix invalid of_node_put() in optee_driver_init() @@ -14,12 +14,13 @@ So remove the invalid call to of_node_put(). Reported-by: Alex Shi <alex.shi@linaro.org> Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c -index 7952357df9c8..edb6e4e9ef3a 100644 +index 58169e519422..18c8c0a50d37 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c -@@ -590,7 +590,6 @@ static int __init optee_driver_init(void) +@@ -589,7 +589,6 @@ static int __init optee_driver_init(void) return -ENODEV; np = of_find_matching_node(fw_np, optee_match); diff --git a/queue/parisc-Align-os_hpmc_size-on-word-boundary.patch b/queue/parisc-Align-os_hpmc_size-on-word-boundary.patch index 4048dcd..c2ad002 100644 --- a/queue/parisc-Align-os_hpmc_size-on-word-boundary.patch +++ b/queue/parisc-Align-os_hpmc_size-on-word-boundary.patch @@ -1,4 +1,4 @@ -From 0ed9d3de5f8f97e6efd5ca0e3377cab5f0451ead Mon Sep 17 00:00:00 2001 +From 85f0eb42f207837fd7b4281a835e25bb289642db Mon Sep 17 00:00:00 2001 From: Helge Deller <deller@gmx.de> Date: Tue, 12 Dec 2017 21:25:41 +0100 Subject: [PATCH] parisc: Align os_hpmc_size on word boundary @@ -11,12 +11,13 @@ Fix it by aligning it properly. Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v4.14+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/parisc/kernel/hpmc.S b/arch/parisc/kernel/hpmc.S -index e3a8e5e4d5de..8d072c44f300 100644 +index 0fbd0a0e1cda..38d461aec46d 100644 --- a/arch/parisc/kernel/hpmc.S +++ b/arch/parisc/kernel/hpmc.S -@@ -305,6 +305,7 @@ ENDPROC_CFI(os_hpmc) +@@ -304,6 +304,7 @@ ENDPROC_CFI(os_hpmc) __INITRODATA diff --git a/queue/parisc-Hide-Diva-built-in-serial-aux-and-graphics-ca.patch b/queue/parisc-Hide-Diva-built-in-serial-aux-and-graphics-ca.patch index a529a62..ae1c351 100644 --- a/queue/parisc-Hide-Diva-built-in-serial-aux-and-graphics-ca.patch +++ b/queue/parisc-Hide-Diva-built-in-serial-aux-and-graphics-ca.patch @@ -1,4 +1,4 @@ -From bcf3f1752a622f1372d3252d0fea8855d89812e7 Mon Sep 17 00:00:00 2001 +From 753ee929139b84177f49e17bfc3e5190033c15fe Mon Sep 17 00:00:00 2001 From: Helge Deller <deller@gmx.de> Date: Tue, 12 Dec 2017 21:52:26 +0100 Subject: [PATCH] parisc: Hide Diva-built-in serial aux and graphics card @@ -12,12 +12,13 @@ So, prevent that Linux drivers try to enable those devices. Signed-off-by: Helge Deller <deller@gmx.de> Cc: <stable@vger.kernel.org> # v3.0+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/parisc/lba_pci.c b/drivers/parisc/lba_pci.c -index a25fed52f7e9..41b740aed3a3 100644 +index bc286cbbbc9b..1cced1d039d7 100644 --- a/drivers/parisc/lba_pci.c +++ b/drivers/parisc/lba_pci.c -@@ -1692,3 +1692,36 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask) +@@ -1656,3 +1656,36 @@ void lba_set_iregs(struct parisc_device *lba, u32 ibase, u32 imask) iounmap(base_addr); } diff --git a/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch b/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch index eca9ab3..a73342d 100644 --- a/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch +++ b/queue/pinctrl-cherryview-Mask-all-interrupts-on-Intel_Stra.patch @@ -1,4 +1,4 @@ -From b008d1e3f997e8b122544afe903daa005751ad8d Mon Sep 17 00:00:00 2001 +From 4c96aeeb428e81050aee7543b6bcf4d3bb1d080e Mon Sep 17 00:00:00 2001 From: Mika Westerberg <mika.westerberg@linux.intel.com> Date: Mon, 4 Dec 2017 12:11:02 +0300 Subject: [PATCH] pinctrl: cherryview: Mask all interrupts on Intel_Strago diff --git a/queue/platform-x86-asus-wireless-send-an-EV_SYN-SYN_REPORT.patch b/queue/platform-x86-asus-wireless-send-an-EV_SYN-SYN_REPORT.patch index 327c8b2..e176cb2 100644 --- a/queue/platform-x86-asus-wireless-send-an-EV_SYN-SYN_REPORT.patch +++ b/queue/platform-x86-asus-wireless-send-an-EV_SYN-SYN_REPORT.patch @@ -1,4 +1,4 @@ -From bff5bf9db1c9453ffd0a78abed3e2d040c092fd9 Mon Sep 17 00:00:00 2001 +From 59b08446a313fa5e7213d8a3a46ab5c62d1f22cd Mon Sep 17 00:00:00 2001 From: Peter Hutterer <peter.hutterer@who-t.net> Date: Mon, 4 Dec 2017 10:26:17 +1000 Subject: [PATCH] platform/x86: asus-wireless: send an EV_SYN/SYN_REPORT @@ -18,6 +18,7 @@ https://bugs.freedesktop.org/show_bug.cgi?id=104041 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Darren Hart (VMware) <dvhart@infradead.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/asus-wireless.c b/drivers/platform/x86/asus-wireless.c index f3796164329e..d4aeac3477f5 100644 diff --git a/queue/powerpc-perf-Dereference-BHRB-entries-safely.patch b/queue/powerpc-perf-Dereference-BHRB-entries-safely.patch index e71f8b7..54766a1 100644 --- a/queue/powerpc-perf-Dereference-BHRB-entries-safely.patch +++ b/queue/powerpc-perf-Dereference-BHRB-entries-safely.patch @@ -1,4 +1,4 @@ -From f41d84dddc66b164ac16acf3f584c276146f1c48 Mon Sep 17 00:00:00 2001 +From 4c9d88386c8d714e6231d1eb073a3912efea7ddd Mon Sep 17 00:00:00 2001 From: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Date: Tue, 12 Dec 2017 17:59:15 +0530 Subject: [PATCH] powerpc/perf: Dereference BHRB entries safely @@ -29,9 +29,10 @@ Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com> Reviewed-by: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com> [mpe: Use probe_kernel_read() which is clearer, tweak change log] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c -index 153812966365..fce545774d50 100644 +index 6c2d4168daec..a998352b4fbe 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -410,8 +410,12 @@ static __u64 power_pmu_bhrb_to(u64 addr) diff --git a/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch b/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch index 5061c75..c31f7b8 100644 --- a/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch +++ b/queue/powerpc-xmon-Avoid-tripping-SMP-hardlockup-watchdog.patch @@ -1,4 +1,4 @@ -From 064996d62a33ffe10264b5af5dca92d54f60f806 Mon Sep 17 00:00:00 2001 +From 9138ef40fc5b2bb44cefbbda94e28a439b39ad71 Mon Sep 17 00:00:00 2001 From: Nicholas Piggin <npiggin@gmail.com> Date: Fri, 29 Sep 2017 13:29:40 +1000 Subject: [PATCH] powerpc/xmon: Avoid tripping SMP hardlockup watchdog @@ -14,12 +14,13 @@ Also annotate these spin loops with spin_begin/end calls. Signed-off-by: Nicholas Piggin <npiggin@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c -index 33351c6704b1..d9a12102b111 100644 +index 8af45876b95c..69c4ea18202c 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c -@@ -530,14 +530,19 @@ static int xmon_core(struct pt_regs *regs, int fromipi) +@@ -524,14 +524,19 @@ static int xmon_core(struct pt_regs *regs, int fromipi) waiting: secondary = 1; @@ -41,7 +42,7 @@ index 33351c6704b1..d9a12102b111 100644 if (!secondary && !xmon_gate) { /* we are the first cpu to come in */ -@@ -568,21 +573,25 @@ static int xmon_core(struct pt_regs *regs, int fromipi) +@@ -562,21 +567,25 @@ static int xmon_core(struct pt_regs *regs, int fromipi) mb(); xmon_gate = 1; barrier(); diff --git a/queue/rtc-pl031-make-interrupt-optional.patch b/queue/rtc-pl031-make-interrupt-optional.patch index 449f501..2333ca1 100644 --- a/queue/rtc-pl031-make-interrupt-optional.patch +++ b/queue/rtc-pl031-make-interrupt-optional.patch @@ -1,4 +1,4 @@ -From fea924b4b89bef6bbbb03ee1310c68c48043ddc0 Mon Sep 17 00:00:00 2001 +From 15503d484f90535484ff57bd0eed5eb132f72bd4 Mon Sep 17 00:00:00 2001 From: Russell King <rmk+kernel@armlinux.org.uk> Date: Fri, 29 Sep 2017 11:22:15 +0100 Subject: [PATCH] rtc: pl031: make interrupt optional diff --git a/queue/rtc-set-the-alarm-to-the-next-expiring-timer.patch b/queue/rtc-set-the-alarm-to-the-next-expiring-timer.patch index 75727d9..6939a03 100644 --- a/queue/rtc-set-the-alarm-to-the-next-expiring-timer.patch +++ b/queue/rtc-set-the-alarm-to-the-next-expiring-timer.patch @@ -1,4 +1,4 @@ -From 74717b28cb32e1ad3c1042cafd76b264c8c0f68d Mon Sep 17 00:00:00 2001 +From 8acee3d5a14399ea243c4cecb5cfc4500b98b159 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni <alexandre.belloni@free-electrons.com> Date: Thu, 28 Sep 2017 13:53:27 +0200 Subject: [PATCH] rtc: set the alarm to the next expiring timer @@ -13,12 +13,13 @@ Ensure the RTC alarm is set in that case. Fixes: 2b2f5ff00f63 ("rtc: interface: ignore expired timers when enqueuing new timers") Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c -index 8cec9a02c0b8..9eb32ead63db 100644 +index fc0fa7577636..c76c7c1670a7 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c -@@ -779,7 +779,7 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) +@@ -772,7 +772,7 @@ static int rtc_timer_enqueue(struct rtc_device *rtc, struct rtc_timer *timer) } timerqueue_add(&rtc->timerqueue, &timer->node); diff --git a/queue/scsi-cxgb4i-fix-Tx-skb-leak.patch b/queue/scsi-cxgb4i-fix-Tx-skb-leak.patch index 130fe9d..bddb7e4 100644 --- a/queue/scsi-cxgb4i-fix-Tx-skb-leak.patch +++ b/queue/scsi-cxgb4i-fix-Tx-skb-leak.patch @@ -1,4 +1,4 @@ -From 9b3a081fb62158b50bcc90522ca2423017544367 Mon Sep 17 00:00:00 2001 +From 66a5b93803e32c4d8535caed1173c8a036c05182 Mon Sep 17 00:00:00 2001 From: Varun Prakash <varun@chelsio.com> Date: Wed, 11 Oct 2017 19:33:07 +0530 Subject: [PATCH] scsi: cxgb4i: fix Tx skb leak @@ -11,12 +11,13 @@ avoid skb leak. Signed-off-by: Varun Prakash <varun@chelsio.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c -index 1d02cf9fe06c..30d5f0ef29bb 100644 +index 0aae094ab91c..b619c9c433be 100644 --- a/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c +++ b/drivers/scsi/cxgbi/cxgb4i/cxgb4i.c -@@ -1575,6 +1575,7 @@ static void release_offload_resources(struct cxgbi_sock *csk) +@@ -1574,6 +1574,7 @@ static void release_offload_resources(struct cxgbi_sock *csk) csk, csk->state, csk->flags, csk->tid); cxgbi_sock_free_cpl_skbs(csk); diff --git a/queue/scsi-lpfc-Fix-secure-firmware-updates.patch b/queue/scsi-lpfc-Fix-secure-firmware-updates.patch index 3f0b048..d462d5e 100644 --- a/queue/scsi-lpfc-Fix-secure-firmware-updates.patch +++ b/queue/scsi-lpfc-Fix-secure-firmware-updates.patch @@ -1,4 +1,4 @@ -From 184fc2b9a8bcbda9c14d0a1e7fbecfc028c7702e Mon Sep 17 00:00:00 2001 +From 1e00774c231bfe5ee547c715b6ef3a1a0ab1bfd4 Mon Sep 17 00:00:00 2001 From: Dick Kennedy <dick.kennedy@broadcom.com> Date: Fri, 29 Sep 2017 17:34:42 -0700 Subject: [PATCH] scsi: lpfc: Fix secure firmware updates @@ -15,12 +15,13 @@ Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> Signed-off-by: James Smart <james.smart@broadcom.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h -index 1db0a38683f4..2b145966c73f 100644 +index e0a5fce416ae..4a03b8da7f46 100644 --- a/drivers/scsi/lpfc/lpfc_hw4.h +++ b/drivers/scsi/lpfc/lpfc_hw4.h -@@ -3636,7 +3636,7 @@ struct lpfc_mbx_get_port_name { +@@ -3607,7 +3607,7 @@ struct lpfc_mbx_get_port_name { #define MB_CEQ_STATUS_QUEUE_FLUSHING 0x4 #define MB_CQE_STATUS_DMA_FAILED 0x5 diff --git a/queue/scsi-lpfc-PLOGI-failures-during-NPIV-testing.patch b/queue/scsi-lpfc-PLOGI-failures-during-NPIV-testing.patch index 1fbd964..694ecef 100644 --- a/queue/scsi-lpfc-PLOGI-failures-during-NPIV-testing.patch +++ b/queue/scsi-lpfc-PLOGI-failures-during-NPIV-testing.patch @@ -1,4 +1,4 @@ -From e8bcf0ae4c0346fdc78ebefe0eefcaa6a6622d38 Mon Sep 17 00:00:00 2001 +From 16a158b533d14085294815faed218f3761f5827d Mon Sep 17 00:00:00 2001 From: Dick Kennedy <dick.kennedy@broadcom.com> Date: Fri, 29 Sep 2017 17:34:32 -0700 Subject: [PATCH] scsi: lpfc: PLOGI failures during NPIV testing @@ -16,12 +16,13 @@ Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com> Signed-off-by: James Smart <james.smart@broadcom.com> Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c -index 499df9d17339..d9a03beb76a4 100644 +index bcb36bedf710..d99c91d015cb 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c -@@ -4983,7 +4983,8 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) +@@ -4972,7 +4972,8 @@ lpfc_nlp_remove(struct lpfc_vport *vport, struct lpfc_nodelist *ndlp) lpfc_cancel_retry_delay_tmo(vport, ndlp); if ((ndlp->nlp_flag & NLP_DEFER_RM) && !(ndlp->nlp_flag & NLP_REG_LOGIN_SEND) && diff --git a/queue/scsi-mpt3sas-Fix-IO-error-occurs-on-pulling-out-a-dr.patch b/queue/scsi-mpt3sas-Fix-IO-error-occurs-on-pulling-out-a-dr.patch index 3bf188e..d466fe2 100644 --- a/queue/scsi-mpt3sas-Fix-IO-error-occurs-on-pulling-out-a-dr.patch +++ b/queue/scsi-mpt3sas-Fix-IO-error-occurs-on-pulling-out-a-dr.patch @@ -1,4 +1,4 @@ -From 2ce9a3645299ba1752873d333d73f67620f4550b Mon Sep 17 00:00:00 2001 +From 1f92ac8f14a9d8c07f8dd07ade5e43ddcf30bc19 Mon Sep 17 00:00:00 2001 From: Sreekanth Reddy <sreekanth.reddy@broadcom.com> Date: Tue, 10 Oct 2017 18:41:18 +0530 Subject: [PATCH] scsi: mpt3sas: Fix IO error occurs on pulling out a drive @@ -19,12 +19,13 @@ more time and hence I/Os were failing. Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@broadcom.com> Reviewed-by: Tomas Henzl <thenzl@redhat.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -index dd2d63b16c7c..814b974001f7 100644 +index a5d872664257..60e508e3f897 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c -@@ -4807,6 +4807,11 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) +@@ -4804,6 +4804,11 @@ _scsih_io_done(struct MPT3SAS_ADAPTER *ioc, u16 smid, u8 msix_index, u32 reply) } else if (log_info == VIRTUAL_IO_FAILED_RETRY) { scmd->result = DID_RESET << 16; break; diff --git a/queue/spi-a3700-Fix-clk-prescaling-for-coefficient-over-15.patch b/queue/spi-a3700-Fix-clk-prescaling-for-coefficient-over-15.patch index d72cb10..55080aa 100644 --- a/queue/spi-a3700-Fix-clk-prescaling-for-coefficient-over-15.patch +++ b/queue/spi-a3700-Fix-clk-prescaling-for-coefficient-over-15.patch @@ -1,4 +1,4 @@ -From 251c201bf4f8b5bf4f1ccb4f8920eed2e1f57580 Mon Sep 17 00:00:00 2001 +From 2bbfd7964c2890e386d453012a8afdbdacba7229 Mon Sep 17 00:00:00 2001 From: Maxime Chevallier <maxime.chevallier@smile.fr> Date: Mon, 27 Nov 2017 15:16:32 +0100 Subject: [PATCH] spi: a3700: Fix clk prescaling for coefficient over 15 @@ -18,9 +18,10 @@ This was tested on Espressobin with spidev and a locigal analyser. Signed-off-by: Maxime Chevallier <maxime.chevallier@smile.fr> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c -index 77fe55ce790c..d65345312527 100644 +index 53a04267eb38..3848bde779d3 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c @@ -79,6 +79,7 @@ @@ -31,7 +32,7 @@ index 77fe55ce790c..d65345312527 100644 #define A3700_SPI_WFIFO_THRS_BIT 28 #define A3700_SPI_RFIFO_THRS_BIT 24 -@@ -220,6 +221,13 @@ static void a3700_spi_clock_set(struct a3700_spi *a3700_spi, +@@ -228,6 +229,13 @@ static void a3700_spi_clock_set(struct a3700_spi *a3700_spi, prescale = DIV_ROUND_UP(clk_get_rate(a3700_spi->clk), speed_hz); diff --git a/queue/spi-xilinx-Detect-stall-with-Unknown-commands.patch b/queue/spi-xilinx-Detect-stall-with-Unknown-commands.patch index 0f8b594..b400900 100644 --- a/queue/spi-xilinx-Detect-stall-with-Unknown-commands.patch +++ b/queue/spi-xilinx-Detect-stall-with-Unknown-commands.patch @@ -1,4 +1,4 @@ -From 5a1314fa697fc65cefaba64cd4699bfc3e6882a6 Mon Sep 17 00:00:00 2001 +From b747f0acc65969b77c72c78bf0fd1892754b09db Mon Sep 17 00:00:00 2001 From: Ricardo Ribalda <ricardo.ribalda@gmail.com> Date: Tue, 21 Nov 2017 10:09:02 +0100 Subject: [PATCH] spi: xilinx: Detect stall with Unknown commands @@ -29,6 +29,7 @@ m25p80 spi0.0: s25sl064p (8192 Kbytes) Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com> Signed-off-by: Mark Brown <broonie@kernel.org> Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c index bc7100b93dfc..e0b9fe1d0e37 100644 diff --git a/queue/staging-greybus-light-Release-memory-obtained-by-kas.patch b/queue/staging-greybus-light-Release-memory-obtained-by-kas.patch index 289357b..bcf3504 100644 --- a/queue/staging-greybus-light-Release-memory-obtained-by-kas.patch +++ b/queue/staging-greybus-light-Release-memory-obtained-by-kas.patch @@ -1,4 +1,4 @@ -From 04820da21050b35eed68aa046115d810163ead0c Mon Sep 17 00:00:00 2001 +From 6c1615fb51080babc3938450546ef0fe3331922b Mon Sep 17 00:00:00 2001 From: Arvind Yadav <arvind.yadav.cs@gmail.com> Date: Sat, 23 Sep 2017 13:25:30 +0530 Subject: [PATCH] staging: greybus: light: Release memory obtained by kasprintf @@ -10,12 +10,13 @@ Free memory region, if gb_lights_channel_config is not successful. Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Reviewed-by: Rui Miguel Silva <rmfrfs@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/greybus/light.c b/drivers/staging/greybus/light.c -index 3f4148c92308..0f538b8c3a07 100644 +index 16813628eda1..b38742de1bb5 100644 --- a/drivers/staging/greybus/light.c +++ b/drivers/staging/greybus/light.c -@@ -925,6 +925,8 @@ static void __gb_lights_led_unregister(struct gb_channel *channel) +@@ -923,6 +923,8 @@ static void __gb_lights_led_unregister(struct gb_channel *channel) return; led_classdev_unregister(cdev); diff --git a/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch b/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch index 276c52f..772c9cb 100644 --- a/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch +++ b/queue/tcp-add-tcp_ooo_try_coalesce-helper.patch @@ -1,4 +1,4 @@ -From ce0196d3b4bd42efb71abe0f3d10cdb6386473ce Mon Sep 17 00:00:00 2001 +From 43f5f2c8d68d325c9c393c9f3026d28feb0dc655 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:21 -0700 Subject: [PATCH] tcp: add tcp_ooo_try_coalesce() helper @@ -21,7 +21,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index afbfa4d25138..2a791b9f4090 100644 +index ea5bc065e491..e1bb061c32a6 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4295,6 +4295,23 @@ static bool tcp_try_coalesce(struct sock *sk, diff --git a/queue/tcp-avoid-collapses-in-tcp_prune_queue-if-possible.patch b/queue/tcp-avoid-collapses-in-tcp_prune_queue-if-possible.patch index 9ecea52..6f799ec 100644 --- a/queue/tcp-avoid-collapses-in-tcp_prune_queue-if-possible.patch +++ b/queue/tcp-avoid-collapses-in-tcp_prune_queue-if-possible.patch @@ -1,4 +1,4 @@ -From f4a3313d8e2ca9fd8d8f45e40a2903ba782607e7 Mon Sep 17 00:00:00 2001 +From 41050cf95c621157734bf72422971b345d011d0c Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:18 -0700 Subject: [PATCH] tcp: avoid collapses in tcp_prune_queue() if possible @@ -25,12 +25,13 @@ Signed-off-by: Eric Dumazet <edumazet@google.com> Acked-by: Soheil Hassas Yeganeh <soheil@google.com> Acked-by: Yuchung Cheng <ycheng@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index 64e45b279431..53289911362a 100644 +index 06fcf7cd649b..a225ff357cf8 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c -@@ -5004,6 +5004,9 @@ static int tcp_prune_queue(struct sock *sk) +@@ -4948,6 +4948,9 @@ static int tcp_prune_queue(struct sock *sk) else if (tcp_under_memory_pressure(sk)) tp->rcv_ssthresh = min(tp->rcv_ssthresh, 4U * tp->advmss); diff --git a/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch b/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch index ab34cd4..2704350 100644 --- a/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch +++ b/queue/tcp-call-tcp_drop-from-tcp_data_queue_ofo.patch @@ -1,4 +1,4 @@ -From 0ccc0916d01b34f0d132feefa1269b16bc820e65 Mon Sep 17 00:00:00 2001 +From 4e3f0ec1fde0afd7ae13b2ef35107a3b401e7b47 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:20 -0700 Subject: [PATCH] tcp: call tcp_drop() from tcp_data_queue_ofo() @@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c -index a9a33c789b01..afbfa4d25138 100644 +index 1c927bd0c9c5..ea5bc065e491 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c @@ -4446,7 +4446,7 @@ static void tcp_data_queue_ofo(struct sock *sk, struct sk_buff *skb) diff --git a/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch b/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch index 7becb1f..ec827e6 100644 --- a/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch +++ b/queue/tcp-detect-malicious-patterns-in-tcp_collapse_ofo_qu.patch @@ -1,4 +1,4 @@ -From bc1a9e67c2490571b314248ed818ce68f5d9e14c Mon Sep 17 00:00:00 2001 +From 6ccfc6f5fbc277ad12c7e84181f463aa22e78a7c Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:19 -0700 Subject: [PATCH] tcp: detect malicious patterns in tcp_collapse_ofo_queue() diff --git a/queue/tcp-fix-under-evaluated-ssthresh-in-TCP-Vegas.patch b/queue/tcp-fix-under-evaluated-ssthresh-in-TCP-Vegas.patch index 92172bd..59b3cf8 100644 --- a/queue/tcp-fix-under-evaluated-ssthresh-in-TCP-Vegas.patch +++ b/queue/tcp-fix-under-evaluated-ssthresh-in-TCP-Vegas.patch @@ -1,4 +1,4 @@ -From cf5d74b85ef40c202c76d90959db4d850f301b95 Mon Sep 17 00:00:00 2001 +From 5bbc34ccb07592a610b6ee7e2cdf69b946e023f6 Mon Sep 17 00:00:00 2001 From: Hoang Tran <tranviethoang.vn@gmail.com> Date: Wed, 27 Sep 2017 18:30:58 +0200 Subject: [PATCH] tcp: fix under-evaluated ssthresh in TCP Vegas @@ -11,6 +11,7 @@ under-evaluate the ssthresh. Signed-off-by: Hoang Tran <hoang.tran@uclouvain.be> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv4/tcp_vegas.c b/net/ipv4/tcp_vegas.c index 218cfcc77650..ee113ff15fd0 100644 diff --git a/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch b/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch index c7d6657..bf7c98c 100644 --- a/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch +++ b/queue/tcp-free-batches-of-packets-in-tcp_prune_ofo_queue.patch @@ -1,4 +1,4 @@ -From f18e6b76e301c65eed1572ba19b827566bfe03a0 Mon Sep 17 00:00:00 2001 +From d73f3f37b77813f546e256245eac322af22c9492 Mon Sep 17 00:00:00 2001 From: Eric Dumazet <edumazet@google.com> Date: Mon, 23 Jul 2018 09:28:17 -0700 Subject: [PATCH] tcp: free batches of packets in tcp_prune_ofo_queue() diff --git a/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch b/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch index ac42012..c4b89e4 100644 --- a/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch +++ b/queue/thermal-drivers-hisi-Fix-kernel-panic-on-alarm-inter.patch @@ -1,4 +1,4 @@ -From c477bf6956a64e7987e051de4f16373aad937921 Mon Sep 17 00:00:00 2001 +From c9d47c76238b8c64240f95f48f316b89c5a11ad4 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Thu, 19 Oct 2017 19:05:45 +0200 Subject: [PATCH] thermal/drivers/hisi: Fix kernel panic on alarm interrupt diff --git a/queue/thermal-drivers-hisi-Fix-missing-interrupt-enablemen.patch b/queue/thermal-drivers-hisi-Fix-missing-interrupt-enablemen.patch index f8f2ddb..793baca 100644 --- a/queue/thermal-drivers-hisi-Fix-missing-interrupt-enablemen.patch +++ b/queue/thermal-drivers-hisi-Fix-missing-interrupt-enablemen.patch @@ -1,4 +1,4 @@ -From c176b10b025acee4dc8f2ab1cd64eb73b5ccef53 Mon Sep 17 00:00:00 2001 +From 6456c953779889b4feb07bff35a9c9712530ca2f Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Thu, 19 Oct 2017 19:05:43 +0200 Subject: [PATCH] thermal/drivers/hisi: Fix missing interrupt enablement @@ -21,9 +21,10 @@ Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> Reviewed-by: Leo Yan <leo.yan@linaro.org> Tested-by: Leo Yan <leo.yan@linaro.org> Signed-off-by: Eduardo Valentin <edubezval@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c -index bd3572c41585..8381696241d6 100644 +index f6429666a1cf..3fa13a71764b 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c @@ -345,8 +345,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) diff --git a/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch b/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch index c1d67b2..6c2ef3c 100644 --- a/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch +++ b/queue/thermal-drivers-hisi-Fix-multiple-alarm-interrupts-f.patch @@ -1,4 +1,4 @@ -From 6f4ef8c3dc0a983a638497bf7b749fc31e53de1a Mon Sep 17 00:00:00 2001 +From a0d7c8a6196f596ffa402911b579e63a0e1a5aa0 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Thu, 19 Oct 2017 19:05:47 +0200 Subject: [PATCH] thermal/drivers/hisi: Fix multiple alarm interrupts firing diff --git a/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch b/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch index a733867..90b0f0f 100644 --- a/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch +++ b/queue/thermal-drivers-hisi-Simplify-the-temperature-step-c.patch @@ -1,4 +1,4 @@ -From ee17e3d0d421fce87ed48e7001cb2c96cf5cfe60 Mon Sep 17 00:00:00 2001 +From 7bc38cec62671b9a12f14a5bfcfcbb6040ac1303 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano <daniel.lezcano@linaro.org> Date: Thu, 19 Oct 2017 19:05:46 +0200 Subject: [PATCH] thermal/drivers/hisi: Simplify the temperature/step diff --git a/queue/tracing-Exclude-generic-fields-from-histograms.patch b/queue/tracing-Exclude-generic-fields-from-histograms.patch index 33220d2..74fc6f8 100644 --- a/queue/tracing-Exclude-generic-fields-from-histograms.patch +++ b/queue/tracing-Exclude-generic-fields-from-histograms.patch @@ -1,4 +1,4 @@ -From a15f7fc20389a8827d5859907568b201234d4b79 Mon Sep 17 00:00:00 2001 +From 901a120809be29f5f8e8c2c0734f1a478332cae7 Mon Sep 17 00:00:00 2001 From: Tom Zanussi <tom.zanussi@linux.intel.com> Date: Fri, 22 Sep 2017 14:58:17 -0500 Subject: [PATCH] tracing: Exclude 'generic fields' from histograms @@ -16,9 +16,10 @@ Link: http://lkml.kernel.org/r/956154cbc3e8a4f0633d619b886c97f0f0edf7b4.15061050 Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c -index f123b5d0c226..121d56850f24 100644 +index 1c21d0e2a145..7eb975a2d0e1 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -450,7 +450,7 @@ static int create_val_field(struct hist_trigger_data *hist_data, diff --git a/queue/vfio-pci-Virtualize-Maximum-Payload-Size.patch b/queue/vfio-pci-Virtualize-Maximum-Payload-Size.patch index fa79f41..2fe91b8 100644 --- a/queue/vfio-pci-Virtualize-Maximum-Payload-Size.patch +++ b/queue/vfio-pci-Virtualize-Maximum-Payload-Size.patch @@ -1,4 +1,4 @@ -From 523184972b282cd9ca17a76f6ca4742394856818 Mon Sep 17 00:00:00 2001 +From 30babf3464c11a45073a0f297f21fdb9f66a2f2d Mon Sep 17 00:00:00 2001 From: Alex Williamson <alex.williamson@redhat.com> Date: Mon, 2 Oct 2017 12:39:09 -0600 Subject: [PATCH] vfio/pci: Virtualize Maximum Payload Size @@ -18,9 +18,10 @@ handle it. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/vfio/pci/vfio_pci_config.c b/drivers/vfio/pci/vfio_pci_config.c -index 5628fe114347..91335e6de88a 100644 +index 330a57024cbc..816a25cf86f3 100644 --- a/drivers/vfio/pci/vfio_pci_config.c +++ b/drivers/vfio/pci/vfio_pci_config.c @@ -849,11 +849,13 @@ static int __init init_pci_cap_exp_perm(struct perm_bits *perm) diff --git a/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch b/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch index 7ec2910..93a7f31 100644 --- a/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch +++ b/queue/x86-platform-UV-Convert-timers-to-use-timer_setup.patch @@ -1,4 +1,4 @@ -From 376f3bcebdc999cc737d9052109cc33b573b3a8b Mon Sep 17 00:00:00 2001 +From 60f9feecb017e708af34ec7b473c500b0e188333 Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook@chromium.org> Date: Mon, 16 Oct 2017 16:22:31 -0700 Subject: [PATCH] x86/platform/UV: Convert timers to use timer_setup() @@ -15,12 +15,13 @@ Cc: Dimitri Sivanich <sivanich@hpe.com> Cc: Russ Anderson <rja@hpe.com> Cc: Mike Travis <mike.travis@hpe.com> Link: https://lkml.kernel.org/r/20171016232231.GA100493@beast +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c -index 0d57bb9079c9..c0b694810ff4 100644 +index b487b3a01615..2f17c3919d0b 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c -@@ -920,9 +920,8 @@ static __init void uv_rtc_init(void) +@@ -932,9 +932,8 @@ static __init void uv_rtc_init(void) /* * percpu heartbeat timer */ @@ -31,7 +32,7 @@ index 0d57bb9079c9..c0b694810ff4 100644 unsigned char bits = uv_scir_info->state; /* Flip heartbeat bit: */ -@@ -947,7 +946,7 @@ static int uv_heartbeat_enable(unsigned int cpu) +@@ -959,7 +958,7 @@ static int uv_heartbeat_enable(unsigned int cpu) struct timer_list *timer = &uv_cpu_scir_info(cpu)->timer; uv_set_cpu_scir_bits(cpu, SCIR_CPU_HEARTBEAT|SCIR_CPU_ACTIVITY); |