From: Greg Kroah-Hartman Date: Wed, 2 May 2018 20:09:22 +0000 (-0700) Subject: drop some patches from 4.4 and 4.9 X-Git-Tag: v4.9.99~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a94b3d42f6bbcc81ba73c70e6284682eacb86f6;p=thirdparty%2Fkernel%2Fstable-queue.git drop some patches from 4.4 and 4.9 --- diff --git a/queue-4.4/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch b/queue-4.4/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch deleted file mode 100644 index 714cdc04061..00000000000 --- a/queue-4.4/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch +++ /dev/null @@ -1,37 +0,0 @@ -From foo@baz Wed May 2 11:39:22 PDT 2018 -From: David Lechner -Date: Mon, 15 Jan 2018 11:29:31 -0600 -Subject: ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y - -From: David Lechner - -[ Upstream commit 35ba26772c827dbfc03be8adc3af8ff0d294b38f ] - -This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in -option. Since the reset function has been moved out of the mach code in -commit 94f2e94514e5 ("ARM: davinci: remove watchdog reset") and into the -watchdog driver, devices cannot reboot unless the watchdog driver is -loaded, so make it a compiled-in option so that we can always reboot, even -when modules are not loaded. - -Cc: Sekhar Nori -Suggested-by: Adam Ford -Signed-off-by: David Lechner -Signed-off-by: Sekhar Nori -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/configs/davinci_all_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/configs/davinci_all_defconfig -+++ b/arch/arm/configs/davinci_all_defconfig -@@ -120,7 +120,7 @@ CONFIG_I2C_DAVINCI=y - CONFIG_PINCTRL_SINGLE=y - CONFIG_GPIO_PCF857X=y - CONFIG_WATCHDOG=y --CONFIG_DAVINCI_WATCHDOG=m -+CONFIG_DAVINCI_WATCHDOG=y - CONFIG_MFD_DM355EVM_MSP=y - CONFIG_TPS6507X=y - CONFIG_VIDEO_OUTPUT_CONTROL=m diff --git a/queue-4.4/pinctrl-msm-use-dynamic-gpio-numbering.patch b/queue-4.4/pinctrl-msm-use-dynamic-gpio-numbering.patch deleted file mode 100644 index 5bb0eeb921b..00000000000 --- a/queue-4.4/pinctrl-msm-use-dynamic-gpio-numbering.patch +++ /dev/null @@ -1,34 +0,0 @@ -From foo@baz Wed May 2 11:39:22 PDT 2018 -From: Bjorn Andersson -Date: Sun, 28 Jan 2018 16:59:48 -0800 -Subject: pinctrl: msm: Use dynamic GPIO numbering - -From: Bjorn Andersson - -[ Upstream commit a7aa75a2a7dba32594291a71c3704000a2fd7089 ] - -The base of the TLMM gpiochip should not be statically defined as 0, fix -this to not artificially restrict the existence of multiple pinctrl-msm -devices. - -Fixes: f365be092572 ("pinctrl: Add Qualcomm TLMM driver") -Reported-by: Timur Tabi -Signed-off-by: Bjorn Andersson -Signed-off-by: Linus Walleij -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/pinctrl/qcom/pinctrl-msm.c -+++ b/drivers/pinctrl/qcom/pinctrl-msm.c -@@ -793,7 +793,7 @@ static int msm_gpio_init(struct msm_pinc - return -EINVAL; - - chip = &pctrl->chip; -- chip->base = 0; -+ chip->base = -1; - chip->ngpio = ngpio; - chip->label = dev_name(pctrl->dev); - chip->dev = pctrl->dev; diff --git a/queue-4.4/series b/queue-4.4/series index 3eb6ee4a2c7..468c56f7c28 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -241,7 +241,6 @@ pci-add-function-1-dma-alias-quirk-for-marvell-88se9220.patch udf-provide-saner-default-for-invalid-uid-gid.patch media-vb2-fix-videobuf2-to-map-correct-area.patch media-cx25821-prevent-out-of-bounds-read-on-array-card.patch -arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch clk-samsung-s3c2410-fix-pll-rates.patch clk-samsung-exynos5260-fix-pll-rates.patch clk-samsung-exynos5433-fix-pll-rates.patch @@ -261,7 +260,6 @@ scsi-lpfc-fix-issue_lip-if-link-is-disabled.patch scsi-lpfc-fix-soft-lockup-in-lpfc-worker-thread-during-lip-testing.patch scsi-lpfc-fix-frequency-of-release-wqe-cqes.patch regulator-of-add-a-missing-of_node_put-in-an-error-handling-path-of-of_regulator_match.patch -pinctrl-msm-use-dynamic-gpio-numbering.patch asoc-samsung-i2s-ensure-the-rclk-rate-is-properly-determined.patch bluetooth-btusb-add-device-id-for-rtl8822be.patch kdb-make-mdr-command-repeat.patch diff --git a/queue-4.9/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch b/queue-4.9/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch deleted file mode 100644 index 980a887badc..00000000000 --- a/queue-4.9/arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch +++ /dev/null @@ -1,37 +0,0 @@ -From foo@baz Wed May 2 10:53:12 PDT 2018 -From: David Lechner -Date: Mon, 15 Jan 2018 11:29:31 -0600 -Subject: ARM: davinci_all_defconfig: set CONFIG_DAVINCI_WATCHDOG=y - -From: David Lechner - -[ Upstream commit 35ba26772c827dbfc03be8adc3af8ff0d294b38f ] - -This changes CONFIG_DAVINCI_WATCHDOG from a module to a compiled-in -option. Since the reset function has been moved out of the mach code in -commit 94f2e94514e5 ("ARM: davinci: remove watchdog reset") and into the -watchdog driver, devices cannot reboot unless the watchdog driver is -loaded, so make it a compiled-in option so that we can always reboot, even -when modules are not loaded. - -Cc: Sekhar Nori -Suggested-by: Adam Ford -Signed-off-by: David Lechner -Signed-off-by: Sekhar Nori -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - arch/arm/configs/davinci_all_defconfig | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/arch/arm/configs/davinci_all_defconfig -+++ b/arch/arm/configs/davinci_all_defconfig -@@ -117,7 +117,7 @@ CONFIG_PINCTRL_SINGLE=y - CONFIG_GPIO_SYSFS=y - CONFIG_GPIO_PCA953X=y - CONFIG_WATCHDOG=y --CONFIG_DAVINCI_WATCHDOG=m -+CONFIG_DAVINCI_WATCHDOG=y - CONFIG_MFD_DM355EVM_MSP=y - CONFIG_TPS6507X=y - CONFIG_REGULATOR=y diff --git a/queue-4.9/series b/queue-4.9/series index 0279dba0a7d..aa9fc0428e8 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -362,7 +362,6 @@ udf-provide-saner-default-for-invalid-uid-gid.patch media-vb2-fix-videobuf2-to-map-correct-area.patch media-vivid-fix-incorrect-capabilities-for-radio.patch media-cx25821-prevent-out-of-bounds-read-on-array-card.patch -arm-davinci_all_defconfig-set-config_davinci_watchdog-y.patch clk-samsung-s3c2410-fix-pll-rates.patch clk-samsung-exynos7-fix-pll-rates.patch clk-samsung-exynos5260-fix-pll-rates.patch