From 47cb749ef73f26991c0efbf11f8ac20c734d096f Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 22 Aug 2018 12:13:12 +0200 Subject: [PATCH] drop patch from 4.14 and 4.17 --- ...copyout-for-config_compat_32bit_time.patch | 41 ------------------- queue-4.14/series | 1 - ...copyout-for-config_compat_32bit_time.patch | 41 ------------------- queue-4.17/series | 1 - 4 files changed, 84 deletions(-) delete mode 100644 queue-4.14/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch delete mode 100644 queue-4.17/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch diff --git a/queue-4.14/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch b/queue-4.14/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch deleted file mode 100644 index 1858284046e..00000000000 --- a/queue-4.14/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Wed Aug 22 09:33:46 CEST 2018 -From: Arnd Bergmann -Date: Mon, 18 Jun 2018 16:07:59 +0200 -Subject: posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME - -From: Arnd Bergmann - -[ Upstream commit 0fe2795516b9e1c59b58b02bdf8658698117ec4e ] - -Commit b5793b0d92c9 added support for building the nanosleep compat system -call on 32-bit architectures, but missed one change in nanosleep_copyout(), -which would trigger a BUG() as soon as any architecture is switched over to -use it. - -Use the proper config symbol to enable the code path. - -Fixes: Commit b5793b0d92c9 ("posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME") -Signed-off-by: Arnd Bergmann -Signed-off-by: Thomas Gleixner -Cc: y2038@lists.linaro.org -Cc: Anna-Maria Gleixner -Cc: Deepa Dinamani -Cc: "Rafael J. Wysocki" -Link: https://lkml.kernel.org/r/20180618140811.2998503-1-arnd@arndb.de -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - kernel/time/hrtimer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/time/hrtimer.c -+++ b/kernel/time/hrtimer.c -@@ -1450,7 +1450,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); - int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts) - { - switch(restart->nanosleep.type) { --#ifdef CONFIG_COMPAT -+#ifdef CONFIG_COMPAT_32BIT_TIME - case TT_COMPAT: - if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp)) - return -EFAULT; diff --git a/queue-4.14/series b/queue-4.14/series index ca2b5027a2c..e8c22dd4679 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -39,7 +39,6 @@ drm-mali-dp-enable-global-se-interrupts-mask-for-dp500.patch drm-arm-malidp-preserve-layer_format-contents-when-setting-format.patch ib-rxe-fix-missing-completion-for-mem_reg-work-requests.patch libahci-fix-possible-spectre-v1-pmp-indexing-in-ahci_led_store.patch -posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch usb-dwc2-alloc-dma-aligned-buffer-for-isoc-split-in.patch usb-dwc2-fix-isoc-split-in-transfer-with-no-data.patch usb-gadget-composite-fix-delayed_status-race-condition-when-set_interface.patch diff --git a/queue-4.17/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch b/queue-4.17/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch deleted file mode 100644 index d8886851d10..00000000000 --- a/queue-4.17/posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch +++ /dev/null @@ -1,41 +0,0 @@ -From foo@baz Wed Aug 22 09:16:55 CEST 2018 -From: Arnd Bergmann -Date: Mon, 18 Jun 2018 16:07:59 +0200 -Subject: posix-timers: Fix nanosleep_copyout() for CONFIG_COMPAT_32BIT_TIME - -From: Arnd Bergmann - -[ Upstream commit 0fe2795516b9e1c59b58b02bdf8658698117ec4e ] - -Commit b5793b0d92c9 added support for building the nanosleep compat system -call on 32-bit architectures, but missed one change in nanosleep_copyout(), -which would trigger a BUG() as soon as any architecture is switched over to -use it. - -Use the proper config symbol to enable the code path. - -Fixes: Commit b5793b0d92c9 ("posix-timers: Make compat syscalls depend on CONFIG_COMPAT_32BIT_TIME") -Signed-off-by: Arnd Bergmann -Signed-off-by: Thomas Gleixner -Cc: y2038@lists.linaro.org -Cc: Anna-Maria Gleixner -Cc: Deepa Dinamani -Cc: "Rafael J. Wysocki" -Link: https://lkml.kernel.org/r/20180618140811.2998503-1-arnd@arndb.de -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - kernel/time/hrtimer.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/kernel/time/hrtimer.c -+++ b/kernel/time/hrtimer.c -@@ -1659,7 +1659,7 @@ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper); - int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts) - { - switch(restart->nanosleep.type) { --#ifdef CONFIG_COMPAT -+#ifdef CONFIG_COMPAT_32BIT_TIME - case TT_COMPAT: - if (compat_put_timespec64(ts, restart->nanosleep.compat_rmtp)) - return -EFAULT; diff --git a/queue-4.17/series b/queue-4.17/series index c12868f851a..44cfc8914f3 100644 --- a/queue-4.17/series +++ b/queue-4.17/series @@ -49,7 +49,6 @@ drm-mali-dp-rectify-the-width-and-height-passed-to-rotmem_required.patch ib-rxe-fix-missing-completion-for-mem_reg-work-requests.patch libahci-fix-possible-spectre-v1-pmp-indexing-in-ahci_led_store.patch dmaengine-ti-omap-dma-fix-omap1510-incorrect-residue_granularity.patch -posix-timers-fix-nanosleep_copyout-for-config_compat_32bit_time.patch usb-dwc2-fix-host-exit-from-hibernation-flow.patch usb-dwc2-alloc-dma-aligned-buffer-for-isoc-split-in.patch usb-dwc2-fix-isoc-split-in-transfer-with-no-data.patch -- 2.47.3