4.9-stable patches

added patches:
	kdev_t-always-inline-major-minor-helper-functions.patch

diff --git a/queue-4.19/series b/queue-4.19/series
new file mode 100644 (file)
index 0000000..358c11b
--- /dev/null
+++ b/queue-4.19/series
@@ -0,0 +1 @@
+revert-mtd-spinand-fix-oob-read.patch

diff --git a/queue-4.9/kdev_t-always-inline-major-minor-helper-functions.patch b/queue-4.9/kdev_t-always-inline-major-minor-helper-functions.patch
new file mode 100644 (file)
index 0000000..76f9f02
--- /dev/null
+++ b/queue-4.9/kdev_t-always-inline-major-minor-helper-functions.patch
@@ -0,0 +1,104 @@
+From aa8c7db494d0a83ecae583aa193f1134ef25d506 Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Tue, 29 Dec 2020 15:14:55 -0800
+Subject: kdev_t: always inline major/minor helper functions
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit aa8c7db494d0a83ecae583aa193f1134ef25d506 upstream.
+
+Silly GCC doesn't always inline these trivial functions.
+
+Fixes the following warning:
+
+  arch/x86/kernel/sys_ia32.o: warning: objtool: cp_stat64()+0xd8: call to new_encode_dev() with UACCESS enabled
+
+Link: https://lkml.kernel.org/r/984353b44a4484d86ba9f73884b7306232e25e30.1608737428.git.jpoimboe@redhat.com
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Reported-by: Randy Dunlap <rdunlap@infradead.org>
+Acked-by: Randy Dunlap <rdunlap@infradead.org> [build-tested]
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/kdev_t.h |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+--- a/include/linux/kdev_t.h
++++ b/include/linux/kdev_t.h
+@@ -20,61 +20,61 @@
+       })
+ 
+ /* acceptable for old filesystems */
+-static inline bool old_valid_dev(dev_t dev)
++static __always_inline bool old_valid_dev(dev_t dev)
+ {
+       return MAJOR(dev) < 256 && MINOR(dev) < 256;
+ }
+ 
+-static inline u16 old_encode_dev(dev_t dev)
++static __always_inline u16 old_encode_dev(dev_t dev)
+ {
+       return (MAJOR(dev) << 8) | MINOR(dev);
+ }
+ 
+-static inline dev_t old_decode_dev(u16 val)
++static __always_inline dev_t old_decode_dev(u16 val)
+ {
+       return MKDEV((val >> 8) & 255, val & 255);
+ }
+ 
+-static inline u32 new_encode_dev(dev_t dev)
++static __always_inline u32 new_encode_dev(dev_t dev)
+ {
+       unsigned major = MAJOR(dev);
+       unsigned minor = MINOR(dev);
+       return (minor & 0xff) | (major << 8) | ((minor & ~0xff) << 12);
+ }
+ 
+-static inline dev_t new_decode_dev(u32 dev)
++static __always_inline dev_t new_decode_dev(u32 dev)
+ {
+       unsigned major = (dev & 0xfff00) >> 8;
+       unsigned minor = (dev & 0xff) | ((dev >> 12) & 0xfff00);
+       return MKDEV(major, minor);
+ }
+ 
+-static inline u64 huge_encode_dev(dev_t dev)
++static __always_inline u64 huge_encode_dev(dev_t dev)
+ {
+       return new_encode_dev(dev);
+ }
+ 
+-static inline dev_t huge_decode_dev(u64 dev)
++static __always_inline dev_t huge_decode_dev(u64 dev)
+ {
+       return new_decode_dev(dev);
+ }
+ 
+-static inline int sysv_valid_dev(dev_t dev)
++static __always_inline int sysv_valid_dev(dev_t dev)
+ {
+       return MAJOR(dev) < (1<<14) && MINOR(dev) < (1<<18);
+ }
+ 
+-static inline u32 sysv_encode_dev(dev_t dev)
++static __always_inline u32 sysv_encode_dev(dev_t dev)
+ {
+       return MINOR(dev) | (MAJOR(dev) << 18);
+ }
+ 
+-static inline unsigned sysv_major(u32 dev)
++static __always_inline unsigned sysv_major(u32 dev)
+ {
+       return (dev >> 18) & 0x3fff;
+ }
+ 
+-static inline unsigned sysv_minor(u32 dev)
++static __always_inline unsigned sysv_minor(u32 dev)
+ {
+       return dev & 0x3ffff;
+ }

diff --git a/queue-4.9/series b/queue-4.9/series
index 9e9cdf49d415887c0631360bb75d85a00e7722f7..92c63e07cab1ff3a15c106587fce7ca7394d913d 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -22,3 +22,4 @@ module-set-module_state_going-state-when-a-module-fa.patch
 quota-don-t-overflow-quota-file-offsets.patch
 powerpc-sysdev-add-missing-iounmap-on-error-in-mpic_.patch
 module-delay-kobject-uevent-until-after-module-init-.patch
+kdev_t-always-inline-major-minor-helper-functions.patch

diff --git a/queue-5.10/series b/queue-5.10/series
new file mode 100644 (file)
index 0000000..9c03404
--- /dev/null
+++ b/queue-5.10/series
@@ -0,0 +1,2 @@
+revert-drm-amd-display-fix-memory-leaks-in-s3-resume.patch
+revert-mtd-spinand-fix-oob-read.patch

diff --git a/queue-5.4/series b/queue-5.4/series
new file mode 100644 (file)
index 0000000..9c03404
--- /dev/null
+++ b/queue-5.4/series
@@ -0,0 +1,2 @@
+revert-drm-amd-display-fix-memory-leaks-in-s3-resume.patch
+revert-mtd-spinand-fix-oob-read.patch