diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-07-23 15:45:28 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-07-23 15:45:28 -0400 |
| commit | a46024562c7d2917558d44041dc911b2a050603b (patch) | |
| tree | 6a30a940ffe3aad137446575f76a3b55f344d34c | |
| parent | f17095ea4044d723aaecd6219207c51297d4b890 (diff) | |
| download | longterm-queue-4.8-a46024562c7d2917558d44041dc911b2a050603b.tar.gz | |
re-export to get SOB lines.
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
197 files changed, 738 insertions, 565 deletions
diff --git a/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch b/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch index 1d1aaf3..f6822d5 100644 --- a/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch +++ b/queue/ACPI-button-Change-default-behavior-to-lid_init_stat.patch @@ -1,4 +1,4 @@ -From 85ee890f9311ef647f60b9292398d3cbeab91b24 Mon Sep 17 00:00:00 2001 +From 9a19ece92934ea75926a26257917540556716f46 Mon Sep 17 00:00:00 2001 From: Lv Zheng <lv.zheng@intel.com> Date: Thu, 12 Jan 2017 15:47:34 +0800 Subject: [PATCH] ACPI / button: Change default behavior to lid_init_state=open diff --git a/queue/ACPI-save-NVS-memory-for-Lenovo-G50-45.patch b/queue/ACPI-save-NVS-memory-for-Lenovo-G50-45.patch index 1c83145..db8a80b 100644 --- a/queue/ACPI-save-NVS-memory-for-Lenovo-G50-45.patch +++ b/queue/ACPI-save-NVS-memory-for-Lenovo-G50-45.patch @@ -1,4 +1,4 @@ -From cbc00c1310d34139a63946482b40a6b261a03fb9 Mon Sep 17 00:00:00 2001 +From 4a59cde8cfcad02314cbfdd732f51e8737fcde60 Mon Sep 17 00:00:00 2001 From: Zhang Rui <rui.zhang@intel.com> Date: Mon, 16 Jan 2017 10:55:45 +0800 Subject: [PATCH] ACPI: save NVS memory for Lenovo G50-45 @@ -18,9 +18,10 @@ Tested-by: Przemek <soprwa@gmail.com> Signed-off-by: Zhang Rui <rui.zhang@intel.com> [ rjw: Drop unnecessary code ] 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/sleep.c b/drivers/acpi/sleep.c -index 54abb26b7366..a4327af676fe 100644 +index 7a2e4d45b266..5766ffc4625e 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -130,6 +130,12 @@ void __init acpi_nvs_nosave_s3(void) diff --git a/queue/ACPI-scan-Set-the-visited-flag-for-all-enumerated-de.patch b/queue/ACPI-scan-Set-the-visited-flag-for-all-enumerated-de.patch index 670f62a..c5675f8 100644 --- a/queue/ACPI-scan-Set-the-visited-flag-for-all-enumerated-de.patch +++ b/queue/ACPI-scan-Set-the-visited-flag-for-all-enumerated-de.patch @@ -1,4 +1,4 @@ -From f406270bf73d71ea7b35ee3f7a08a44f6594c9b1 Mon Sep 17 00:00:00 2001 +From b22eb6bbc4f8ec398131fee0c6cec2c5db4aab9b Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com> Date: Tue, 11 Apr 2017 00:23:42 +0200 Subject: [PATCH] ACPI / scan: Set the visited flag for all enumerated devices @@ -16,12 +16,13 @@ Reported-and-tested-by: Kevin Locke <kevin@kevinlocke.name> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com> Cc: 4.8+ <stable@vger.kernel.org> # 4.8+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 192691880d55..2433569b02ef 100644 +index e878fc799af7..791dbb87f9b6 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c -@@ -1857,15 +1857,20 @@ static void acpi_bus_attach(struct acpi_device *device) +@@ -1827,15 +1827,20 @@ static void acpi_bus_attach(struct acpi_device *device) return; device->flags.match_driver = true; diff --git a/queue/ALSA-usb-audio-Add-native-DSD-support-for-TEAC-501-5.patch b/queue/ALSA-usb-audio-Add-native-DSD-support-for-TEAC-501-5.patch index 7a7496b..008afdf 100644 --- a/queue/ALSA-usb-audio-Add-native-DSD-support-for-TEAC-501-5.patch +++ b/queue/ALSA-usb-audio-Add-native-DSD-support-for-TEAC-501-5.patch @@ -1,4 +1,4 @@ -From 7f38ca047b0cb54df7f6d9e4110e292e45dba6ad Mon Sep 17 00:00:00 2001 +From 897f036baf2ee8fbba12fb536ee167196a229133 Mon Sep 17 00:00:00 2001 From: Nobutaka Okabe <nob77413@gmail.com> Date: Tue, 13 Dec 2016 01:24:08 +0900 Subject: [PATCH] ALSA: usb-audio: Add native DSD support for TEAC 501/503 DAC @@ -17,12 +17,13 @@ This patch adds native DSD support for the following devices. Signed-off-by: Nobutaka Okabe <nob77413@gmail.com> 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 2782155ae3ce..b3fd2382fdd9 100644 +index 8323d60a0e14..e9ac342d95ff 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c -@@ -1165,6 +1165,18 @@ static bool is_marantz_denon_dac(unsigned int id) +@@ -1166,6 +1166,18 @@ static bool is_marantz_denon_dac(unsigned int id) return false; } @@ -41,7 +42,7 @@ index 2782155ae3ce..b3fd2382fdd9 100644 int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, struct audioformat *fmt) { -@@ -1192,6 +1204,26 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, +@@ -1193,6 +1205,26 @@ int snd_usb_select_mode_quirk(struct snd_usb_substream *subs, break; } mdelay(20); @@ -68,7 +69,7 @@ index 2782155ae3ce..b3fd2382fdd9 100644 } return 0; } -@@ -1337,5 +1369,11 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, +@@ -1332,5 +1364,11 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, return SNDRV_PCM_FMTBIT_DSD_U32_BE; } diff --git a/queue/ALSA-usb-audio-add-implicit-fb-quirk-for-Axe-Fx-II.patch b/queue/ALSA-usb-audio-add-implicit-fb-quirk-for-Axe-Fx-II.patch index 0ece5ed..5f4cb48 100644 --- a/queue/ALSA-usb-audio-add-implicit-fb-quirk-for-Axe-Fx-II.patch +++ b/queue/ALSA-usb-audio-add-implicit-fb-quirk-for-Axe-Fx-II.patch @@ -1,4 +1,4 @@ -From 17f08b0d9aafccdb10038ab6dbd9ddb6433c13e2 Mon Sep 17 00:00:00 2001 +From cb923783b79c88dd8c92295cde1c03a7cd2618fe Mon Sep 17 00:00:00 2001 From: Alberto Aguirre <albaguirre@gmail.com> Date: Thu, 8 Dec 2016 00:36:48 -0600 Subject: [PATCH] ALSA: usb-audio: add implicit fb quirk for Axe-Fx II @@ -11,9 +11,10 @@ endpoint is properly configured. Signed-off-by: Alberto Aguirre <albaguirre@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/usb/pcm.c b/sound/usb/pcm.c -index a522c9af1f34..34c6d4f2c0b6 100644 +index 48afae053c56..cf8459a6fad8 100644 --- a/sound/usb/pcm.c +++ b/sound/usb/pcm.c @@ -348,6 +348,16 @@ static int set_sync_ep_implicit_fb_quirk(struct snd_usb_substream *subs, diff --git a/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch b/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch index f7d797d..1f77006 100644 --- a/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch +++ b/queue/ARM-davinci-PM-support-da8xx-DT-platforms.patch @@ -1,4 +1,4 @@ -From 82382ed72411311f4d6d524d6d6bd784473aaae8 Mon Sep 17 00:00:00 2001 +From 582186a5e38f0f91770b672b5e9c1c21a0ff4690 Mon Sep 17 00:00:00 2001 From: Kevin Hilman <khilman@baylibre.com> Date: Tue, 15 Nov 2016 11:54:21 -0800 Subject: [PATCH] ARM: davinci: PM: support da8xx DT platforms diff --git a/queue/ARM-dts-STiH407-family-set-snps-dis_u3_susphy_quirk.patch b/queue/ARM-dts-STiH407-family-set-snps-dis_u3_susphy_quirk.patch index 1c2cae9..97e1fbd 100644 --- a/queue/ARM-dts-STiH407-family-set-snps-dis_u3_susphy_quirk.patch +++ b/queue/ARM-dts-STiH407-family-set-snps-dis_u3_susphy_quirk.patch @@ -1,4 +1,4 @@ -From 8413299cb3933dade6186bbee8363f190032107e Mon Sep 17 00:00:00 2001 +From f61febe4a20b3ba45f7cb69ed3b92f5cfdb7c2f6 Mon Sep 17 00:00:00 2001 From: Patrice Chotard <patrice.chotard@st.com> Date: Fri, 27 Jan 2017 15:45:11 +0100 Subject: [PATCH] ARM: dts: STiH407-family: set snps,dis_u3_susphy_quirk @@ -17,12 +17,13 @@ After analysis, xhci try to set link in U3 and returns an error. Using snps,dis_u3_susphy_quirk fix this issue. Signed-off-by: Patrice Chotard <patrice.chotard@st.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi -index c8b2944e304a..ace97e8576db 100644 +index 8b063ab10c19..1e1676bf06c0 100644 --- a/arch/arm/boot/dts/stih407-family.dtsi +++ b/arch/arm/boot/dts/stih407-family.dtsi -@@ -680,6 +680,7 @@ +@@ -661,6 +661,7 @@ phy-names = "usb2-phy", "usb3-phy"; phys = <&usb2_picophy0>, <&phy_port2 PHY_TYPE_USB3>; diff --git a/queue/ARM-smccc-Update-HVC-comment-to-describe-new-quirk-p.patch b/queue/ARM-smccc-Update-HVC-comment-to-describe-new-quirk-p.patch index 34476cf..8023ec1 100644 --- a/queue/ARM-smccc-Update-HVC-comment-to-describe-new-quirk-p.patch +++ b/queue/ARM-smccc-Update-HVC-comment-to-describe-new-quirk-p.patch @@ -1,4 +1,4 @@ -From 3046ec674d441562c6bb3e4284cd866743042ef3 Mon Sep 17 00:00:00 2001 +From 5f2196d52b174ca3934a2f1adfec11c68939be46 Mon Sep 17 00:00:00 2001 From: Will Deacon <will.deacon@arm.com> Date: Wed, 8 Feb 2017 14:54:12 +0000 Subject: [PATCH] ARM: smccc: Update HVC comment to describe new quirk @@ -12,6 +12,7 @@ updated the comment for the SMC version. This patch adds the new paramater to the comment describing the HVC version too. Signed-off-by: Will Deacon <will.deacon@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index b67934164401..4c5bca38c653 100644 diff --git a/queue/ASoC-Intel-Baytrail-add-quirk-for-Lenovo-Thinkpad-10.patch b/queue/ASoC-Intel-Baytrail-add-quirk-for-Lenovo-Thinkpad-10.patch index 3cc8246..d08d139 100644 --- a/queue/ASoC-Intel-Baytrail-add-quirk-for-Lenovo-Thinkpad-10.patch +++ b/queue/ASoC-Intel-Baytrail-add-quirk-for-Lenovo-Thinkpad-10.patch @@ -1,4 +1,4 @@ -From fd0138dc5d17c636477b371d99265c406437c583 Mon Sep 17 00:00:00 2001 +From bb6da395393c459b26b78ec0d754c37fd9934ab6 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Thu, 26 Jan 2017 14:09:35 -0600 Subject: [PATCH] ASoC: Intel: Baytrail: add quirk for Lenovo Thinkpad 10 @@ -10,12 +10,13 @@ quirk mechanism to use the cht_bsw_rt5672 machine driver Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/intel/atom/sst/sst_acpi.c b/sound/soc/intel/atom/sst/sst_acpi.c -index 4c0b89ec42e0..8cc30dfbf87d 100644 +index 4d3184971227..5471151d3121 100644 --- a/sound/soc/intel/atom/sst/sst_acpi.c +++ b/sound/soc/intel/atom/sst/sst_acpi.c -@@ -400,6 +400,7 @@ static int sst_acpi_remove(struct platform_device *pdev) +@@ -327,6 +327,7 @@ static int sst_acpi_remove(struct platform_device *pdev) static unsigned long cht_machine_id; #define CHT_SURFACE_MACH 1 @@ -23,7 +24,7 @@ index 4c0b89ec42e0..8cc30dfbf87d 100644 static int cht_surface_quirk_cb(const struct dmi_system_id *id) { -@@ -407,6 +408,23 @@ static int cht_surface_quirk_cb(const struct dmi_system_id *id) +@@ -334,6 +335,23 @@ static int cht_surface_quirk_cb(const struct dmi_system_id *id) return 1; } @@ -47,7 +48,7 @@ index 4c0b89ec42e0..8cc30dfbf87d 100644 static const struct dmi_system_id cht_table[] = { { -@@ -424,6 +442,10 @@ static struct sst_acpi_mach cht_surface_mach = { +@@ -350,6 +368,10 @@ static struct sst_acpi_mach cht_surface_mach = { "10EC5640", "cht-bsw-rt5645", "intel/fw_sst_22a8.bin", "cht-bsw", NULL, &chv_platform_data }; @@ -58,7 +59,7 @@ index 4c0b89ec42e0..8cc30dfbf87d 100644 static struct sst_acpi_mach *cht_quirk(void *arg) { struct sst_acpi_mach *mach = arg; -@@ -436,8 +458,21 @@ static struct sst_acpi_mach *cht_quirk(void *arg) +@@ -362,8 +384,21 @@ static struct sst_acpi_mach *cht_quirk(void *arg) return mach; } diff --git a/queue/ASoC-Intel-cht_bsw_rt5645-add-Baytrail-MCLK-support.patch b/queue/ASoC-Intel-cht_bsw_rt5645-add-Baytrail-MCLK-support.patch index 9392ac9..1d5c808 100644 --- a/queue/ASoC-Intel-cht_bsw_rt5645-add-Baytrail-MCLK-support.patch +++ b/queue/ASoC-Intel-cht_bsw_rt5645-add-Baytrail-MCLK-support.patch @@ -1,4 +1,4 @@ -From a50477e55fff69e1028f25624ee9fc9182d59b1f Mon Sep 17 00:00:00 2001 +From 1e54c7b4f3bfead6b10f8d1335f04c0e518b938c Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Thu, 26 Jan 2017 14:09:38 -0600 Subject: [PATCH] ASoC: Intel: cht_bsw_rt5645: add Baytrail MCLK support @@ -17,9 +17,10 @@ and RT5645 such as Asus X205TA Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c -index f504a0e18f91..468228b73b0b 100644 +index 5b3418af6a88..90525614c20a 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c @@ -24,6 +24,9 @@ @@ -146,7 +147,7 @@ index f504a0e18f91..468228b73b0b 100644 static int snd_cht_mc_probe(struct platform_device *pdev) { int ret_val = 0; -@@ -391,6 +439,16 @@ static int snd_cht_mc_probe(struct platform_device *pdev) +@@ -401,6 +449,16 @@ static int snd_cht_mc_probe(struct platform_device *pdev) cht_dailink[dai_index].codec_name = cht_rt5640_codec_name; } diff --git a/queue/ASoC-Intel-cht_bsw_rt5645-harden-ACPI-device-detecti.patch b/queue/ASoC-Intel-cht_bsw_rt5645-harden-ACPI-device-detecti.patch index 62028d3..f33895c 100644 --- a/queue/ASoC-Intel-cht_bsw_rt5645-harden-ACPI-device-detecti.patch +++ b/queue/ASoC-Intel-cht_bsw_rt5645-harden-ACPI-device-detecti.patch @@ -1,4 +1,4 @@ -From 42648c2270ca0c96935dfc5d0f5c4f8d2406cf75 Mon Sep 17 00:00:00 2001 +From 404f6a94e8473b35f7ee6b2d8f732e211355e53e Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Thu, 26 Jan 2017 14:09:41 -0600 Subject: [PATCH] ASoC: Intel: cht_bsw_rt5645: harden ACPI device detection @@ -12,12 +12,13 @@ configurations Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/intel/boards/cht_bsw_rt5645.c b/sound/soc/intel/boards/cht_bsw_rt5645.c -index 3684bdbd8598..3461e4a88ba8 100644 +index 16c94c45ce50..5b3418af6a88 100644 --- a/sound/soc/intel/boards/cht_bsw_rt5645.c +++ b/sound/soc/intel/boards/cht_bsw_rt5645.c -@@ -407,22 +407,32 @@ static int snd_cht_mc_probe(struct platform_device *pdev) +@@ -358,22 +358,32 @@ static int snd_cht_mc_probe(struct platform_device *pdev) struct sst_acpi_mach *mach; const char *i2c_name = NULL; int dai_index = 0; diff --git a/queue/ASoC-codecs-rt5670-add-quirk-for-Lenovo-Thinkpad-10.patch b/queue/ASoC-codecs-rt5670-add-quirk-for-Lenovo-Thinkpad-10.patch index 36ea24b..c4fb4c4 100644 --- a/queue/ASoC-codecs-rt5670-add-quirk-for-Lenovo-Thinkpad-10.patch +++ b/queue/ASoC-codecs-rt5670-add-quirk-for-Lenovo-Thinkpad-10.patch @@ -1,4 +1,4 @@ -From 93ffeaa8ee3f10a0628ad135b552a2497e0bef2c Mon Sep 17 00:00:00 2001 +From c0adcd005c5a4eaf285a02b045e1ed0ac37a5baa Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Date: Thu, 26 Jan 2017 14:09:34 -0600 Subject: [PATCH] ASoC: codecs: rt5670: add quirk for Lenovo Thinkpad 10 @@ -10,12 +10,13 @@ really a rt5670 Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c -index 97bafac3bc15..17d20b99f041 100644 +index 7b94b8d2d10f..473286c531df 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c -@@ -2814,6 +2814,7 @@ MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id); +@@ -2812,6 +2812,7 @@ MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id); static const struct acpi_device_id rt5670_acpi_match[] = { { "10EC5670", 0}, { "10EC5672", 0}, diff --git a/queue/ASoC-rt5670-Add-missing-10EC5072-ACPI-ID.patch b/queue/ASoC-rt5670-Add-missing-10EC5072-ACPI-ID.patch index 94b018a..9d81de5 100644 --- a/queue/ASoC-rt5670-Add-missing-10EC5072-ACPI-ID.patch +++ b/queue/ASoC-rt5670-Add-missing-10EC5072-ACPI-ID.patch @@ -1,4 +1,4 @@ -From d25280060835e1b2b84c242905da8334ab15c5b4 Mon Sep 17 00:00:00 2001 +From 09b014d178d78801fcd3f6acd2754b2e33b00863 Mon Sep 17 00:00:00 2001 From: Takashi Iwai <tiwai@suse.de> Date: Wed, 30 Nov 2016 14:55:29 +0100 Subject: [PATCH] ASoC: rt5670: Add missing 10EC5072 ACPI ID @@ -10,12 +10,13 @@ This was found on Dell Wyse 3040 box. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Mark Brown <broonie@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c -index d32ebe73c2c9..97bafac3bc15 100644 +index 8ef467f64f03..7b94b8d2d10f 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c -@@ -2813,6 +2813,7 @@ MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id); +@@ -2811,6 +2811,7 @@ MODULE_DEVICE_TABLE(i2c, rt5670_i2c_id); #ifdef CONFIG_ACPI static const struct acpi_device_id rt5670_acpi_match[] = { { "10EC5670", 0}, diff --git a/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch b/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch index 4b14188..37e0897 100644 --- a/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch +++ b/queue/ASoC-sun4i-i2s-Add-quirks-to-handle-a31-compatible.patch @@ -1,4 +1,4 @@ -From 351911b4e5df39a23095661654f44e9ad4625b9e Mon Sep 17 00:00:00 2001 +From d423a9b5f514ad4025c6dbc4862c63967b5e06e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Myl=C3=A8ne=20Josserand?= <mylene.josserand@free-electrons.com> Date: Thu, 2 Feb 2017 10:24:16 +0100 diff --git a/queue/Allow-stack-to-grow-up-to-address-space-limit.patch b/queue/Allow-stack-to-grow-up-to-address-space-limit.patch index 4e2fa29..aa15c26 100644 --- a/queue/Allow-stack-to-grow-up-to-address-space-limit.patch +++ b/queue/Allow-stack-to-grow-up-to-address-space-limit.patch @@ -1,4 +1,4 @@ -From bd726c90b6b8ce87602208701b208a208e6d5600 Mon Sep 17 00:00:00 2001 +From 40187a5ffff1a32889872b360660f277533b8cc9 Mon Sep 17 00:00:00 2001 From: Helge Deller <deller@gmx.de> Date: Mon, 19 Jun 2017 17:34:05 +0200 Subject: [PATCH] Allow stack to grow up to address space limit @@ -12,12 +12,13 @@ the address space limit given by TASK_SIZE. Signed-off-by: Helge Deller <deller@gmx.de> Acked-by: Hugh Dickins <hughd@google.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/mmap.c b/mm/mmap.c -index 290b77d9a01e..a5e3dcd75e79 100644 +index 5680e300e279..bd4483153911 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -2230,16 +2230,19 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) +@@ -2073,16 +2073,19 @@ int expand_upwards(struct vm_area_struct *vma, unsigned long address) if (!(vma->vm_flags & VM_GROWSUP)) return -EFAULT; diff --git a/queue/CIFS-store-results-of-cifs_reopen_file-to-avoid-infi.patch b/queue/CIFS-store-results-of-cifs_reopen_file-to-avoid-infi.patch index 97b75fc..4640642 100644 --- a/queue/CIFS-store-results-of-cifs_reopen_file-to-avoid-infi.patch +++ b/queue/CIFS-store-results-of-cifs_reopen_file-to-avoid-infi.patch @@ -1,4 +1,4 @@ -From 1fa839b4986d648b907d117275869a0e46c324b9 Mon Sep 17 00:00:00 2001 +From eae4f373b3685e8f7be5b4d5b5d5a355e4c2c20b Mon Sep 17 00:00:00 2001 From: Germano Percossi <germano.percossi@citrix.com> Date: Fri, 7 Apr 2017 12:29:38 +0100 Subject: [PATCH] CIFS: store results of cifs_reopen_file to avoid infinite @@ -27,12 +27,13 @@ Signed-off-by: Germano Percossi <germano.percossi@citrix.com> Reviewed-by: Pavel Shilovsky <pshilov@microsoft.com> CC: Stable <stable@vger.kernel.org> Signed-off-by: Steve French <smfrench@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/cifs/file.c b/fs/cifs/file.c -index aa3debbba826..21d404535739 100644 +index 605438afe7ef..3243348d1643 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c -@@ -2597,7 +2597,7 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, +@@ -2553,7 +2553,7 @@ cifs_write_from_iter(loff_t offset, size_t len, struct iov_iter *from, wdata->credits = credits; if (!wdata->cfile->invalidHandle || @@ -41,7 +42,7 @@ index aa3debbba826..21d404535739 100644 rc = server->ops->async_writev(wdata, cifs_uncached_writedata_release); if (rc) { -@@ -3022,7 +3022,7 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file, +@@ -2955,7 +2955,7 @@ cifs_send_async_read(loff_t offset, size_t len, struct cifsFileInfo *open_file, rdata->credits = credits; if (!rdata->cfile->invalidHandle || @@ -50,7 +51,7 @@ index aa3debbba826..21d404535739 100644 rc = server->ops->async_readv(rdata); error: if (rc) { -@@ -3617,7 +3617,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, +@@ -3530,7 +3530,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, } if (!rdata->cfile->invalidHandle || diff --git a/queue/Documentation-stable-kernel-rules-fix-stable-tag-for.patch b/queue/Documentation-stable-kernel-rules-fix-stable-tag-for.patch index 1c2e3b9..9fca81d 100644 --- a/queue/Documentation-stable-kernel-rules-fix-stable-tag-for.patch +++ b/queue/Documentation-stable-kernel-rules-fix-stable-tag-for.patch @@ -1,4 +1,4 @@ -From 35a2d95ce59ed6443c6359a6add3b5be894f5b15 Mon Sep 17 00:00:00 2001 +From 83540e1805fb1bb7fce14dd32e241b3e6a626bfd Mon Sep 17 00:00:00 2001 From: Johan Hovold <johan@kernel.org> Date: Mon, 3 Apr 2017 15:53:34 +0200 Subject: [PATCH] Documentation: stable-kernel-rules: fix stable-tag format diff --git a/queue/HID-i2c-hid-add-a-simple-quirk-to-fix-device-defects.patch b/queue/HID-i2c-hid-add-a-simple-quirk-to-fix-device-defects.patch index 28b0ffd..2936c88 100644 --- a/queue/HID-i2c-hid-add-a-simple-quirk-to-fix-device-defects.patch +++ b/queue/HID-i2c-hid-add-a-simple-quirk-to-fix-device-defects.patch @@ -1,4 +1,4 @@ -From 7e849b4cf416e8caf212f171a271a16ebd58c64b Mon Sep 17 00:00:00 2001 +From 2de55e45ebb8bfb3e4458b4a592f3ad4acdae191 Mon Sep 17 00:00:00 2001 From: HungNien Chen <hn.chen@weidahitech.com> Date: Thu, 10 Nov 2016 11:47:13 +0800 Subject: [PATCH] HID: i2c-hid: add a simple quirk to fix device defects diff --git a/queue/HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch b/queue/HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch index c90f5a8..f84e782 100644 --- a/queue/HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch +++ b/queue/HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch @@ -1,4 +1,4 @@ -From b490a8537df60d449199e162417da74ee9262515 Mon Sep 17 00:00:00 2001 +From 0ee7767d5be402635a4975b13a5331126912127f Mon Sep 17 00:00:00 2001 From: Yuta Kobayashi <alu.ula@outlook.com> Date: Fri, 12 Aug 2016 07:49:17 +0000 Subject: [PATCH] HID: microsoft: Add Surface 4 type cover pro 4 (JP) @@ -9,9 +9,10 @@ Adding support for the Microsoft Surface 4 Type Cover Pro (JP). Signed-off-by: Yuta Kobayashi <alu.ula@outlook.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index ed10d4f66ee3..45400de44f62 100644 +index 08f53c7fd513..de7bb35b6a97 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -727,6 +727,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) @@ -31,10 +32,10 @@ index ed10d4f66ee3..45400de44f62 100644 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index da1c58e6319f..3466f0d32e01 100644 +index 7e7205fdcfd4..f434f0b622b6 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -713,6 +713,7 @@ +@@ -722,6 +722,7 @@ #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 0x07dc #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd @@ -56,10 +57,10 @@ index e924d555536c..56c586fb8449 100644 .driver_data = MS_HIDINPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c -index b4b8c6abb03e..1fccffd8093e 100644 +index 182d3a2b6c7c..f8923e8ef354 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c -@@ -98,6 +98,7 @@ static const struct hid_blacklist { +@@ -103,6 +103,7 @@ static const struct hid_blacklist { { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, diff --git a/queue/HID-multitouch-do-not-retrieve-all-reports-for-all-d.patch b/queue/HID-multitouch-do-not-retrieve-all-reports-for-all-d.patch index 647f1a5..d03f76c 100644 --- a/queue/HID-multitouch-do-not-retrieve-all-reports-for-all-d.patch +++ b/queue/HID-multitouch-do-not-retrieve-all-reports-for-all-d.patch @@ -1,4 +1,4 @@ -From b897f6db3ae2cd9a42377f8b1865450f34ceff0e Mon Sep 17 00:00:00 2001 +From 43c232fb4aa97db4bcb734326fc9ef0cc9e4e547 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Fri, 25 Nov 2016 14:27:22 +0100 Subject: [PATCH] HID: multitouch: do not retrieve all reports for all devices @@ -17,6 +17,7 @@ feature report. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 84c56e645fe8..89e9032ab1e7 100644 diff --git a/queue/HID-multitouch-enable-the-Surface-3-Type-Cover-to-re.patch b/queue/HID-multitouch-enable-the-Surface-3-Type-Cover-to-re.patch index 3c6e8d2..b916dff 100644 --- a/queue/HID-multitouch-enable-the-Surface-3-Type-Cover-to-re.patch +++ b/queue/HID-multitouch-enable-the-Surface-3-Type-Cover-to-re.patch @@ -1,4 +1,4 @@ -From 8fe89ef076fa104f514da6ef61d90f5bf93488e3 Mon Sep 17 00:00:00 2001 +From e509613e011514fd2ae4206a49fac79d7ea0d11d Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Fri, 25 Nov 2016 14:27:23 +0100 Subject: [PATCH] HID: multitouch: enable the Surface 3 Type Cover to report @@ -16,9 +16,10 @@ also remove it from the list of ushbid quirks. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 2b89c701076f..a5dd7e63ada3 100644 +index de7bb35b6a97..8226ae04909a 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -728,7 +728,6 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type) @@ -38,10 +39,10 @@ index 2b89c701076f..a5dd7e63ada3 100644 { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_3KV1) }, diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 575aa65436d1..10d15359cbae 100644 +index f434f0b622b6..39303015f495 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -719,7 +719,6 @@ +@@ -723,7 +723,6 @@ #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 0x07e2 #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9 @@ -50,10 +51,10 @@ index 575aa65436d1..10d15359cbae 100644 #define USB_VENDOR_ID_MOJO 0x8282 diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c -index c6cd392e9f99..ba02667beb80 100644 +index 56c586fb8449..2ac376ecdd42 100644 --- a/drivers/hid/hid-microsoft.c +++ b/drivers/hid/hid-microsoft.c -@@ -282,8 +282,6 @@ static const struct hid_device_id ms_devices[] = { +@@ -290,8 +290,6 @@ static const struct hid_device_id ms_devices[] = { .driver_data = MS_HIDINPUT }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP), .driver_data = MS_HIDINPUT }, @@ -78,10 +79,10 @@ index fb6f1f447279..84c56e645fe8 100644 /* diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c -index e6cfd323babc..18ae71503309 100644 +index f8923e8ef354..201906ab9ae0 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c -@@ -102,7 +102,6 @@ static const struct hid_blacklist { +@@ -104,7 +104,6 @@ static const struct hid_blacklist { { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, { USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS }, diff --git a/queue/HID-sensor-hub-add-quirk-for-Microchip-MM7150.patch b/queue/HID-sensor-hub-add-quirk-for-Microchip-MM7150.patch index 8192fc5..2a8d3fc 100644 --- a/queue/HID-sensor-hub-add-quirk-for-Microchip-MM7150.patch +++ b/queue/HID-sensor-hub-add-quirk-for-Microchip-MM7150.patch @@ -1,4 +1,4 @@ -From 5cc5084dd9afa2f9bf953b0217bdb1b7c2158be1 Mon Sep 17 00:00:00 2001 +From 083e47567857ae0b7165a460a3588412223b03ae Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Fri, 25 Nov 2016 11:03:44 +0100 Subject: [PATCH] HID: sensor-hub: add quirk for Microchip MM7150 @@ -10,12 +10,13 @@ One more device requiring a quirk :/ Reported-by: Christian-Nils Boda <christian-nils.boda@gadz.org> Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c -index 0646278db7b3..5c925228847c 100644 +index 41e4b05a8c56..8b9ebe83e0cd 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c -@@ -798,6 +798,9 @@ static const struct hid_device_id sensor_hub_devices[] = { +@@ -783,6 +783,9 @@ static const struct hid_device_id sensor_hub_devices[] = { { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_MICROSOFT, 0x07bd), /* Microsoft Surface 3 */ .driver_data = HID_SENSOR_HUB_ENUM_QUIRK}, diff --git a/queue/HID-sensor-hub-add-quirk-for-Microsoft-Surface-3.patch b/queue/HID-sensor-hub-add-quirk-for-Microsoft-Surface-3.patch index e618b5d..9256d98 100644 --- a/queue/HID-sensor-hub-add-quirk-for-Microsoft-Surface-3.patch +++ b/queue/HID-sensor-hub-add-quirk-for-Microsoft-Surface-3.patch @@ -1,4 +1,4 @@ -From da809197a919942ab6ee0d008c20a011872181b1 Mon Sep 17 00:00:00 2001 +From d7336f18e2e7a6db6008dd5655829f4b50187301 Mon Sep 17 00:00:00 2001 From: Benjamin Tissoires <benjamin.tissoires@redhat.com> Date: Fri, 25 Nov 2016 11:03:43 +0100 Subject: [PATCH] HID: sensor-hub add quirk for Microsoft Surface 3 @@ -11,12 +11,13 @@ One more device requiring a quirk :/ Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Tested-by: Bastien Nocera <hadess@hadess.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-sensor-hub.c b/drivers/hid/hid-sensor-hub.c -index 60875625cbdf..0646278db7b3 100644 +index 3d5ba5b51af3..41e4b05a8c56 100644 --- a/drivers/hid/hid-sensor-hub.c +++ b/drivers/hid/hid-sensor-hub.c -@@ -795,6 +795,9 @@ static const struct hid_device_id sensor_hub_devices[] = { +@@ -780,6 +780,9 @@ static const struct hid_device_id sensor_hub_devices[] = { { HID_DEVICE(HID_BUS_ANY, HID_GROUP_SENSOR_HUB, USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_2), .driver_data = HID_SENSOR_HUB_ENUM_QUIRK}, diff --git a/queue/HID-usbhid-Add-quirk-for-Mayflash-Dragonrise-Dolphin.patch b/queue/HID-usbhid-Add-quirk-for-Mayflash-Dragonrise-Dolphin.patch index 7ca934c..69de01a 100644 --- a/queue/HID-usbhid-Add-quirk-for-Mayflash-Dragonrise-Dolphin.patch +++ b/queue/HID-usbhid-Add-quirk-for-Mayflash-Dragonrise-Dolphin.patch @@ -1,4 +1,4 @@ -From 8aa2cc7e747881d1fd52db28261b201d4e3e5565 Mon Sep 17 00:00:00 2001 +From 21d06bd44ea8493174c7a7ecfd02a1c768981983 Mon Sep 17 00:00:00 2001 From: Marcel Hasler <mahasler@gmail.com> Date: Tue, 20 Dec 2016 22:08:13 +0100 Subject: [PATCH] HID: usbhid: Add quirk for Mayflash/Dragonrise DolphinBar. @@ -12,12 +12,13 @@ quirk the adapter is falsely recognized as a tablet. See also bug 115841 Signed-off-by: Marcel Hasler <mahasler@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 62b03d53ecd1..54bd22dc1411 100644 +index b8197ecfcdbf..f24d96962f3b 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -319,6 +319,7 @@ +@@ -320,6 +320,7 @@ #define USB_VENDOR_ID_DRAGONRISE 0x0079 #define USB_DEVICE_ID_DRAGONRISE_WIIU 0x1800 #define USB_DEVICE_ID_DRAGONRISE_PS3 0x1801 @@ -26,7 +27,7 @@ index 62b03d53ecd1..54bd22dc1411 100644 #define USB_VENDOR_ID_DWAV 0x0eef diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c -index 6fd49788fbe6..e9d6cc7cdfc5 100644 +index 2677fd4d7d22..a4ccc07bbc1f 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -83,6 +83,7 @@ static const struct hid_blacklist { diff --git a/queue/HID-usbhid-Add-quirk-for-the-Futaba-TOSD-5711BB-VFD.patch b/queue/HID-usbhid-Add-quirk-for-the-Futaba-TOSD-5711BB-VFD.patch index 8f214ad..9ee806b 100644 --- a/queue/HID-usbhid-Add-quirk-for-the-Futaba-TOSD-5711BB-VFD.patch +++ b/queue/HID-usbhid-Add-quirk-for-the-Futaba-TOSD-5711BB-VFD.patch @@ -1,4 +1,4 @@ -From f83f90cf7ba68deb09406ea9da80852a64c4db29 Mon Sep 17 00:00:00 2001 +From 36133ed224d4f4c4aae692bf1cb1d2ae9f8165bd Mon Sep 17 00:00:00 2001 From: Alex Wood <thetewood@gmail.com> Date: Fri, 23 Dec 2016 12:50:13 +0000 Subject: [PATCH] HID: usbhid: Add quirk for the Futaba TOSD-5711BB VFD @@ -10,12 +10,13 @@ register the display in hid-ids and tell hid-quirks to not do the init. Signed-off-by: Alex Wood <thetewood@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index ec277b96eaa1..62b03d53ecd1 100644 +index 39303015f495..b8197ecfcdbf 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -365,6 +365,9 @@ +@@ -366,6 +366,9 @@ #define USB_VENDOR_ID_FLATFROG 0x25b5 #define USB_DEVICE_ID_MULTITOUCH_3200 0x0002 @@ -26,7 +27,7 @@ index ec277b96eaa1..62b03d53ecd1 100644 #define USB_DEVICE_ID_ESSENTIAL_REALITY_P5 0x0100 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c -index b3e01c82af05..6fd49788fbe6 100644 +index 201906ab9ae0..2677fd4d7d22 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c @@ -88,6 +88,7 @@ static const struct hid_blacklist { diff --git a/queue/HID-usbhid-Add-quirks-for-Mayflash-Dragonrise-GameCu.patch b/queue/HID-usbhid-Add-quirks-for-Mayflash-Dragonrise-GameCu.patch index 21ca840..577dcf5 100644 --- a/queue/HID-usbhid-Add-quirks-for-Mayflash-Dragonrise-GameCu.patch +++ b/queue/HID-usbhid-Add-quirks-for-Mayflash-Dragonrise-GameCu.patch @@ -1,4 +1,4 @@ -From b2554000f5b5d2a3a368d09c6debf7da64901fcf Mon Sep 17 00:00:00 2001 +From 57be2961ddc2f9bfa6f41e123b183fe5a43ee9ad Mon Sep 17 00:00:00 2001 From: Marcel Hasler <mahasler@gmail.com> Date: Thu, 3 Nov 2016 19:47:26 +0100 Subject: [PATCH] HID: usbhid: Add quirks for Mayflash/Dragonrise GameCube and @@ -14,12 +14,13 @@ quirk those adapters are falsely recognized as tablets. Fixes bug 115841 Signed-off-by: Marcel Hasler <mahasler@gmail.com> Reviewed-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index 6cfb5cacc253..642e64861654 100644 +index cdea2cb911b0..feb08fae0e54 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -314,8 +314,10 @@ +@@ -317,8 +317,10 @@ #define USB_VENDOR_ID_DMI 0x0c0b #define USB_DEVICE_ID_DMI_ENC 0x5fab @@ -33,10 +34,10 @@ index 6cfb5cacc253..642e64861654 100644 #define USB_VENDOR_ID_DWAV 0x0eef #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c -index 354d49ea36dd..05f6f61f0213 100644 +index 862d6800e751..182d3a2b6c7c 100644 --- a/drivers/hid/usbhid/hid-quirks.c +++ b/drivers/hid/usbhid/hid-quirks.c -@@ -81,6 +81,8 @@ static const struct hid_blacklist { +@@ -82,6 +82,8 @@ static const struct hid_blacklist { { USB_VENDOR_ID_CREATIVELABS, USB_DEVICE_ID_CREATIVE_SB_OMNI_SURROUND_51, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DMI, USB_DEVICE_ID_DMI_ENC, HID_QUIRK_NOGET }, { USB_VENDOR_ID_DRAGONRISE, USB_DEVICE_ID_DRAGONRISE_WIIU, HID_QUIRK_MULTI_INPUT }, diff --git a/queue/Input-gpio_keys-add-support-for-GPIO-descriptors.patch b/queue/Input-gpio_keys-add-support-for-GPIO-descriptors.patch index 10acd13..ea59bed 100644 --- a/queue/Input-gpio_keys-add-support-for-GPIO-descriptors.patch +++ b/queue/Input-gpio_keys-add-support-for-GPIO-descriptors.patch @@ -1,4 +1,4 @@ -From 5feeca3c1e39c01f9ef5abc94dea94021ccf94fc Mon Sep 17 00:00:00 2001 +From a4dadee754e7d0161ab02e51859a4e175ee524b8 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven <geert+renesas@glider.be> Date: Wed, 19 Oct 2016 15:47:21 -0700 Subject: [PATCH] Input: gpio_keys - add support for GPIO descriptors @@ -18,9 +18,10 @@ Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Linus Walleij <linus.walleij@linaro.org> Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c -index d75a25c187ae..0f04cb1569a0 100644 +index 29093657f2ef..9b8079ca0fb4 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -26,6 +26,7 @@ diff --git a/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch b/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch index 07f8365..892de74 100644 --- a/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch +++ b/queue/Input-xpad-add-support-for-Razer-Wildcat-gamepad.patch @@ -1,4 +1,4 @@ -From 055d801133a565546d458eaf7e8cd8241fd6b3c8 Mon Sep 17 00:00:00 2001 +From 64ad90044ebd280f627aaec24801e8b7de48003f Mon Sep 17 00:00:00 2001 From: Cameron Gutman <aicommander@gmail.com> Date: Mon, 10 Apr 2017 20:44:25 -0700 Subject: [PATCH] Input: xpad - add support for Razer Wildcat gamepad diff --git a/queue/MIPS-Add-MIPS_CPU_FTLB-for-Loongson-3A-R2.patch b/queue/MIPS-Add-MIPS_CPU_FTLB-for-Loongson-3A-R2.patch index e9dcea3..7fbe471 100644 --- a/queue/MIPS-Add-MIPS_CPU_FTLB-for-Loongson-3A-R2.patch +++ b/queue/MIPS-Add-MIPS_CPU_FTLB-for-Loongson-3A-R2.patch @@ -1,4 +1,4 @@ -From 033cffeedbd11c140952b98e8639bf652091a17d Mon Sep 17 00:00:00 2001 +From 17ae90d852c081fae4ce2926ac0f3bce88399442 Mon Sep 17 00:00:00 2001 From: Huacai Chen <chenhc@lemote.com> Date: Thu, 16 Mar 2017 21:00:25 +0800 Subject: [PATCH] MIPS: Add MIPS_CPU_FTLB for Loongson-3A R2 @@ -17,9 +17,10 @@ Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15752/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c -index 07718bb5fc9d..12422fd4af23 100644 +index dd3175442c9e..921211bcd2ba 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -1824,7 +1824,7 @@ static inline void cpu_probe_loongson(struct cpuinfo_mips *c, unsigned int cpu) diff --git a/queue/MIPS-Check-TLB-before-handle_ri_rdhwr-for-Loongson-3.patch b/queue/MIPS-Check-TLB-before-handle_ri_rdhwr-for-Loongson-3.patch index 9e2aea0..dc76137 100644 --- a/queue/MIPS-Check-TLB-before-handle_ri_rdhwr-for-Loongson-3.patch +++ b/queue/MIPS-Check-TLB-before-handle_ri_rdhwr-for-Loongson-3.patch @@ -1,4 +1,4 @@ -From 5a34133167dce36666ea054e30a561b7f4413b7f Mon Sep 17 00:00:00 2001 +From 306d2efb9583e05e05929d5bece817644a0a0ad7 Mon Sep 17 00:00:00 2001 From: Huacai Chen <chenhc@lemote.com> Date: Thu, 16 Mar 2017 21:00:26 +0800 Subject: [PATCH] MIPS: Check TLB before handle_ri_rdhwr() for Loongson-3 @@ -35,12 +35,13 @@ Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15753/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S -index 7ec9612cb007..2ac6c2625c13 100644 +index dc0b29612891..52a4fdfc8513 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S -@@ -519,7 +519,7 @@ NESTED(nmi_handler, PT_SIZE, sp) +@@ -448,7 +448,7 @@ NESTED(nmi_handler, PT_SIZE, sp) BUILD_HANDLER reserved reserved sti verbose /* others */ .align 5 @@ -49,7 +50,7 @@ index 7ec9612cb007..2ac6c2625c13 100644 .set push .set noat .set noreorder -@@ -538,7 +538,7 @@ NESTED(nmi_handler, PT_SIZE, sp) +@@ -467,7 +467,7 @@ NESTED(nmi_handler, PT_SIZE, sp) .set pop bltz k1, handle_ri /* slow path */ /* fall thru */ @@ -59,10 +60,10 @@ index 7ec9612cb007..2ac6c2625c13 100644 LEAF(handle_ri_rdhwr) .set push diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c -index c7d17cfb32f6..b49e7bf9f950 100644 +index 3de85be2486a..137ac7e93054 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c -@@ -83,7 +83,7 @@ extern asmlinkage void handle_dbe(void); +@@ -79,7 +79,7 @@ extern asmlinkage void handle_dbe(void); extern asmlinkage void handle_sys(void); extern asmlinkage void handle_bp(void); extern asmlinkage void handle_ri(void); @@ -71,7 +72,7 @@ index c7d17cfb32f6..b49e7bf9f950 100644 extern asmlinkage void handle_ri_rdhwr(void); extern asmlinkage void handle_cpu(void); extern asmlinkage void handle_ov(void); -@@ -2408,9 +2408,18 @@ void __init trap_init(void) +@@ -2296,9 +2296,18 @@ void __init trap_init(void) set_except_vector(EXCCODE_SYS, handle_sys); set_except_vector(EXCCODE_BP, handle_bp); diff --git a/queue/MIPS-End-spinlocks-with-.insn.patch b/queue/MIPS-End-spinlocks-with-.insn.patch index 961a8a0..7397d0e 100644 --- a/queue/MIPS-End-spinlocks-with-.insn.patch +++ b/queue/MIPS-End-spinlocks-with-.insn.patch @@ -1,4 +1,4 @@ -From 4b5347a24a0f2d3272032c120664b484478455de Mon Sep 17 00:00:00 2001 +From 48862bc999dddd435256d8699375c7c0c2adaa0b Mon Sep 17 00:00:00 2001 From: Paul Burton <paul.burton@imgtec.com> Date: Thu, 23 Feb 2017 14:50:24 +0000 Subject: [PATCH] MIPS: End spinlocks with .insn @@ -30,6 +30,7 @@ Cc: linux-kernel@vger.kernel.org Cc: <stable@vger.kernel.org> Patchwork: https://patchwork.linux-mips.org/patch/15325/ Signed-off-by: James Hogan <james.hogan@imgtec.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/include/asm/spinlock.h b/arch/mips/include/asm/spinlock.h index f485afe51514..a8df44d60607 100644 diff --git a/queue/MIPS-Flush-wrong-invalid-FTLB-entry-for-huge-page.patch b/queue/MIPS-Flush-wrong-invalid-FTLB-entry-for-huge-page.patch index 2620c27..fa585ba 100644 --- a/queue/MIPS-Flush-wrong-invalid-FTLB-entry-for-huge-page.patch +++ b/queue/MIPS-Flush-wrong-invalid-FTLB-entry-for-huge-page.patch @@ -1,4 +1,4 @@ -From 0115f6cbf26663c86496bc56eeea293f85b77897 Mon Sep 17 00:00:00 2001 +From 35aecc9d64cf3b7f6a7bed734f6103c5778cf286 Mon Sep 17 00:00:00 2001 From: Huacai Chen <chenhc@lemote.com> Date: Thu, 16 Mar 2017 21:00:27 +0800 Subject: [PATCH] MIPS: Flush wrong invalid FTLB entry for huge page @@ -31,12 +31,13 @@ Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15754/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c -index 9bfee8988eaf..4f642e07c2b1 100644 +index 55ce39606cb8..2da5649fc545 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -760,7 +760,8 @@ static void build_huge_update_entries(u32 **p, unsigned int pte, +@@ -762,7 +762,8 @@ static void build_huge_update_entries(u32 **p, unsigned int pte, static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r, struct uasm_label **l, unsigned int pte, @@ -46,7 +47,7 @@ index 9bfee8988eaf..4f642e07c2b1 100644 { #ifdef CONFIG_SMP UASM_i_SC(p, pte, 0, ptr); -@@ -769,6 +770,22 @@ static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r, +@@ -771,6 +772,22 @@ static void build_huge_handler_tail(u32 **p, struct uasm_reloc **r, #else UASM_i_SW(p, pte, 0, ptr); #endif @@ -69,7 +70,7 @@ index 9bfee8988eaf..4f642e07c2b1 100644 build_huge_update_entries(p, pte, ptr); build_huge_tlb_write_entry(p, l, r, pte, tlb_indexed, 0); } -@@ -2199,7 +2216,7 @@ static void build_r4000_tlb_load_handler(void) +@@ -2197,7 +2214,7 @@ static void build_r4000_tlb_load_handler(void) uasm_l_tlbl_goaround2(&l, p); } uasm_i_ori(&p, wr.r1, wr.r1, (_PAGE_ACCESSED | _PAGE_VALID)); @@ -78,7 +79,7 @@ index 9bfee8988eaf..4f642e07c2b1 100644 #endif uasm_l_nopage_tlbl(&l, p); -@@ -2254,7 +2271,7 @@ static void build_r4000_tlb_store_handler(void) +@@ -2252,7 +2269,7 @@ static void build_r4000_tlb_store_handler(void) build_tlb_probe_entry(&p); uasm_i_ori(&p, wr.r1, wr.r1, _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); @@ -87,7 +88,7 @@ index 9bfee8988eaf..4f642e07c2b1 100644 #endif uasm_l_nopage_tlbs(&l, p); -@@ -2310,7 +2327,7 @@ static void build_r4000_tlb_modify_handler(void) +@@ -2308,7 +2325,7 @@ static void build_r4000_tlb_modify_handler(void) build_tlb_probe_entry(&p); uasm_i_ori(&p, wr.r1, wr.r1, _PAGE_ACCESSED | _PAGE_MODIFIED | _PAGE_VALID | _PAGE_DIRTY); diff --git a/queue/MIPS-Force-o32-fp64-support-on-32bit-MIPS64r6-kernel.patch b/queue/MIPS-Force-o32-fp64-support-on-32bit-MIPS64r6-kernel.patch index 775e717..e46a2a3 100644 --- a/queue/MIPS-Force-o32-fp64-support-on-32bit-MIPS64r6-kernel.patch +++ b/queue/MIPS-Force-o32-fp64-support-on-32bit-MIPS64r6-kernel.patch @@ -1,4 +1,4 @@ -From 2e6c7747730296a6d4fd700894286db1132598c4 Mon Sep 17 00:00:00 2001 +From cccec28b1abb1974cf8d3db21d98ef562a305b04 Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Thu, 16 Feb 2017 12:39:01 +0000 Subject: [PATCH] MIPS: Force o32 fp64 support on 32bit MIPS64r6 kernels @@ -26,12 +26,13 @@ Cc: linux-mips@linux-mips.org Cc: <stable@vger.kernel.org> # 4.0.x- Patchwork: https://patchwork.linux-mips.org/patch/15310/ Signed-off-by: James Hogan <james.hogan@imgtec.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index a008a9f03072..e0bb576410bb 100644 +index 212ff92920d2..e6f5a4a1f021 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1531,7 +1531,7 @@ config CPU_MIPS64_R6 +@@ -1495,7 +1495,7 @@ config CPU_MIPS64_R6 select CPU_SUPPORTS_HIGHMEM select CPU_SUPPORTS_MSA select GENERIC_CSUM diff --git a/queue/MIPS-Introduce-irq_stack.patch b/queue/MIPS-Introduce-irq_stack.patch index 06a1738..60f5f3c 100644 --- a/queue/MIPS-Introduce-irq_stack.patch +++ b/queue/MIPS-Introduce-irq_stack.patch @@ -1,4 +1,4 @@ -From 37c3da995797ca5035fb063153228c88244cf1fd Mon Sep 17 00:00:00 2001 +From a16c4bd6090cfa4f2c04f9583756a9734620e1c4 Mon Sep 17 00:00:00 2001 From: Matt Redfearn <matt.redfearn@imgtec.com> Date: Mon, 19 Dec 2016 14:20:56 +0000 Subject: [PATCH] MIPS: Introduce irq_stack diff --git a/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch b/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch index 8b651ea..d24eec0 100644 --- a/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch +++ b/queue/MIPS-Lantiq-fix-missing-xbar-kernel-panic.patch @@ -1,4 +1,4 @@ -From a9c60674853ca9b58b06f62f60dffdec11ee2197 Mon Sep 17 00:00:00 2001 +From 154d7249a6ca1e2c4d3e86cac8950c6bcabbaa22 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens <hauke@hauke-m.de> Date: Wed, 15 Mar 2017 23:26:42 +0100 Subject: [PATCH] MIPS: Lantiq: fix missing xbar kernel panic diff --git a/queue/MIPS-Only-change-28-to-thread_info-if-coming-from-us.patch b/queue/MIPS-Only-change-28-to-thread_info-if-coming-from-us.patch index 6a17ec1..bee1e1a 100644 --- a/queue/MIPS-Only-change-28-to-thread_info-if-coming-from-us.patch +++ b/queue/MIPS-Only-change-28-to-thread_info-if-coming-from-us.patch @@ -1,4 +1,4 @@ -From 510d86362a27577f5ee23f46cfb354ad49731e61 Mon Sep 17 00:00:00 2001 +From 62418a5b5ca62429b4984bb9b7d6e865a676d4ae Mon Sep 17 00:00:00 2001 From: Matt Redfearn <matt.redfearn@imgtec.com> Date: Mon, 19 Dec 2016 14:20:58 +0000 Subject: [PATCH] MIPS: Only change $28 to thread_info if coming from user mode @@ -31,6 +31,7 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14742/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/include/asm/stackframe.h b/arch/mips/include/asm/stackframe.h index eebf39549606..2f182bdf024f 100644 diff --git a/queue/MIPS-Select-HAVE_IRQ_EXIT_ON_IRQ_STACK.patch b/queue/MIPS-Select-HAVE_IRQ_EXIT_ON_IRQ_STACK.patch index f727711..0b88113 100644 --- a/queue/MIPS-Select-HAVE_IRQ_EXIT_ON_IRQ_STACK.patch +++ b/queue/MIPS-Select-HAVE_IRQ_EXIT_ON_IRQ_STACK.patch @@ -1,4 +1,4 @@ -From 3cc3434fd6307d06b53b98ce83e76bf9807689b9 Mon Sep 17 00:00:00 2001 +From 0a18093d6aa2f90bf7ebee802a4fe4f6a954ae69 Mon Sep 17 00:00:00 2001 From: Matt Redfearn <matt.redfearn@imgtec.com> Date: Mon, 19 Dec 2016 14:21:00 +0000 Subject: [PATCH] MIPS: Select HAVE_IRQ_EXIT_ON_IRQ_STACK @@ -16,9 +16,10 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14744/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index b3c5bde43d34..80832aa8e4fb 100644 +index e6f5a4a1f021..3f3563f9da66 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -9,6 +9,7 @@ config MIPS diff --git a/queue/MIPS-Stack-unwinding-while-on-IRQ-stack.patch b/queue/MIPS-Stack-unwinding-while-on-IRQ-stack.patch index 02a110f..0e91a8d 100644 --- a/queue/MIPS-Stack-unwinding-while-on-IRQ-stack.patch +++ b/queue/MIPS-Stack-unwinding-while-on-IRQ-stack.patch @@ -1,4 +1,4 @@ -From d42d8d106b0275b027c1e8992c42aecf933436ea Mon Sep 17 00:00:00 2001 +From 84fa7ba01d8398d05717ddb4424c95d3faf621bb Mon Sep 17 00:00:00 2001 From: Matt Redfearn <matt.redfearn@imgtec.com> Date: Mon, 19 Dec 2016 14:20:57 +0000 Subject: [PATCH] MIPS: Stack unwinding while on IRQ stack @@ -24,9 +24,10 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14741/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c -index 5142b1dfe8a7..48e30e0469ef 100644 +index 8c4d547d79b8..73b777230302 100644 --- a/arch/mips/kernel/process.c +++ b/arch/mips/kernel/process.c @@ -33,6 +33,7 @@ @@ -37,7 +38,7 @@ index 5142b1dfe8a7..48e30e0469ef 100644 #include <asm/msa.h> #include <asm/pgtable.h> #include <asm/mipsregs.h> -@@ -511,7 +512,19 @@ EXPORT_SYMBOL(unwind_stack_by_address); +@@ -556,7 +557,19 @@ EXPORT_SYMBOL(unwind_stack_by_address); unsigned long unwind_stack(struct task_struct *task, unsigned long *sp, unsigned long pc, unsigned long *ra) { diff --git a/queue/MIPS-Switch-to-the-irq_stack-in-interrupts.patch b/queue/MIPS-Switch-to-the-irq_stack-in-interrupts.patch index f1e4660..562d839 100644 --- a/queue/MIPS-Switch-to-the-irq_stack-in-interrupts.patch +++ b/queue/MIPS-Switch-to-the-irq_stack-in-interrupts.patch @@ -1,4 +1,4 @@ -From dda45f701c9d7ad4ac0bb446e3a96f6df9a468d9 Mon Sep 17 00:00:00 2001 +From e625a4e855abd8fbf7ed6f97fa34c29acb8e10d5 Mon Sep 17 00:00:00 2001 From: Matt Redfearn <matt.redfearn@imgtec.com> Date: Mon, 19 Dec 2016 14:20:59 +0000 Subject: [PATCH] MIPS: Switch to the irq_stack in interrupts @@ -26,9 +26,10 @@ Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/14743/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S -index dc0b29612891..0a7ba4b2f687 100644 +index 52a4fdfc8513..3a98ef64fdf0 100644 --- a/arch/mips/kernel/genex.S +++ b/arch/mips/kernel/genex.S @@ -187,9 +187,44 @@ NESTED(handle_int, PT_SIZE, sp) diff --git a/queue/MIPS-c-r4k-Fix-Loongson-3-s-vcache-scache-waysize-ca.patch b/queue/MIPS-c-r4k-Fix-Loongson-3-s-vcache-scache-waysize-ca.patch index dbd4b0e..e85a3dc 100644 --- a/queue/MIPS-c-r4k-Fix-Loongson-3-s-vcache-scache-waysize-ca.patch +++ b/queue/MIPS-c-r4k-Fix-Loongson-3-s-vcache-scache-waysize-ca.patch @@ -1,4 +1,4 @@ -From 0be032c190abcdcfa948082b6a1e0d461184ba4d Mon Sep 17 00:00:00 2001 +From fa7f3c8ebf160bd8b0f84d8807366e3c50106836 Mon Sep 17 00:00:00 2001 From: Huacai Chen <chenhc@lemote.com> Date: Thu, 16 Mar 2017 21:00:29 +0800 Subject: [PATCH] MIPS: c-r4k: Fix Loongson-3's vcache/scache waysize @@ -19,12 +19,13 @@ Cc: linux-mips@linux-mips.org Cc: stable@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/15756/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c -index e7f798d55fbc..3fe99cb271a9 100644 +index fa7d8d3790bf..320f87e029d7 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c -@@ -1562,6 +1562,7 @@ static void probe_vcache(void) +@@ -1542,6 +1542,7 @@ static void probe_vcache(void) vcache_size = c->vcache.sets * c->vcache.ways * c->vcache.linesz; c->vcache.waybit = 0; @@ -32,7 +33,7 @@ index e7f798d55fbc..3fe99cb271a9 100644 pr_info("Unified victim cache %ldkB %s, linesize %d bytes.\n", vcache_size >> 10, way_string[c->vcache.ways], c->vcache.linesz); -@@ -1664,6 +1665,7 @@ static void __init loongson3_sc_init(void) +@@ -1644,6 +1645,7 @@ static void __init loongson3_sc_init(void) /* Loongson-3 has 4 cores, 1MB scache for each. scaches are shared */ scache_size *= 4; c->scache.waybit = 0; diff --git a/queue/MIPS-ralink-Fix-typos-in-rt3883-pinctrl.patch b/queue/MIPS-ralink-Fix-typos-in-rt3883-pinctrl.patch index e19d545..b0d0054 100644 --- a/queue/MIPS-ralink-Fix-typos-in-rt3883-pinctrl.patch +++ b/queue/MIPS-ralink-Fix-typos-in-rt3883-pinctrl.patch @@ -1,4 +1,4 @@ -From 7c5a3d813050ee235817b0220dd8c42359a9efd8 Mon Sep 17 00:00:00 2001 +From 987aa9c15fe8a25e08027575c6555f3374f6fbe4 Mon Sep 17 00:00:00 2001 From: John Crispin <john@phrozen.org> Date: Sat, 25 Feb 2017 11:54:23 +0100 Subject: [PATCH] MIPS: ralink: Fix typos in rt3883 pinctrl @@ -15,12 +15,13 @@ Cc: linux-mips@linux-mips.org Cc: <stable@vger.kernel.org> # 3.19.x- Patchwork: https://patchwork.linux-mips.org/patch/15328/ Signed-off-by: James Hogan <james.hogan@imgtec.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/mips/ralink/rt3883.c b/arch/mips/ralink/rt3883.c -index c4ffd43d3996..48ce701557a4 100644 +index 3e0aa09c6b55..9e4631acfcb5 100644 --- a/arch/mips/ralink/rt3883.c +++ b/arch/mips/ralink/rt3883.c -@@ -35,7 +35,7 @@ static struct rt2880_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) }; +@@ -36,7 +36,7 @@ static struct rt2880_pmx_func uartlite_func[] = { FUNC("uartlite", 0, 15, 2) }; static struct rt2880_pmx_func jtag_func[] = { FUNC("jtag", 0, 17, 5) }; static struct rt2880_pmx_func mdio_func[] = { FUNC("mdio", 0, 22, 2) }; static struct rt2880_pmx_func lna_a_func[] = { FUNC("lna a", 0, 32, 3) }; @@ -29,7 +30,7 @@ index c4ffd43d3996..48ce701557a4 100644 static struct rt2880_pmx_func pci_func[] = { FUNC("pci-dev", 0, 40, 32), FUNC("pci-host2", 1, 40, 32), -@@ -43,7 +43,7 @@ static struct rt2880_pmx_func pci_func[] = { +@@ -44,7 +44,7 @@ static struct rt2880_pmx_func pci_func[] = { FUNC("pci-fnc", 3, 40, 32) }; static struct rt2880_pmx_func ge1_func[] = { FUNC("ge1", 0, 72, 12) }; diff --git a/queue/PCI-Add-ACS-quirk-for-Intel-Union-Point.patch b/queue/PCI-Add-ACS-quirk-for-Intel-Union-Point.patch index 686204b..4c3caf7 100644 --- a/queue/PCI-Add-ACS-quirk-for-Intel-Union-Point.patch +++ b/queue/PCI-Add-ACS-quirk-for-Intel-Union-Point.patch @@ -1,4 +1,4 @@ -From 7184f5b451cf3dc61de79091d235b5d2bba2782d Mon Sep 17 00:00:00 2001 +From 8b4638e153e6aafc73d497869121961491a92a51 Mon Sep 17 00:00:00 2001 From: Alex Williamson <alex.williamson@redhat.com> Date: Thu, 19 Jan 2017 08:51:30 -0700 Subject: [PATCH] PCI: Add ACS quirk for Intel Union Point @@ -12,12 +12,13 @@ existing quirk. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 1800befa8b8b..a0b3cd5726dc 100644 +index 5e8abe005b29..12ab283cf7c9 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4150,15 +4150,35 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags) +@@ -4140,15 +4140,35 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags) * * N.B. This doesn't fix what lspci shows. * diff --git a/queue/PCI-Add-ACS-quirk-for-Qualcomm-QDF2400-and-QDF2432.patch b/queue/PCI-Add-ACS-quirk-for-Qualcomm-QDF2400-and-QDF2432.patch index 554ee56..77e7cbd 100644 --- a/queue/PCI-Add-ACS-quirk-for-Qualcomm-QDF2400-and-QDF2432.patch +++ b/queue/PCI-Add-ACS-quirk-for-Qualcomm-QDF2400-and-QDF2432.patch @@ -1,4 +1,4 @@ -From 33be632b8443b6ac74aa293504f430604fb9abeb Mon Sep 17 00:00:00 2001 +From c24c5c2495da5eacd5346fd508db86fdcedcb45d Mon Sep 17 00:00:00 2001 From: Sinan Kaya <okaya@codeaurora.org> Date: Thu, 16 Feb 2017 17:01:45 -0500 Subject: [PATCH] PCI: Add ACS quirk for Qualcomm QDF2400 and QDF2432 @@ -25,12 +25,13 @@ Add an ACS quirk for the QDF2400 and QDF2432 products. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> 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/quirks.c b/drivers/pci/quirks.c -index a0b3cd5726dc..29b75d7057c4 100644 +index dd9262e67209..c5f882bc68ea 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -4136,6 +4136,26 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags) +@@ -4150,6 +4150,26 @@ static int pci_quirk_intel_pch_acs(struct pci_dev *dev, u16 acs_flags) } /* @@ -57,7 +58,7 @@ index a0b3cd5726dc..29b75d7057c4 100644 * Sunrise Point PCH root ports implement ACS, but unfortunately as shown in * the datasheet (Intel 100 Series Chipset Family PCH Datasheet, Vol. 2, * 12.1.46, 12.1.47)[1] this chipset uses dwords for the ACS capability and -@@ -4291,6 +4311,9 @@ static const struct pci_dev_acs_enabled { +@@ -4305,6 +4325,9 @@ static const struct pci_dev_acs_enabled { /* I219 */ { PCI_VENDOR_ID_INTEL, 0x15b7, pci_quirk_mf_endpoint_acs }, { PCI_VENDOR_ID_INTEL, 0x15b8, pci_quirk_mf_endpoint_acs }, diff --git a/queue/PCI-Add-Broadcom-Northstar2-PAXC-quirk-for-device-cl.patch b/queue/PCI-Add-Broadcom-Northstar2-PAXC-quirk-for-device-cl.patch index e6de3bb..24f2ce6 100644 --- a/queue/PCI-Add-Broadcom-Northstar2-PAXC-quirk-for-device-cl.patch +++ b/queue/PCI-Add-Broadcom-Northstar2-PAXC-quirk-for-device-cl.patch @@ -1,4 +1,4 @@ -From ce709f86501a013e941e9986cb072eae375ddf3e Mon Sep 17 00:00:00 2001 +From 1930f53009502f2c61fd23ec75030e0706a36234 Mon Sep 17 00:00:00 2001 From: Jon Mason <jon.mason@broadcom.com> Date: Fri, 27 Jan 2017 16:44:09 -0500 Subject: [PATCH] PCI: Add Broadcom Northstar2 PAXC quirk for device class and @@ -14,12 +14,13 @@ are tied to zero (thus preventing them from being set). These cannot be Signed-off-by: Jon Mason <jon.mason@broadcom.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 1800befa8b8b..c5ef20a6c937 100644 +index 12ab283cf7c9..7b267ab79cdb 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -2239,6 +2239,27 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_BROADCOM, +@@ -2229,6 +2229,27 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5719, quirk_brcm_5719_limit_mrrs); diff --git a/queue/PCI-Disable-MSI-for-HiSilicon-Hip06-Hip07-Root-Ports.patch b/queue/PCI-Disable-MSI-for-HiSilicon-Hip06-Hip07-Root-Ports.patch index cfbb6ed..487f019 100644 --- a/queue/PCI-Disable-MSI-for-HiSilicon-Hip06-Hip07-Root-Ports.patch +++ b/queue/PCI-Disable-MSI-for-HiSilicon-Hip06-Hip07-Root-Ports.patch @@ -1,4 +1,4 @@ -From 72f2ff0deb870145a5a2d24cd75b4f9936159a62 Mon Sep 17 00:00:00 2001 +From de7805f34d749b4338ff67f96f37da16b7d116c3 Mon Sep 17 00:00:00 2001 From: Dongdong Liu <liudongdong3@huawei.com> Date: Fri, 3 Feb 2017 15:02:07 -0600 Subject: [PATCH] PCI: Disable MSI for HiSilicon Hip06/Hip07 Root Ports @@ -16,12 +16,13 @@ Signed-off-by: Dongdong Liu <liudongdong3@huawei.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Reviewed-by: Gabriele Paoloni <gabriele.paoloni@huawei.com> Reviewed-by: Zhou Wang <wangzhou1@hisilicon.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 1800befa8b8b..c49ac99bda4b 100644 +index 7b267ab79cdb..825d62a897f4 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -1634,6 +1634,7 @@ static void quirk_pcie_mch(struct pci_dev *pdev) +@@ -1623,6 +1623,7 @@ static void quirk_pcie_mch(struct pci_dev *pdev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7520_MCH, quirk_pcie_mch); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7320_MCH, quirk_pcie_mch); DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_E7525_MCH, quirk_pcie_mch); @@ -30,10 +31,10 @@ index 1800befa8b8b..c49ac99bda4b 100644 /* diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h -index 73dda0edcb97..a4f77feecbb0 100644 +index f020ab4079d3..3e5dbbe75f70 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -2516,6 +2516,8 @@ +@@ -2513,6 +2513,8 @@ #define PCI_DEVICE_ID_KORENIX_JETCARDF2 0x1700 #define PCI_DEVICE_ID_KORENIX_JETCARDF3 0x17ff diff --git a/queue/PCI-Expand-VPD-access-disabled-quirk-message.patch b/queue/PCI-Expand-VPD-access-disabled-quirk-message.patch index adcdf56..9e06f83 100644 --- a/queue/PCI-Expand-VPD-access-disabled-quirk-message.patch +++ b/queue/PCI-Expand-VPD-access-disabled-quirk-message.patch @@ -1,4 +1,4 @@ -From 044bc425bb72ffdecfb2a66d50cb1d024ecb96d0 Mon Sep 17 00:00:00 2001 +From b09f7a9eac0377254e39fae1dbda66ae02e1a55c Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Tue, 15 Nov 2016 08:01:17 -0600 Subject: [PATCH] PCI: Expand "VPD access disabled" quirk message @@ -13,12 +13,13 @@ in the dmesg log because there's no clue about what the firmware bug is. Expand the message to explain why we're disabling VPD. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index c232729f5b1b..7329796a896f 100644 +index 2a4b682cb861..5e8abe005b29 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -2156,7 +2156,7 @@ static void quirk_blacklist_vpd(struct pci_dev *dev) +@@ -2145,7 +2145,7 @@ static void quirk_blacklist_vpd(struct pci_dev *dev) { if (dev->vpd) { dev->vpd->len = 0; diff --git a/queue/PCI-Sort-the-list-of-devices-with-D3-delay-quirk-by-.patch b/queue/PCI-Sort-the-list-of-devices-with-D3-delay-quirk-by-.patch index c807909..6e56fdd 100644 --- a/queue/PCI-Sort-the-list-of-devices-with-D3-delay-quirk-by-.patch +++ b/queue/PCI-Sort-the-list-of-devices-with-D3-delay-quirk-by-.patch @@ -1,4 +1,4 @@ -From cd3e2eb8905d14fe28a2fc75362b8ecec16f0fb6 Mon Sep 17 00:00:00 2001 +From de0f47871e6b77bf1cde9ce0e1cee01c62b00154 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Tue, 14 Feb 2017 12:59:37 +0200 Subject: [PATCH] PCI: Sort the list of devices with D3 delay quirk by ID @@ -12,12 +12,13 @@ There is no functional change. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 1800befa8b8b..e2fd20d56add 100644 +index 825d62a897f4..dd9262e67209 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3113,30 +3113,32 @@ static void quirk_remove_d3_delay(struct pci_dev *dev) +@@ -3125,30 +3125,32 @@ static void quirk_remove_d3_delay(struct pci_dev *dev) { dev->d3_delay = 0; } diff --git a/queue/PCI-thunder-pem-Factor-out-resource-lookup.patch b/queue/PCI-thunder-pem-Factor-out-resource-lookup.patch index bf2bc30..f29f4d7 100644 --- a/queue/PCI-thunder-pem-Factor-out-resource-lookup.patch +++ b/queue/PCI-thunder-pem-Factor-out-resource-lookup.patch @@ -1,4 +1,4 @@ -From 0d414268fb8d0844030f87027e904f69d96706be Mon Sep 17 00:00:00 2001 +From 8f6a5d734bc0d925b1cfe31da8207a49cfca8298 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Wed, 30 Nov 2016 23:57:56 -0600 Subject: [PATCH] PCI: thunder-pem: Factor out resource lookup @@ -10,6 +10,7 @@ easily add a corresponding lookup using ACPI. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pci/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c index 6abaf80ffb39..c3276eede82a 100644 diff --git a/queue/Reset-TreeId-to-zero-on-SMB2-TREE_CONNECT.patch b/queue/Reset-TreeId-to-zero-on-SMB2-TREE_CONNECT.patch index 9783943..c6a351b 100644 --- a/queue/Reset-TreeId-to-zero-on-SMB2-TREE_CONNECT.patch +++ b/queue/Reset-TreeId-to-zero-on-SMB2-TREE_CONNECT.patch @@ -1,4 +1,4 @@ -From 806a28efe9b78ffae5e2757e1ee924b8e50c08ab Mon Sep 17 00:00:00 2001 +From 0d19a34183b662df9ae8b753638e670760dd6c64 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski <glogow@fbihome.de> Date: Mon, 20 Feb 2017 12:25:58 +0100 Subject: [PATCH] Reset TreeId to zero on SMB2 TREE_CONNECT @@ -16,12 +16,13 @@ Reviewed-by: Aurelien Aptel <aaptel@suse.com> Tested-by: Aurelien Aptel <aaptel@suse.com> Signed-off-by: Steve French <smfrench@gmail.com> CC: Stable <stable@vger.kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c -index 7446496850a3..66fa1b941cdf 100644 +index 32e0e06f972c..4c139f407e89 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c -@@ -1185,6 +1185,10 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, +@@ -949,6 +949,10 @@ SMB2_tcon(const unsigned int xid, struct cifs_ses *ses, const char *tree, return -EINVAL; } diff --git a/queue/arm-arm64-KVM-Take-mmap_sem-in-kvm_arch_prepare_memo.patch b/queue/arm-arm64-KVM-Take-mmap_sem-in-kvm_arch_prepare_memo.patch index 94cbfe5..e332142 100644 --- a/queue/arm-arm64-KVM-Take-mmap_sem-in-kvm_arch_prepare_memo.patch +++ b/queue/arm-arm64-KVM-Take-mmap_sem-in-kvm_arch_prepare_memo.patch @@ -1,4 +1,4 @@ -From 72f310481a08db821b614e7b5d00febcc9064b36 Mon Sep 17 00:00:00 2001 +From d1e61a353f9049a9192a1d08cdb18cedfc336783 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Thu, 16 Mar 2017 18:20:50 +0000 Subject: [PATCH] arm/arm64: KVM: Take mmap_sem in @@ -17,9 +17,10 @@ Reviewed-by: Christoffer Dall <cdall@linaro.org> [ Handle dirty page logging failure case ] Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c -index f2e2e0c6d6fd..13b9c1fa8961 100644 +index 7bc33138c746..b3063ee63593 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -1803,6 +1803,7 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, diff --git a/queue/arm-arm64-KVM-Take-mmap_sem-in-stage2_unmap_vm.patch b/queue/arm-arm64-KVM-Take-mmap_sem-in-stage2_unmap_vm.patch index 25642ac..e7f1990 100644 --- a/queue/arm-arm64-KVM-Take-mmap_sem-in-stage2_unmap_vm.patch +++ b/queue/arm-arm64-KVM-Take-mmap_sem-in-stage2_unmap_vm.patch @@ -1,4 +1,4 @@ -From 90f6e150e44a0dc3883110eeb3ab35d1be42b6bb Mon Sep 17 00:00:00 2001 +From 9af4e00b14a655c8693bd436b44aef4c02caeed5 Mon Sep 17 00:00:00 2001 From: Marc Zyngier <marc.zyngier@arm.com> Date: Thu, 16 Mar 2017 18:20:49 +0000 Subject: [PATCH] arm/arm64: KVM: Take mmap_sem in stage2_unmap_vm @@ -14,12 +14,13 @@ Cc: stable@vger.kernel.org # v3.19+ Reviewed-by: Christoffer Dall <cdall@linaro.org> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c -index 962616fd4ddd..f2e2e0c6d6fd 100644 +index e9a5c0e0c115..7bc33138c746 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c -@@ -803,6 +803,7 @@ void stage2_unmap_vm(struct kvm *kvm) +@@ -804,6 +804,7 @@ void stage2_unmap_vm(struct kvm *kvm) int idx; idx = srcu_read_lock(&kvm->srcu); @@ -27,7 +28,7 @@ index 962616fd4ddd..f2e2e0c6d6fd 100644 spin_lock(&kvm->mmu_lock); slots = kvm_memslots(kvm); -@@ -810,6 +811,7 @@ void stage2_unmap_vm(struct kvm *kvm) +@@ -811,6 +812,7 @@ void stage2_unmap_vm(struct kvm *kvm) stage2_unmap_memslot(kvm, memslot); spin_unlock(&kvm->mmu_lock); diff --git a/queue/arm-kernel-Add-SMC-structure-parameter.patch b/queue/arm-kernel-Add-SMC-structure-parameter.patch index 94351ff..2f793aa 100644 --- a/queue/arm-kernel-Add-SMC-structure-parameter.patch +++ b/queue/arm-kernel-Add-SMC-structure-parameter.patch @@ -1,4 +1,4 @@ -From 680a0873e193bae666439f4b5e32c758e68f114c Mon Sep 17 00:00:00 2001 +From c2b77e459a257940883f3b01f5ac127811cc5784 Mon Sep 17 00:00:00 2001 From: Andy Gross <andy.gross@linaro.org> Date: Wed, 1 Feb 2017 11:28:27 -0600 Subject: [PATCH] arm: kernel: Add SMC structure parameter @@ -16,6 +16,7 @@ This patch and partial implementation was suggested by Will Deacon. Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/kernel/armksyms.c b/arch/arm/kernel/armksyms.c index 7e45f69a0ddc..8e8d20cdbce7 100644 @@ -73,10 +74,10 @@ index 78f368039c79..e9c4dc9e0ada 100644 +EXPORT_SYMBOL(__arm_smccc_smc); +EXPORT_SYMBOL(__arm_smccc_hvc); diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c -index bc049afc73a7..b3bb7ef97bc8 100644 +index 05070b72fc28..ad0e126317ae 100644 --- a/arch/arm64/kernel/asm-offsets.c +++ b/arch/arm64/kernel/asm-offsets.c -@@ -143,8 +143,11 @@ int main(void) +@@ -139,8 +139,11 @@ int main(void) DEFINE(SLEEP_STACK_DATA_SYSTEM_REGS, offsetof(struct sleep_stack_data, system_regs)); DEFINE(SLEEP_STACK_DATA_CALLEE_REGS, offsetof(struct sleep_stack_data, callee_saved_regs)); #endif diff --git a/queue/arm64-PCI-Add-local-struct-device-pointers.patch b/queue/arm64-PCI-Add-local-struct-device-pointers.patch index 64013f5..49e6c0b 100644 --- a/queue/arm64-PCI-Add-local-struct-device-pointers.patch +++ b/queue/arm64-PCI-Add-local-struct-device-pointers.patch @@ -1,4 +1,4 @@ -From dfd1972c2b464c10fb585c4c60b594e09d181a01 Mon Sep 17 00:00:00 2001 +From e01597efd950d1fc481c44c89ebe04605d11147d Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Thu, 1 Dec 2016 11:33:57 -0600 Subject: [PATCH] arm64: PCI: Add local struct device pointers @@ -10,9 +10,10 @@ intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c -index acf38722457b..8183c9803206 100644 +index 95e0bb4fe97f..409abc45bdb6 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c @@ -121,6 +121,7 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge) diff --git a/queue/arm64-PCI-Manage-controller-specific-data-on-per-con.patch b/queue/arm64-PCI-Manage-controller-specific-data-on-per-con.patch index 03bf30c..3b790a1 100644 --- a/queue/arm64-PCI-Manage-controller-specific-data-on-per-con.patch +++ b/queue/arm64-PCI-Manage-controller-specific-data-on-per-con.patch @@ -1,4 +1,4 @@ -From 093d24a204425f71f4f106b7e62c8df4b456e1cc Mon Sep 17 00:00:00 2001 +From 3caa68bf813f8f20b4ecb9a4bffc01e9d4b3a930 Mon Sep 17 00:00:00 2001 From: Tomasz Nowicki <tn@semihalf.com> Date: Thu, 24 Nov 2016 12:05:23 +0100 Subject: [PATCH] arm64: PCI: Manage controller-specific data on per-controller @@ -25,12 +25,13 @@ No functional changes in this patch. Signed-off-by: Tomasz Nowicki <tn@semihalf.com> Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c -index 216dff6c5877..ac4509d2668a 100644 +index acf38722457b..95e0bb4fe97f 100644 --- a/arch/arm64/kernel/pci.c +++ b/arch/arm64/kernel/pci.c -@@ -168,33 +168,36 @@ static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci) +@@ -159,33 +159,36 @@ static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci) ri = container_of(ci, struct acpi_pci_generic_root_info, common); pci_ecam_free(ri->cfg); diff --git a/queue/arm64-mm-unaligned-access-by-user-land-should-be-rec.patch b/queue/arm64-mm-unaligned-access-by-user-land-should-be-rec.patch index 811c5e1..937dc40 100644 --- a/queue/arm64-mm-unaligned-access-by-user-land-should-be-rec.patch +++ b/queue/arm64-mm-unaligned-access-by-user-land-should-be-rec.patch @@ -1,4 +1,4 @@ -From 09a6adf53d42ca3088fa3fb41f40b768efc711ed Mon Sep 17 00:00:00 2001 +From 04f8cc954037d6574723b4035f101e6c57b63553 Mon Sep 17 00:00:00 2001 From: Victor Kamensky <kamensky@cisco.com> Date: Mon, 3 Apr 2017 22:51:01 -0700 Subject: [PATCH] arm64: mm: unaligned access by user-land should be received @@ -21,12 +21,13 @@ Cc: <stable@vger.kernel.org> Fixes: 52d7523 (arm64: mm: allow the kernel to handle alignment faults on user accesses) Signed-off-by: Victor Kamensky <kamensky@cisco.com> Signed-off-by: Will Deacon <will.deacon@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c -index 4bf899fb451b..1b35b8bddbfb 100644 +index 67506c3c5476..5a7c435cde3e 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c -@@ -42,7 +42,20 @@ +@@ -41,7 +41,20 @@ #include <asm/pgtable.h> #include <asm/tlbflush.h> @@ -48,7 +49,7 @@ index 4bf899fb451b..1b35b8bddbfb 100644 #ifdef CONFIG_KPROBES static inline int notify_page_fault(struct pt_regs *regs, unsigned int esr) -@@ -197,10 +210,12 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, +@@ -196,10 +209,12 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr, struct pt_regs *regs) { struct siginfo si; @@ -62,7 +63,7 @@ index 4bf899fb451b..1b35b8bddbfb 100644 addr, esr); show_pte(tsk->mm, addr); show_regs(regs); -@@ -219,14 +234,16 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re +@@ -218,14 +233,16 @@ static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *re { struct task_struct *tsk = current; struct mm_struct *mm = tsk->active_mm; @@ -82,7 +83,7 @@ index 4bf899fb451b..1b35b8bddbfb 100644 __do_kernel_fault(mm, addr, esr, regs); } -@@ -488,12 +505,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs) +@@ -482,12 +499,7 @@ static int do_bad(unsigned long addr, unsigned int esr, struct pt_regs *regs) return 1; } @@ -96,7 +97,7 @@ index 4bf899fb451b..1b35b8bddbfb 100644 { do_bad, SIGBUS, 0, "ttbr address size fault" }, { do_bad, SIGBUS, 0, "level 1 address size fault" }, { do_bad, SIGBUS, 0, "level 2 address size fault" }, -@@ -560,19 +572,13 @@ static const struct fault_info { +@@ -554,19 +566,13 @@ static const struct fault_info { { do_bad, SIGBUS, 0, "unknown 63" }, }; diff --git a/queue/ath9k-fix-NULL-pointer-dereference.patch b/queue/ath9k-fix-NULL-pointer-dereference.patch index c5b04c2..b30ab43 100644 --- a/queue/ath9k-fix-NULL-pointer-dereference.patch +++ b/queue/ath9k-fix-NULL-pointer-dereference.patch @@ -1,4 +1,4 @@ -From 40bea976c72b9ee60f8d097852deb53ccbeaffbe Mon Sep 17 00:00:00 2001 +From 1f235074bc4ace6e476aa5d6f889eadb95ed0903 Mon Sep 17 00:00:00 2001 From: Miaoqing Pan <miaoqing@codeaurora.org> Date: Wed, 16 Nov 2016 17:23:08 +0800 Subject: [PATCH] ath9k: fix NULL pointer dereference @@ -39,6 +39,7 @@ Reported-by: Devin Tuchsen <devin.tuchsen@gmail.com> Tested-by: Devin Tuchsen <devin.tuchsen@gmail.com> Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ath/ath9k/common-spectral.c b/drivers/net/wireless/ath/ath9k/common-spectral.c index e2512d5bc0e1..eedf86b67cf5 100644 diff --git a/queue/blk-mq-Avoid-memory-reclaim-when-remapping-queues.patch b/queue/blk-mq-Avoid-memory-reclaim-when-remapping-queues.patch index cd8c8b5..fcd4dd4 100644 --- a/queue/blk-mq-Avoid-memory-reclaim-when-remapping-queues.patch +++ b/queue/blk-mq-Avoid-memory-reclaim-when-remapping-queues.patch @@ -1,4 +1,4 @@ -From 36e1f3d107867b25c616c2fd294f5a1c9d4e5d09 Mon Sep 17 00:00:00 2001 +From a24f21ae9fc7728759d64368ca57d9b728f03060 Mon Sep 17 00:00:00 2001 From: Gabriel Krisman Bertazi <krisman@linux.vnet.ibm.com> Date: Tue, 6 Dec 2016 13:31:44 -0200 Subject: [PATCH] blk-mq: Avoid memory reclaim when remapping queues @@ -69,12 +69,13 @@ Cc: Douglas Miller <dougmill@linux.vnet.ibm.com> Cc: linux-block@vger.kernel.org Cc: linux-scsi@vger.kernel.org Signed-off-by: Jens Axboe <axboe@fb.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/block/blk-mq.c b/block/blk-mq.c -index d79fdc11b1ee..7ad7c11fe01d 100644 +index 2b1e6b815bee..7f871aa4f4a5 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c -@@ -1605,7 +1605,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, +@@ -1522,7 +1522,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, INIT_LIST_HEAD(&tags->page_list); tags->rqs = kzalloc_node(set->queue_depth * sizeof(struct request *), @@ -83,7 +84,7 @@ index d79fdc11b1ee..7ad7c11fe01d 100644 set->numa_node); if (!tags->rqs) { blk_mq_free_tags(tags); -@@ -1631,7 +1631,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, +@@ -1548,7 +1548,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, do { page = alloc_pages_node(set->numa_node, @@ -92,7 +93,7 @@ index d79fdc11b1ee..7ad7c11fe01d 100644 this_order); if (page) break; -@@ -1652,7 +1652,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, +@@ -1569,7 +1569,7 @@ static struct blk_mq_tags *blk_mq_init_rq_map(struct blk_mq_tag_set *set, * Allow kmemleak to scan these pages as they contain pointers * to additional allocations like via ops->init_request(). */ diff --git a/queue/brcmfmac-use-local-iftype-avoiding-use-after-free-of.patch b/queue/brcmfmac-use-local-iftype-avoiding-use-after-free-of.patch index 7096cac..050d498 100644 --- a/queue/brcmfmac-use-local-iftype-avoiding-use-after-free-of.patch +++ b/queue/brcmfmac-use-local-iftype-avoiding-use-after-free-of.patch @@ -1,4 +1,4 @@ -From d77facb88448cdeaaa3adba5b9704a48ac2ac8d6 Mon Sep 17 00:00:00 2001 +From 773d3de75a771e47240e429d039578fdaa513d10 Mon Sep 17 00:00:00 2001 From: Arend Van Spriel <arend.vanspriel@broadcom.com> Date: Tue, 28 Mar 2017 09:11:30 +0100 Subject: [PATCH] brcmfmac: use local iftype avoiding use-after-free of virtual @@ -19,6 +19,7 @@ Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> Reviewed-by: Franky Lin <franky.lin@broadcom.com> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c index de19c7c92bc6..85d949e03f79 100644 diff --git a/queue/can-ifi-use-correct-register-to-read-rx-status.patch b/queue/can-ifi-use-correct-register-to-read-rx-status.patch index eb1e882..ad867d9 100644 --- a/queue/can-ifi-use-correct-register-to-read-rx-status.patch +++ b/queue/can-ifi-use-correct-register-to-read-rx-status.patch @@ -1,4 +1,4 @@ -From 57c1d4c33e8f7ec90976d79127059c1919cc0651 Mon Sep 17 00:00:00 2001 +From d86034f1d0fab40c24804b57b570b7f6e168aa29 Mon Sep 17 00:00:00 2001 From: Markus Marb <markus@marb.org> Date: Fri, 17 Mar 2017 23:14:47 +0100 Subject: [PATCH] can: ifi: use correct register to read rx status @@ -10,9 +10,10 @@ The incorrect offset was used when trying to read the RXSTCMD register. Signed-off-by: Markus Marb <markus@marb.org> Cc: linux-stable <stable@vger.kernel.org> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/can/ifi_canfd/ifi_canfd.c b/drivers/net/can/ifi_canfd/ifi_canfd.c -index 138f5ae75c0b..4d1fe8d95042 100644 +index 368bb0710d8f..481895b2f9f4 100644 --- a/drivers/net/can/ifi_canfd/ifi_canfd.c +++ b/drivers/net/can/ifi_canfd/ifi_canfd.c @@ -557,7 +557,7 @@ static int ifi_canfd_poll(struct napi_struct *napi, int quota) diff --git a/queue/cfg80211-check-rdev-resume-callback-only-for-registe.patch b/queue/cfg80211-check-rdev-resume-callback-only-for-registe.patch index 30c1d1b..404e054 100644 --- a/queue/cfg80211-check-rdev-resume-callback-only-for-registe.patch +++ b/queue/cfg80211-check-rdev-resume-callback-only-for-registe.patch @@ -1,4 +1,4 @@ -From b3ef5520c1eabb56064474043c7c55a1a65b8708 Mon Sep 17 00:00:00 2001 +From 494d9b18582c35926d9173cae2e70853434d8741 Mon Sep 17 00:00:00 2001 From: Arend Van Spriel <arend.vanspriel@broadcom.com> Date: Tue, 28 Mar 2017 09:11:31 +0100 Subject: [PATCH] cfg80211: check rdev resume callback only for registered @@ -106,12 +106,13 @@ Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com> Reviewed-by: Franky Lin <franky.lin@broadcom.com> Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c -index 16b6b5988be9..570a2b67ca10 100644 +index e46469bc130f..0f51db4b2979 100644 --- a/net/wireless/sysfs.c +++ b/net/wireless/sysfs.c -@@ -132,12 +132,10 @@ static int wiphy_resume(struct device *dev) +@@ -127,12 +127,10 @@ static int wiphy_resume(struct device *dev) /* Age scan results with time spent in suspend */ cfg80211_bss_age(rdev, get_seconds() - rdev->suspend_at); diff --git a/queue/cgroup-kthread-close-race-window-where-new-kthreads-.patch b/queue/cgroup-kthread-close-race-window-where-new-kthreads-.patch index 6870f46..8b963ab 100644 --- a/queue/cgroup-kthread-close-race-window-where-new-kthreads-.patch +++ b/queue/cgroup-kthread-close-race-window-where-new-kthreads-.patch @@ -1,4 +1,4 @@ -From e320d538783ac616638a6fe7a80ae23cd4618939 Mon Sep 17 00:00:00 2001 +From c109ccb5dd7b7b4ed06d4522c0d62b7ae2182279 Mon Sep 17 00:00:00 2001 From: Tejun Heo <tj@kernel.org> Date: Thu, 16 Mar 2017 16:54:24 -0400 Subject: [PATCH] cgroup, kthread: close race window where new kthreads can be diff --git a/queue/char-lack-of-bool-string-made-CONFIG_DEVPORT-always-.patch b/queue/char-lack-of-bool-string-made-CONFIG_DEVPORT-always-.patch index 89b48fd..07ed1c1 100644 --- a/queue/char-lack-of-bool-string-made-CONFIG_DEVPORT-always-.patch +++ b/queue/char-lack-of-bool-string-made-CONFIG_DEVPORT-always-.patch @@ -1,4 +1,4 @@ -From f2cfa58b136e4b06a9b9db7af5ef62fbb5992f62 Mon Sep 17 00:00:00 2001 +From d6ed10f472fc84a797e5ee9d9acc3d2e4f14bf08 Mon Sep 17 00:00:00 2001 From: Max Bires <jbires@google.com> Date: Tue, 3 Jan 2017 08:18:07 -0800 Subject: [PATCH] char: lack of bool string made CONFIG_DEVPORT always on @@ -14,9 +14,10 @@ used. Adding a message here in order to make this user visible. Signed-off-by: Max Bires <jbires@google.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index fde005ef9d36..4ee2a10207d0 100644 +index dcc09739a54e..8453a49471d7 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -571,9 +571,12 @@ config TELCLOCK diff --git a/queue/clk-lpc32xx-add-a-quirk-for-PWM-and-MS-clock-divider.patch b/queue/clk-lpc32xx-add-a-quirk-for-PWM-and-MS-clock-divider.patch index 2a38a78..b003334 100644 --- a/queue/clk-lpc32xx-add-a-quirk-for-PWM-and-MS-clock-divider.patch +++ b/queue/clk-lpc32xx-add-a-quirk-for-PWM-and-MS-clock-divider.patch @@ -1,4 +1,4 @@ -From f84d42a9cffc4ecd96f1ce3a038f841782142eb2 Mon Sep 17 00:00:00 2001 +From 971461272ae911bb6732c7734f29919dcccf87df Mon Sep 17 00:00:00 2001 From: Vladimir Zapolskiy <vz@mleia.com> Date: Fri, 7 Oct 2016 04:16:55 +0300 Subject: [PATCH] clk: lpc32xx: add a quirk for PWM and MS clock dividers @@ -22,9 +22,10 @@ a gate clock will work as expected. Signed-off-by: Vladimir Zapolskiy <vz@mleia.com> Reviewed-by: Sylvain Lemieux <slemieux.tyco@gmail.com> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/clk/nxp/clk-lpc32xx.c b/drivers/clk/nxp/clk-lpc32xx.c -index 34c97353cdeb..5b98ff9076f3 100644 +index 90d740a2fc0d..86c00d99e231 100644 --- a/drivers/clk/nxp/clk-lpc32xx.c +++ b/drivers/clk/nxp/clk-lpc32xx.c @@ -1282,13 +1282,13 @@ static struct clk_hw_proto clk_hw_proto[LPC32XX_CLK_HW_MAX] = { @@ -74,7 +75,7 @@ index 34c97353cdeb..5b98ff9076f3 100644 static void __init lpc32xx_clk_init(struct device_node *np) { unsigned int i; -@@ -1517,6 +1530,17 @@ static void __init lpc32xx_clk_init(struct device_node *np) +@@ -1516,6 +1529,17 @@ static void __init lpc32xx_clk_init(struct device_node *np) return; } diff --git a/queue/clocksource-drivers-arm_arch_timer-Don-t-assume-cloc.patch b/queue/clocksource-drivers-arm_arch_timer-Don-t-assume-cloc.patch index 536a42d..e92dbcf 100644 --- a/queue/clocksource-drivers-arm_arch_timer-Don-t-assume-cloc.patch +++ b/queue/clocksource-drivers-arm_arch_timer-Don-t-assume-cloc.patch @@ -1,4 +1,4 @@ -From c072f3d7a7d9ba3e5a11f7571fe26417985d5f52 Mon Sep 17 00:00:00 2001 +From 4ab10417085fae142c7fa40f53de1475467abe53 Mon Sep 17 00:00:00 2001 From: Brian Norris <briannorris@chromium.org> Date: Tue, 4 Oct 2016 11:12:09 -0700 Subject: [PATCH] clocksource/drivers/arm_arch_timer: Don't assume clock runs diff --git a/queue/crypto-ahash-Fix-EINPROGRESS-notification-callback.patch b/queue/crypto-ahash-Fix-EINPROGRESS-notification-callback.patch index 9bc9732..6eb80e7 100644 --- a/queue/crypto-ahash-Fix-EINPROGRESS-notification-callback.patch +++ b/queue/crypto-ahash-Fix-EINPROGRESS-notification-callback.patch @@ -1,4 +1,4 @@ -From ef0579b64e93188710d48667cb5e014926af9f1b Mon Sep 17 00:00:00 2001 +From 0ddb6e98c3f64ab9030fa2ee112697ace5b3d41c Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@gondor.apana.org.au> Date: Mon, 10 Apr 2017 17:27:57 +0800 Subject: [PATCH] crypto: ahash - Fix EINPROGRESS notification callback @@ -27,12 +27,13 @@ Cc: <stable@vger.kernel.org> Reported-by: Sabrina Dubroca <sd@queasysnail.net> Tested-by: Sabrina Dubroca <sd@queasysnail.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/crypto/ahash.c b/crypto/ahash.c -index e58c4970c22b..826cd7ab4d4a 100644 +index 2ce8bcb9049c..cce0268a13fe 100644 --- a/crypto/ahash.c +++ b/crypto/ahash.c -@@ -32,6 +32,7 @@ struct ahash_request_priv { +@@ -31,6 +31,7 @@ struct ahash_request_priv { crypto_completion_t complete; void *data; u8 *result; @@ -40,7 +41,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 void *ubuf[] CRYPTO_MINALIGN_ATTR; }; -@@ -253,6 +254,8 @@ static int ahash_save_req(struct ahash_request *req, crypto_completion_t cplt) +@@ -252,6 +253,8 @@ static int ahash_save_req(struct ahash_request *req, crypto_completion_t cplt) priv->result = req->result; priv->complete = req->base.complete; priv->data = req->base.data; @@ -49,7 +50,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 /* * WARNING: We do not backup req->priv here! The req->priv * is for internal use of the Crypto API and the -@@ -267,38 +270,44 @@ static int ahash_save_req(struct ahash_request *req, crypto_completion_t cplt) +@@ -266,38 +269,44 @@ static int ahash_save_req(struct ahash_request *req, crypto_completion_t cplt) return 0; } @@ -105,7 +106,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 /* * Restore the original request, see ahash_op_unaligned() for what * goes where. -@@ -309,7 +318,7 @@ static void ahash_op_unaligned_done(struct crypto_async_request *req, int err) +@@ -308,7 +317,7 @@ static void ahash_op_unaligned_done(struct crypto_async_request *req, int err) */ /* First copy req->result into req->priv.result */ @@ -114,7 +115,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 /* Complete the ORIGINAL request. */ areq->base.complete(&areq->base, err); -@@ -325,7 +334,12 @@ static int ahash_op_unaligned(struct ahash_request *req, +@@ -324,7 +333,12 @@ static int ahash_op_unaligned(struct ahash_request *req, return err; err = op(req); @@ -128,7 +129,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 return err; } -@@ -360,25 +374,14 @@ int crypto_ahash_digest(struct ahash_request *req) +@@ -359,25 +373,14 @@ int crypto_ahash_digest(struct ahash_request *req) } EXPORT_SYMBOL_GPL(crypto_ahash_digest); @@ -157,7 +158,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 areq->base.complete(&areq->base, err); } -@@ -389,11 +392,15 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err) +@@ -388,11 +391,15 @@ static int ahash_def_finup_finish1(struct ahash_request *req, int err) goto out; req->base.complete = ahash_def_finup_done2; @@ -175,7 +176,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 return err; } -@@ -401,7 +408,16 @@ static void ahash_def_finup_done1(struct crypto_async_request *req, int err) +@@ -400,7 +407,16 @@ static void ahash_def_finup_done1(struct crypto_async_request *req, int err) { struct ahash_request *areq = req->data; @@ -192,7 +193,7 @@ index e58c4970c22b..826cd7ab4d4a 100644 areq->base.complete(&areq->base, err); } -@@ -416,6 +432,11 @@ static int ahash_def_finup(struct ahash_request *req) +@@ -415,6 +431,11 @@ static int ahash_def_finup(struct ahash_request *req) return err; err = tfm->update(req); diff --git a/queue/crypto-algif_aead-Fix-bogus-request-dereference-in-c.patch b/queue/crypto-algif_aead-Fix-bogus-request-dereference-in-c.patch index 90aab64..84bae06 100644 --- a/queue/crypto-algif_aead-Fix-bogus-request-dereference-in-c.patch +++ b/queue/crypto-algif_aead-Fix-bogus-request-dereference-in-c.patch @@ -1,4 +1,4 @@ -From 01351c96df302968b0bec55e6296137da0e5280e Mon Sep 17 00:00:00 2001 +From 9a5880049feeeec57dfa433a159124500261fe28 Mon Sep 17 00:00:00 2001 From: Herbert Xu <herbert@gondor.apana.org.au> Date: Mon, 10 Apr 2017 17:59:07 +0800 Subject: [PATCH] crypto: algif_aead - Fix bogus request dereference in diff --git a/queue/crypto-caam-fix-RNG-deinstantiation-error-checking.patch b/queue/crypto-caam-fix-RNG-deinstantiation-error-checking.patch index 656ca8e..e9d3937 100644 --- a/queue/crypto-caam-fix-RNG-deinstantiation-error-checking.patch +++ b/queue/crypto-caam-fix-RNG-deinstantiation-error-checking.patch @@ -1,4 +1,4 @@ -From 40c98cb57cdbc377456116ad4582c89e329721b0 Mon Sep 17 00:00:00 2001 +From 5a4499716192ffca226bd76acc3c8c0033a5200f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> Date: Wed, 5 Apr 2017 11:41:03 +0300 Subject: [PATCH] crypto: caam - fix RNG deinstantiation error checking @@ -20,9 +20,10 @@ Cc: <stable@vger.kernel.org> # 3.13+ Fixes: 1005bccd7a4a6 ("crypto: caam - enable instantiation of all RNG4 state handles") Signed-off-by: Horia Geantă <horia.geanta@nxp.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/caam/ctrl.c b/drivers/crypto/caam/ctrl.c -index 220f94bd1635..5d7f73d60515 100644 +index 2341f3799591..0c97f56f8854 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -281,7 +281,8 @@ static int deinstantiate_rng(struct device *ctrldev, int state_handle_mask) diff --git a/queue/crypto-caam-fix-invalid-dereference-in-caam_rsa_init.patch b/queue/crypto-caam-fix-invalid-dereference-in-caam_rsa_init.patch index ea23fed..e1ae134 100644 --- a/queue/crypto-caam-fix-invalid-dereference-in-caam_rsa_init.patch +++ b/queue/crypto-caam-fix-invalid-dereference-in-caam_rsa_init.patch @@ -1,4 +1,4 @@ -From 33fa46d7b310e06d2cb2ab5417c100af120bfb65 Mon Sep 17 00:00:00 2001 +From 21322e2a170de9bbbaea9c4014daef6aef906f9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Horia=20Geant=C4=83?= <horia.geanta@nxp.com> Date: Mon, 3 Apr 2017 18:30:07 +0300 Subject: [PATCH] crypto: caam - fix invalid dereference in caam_rsa_init_tfm() @@ -15,9 +15,10 @@ Cc: <stable@vger.kernel.org> # 4.8+ Fixes: 8c419778ab57e ("crypto: caam - add support for RSA algorithm") Signed-off-by: Horia Geantă <horia.geanta@nxp.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/caam/caampkc.c b/drivers/crypto/caam/caampkc.c -index 32100c4851dd..49cbdcba7883 100644 +index 851015e652b8..354a16ab5a16 100644 --- a/drivers/crypto/caam/caampkc.c +++ b/drivers/crypto/caam/caampkc.c @@ -506,7 +506,7 @@ static int caam_rsa_init_tfm(struct crypto_akcipher *tfm) diff --git a/queue/dm-raid-fix-NULL-pointer-dereference-for-raid1-witho.patch b/queue/dm-raid-fix-NULL-pointer-dereference-for-raid1-witho.patch index 09ad4d6..b3f893e 100644 --- a/queue/dm-raid-fix-NULL-pointer-dereference-for-raid1-witho.patch +++ b/queue/dm-raid-fix-NULL-pointer-dereference-for-raid1-witho.patch @@ -1,4 +1,4 @@ -From 7a0c5c5b834fb60764b494b0e39c239da3b0774b Mon Sep 17 00:00:00 2001 +From aaf31784ce3d8ca3e97a2b9acd85a5d9aa62aabd Mon Sep 17 00:00:00 2001 From: Dmitry Bilunov <kmeaw@yandex-team.ru> Date: Thu, 30 Mar 2017 18:14:26 +0300 Subject: [PATCH] dm raid: fix NULL pointer dereference for raid1 without @@ -75,12 +75,13 @@ Signed-off-by: Dmitry Bilunov <kmeaw@yandex-team.ru> Signed-off-by: Andrey Smetanin <asmetanin@yandex-team.ru> Acked-by: Heinz Mauelshagen <heinzm@redhat.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c -index f8564d63982f..1e217ba84d09 100644 +index 15daa36fcea6..ee75e3510be6 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c -@@ -3726,7 +3726,7 @@ static int raid_preresume(struct dm_target *ti) +@@ -3589,7 +3589,7 @@ static int raid_preresume(struct dm_target *ti) return r; /* Resize bitmap to adjust to changed region size (aka MD bitmap chunksize) */ diff --git a/queue/dm-verity-fec-fix-bufio-leaks.patch b/queue/dm-verity-fec-fix-bufio-leaks.patch index 915b012..bad6fb8 100644 --- a/queue/dm-verity-fec-fix-bufio-leaks.patch +++ b/queue/dm-verity-fec-fix-bufio-leaks.patch @@ -1,4 +1,4 @@ -From 86e3e83b443669dd2bcc5c8a83b23e3aa0694c0d Mon Sep 17 00:00:00 2001 +From 24def1a8de6f68c1fcff222032bee38983a79caf Mon Sep 17 00:00:00 2001 From: Sami Tolvanen <samitolvanen@google.com> Date: Fri, 31 Mar 2017 12:32:45 -0700 Subject: [PATCH] dm verity fec: fix bufio leaks @@ -11,6 +11,7 @@ Fixes: a739ff3f543a ("dm verity: add support for forward error correction") Cc: stable@vger.kernel.org # v4.5+ Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index c3cc04d89524..78f36012eaca 100644 diff --git a/queue/dm-verity-fec-limit-error-correction-recursion.patch b/queue/dm-verity-fec-limit-error-correction-recursion.patch index d2c094f..b4ff2ca 100644 --- a/queue/dm-verity-fec-limit-error-correction-recursion.patch +++ b/queue/dm-verity-fec-limit-error-correction-recursion.patch @@ -1,4 +1,4 @@ -From f1a880a93baaadb14c10a348fd199f1cdb6bcccd Mon Sep 17 00:00:00 2001 +From 6b239cab7a48cf6dfa82218f909a45d57a530f4e Mon Sep 17 00:00:00 2001 From: Sami Tolvanen <samitolvanen@google.com> Date: Wed, 15 Mar 2017 15:12:23 -0700 Subject: [PATCH] dm verity fec: limit error correction recursion @@ -14,6 +14,7 @@ Fixes: a739ff3f543a ("dm verity: add support for forward error correction") Signed-off-by: Sami Tolvanen <samitolvanen@google.com> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Cc: stable@vger.kernel.org # v4.5+ +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/md/dm-verity-fec.c b/drivers/md/dm-verity-fec.c index 0f0eb8a3d922..c3cc04d89524 100644 diff --git a/queue/dma-buf-add-support-for-compat-ioctl.patch b/queue/dma-buf-add-support-for-compat-ioctl.patch index ed01c35..4332013 100644 --- a/queue/dma-buf-add-support-for-compat-ioctl.patch +++ b/queue/dma-buf-add-support-for-compat-ioctl.patch @@ -1,4 +1,4 @@ -From 888022c0473d079bff9b47fb50434b1f20f8f37f Mon Sep 17 00:00:00 2001 +From 939d719586ef5dcbe438d87e3764345fabfb0341 Mon Sep 17 00:00:00 2001 From: Marek Szyprowski <m.szyprowski@samsung.com> Date: Tue, 21 Feb 2017 14:21:01 +0100 Subject: [PATCH] dma-buf: add support for compat ioctl @@ -18,12 +18,13 @@ Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Sumit Semwal <sumit.semwal@linaro.org> Link: http://patchwork.freedesktop.org/patch/msgid/1487683261-2655-1-git-send-email-m.szyprowski@samsung.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 718f832a5c71..0007b792827b 100644 +index ddaee60ae52a..2db86c64c3de 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c -@@ -325,6 +325,9 @@ static const struct file_operations dma_buf_fops = { +@@ -303,6 +303,9 @@ static const struct file_operations dma_buf_fops = { .llseek = dma_buf_llseek, .poll = dma_buf_poll, .unlocked_ioctl = dma_buf_ioctl, diff --git a/queue/drm-edid-constify-edid-quirk-list.patch b/queue/drm-edid-constify-edid-quirk-list.patch index cbc56f4..e643f97 100644 --- a/queue/drm-edid-constify-edid-quirk-list.patch +++ b/queue/drm-edid-constify-edid-quirk-list.patch @@ -1,4 +1,4 @@ -From 23c4cfbdab494568600ae6073a2bf02be4b10f4e Mon Sep 17 00:00:00 2001 +From 4af289f7b2e7200b5d760937594beafbb4455b74 Mon Sep 17 00:00:00 2001 From: Jani Nikula <jani.nikula@intel.com> Date: Wed, 28 Dec 2016 13:06:26 +0200 Subject: [PATCH] drm/edid: constify edid quirk list @@ -10,12 +10,13 @@ No reason not to be const. Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1482923186-22430-1-git-send-email-jani.nikula@intel.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c -index 67d6a73731d8..4ff04aa84dd0 100644 +index bab1a9405e02..52fee53a8dfa 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c -@@ -91,7 +91,7 @@ struct detailed_mode_closure { +@@ -90,7 +90,7 @@ struct detailed_mode_closure { #define LEVEL_GTF2 2 #define LEVEL_CVT 3 @@ -24,7 +25,7 @@ index 67d6a73731d8..4ff04aa84dd0 100644 char vendor[4]; int product_id; u32 quirks; -@@ -1478,7 +1478,7 @@ EXPORT_SYMBOL(drm_edid_duplicate); +@@ -1449,7 +1449,7 @@ EXPORT_SYMBOL(drm_edid_duplicate); * * Returns true if @vendor is in @edid, false otherwise */ @@ -33,7 +34,7 @@ index 67d6a73731d8..4ff04aa84dd0 100644 { char edid_vendor[3]; -@@ -1498,7 +1498,7 @@ static bool edid_vendor(struct edid *edid, char *vendor) +@@ -1469,7 +1469,7 @@ static bool edid_vendor(struct edid *edid, char *vendor) */ static u32 edid_get_quirks(struct edid *edid) { diff --git a/queue/drm-i915-Avoid-tweaking-evaluation-thresholds-on-Bay.patch b/queue/drm-i915-Avoid-tweaking-evaluation-thresholds-on-Bay.patch index b96e409..9f99161 100644 --- a/queue/drm-i915-Avoid-tweaking-evaluation-thresholds-on-Bay.patch +++ b/queue/drm-i915-Avoid-tweaking-evaluation-thresholds-on-Bay.patch @@ -1,4 +1,4 @@ -From 34dc8993eef63681b062871413a9484008a2a78f Mon Sep 17 00:00:00 2001 +From 01acf8fd6129cf5f15c7bf9159f1ebb71c4dd800 Mon Sep 17 00:00:00 2001 From: Mika Kuoppala <mika.kuoppala@linux.intel.com> Date: Wed, 15 Feb 2017 15:52:59 +0200 Subject: [PATCH] drm/i915: Avoid tweaking evaluation thresholds on Baytrail v3 @@ -63,12 +63,13 @@ Signed-off-by: Mika Kuoppala <mika.kuoppala@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1487166779-26945-1-git-send-email-mika.kuoppala@intel.com (cherry picked from commit 6067a27d1f0184596d51decbac1c1fdc4acb012f) 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/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c -index 249623d45be0..65cd4c56c9dd 100644 +index 076cfa546ac3..b168076fe0ee 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c -@@ -4891,6 +4891,12 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) +@@ -4924,6 +4924,12 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) break; } @@ -81,7 +82,7 @@ index 249623d45be0..65cd4c56c9dd 100644 I915_WRITE(GEN6_RP_UP_EI, GT_INTERVAL_FROM_US(dev_priv, ei_up)); I915_WRITE(GEN6_RP_UP_THRESHOLD, -@@ -4911,6 +4917,7 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) +@@ -4944,6 +4950,7 @@ static void gen6_set_rps_thresholds(struct drm_i915_private *dev_priv, u8 val) GEN6_RP_UP_BUSY_AVG | GEN6_RP_DOWN_IDLE_AVG); diff --git a/queue/drm-i915-Nuke-debug-messages-from-the-pipe-update-cr.patch b/queue/drm-i915-Nuke-debug-messages-from-the-pipe-update-cr.patch index 2b39a2e..b32f475 100644 --- a/queue/drm-i915-Nuke-debug-messages-from-the-pipe-update-cr.patch +++ b/queue/drm-i915-Nuke-debug-messages-from-the-pipe-update-cr.patch @@ -1,4 +1,4 @@ -From edd06b8353772dca7afcd4640dafa83b521edd55 Mon Sep 17 00:00:00 2001 +From c831c62e815e56ca3e2e052d4d422f3a4d685b91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> Date: Tue, 7 Mar 2017 22:54:19 +0200 Subject: [PATCH] drm/i915: Nuke debug messages from the pipe update critical @@ -27,12 +27,13 @@ Link: http://patchwork.freedesktop.org/patch/msgid/20170307205419.19447-1-ville. Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> (cherry picked from commit c3f8ad57a01a31397e5a0349a226a32f35ddc19c) 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/intel_display.c b/drivers/gpu/drm/i915/intel_display.c -index 9a8b6a13233d..b3e0cd133b49 100644 +index 9ecd8df5e68a..fcdadc43a560 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c -@@ -3669,10 +3669,6 @@ static void intel_update_pipe_config(struct intel_crtc *crtc, +@@ -3290,10 +3290,6 @@ static void intel_update_pipe_config(struct intel_crtc *crtc, /* drm_atomic_helper_update_legacy_modeset_state might not be called. */ crtc->base.mode = crtc->base.state->mode; @@ -43,7 +44,7 @@ index 9a8b6a13233d..b3e0cd133b49 100644 /* * Update pipe size and adjust fitter if needed: the reason for this is * that in compute_mode_changes we check the native mode (not the pfit -@@ -4796,23 +4792,17 @@ static void skylake_pfit_enable(struct intel_crtc *crtc) +@@ -4426,23 +4422,17 @@ static void skylake_pfit_enable(struct intel_crtc *crtc) struct intel_crtc_scaler_state *scaler_state = &crtc->config->scaler_state; diff --git a/queue/drm-i915-Remove-.is_mobile-field-from-platform-struc.patch b/queue/drm-i915-Remove-.is_mobile-field-from-platform-struc.patch index 070804d..179272b 100644 --- a/queue/drm-i915-Remove-.is_mobile-field-from-platform-struc.patch +++ b/queue/drm-i915-Remove-.is_mobile-field-from-platform-struc.patch @@ -1,4 +1,4 @@ -From 0d00dc39ab0d864a11dd74191ea78e31f8d61d4b Mon Sep 17 00:00:00 2001 +From b624cfa4ed4c54b10f54d9cee26a06b467ef0108 Mon Sep 17 00:00:00 2001 From: Carlos Santa <carlos.santa@intel.com> Date: Wed, 17 Aug 2016 12:30:37 -0700 Subject: [PATCH] drm/i915: Remove .is_mobile field from platform struct @@ -13,6 +13,7 @@ as it is still needed for ilk-ivb. Signed-off-by: Carlos Santa <carlos.santa@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c index 8b8852bc2f4a..f306698a4cb4 100644 diff --git a/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch b/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch index 9f8c804..4702fa6 100644 --- a/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch +++ b/queue/drm-i915-Stop-using-RP_DOWN_EI-on-Baytrail.patch @@ -1,4 +1,4 @@ -From 686403c22d88722c3563caab43a89dbc9a12d677 Mon Sep 17 00:00:00 2001 +From e334044be8157785f15c5a6534f84d04ed2adbf5 Mon Sep 17 00:00:00 2001 From: Chris Wilson <chris@chris-wilson.co.uk> Date: Mon, 13 Mar 2017 17:06:17 +0000 Subject: [PATCH] drm/i915: Stop using RP_DOWN_EI on Baytrail diff --git a/queue/drm-i915-actually-drive-the-BDW-reserved-IDs.patch b/queue/drm-i915-actually-drive-the-BDW-reserved-IDs.patch index a7b1096..f1c315c 100644 --- a/queue/drm-i915-actually-drive-the-BDW-reserved-IDs.patch +++ b/queue/drm-i915-actually-drive-the-BDW-reserved-IDs.patch @@ -1,4 +1,4 @@ -From 98b2f01c8dfc8922a2af1fe82a1c40cac4911634 Mon Sep 17 00:00:00 2001 +From 180e0a795204673454e4810ad905355de2f5bf79 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni <paulo.r.zanoni@intel.com> Date: Tue, 3 Jan 2017 18:04:20 -0200 Subject: [PATCH] drm/i915: actually drive the BDW reserved IDs @@ -38,12 +38,13 @@ Cc: Jani Nikula <jani.nikula@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1483473860-17644-3-git-send-email-paulo.r.zanoni@intel.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c -index 7435a73f6bc6..ecb487b5356f 100644 +index 2b6c0d214e55..f21a0d14a0d9 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c -@@ -456,6 +456,7 @@ static const struct pci_device_id pciidlist[] = { +@@ -365,6 +365,7 @@ static const struct pci_device_id pciidlist[] = { INTEL_VLV_IDS(&intel_valleyview_info), INTEL_BDW_GT12_IDS(&intel_broadwell_info), INTEL_BDW_GT3_IDS(&intel_broadwell_gt3_info), diff --git a/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch b/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch index 621688f..59f3168 100644 --- a/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch +++ b/queue/drm-i915-fix-INTEL_BDW_IDS-definition.patch @@ -1,4 +1,4 @@ -From 7fbd995ce4241e98d30859405504c3fb279c4ccb Mon Sep 17 00:00:00 2001 +From 5983b2db4a4b8fd9c7cd4eec073fd6556a9b9919 Mon Sep 17 00:00:00 2001 From: Paulo Zanoni <paulo.r.zanoni@intel.com> Date: Tue, 3 Jan 2017 18:04:18 -0200 Subject: [PATCH] drm/i915: fix INTEL_BDW_IDS definition @@ -15,9 +15,10 @@ Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1483473860-17644-1-git-send-email-paulo.r.zanoni@intel.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h -index aeb36cb0854f..6588dd1d88c5 100644 +index 0d5f4268d75f..77b6bcb60f2b 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -240,8 +240,6 @@ diff --git a/queue/drm-i915-gen9-Increase-PCODE-request-timeout-to-50ms.patch b/queue/drm-i915-gen9-Increase-PCODE-request-timeout-to-50ms.patch index 202b650..144887e 100644 --- a/queue/drm-i915-gen9-Increase-PCODE-request-timeout-to-50ms.patch +++ b/queue/drm-i915-gen9-Increase-PCODE-request-timeout-to-50ms.patch @@ -1,4 +1,4 @@ -From d253371c4c2f5fc2d884ef25f64decd7549aff5a Mon Sep 17 00:00:00 2001 +From 7b9258e893e5d8cc66881c1a6f2d0479eece57d6 Mon Sep 17 00:00:00 2001 From: Imre Deak <imre.deak@intel.com> Date: Fri, 24 Feb 2017 16:32:10 +0200 Subject: [PATCH] drm/i915/gen9: Increase PCODE request timeout to 50ms @@ -33,12 +33,13 @@ Acked-by: Chris Wilson <chris@chris-wilson.co.uk> Link: http://patchwork.freedesktop.org/patch/msgid/1487946730-17162-1-git-send-email-imre.deak@intel.com (cherry picked from commit 0129936ddda26afd5d9d207c4e86b2425952579f) 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/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c -index 65cd4c56c9dd..940bab22d464 100644 +index 9e6488fe88f9..076cfa546ac3 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c -@@ -7923,10 +7923,10 @@ static bool skl_pcode_try_request(struct drm_i915_private *dev_priv, u32 mbox, +@@ -8003,10 +8003,10 @@ static bool skl_pcode_try_request(struct drm_i915_private *dev_priv, u32 mbox, * @timeout_base_ms: timeout for polling with preemption enabled * * Keep resending the @request to @mbox until PCODE acknowledges it, PCODE @@ -51,7 +52,7 @@ index 65cd4c56c9dd..940bab22d464 100644 * preemption disabled. * * Returns 0 on success, %-ETIMEDOUT in case of a timeout, <0 in case of some -@@ -7962,14 +7962,15 @@ int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request, +@@ -8042,14 +8042,15 @@ int skl_pcode_request(struct drm_i915_private *dev_priv, u32 mbox, u32 request, * worst case) _and_ PCODE was busy for some reason even after a * (queued) request and @timeout_base_ms delay. As a workaround retry * the poll with preemption disabled to maximize the number of diff --git a/queue/drm-i915-more-.is_mobile-cleanups-for-BDW.patch b/queue/drm-i915-more-.is_mobile-cleanups-for-BDW.patch index d5a2004..a825b5b 100644 --- a/queue/drm-i915-more-.is_mobile-cleanups-for-BDW.patch +++ b/queue/drm-i915-more-.is_mobile-cleanups-for-BDW.patch @@ -1,4 +1,4 @@ -From 0784bc624ae9be4269f8129572ee164ca680ca7c Mon Sep 17 00:00:00 2001 +From 1a7b315d5a3edd7f6933786ebdc0826e2f30684a Mon Sep 17 00:00:00 2001 From: Paulo Zanoni <paulo.r.zanoni@intel.com> Date: Tue, 3 Jan 2017 18:04:19 -0200 Subject: [PATCH] drm/i915: more .is_mobile cleanups for BDW @@ -17,9 +17,10 @@ Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/1483473860-17644-2-git-send-email-paulo.r.zanoni@intel.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h -index 6588dd1d88c5..a1dd21d6b723 100644 +index 77b6bcb60f2b..61766a420f6b 100644 --- a/include/drm/i915_pciids.h +++ b/include/drm/i915_pciids.h @@ -226,21 +226,18 @@ diff --git a/queue/drm-mga-remove-device_is_agp-callback.patch b/queue/drm-mga-remove-device_is_agp-callback.patch index 7fec56e..0a6363e 100644 --- a/queue/drm-mga-remove-device_is_agp-callback.patch +++ b/queue/drm-mga-remove-device_is_agp-callback.patch @@ -1,4 +1,4 @@ -From 858b2c1bf820ebfba89c5e2867ab882bdb5b2f5a Mon Sep 17 00:00:00 2001 +From ff16ff451e078f6d494705f9e5e5d96ce3be04cc Mon Sep 17 00:00:00 2001 From: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Wed, 25 Jan 2017 07:26:51 +0100 Subject: [PATCH] drm/mga: remove device_is_agp callback @@ -11,9 +11,10 @@ callback. Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Link: http://patchwork.freedesktop.org/patch/msgid/20170125062657.19270-10-daniel.vetter@ffwll.ch +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/mga/mga_dma.c b/drivers/gpu/drm/mga/mga_dma.c -index a1d8dd15b131..1ffdafea27e4 100644 +index 1f2f9ca25901..4556e2b13ac5 100644 --- a/drivers/gpu/drm/mga/mga_dma.c +++ b/drivers/gpu/drm/mga/mga_dma.c @@ -392,6 +392,24 @@ int mga_driver_load(struct drm_device *dev, unsigned long flags) @@ -51,7 +52,7 @@ index a1d8dd15b131..1ffdafea27e4 100644 drm_mga_private_t *const dev_priv = (drm_mga_private_t *) dev->dev_private; diff --git a/drivers/gpu/drm/mga/mga_drv.c b/drivers/gpu/drm/mga/mga_drv.c -index 25b2a1a424e6..63ba0699d107 100644 +index 5e2f131a6a72..becbbec87a74 100644 --- a/drivers/gpu/drm/mga/mga_drv.c +++ b/drivers/gpu/drm/mga/mga_drv.c @@ -37,8 +37,6 @@ diff --git a/queue/drm-msm-adreno-move-function-declarations-to-header-.patch b/queue/drm-msm-adreno-move-function-declarations-to-header-.patch index 6ff1232..cdc1f9e 100644 --- a/queue/drm-msm-adreno-move-function-declarations-to-header-.patch +++ b/queue/drm-msm-adreno-move-function-declarations-to-header-.patch @@ -1,4 +1,4 @@ -From a5725ab0497ad91a2df7c01a78bf1a0cc5be4526 Mon Sep 17 00:00:00 2001 +From 8cec2ad25fdeb17521811672624b9f8152c206d6 Mon Sep 17 00:00:00 2001 From: Baoyou Xie <baoyou.xie@linaro.org> Date: Sat, 22 Oct 2016 17:17:44 +0800 Subject: [PATCH] drm/msm/adreno: move function declarations to header file @@ -18,6 +18,7 @@ Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1477127865-9381-1-git-send-email-baoyou.xie@linaro.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 5127b75dbf40..7250ffc6322f 100644 diff --git a/queue/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch b/queue/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch index 533a0b8..aaf9607 100644 --- a/queue/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch +++ b/queue/drm-nouveau-disp-mcp7x-disable-dptmds-workaround.patch @@ -1,4 +1,4 @@ -From 7dfee6827780d4228148263545af936d0cae8930 Mon Sep 17 00:00:00 2001 +From c408c5cc4badca5f305a2770fcd465042af91614 Mon Sep 17 00:00:00 2001 From: Ben Skeggs <bskeggs@redhat.com> Date: Mon, 9 Jan 2017 10:22:15 +1000 Subject: [PATCH] drm/nouveau/disp/mcp7x: disable dptmds workaround @@ -10,9 +10,10 @@ inspection of RM traces, NVIDIA don't appear to do it on them either. Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Tested-by: Roy Spliet <nouveau@spliet.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c -index 567466f93cd5..0db8efbf1c2e 100644 +index fbb8c7dc18fd..0d65e7f15451 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c @@ -433,8 +433,6 @@ nv50_disp_dptmds_war(struct nvkm_device *device) diff --git a/queue/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv.patch b/queue/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv.patch index ac5f395..821106d 100644 --- a/queue/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv.patch +++ b/queue/drm-nouveau-mmu-nv4a-use-nv04-mmu-rather-than-the-nv.patch @@ -1,4 +1,4 @@ -From f94773b9f5ecd1df7c88c2e921924dd41d2020cc Mon Sep 17 00:00:00 2001 +From 12a358111988abdbfef143ff33570dd030b1b275 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin <imirkin@alum.mit.edu> Date: Sat, 18 Mar 2017 16:23:10 -0400 Subject: [PATCH] drm/nouveau/mmu/nv4a: use nv04 mmu rather than the nv44 one @@ -20,9 +20,10 @@ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70388 Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Cc: stable@vger.kernel.org Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c -index 273562dd6bbd..0fc41db34522 100644 +index e0d7f8472ac6..d741ff88e405 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/base.c @@ -714,7 +714,7 @@ nv4a_chipset = { diff --git a/queue/drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch b/queue/drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch index 1644ef7..dac2023 100644 --- a/queue/drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch +++ b/queue/drm-nouveau-mpeg-mthd-returns-true-on-success-now.patch @@ -1,4 +1,4 @@ -From 83bce9c2baa51e439480a713119a73d3c8b61083 Mon Sep 17 00:00:00 2001 +From f9e541dea46bfe0ca928e96e531f024e90aa09c2 Mon Sep 17 00:00:00 2001 From: Ilia Mirkin <imirkin@alum.mit.edu> Date: Sat, 18 Mar 2017 21:53:05 -0400 Subject: [PATCH] drm/nouveau/mpeg: mthd returns true on success now @@ -9,6 +9,7 @@ Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu> Fixes: 590801c1a3 ("drm/nouveau/mpeg: remove dependence on namedb/engctx lookup") Cc: stable@vger.kernel.org # v4.3+ Signed-off-by: Ben Skeggs <bskeggs@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c b/drivers/gpu/drm/nouveau/nvkm/engine/mpeg/nv31.c index 003ac915eaad..8a8895246d26 100644 diff --git a/queue/drm-ttm-drm-vmwgfx-Relax-permission-checking-when-op.patch b/queue/drm-ttm-drm-vmwgfx-Relax-permission-checking-when-op.patch index 93d67b0..de23789 100644 --- a/queue/drm-ttm-drm-vmwgfx-Relax-permission-checking-when-op.patch +++ b/queue/drm-ttm-drm-vmwgfx-Relax-permission-checking-when-op.patch @@ -1,4 +1,4 @@ -From fe25deb7737ce6c0879ccf79c99fa1221d428bf2 Mon Sep 17 00:00:00 2001 +From 719503741289ed90f1eb123c5d365445c9c2f375 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom <thellstrom@vmware.com> Date: Mon, 27 Mar 2017 11:21:25 +0200 Subject: [PATCH] drm/ttm, drm/vmwgfx: Relax permission checking when opening @@ -17,9 +17,10 @@ surface is used recursively to obtain surface information. Cc: <stable@vger.kernel.org> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/ttm/ttm_object.c b/drivers/gpu/drm/ttm/ttm_object.c -index fdb451e3ec01..d750140bafbc 100644 +index 4f5fa8d65fe9..144367c0c28f 100644 --- a/drivers/gpu/drm/ttm/ttm_object.c +++ b/drivers/gpu/drm/ttm/ttm_object.c @@ -179,7 +179,7 @@ int ttm_base_object_init(struct ttm_object_file *tfile, @@ -61,7 +62,7 @@ index fdb451e3ec01..d750140bafbc 100644 dma_buf_put(dma_buf); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c -index 4076063e0fdd..6b2708b4eafe 100644 +index ac07f5b5dfbf..2f64c91679b3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -1075,10 +1075,8 @@ int vmw_fence_event_ioctl(struct drm_device *dev, void *data, @@ -78,10 +79,10 @@ index 4076063e0fdd..6b2708b4eafe 100644 DRM_ERROR("Failed to reference a fence " "object.\n"); diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c -index 65b3f0369636..bf23153d4f55 100644 +index 6a328d507a28..196df7016d47 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_resource.c -@@ -589,7 +589,7 @@ static int vmw_user_dmabuf_synccpu_grab(struct vmw_user_dma_buffer *user_bo, +@@ -591,7 +591,7 @@ static int vmw_user_dmabuf_synccpu_grab(struct vmw_user_dma_buffer *user_bo, return ret; ret = ttm_ref_object_add(tfile, &user_bo->prime.base, @@ -90,7 +91,7 @@ index 65b3f0369636..bf23153d4f55 100644 if (ret != 0 || existed) ttm_bo_synccpu_write_release(&user_bo->dma.base); -@@ -773,7 +773,7 @@ int vmw_user_dmabuf_reference(struct ttm_object_file *tfile, +@@ -775,7 +775,7 @@ int vmw_user_dmabuf_reference(struct ttm_object_file *tfile, *handle = user_bo->prime.base.hash.key; return ttm_ref_object_add(tfile, &user_bo->prime.base, @@ -100,10 +101,10 @@ index 65b3f0369636..bf23153d4f55 100644 /* diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c -index f410502cb075..adc023fe67f3 100644 +index 55b7f527ea8c..8423f0f46b27 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c -@@ -891,17 +891,16 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, +@@ -901,17 +901,16 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, uint32_t handle; struct ttm_base_object *base; int ret; @@ -125,7 +126,7 @@ index f410502cb075..adc023fe67f3 100644 if (ACCESS_ONCE(vmw_fpriv(file_priv)->locked_master)) { DRM_ERROR("Locked master refused legacy " "surface reference.\n"); -@@ -929,17 +928,14 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, +@@ -939,17 +938,14 @@ vmw_surface_handle_reference(struct vmw_private *dev_priv, /* * Make sure the surface creator has the same diff --git a/queue/drm-vmwgfx-NULL-pointer-dereference-in-vmw_surface_d.patch b/queue/drm-vmwgfx-NULL-pointer-dereference-in-vmw_surface_d.patch index a5234fa..4e741df 100644 --- a/queue/drm-vmwgfx-NULL-pointer-dereference-in-vmw_surface_d.patch +++ b/queue/drm-vmwgfx-NULL-pointer-dereference-in-vmw_surface_d.patch @@ -1,4 +1,4 @@ -From 36274ab8c596f1240c606bb514da329add2a1bcd Mon Sep 17 00:00:00 2001 +From f113dba51cb7d1fbcbc36d1027cdbdfaa1f4b390 Mon Sep 17 00:00:00 2001 From: Murray McAllister <murray.mcallister@insomniasec.com> Date: Mon, 27 Mar 2017 11:12:53 +0200 Subject: [PATCH] drm/vmwgfx: NULL pointer dereference in @@ -15,12 +15,13 @@ Add check to avoid NULL pointer dereferences. Cc: <stable@vger.kernel.org> Signed-off-by: Murray McAllister <murray.mcallister@insomniasec.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c -index b445ce9b9757..f410502cb075 100644 +index c2a721a8cef9..55b7f527ea8c 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c -@@ -716,8 +716,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, +@@ -718,8 +718,8 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, for (i = 0; i < DRM_VMW_MAX_SURFACE_FACES; ++i) num_sizes += req->mip_levels[i]; diff --git a/queue/drm-vmwgfx-Remove-getparam-error-message.patch b/queue/drm-vmwgfx-Remove-getparam-error-message.patch index d70f7d1..9a5dba2 100644 --- a/queue/drm-vmwgfx-Remove-getparam-error-message.patch +++ b/queue/drm-vmwgfx-Remove-getparam-error-message.patch @@ -1,4 +1,4 @@ -From 53e16798b0864464c5444a204e1bb93ae246c429 Mon Sep 17 00:00:00 2001 +From 25cd7195b7784a82f64c86997449f30018694959 Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom <thellstrom@vmware.com> Date: Mon, 27 Mar 2017 13:06:05 +0200 Subject: [PATCH] drm/vmwgfx: Remove getparam error message @@ -13,6 +13,7 @@ Cc: <stable@vger.kernel.org> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index 1802d0e7fab8..5ec24fd801cd 100644 diff --git a/queue/drm-vmwgfx-Type-check-lookups-of-fence-objects.patch b/queue/drm-vmwgfx-Type-check-lookups-of-fence-objects.patch index 026a927..2f33446 100644 --- a/queue/drm-vmwgfx-Type-check-lookups-of-fence-objects.patch +++ b/queue/drm-vmwgfx-Type-check-lookups-of-fence-objects.patch @@ -1,4 +1,4 @@ -From f7652afa8eadb416b23eb57dec6f158529942041 Mon Sep 17 00:00:00 2001 +From a544baa254f0c2984c49bacd0acb110010afc45d Mon Sep 17 00:00:00 2001 From: Thomas Hellstrom <thellstrom@vmware.com> Date: Mon, 27 Mar 2017 11:09:08 +0200 Subject: [PATCH] drm/vmwgfx: Type-check lookups of fence objects @@ -18,7 +18,7 @@ Reviewed-by: Sinclair Yeh <syeh@vmware.com> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c -index 6541dd8b82dc..4076063e0fdd 100644 +index 26ac8e80a478..ac07f5b5dfbf 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c @@ -701,6 +701,41 @@ void vmw_fence_fifo_up(struct vmw_fence_manager *fman) diff --git a/queue/drm-vmwgfx-avoid-calling-vzalloc-with-a-0-size-in-vm.patch b/queue/drm-vmwgfx-avoid-calling-vzalloc-with-a-0-size-in-vm.patch index 525f2b1..2bf80d4 100644 --- a/queue/drm-vmwgfx-avoid-calling-vzalloc-with-a-0-size-in-vm.patch +++ b/queue/drm-vmwgfx-avoid-calling-vzalloc-with-a-0-size-in-vm.patch @@ -1,4 +1,4 @@ -From 63774069d9527a1aeaa4aa20e929ef5e8e9ecc38 Mon Sep 17 00:00:00 2001 +From 8d44b63983d6ae4b47a97aa490df08255628d84e Mon Sep 17 00:00:00 2001 From: Murray McAllister <murray.mcallister@insomniasec.com> Date: Mon, 27 Mar 2017 11:15:12 +0200 Subject: [PATCH] drm/vmwgfx: avoid calling vzalloc with a 0 size in @@ -15,6 +15,7 @@ Add check to avoid a size of 0. Cc: <stable@vger.kernel.org> Signed-off-by: Murray McAllister <murray.mcallister@insomniasec.com> Reviewed-by: Sinclair Yeh <syeh@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c index b8c6a03c8c54..1802d0e7fab8 100644 diff --git a/queue/drm-vmwgfx-fix-integer-overflow-in-vmw_surface_defin.patch b/queue/drm-vmwgfx-fix-integer-overflow-in-vmw_surface_defin.patch index be7d47b..6e00122 100644 --- a/queue/drm-vmwgfx-fix-integer-overflow-in-vmw_surface_defin.patch +++ b/queue/drm-vmwgfx-fix-integer-overflow-in-vmw_surface_defin.patch @@ -1,4 +1,4 @@ -From e7e11f99564222d82f0ce84bd521e57d78a6b678 Mon Sep 17 00:00:00 2001 +From bfa66065a1032c9c46fd8d277a0d922e0fb442d1 Mon Sep 17 00:00:00 2001 From: Li Qiang <liq3ea@gmail.com> Date: Mon, 27 Mar 2017 20:10:53 -0700 Subject: [PATCH] drm/vmwgfx: fix integer overflow in @@ -16,12 +16,13 @@ used as the loop count. This can lead an oob write. Add the check of Cc: <stable@vger.kernel.org> Signed-off-by: Li Qiang <liqiang6-s@360.cn> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c -index adc023fe67f3..05fa092c942b 100644 +index 8423f0f46b27..27f0c3b06cd0 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_surface.c -@@ -713,8 +713,11 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, +@@ -715,8 +715,11 @@ int vmw_surface_define_ioctl(struct drm_device *dev, void *data, 128; num_sizes = 0; diff --git a/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch b/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch index 40f0af1..447f33c 100644 --- a/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch +++ b/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch @@ -1,4 +1,4 @@ -From 8330c6ed1ad205f29cd7d6ffbd6455bdc8fd66a4 Mon Sep 17 00:00:00 2001 +From 40a29dd73f37285c26b22be9bba5a98427868583 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel <ard.biesheuvel@linaro.org> Date: Tue, 4 Apr 2017 16:27:44 +0100 Subject: [PATCH] efi/fb: Avoid reconfiguration of BAR that covers the diff --git a/queue/efi-libstub-Skip-GOP-with-PIXEL_BLT_ONLY-format.patch b/queue/efi-libstub-Skip-GOP-with-PIXEL_BLT_ONLY-format.patch index 5b667c6..7b19bae 100644 --- a/queue/efi-libstub-Skip-GOP-with-PIXEL_BLT_ONLY-format.patch +++ b/queue/efi-libstub-Skip-GOP-with-PIXEL_BLT_ONLY-format.patch @@ -1,4 +1,4 @@ -From 540f4c0e894f7e46a66dfa424b16424cbdc12c38 Mon Sep 17 00:00:00 2001 +From 42f3d3fc3bb27010b70abc899a691c33cb12e1a1 Mon Sep 17 00:00:00 2001 From: "Cohen, Eugene" <eugene@hp.com> Date: Tue, 4 Apr 2017 16:27:43 +0100 Subject: [PATCH] efi/libstub: Skip GOP with PIXEL_BLT_ONLY format @@ -31,6 +31,7 @@ Cc: lorenzo.pieralisi@arm.com Fixes: 9822504c1fa5 ("efifb: Enable the efi-framebuffer platform driver ...") Link: http://lkml.kernel.org/r/20170404152744.26687-2-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c index 932742e4cf23..24c461dea7af 100644 diff --git a/queue/ext4-fix-inode-checksum-calculation-problem-if-i_ext.patch b/queue/ext4-fix-inode-checksum-calculation-problem-if-i_ext.patch index b05f30d..fb1328d 100644 --- a/queue/ext4-fix-inode-checksum-calculation-problem-if-i_ext.patch +++ b/queue/ext4-fix-inode-checksum-calculation-problem-if-i_ext.patch @@ -1,4 +1,4 @@ -From 05ac5aa18abd7db341e54df4ae2b4c98ea0e43b7 Mon Sep 17 00:00:00 2001 +From 2be00cb9a01ce34b600cf958fe209e6d1926f797 Mon Sep 17 00:00:00 2001 From: Daeho Jeong <daeho.jeong@samsung.com> Date: Thu, 1 Dec 2016 11:49:12 -0500 Subject: [PATCH] ext4: fix inode checksum calculation problem if i_extra_size @@ -18,12 +18,13 @@ Signed-off-by: Daeho Jeong <daeho.jeong@samsung.com> Signed-off-by: Youngjin Gil <youngjin.gil@samsung.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Theodore Ts'o <tytso@mit.edu> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c -index 7d95b6174980..b48ca0392b9c 100644 +index b99d1335eb26..20fbbc34ddb8 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c -@@ -72,10 +72,9 @@ static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw, +@@ -71,10 +71,9 @@ static __u32 ext4_inode_csum(struct inode *inode, struct ext4_inode *raw, csum = ext4_chksum(sbi, csum, (__u8 *)&dummy_csum, csum_size); offset += csum_size; diff --git a/queue/firmware-qcom-scm-Fix-interrupted-SCM-calls.patch b/queue/firmware-qcom-scm-Fix-interrupted-SCM-calls.patch index 25cc981..4b22091 100644 --- a/queue/firmware-qcom-scm-Fix-interrupted-SCM-calls.patch +++ b/queue/firmware-qcom-scm-Fix-interrupted-SCM-calls.patch @@ -1,4 +1,4 @@ -From 82bcd087029f6056506ea929f11af02622230901 Mon Sep 17 00:00:00 2001 +From c761c37c668d2c985e68eaae5b8c6ae660cc1d28 Mon Sep 17 00:00:00 2001 From: Andy Gross <andy.gross@linaro.org> Date: Wed, 1 Feb 2017 11:28:28 -0600 Subject: [PATCH] firmware: qcom: scm: Fix interrupted SCM calls @@ -20,6 +20,7 @@ https://lkml.org/lkml/2016/9/28/272 Signed-off-by: Andy Gross <andy.gross@linaro.org> Reviewed-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm64/kernel/smccc-call.S b/arch/arm64/kernel/smccc-call.S index ba60a8cb07d2..62522342e1e4 100644 diff --git a/queue/ftrace-Fix-function-pid-filter-on-instances.patch b/queue/ftrace-Fix-function-pid-filter-on-instances.patch index 0dff163..6ab8efa 100644 --- a/queue/ftrace-Fix-function-pid-filter-on-instances.patch +++ b/queue/ftrace-Fix-function-pid-filter-on-instances.patch @@ -1,4 +1,4 @@ -From d879d0b8c183aabeb9a65eba91f3f9e3c7e7b905 Mon Sep 17 00:00:00 2001 +From 6d96558876c2e391fb6bee89cd6ee38d940a1fbb Mon Sep 17 00:00:00 2001 From: Namhyung Kim <namhyung@kernel.org> Date: Mon, 17 Apr 2017 11:44:27 +0900 Subject: [PATCH] ftrace: Fix function pid filter on instances @@ -46,12 +46,13 @@ Cc: stable@vger.kernel.org Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index 27bb2e61276e..dd3e91d68dc7 100644 +index 95af2dc4b394..00e9e679bcf0 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -5566,6 +5566,15 @@ static void clear_ftrace_pids(struct trace_array *tr) +@@ -5395,6 +5395,15 @@ static void clear_ftrace_pids(struct trace_array *tr) trace_free_pid_list(pid_list); } @@ -68,10 +69,10 @@ index 27bb2e61276e..dd3e91d68dc7 100644 { mutex_lock(&ftrace_lock); diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c -index f35109514a01..d484452ae648 100644 +index 93b46040bdab..a8116a2bdac4 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c -@@ -7402,6 +7402,7 @@ static int instance_rmdir(const char *name) +@@ -7126,6 +7126,7 @@ static int instance_rmdir(const char *name) tracing_set_nop(tr); event_trace_del_tracer(tr); @@ -80,10 +81,10 @@ index f35109514a01..d484452ae648 100644 tracefs_remove_recursive(tr->dir); free_trace_buffers(tr); diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h -index ae1cce91fead..d19d52d600d6 100644 +index f783df416726..9506b5c522bd 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h -@@ -896,6 +896,7 @@ int using_ftrace_ops_list_func(void); +@@ -865,6 +865,7 @@ int using_ftrace_ops_list_func(void); void ftrace_init_tracefs(struct trace_array *tr, struct dentry *d_tracer); void ftrace_init_tracefs_toplevel(struct trace_array *tr, struct dentry *d_tracer); @@ -91,7 +92,7 @@ index ae1cce91fead..d19d52d600d6 100644 #else static inline int ftrace_trace_task(struct trace_array *tr) { -@@ -914,6 +915,7 @@ ftrace_init_global_array_ops(struct trace_array *tr) { } +@@ -883,6 +884,7 @@ ftrace_init_global_array_ops(struct trace_array *tr) { } static inline void ftrace_reset_array_ops(struct trace_array *tr) { } static inline void ftrace_init_tracefs(struct trace_array *tr, struct dentry *d) { } static inline void ftrace_init_tracefs_toplevel(struct trace_array *tr, struct dentry *d) { } diff --git a/queue/ftrace-Fix-removing-of-second-function-probe.patch b/queue/ftrace-Fix-removing-of-second-function-probe.patch index cfe0601..b20b8c8 100644 --- a/queue/ftrace-Fix-removing-of-second-function-probe.patch +++ b/queue/ftrace-Fix-removing-of-second-function-probe.patch @@ -1,4 +1,4 @@ -From 82cc4fc2e70ec5baeff8f776f2773abc8b2cc0ae Mon Sep 17 00:00:00 2001 +From 98efe142c3d85a39b31461617bd734556e70e11c Mon Sep 17 00:00:00 2001 From: "Steven Rostedt (VMware)" <rostedt@goodmis.org> Date: Fri, 14 Apr 2017 17:45:45 -0400 Subject: [PATCH] ftrace: Fix removing of second function probe @@ -89,12 +89,13 @@ Causes: Cc: stable@vger.kernel.org Fixes: 59df055f1991 ("ftrace: trace different functions with a different tracer") Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c -index b9691ee8f6c1..27bb2e61276e 100644 +index b1d7f1b5e791..95af2dc4b394 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c -@@ -3755,23 +3755,24 @@ static void __enable_ftrace_function_probe(struct ftrace_ops_hash *old_hash) +@@ -3730,23 +3730,24 @@ static void __enable_ftrace_function_probe(struct ftrace_ops_hash *old_hash) ftrace_probe_registered = 1; } @@ -122,7 +123,7 @@ index b9691ee8f6c1..27bb2e61276e 100644 } -@@ -3901,6 +3902,7 @@ static void +@@ -3876,6 +3877,7 @@ static void __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, void *data, int flags) { @@ -130,7 +131,7 @@ index b9691ee8f6c1..27bb2e61276e 100644 struct ftrace_func_entry *rec_entry; struct ftrace_func_probe *entry; struct ftrace_func_probe *p; -@@ -3912,6 +3914,7 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, +@@ -3887,6 +3889,7 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, struct hlist_node *tmp; char str[KSYM_SYMBOL_LEN]; int i, ret; @@ -138,7 +139,7 @@ index b9691ee8f6c1..27bb2e61276e 100644 if (glob && (strcmp(glob, "*") == 0 || !strlen(glob))) func_g.search = NULL; -@@ -3930,6 +3933,10 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, +@@ -3905,6 +3908,10 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, mutex_lock(&trace_probe_ops.func_hash->regex_lock); @@ -149,7 +150,7 @@ index b9691ee8f6c1..27bb2e61276e 100644 hash = alloc_and_copy_ftrace_hash(FTRACE_HASH_DEFAULT_BITS, *orig_hash); if (!hash) /* Hmm, should report this somehow */ -@@ -3967,12 +3974,17 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, +@@ -3942,12 +3949,17 @@ __unregister_ftrace_function_probe(char *glob, struct ftrace_probe_ops *ops, } } mutex_lock(&ftrace_lock); diff --git a/queue/i2c-bcm2835-Fix-hang-for-writing-messages-larger-tha.patch b/queue/i2c-bcm2835-Fix-hang-for-writing-messages-larger-tha.patch index a389adf..180cd2d 100644 --- a/queue/i2c-bcm2835-Fix-hang-for-writing-messages-larger-tha.patch +++ b/queue/i2c-bcm2835-Fix-hang-for-writing-messages-larger-tha.patch @@ -1,4 +1,4 @@ -From e2474541032db65d02bf88b6a8c2f954654b443f Mon Sep 17 00:00:00 2001 +From 12bc93ab89d8ad575da4e01e1cab2708c9e08076 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org> Date: Mon, 3 Oct 2016 22:06:08 +0200 Subject: [PATCH] i2c: bcm2835: Fix hang for writing messages larger than 16 @@ -30,6 +30,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Reviewed-by: Eric Anholt <eric@anholt.net> Reviewed-by: Martin Sperl <kernel@martin.sperl.org> Signed-off-by: Wolfram Sang <wsa@the-dreams.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c index d4f3239b5686..f283b714aa79 100644 diff --git a/queue/iio-bmg160-reset-chip-when-probing.patch b/queue/iio-bmg160-reset-chip-when-probing.patch index 41f7dd4..0196063 100644 --- a/queue/iio-bmg160-reset-chip-when-probing.patch +++ b/queue/iio-bmg160-reset-chip-when-probing.patch @@ -1,4 +1,4 @@ -From 4bdc9029685ac03be50b320b29691766d2326c2b Mon Sep 17 00:00:00 2001 +From 9d7075f646e86e83b25387b0293b2db081d49e6d Mon Sep 17 00:00:00 2001 From: Quentin Schulz <quentin.schulz@free-electrons.com> Date: Tue, 21 Mar 2017 16:52:14 +0100 Subject: [PATCH] iio: bmg160: reset chip when probing @@ -19,6 +19,7 @@ and the BMI055 give the same reset register and bits. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/iio/gyro/bmg160_core.c b/drivers/iio/gyro/bmg160_core.c index f7fcfa886f72..821919dd245b 100644 diff --git a/queue/irqchip-irq-imx-gpcv2-Fix-spinlock-initialization.patch b/queue/irqchip-irq-imx-gpcv2-Fix-spinlock-initialization.patch index 7df8657..345dae0 100644 --- a/queue/irqchip-irq-imx-gpcv2-Fix-spinlock-initialization.patch +++ b/queue/irqchip-irq-imx-gpcv2-Fix-spinlock-initialization.patch @@ -1,4 +1,4 @@ -From 75eb5e1e7b4edbc8e8f930de59004d21cb46961f Mon Sep 17 00:00:00 2001 +From f7dd71ac2b30aa3d91210b26b08432dbc8252f8e Mon Sep 17 00:00:00 2001 From: Tyler Baker <tyler.baker@linaro.org> Date: Thu, 13 Apr 2017 15:27:31 -0700 Subject: [PATCH] irqchip/irq-imx-gpcv2: Fix spinlock initialization @@ -25,6 +25,7 @@ Cc: linux-arm-kernel@lists.infradead.org Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20170413222731.5917-1-tyler.baker@linaro.org Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/irqchip/irq-imx-gpcv2.c b/drivers/irqchip/irq-imx-gpcv2.c index 15af9a9753e5..2d203b422129 100644 diff --git a/queue/iscsi-target-Drop-work-around-for-legacy-GlobalSAN-i.patch b/queue/iscsi-target-Drop-work-around-for-legacy-GlobalSAN-i.patch index f80da25..fd167a7 100644 --- a/queue/iscsi-target-Drop-work-around-for-legacy-GlobalSAN-i.patch +++ b/queue/iscsi-target-Drop-work-around-for-legacy-GlobalSAN-i.patch @@ -1,4 +1,4 @@ -From 1c99de981f30b3e7868b8d20ce5479fa1c0fea46 Mon Sep 17 00:00:00 2001 +From 332d7431ff539476686a9a906f89d04bc65dfb28 Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger <nab@linux-iscsi.org> Date: Sun, 2 Apr 2017 13:36:44 -0700 Subject: [PATCH] iscsi-target: Drop work-around for legacy GlobalSAN initiator @@ -49,9 +49,10 @@ Cc: Himanshu Madhani <Himanshu.Madhani@cavium.com> Cc: Arun Easi <arun.easi@cavium.com> Cc: stable@vger.kernel.org # 3.1+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c -index e65bf78ceef3..fce627628200 100644 +index 0efa80bb8962..4a073339ae2e 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c @@ -782,22 +782,6 @@ static void iscsi_check_proposer_for_optional_reply(struct iscsi_param *param) diff --git a/queue/iscsi-target-Fix-TMR-reference-leak-during-session-s.patch b/queue/iscsi-target-Fix-TMR-reference-leak-during-session-s.patch index 42f7006..d12c67b 100644 --- a/queue/iscsi-target-Fix-TMR-reference-leak-during-session-s.patch +++ b/queue/iscsi-target-Fix-TMR-reference-leak-during-session-s.patch @@ -1,4 +1,4 @@ -From efb2ea770bb3b0f40007530bc8b0c22f36e1c5eb Mon Sep 17 00:00:00 2001 +From af3779a34a7e2942f9acdef0392e5a768948e1a9 Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger <nab@linux-iscsi.org> Date: Thu, 23 Mar 2017 17:19:24 -0700 Subject: [PATCH] iscsi-target: Fix TMR reference leak during session shutdown @@ -39,12 +39,13 @@ Cc: Chu Yuan Lin <cyl@datera.io> Tested-by: Chu Yuan Lin <cyl@datera.io> Cc: stable@vger.kernel.org # 3.10+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/target/iscsi/iscsi_target_util.c b/drivers/target/iscsi/iscsi_target_util.c -index 5041a9c8bdcb..b4640338f8d8 100644 +index 1f38177207e0..da5a5fcb8c29 100644 --- a/drivers/target/iscsi/iscsi_target_util.c +++ b/drivers/target/iscsi/iscsi_target_util.c -@@ -737,21 +737,23 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) +@@ -735,21 +735,23 @@ void iscsit_free_cmd(struct iscsi_cmd *cmd, bool shutdown) { struct se_cmd *se_cmd = NULL; int rc; diff --git a/queue/kvm-arm-arm64-Fix-locking-for-kvm_free_stage2_pgd.patch b/queue/kvm-arm-arm64-Fix-locking-for-kvm_free_stage2_pgd.patch index 1d98caa..7cafe6f 100644 --- a/queue/kvm-arm-arm64-Fix-locking-for-kvm_free_stage2_pgd.patch +++ b/queue/kvm-arm-arm64-Fix-locking-for-kvm_free_stage2_pgd.patch @@ -1,4 +1,4 @@ -From 8b3405e345b5a098101b0c31b264c812bba045d9 Mon Sep 17 00:00:00 2001 +From e80f58f2326dc4fe7c5a76d39990254cc7863de0 Mon Sep 17 00:00:00 2001 From: Suzuki K Poulose <suzuki.poulose@arm.com> Date: Mon, 3 Apr 2017 15:12:43 +0100 Subject: [PATCH] kvm: arm/arm64: Fix locking for kvm_free_stage2_pgd @@ -23,9 +23,10 @@ Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com> Signed-off-by: Christoffer Dall <cdall@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c -index 13b9c1fa8961..582a972371cf 100644 +index b3063ee63593..5911297093b7 100644 --- a/arch/arm/kvm/mmu.c +++ b/arch/arm/kvm/mmu.c @@ -292,11 +292,18 @@ static void unmap_stage2_range(struct kvm *kvm, phys_addr_t start, u64 size) @@ -47,7 +48,7 @@ index 13b9c1fa8961..582a972371cf 100644 } while (pgd++, addr = next, addr != end); } -@@ -831,7 +838,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm) +@@ -832,7 +839,10 @@ void kvm_free_stage2_pgd(struct kvm *kvm) if (kvm->arch.pgd == NULL) return; diff --git a/queue/libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handl.patch b/queue/libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handl.patch index 106ff0a..59516f8 100644 --- a/queue/libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handl.patch +++ b/queue/libnvdimm-fix-reconfig_mutex-mmap_sem-and-jbd2_handl.patch @@ -1,4 +1,4 @@ -From 0beb2012a1722633515c8aaa263c73449636c893 Mon Sep 17 00:00:00 2001 +From 9437be02d9e2069342b3fc5b1955828d9aed6853 Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams@intel.com> Date: Fri, 7 Apr 2017 09:47:24 -0700 Subject: [PATCH] libnvdimm: fix reconfig_mutex, mmap_sem, and jbd2_handle @@ -67,6 +67,7 @@ Fixes: 62232e45f4a2 ("libnvdimm: control (ioctl) messages for nvdimm_bus and nvd Cc: Dave Jiang <dave.jiang@intel.com> Reported-by: Vishal Verma <vishal.l.verma@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/nvdimm/bus.c b/drivers/nvdimm/bus.c index 23d4a1728cdf..351bac8f6503 100644 diff --git a/queue/media-dvb-usb-don-t-use-stack-for-firmware-load.patch b/queue/media-dvb-usb-don-t-use-stack-for-firmware-load.patch index 0bd7478..3f32d1d 100644 --- a/queue/media-dvb-usb-don-t-use-stack-for-firmware-load.patch +++ b/queue/media-dvb-usb-don-t-use-stack-for-firmware-load.patch @@ -1,7 +1,7 @@ -From bdf8118faf7881b51036410fa6e52260ee172816 Mon Sep 17 00:00:00 2001 +From a13fb5ee317973071d6ca5f8971d82a58d0d8f1d Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab <mchehab@s-opensource.com> Date: Tue, 24 Jan 2017 08:13:11 -0200 -Subject: [PATCH] dvb-usb: don't use stack for firmware load +Subject: [PATCH] [media] dvb-usb: don't use stack for firmware load commit 43fab9793c1f44e665b4f98035a14942edf03ddc upstream. @@ -74,6 +74,7 @@ So, allocate the structure dynamically. Cc: stable@vger.kernel.org # Kernel 4.9+ Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c index dd048a7c461c..53a11a064fc5 100644 diff --git a/queue/media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch b/queue/media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch index c56f173..fe6cea7 100644 --- a/queue/media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch +++ b/queue/media-dvb-usb-firmware-don-t-do-DMA-on-stack.patch @@ -1,4 +1,4 @@ -From 67b0503db9c29b04eadfeede6bebbfe5ddad94ef Mon Sep 17 00:00:00 2001 +From eb3c99eacc29f3c3f0ac7f110e53d04f54aca0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de> Date: Sun, 12 Feb 2017 13:02:13 -0200 Subject: [PATCH] [media] dvb-usb-firmware: don't do DMA on stack @@ -16,9 +16,10 @@ Fixes: 43fab9793c1f ("[media] dvb-usb: don't use stack for firmware load") Cc: stable@vger.kernel.org Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c -index ab9866024ec7..04033efe7ad5 100644 +index 53a11a064fc5..b8d2ac5833e9 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-firmware.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-firmware.c @@ -36,16 +36,18 @@ static int usb_cypress_writemem(struct usb_device *udev,u16 addr,u8 *data, u8 le @@ -46,7 +47,7 @@ index ab9866024ec7..04033efe7ad5 100644 err("could not stop the USB controller CPU."); while ((ret = dvb_usb_get_hexline(fw, hx, &pos)) > 0) { -@@ -61,21 +63,21 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw +@@ -62,21 +64,21 @@ int usb_cypress_load_firmware(struct usb_device *udev, const struct firmware *fw } if (ret < 0) { err("firmware download failed at %d with %d",pos,ret); diff --git a/queue/media-dvb-usb-v2-avoid-use-after-free.patch b/queue/media-dvb-usb-v2-avoid-use-after-free.patch index 25a8106..3891cec 100644 --- a/queue/media-dvb-usb-v2-avoid-use-after-free.patch +++ b/queue/media-dvb-usb-v2-avoid-use-after-free.patch @@ -1,4 +1,4 @@ -From 005145378c9ad7575a01b6ce1ba118fb427f583a Mon Sep 17 00:00:00 2001 +From 4a73d7e9f7b10d89e01a892f1f8c3c390977e0fc Mon Sep 17 00:00:00 2001 From: Arnd Bergmann <arnd@arndb.de> Date: Thu, 2 Feb 2017 12:36:01 -0200 Subject: [PATCH] [media] dvb-usb-v2: avoid use-after-free @@ -23,12 +23,13 @@ as both printk() and kfree() are able to deal with NULL pointers. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c -index 298c91a6f1f9..955fb0d07507 100644 +index 3fbb2cd19f5e..0f1f69d64c18 100644 --- a/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c +++ b/drivers/media/usb/dvb-usb-v2/dvb_usb_core.c -@@ -1012,8 +1012,8 @@ EXPORT_SYMBOL(dvb_usbv2_probe); +@@ -1015,8 +1015,8 @@ EXPORT_SYMBOL(dvb_usbv2_probe); void dvb_usbv2_disconnect(struct usb_interface *intf) { struct dvb_usb_device *d = usb_get_intfdata(intf); @@ -39,7 +40,7 @@ index 298c91a6f1f9..955fb0d07507 100644 dev_dbg(&d->udev->dev, "%s: bInterfaceNumber=%d\n", __func__, intf->cur_altsetting->desc.bInterfaceNumber); -@@ -1023,8 +1023,9 @@ void dvb_usbv2_disconnect(struct usb_interface *intf) +@@ -1026,8 +1026,9 @@ void dvb_usbv2_disconnect(struct usb_interface *intf) dvb_usbv2_exit(d); diff --git a/queue/metag-usercopy-Add-early-abort-to-copy_to_user.patch b/queue/metag-usercopy-Add-early-abort-to-copy_to_user.patch index 44c2b37..3e0e686 100644 --- a/queue/metag-usercopy-Add-early-abort-to-copy_to_user.patch +++ b/queue/metag-usercopy-Add-early-abort-to-copy_to_user.patch @@ -1,4 +1,4 @@ -From fb8ea062a8f2e85256e13f55696c5c5f0dfdcc8b Mon Sep 17 00:00:00 2001 +From 623977be918a8fd5884955b6234ae14d188ef7de Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Fri, 31 Mar 2017 13:35:01 +0100 Subject: [PATCH] metag/usercopy: Add early abort to copy_to_user @@ -15,6 +15,7 @@ Reported-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index a6ced9691ddb..714d8562aa20 100644 diff --git a/queue/metag-usercopy-Add-missing-fixups.patch b/queue/metag-usercopy-Add-missing-fixups.patch index c5a3adf..f1b1cd7 100644 --- a/queue/metag-usercopy-Add-missing-fixups.patch +++ b/queue/metag-usercopy-Add-missing-fixups.patch @@ -1,4 +1,4 @@ -From b884a190afcecdbef34ca508ea5ee88bb7c77861 Mon Sep 17 00:00:00 2001 +From 70955b68798fb06f8220ba0cb575e464455d81c9 Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Tue, 4 Apr 2017 08:51:34 +0100 Subject: [PATCH] metag/usercopy: Add missing fixups @@ -16,6 +16,7 @@ Fixes: 373cd784d0fc ("metag: Memory handling") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index e09c95ba028c..2792fc621088 100644 diff --git a/queue/metag-usercopy-Drop-unused-macros.patch b/queue/metag-usercopy-Drop-unused-macros.patch index 09bf277..e35cd7a 100644 --- a/queue/metag-usercopy-Drop-unused-macros.patch +++ b/queue/metag-usercopy-Drop-unused-macros.patch @@ -1,4 +1,4 @@ -From ef62a2d81f73d9cddef14bc3d9097a57010d551c Mon Sep 17 00:00:00 2001 +From c54b8fe7f26ee6602fb78485e9283edbd9addc99 Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Fri, 31 Mar 2017 10:37:44 +0100 Subject: [PATCH] metag/usercopy: Drop unused macros @@ -13,6 +13,7 @@ Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index b3ebfe9c8e88..b4eb1f17069f 100644 diff --git a/queue/metag-usercopy-Fix-alignment-error-checking.patch b/queue/metag-usercopy-Fix-alignment-error-checking.patch index 3622718..1c4702a 100644 --- a/queue/metag-usercopy-Fix-alignment-error-checking.patch +++ b/queue/metag-usercopy-Fix-alignment-error-checking.patch @@ -1,4 +1,4 @@ -From 2257211942bbbf6c798ab70b487d7e62f7835a1a Mon Sep 17 00:00:00 2001 +From 87ff3c11abc7d560f9f9b43ec576a4c7329ad4c4 Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Fri, 31 Mar 2017 11:23:18 +0100 Subject: [PATCH] metag/usercopy: Fix alignment error checking @@ -19,6 +19,7 @@ Fixes: 373cd784d0fc ("metag: Memory handling") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index b4eb1f17069f..a6ced9691ddb 100644 diff --git a/queue/metag-usercopy-Fix-src-fixup-in-from-user-rapf-loops.patch b/queue/metag-usercopy-Fix-src-fixup-in-from-user-rapf-loops.patch index 5762e82..ec55218 100644 --- a/queue/metag-usercopy-Fix-src-fixup-in-from-user-rapf-loops.patch +++ b/queue/metag-usercopy-Fix-src-fixup-in-from-user-rapf-loops.patch @@ -1,4 +1,4 @@ -From 2c0b1df88b987a12d95ea1d6beaf01894f3cc725 Mon Sep 17 00:00:00 2001 +From 57466eea16281789bac783158d98f884d0e0649a Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Mon, 3 Apr 2017 17:41:40 +0100 Subject: [PATCH] metag/usercopy: Fix src fixup in from user rapf loops @@ -20,6 +20,7 @@ Fixes: 373cd784d0fc ("metag: Memory handling") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index 4422928a1746..e09c95ba028c 100644 diff --git a/queue/metag-usercopy-Set-flags-before-ADDZ.patch b/queue/metag-usercopy-Set-flags-before-ADDZ.patch index 8de981c..3b38825 100644 --- a/queue/metag-usercopy-Set-flags-before-ADDZ.patch +++ b/queue/metag-usercopy-Set-flags-before-ADDZ.patch @@ -1,4 +1,4 @@ -From fd40eee1290ad7add7aa665e3ce6b0f9fe9734b4 Mon Sep 17 00:00:00 2001 +From 5466c954e2637fd484714a7fe738c7c900f9e0e8 Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Tue, 4 Apr 2017 11:43:26 +0100 Subject: [PATCH] metag/usercopy: Set flags before ADDZ @@ -20,6 +20,7 @@ Fixes: 373cd784d0fc ("metag: Memory handling") Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/lib/usercopy.c b/arch/metag/lib/usercopy.c index e1d553872fd7..4422928a1746 100644 diff --git a/queue/metag-usercopy-Zero-rest-of-buffer-from-copy_from_us.patch b/queue/metag-usercopy-Zero-rest-of-buffer-from-copy_from_us.patch index 7dcba2c..ba0895c 100644 --- a/queue/metag-usercopy-Zero-rest-of-buffer-from-copy_from_us.patch +++ b/queue/metag-usercopy-Zero-rest-of-buffer-from-copy_from_us.patch @@ -1,4 +1,4 @@ -From 563ddc1076109f2b3f88e6d355eab7b6fd4662cb Mon Sep 17 00:00:00 2001 +From dc18f938de61a812a6c4d05a6a4e723cb1e93ce5 Mon Sep 17 00:00:00 2001 From: James Hogan <james.hogan@imgtec.com> Date: Fri, 31 Mar 2017 11:14:02 +0100 Subject: [PATCH] metag/usercopy: Zero rest of buffer from copy_from_user @@ -24,6 +24,7 @@ Reported-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: James Hogan <james.hogan@imgtec.com> Cc: linux-metag@vger.kernel.org Cc: stable@vger.kernel.org +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/metag/include/asm/uaccess.h b/arch/metag/include/asm/uaccess.h index 273e61225c27..07238b39638c 100644 diff --git a/queue/mm-Tighten-x86-dev-mem-with-zeroing-reads.patch b/queue/mm-Tighten-x86-dev-mem-with-zeroing-reads.patch index 03e4cab..e23b073 100644 --- a/queue/mm-Tighten-x86-dev-mem-with-zeroing-reads.patch +++ b/queue/mm-Tighten-x86-dev-mem-with-zeroing-reads.patch @@ -1,4 +1,4 @@ -From a4866aa812518ed1a37d8ea0c881dc946409de94 Mon Sep 17 00:00:00 2001 +From 893630eb8c4c1c1685fb5c7084b62936955014fe Mon Sep 17 00:00:00 2001 From: Kees Cook <keescook@chromium.org> Date: Wed, 5 Apr 2017 09:39:08 -0700 Subject: [PATCH] mm: Tighten x86 /dev/mem with zeroing reads @@ -21,9 +21,10 @@ hardened usercopy won't Oops the kernel. Reported-by: Tommi Rantala <tommi.t.rantala@nokia.com> Tested-by: Tommi Rantala <tommi.t.rantala@nokia.com> Signed-off-by: Kees Cook <keescook@chromium.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c -index 22af912d66d2..889e7619a091 100644 +index d28a2d741f9e..8a427715f541 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -643,21 +643,40 @@ void __init init_mem_mapping(void) @@ -79,7 +80,7 @@ index 22af912d66d2..889e7619a091 100644 void free_init_pages(char *what, unsigned long begin, unsigned long end) diff --git a/drivers/char/mem.c b/drivers/char/mem.c -index 6d9cc2d39d22..7e4a9d1296bb 100644 +index a33163dbb913..45b17ad779ae 100644 --- a/drivers/char/mem.c +++ b/drivers/char/mem.c @@ -60,6 +60,10 @@ static inline int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) diff --git a/queue/mm-fix-new-crash-in-unmapped_area_topdown.patch b/queue/mm-fix-new-crash-in-unmapped_area_topdown.patch index 15f34fb..9f26628 100644 --- a/queue/mm-fix-new-crash-in-unmapped_area_topdown.patch +++ b/queue/mm-fix-new-crash-in-unmapped_area_topdown.patch @@ -1,4 +1,4 @@ -From f4cb767d76cf7ee72f97dd76f6cfa6c76a5edc89 Mon Sep 17 00:00:00 2001 +From 7a6702934290446bcfa4a34e55af96fc9db61aa1 Mon Sep 17 00:00:00 2001 From: Hugh Dickins <hughd@google.com> Date: Tue, 20 Jun 2017 02:10:44 -0700 Subject: [PATCH] mm: fix new crash in unmapped_area_topdown() @@ -19,12 +19,13 @@ Debugged-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Hugh Dickins <hughd@google.com> Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/mmap.c b/mm/mmap.c -index 8e07976d5e47..290b77d9a01e 100644 +index 7656743eed2f..5680e300e279 100644 --- a/mm/mmap.c +++ b/mm/mmap.c -@@ -1817,7 +1817,8 @@ unsigned long unmapped_area(struct vm_unmapped_area_info *info) +@@ -1660,7 +1660,8 @@ check_current: /* Check if current node has a suitable gap */ if (gap_start > high_limit) return -ENOMEM; @@ -34,7 +35,7 @@ index 8e07976d5e47..290b77d9a01e 100644 goto found; /* Visit right subtree if it looks promising */ -@@ -1920,7 +1921,8 @@ unsigned long unmapped_area_topdown(struct vm_unmapped_area_info *info) +@@ -1763,7 +1764,8 @@ check_current: gap_end = vm_start_gap(vma); if (gap_end < low_limit) return -ENOMEM; diff --git a/queue/mm-larger-stack-guard-gap-between-vmas.patch b/queue/mm-larger-stack-guard-gap-between-vmas.patch index 8130399..38f8117 100644 --- a/queue/mm-larger-stack-guard-gap-between-vmas.patch +++ b/queue/mm-larger-stack-guard-gap-between-vmas.patch @@ -1,4 +1,4 @@ -From 4993cb23698ba163b1be5467e97058f7b70fca55 Mon Sep 17 00:00:00 2001 +From eef81e9dc7bedcfa1f8d20c782430cb80a3dbe8c Mon Sep 17 00:00:00 2001 From: Hugh Dickins <hughd@google.com> Date: Mon, 19 Jun 2017 04:03:24 -0700 Subject: [PATCH] mm: larger stack guard gap, between vmas @@ -57,10 +57,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt -index 7a7af6a8e20e..7d588e59d0b0 100644 +index f1d70571e716..a5d7bac6e5e1 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -3861,6 +3861,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. +@@ -3856,6 +3856,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted. spia_pedr= spia_peddr= @@ -386,10 +386,10 @@ index 4ea71eba40a5..aac9114728c3 100644 } diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index 2750949397eb..5feada822930 100644 +index 431551db3f05..f63cc8b8603d 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -309,11 +309,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) +@@ -306,11 +306,7 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid) /* We don't show the stack guard page in /proc/maps */ start = vma->vm_start; @@ -402,10 +402,10 @@ index 2750949397eb..5feada822930 100644 seq_setwidth(m, 25 + sizeof(void *) * 6 - 1); seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu ", diff --git a/include/linux/mm.h b/include/linux/mm.h -index 582d30baaa86..31206cc2e99c 100644 +index 277cd39a6399..e4dbdc6d5516 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h -@@ -1392,39 +1392,11 @@ int clear_page_dirty_for_io(struct page *page); +@@ -1370,39 +1370,11 @@ int clear_page_dirty_for_io(struct page *page); int get_cmdline(struct task_struct *task, char *buffer, int buflen); @@ -445,7 +445,7 @@ index 582d30baaa86..31206cc2e99c 100644 int vma_is_stack_for_task(struct vm_area_struct *vma, struct task_struct *t); extern unsigned long move_page_tables(struct vm_area_struct *vma, -@@ -2153,6 +2125,7 @@ void page_cache_async_readahead(struct address_space *mapping, +@@ -2131,6 +2103,7 @@ void page_cache_async_readahead(struct address_space *mapping, pgoff_t offset, unsigned long size); @@ -453,7 +453,7 @@ index 582d30baaa86..31206cc2e99c 100644 /* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */ extern int expand_stack(struct vm_area_struct *vma, unsigned long address); -@@ -2181,6 +2154,30 @@ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * m +@@ -2159,6 +2132,30 @@ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * m return vma; } @@ -501,7 +501,7 @@ index 22cc22e7432f..4b3723734623 100644 fault_flags |= FAULT_FLAG_WRITE; if (*flags & FOLL_REMOTE) diff --git a/mm/memory.c b/mm/memory.c -index 45f39f391cc2..527ef7841146 100644 +index 793fe0f9841c..dd90377531ef 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -2695,40 +2695,6 @@ out_release: @@ -557,7 +557,7 @@ index 45f39f391cc2..527ef7841146 100644 * Use pte_alloc() instead of pte_alloc_map(). We can't run * pte_offset_map() on pmds where a huge pmd might be created diff --git a/mm/mmap.c b/mm/mmap.c -index f3ebc5a54367..c62c38dd2cfe 100644 +index ca9d91bca0d6..7656743eed2f 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -176,6 +176,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) diff --git a/queue/mm-memcontrol-use-special-workqueue-for-creating-per.patch b/queue/mm-memcontrol-use-special-workqueue-for-creating-per.patch index 0a31934..000569c 100644 --- a/queue/mm-memcontrol-use-special-workqueue-for-creating-per.patch +++ b/queue/mm-memcontrol-use-special-workqueue-for-creating-per.patch @@ -1,4 +1,4 @@ -From 13583c3d3224508582ec03d881d0b68dd3ee8e10 Mon Sep 17 00:00:00 2001 +From 1019d14540ff92e9719de7ab56769efd3a8d6a6f Mon Sep 17 00:00:00 2001 From: Vladimir Davydov <vdavydov.dev@gmail.com> Date: Mon, 12 Dec 2016 16:41:29 -0800 Subject: [PATCH] mm: memcontrol: use special workqueue for creating per-memcg @@ -36,12 +36,13 @@ Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> Cc: Pekka Enberg <penberg@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/memcontrol.c b/mm/memcontrol.c -index 0f870ba43942..91dfc7c5ce8f 100644 +index face124e24e9..a6da3f1aca60 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c -@@ -2154,6 +2154,8 @@ struct memcg_kmem_cache_create_work { +@@ -2182,6 +2182,8 @@ struct memcg_kmem_cache_create_work { struct work_struct work; }; @@ -50,7 +51,7 @@ index 0f870ba43942..91dfc7c5ce8f 100644 static void memcg_kmem_cache_create_func(struct work_struct *w) { struct memcg_kmem_cache_create_work *cw = -@@ -2185,7 +2187,7 @@ static void __memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, +@@ -2213,7 +2215,7 @@ static void __memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, cw->cachep = cachep; INIT_WORK(&cw->work, memcg_kmem_cache_create_func); @@ -59,7 +60,7 @@ index 0f870ba43942..91dfc7c5ce8f 100644 } static void memcg_schedule_kmem_cache_create(struct mem_cgroup *memcg, -@@ -5783,6 +5785,17 @@ static int __init mem_cgroup_init(void) +@@ -5806,6 +5808,17 @@ static int __init mem_cgroup_init(void) { int cpu, node; diff --git a/queue/mm-mempolicy.c-fix-error-handling-in-set_mempolicy-a.patch b/queue/mm-mempolicy.c-fix-error-handling-in-set_mempolicy-a.patch index 2d89573..142da9e 100644 --- a/queue/mm-mempolicy.c-fix-error-handling-in-set_mempolicy-a.patch +++ b/queue/mm-mempolicy.c-fix-error-handling-in-set_mempolicy-a.patch @@ -1,4 +1,4 @@ -From cf01fb9985e8deb25ccf0ea54d916b8871ae0e62 Mon Sep 17 00:00:00 2001 +From 150d8b23d89c3feb022c4506d775eda6430e707a Mon Sep 17 00:00:00 2001 From: Chris Salls <salls@cs.ucsb.edu> Date: Fri, 7 Apr 2017 23:48:11 -0700 Subject: [PATCH] mm/mempolicy.c: fix error handling in set_mempolicy and @@ -12,12 +12,13 @@ sensitive data. Signed-off-by: Chris Salls <salls@cs.ucsb.edu> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/mempolicy.c b/mm/mempolicy.c -index 75b2745bac41..37d0b334bfe9 100644 +index a5fd6533adc6..01f7011e84e2 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c -@@ -1529,7 +1529,6 @@ COMPAT_SYSCALL_DEFINE5(get_mempolicy, int __user *, policy, +@@ -1524,7 +1524,6 @@ COMPAT_SYSCALL_DEFINE5(get_mempolicy, int __user *, policy, COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask, compat_ulong_t, maxnode) { @@ -25,7 +26,7 @@ index 75b2745bac41..37d0b334bfe9 100644 unsigned long __user *nm = NULL; unsigned long nr_bits, alloc_size; DECLARE_BITMAP(bm, MAX_NUMNODES); -@@ -1538,14 +1537,13 @@ COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask, +@@ -1533,14 +1532,13 @@ COMPAT_SYSCALL_DEFINE3(set_mempolicy, int, mode, compat_ulong_t __user *, nmask, alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8; if (nmask) { @@ -44,7 +45,7 @@ index 75b2745bac41..37d0b334bfe9 100644 return sys_set_mempolicy(mode, nm, nr_bits+1); } -@@ -1553,7 +1551,6 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len, +@@ -1548,7 +1546,6 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len, compat_ulong_t, mode, compat_ulong_t __user *, nmask, compat_ulong_t, maxnode, compat_ulong_t, flags) { @@ -52,7 +53,7 @@ index 75b2745bac41..37d0b334bfe9 100644 unsigned long __user *nm = NULL; unsigned long nr_bits, alloc_size; nodemask_t bm; -@@ -1562,14 +1559,13 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len, +@@ -1557,14 +1554,13 @@ COMPAT_SYSCALL_DEFINE6(mbind, compat_ulong_t, start, compat_ulong_t, len, alloc_size = ALIGN(nr_bits, BITS_PER_LONG) / 8; if (nmask) { diff --git a/queue/mm-page_alloc.c-fix-print-order-in-show_free_areas.patch b/queue/mm-page_alloc.c-fix-print-order-in-show_free_areas.patch index 0008f0a..3faf2be 100644 --- a/queue/mm-page_alloc.c-fix-print-order-in-show_free_areas.patch +++ b/queue/mm-page_alloc.c-fix-print-order-in-show_free_areas.patch @@ -1,4 +1,4 @@ -From 1f06b81aea5ecba2c1f8afd87e0ba1b9f8f90160 Mon Sep 17 00:00:00 2001 +From d17a3f0cf865350e0e9050e8c2ee9d095b66fc27 Mon Sep 17 00:00:00 2001 From: Alexander Polakov <apolyakov@beget.ru> Date: Fri, 7 Apr 2017 16:04:45 -0700 Subject: [PATCH] mm/page_alloc.c: fix print order in show_free_areas() @@ -14,12 +14,13 @@ Cc: Vlastimil Babka <vbabka@suse.cz> Cc: <stable@vger.kernel.org> [4.8+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/page_alloc.c b/mm/page_alloc.c -index 6cbde310abed..d6a665057d61 100644 +index 091c57712846..a549a6a6a338 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c -@@ -4519,13 +4519,13 @@ void show_free_areas(unsigned int filter, nodemask_t *nodemask) +@@ -4269,13 +4269,13 @@ void show_free_areas(unsigned int filter) K(node_page_state(pgdat, NR_FILE_MAPPED)), K(node_page_state(pgdat, NR_FILE_DIRTY)), K(node_page_state(pgdat, NR_WRITEBACK)), diff --git a/queue/mmc-sdhci-msm-Enable-few-quirks.patch b/queue/mmc-sdhci-msm-Enable-few-quirks.patch index 8f8078c..03689f3 100644 --- a/queue/mmc-sdhci-msm-Enable-few-quirks.patch +++ b/queue/mmc-sdhci-msm-Enable-few-quirks.patch @@ -1,4 +1,4 @@ -From a0e3142869d29688de6f77be31aa7a401a4a88f1 Mon Sep 17 00:00:00 2001 +From f06666886de915a13d1c625524692b30906d41e8 Mon Sep 17 00:00:00 2001 From: Ritesh Harjani <riteshh@codeaurora.org> Date: Mon, 21 Nov 2016 12:07:18 +0530 Subject: [PATCH] mmc: sdhci-msm: Enable few quirks @@ -12,12 +12,13 @@ Signed-off-by: Sahitya Tummala <stummala@codeaurora.org> Signed-off-by: Ritesh Harjani <riteshh@codeaurora.org> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c -index aaeaf475e395..15a8b8e70ff9 100644 +index 90ed2e12d345..437e4807727d 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c -@@ -592,7 +592,9 @@ static const struct sdhci_ops sdhci_msm_ops = { +@@ -524,7 +524,9 @@ static const struct sdhci_ops sdhci_msm_ops = { static const struct sdhci_pltfm_data sdhci_msm_pdata = { .quirks = SDHCI_QUIRK_BROKEN_CARD_DETECTION | SDHCI_QUIRK_NO_CARD_NO_RESET | diff --git a/queue/mmc-sdhci-of-esdhc-remove-default-broken-cd-for-ARM.patch b/queue/mmc-sdhci-of-esdhc-remove-default-broken-cd-for-ARM.patch index 6adf9ca..122774a 100644 --- a/queue/mmc-sdhci-of-esdhc-remove-default-broken-cd-for-ARM.patch +++ b/queue/mmc-sdhci-of-esdhc-remove-default-broken-cd-for-ARM.patch @@ -1,4 +1,4 @@ -From e9acc77dd046b22c7ebf70e35f68968978445f8b Mon Sep 17 00:00:00 2001 +From c4ebacda84a54b7c98171ffad38c2584e8fb5d81 Mon Sep 17 00:00:00 2001 From: yangbo lu <yangbo.lu@nxp.com> Date: Mon, 26 Dec 2016 17:40:44 +0800 Subject: [PATCH] mmc: sdhci-of-esdhc: remove default broken-cd for ARM @@ -20,12 +20,13 @@ little-endian eSDHC) This makes broken-cd property work again for ARM. Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com> Acked-by: Adrian Hunter <adrian.hunter@intel.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c -index 9a6eb4492172..364f6b87a728 100644 +index 2267601f0ac1..cfd5b64576d9 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c -@@ -569,16 +569,19 @@ static const struct sdhci_ops sdhci_esdhc_le_ops = { +@@ -559,16 +559,19 @@ static const struct sdhci_ops sdhci_esdhc_le_ops = { }; static const struct sdhci_pltfm_data sdhci_esdhc_be_pdata = { @@ -51,7 +52,7 @@ index 9a6eb4492172..364f6b87a728 100644 .ops = &sdhci_esdhc_le_ops, }; -@@ -643,8 +646,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) +@@ -623,8 +626,7 @@ static int sdhci_esdhc_probe(struct platform_device *pdev) of_device_is_compatible(np, "fsl,p5020-esdhc") || of_device_is_compatible(np, "fsl,p4080-esdhc") || of_device_is_compatible(np, "fsl,p1020-esdhc") || diff --git a/queue/mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch b/queue/mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch index d1bb01b..9930762 100644 --- a/queue/mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch +++ b/queue/mtd-bcm47xxpart-fix-parsing-first-block-after-aligne.patch @@ -1,4 +1,4 @@ -From bd5d21310133921021d78995ad6346f908483124 Mon Sep 17 00:00:00 2001 +From af833a75f58559eef4ae318a64d3bd01a2c7ba8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> Date: Sun, 20 Nov 2016 16:09:30 +0100 Subject: [PATCH] mtd: bcm47xxpart: fix parsing first block after aligned TRX @@ -17,6 +17,7 @@ This fixes calculation and simplifies the comment. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> Signed-off-by: Brian Norris <computersforpeace@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c index 377947580203..283ff7e17a0f 100644 diff --git a/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch b/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch index adfba09..51e6ea1 100644 --- a/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch +++ b/queue/nbd-use-loff_t-for-blocksize-and-nbd_set_size-args.patch @@ -1,4 +1,4 @@ -From c4fe05b47060bcb19876f6cf6860f05da380f9a7 Mon Sep 17 00:00:00 2001 +From be7b1c46fa4033879ea7c85726f58b7370995b71 Mon Sep 17 00:00:00 2001 From: Josef Bacik <jbacik@fb.com> Date: Fri, 2 Dec 2016 16:19:12 -0500 Subject: [PATCH] nbd: use loff_t for blocksize and nbd_set_size args diff --git a/queue/net-ipv6-check-route-protocol-when-deleting-routes.patch b/queue/net-ipv6-check-route-protocol-when-deleting-routes.patch index e49d339..6b4e05b 100644 --- a/queue/net-ipv6-check-route-protocol-when-deleting-routes.patch +++ b/queue/net-ipv6-check-route-protocol-when-deleting-routes.patch @@ -1,4 +1,4 @@ -From c2ed1880fd61a998e3ce40254a99a2ad000f1a7d Mon Sep 17 00:00:00 2001 +From 206cdb3a765fa3a7fcacf6f32bbc0722823d8455 Mon Sep 17 00:00:00 2001 From: Mantas M <grawity@gmail.com> Date: Fri, 16 Dec 2016 10:30:59 +0200 Subject: [PATCH] net: ipv6: check route protocol when deleting routes @@ -16,12 +16,13 @@ This can be verified using `ip -6 route del <prefix> proto something`. Signed-off-by: Mantas Mikulėnas <grawity@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/ipv6/route.c b/net/ipv6/route.c -index 2413a0637d99..890acace01d0 100644 +index a5351aa492b3..9fd2414836c1 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c -@@ -2174,6 +2174,8 @@ static int ip6_route_del(struct fib6_config *cfg) +@@ -2155,6 +2155,8 @@ static int ip6_route_del(struct fib6_config *cfg) continue; if (cfg->fc_metric && cfg->fc_metric != rt->rt6i_metric) continue; diff --git a/queue/net-mlx4_core-Fix-racy-CQ-Completion-Queue-free.patch b/queue/net-mlx4_core-Fix-racy-CQ-Completion-Queue-free.patch index 3c6bb91..0d92ca1 100644 --- a/queue/net-mlx4_core-Fix-racy-CQ-Completion-Queue-free.patch +++ b/queue/net-mlx4_core-Fix-racy-CQ-Completion-Queue-free.patch @@ -1,4 +1,4 @@ -From 291c566a28910614ce42d0ffe82196eddd6346f4 Mon Sep 17 00:00:00 2001 +From a043165eaf19bcc3451eae420422913d13bec273 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein <jackm@dev.mellanox.co.il> Date: Mon, 16 Jan 2017 18:31:37 +0200 Subject: [PATCH] net/mlx4_core: Fix racy CQ (Completion Queue) free @@ -43,6 +43,7 @@ Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il> Signed-off-by: Matan Barak <matanb@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.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/mellanox/mlx4/cq.c b/drivers/net/ethernet/mellanox/mlx4/cq.c index a849da92f857..6b8635378f1f 100644 diff --git a/queue/net-mlx4_core-Fix-when-to-save-some-qp-context-flags.patch b/queue/net-mlx4_core-Fix-when-to-save-some-qp-context-flags.patch index f386e25..1b3ac1b 100644 --- a/queue/net-mlx4_core-Fix-when-to-save-some-qp-context-flags.patch +++ b/queue/net-mlx4_core-Fix-when-to-save-some-qp-context-flags.patch @@ -1,4 +1,4 @@ -From 7c3945bc2073554bb2ecf983e073dee686679c53 Mon Sep 17 00:00:00 2001 +From 42a45ef3d7d3d61b3950be7c4cb7e29b30af6082 Mon Sep 17 00:00:00 2001 From: Jack Morgenstein <jackm@dev.mellanox.co.il> Date: Mon, 16 Jan 2017 18:31:38 +0200 Subject: [PATCH] net/mlx4_core: Fix when to save some qp context flags for @@ -20,12 +20,13 @@ Fixes: f0f829bf42cd ("net/mlx4_core: Add immediate activate for VGT->VST->VGT") Signed-off-by: Jack Morgenstein <jackm@dev.mellanox.co.il> Signed-off-by: Tariq Toukan <tariqt@mellanox.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/mellanox/mlx4/resource_tracker.c b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c -index 56185a0b827d..1822382212ee 100644 +index 8b81114bdc72..8fd47ab39237 100644 --- a/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +++ b/drivers/net/ethernet/mellanox/mlx4/resource_tracker.c -@@ -2980,6 +2980,9 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave, +@@ -2963,6 +2963,9 @@ int mlx4_RST2INIT_QP_wrapper(struct mlx4_dev *dev, int slave, put_res(dev, slave, srqn, RES_SRQ); qp->srq = srq; } @@ -35,7 +36,7 @@ index 56185a0b827d..1822382212ee 100644 put_res(dev, slave, rcqn, RES_CQ); put_res(dev, slave, mtt_base, RES_MTT); res_end_move(dev, slave, RES_QP, qpn); -@@ -3772,7 +3775,6 @@ int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave, +@@ -3755,7 +3758,6 @@ int mlx4_INIT2RTR_QP_wrapper(struct mlx4_dev *dev, int slave, int qpn = vhcr->in_modifier & 0x7fffff; struct res_qp *qp; u8 orig_sched_queue; @@ -43,7 +44,7 @@ index 56185a0b827d..1822382212ee 100644 u8 orig_vlan_control = qpc->pri_path.vlan_control; u8 orig_fvl_rx = qpc->pri_path.fvl_rx; u8 orig_pri_path_fl = qpc->pri_path.fl; -@@ -3814,7 +3816,6 @@ out: +@@ -3797,7 +3799,6 @@ out: */ if (!err) { qp->sched_queue = orig_sched_queue; diff --git a/queue/net-mlx4_core-Use-device-ID-defines.patch b/queue/net-mlx4_core-Use-device-ID-defines.patch index b01f34b..a8dab40 100644 --- a/queue/net-mlx4_core-Use-device-ID-defines.patch +++ b/queue/net-mlx4_core-Use-device-ID-defines.patch @@ -1,4 +1,4 @@ -From c19e4b9037fa8a0477525a64e93847f534e8cc17 Mon Sep 17 00:00:00 2001 +From 86839aa8f67117ab2b21a8cfc34b4f9a045291c3 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas <bhelgaas@google.com> Date: Thu, 17 Nov 2016 16:11:39 -0600 Subject: [PATCH] net/mlx4_core: Use device ID defines @@ -11,6 +11,7 @@ both places. No functional change intended. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Tariq Toukan <tariqt@mellanox.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 7183ac4135d2..62788b7c728d 100644 diff --git a/queue/net-mlx4_en-Fix-bad-WQE-issue.patch b/queue/net-mlx4_en-Fix-bad-WQE-issue.patch index c9e620e..9af647b 100644 --- a/queue/net-mlx4_en-Fix-bad-WQE-issue.patch +++ b/queue/net-mlx4_en-Fix-bad-WQE-issue.patch @@ -1,4 +1,4 @@ -From 6496bbf0ec481966ef9ffe5b6660d8d1b55c60cc Mon Sep 17 00:00:00 2001 +From 7b5641a39a9f5808f0cc2ae9a5e7defbd1788596 Mon Sep 17 00:00:00 2001 From: Eugenia Emantayev <eugenia@mellanox.com> Date: Thu, 29 Dec 2016 18:37:10 +0200 Subject: [PATCH] net/mlx4_en: Fix bad WQE issue @@ -13,12 +13,13 @@ Fixes: 9f519f68cfff ('mlx4_en: Not using Shared Receive Queues') Signed-off-by: Eugenia Emantayev <eugenia@mellanox.com> Signed-off-by: Tariq Toukan <tariqt@mellanox.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/mellanox/mlx4/en_rx.c b/drivers/net/ethernet/mellanox/mlx4/en_rx.c -index 3c37e216bbf3..eac527e25ec9 100644 +index 134370869cef..f24c195ea8d8 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_rx.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_rx.c -@@ -445,8 +445,14 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) +@@ -443,8 +443,14 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv) ring->cqn = priv->rx_cq[ring_ind]->mcq.cqn; ring->stride = stride; diff --git a/queue/net-packet-fix-overflow-in-check-for-priv-area-size.patch b/queue/net-packet-fix-overflow-in-check-for-priv-area-size.patch index ec99b93..f6a5067 100644 --- a/queue/net-packet-fix-overflow-in-check-for-priv-area-size.patch +++ b/queue/net-packet-fix-overflow-in-check-for-priv-area-size.patch @@ -1,4 +1,4 @@ -From 2b6867c2ce76c596676bec7d2d525af525fdc6e2 Mon Sep 17 00:00:00 2001 +From bfca70a1e25a461b55452dc370a6006518f44239 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov <andreyknvl@google.com> Date: Wed, 29 Mar 2017 16:11:20 +0200 Subject: [PATCH] net/packet: fix overflow in check for priv area size @@ -17,12 +17,13 @@ it can overflow inside BLK_PLUS_PRIV otherwise. Signed-off-by: Andrey Konovalov <andreyknvl@google.com> Acked-by: Eric Dumazet <edumazet@google.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c -index a0dbe7ca8f72..2323ee35dc09 100644 +index b3dc668b0da7..4df49bae4f1f 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -4193,8 +4193,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, +@@ -4222,8 +4222,8 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, if (unlikely(!PAGE_ALIGNED(req->tp_block_size))) goto out; if (po->tp_version >= TPACKET_V3 && diff --git a/queue/nios2-reserve-boot-memory-for-device-tree.patch b/queue/nios2-reserve-boot-memory-for-device-tree.patch index ddab018..51d3e4d 100644 --- a/queue/nios2-reserve-boot-memory-for-device-tree.patch +++ b/queue/nios2-reserve-boot-memory-for-device-tree.patch @@ -1,4 +1,4 @@ -From 921d701e6f31e1ffaca3560416af1aa04edb4c4f Mon Sep 17 00:00:00 2001 +From 0b6a815bd464619591e022ff88c3321991339a3b Mon Sep 17 00:00:00 2001 From: Tobias Klauser <tklauser@distanz.ch> Date: Sun, 2 Apr 2017 20:08:04 -0700 Subject: [PATCH] nios2: reserve boot memory for device tree @@ -33,6 +33,7 @@ Reference: http://lkml.kernel.org/r/20170226210338.GA19476@roeck-us.net Tested-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Acked-by: Ley Foon Tan <ley.foon.tan@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 367c5426157b..3901b80d4420 100644 @@ -53,10 +54,10 @@ index 367c5426157b..3901b80d4420 100644 { __be32 *dtb = (u32 *)__dtb_start; diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c -index 6e57ffa5db27..6044d9be28b4 100644 +index a4ff86d58d5c..6c4e351a7930 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c -@@ -201,6 +201,9 @@ void __init setup_arch(char **cmdline_p) +@@ -195,6 +195,9 @@ void __init setup_arch(char **cmdline_p) } #endif /* CONFIG_BLK_DEV_INITRD */ diff --git a/queue/nvme-simplify-stripe-quirk.patch b/queue/nvme-simplify-stripe-quirk.patch index 5543e06..7de7f28 100644 --- a/queue/nvme-simplify-stripe-quirk.patch +++ b/queue/nvme-simplify-stripe-quirk.patch @@ -1,4 +1,4 @@ -From e6282aef7b89a11d26e731060c4409b7aac278bf Mon Sep 17 00:00:00 2001 +From 7c6e9989a4ad40ca657a7b85519873ec1d829527 Mon Sep 17 00:00:00 2001 From: Keith Busch <keith.busch@intel.com> Date: Mon, 19 Dec 2016 11:37:50 -0500 Subject: [PATCH] nvme: simplify stripe quirk @@ -19,12 +19,13 @@ transfer size for the devices using this quirk. Signed-off-by: Keith Busch <keith.busch@intel.com> Signed-off-by: Christoph Hellwig <hch@lst.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c -index b40cfb076f02..2fc86dc7a8df 100644 +index f56fa1cff25d..0aaa1589e09e 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c -@@ -1193,8 +1193,8 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, +@@ -1194,8 +1194,8 @@ static void nvme_set_queue_limits(struct nvme_ctrl *ctrl, blk_queue_max_hw_sectors(q, ctrl->max_hw_sectors); blk_queue_max_segments(q, min_t(u32, max_segments, USHRT_MAX)); } @@ -35,7 +36,7 @@ index b40cfb076f02..2fc86dc7a8df 100644 blk_queue_virt_boundary(q, ctrl->page_size - 1); if (ctrl->vwc & NVME_CTRL_VWC_PRESENT) vwc = true; -@@ -1250,19 +1250,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) +@@ -1251,19 +1251,6 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) ctrl->max_hw_sectors = min_not_zero(ctrl->max_hw_sectors, max_hw_sectors); @@ -56,10 +57,10 @@ index b40cfb076f02..2fc86dc7a8df 100644 ctrl->sgls = le32_to_cpu(id->sgls); ctrl->kas = le16_to_cpu(id->kas); diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h -index bd5321441d12..6377e14586dc 100644 +index ab18b78102bf..334f9218a23d 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h -@@ -135,7 +135,6 @@ struct nvme_ctrl { +@@ -120,7 +120,6 @@ struct nvme_ctrl { u32 page_size; u32 max_hw_sectors; diff --git a/queue/orangefs-fix-buffer-size-mis-match-between-kernel-sp.patch b/queue/orangefs-fix-buffer-size-mis-match-between-kernel-sp.patch index d072613..05344d6 100644 --- a/queue/orangefs-fix-buffer-size-mis-match-between-kernel-sp.patch +++ b/queue/orangefs-fix-buffer-size-mis-match-between-kernel-sp.patch @@ -1,4 +1,4 @@ -From eb68d0324dc4d88ab0d6159bdcd98c247a3a8954 Mon Sep 17 00:00:00 2001 +From 8fb5e113e02814145dfb1eedbba73390f16d5cf8 Mon Sep 17 00:00:00 2001 From: Mike Marshall <hubcap@omnibond.com> Date: Tue, 7 Feb 2017 12:41:02 -0500 Subject: [PATCH] orangefs: fix buffer size mis-match between kernel space and @@ -16,12 +16,13 @@ debug levels are set. This patch sets the kernel side buffer to 2K to match the userspace side... Signed-off-by: Mike Marshall <hubcap@omnibond.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/orangefs/orangefs-dev-proto.h b/fs/orangefs/orangefs-dev-proto.h -index a3d84ffee905..f380f9ed1b28 100644 +index 9eac9d9a3f3a..a24c447d032f 100644 --- a/fs/orangefs/orangefs-dev-proto.h +++ b/fs/orangefs/orangefs-dev-proto.h -@@ -50,8 +50,7 @@ +@@ -46,8 +46,7 @@ * Misc constants. Please retain them as multiples of 8! * Otherwise 32-64 bit interactions will be messed up :) */ diff --git a/queue/perf-x86-Avoid-exposing-wrong-stale-data-in-intel_pm.patch b/queue/perf-x86-Avoid-exposing-wrong-stale-data-in-intel_pm.patch index ba4a622..f396a35 100644 --- a/queue/perf-x86-Avoid-exposing-wrong-stale-data-in-intel_pm.patch +++ b/queue/perf-x86-Avoid-exposing-wrong-stale-data-in-intel_pm.patch @@ -1,4 +1,4 @@ -From f2200ac311302fcdca6556fd0c5127eab6c65a3e Mon Sep 17 00:00:00 2001 +From e8fca0f1ba329770c76c93ec63f4472dd25c8e16 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Tue, 11 Apr 2017 10:10:28 +0200 Subject: [PATCH] perf/x86: Avoid exposing wrong/stale data in @@ -17,12 +17,13 @@ Cc: linux-kernel@vger.kernel.org Cc: <stable@vger.kernel.org> Fixes: 135c5612c460 ("perf/x86/intel: Support Haswell/v4 LBR format") Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/events/intel/lbr.c b/arch/x86/events/intel/lbr.c -index 81b321ace8e0..f924629836a8 100644 +index 707d358e0dff..5d97308f1e11 100644 --- a/arch/x86/events/intel/lbr.c +++ b/arch/x86/events/intel/lbr.c -@@ -507,6 +507,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) +@@ -513,6 +513,9 @@ static void intel_pmu_lbr_read_32(struct cpu_hw_events *cpuc) cpuc->lbr_entries[i].to = msr_lastbranch.to; cpuc->lbr_entries[i].mispred = 0; cpuc->lbr_entries[i].predicted = 0; diff --git a/queue/platform-x86-acer-wmi-Only-supports-AMW0_GUID1-on-ac.patch b/queue/platform-x86-acer-wmi-Only-supports-AMW0_GUID1-on-ac.patch index 6d7d602..a3fa96f 100644 --- a/queue/platform-x86-acer-wmi-Only-supports-AMW0_GUID1-on-ac.patch +++ b/queue/platform-x86-acer-wmi-Only-supports-AMW0_GUID1-on-ac.patch @@ -1,4 +1,4 @@ -From 5241b1938a4d33eee3d3b43f23067c8e5b96db45 Mon Sep 17 00:00:00 2001 +From 4d0f18b5c772a3df19998f98faac7883e6305bb5 Mon Sep 17 00:00:00 2001 From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> Date: Tue, 1 Nov 2016 12:30:58 +0800 Subject: [PATCH] platform/x86: acer-wmi: Only supports AMW0_GUID1 on acer @@ -26,6 +26,7 @@ compatibility. Tested-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Lee, Chun-Yi <jlee@suse.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index 79d64ea00bfb..a66192f692e3 100644 diff --git a/queue/platform-x86-acer-wmi-setup-accelerometer-when-machi.patch b/queue/platform-x86-acer-wmi-setup-accelerometer-when-machi.patch index 5176db6..150c235 100644 --- a/queue/platform-x86-acer-wmi-setup-accelerometer-when-machi.patch +++ b/queue/platform-x86-acer-wmi-setup-accelerometer-when-machi.patch @@ -1,4 +1,4 @@ -From 98d610c3739ac354319a6590b915f4624d9151e6 Mon Sep 17 00:00:00 2001 +From 1d950daef01fa35d26600c34e4820485f56a0f19 Mon Sep 17 00:00:00 2001 From: "Lee, Chun-Yi" <joeyli.kernel@gmail.com> Date: Thu, 3 Nov 2016 08:18:52 +0800 Subject: [PATCH] platform/x86: acer-wmi: setup accelerometer when machine has @@ -23,6 +23,7 @@ Cc: Darren Hart <dvhart@infradead.org> Signed-off-by: Lee, Chun-Yi <jlee@suse.com> [andy: slightly massage commit message] Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index a66192f692e3..c29b9b611ab2 100644 diff --git a/queue/platform-x86-asus-wmi-Detect-quirk_no_rfkill-from-th.patch b/queue/platform-x86-asus-wmi-Detect-quirk_no_rfkill-from-th.patch index 75e2d13..2a29c10 100644 --- a/queue/platform-x86-asus-wmi-Detect-quirk_no_rfkill-from-th.patch +++ b/queue/platform-x86-asus-wmi-Detect-quirk_no_rfkill-from-th.patch @@ -1,4 +1,4 @@ -From 71050ae7bf83e4d71a859257d11adc5de517073e Mon Sep 17 00:00:00 2001 +From 717aff9ea9d3895907f80d69703ea515fcd6d489 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= <jprvita@gmail.com> Date: Mon, 20 Feb 2017 14:50:22 -0500 Subject: [PATCH] platform/x86: asus-wmi: Detect quirk_no_rfkill from the DSDT @@ -42,9 +42,10 @@ and ASUS_WMI_DSTS_USER_BIT avoids adding DMI-based quirks for at least Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c -index 43cb680adbb4..8499d3ae4257 100644 +index 8cd689a4e3b8..f081008a19e1 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c @@ -159,6 +159,8 @@ MODULE_LICENSE("GPL"); @@ -87,7 +88,7 @@ index 43cb680adbb4..8499d3ae4257 100644 if (!asus->driver->quirks->no_rfkill) { err = asus_wmi_rfkill_init(asus); if (err) -@@ -2134,10 +2153,6 @@ static int asus_wmi_add(struct platform_device *pdev) +@@ -2131,10 +2150,6 @@ static int asus_wmi_add(struct platform_device *pdev) if (err) goto fail_debugfs; diff --git a/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch b/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch index cbabd1b..d833c24 100644 --- a/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch +++ b/queue/platform-x86-asus-wmi-Set-specified-XUSB2PR-value-fo.patch @@ -1,4 +1,4 @@ -From cf33ea153081d47ca5155a5ad9da33adf15b8076 Mon Sep 17 00:00:00 2001 +From 110742d03c45dbf965c0a2f05a26dada892dfacd Mon Sep 17 00:00:00 2001 From: Kai-Chuan Hsieh <kai.chiuan@gmail.com> Date: Thu, 1 Sep 2016 23:55:55 +0800 Subject: [PATCH] platform/x86: asus-wmi: Set specified XUSB2PR value for diff --git a/queue/powerpc-64-Fix-flush_-d-i-cache_range-called-from-mo.patch b/queue/powerpc-64-Fix-flush_-d-i-cache_range-called-from-mo.patch index 41f5a54..f679d5d 100644 --- a/queue/powerpc-64-Fix-flush_-d-i-cache_range-called-from-mo.patch +++ b/queue/powerpc-64-Fix-flush_-d-i-cache_range-called-from-mo.patch @@ -1,4 +1,4 @@ -From 8f5f525d5b83f7d76a6baf9c4e94d4bf312ea7f6 Mon Sep 17 00:00:00 2001 +From 875dc3141f9425ec982f96e494652ef2b3b6b2f5 Mon Sep 17 00:00:00 2001 From: Oliver O'Halloran <oohall@gmail.com> Date: Mon, 3 Apr 2017 13:25:12 +1000 Subject: [PATCH] powerpc/64: Fix flush_(d|i)cache_range() called from modules @@ -22,12 +22,13 @@ Fixes: 721aeaa9fdf3 ("powerpc: Build little endian ppc64 kernel with ABIv2") Cc: stable@vger.kernel.org # v3.16+ Signed-off-by: Oliver O'Halloran <oohall@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/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S -index ae179cb1bb3c..c119044cad0d 100644 +index 5d7e583f1588..457b8dba021e 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S -@@ -67,7 +67,7 @@ PPC64_CACHES: +@@ -66,7 +66,7 @@ PPC64_CACHES: * flush all bytes from start through stop-1 inclusive */ @@ -36,7 +37,7 @@ index ae179cb1bb3c..c119044cad0d 100644 BEGIN_FTR_SECTION PURGE_PREFETCHED_INS blr -@@ -120,7 +120,7 @@ EXPORT_SYMBOL(flush_icache_range) +@@ -118,7 +118,7 @@ _ASM_NOKPROBE_SYMBOL(flush_icache_range) * * flush all bytes from start to stop-1 inclusive */ diff --git a/queue/powerpc-Disable-HFSCR-TM-if-TM-is-not-supported.patch b/queue/powerpc-Disable-HFSCR-TM-if-TM-is-not-supported.patch index 52af66d..b8cd5eb 100644 --- a/queue/powerpc-Disable-HFSCR-TM-if-TM-is-not-supported.patch +++ b/queue/powerpc-Disable-HFSCR-TM-if-TM-is-not-supported.patch @@ -1,4 +1,4 @@ -From 7ed23e1bae8bf7e37fd555066550a00b95a3a98b Mon Sep 17 00:00:00 2001 +From f5d1ea75be2a1d6949a83b74efbbef74cb287c6d Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt <benh@kernel.crashing.org> Date: Mon, 20 Mar 2017 17:49:03 +1100 Subject: [PATCH] powerpc: Disable HFSCR[TM] if TM is not supported @@ -30,12 +30,13 @@ Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Tested-by: Sam Bobroff <sam.bobroff@au1.ibm.com> [mpe: Rewrite change log with input from Sam, add Fixes/stable] Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c -index 9cfaa8b69b5f..f997154dfc41 100644 +index 8d586cff8a41..a12be60181bf 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c -@@ -236,6 +236,15 @@ static void cpu_ready_for_interrupts(void) +@@ -245,6 +245,15 @@ static void cpu_ready_for_interrupts(void) mtspr(SPRN_LPCR, lpcr | LPCR_AIL_3); } diff --git a/queue/powerpc-Don-t-try-to-fix-up-misaligned-load-with-res.patch b/queue/powerpc-Don-t-try-to-fix-up-misaligned-load-with-res.patch index 7db4b69..8116841 100644 --- a/queue/powerpc-Don-t-try-to-fix-up-misaligned-load-with-res.patch +++ b/queue/powerpc-Don-t-try-to-fix-up-misaligned-load-with-res.patch @@ -1,4 +1,4 @@ -From 48fe9e9488743eec9b7c1addd3c93f12f2123d54 Mon Sep 17 00:00:00 2001 +From de2972c78441162fc9ebc69b4cb44465cf3aafaa Mon Sep 17 00:00:00 2001 From: Paul Mackerras <paulus@ozlabs.org> Date: Tue, 4 Apr 2017 14:56:05 +1000 Subject: [PATCH] powerpc: Don't try to fix up misaligned load-with-reservation @@ -27,9 +27,10 @@ in a SIGBUS being delivered to the process. Cc: stable@vger.kernel.org Signed-off-by: Paul Mackerras <paulus@ozlabs.org> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c -index cbc7c42cdb74..ec7a8b099dd9 100644 +index 033f3385fa49..b2da7c8baed7 100644 --- a/arch/powerpc/kernel/align.c +++ b/arch/powerpc/kernel/align.c @@ -807,14 +807,25 @@ int fix_alignment(struct pt_regs *regs) diff --git a/queue/powerpc-crypto-crc32c-vpmsum-Fix-missing-preempt_dis.patch b/queue/powerpc-crypto-crc32c-vpmsum-Fix-missing-preempt_dis.patch index 9e6963c..0a3d8fa 100644 --- a/queue/powerpc-crypto-crc32c-vpmsum-Fix-missing-preempt_dis.patch +++ b/queue/powerpc-crypto-crc32c-vpmsum-Fix-missing-preempt_dis.patch @@ -1,4 +1,4 @@ -From 4749228f022893faf54a3dbc70796f78b7d4f342 Mon Sep 17 00:00:00 2001 +From 8ec3265f11ee910f8b66a4743cb2327fb1e32dcf Mon Sep 17 00:00:00 2001 From: Michael Ellerman <mpe@ellerman.id.au> Date: Thu, 6 Apr 2017 23:34:38 +1000 Subject: [PATCH] powerpc/crypto/crc32c-vpmsum: Fix missing preempt_disable() @@ -48,6 +48,7 @@ disables. Fixes: 6dd7a82cc54e ("crypto: powerpc - Add POWER8 optimised crc32c") Cc: stable@vger.kernel.org # v4.8+ Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/crypto/crc32c-vpmsum_glue.c b/arch/powerpc/crypto/crc32c-vpmsum_glue.c index 411994551afc..f058e0c3e4d4 100644 diff --git a/queue/powerpc-kernel-Use-kprobe-blacklist-for-asm-function.patch b/queue/powerpc-kernel-Use-kprobe-blacklist-for-asm-function.patch index 6453f71..5f16b57 100644 --- a/queue/powerpc-kernel-Use-kprobe-blacklist-for-asm-function.patch +++ b/queue/powerpc-kernel-Use-kprobe-blacklist-for-asm-function.patch @@ -1,4 +1,4 @@ -From 6f698df10cb24d466b9a790b9daedb9e7bcd5d2a Mon Sep 17 00:00:00 2001 +From 7891f34ac45a3dfcc387959954e66f9df9ee7b65 Mon Sep 17 00:00:00 2001 From: Nicholas Piggin <npiggin@gmail.com> Date: Fri, 16 Sep 2016 20:48:17 +1000 Subject: [PATCH] powerpc/kernel: Use kprobe blacklist for asm functions @@ -14,6 +14,7 @@ cleanup. 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/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h index d5d5b5e348f2..cd39ac127786 100644 @@ -83,7 +84,7 @@ index d5d5b5e348f2..cd39ac127786 100644 #define FUNC_END(name) diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S -index d9c912b6e632..03756ffdcd71 100644 +index f2f787ec3cd6..e3d9d5562e01 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S @@ -328,7 +328,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE) diff --git a/queue/powerpc-mm-Add-missing-global-TLB-invalidate-if-cxl-.patch b/queue/powerpc-mm-Add-missing-global-TLB-invalidate-if-cxl-.patch index dc11d01..3220d46 100644 --- a/queue/powerpc-mm-Add-missing-global-TLB-invalidate-if-cxl-.patch +++ b/queue/powerpc-mm-Add-missing-global-TLB-invalidate-if-cxl-.patch @@ -1,4 +1,4 @@ -From 88b1bf7268f56887ca88eb09c6fb0f4fc970121a Mon Sep 17 00:00:00 2001 +From ff72ea3c1011509fa0d9d1506ce4093beafcce34 Mon Sep 17 00:00:00 2001 From: Frederic Barrat <fbarrat@linux.vnet.ibm.com> Date: Wed, 29 Mar 2017 19:19:42 +0200 Subject: [PATCH] powerpc/mm: Add missing global TLB invalidate if cxl is @@ -21,12 +21,13 @@ Cc: stable@vger.kernel.org # v3.18+ Signed-off-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/powerpc/mm/hash_native_64.c b/arch/powerpc/mm/hash_native_64.c -index cc332608e656..65bb8f33b399 100644 +index 1d83e933bef5..5e44a2257bdf 100644 --- a/arch/powerpc/mm/hash_native_64.c +++ b/arch/powerpc/mm/hash_native_64.c -@@ -638,6 +638,10 @@ static void native_flush_hash_range(unsigned long number, int local) +@@ -674,6 +674,10 @@ static void native_flush_hash_range(unsigned long number, int local) unsigned long psize = batch->psize; int ssize = batch->ssize; int i; @@ -37,7 +38,7 @@ index cc332608e656..65bb8f33b399 100644 local_irq_save(flags); -@@ -667,8 +671,7 @@ static void native_flush_hash_range(unsigned long number, int local) +@@ -703,8 +707,7 @@ static void native_flush_hash_range(unsigned long number, int local) } pte_iterate_hashed_end(); } diff --git a/queue/ptrace-fix-PTRACE_LISTEN-race-corrupting-task-state.patch b/queue/ptrace-fix-PTRACE_LISTEN-race-corrupting-task-state.patch index 70b258a..4d6e5f0 100644 --- a/queue/ptrace-fix-PTRACE_LISTEN-race-corrupting-task-state.patch +++ b/queue/ptrace-fix-PTRACE_LISTEN-race-corrupting-task-state.patch @@ -1,4 +1,4 @@ -From 5402e97af667e35e54177af8f6575518bf251d51 Mon Sep 17 00:00:00 2001 +From d13edb33989cb84e8331cdc1aea69521870d5312 Mon Sep 17 00:00:00 2001 From: "bsegall@google.com" <bsegall@google.com> Date: Fri, 7 Apr 2017 16:04:51 -0700 Subject: [PATCH] ptrace: fix PTRACE_LISTEN race corrupting task->state @@ -28,12 +28,13 @@ Acked-by: Oleg Nesterov <oleg@redhat.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/ptrace.c b/kernel/ptrace.c -index 0af928712174..266ddcc1d8bb 100644 +index 7b20baea41e7..4baf6d6a6d8c 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c -@@ -184,11 +184,17 @@ static void ptrace_unfreeze_traced(struct task_struct *task) +@@ -150,11 +150,17 @@ static void ptrace_unfreeze_traced(struct task_struct *task) WARN_ON(!task->ptrace || task->parent != current); diff --git a/queue/pwm-rockchip-State-of-PWM-clock-should-synchronize-w.patch b/queue/pwm-rockchip-State-of-PWM-clock-should-synchronize-w.patch index 998389e..ef2ccb2 100644 --- a/queue/pwm-rockchip-State-of-PWM-clock-should-synchronize-w.patch +++ b/queue/pwm-rockchip-State-of-PWM-clock-should-synchronize-w.patch @@ -1,4 +1,4 @@ -From a900152b5c29aea8134cc7a4c5db25552b3cd8f7 Mon Sep 17 00:00:00 2001 +From 146955f4810077c416efbcd2d38483add62ffeb8 Mon Sep 17 00:00:00 2001 From: David Wu <david.wu@rock-chips.com> Date: Wed, 1 Mar 2017 19:10:55 +0800 Subject: [PATCH] pwm: rockchip: State of PWM clock should synchronize with PWM @@ -24,6 +24,7 @@ Cc: stable@vger.kernel.org Signed-off-by: David Wu <david.wu@rock-chips.com> Reviewed-by: Boris Brezillon <boris.brezillon@free-electrons.com> Signed-off-by: Thierry Reding <thierry.reding@gmail.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/pwm/pwm-rockchip.c b/drivers/pwm/pwm-rockchip.c index ef89df1f7336..744d56197286 100644 diff --git a/queue/random-use-chacha20-for-get_random_int-long.patch b/queue/random-use-chacha20-for-get_random_int-long.patch index 6ba7dc7..683ddaf 100644 --- a/queue/random-use-chacha20-for-get_random_int-long.patch +++ b/queue/random-use-chacha20-for-get_random_int-long.patch @@ -1,4 +1,4 @@ -From 9ed1e1338f46b2b726facc2e40959131d29ff9c4 Mon Sep 17 00:00:00 2001 +From 9c50160eeb937c54dad6743fac8df46bd2563eed Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" <Jason@zx2c4.com> Date: Fri, 6 Jan 2017 19:32:01 +0100 Subject: [PATCH] random: use chacha20 for get_random_int/long diff --git a/queue/ring-buffer-Fix-return-value-check-in-test_ringbuffe.patch b/queue/ring-buffer-Fix-return-value-check-in-test_ringbuffe.patch index 89c2b35..a31dde3 100644 --- a/queue/ring-buffer-Fix-return-value-check-in-test_ringbuffe.patch +++ b/queue/ring-buffer-Fix-return-value-check-in-test_ringbuffe.patch @@ -1,4 +1,4 @@ -From 62277de758b155dc04b78f195a1cb5208c37b2df Mon Sep 17 00:00:00 2001 +From f777d9ed11885f59e0004f5ca4f32eaa7e7edd59 Mon Sep 17 00:00:00 2001 From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Date: Fri, 17 Jun 2016 17:33:59 +0000 Subject: [PATCH] ring-buffer: Fix return value check in test_ringbuffer() @@ -15,12 +15,13 @@ Cc: stable@vger.kernel.org Fixes: 6c43e554a ("ring-buffer: Add ring buffer startup selftest") Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c -index 96fc3c043ad6..54e7a90db848 100644 +index 9c143739b8d7..f30847af7310 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c -@@ -4826,9 +4826,9 @@ static __init int test_ringbuffer(void) +@@ -4870,9 +4870,9 @@ static __init int test_ringbuffer(void) rb_data[cpu].cnt = cpu; rb_threads[cpu] = kthread_create(rb_test, &rb_data[cpu], "rbtester/%d", cpu); @@ -32,7 +33,7 @@ index 96fc3c043ad6..54e7a90db848 100644 goto out_free; } -@@ -4838,9 +4838,9 @@ static __init int test_ringbuffer(void) +@@ -4882,9 +4882,9 @@ static __init int test_ringbuffer(void) /* Now create the rb hammer! */ rb_hammer = kthread_run(rb_hammer_test, NULL, "rbhammer"); diff --git a/queue/rt2x00-Fix-incorrect-usage-of-CONFIG_RT2X00_LIB_USB.patch b/queue/rt2x00-Fix-incorrect-usage-of-CONFIG_RT2X00_LIB_USB.patch index 0eb3f02..17a07a8 100644 --- a/queue/rt2x00-Fix-incorrect-usage-of-CONFIG_RT2X00_LIB_USB.patch +++ b/queue/rt2x00-Fix-incorrect-usage-of-CONFIG_RT2X00_LIB_USB.patch @@ -1,4 +1,4 @@ -From a083c8fd277b4122c804f18ec8c84165f345c71c Mon Sep 17 00:00:00 2001 +From 3a11f7e6683ce11abc3c122366ee442ba78667e2 Mon Sep 17 00:00:00 2001 From: Vishal Thanki <vishalthanki@gmail.com> Date: Wed, 16 Nov 2016 17:01:54 +0100 Subject: [PATCH] rt2x00: Fix incorrect usage of CONFIG_RT2X00_LIB_USB @@ -13,12 +13,13 @@ of pending work. Changing the #ifdef to #if IS_ENABLED() to fix it. Signed-off-by: Vishal Thanki <vishalthanki@gmail.com> Acked-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -index d65925061360..5071cf038466 100644 +index 4e0c5653054b..b7273be9303d 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c -@@ -1439,7 +1439,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) +@@ -1422,7 +1422,7 @@ void rt2x00lib_remove_dev(struct rt2x00_dev *rt2x00dev) cancel_work_sync(&rt2x00dev->intf_work); cancel_delayed_work_sync(&rt2x00dev->autowakeup_work); cancel_work_sync(&rt2x00dev->sleep_work); diff --git a/queue/rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch b/queue/rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch index aab7cdf..6d45c4d 100644 --- a/queue/rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch +++ b/queue/rt2x00usb-do-not-anchor-rx-and-tx-urb-s.patch @@ -1,4 +1,4 @@ -From 93c7018ec16bb83399dd4db61c361a6d6aba0d5a Mon Sep 17 00:00:00 2001 +From 6180e00f1325c5cacf9daf8820fb052b2d872b64 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka <sgruszka@redhat.com> Date: Wed, 8 Feb 2017 12:18:09 +0100 Subject: [PATCH] rt2x00usb: do not anchor rx and tx urb's @@ -28,9 +28,10 @@ Cc: Vishal Thanki <vishalthanki@gmail.com> Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -index 5a2bf9f63cd7..fe13dd07cc2a 100644 +index 4104cf5608e2..662705e31136 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c @@ -319,10 +319,8 @@ static bool rt2x00usb_kick_tx_entry(struct queue_entry *entry, void *data) diff --git a/queue/rt2x00usb-fix-anchor-initialization.patch b/queue/rt2x00usb-fix-anchor-initialization.patch index 680296f..77ebb4f 100644 --- a/queue/rt2x00usb-fix-anchor-initialization.patch +++ b/queue/rt2x00usb-fix-anchor-initialization.patch @@ -1,4 +1,4 @@ -From 0488a6121dfe6cbd44de15ea3627913b7549a1e9 Mon Sep 17 00:00:00 2001 +From 284e2550741db197027cdb91051d67c4586f1622 Mon Sep 17 00:00:00 2001 From: Stanislaw Gruszka <sgruszka@redhat.com> Date: Wed, 8 Feb 2017 12:18:10 +0100 Subject: [PATCH] rt2x00usb: fix anchor initialization @@ -34,12 +34,13 @@ Cc: Vishal Thanki <vishalthanki@gmail.com> Fixes: 8b4c0009313f ("rt2x00usb: Use usb anchor to manage URB") Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -index fe13dd07cc2a..c696f0ad6a68 100644 +index 6005e14213ca..4104cf5608e2 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00usb.c -@@ -825,10 +825,6 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, +@@ -824,10 +824,6 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, if (retval) goto exit_free_device; @@ -50,7 +51,7 @@ index fe13dd07cc2a..c696f0ad6a68 100644 rt2x00dev->anchor = devm_kmalloc(&usb_dev->dev, sizeof(struct usb_anchor), GFP_KERNEL); -@@ -836,10 +832,17 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, +@@ -835,10 +831,17 @@ int rt2x00usb_probe(struct usb_interface *usb_intf, retval = -ENOMEM; goto exit_free_reg; } diff --git a/queue/rtc-tegra-Implement-clock-handling.patch b/queue/rtc-tegra-Implement-clock-handling.patch index 3030bf1..c261128 100644 --- a/queue/rtc-tegra-Implement-clock-handling.patch +++ b/queue/rtc-tegra-Implement-clock-handling.patch @@ -1,4 +1,4 @@ -From 5c4b69afd763584d59c8d15cbfa859752004827a Mon Sep 17 00:00:00 2001 +From 1bfaa614ab08df8ec4ccd52b41aa2651769d3984 Mon Sep 17 00:00:00 2001 From: Thierry Reding <treding@nvidia.com> Date: Thu, 12 Jan 2017 17:07:43 +0100 Subject: [PATCH] rtc: tegra: Implement clock handling diff --git a/queue/s390-decompressor-fix-initrd-corruption-caused-by-bs.patch b/queue/s390-decompressor-fix-initrd-corruption-caused-by-bs.patch index 73b3a8b..cbafef7 100644 --- a/queue/s390-decompressor-fix-initrd-corruption-caused-by-bs.patch +++ b/queue/s390-decompressor-fix-initrd-corruption-caused-by-bs.patch @@ -1,4 +1,4 @@ -From d82c0d12c92705ef468683c9b7a8298dd61ed191 Mon Sep 17 00:00:00 2001 +From 7579f0067c82b744bc4fbff8bb19593e7e278a08 Mon Sep 17 00:00:00 2001 From: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Date: Mon, 13 Mar 2017 12:14:58 -0300 Subject: [PATCH] s390/decompressor: fix initrd corruption caused by bss clear @@ -23,9 +23,10 @@ Reviewed-by: Vineetha HariPai <vineetha.hari.pai@canonical.com> Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/boot/compressed/misc.c b/arch/s390/boot/compressed/misc.c -index fa95041fa9f6..33ca29333e18 100644 +index 4da604ebf6fd..ca15613eaaa4 100644 --- a/arch/s390/boot/compressed/misc.c +++ b/arch/s390/boot/compressed/misc.c @@ -141,31 +141,34 @@ static void check_ipl_parmblock(void *start, unsigned long size) diff --git a/queue/s390-uaccess-get_user-should-zero-on-failure-again.patch b/queue/s390-uaccess-get_user-should-zero-on-failure-again.patch index 466dd9e..6418296 100644 --- a/queue/s390-uaccess-get_user-should-zero-on-failure-again.patch +++ b/queue/s390-uaccess-get_user-should-zero-on-failure-again.patch @@ -1,4 +1,4 @@ -From d09c5373e8e4eaaa09233552cbf75dc4c4f21203 Mon Sep 17 00:00:00 2001 +From 19063e337f7cadfa3ef9a6d5784416c770e0d90e Mon Sep 17 00:00:00 2001 From: Heiko Carstens <heiko.carstens@de.ibm.com> Date: Mon, 27 Mar 2017 09:48:04 +0200 Subject: [PATCH] s390/uaccess: get_user() should zero on failure (again) @@ -24,12 +24,13 @@ Cc: stable@vger.kernel.org Cc: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/s390/include/asm/uaccess.h b/arch/s390/include/asm/uaccess.h -index 136932ff4250..3ea1554d04b3 100644 +index 52d7c8709279..a7ef70220126 100644 --- a/arch/s390/include/asm/uaccess.h +++ b/arch/s390/include/asm/uaccess.h -@@ -147,7 +147,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from, +@@ -144,7 +144,7 @@ unsigned long __must_check __copy_to_user(void __user *to, const void *from, " jg 2b\n" \ ".popsection\n" \ EX_TABLE(0b,3b) EX_TABLE(1b,3b) \ diff --git a/queue/sata-ahci-da850-implement-a-workaround-for-the-softr.patch b/queue/sata-ahci-da850-implement-a-workaround-for-the-softr.patch index 75c45b9..edb36b7 100644 --- a/queue/sata-ahci-da850-implement-a-workaround-for-the-softr.patch +++ b/queue/sata-ahci-da850-implement-a-workaround-for-the-softr.patch @@ -1,4 +1,4 @@ -From f4d435f3265661d04e5290a0a0450e3a38898128 Mon Sep 17 00:00:00 2001 +From 2c90fc66105f3a3c1631e7c79c463c2a3fe98858 Mon Sep 17 00:00:00 2001 From: Bartosz Golaszewski <bgolaszewski@baylibre.com> Date: Mon, 30 Jan 2017 11:02:05 +0100 Subject: [PATCH] sata: ahci-da850: implement a workaround for the softreset @@ -16,9 +16,10 @@ with pmp - if the operation fails with -EBUSY, retry without pmp. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> Acked-by: Tejun Heo <tj@kernel.org> Signed-off-by: Sekhar Nori <nsekhar@ti.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/ata/ahci_da850.c b/drivers/ata/ahci_da850.c -index 72126a0415fb..84c7805c0247 100644 +index 267a3d3e79f4..52f2674d5e89 100644 --- a/drivers/ata/ahci_da850.c +++ b/drivers/ata/ahci_da850.c @@ -54,11 +54,42 @@ static void da850_sata_init(struct device *dev, void __iomem *pwrdn_reg, diff --git a/queue/scsi-qla2xxx-Add-fix-to-read-correct-register-value-.patch b/queue/scsi-qla2xxx-Add-fix-to-read-correct-register-value-.patch index 5a6c946..4e9f360 100644 --- a/queue/scsi-qla2xxx-Add-fix-to-read-correct-register-value-.patch +++ b/queue/scsi-qla2xxx-Add-fix-to-read-correct-register-value-.patch @@ -1,4 +1,4 @@ -From bf6061b17a8d47ef0d9344d3ef576a4ff0edf793 Mon Sep 17 00:00:00 2001 +From 09646a37476f05c06ba02594afdec879582e675f Mon Sep 17 00:00:00 2001 From: Sawan Chandak <sawan.chandak@cavium.com> Date: Fri, 31 Mar 2017 14:37:03 -0700 Subject: [PATCH] scsi: qla2xxx: Add fix to read correct register value for @@ -14,12 +14,13 @@ Signed-off-by: Sawan Chandak <sawan.chandak@cavium.com> Signed-off-by: Himanshu Madhani <himanshu.madhani@cavium.com> Cc: <stable@vger.kernel.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c -index 579363a6f44f..c9e45d2befe5 100644 +index afa6a856cce5..8a1f5799dd99 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c -@@ -1126,8 +1126,13 @@ static inline +@@ -963,8 +963,13 @@ static inline uint32_t qla2x00_isp_reg_stat(struct qla_hw_data *ha) { struct device_reg_24xx __iomem *reg = &ha->iobase->isp24; diff --git a/queue/scsi-sd-Consider-max_xfer_blocks-if-opt_xfer_blocks-.patch b/queue/scsi-sd-Consider-max_xfer_blocks-if-opt_xfer_blocks-.patch index 7edd804..6314e61 100644 --- a/queue/scsi-sd-Consider-max_xfer_blocks-if-opt_xfer_blocks-.patch +++ b/queue/scsi-sd-Consider-max_xfer_blocks-if-opt_xfer_blocks-.patch @@ -1,4 +1,4 @@ -From 6780414519f91c2a84da9baa963a940ac916f803 Mon Sep 17 00:00:00 2001 +From 91c1d865c42e375780f1d4989961d69b946eb0a9 Mon Sep 17 00:00:00 2001 From: Fam Zheng <famz@redhat.com> Date: Tue, 28 Mar 2017 12:41:26 +0800 Subject: [PATCH] scsi: sd: Consider max_xfer_blocks if opt_xfer_blocks is @@ -16,12 +16,13 @@ Cc: <stable@vger.kernel.org> # v4.4+ Fixes: ca369d51b3e ("block/sd: Fix device-imposed transfer length limits") Signed-off-by: Fam Zheng <famz@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/sd.c b/drivers/scsi/sd.c -index fb9b4d29af0b..906cd6bfa2a9 100644 +index d3e852ad5aa3..3a5208c53e4a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2956,7 +2956,8 @@ static int sd_revalidate_disk(struct gendisk *disk) +@@ -2876,7 +2876,8 @@ static int sd_revalidate_disk(struct gendisk *disk) q->limits.io_opt = logical_to_bytes(sdp, sdkp->opt_xfer_blocks); rw_max = logical_to_sectors(sdp, sdkp->opt_xfer_blocks); } else diff --git a/queue/scsi-sd-Fix-capacity-calculation-with-32-bit-sector_.patch b/queue/scsi-sd-Fix-capacity-calculation-with-32-bit-sector_.patch index 5518f01..c2b50a3 100644 --- a/queue/scsi-sd-Fix-capacity-calculation-with-32-bit-sector_.patch +++ b/queue/scsi-sd-Fix-capacity-calculation-with-32-bit-sector_.patch @@ -1,4 +1,4 @@ -From 7c856152cb92f8eee2df29ef325a1b1f43161aff Mon Sep 17 00:00:00 2001 +From 5682f1121ac35b3a31370a337e534b05b6accea9 Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" <martin.petersen@oracle.com> Date: Tue, 4 Apr 2017 10:42:30 -0400 Subject: [PATCH] scsi: sd: Fix capacity calculation with 32-bit sector_t @@ -18,12 +18,13 @@ Reported-by: Steve Magnani <steve.magnani@digidescorp.com> Cc: Bart Van Assche <Bart.VanAssche@sandisk.com> Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.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/sd.c b/drivers/scsi/sd.c -index 906cd6bfa2a9..fe0f7997074e 100644 +index 3a5208c53e4a..843e4ae24f6a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c -@@ -2102,6 +2102,22 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp, +@@ -2056,6 +2056,22 @@ static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp, #define READ_CAPACITY_RETRIES_ON_RESET 10 @@ -46,7 +47,7 @@ index 906cd6bfa2a9..fe0f7997074e 100644 static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, unsigned char *buffer) { -@@ -2167,7 +2183,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, +@@ -2121,7 +2137,7 @@ static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp, return -ENODEV; } @@ -55,7 +56,7 @@ index 906cd6bfa2a9..fe0f7997074e 100644 sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a " "kernel compiled with support for large block " "devices.\n"); -@@ -2256,7 +2272,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, +@@ -2207,7 +2223,7 @@ static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp, return sector_size; } diff --git a/queue/scsi-sr-Sanity-check-returned-mode-data.patch b/queue/scsi-sr-Sanity-check-returned-mode-data.patch index b7f70be..9d346ad 100644 --- a/queue/scsi-sr-Sanity-check-returned-mode-data.patch +++ b/queue/scsi-sr-Sanity-check-returned-mode-data.patch @@ -1,4 +1,4 @@ -From a00a7862513089f17209b732f230922f1942e0b9 Mon Sep 17 00:00:00 2001 +From 27c7cb8c604577e44f299f2069199b1253ea9c7e Mon Sep 17 00:00:00 2001 From: "Martin K. Petersen" <martin.petersen@oracle.com> Date: Fri, 17 Mar 2017 08:47:14 -0400 Subject: [PATCH] scsi: sr: Sanity check returned mode data @@ -13,12 +13,13 @@ Cc: <stable@vger.kernel.org> Reported-by: Kefeng Wang <wangkefeng.wang@huawei.com> Tested-by: Kefeng Wang <wangkefeng.wang@huawei.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/sr.c b/drivers/scsi/sr.c -index 0b29b9329b1c..a8f630213a1a 100644 +index ed179348de80..8ecd57ebe45f 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c -@@ -836,6 +836,7 @@ static void get_capabilities(struct scsi_cd *cd) +@@ -833,6 +833,7 @@ static void get_capabilities(struct scsi_cd *cd) unsigned char *buffer; struct scsi_mode_data data; struct scsi_sense_hdr sshdr; @@ -26,7 +27,7 @@ index 0b29b9329b1c..a8f630213a1a 100644 int rc, n; static const char *loadmech[] = -@@ -862,10 +863,11 @@ static void get_capabilities(struct scsi_cd *cd) +@@ -859,10 +860,11 @@ static void get_capabilities(struct scsi_cd *cd) scsi_test_unit_ready(cd->device, SR_TIMEOUT, MAX_RETRIES, &sshdr); /* ask for mode page 0x2a */ diff --git a/queue/scsi-ufs-Enable-no-vccq-quirk-for-skhynix-device.patch b/queue/scsi-ufs-Enable-no-vccq-quirk-for-skhynix-device.patch index cf225f2..3e19bad 100644 --- a/queue/scsi-ufs-Enable-no-vccq-quirk-for-skhynix-device.patch +++ b/queue/scsi-ufs-Enable-no-vccq-quirk-for-skhynix-device.patch @@ -1,4 +1,4 @@ -From 9630886145c02c0770daf98fa0202c7c94986cc6 Mon Sep 17 00:00:00 2001 +From 74d633e1f4716e4b935725f8aad93b55302355e7 Mon Sep 17 00:00:00 2001 From: Kyuho Choi <chlrbgh0@gmail.com> Date: Mon, 26 Sep 2016 23:58:25 +0900 Subject: [PATCH] scsi: ufs: Enable no vccq quirk for skhynix device @@ -11,9 +11,10 @@ don't need vccq vrail for device operation. Signed-off-by: Kyuho Choi <kyuho.choi@sk.com> Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h -index fe4695157e4d..f7983058f3f7 100644 +index ee4ab85e2801..22f881e9253a 100644 --- a/drivers/scsi/ufs/ufs_quirks.h +++ b/drivers/scsi/ufs/ufs_quirks.h @@ -25,6 +25,7 @@ @@ -24,7 +25,7 @@ index fe4695157e4d..f7983058f3f7 100644 /** * ufs_device_info - ufs device details -@@ -154,6 +155,7 @@ static struct ufs_dev_fix ufs_fixups[] = { +@@ -145,6 +146,7 @@ static struct ufs_dev_fix ufs_fixups[] = { UFS_DEVICE_QUIRK_PA_TACTIVATE), UFS_FIX(UFS_VENDOR_TOSHIBA, "THGLF2G9D8KBADG", UFS_DEVICE_QUIRK_PA_TACTIVATE), diff --git a/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch b/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch index 3f5b4aa..168e488 100644 --- a/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch +++ b/queue/scsi-ufs-add-quirk-to-increase-host-PA_SaveConfigTim.patch @@ -1,4 +1,4 @@ -From 4a54eccc93c7394af236cb82dd4eeda1214cd7a3 Mon Sep 17 00:00:00 2001 +From 6ad2a6b9683507dfb09e09e5ee58da1ccafa71c2 Mon Sep 17 00:00:00 2001 From: Subhash Jadavani <subhashj@codeaurora.org> Date: Mon, 5 Dec 2016 19:25:32 -0800 Subject: [PATCH] scsi: ufs: add quirk to increase host PA_SaveConfigTime diff --git a/queue/scsi-ufs-ensure-that-host-pa_tactivate-is-higher-tha.patch b/queue/scsi-ufs-ensure-that-host-pa_tactivate-is-higher-tha.patch index 76a4000..b0e2626 100644 --- a/queue/scsi-ufs-ensure-that-host-pa_tactivate-is-higher-tha.patch +++ b/queue/scsi-ufs-ensure-that-host-pa_tactivate-is-higher-tha.patch @@ -1,4 +1,4 @@ -From c6a6db439868c7ba5cc90d4c461d9697ec731fa1 Mon Sep 17 00:00:00 2001 +From e771f45d83d1b0bd6d534730395dcddb1426b044 Mon Sep 17 00:00:00 2001 From: "subhashj@codeaurora.org" <subhashj@codeaurora.org> Date: Wed, 23 Nov 2016 16:32:08 -0800 Subject: [PATCH] scsi: ufs: ensure that host pa_tactivate is higher than @@ -13,6 +13,7 @@ This change allows this by using quirk. Reviewed-by: Venkat Gopalakrishnan <venkatg@codeaurora.org> Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ufs/ufs_quirks.h b/drivers/scsi/ufs/ufs_quirks.h index 22f881e9253a..f7983058f3f7 100644 @@ -42,10 +43,10 @@ index 22f881e9253a..f7983058f3f7 100644 UFS_DEVICE_QUIRK_DELAY_BEFORE_LPM), UFS_FIX(UFS_VENDOR_TOSHIBA, "THGLF2G9C8KBADG", diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c -index 393f6d55df5a..28cbca21c4dd 100644 +index c491682bc50a..b2440abf4a23 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c -@@ -5089,6 +5089,76 @@ out: +@@ -4976,6 +4976,76 @@ out: return ret; } @@ -122,7 +123,7 @@ index 393f6d55df5a..28cbca21c4dd 100644 static void ufshcd_tune_unipro_params(struct ufs_hba *hba) { if (ufshcd_is_unipro_pa_params_tuning_req(hba)) { -@@ -5099,6 +5169,9 @@ static void ufshcd_tune_unipro_params(struct ufs_hba *hba) +@@ -4986,6 +5056,9 @@ static void ufshcd_tune_unipro_params(struct ufs_hba *hba) if (hba->dev_quirks & UFS_DEVICE_QUIRK_PA_TACTIVATE) /* set 1ms timeout for PA_TACTIVATE */ ufshcd_dme_set(hba, UIC_ARG_MIB(PA_TACTIVATE), 10); diff --git a/queue/scsi-ufs-introduce-UFSHCD_QUIRK_PRDT_BYTE_GRAN-quirk.patch b/queue/scsi-ufs-introduce-UFSHCD_QUIRK_PRDT_BYTE_GRAN-quirk.patch index 1413f0c..5a80fa4 100644 --- a/queue/scsi-ufs-introduce-UFSHCD_QUIRK_PRDT_BYTE_GRAN-quirk.patch +++ b/queue/scsi-ufs-introduce-UFSHCD_QUIRK_PRDT_BYTE_GRAN-quirk.patch @@ -1,4 +1,4 @@ -From 75b1cc4ad63afa28c1a045b5157c008f405f06a9 Mon Sep 17 00:00:00 2001 +From 44e95b7068a0f8febf20a5ca9ce3e6b49eabea2f Mon Sep 17 00:00:00 2001 From: Kiwoong Kim <kwmad.kim@samsung.com> Date: Tue, 22 Nov 2016 17:06:59 +0900 Subject: [PATCH] scsi: ufs: introduce UFSHCD_QUIRK_PRDT_BYTE_GRAN quirk @@ -11,12 +11,13 @@ offset as bytes, not double words. Signed-off-by: Kiwoong Kim <kwmad.kim@samsung.com> Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c -index 421488161cf3..f91e50bf1a43 100644 +index f08d41a2d70b..c491682bc50a 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c -@@ -1129,7 +1129,7 @@ ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd) +@@ -1088,7 +1088,7 @@ ufshcd_send_uic_cmd(struct ufs_hba *hba, struct uic_command *uic_cmd) * * Returns 0 in case of success, non-zero value in case of failure */ @@ -25,7 +26,7 @@ index 421488161cf3..f91e50bf1a43 100644 { struct ufshcd_sg_entry *prd_table; struct scatterlist *sg; -@@ -1143,8 +1143,13 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp) +@@ -1102,8 +1102,13 @@ static int ufshcd_map_sg(struct ufshcd_lrb *lrbp) return sg_segments; if (sg_segments) { @@ -41,7 +42,7 @@ index 421488161cf3..f91e50bf1a43 100644 prd_table = (struct ufshcd_sg_entry *)lrbp->ucd_prdt_ptr; -@@ -1507,7 +1512,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) +@@ -1462,7 +1467,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) ufshcd_comp_scsi_upiu(hba, lrbp); @@ -50,7 +51,7 @@ index 421488161cf3..f91e50bf1a43 100644 if (err) { lrbp->cmd = NULL; clear_bit_unlock(tag, &hba->lrb_in_use); -@@ -2368,12 +2373,21 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) +@@ -2317,12 +2322,21 @@ static void ufshcd_host_memory_configure(struct ufs_hba *hba) cpu_to_le32(upper_32_bits(cmd_desc_element_addr)); /* Response upiu and prdt offset should be in double words */ @@ -76,10 +77,10 @@ index 421488161cf3..f91e50bf1a43 100644 hba->lrb[i].utr_descriptor_ptr = (utrdlp + i); hba->lrb[i].ucd_req_ptr = diff --git a/drivers/scsi/ufs/ufshcd.h b/drivers/scsi/ufs/ufshcd.h -index 8e76501144d6..7d9ff22acfea 100644 +index 430bef111293..5b65441110fa 100644 --- a/drivers/scsi/ufs/ufshcd.h +++ b/drivers/scsi/ufs/ufshcd.h -@@ -485,6 +485,12 @@ struct ufs_hba { +@@ -474,6 +474,12 @@ struct ufs_hba { */ #define UFSHCD_QUIRK_BROKEN_UFS_HCI_VERSION UFS_BIT(5) diff --git a/queue/scsi-ufs-introduce-a-new-ufshcd_statea-UFSHCD_STATE_.patch b/queue/scsi-ufs-introduce-a-new-ufshcd_statea-UFSHCD_STATE_.patch index c6e8f70..7f88b62 100644 --- a/queue/scsi-ufs-introduce-a-new-ufshcd_statea-UFSHCD_STATE_.patch +++ b/queue/scsi-ufs-introduce-a-new-ufshcd_statea-UFSHCD_STATE_.patch @@ -1,4 +1,4 @@ -From 141f81651037ea109188a6bafdc5c9a318bd5a46 Mon Sep 17 00:00:00 2001 +From 068fd94744384488f7b88327d817fea11ef491f7 Mon Sep 17 00:00:00 2001 From: Zang Leigang <zangleigang@hisilicon.com> Date: Wed, 16 Nov 2016 11:29:37 +0800 Subject: [PATCH] scsi: ufs: introduce a new ufshcd_statea @@ -12,12 +12,13 @@ immediately. Use UFSHCD_STATE_ERROR here looks not literaly correct. Signed-off-by: Zang Leigang <zangleigang@hisilicon.com> Reviewed-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c -index 576b29c11d7a..421488161cf3 100644 +index bf4498f7900e..52986c0dec99 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c -@@ -125,6 +125,7 @@ enum { +@@ -123,6 +123,7 @@ enum { UFSHCD_STATE_RESET, UFSHCD_STATE_ERROR, UFSHCD_STATE_OPERATIONAL, @@ -25,7 +26,7 @@ index 576b29c11d7a..421488161cf3 100644 }; /* UFSHCD error handling flags */ -@@ -1450,6 +1451,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) +@@ -1436,6 +1437,7 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd) switch (hba->ufshcd_state) { case UFSHCD_STATE_OPERATIONAL: break; @@ -33,7 +34,7 @@ index 576b29c11d7a..421488161cf3 100644 case UFSHCD_STATE_RESET: err = SCSI_MLQUEUE_HOST_BUSY; goto out_unlock; -@@ -4212,7 +4214,7 @@ static void ufshcd_check_errors(struct ufs_hba *hba) +@@ -4193,7 +4195,7 @@ static void ufshcd_check_errors(struct ufs_hba *hba) /* block commands from scsi mid-layer */ scsi_block_requests(hba->host); diff --git a/queue/scsi-ufs-issue-link-starup-2-times-if-device-isn-t-a.patch b/queue/scsi-ufs-issue-link-starup-2-times-if-device-isn-t-a.patch index 77f98dd..1b3a998 100644 --- a/queue/scsi-ufs-issue-link-starup-2-times-if-device-isn-t-a.patch +++ b/queue/scsi-ufs-issue-link-starup-2-times-if-device-isn-t-a.patch @@ -1,4 +1,4 @@ -From 7caf489b99a42a9017ef3d733912aea8794677e7 Mon Sep 17 00:00:00 2001 +From 7ac5c96222d077f3ed4a98252e3bd4fa1744a7e3 Mon Sep 17 00:00:00 2001 From: "subhashj@codeaurora.org" <subhashj@codeaurora.org> Date: Wed, 23 Nov 2016 16:32:20 -0800 Subject: [PATCH] scsi: ufs: issue link starup 2 times if device isn't active @@ -15,12 +15,13 @@ times to make sure that device moves to active state. Reviewed-by: Gilad Broner <gbroner@codeaurora.org> Signed-off-by: Subhash Jadavani <subhashj@codeaurora.org> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c -index 28cbca21c4dd..16c5c50d054d 100644 +index 52986c0dec99..f3005b798796 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c -@@ -3185,7 +3185,16 @@ static int ufshcd_link_startup(struct ufs_hba *hba) +@@ -3127,7 +3127,16 @@ static int ufshcd_link_startup(struct ufs_hba *hba) { int ret; int retries = DME_LINKSTARTUP_RETRIES; @@ -37,7 +38,7 @@ index 28cbca21c4dd..16c5c50d054d 100644 do { ufshcd_vops_link_startup_notify(hba, PRE_CHANGE); -@@ -3211,6 +3220,12 @@ static int ufshcd_link_startup(struct ufs_hba *hba) +@@ -3153,6 +3162,12 @@ static int ufshcd_link_startup(struct ufs_hba *hba) /* failed to get the link up... retire */ goto out; @@ -50,7 +51,7 @@ index 28cbca21c4dd..16c5c50d054d 100644 if (hba->quirks & UFSHCD_QUIRK_BROKEN_LCC) { ret = ufshcd_disable_device_tx_lcc(hba); if (ret) -@@ -6744,10 +6759,12 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) +@@ -6626,10 +6641,12 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) pm_runtime_get_sync(dev); /* diff --git a/queue/serial-8250_omap-Add-OMAP_DMA_TX_KICK-quirk-for-AM43.patch b/queue/serial-8250_omap-Add-OMAP_DMA_TX_KICK-quirk-for-AM43.patch index d69c1f5..08fe3f7 100644 --- a/queue/serial-8250_omap-Add-OMAP_DMA_TX_KICK-quirk-for-AM43.patch +++ b/queue/serial-8250_omap-Add-OMAP_DMA_TX_KICK-quirk-for-AM43.patch @@ -1,4 +1,4 @@ -From b6ffcf21082300519bc4f9c3d24f61207cc9eae4 Mon Sep 17 00:00:00 2001 +From 44d3c12d8213d59802a7128dab27af174ed09f01 Mon Sep 17 00:00:00 2001 From: Vignesh R <vigneshr@ti.com> Date: Fri, 20 Jan 2017 13:46:53 +0530 Subject: [PATCH] serial: 8250_omap: Add OMAP_DMA_TX_KICK quirk for AM437x @@ -13,12 +13,13 @@ of_machine_is_compatible() and instead pass quirks via device data. Signed-off-by: Vignesh R <vigneshr@ti.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c -index 4ad1934ef6ed..97766dcd67d4 100644 +index 61ad6c3b20a0..f4eb807a2616 100644 --- a/drivers/tty/serial/8250/8250_omap.c +++ b/drivers/tty/serial/8250/8250_omap.c -@@ -1078,15 +1078,15 @@ static int omap8250_no_handle_irq(struct uart_port *port) +@@ -1075,15 +1075,15 @@ static int omap8250_no_handle_irq(struct uart_port *port) } static const u8 am3352_habit = OMAP_DMA_TX_KICK | UART_ERRATA_CLOCK_DISABLE; @@ -37,7 +38,7 @@ index 4ad1934ef6ed..97766dcd67d4 100644 {}, }; MODULE_DEVICE_TABLE(of, omap8250_dt_ids); -@@ -1221,9 +1221,6 @@ static int omap8250_probe(struct platform_device *pdev) +@@ -1218,9 +1218,6 @@ static int omap8250_probe(struct platform_device *pdev) priv->omap8250_dma.rx_size = RX_TRIGGER; priv->omap8250_dma.rxconf.src_maxburst = RX_TRIGGER; priv->omap8250_dma.txconf.dst_maxburst = TX_TRIGGER; diff --git a/queue/staging-android-ashmem-lseek-failed-due-to-no-FMODE_.patch b/queue/staging-android-ashmem-lseek-failed-due-to-no-FMODE_.patch index 924b031..2e83ba5 100644 --- a/queue/staging-android-ashmem-lseek-failed-due-to-no-FMODE_.patch +++ b/queue/staging-android-ashmem-lseek-failed-due-to-no-FMODE_.patch @@ -1,4 +1,4 @@ -From 97fbfef6bd597888485b653175fb846c6998b60c Mon Sep 17 00:00:00 2001 +From 0a6a6d88ae2622e7cf2793f511b73c17ada547f7 Mon Sep 17 00:00:00 2001 From: Shuxiao Zhang <zhangshuxiao@xiaomi.com> Date: Thu, 6 Apr 2017 22:30:29 +0800 Subject: [PATCH] staging: android: ashmem: lseek failed due to no FMODE_LSEEK. @@ -21,12 +21,13 @@ Signed-off-by: Shuxiao Zhang <zhangshuxiao@xiaomi.com> Tested-by: Greg Hackmann <ghackmann@google.com> Cc: stable <stable@vger.kernel.org> # 3.18+ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c -index 7cbad0d45b9c..6ba270e0494d 100644 +index ca9a53c03f0f..2b770cb0c488 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c -@@ -409,6 +409,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) +@@ -405,6 +405,7 @@ static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) ret = PTR_ERR(vmfile); goto out; } diff --git a/queue/svcauth_gss-Close-connection-when-dropping-an-incomi.patch b/queue/svcauth_gss-Close-connection-when-dropping-an-incomi.patch index c073185..47aab31 100644 --- a/queue/svcauth_gss-Close-connection-when-dropping-an-incomi.patch +++ b/queue/svcauth_gss-Close-connection-when-dropping-an-incomi.patch @@ -1,4 +1,4 @@ -From 4d712ef1db05c3aa5c3b690a50c37ebad584c53f Mon Sep 17 00:00:00 2001 +From 7c9526b1e36c4ead68cd0caa2aac02374b490ddc Mon Sep 17 00:00:00 2001 From: Chuck Lever <chuck.lever@oracle.com> Date: Tue, 29 Nov 2016 11:04:34 -0500 Subject: [PATCH] svcauth_gss: Close connection when dropping an incoming @@ -33,12 +33,13 @@ Change those spots in a similar fashion. Signed-off-by: Chuck Lever <chuck.lever@oracle.com> Signed-off-by: J. Bruce Fields <bfields@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c -index 45662d7f0943..886e9d381771 100644 +index a16b5a3e983c..74a1b77d3697 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c -@@ -1548,7 +1548,7 @@ complete: +@@ -1541,7 +1541,7 @@ complete: ret = SVC_COMPLETE; goto out; drop: @@ -48,10 +49,10 @@ index 45662d7f0943..886e9d381771 100644 if (rsci) cache_put(&rsci->h, sn->rsc_cache); diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c -index 7c8070ec93c8..75f290bddca1 100644 +index c5b0cb4f4056..463d417ed77c 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c -@@ -1155,8 +1155,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) +@@ -1138,8 +1138,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) case SVC_DENIED: goto err_bad_auth; case SVC_CLOSE: @@ -61,7 +62,7 @@ index 7c8070ec93c8..75f290bddca1 100644 case SVC_DROP: goto dropit; case SVC_COMPLETE: -@@ -1246,7 +1245,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) +@@ -1229,7 +1228,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) sendit: if (svc_authorise(rqstp)) @@ -70,7 +71,7 @@ index 7c8070ec93c8..75f290bddca1 100644 return 1; /* Caller can now send it */ dropit: -@@ -1254,11 +1253,16 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) +@@ -1237,11 +1236,16 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) dprintk("svc: svc_process dropit\n"); return 0; diff --git a/queue/sysfs-be-careful-of-error-returns-from-ops-show.patch b/queue/sysfs-be-careful-of-error-returns-from-ops-show.patch index 9439262..4f646fa 100644 --- a/queue/sysfs-be-careful-of-error-returns-from-ops-show.patch +++ b/queue/sysfs-be-careful-of-error-returns-from-ops-show.patch @@ -1,4 +1,4 @@ -From c8a139d001a1aab1ea8734db14b22dac9dd143b6 Mon Sep 17 00:00:00 2001 +From dcc81937c1f03c020444fab09c67ab77b517c5a6 Mon Sep 17 00:00:00 2001 From: NeilBrown <neilb@suse.com> Date: Mon, 3 Apr 2017 11:30:34 +1000 Subject: [PATCH] sysfs: be careful of error returns from ops->show() @@ -44,6 +44,7 @@ Signed-off-by: NeilBrown <neilb@suse.com> Acked-by: Tejun Heo <tj@kernel.org> Reported-and-tested-by: Miroslav Benes <mbenes@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index b803213d1307..39c75a86c67f 100644 diff --git a/queue/target-Avoid-mappedlun-symlink-creation-during-lun-s.patch b/queue/target-Avoid-mappedlun-symlink-creation-during-lun-s.patch index b554999..48d6487 100644 --- a/queue/target-Avoid-mappedlun-symlink-creation-during-lun-s.patch +++ b/queue/target-Avoid-mappedlun-symlink-creation-during-lun-s.patch @@ -1,4 +1,4 @@ -From 49cb77e297dc611a1b795cfeb79452b3002bd331 Mon Sep 17 00:00:00 2001 +From 33eb496b7b4aecb63311e10103d96f709f66803b Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger <nab@linux-iscsi.org> Date: Mon, 27 Mar 2017 16:12:43 -0700 Subject: [PATCH] target: Avoid mappedlun symlink creation during lun shutdown @@ -36,9 +36,10 @@ Cc: James Shen <jcs@datera.io> Tested-by: James Shen <jcs@datera.io> Cc: stable@vger.kernel.org # 3.10+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c -index d8a16ca6baa5..d1e6cab8e3d3 100644 +index 31a096aa16ab..6e456de5e564 100644 --- a/drivers/target/target_core_fabric_configfs.c +++ b/drivers/target/target_core_fabric_configfs.c @@ -92,6 +92,11 @@ static int target_fabric_mappedlun_link( @@ -54,10 +55,10 @@ index d8a16ca6baa5..d1e6cab8e3d3 100644 nacl_ci = &lun_acl_ci->ci_parent->ci_group->cg_item; diff --git a/drivers/target/target_core_tpg.c b/drivers/target/target_core_tpg.c -index 6fb191914f45..dfaef4d3b2d2 100644 +index 2744251178ad..1949f50725a5 100644 --- a/drivers/target/target_core_tpg.c +++ b/drivers/target/target_core_tpg.c -@@ -642,6 +642,8 @@ void core_tpg_remove_lun( +@@ -640,6 +640,8 @@ void core_tpg_remove_lun( */ struct se_device *dev = rcu_dereference_raw(lun->lun_se_dev); @@ -66,7 +67,7 @@ index 6fb191914f45..dfaef4d3b2d2 100644 core_clear_lun_from_tpg(lun, tpg); /* * Wait for any active I/O references to percpu se_lun->lun_ref to -@@ -663,6 +665,8 @@ void core_tpg_remove_lun( +@@ -661,6 +663,8 @@ void core_tpg_remove_lun( } if (!(dev->se_hba->hba_flags & HBA_FLAGS_INTERNAL_USE)) hlist_del_rcu(&lun->link); @@ -76,7 +77,7 @@ index 6fb191914f45..dfaef4d3b2d2 100644 percpu_ref_exit(&lun->lun_ref); diff --git a/include/target/target_core_base.h b/include/target/target_core_base.h -index 4b784b6e21c0..2e282461cfa5 100644 +index 6233e8fd95b5..0383c601e17c 100644 --- a/include/target/target_core_base.h +++ b/include/target/target_core_base.h @@ -705,6 +705,7 @@ struct se_lun { diff --git a/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch b/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch index 43dcd46..45a7a3e 100644 --- a/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch +++ b/queue/tcmu-Fix-possible-overwrite-of-t_data_sg-s-last-iov.patch @@ -1,4 +1,4 @@ -From fd058ecfe97b25bf4db3bbfc703ddb9a566786f4 Mon Sep 17 00:00:00 2001 +From 9c2ac436243e10bfca64d840f02c0867d79894de Mon Sep 17 00:00:00 2001 From: Xiubo Li <lixiubo@cmss.chinamobile.com> Date: Mon, 27 Mar 2017 17:07:40 +0800 Subject: [PATCH] tcmu: Fix possible overwrite of t_data_sg's last iov[] diff --git a/queue/tcmu-Fix-wrongly-calculating-of-the-base_command_siz.patch b/queue/tcmu-Fix-wrongly-calculating-of-the-base_command_siz.patch index 6a54af9..fd55ab7 100644 --- a/queue/tcmu-Fix-wrongly-calculating-of-the-base_command_siz.patch +++ b/queue/tcmu-Fix-wrongly-calculating-of-the-base_command_siz.patch @@ -1,4 +1,4 @@ -From 12c12283cd048760cd81cb828ed2c920149e32f8 Mon Sep 17 00:00:00 2001 +From 613903aadd4f0340566e361dde14598313da697b Mon Sep 17 00:00:00 2001 From: Xiubo Li <lixiubo@cmss.chinamobile.com> Date: Mon, 27 Mar 2017 17:07:41 +0800 Subject: [PATCH] tcmu: Fix wrongly calculating of the base_command_size diff --git a/queue/tcmu-Skip-Data-Out-blocks-before-gathering-Data-In-b.patch b/queue/tcmu-Skip-Data-Out-blocks-before-gathering-Data-In-b.patch index 9cd54d7..1c143aa 100644 --- a/queue/tcmu-Skip-Data-Out-blocks-before-gathering-Data-In-b.patch +++ b/queue/tcmu-Skip-Data-Out-blocks-before-gathering-Data-In-b.patch @@ -1,4 +1,4 @@ -From a5d68ba85801a78c892a0eb8efb711e293ed314b Mon Sep 17 00:00:00 2001 +From 937f5d98213fb1a93ed85e7180fd3254688a70a1 Mon Sep 17 00:00:00 2001 From: Xiubo Li <lixiubo@cmss.chinamobile.com> Date: Fri, 31 Mar 2017 10:35:25 +0800 Subject: [PATCH] tcmu: Skip Data-Out blocks before gathering Data-In buffer @@ -18,12 +18,13 @@ Tested-by: Ilias Tsitsimpis <iliastsi@arrikto.com> Signed-off-by: Xiubo Li <lixiubo@cmss.chinamobile.com> Cc: stable@vger.kernel.org # 4.6+ Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/target/target_core_user.c b/drivers/target/target_core_user.c -index 9885d1b521fe..f615c3bbb73e 100644 +index 48e29a2ed326..1a82f81eed84 100644 --- a/drivers/target/target_core_user.c +++ b/drivers/target/target_core_user.c -@@ -311,24 +311,50 @@ static void free_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd) +@@ -306,24 +306,50 @@ static void free_data_area(struct tcmu_dev *udev, struct tcmu_cmd *cmd) DATA_BLOCK_BITS); } @@ -79,7 +80,7 @@ index 9885d1b521fe..f615c3bbb73e 100644 } copy_bytes = min_t(size_t, sg_remaining, block_remaining); -@@ -610,19 +636,11 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry * +@@ -597,19 +623,11 @@ static void tcmu_handle_completion(struct tcmu_cmd *cmd, struct tcmu_cmd_entry * se_cmd->scsi_sense_length); free_data_area(udev, cmd); } else if (se_cmd->se_cmd_flags & SCF_BIDI) { diff --git a/queue/thp-fix-MADV_DONTNEED-vs-clear-soft-dirty-race.patch b/queue/thp-fix-MADV_DONTNEED-vs-clear-soft-dirty-race.patch index 1be93e3..35f2c0c 100644 --- a/queue/thp-fix-MADV_DONTNEED-vs-clear-soft-dirty-race.patch +++ b/queue/thp-fix-MADV_DONTNEED-vs-clear-soft-dirty-race.patch @@ -1,4 +1,4 @@ -From 5b7abeae3af8c08c577e599dd0578b9e3ee6687b Mon Sep 17 00:00:00 2001 +From 2a4e783b082cbaf221240215c35a338fd8582bce Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Date: Thu, 13 Apr 2017 14:56:28 -0700 Subject: [PATCH] thp: fix MADV_DONTNEED vs clear soft dirty race @@ -18,12 +18,13 @@ Cc: Hillf Danton <hillf.zj@alibaba-inc.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c -index f08bd31c1081..312578089544 100644 +index f6fa99eca515..431551db3f05 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c -@@ -900,7 +900,14 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma, +@@ -906,7 +906,14 @@ static inline void clear_soft_dirty(struct vm_area_struct *vma, static inline void clear_soft_dirty_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp) { diff --git a/queue/thp-fix-MADV_DONTNEED-vs.-MADV_FREE-race.patch b/queue/thp-fix-MADV_DONTNEED-vs.-MADV_FREE-race.patch index 9ebcf72..64be215 100644 --- a/queue/thp-fix-MADV_DONTNEED-vs.-MADV_FREE-race.patch +++ b/queue/thp-fix-MADV_DONTNEED-vs.-MADV_FREE-race.patch @@ -1,4 +1,4 @@ -From 58ceeb6bec86d9140f9d91d71a710e963523d063 Mon Sep 17 00:00:00 2001 +From 75ba5fda5962bf3a76e81b133634091d8a620d14 Mon Sep 17 00:00:00 2001 From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Date: Thu, 13 Apr 2017 14:56:26 -0700 Subject: [PATCH] thp: fix MADV_DONTNEED vs. MADV_FREE race @@ -39,12 +39,13 @@ Cc: Hillf Danton <hillf.zj@alibaba-inc.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/huge_memory.c b/mm/huge_memory.c -index 26769465af63..f3c4f9d22821 100644 +index 9036d6067df4..14c9374c6466 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c -@@ -1568,8 +1568,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, +@@ -1320,8 +1320,7 @@ bool madvise_free_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma, deactivate_page(page); if (pmd_young(orig_pmd) || pmd_dirty(orig_pmd)) { diff --git a/queue/usb-chipidea-msm-Rely-on-core-to-override-AHBBURST.patch b/queue/usb-chipidea-msm-Rely-on-core-to-override-AHBBURST.patch index 60d3495..aa4c944 100644 --- a/queue/usb-chipidea-msm-Rely-on-core-to-override-AHBBURST.patch +++ b/queue/usb-chipidea-msm-Rely-on-core-to-override-AHBBURST.patch @@ -1,4 +1,4 @@ -From dd3749099cfa2c80039193c438b90f3160eaf7f9 Mon Sep 17 00:00:00 2001 +From cc76425c1ead29d9195343e44fda3374b42ffab5 Mon Sep 17 00:00:00 2001 From: Stephen Boyd <stephen.boyd@linaro.org> Date: Wed, 28 Dec 2016 14:56:59 -0800 Subject: [PATCH] usb: chipidea: msm: Rely on core to override AHBBURST @@ -16,9 +16,10 @@ Acked-by: Peter Chen <peter.chen@nxp.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Stephen Boyd <stephen.boyd@linaro.org> Signed-off-by: Peter Chen <peter.chen@nxp.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c -index 89c1a02d69b5..719b20caf88e 100644 +index 3889809fd0c4..37591a4b1346 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -24,7 +24,6 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) diff --git a/queue/usb-dwc3-Add-revision-numbers-for-the-USB-3.0-IP.patch b/queue/usb-dwc3-Add-revision-numbers-for-the-USB-3.0-IP.patch index c38f029..7f35aca 100644 --- a/queue/usb-dwc3-Add-revision-numbers-for-the-USB-3.0-IP.patch +++ b/queue/usb-dwc3-Add-revision-numbers-for-the-USB-3.0-IP.patch @@ -1,4 +1,4 @@ -From 512e47572f7d6c9bb43a03fee26928763447728b Mon Sep 17 00:00:00 2001 +From 54c9f00a47159b974df890fac58fea57be2f69ed Mon Sep 17 00:00:00 2001 From: John Youn <johnyoun@synopsys.com> Date: Fri, 19 Aug 2016 11:57:52 -0700 Subject: [PATCH] usb: dwc3: Add revision numbers for the USB 3.0 IP @@ -9,12 +9,13 @@ Add revision number constants for the 3.00a and 3.10a releases. Signed-off-by: John Youn <johnyoun@synopsys.com> Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h -index 3d94acd14897..002e6477d586 100644 +index d46b65ba7e77..dc5a19c105c3 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h -@@ -902,6 +902,8 @@ struct dwc3 { +@@ -878,6 +878,8 @@ struct dwc3 { #define DWC3_REVISION_260A 0x5533260a #define DWC3_REVISION_270A 0x5533270a #define DWC3_REVISION_280A 0x5533280a diff --git a/queue/usb-dwc3-host-pass-quirk-broken-port-ped-property-fo.patch b/queue/usb-dwc3-host-pass-quirk-broken-port-ped-property-fo.patch index 432b5a0..7809dcc 100644 --- a/queue/usb-dwc3-host-pass-quirk-broken-port-ped-property-fo.patch +++ b/queue/usb-dwc3-host-pass-quirk-broken-port-ped-property-fo.patch @@ -1,4 +1,4 @@ -From d1a126933af207b666ff0b01a348f347b1139541 Mon Sep 17 00:00:00 2001 +From 027ec746fcb778f6e672c017af0f5aa51c29bf51 Mon Sep 17 00:00:00 2001 From: Felipe Balbi <felipe.balbi@linux.intel.com> Date: Thu, 26 Jan 2017 11:17:37 +0200 Subject: [PATCH] usb: dwc3: host: pass quirk-broken-port-ped property for diff --git a/queue/usb-host-xhci-plat-enable-BROKEN_PED-quirk-if-platfo.patch b/queue/usb-host-xhci-plat-enable-BROKEN_PED-quirk-if-platfo.patch index 82f4e50..bf5cf65 100644 --- a/queue/usb-host-xhci-plat-enable-BROKEN_PED-quirk-if-platfo.patch +++ b/queue/usb-host-xhci-plat-enable-BROKEN_PED-quirk-if-platfo.patch @@ -1,4 +1,4 @@ -From 21939f003ad09355d9c975735750bb22aa37d8de Mon Sep 17 00:00:00 2001 +From 5f485b0ea588bfa4d38f4dcf5895b0a87cc73a51 Mon Sep 17 00:00:00 2001 From: Felipe Balbi <balbi@ti.com> Date: Mon, 23 Jan 2017 14:19:59 +0200 Subject: [PATCH] usb: host: xhci-plat: enable BROKEN_PED quirk if platform @@ -16,12 +16,13 @@ Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt -index 0b7d8576001c..2d80b60eeabe 100644 +index 966885c636d0..7790c819859a 100644 --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt -@@ -27,6 +27,7 @@ Required properties: +@@ -26,6 +26,7 @@ Required properties: Optional properties: - clocks: reference to a clock - usb3-lpm-capable: determines if platform is USB3 LPM capable @@ -30,10 +31,10 @@ index 0b7d8576001c..2d80b60eeabe 100644 Example: usb@f0931000 { diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c -index c0cd98e804a3..6d33b42ffcf5 100644 +index 5895e84f9dcc..be1572331a64 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c -@@ -232,6 +232,9 @@ static int xhci_plat_probe(struct platform_device *pdev) +@@ -223,6 +223,9 @@ static int xhci_plat_probe(struct platform_device *pdev) if (device_property_read_bool(&pdev->dev, "usb3-lpm-capable")) xhci->quirks |= XHCI_LPM_SUPPORT; diff --git a/queue/usb-hub-Wait-for-connection-to-be-reestablished-afte.patch b/queue/usb-hub-Wait-for-connection-to-be-reestablished-afte.patch index 66d8555..b88187f 100644 --- a/queue/usb-hub-Wait-for-connection-to-be-reestablished-afte.patch +++ b/queue/usb-hub-Wait-for-connection-to-be-reestablished-afte.patch @@ -1,4 +1,4 @@ -From 22547c4cc4fe20698a6a85a55b8788859134b8e4 Mon Sep 17 00:00:00 2001 +From 48dfe27047b8d1674d46317fbdf92fa46ed5129e Mon Sep 17 00:00:00 2001 From: Guenter Roeck <linux@roeck-us.net> Date: Thu, 1 Dec 2016 13:49:59 -0800 Subject: [PATCH] usb: hub: Wait for connection to be reestablished after port @@ -36,12 +36,13 @@ Cc: Douglas Anderson <dianders@chromium.org> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 71bf1c7635de..143454ea385b 100644 +index ae54ee189cd4..fc412c650334 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -2681,8 +2681,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1, +@@ -2652,8 +2652,15 @@ static int hub_port_wait_reset(struct usb_hub *hub, int port1, if (ret < 0) return ret; diff --git a/queue/usb-storage-Add-ignore-residue-quirk-for-Initio-INIC.patch b/queue/usb-storage-Add-ignore-residue-quirk-for-Initio-INIC.patch index 9a23c2c..ee4be11 100644 --- a/queue/usb-storage-Add-ignore-residue-quirk-for-Initio-INIC.patch +++ b/queue/usb-storage-Add-ignore-residue-quirk-for-Initio-INIC.patch @@ -1,4 +1,4 @@ -From d595259fbb7a7afed241b1afb2c4fe4b47de47fa Mon Sep 17 00:00:00 2001 +From 4a4a67bb6c7100dc58851b255f683ee35d40e02f Mon Sep 17 00:00:00 2001 From: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Date: Tue, 28 Feb 2017 00:46:58 +0100 Subject: [PATCH] usb-storage: Add ignore-residue quirk for Initio INIC-3619 @@ -16,12 +16,13 @@ installed BluRay drive: Signed-off-by: Tobias Jakobi <tjakobi@math.uni-bielefeld.de> Acked-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h -index 16cc18369111..9129f6cb8230 100644 +index b7029d3345c9..5b78c7ebfec3 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h -@@ -2071,6 +2071,20 @@ UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110, +@@ -2064,6 +2064,20 @@ UNUSUAL_DEV( 0x1370, 0x6828, 0x0110, 0x0110, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_IGNORE_RESIDUE ), diff --git a/queue/usb-xhci-add-quirk-flag-for-broken-PED-bits.patch b/queue/usb-xhci-add-quirk-flag-for-broken-PED-bits.patch index 1d607c5..9d9b79c 100644 --- a/queue/usb-xhci-add-quirk-flag-for-broken-PED-bits.patch +++ b/queue/usb-xhci-add-quirk-flag-for-broken-PED-bits.patch @@ -1,4 +1,4 @@ -From 41135de1e7fd14c6fcb9158404ba5c8fb97bf259 Mon Sep 17 00:00:00 2001 +From 241bd1184906223509ad92bdc95f5868adc9962e Mon Sep 17 00:00:00 2001 From: Felipe Balbi <balbi@ti.com> Date: Mon, 23 Jan 2017 14:19:58 +0200 Subject: [PATCH] usb: xhci: add quirk flag for broken PED bits @@ -29,9 +29,10 @@ Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Roger Quadros <rogerq@ti.com> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c -index 2d154e27c142..8b906c3683c3 100644 +index 0ef16900efed..1d41637a53e5 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c @@ -458,6 +458,12 @@ static void xhci_disable_port(struct usb_hcd *hcd, struct xhci_hcd *xhci, @@ -48,10 +49,10 @@ index 2d154e27c142..8b906c3683c3 100644 writel(port_status | PORT_PE, addr); port_status = readl(addr); diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h -index 5bf9df25e2ea..b8474a2e6e5d 100644 +index c525722aa934..f97b009ffc40 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h -@@ -1648,6 +1648,9 @@ struct xhci_hcd { +@@ -1657,6 +1657,9 @@ struct xhci_hcd { #define XHCI_SSIC_PORT_UNUSED (1 << 22) #define XHCI_NO_64BIT_SUPPORT (1 << 23) #define XHCI_MISSING_CAS (1 << 24) diff --git a/queue/virtio-console-avoid-DMA-from-stack.patch b/queue/virtio-console-avoid-DMA-from-stack.patch index 84e8614..d26703b 100644 --- a/queue/virtio-console-avoid-DMA-from-stack.patch +++ b/queue/virtio-console-avoid-DMA-from-stack.patch @@ -1,4 +1,4 @@ -From c4baad50297d84bde1a7ad45e50c73adae4a2192 Mon Sep 17 00:00:00 2001 +From 6e161d6fe6ae7397abe82ed347f6f64aaa447e86 Mon Sep 17 00:00:00 2001 From: Omar Sandoval <osandov@fb.com> Date: Wed, 1 Feb 2017 00:02:27 -0800 Subject: [PATCH] virtio-console: avoid DMA from stack @@ -12,12 +12,13 @@ manifested as printks getting turned into NUL bytes). Signed-off-by: Omar Sandoval <osandov@fb.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Amit Shah <amit.shah@redhat.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c -index 6266c0568e1d..e9b7e0b3cabe 100644 +index 4aae0d27e382..d87f3e72c5fb 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c -@@ -1136,6 +1136,8 @@ static int put_chars(u32 vtermno, const char *buf, int count) +@@ -1137,6 +1137,8 @@ static int put_chars(u32 vtermno, const char *buf, int count) { struct port *port; struct scatterlist sg[1]; @@ -26,7 +27,7 @@ index 6266c0568e1d..e9b7e0b3cabe 100644 if (unlikely(early_put_chars)) return early_put_chars(vtermno, buf, count); -@@ -1144,8 +1146,14 @@ static int put_chars(u32 vtermno, const char *buf, int count) +@@ -1145,8 +1147,14 @@ static int put_chars(u32 vtermno, const char *buf, int count) if (!port) return -EPIPE; diff --git a/queue/watchdog-s3c2410-Fix-infinite-interrupt-in-soft-mode.patch b/queue/watchdog-s3c2410-Fix-infinite-interrupt-in-soft-mode.patch index ae8e292..933279f 100644 --- a/queue/watchdog-s3c2410-Fix-infinite-interrupt-in-soft-mode.patch +++ b/queue/watchdog-s3c2410-Fix-infinite-interrupt-in-soft-mode.patch @@ -1,4 +1,4 @@ -From 0b445549ea6f91ffea78a976fe89b932db6e077a Mon Sep 17 00:00:00 2001 +From eab2b03e5e4cc9419134fa54c484d76be4c4d4f1 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski <krzk@kernel.org> Date: Fri, 24 Feb 2017 17:11:16 +0200 Subject: [PATCH] watchdog: s3c2410: Fix infinite interrupt in soft mode @@ -22,6 +22,7 @@ watchdog quirk and flavor are needed. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt index 8f3d96af81d7..1f6e101e299a 100644 @@ -44,7 +45,7 @@ index 8f3d96af81d7..1f6e101e299a 100644 - reg : base physical address of the controller and length of memory mapped region. diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c -index b305b8717d9f..558789b8805f 100644 +index 59e95762a6de..c5a567a73f59 100644 --- a/drivers/watchdog/s3c2410_wdt.c +++ b/drivers/watchdog/s3c2410_wdt.c @@ -46,6 +46,7 @@ diff --git a/queue/x86-intel_idle-Add-CPU-model-0x4a-Atom-Z34xx-series.patch b/queue/x86-intel_idle-Add-CPU-model-0x4a-Atom-Z34xx-series.patch index 04981dd..cf745e9 100644 --- a/queue/x86-intel_idle-Add-CPU-model-0x4a-Atom-Z34xx-series.patch +++ b/queue/x86-intel_idle-Add-CPU-model-0x4a-Atom-Z34xx-series.patch @@ -1,4 +1,4 @@ -From 5e7ec268fd48d63cfd0e3a9be6c6443f01673bd4 Mon Sep 17 00:00:00 2001 +From e999470f70fc9b45cbf80df4fc466617e1822557 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Date: Tue, 25 Oct 2016 17:11:39 +0300 Subject: [PATCH] x86/intel_idle: Add CPU model 0x4a (Atom Z34xx series) @@ -11,9 +11,10 @@ So we just reuse the definition from official BSP code. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Signed-off-by: Len Brown <len.brown@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c -index 4466a2f969d7..5ded9b22b015 100644 +index 67ec58f9ef99..d523b5dc7523 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -724,6 +724,50 @@ static struct cpuidle_state atom_cstates[] = { diff --git a/queue/x86-pmem-fix-broken-__copy_user_nocache-cache-bypass.patch b/queue/x86-pmem-fix-broken-__copy_user_nocache-cache-bypass.patch index 28db8fd..f15fd52 100644 --- a/queue/x86-pmem-fix-broken-__copy_user_nocache-cache-bypass.patch +++ b/queue/x86-pmem-fix-broken-__copy_user_nocache-cache-bypass.patch @@ -1,4 +1,4 @@ -From 11e63f6d920d6f2dfd3cd421e939a4aec9a58dcd Mon Sep 17 00:00:00 2001 +From cd6abbe43dc297c41056b3962077560b1a26292e Mon Sep 17 00:00:00 2001 From: Dan Williams <dan.j.williams@intel.com> Date: Thu, 6 Apr 2017 09:04:31 -0700 Subject: [PATCH] x86, pmem: fix broken __copy_user_nocache cache-bypass @@ -33,12 +33,13 @@ Cc: Matthew Wilcox <mawilcox@microsoft.com> Reviewed-by: Ross Zwisler <ross.zwisler@linux.intel.com> Signed-off-by: Toshi Kani <toshi.kani@hpe.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/include/asm/pmem.h b/arch/x86/include/asm/pmem.h -index 2c1ebeb4d737..529bb4a6487a 100644 +index 643eba42d620..4850c6d3f2c1 100644 --- a/arch/x86/include/asm/pmem.h +++ b/arch/x86/include/asm/pmem.h -@@ -55,7 +55,8 @@ static inline int arch_memcpy_from_pmem(void *dst, const void *src, size_t n) +@@ -58,7 +58,8 @@ static inline int arch_memcpy_from_pmem(void *dst, const void *src, size_t n) * @size: number of bytes to write back * * Write back a cache range using the CLWB (cache line write back) @@ -48,7 +49,7 @@ index 2c1ebeb4d737..529bb4a6487a 100644 */ static inline void arch_wb_cache_pmem(void *addr, size_t size) { -@@ -69,15 +70,6 @@ static inline void arch_wb_cache_pmem(void *addr, size_t size) +@@ -72,15 +73,6 @@ static inline void arch_wb_cache_pmem(void *addr, size_t size) clwb(p); } @@ -64,7 +65,7 @@ index 2c1ebeb4d737..529bb4a6487a 100644 /** * arch_copy_from_iter_pmem - copy data from an iterator to PMEM * @addr: PMEM destination address -@@ -94,7 +86,35 @@ static inline size_t arch_copy_from_iter_pmem(void *addr, size_t bytes, +@@ -97,7 +89,35 @@ static inline size_t arch_copy_from_iter_pmem(void *addr, size_t bytes, /* TODO: skip the write-back by always using non-temporal stores */ len = copy_from_iter_nocache(addr, bytes, i); diff --git a/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-W-reboot-q.patch b/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-W-reboot-q.patch index 48dcd39..fe6fb60 100644 --- a/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-W-reboot-q.patch +++ b/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-W-reboot-q.patch @@ -1,4 +1,4 @@ -From 3b3e78552d3077ec70d2640e629e07e3ab416a6a Mon Sep 17 00:00:00 2001 +From 3e07975a3a54f9ce9451d4d31f1ce4639f485614 Mon Sep 17 00:00:00 2001 From: Matjaz Hegedic <matjaz.hegedic@gmail.com> Date: Sun, 5 Mar 2017 19:16:44 +0100 Subject: [PATCH] x86/reboot/quirks: Add ASUS EeeBook X205TA/W reboot quirk @@ -12,9 +12,10 @@ fixing the problem. Signed-off-by: Matjaz Hegedic <matjaz.hegedic@gmail.com> Link: http://lkml.kernel.org/r/1488737804-20681-1-git-send-email-matjaz.hegedic@gmail.com Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index 01c9cda3e1b7..4194d6f9bb29 100644 +index 00bd3751352d..cb9397c459ba 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -231,6 +231,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { diff --git a/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-reboot-qui.patch b/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-reboot-qui.patch index 9acd235..f76bc73 100644 --- a/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-reboot-qui.patch +++ b/queue/x86-reboot-quirks-Add-ASUS-EeeBook-X205TA-reboot-qui.patch @@ -1,4 +1,4 @@ -From 90b28ded88dda8bea82b4a86923e73ba0746d884 Mon Sep 17 00:00:00 2001 +From 74b79b6ca17c272a7956c68f9a5bdf95dfab0e69 Mon Sep 17 00:00:00 2001 From: Matjaz Hegedic <matjaz.hegedic@gmail.com> Date: Sun, 19 Feb 2017 19:32:48 +0100 Subject: [PATCH] x86/reboot/quirks: Add ASUS EeeBook X205TA reboot quirk @@ -20,9 +20,10 @@ Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c -index e244c19a2451..01c9cda3e1b7 100644 +index 63bf27d972b7..00bd3751352d 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -223,6 +223,14 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = { diff --git a/queue/x86-signals-Fix-lower-upper-bound-reporting-in-compa.patch b/queue/x86-signals-Fix-lower-upper-bound-reporting-in-compa.patch index c677187..b4fb363 100644 --- a/queue/x86-signals-Fix-lower-upper-bound-reporting-in-compa.patch +++ b/queue/x86-signals-Fix-lower-upper-bound-reporting-in-compa.patch @@ -1,4 +1,4 @@ -From cfac6dfa42bddfa9711b20d486e521d1a41ab09f Mon Sep 17 00:00:00 2001 +From 8c1609dde53e97da64e1b451d45bb30bd8d4607d Mon Sep 17 00:00:00 2001 From: Joerg Roedel <jroedel@suse.de> Date: Tue, 4 Apr 2017 18:15:01 +0200 Subject: [PATCH] x86/signals: Fix lower/upper bound reporting in compat @@ -28,12 +28,13 @@ Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: a4455082dc6f0 ('x86/signals: Add missing signal_compat code for x86 features') Link: http://lkml.kernel.org/r/1491322501-5054-1-git-send-email-joro@8bytes.org Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c -index ec1f756f9dc9..71beb28600d4 100644 +index b44564bf86a8..0471763eefdd 100644 --- a/arch/x86/kernel/signal_compat.c +++ b/arch/x86/kernel/signal_compat.c -@@ -151,8 +151,8 @@ int __copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from, +@@ -132,8 +132,8 @@ int copy_siginfo_to_user32(compat_siginfo_t __user *to, const siginfo_t *from) if (from->si_signo == SIGSEGV) { if (from->si_code == SEGV_BNDERR) { diff --git a/queue/x86-vdso-Ensure-vdso32_enabled-gets-set-to-valid-val.patch b/queue/x86-vdso-Ensure-vdso32_enabled-gets-set-to-valid-val.patch index c10b4ca..a262435 100644 --- a/queue/x86-vdso-Ensure-vdso32_enabled-gets-set-to-valid-val.patch +++ b/queue/x86-vdso-Ensure-vdso32_enabled-gets-set-to-valid-val.patch @@ -1,4 +1,4 @@ -From c06989da39cdb10604d572c8c7ea8c8c97f3c483 Mon Sep 17 00:00:00 2001 +From acff96ceed86abd7d62e6293b48f9612a2e5fedf Mon Sep 17 00:00:00 2001 From: Mathias Krause <minipli@googlemail.com> Date: Mon, 10 Apr 2017 17:14:27 +0200 Subject: [PATCH] x86/vdso: Ensure vdso32_enabled gets set to valid values only @@ -24,6 +24,7 @@ Cc: Roland McGrath <roland@redhat.com> Link: http://lkml.kernel.org/r/1491424561-7187-1-git-send-email-minipli@googlemail.com Link: http://lkml.kernel.org/r/20170410151723.518412863@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/entry/vdso/vdso32-setup.c b/arch/x86/entry/vdso/vdso32-setup.c index 7853b53959cd..3f9d1a83891a 100644 diff --git a/queue/x86-vdso-Plug-race-between-mapping-and-ELF-header-se.patch b/queue/x86-vdso-Plug-race-between-mapping-and-ELF-header-se.patch index 5b9a28b..de70190 100644 --- a/queue/x86-vdso-Plug-race-between-mapping-and-ELF-header-se.patch +++ b/queue/x86-vdso-Plug-race-between-mapping-and-ELF-header-se.patch @@ -1,4 +1,4 @@ -From 6fdc6dd90272ce7e75d744f71535cfbd8d77da81 Mon Sep 17 00:00:00 2001 +From 967b271816a6366166728c25f8ca5daff2c1d285 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Mon, 10 Apr 2017 17:14:28 +0200 Subject: [PATCH] x86/vdso: Plug race between mapping and ELF header setup @@ -28,12 +28,13 @@ Cc: Mathias Krause <minipli@googlemail.com> Cc: stable@vger.kernel.org Link: http://lkml.kernel.org/r/20170410151723.602367196@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h -index 9d49c18b5ea9..3762536619f8 100644 +index e7f155c3045e..94aad6364b47 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h -@@ -287,7 +287,7 @@ struct task_struct; +@@ -278,7 +278,7 @@ struct task_struct; #define ARCH_DLINFO_IA32 \ do { \ diff --git a/queue/x86-xen-Fix-APIC-id-mismatch-warning-on-Intel.patch b/queue/x86-xen-Fix-APIC-id-mismatch-warning-on-Intel.patch index aa2052e..c30bb46 100644 --- a/queue/x86-xen-Fix-APIC-id-mismatch-warning-on-Intel.patch +++ b/queue/x86-xen-Fix-APIC-id-mismatch-warning-on-Intel.patch @@ -1,4 +1,4 @@ -From cc272163ea554a97dac180fa8dd6cd54c2810bd1 Mon Sep 17 00:00:00 2001 +From 0a27bc3f95c077083570734d8283e29f70f9ce3b Mon Sep 17 00:00:00 2001 From: Mohit Gambhir <mohit.gambhir@oracle.com> Date: Thu, 26 Jan 2017 13:12:27 -0500 Subject: [PATCH] x86/xen: Fix APIC id mismatch warning on Intel @@ -39,6 +39,7 @@ as opposed to using apicid from cpuid as is done on Intel machines. Signed-off-by: Mohit Gambhir <mohit.gambhir@oracle.com> Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/xen/apic.c b/arch/x86/xen/apic.c index 44c88ad1841a..bcea81f36fc5 100644 diff --git a/queue/xen-fbfront-fix-connecting-to-backend.patch b/queue/xen-fbfront-fix-connecting-to-backend.patch index 1f78cce..91ed914 100644 --- a/queue/xen-fbfront-fix-connecting-to-backend.patch +++ b/queue/xen-fbfront-fix-connecting-to-backend.patch @@ -1,4 +1,4 @@ -From 7767b78837e24e96dc973c9ab02a6690e8763337 Mon Sep 17 00:00:00 2001 +From ccb30ac73653ba2d65f460a353746b2e5c569d3b Mon Sep 17 00:00:00 2001 From: Juergen Gross <jgross@suse.com> Date: Fri, 7 Apr 2017 17:28:23 +0200 Subject: [PATCH] xen, fbfront: fix connecting to backend diff --git a/queue/xfs-Honor-FALLOC_FL_KEEP_SIZE-when-punching-ends-of-.patch b/queue/xfs-Honor-FALLOC_FL_KEEP_SIZE-when-punching-ends-of-.patch index 8e1f6e2..9ff272a 100644 --- a/queue/xfs-Honor-FALLOC_FL_KEEP_SIZE-when-punching-ends-of-.patch +++ b/queue/xfs-Honor-FALLOC_FL_KEEP_SIZE-when-punching-ends-of-.patch @@ -1,4 +1,4 @@ -From 3dd09d5a8589c640abb49cfcf92b4ed669eafad1 Mon Sep 17 00:00:00 2001 +From c154989d1a83c28b39ddf8004fcbee8e4cd33196 Mon Sep 17 00:00:00 2001 From: Calvin Owens <calvinowens@fb.com> Date: Mon, 3 Apr 2017 12:22:29 -0700 Subject: [PATCH] xfs: Honor FALLOC_FL_KEEP_SIZE when punching ends of files @@ -33,12 +33,13 @@ Signed-off-by: Calvin Owens <calvinowens@fb.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Darrick J. Wong <darrick.wong@oracle.com> Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c -index 8b75dcea5966..828532ce0adc 100644 +index da1677dd1e65..0299c7dbfcde 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c -@@ -1311,8 +1311,16 @@ xfs_free_file_space( +@@ -1179,8 +1179,16 @@ xfs_free_file_space( /* * Now that we've unmap all full blocks we'll have to zero out any * partial block at the beginning and/or end. xfs_zero_range is diff --git a/queue/zram-do-not-use-copy_page-with-non-page-aligned-addr.patch b/queue/zram-do-not-use-copy_page-with-non-page-aligned-addr.patch index 3addba4..7db89cc 100644 --- a/queue/zram-do-not-use-copy_page-with-non-page-aligned-addr.patch +++ b/queue/zram-do-not-use-copy_page-with-non-page-aligned-addr.patch @@ -1,4 +1,4 @@ -From d72e9a7a93e4f8e9e52491921d99e0c8aa89eb4e Mon Sep 17 00:00:00 2001 +From 243409ba79547d237057e03b1343791fd729d51a Mon Sep 17 00:00:00 2001 From: Minchan Kim <minchan@kernel.org> Date: Thu, 13 Apr 2017 14:56:37 -0700 Subject: [PATCH] zram: do not use copy_page with non-page aligned address @@ -38,12 +38,13 @@ Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c -index 03a7408e090d..0c09d4256108 100644 +index d2ef51ca9cf4..f874e2a529f4 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c -@@ -523,7 +523,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) +@@ -588,7 +588,7 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index) cmem = zs_map_object(meta->mem_pool, handle, ZS_MM_RO); if (size == PAGE_SIZE) { @@ -52,7 +53,7 @@ index 03a7408e090d..0c09d4256108 100644 } else { struct zcomp_strm *zstrm = zcomp_stream_get(zram->comp); -@@ -717,7 +717,7 @@ compress_again: +@@ -780,7 +780,7 @@ compress_again: if ((clen == PAGE_SIZE) && !is_partial_io(bvec)) { src = kmap_atomic(page); diff --git a/queue/zsmalloc-expand-class-bit.patch b/queue/zsmalloc-expand-class-bit.patch index 382e271..6367dfd 100644 --- a/queue/zsmalloc-expand-class-bit.patch +++ b/queue/zsmalloc-expand-class-bit.patch @@ -1,4 +1,4 @@ -From 85d492f28d056c40629fc25d79f54da618a29dc4 Mon Sep 17 00:00:00 2001 +From 3b4a2d0b6a1972877416ccb4376116b1e150680d Mon Sep 17 00:00:00 2001 From: Minchan Kim <minchan@kernel.org> Date: Thu, 13 Apr 2017 14:56:40 -0700 Subject: [PATCH] zsmalloc: expand class bit @@ -26,12 +26,13 @@ Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c -index b7ee9c34dbd6..d41edd28298b 100644 +index b0bc023d25c5..1689bb58e0d1 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c -@@ -276,7 +276,7 @@ struct zs_pool { +@@ -280,7 +280,7 @@ struct zs_pool { struct zspage { struct { unsigned int fullness:FULLNESS_BITS; |