Updated to version 5.0.7

AUFS was updated to version "4.20.4+-20190311" as well.
This commit is contained in:
Evgenii Shatokhin 2019-04-09 17:26:40 +03:00
parent 4dc86f69fc
commit 27010ed411
8 changed files with 296 additions and 196 deletions

View file

@ -1,3 +1,3 @@
sources: sources:
linux-4.20.tar.xz: f3e78fc0cf8ddd62f7859ac4a54a18a43b43e75a linux-5.0.tar.xz: 3a7bc3cdd77d71b18b96ca0d92e57ef9bded3757
patch-4.20.12.xz: 3e6eae3820fdf20828e0fe32fba38f9918cfdc11 patch-5.0.7.xz: 38b31884dd4a36e6bb708b2cf793ecfba724dc3d

View file

@ -1,18 +1,18 @@
diff --git a/Makefile b/Makefile diff --git a/Makefile b/Makefile
index 6f7a8172de44..956a5a3e8d2f 100644 index 3b3593b78e12..d0d85ca8b942 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -1069,8 +1069,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE @@ -1080,8 +1080,7 @@ include/config/kernel.release: $(srctree)/Makefile FORCE
# Carefully list dependencies so we do not try to build scripts twice # Carefully list dependencies so we do not try to build scripts twice
# in parallel # in parallel
PHONY += scripts PHONY += scripts
-scripts: scripts_basic scripts_dtc asm-generic gcc-plugins $(autoksyms_h) -scripts: scripts_basic scripts_dtc
- $(Q)$(MAKE) $(build)=$(@) - $(Q)$(MAKE) $(build)=$(@)
+scripts: +scripts:
# Things we need to do before we recursively start building the kernel # Things we need to do before we recursively start building the kernel
# or the modules are listed in "prepare". # or the modules are listed in "prepare".
@@ -1107,7 +1106,7 @@ prepare0: archprepare gcc-plugins @@ -1119,7 +1118,7 @@ prepare0: archprepare
$(Q)$(MAKE) $(build)=. $(Q)$(MAKE) $(build)=.
# All the preparing.. # All the preparing..
@ -20,8 +20,8 @@ index 6f7a8172de44..956a5a3e8d2f 100644
+prepare: +prepare:
# Support for using generic headers in asm-generic # Support for using generic headers in asm-generic
PHONY += asm-generic uapi-asm-generic asm-generic := -f $(srctree)/scripts/Makefile.asm-generic obj
@@ -1339,13 +1338,8 @@ endif # CONFIG_MODULES @@ -1359,13 +1358,8 @@ endif # CONFIG_MODULES
CLEAN_DIRS += $(MODVERDIR) include/ksym CLEAN_DIRS += $(MODVERDIR) include/ksym
# Directories & files removed with 'make mrproper' # Directories & files removed with 'make mrproper'
@ -37,24 +37,24 @@ index 6f7a8172de44..956a5a3e8d2f 100644
# clean - Delete most, but leave enough to build external modules # clean - Delete most, but leave enough to build external modules
# #
@@ -1367,13 +1361,10 @@ clean: archclean vmlinuxclean @@ -1387,13 +1381,10 @@ clean: archclean vmlinuxclean
# #
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS)) mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
mrproper: rm-files := $(wildcard $(MRPROPER_FILES)) mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
-mrproper-dirs := $(addprefix _mrproper_,scripts) -mrproper-dirs := $(addprefix _mrproper_,scripts)
-PHONY += $(mrproper-dirs) mrproper archmrproper -PHONY += $(mrproper-dirs) mrproper
-$(mrproper-dirs): -$(mrproper-dirs):
- $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@) - $(Q)$(MAKE) $(clean)=$(patsubst _mrproper_%,%,$@)
+PHONY += mrproper archmrproper +PHONY += mrproper
-mrproper: clean archmrproper $(mrproper-dirs) -mrproper: clean $(mrproper-dirs)
+mrproper: clean archmrproper +mrproper: clean
$(call cmd,rmdirs) $(call cmd,rmdirs)
$(call cmd,rmfiles) $(call cmd,rmfiles)
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 63b609243d03..c54eca94ac2c 100644 index 181973509a05..65800fa2d7ef 100644
--- a/scripts/kconfig/Makefile --- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile
@@ -20,19 +20,14 @@ endif @@ -20,19 +20,14 @@ endif

View file

@ -1925,17 +1925,17 @@ index 000000000000..13e8583f2b91
+Currently this approach is applied to address_space_operations for +Currently this approach is applied to address_space_operations for
+regular files only. +regular files only.
diff --git a/MAINTAINERS b/MAINTAINERS diff --git a/MAINTAINERS b/MAINTAINERS
index f3a5c97e3419..68f189ae4796 100644 index dce5c099f43c..d10f05c88860 100644
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -2594,6 +2594,19 @@ F: include/linux/audit.h @@ -2635,6 +2635,19 @@ F: include/linux/audit.h
F: include/uapi/linux/audit.h F: include/uapi/linux/audit.h
F: kernel/audit* F: kernel/audit*
+AUFS (advanced multi layered unification filesystem) FILESYSTEM +AUFS (advanced multi layered unification filesystem) FILESYSTEM
+M: "J. R. Okajima" <hooanon05g@gmail.com> +M: "J. R. Okajima" <hooanon05g@gmail.com>
+L: linux-unionfs@vger.kernel.org
+L: aufs-users@lists.sourceforge.net (members only) +L: aufs-users@lists.sourceforge.net (members only)
+L: linux-unionfs@vger.kernel.org
+W: http://aufs.sourceforge.net +W: http://aufs.sourceforge.net
+T: git://github.com/sfjro/aufs4-linux.git +T: git://github.com/sfjro/aufs4-linux.git
+S: Supported +S: Supported
@ -1949,7 +1949,7 @@ index f3a5c97e3419..68f189ae4796 100644
M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com> M: Miguel Ojeda Sandonis <miguel.ojeda.sandonis@gmail.com>
S: Maintained S: Maintained
diff --git a/drivers/block/loop.c b/drivers/block/loop.c diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 84b055aa81ba..08488ce07b07 100644 index 9a8d83bc1e75..c5e144b8d20c 100644
--- a/drivers/block/loop.c --- a/drivers/block/loop.c
+++ b/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, @@ -738,6 +738,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
@ -6705,10 +6705,10 @@ index 000000000000..5e578995c256
+#endif /* __AUFS_DCSUB_H__ */ +#endif /* __AUFS_DCSUB_H__ */
diff --git a/fs/aufs/debug.c b/fs/aufs/debug.c diff --git a/fs/aufs/debug.c b/fs/aufs/debug.c
new file mode 100644 new file mode 100644
index 000000000000..8fa0575a08a8 index 000000000000..b93bb4f565bf
--- /dev/null --- /dev/null
+++ b/fs/aufs/debug.c +++ b/fs/aufs/debug.c
@@ -0,0 +1,440 @@ @@ -0,0 +1,441 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -6731,6 +6731,7 @@ index 000000000000..8fa0575a08a8
+ * debug print functions + * debug print functions
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+/* Returns 0, or -errno. arg is in kp->arg. */ +/* Returns 0, or -errno. arg is in kp->arg. */
@ -7383,10 +7384,10 @@ index 000000000000..9c52470a61fb
+#endif /* __AUFS_DEBUG_H__ */ +#endif /* __AUFS_DEBUG_H__ */
diff --git a/fs/aufs/dentry.c b/fs/aufs/dentry.c diff --git a/fs/aufs/dentry.c b/fs/aufs/dentry.c
new file mode 100644 new file mode 100644
index 000000000000..26b5fead4939 index 000000000000..faf664508e64
--- /dev/null --- /dev/null
+++ b/fs/aufs/dentry.c +++ b/fs/aufs/dentry.c
@@ -0,0 +1,1153 @@ @@ -0,0 +1,1154 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -7409,6 +7410,7 @@ index 000000000000..26b5fead4939
+ * lookup and dentry operations + * lookup and dentry operations
+ */ + */
+ +
+#include <linux/iversion.h>
+#include <linux/namei.h> +#include <linux/namei.h>
+#include "aufs.h" +#include "aufs.h"
+ +
@ -9376,10 +9378,10 @@ index 000000000000..86140548f046
+} +}
diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c
new file mode 100644 new file mode 100644
index 000000000000..2efd983ecad7 index 000000000000..68e87d6f287e
--- /dev/null --- /dev/null
+++ b/fs/aufs/dir.c +++ b/fs/aufs/dir.c
@@ -0,0 +1,762 @@ @@ -0,0 +1,763 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -9403,6 +9405,7 @@ index 000000000000..2efd983ecad7
+ */ + */
+ +
+#include <linux/fs_stack.h> +#include <linux/fs_stack.h>
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+void au_add_nlink(struct inode *dir, struct inode *h_dir) +void au_add_nlink(struct inode *dir, struct inode *h_dir)
@ -16522,10 +16525,10 @@ index 000000000000..3bd869a69c8f
+} +}
diff --git a/fs/aufs/hnotify.c b/fs/aufs/hnotify.c diff --git a/fs/aufs/hnotify.c b/fs/aufs/hnotify.c
new file mode 100644 new file mode 100644
index 000000000000..234fdf90c6c9 index 000000000000..95bced39c290
--- /dev/null --- /dev/null
+++ b/fs/aufs/hnotify.c +++ b/fs/aufs/hnotify.c
@@ -0,0 +1,720 @@ @@ -0,0 +1,721 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -16548,6 +16551,7 @@ index 000000000000..234fdf90c6c9
+ * abstraction to notify the direct changes on lower directories + * abstraction to notify the direct changes on lower directories
+ */ + */
+ +
+/* #include <linux/iversion.h> */
+#include "aufs.h" +#include "aufs.h"
+ +
+int au_hn_alloc(struct au_hinode *hinode, struct inode *inode) +int au_hn_alloc(struct au_hinode *hinode, struct inode *inode)
@ -17248,10 +17252,10 @@ index 000000000000..234fdf90c6c9
+} +}
diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c
new file mode 100644 new file mode 100644
index 000000000000..6ead821406f6 index 000000000000..4f5001ebd0f4
--- /dev/null --- /dev/null
+++ b/fs/aufs/i_op.c +++ b/fs/aufs/i_op.c
@@ -0,0 +1,1506 @@ @@ -0,0 +1,1507 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -17276,6 +17280,7 @@ index 000000000000..6ead821406f6
+ +
+#include <linux/device_cgroup.h> +#include <linux/device_cgroup.h>
+#include <linux/fs_stack.h> +#include <linux/fs_stack.h>
+#include <linux/iversion.h>
+#include <linux/namei.h> +#include <linux/namei.h>
+#include <linux/security.h> +#include <linux/security.h>
+#include "aufs.h" +#include "aufs.h"
@ -18760,10 +18765,10 @@ index 000000000000..6ead821406f6
+}; +};
diff --git a/fs/aufs/i_op_add.c b/fs/aufs/i_op_add.c diff --git a/fs/aufs/i_op_add.c b/fs/aufs/i_op_add.c
new file mode 100644 new file mode 100644
index 000000000000..73002d691e9d index 000000000000..af6893e61066
--- /dev/null --- /dev/null
+++ b/fs/aufs/i_op_add.c +++ b/fs/aufs/i_op_add.c
@@ -0,0 +1,935 @@ @@ -0,0 +1,936 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -18786,6 +18791,7 @@ index 000000000000..73002d691e9d
+ * inode operations (add entry) + * inode operations (add entry)
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+/* +/*
@ -19701,10 +19707,10 @@ index 000000000000..73002d691e9d
+} +}
diff --git a/fs/aufs/i_op_del.c b/fs/aufs/i_op_del.c diff --git a/fs/aufs/i_op_del.c b/fs/aufs/i_op_del.c
new file mode 100644 new file mode 100644
index 000000000000..665910bd0ace index 000000000000..1c459dbea5db
--- /dev/null --- /dev/null
+++ b/fs/aufs/i_op_del.c +++ b/fs/aufs/i_op_del.c
@@ -0,0 +1,512 @@ @@ -0,0 +1,513 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -19727,6 +19733,7 @@ index 000000000000..665910bd0ace
+ * inode operations (del entry) + * inode operations (del entry)
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+/* +/*
@ -20219,10 +20226,10 @@ index 000000000000..665910bd0ace
+} +}
diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c
new file mode 100644 new file mode 100644
index 000000000000..9c9966fdde32 index 000000000000..91aa66594a42
--- /dev/null --- /dev/null
+++ b/fs/aufs/i_op_ren.c +++ b/fs/aufs/i_op_ren.c
@@ -0,0 +1,1249 @@ @@ -0,0 +1,1250 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -20246,6 +20253,7 @@ index 000000000000..9c9966fdde32
+ * todo: this is crazy monster + * todo: this is crazy monster
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+enum { AuSRC, AuDST, AuSrcDst }; +enum { AuSRC, AuDST, AuSrcDst };
@ -21766,10 +21774,10 @@ index 000000000000..098fd115052a
+} +}
diff --git a/fs/aufs/inode.c b/fs/aufs/inode.c diff --git a/fs/aufs/inode.c b/fs/aufs/inode.c
new file mode 100644 new file mode 100644
index 000000000000..ee1e6756a2f5 index 000000000000..985377d9bf66
--- /dev/null --- /dev/null
+++ b/fs/aufs/inode.c +++ b/fs/aufs/inode.c
@@ -0,0 +1,528 @@ @@ -0,0 +1,529 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -21792,6 +21800,7 @@ index 000000000000..ee1e6756a2f5
+ * inode functions + * inode functions
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+struct inode *au_igrab(struct inode *inode) +struct inode *au_igrab(struct inode *inode)
@ -23576,10 +23585,10 @@ index 000000000000..cef7d96362c7
+} +}
diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
new file mode 100644 new file mode 100644
index 000000000000..2bd4951a7413 index 000000000000..625bd78d99af
--- /dev/null --- /dev/null
+++ b/fs/aufs/loop.h +++ b/fs/aufs/loop.h
@@ -0,0 +1,53 @@ @@ -0,0 +1,55 @@
+/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 */
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -23622,6 +23631,8 @@ index 000000000000..2bd4951a7413
+int au_loopback_init(void); +int au_loopback_init(void);
+void au_loopback_fin(void); +void au_loopback_fin(void);
+#else +#else
+AuStub(struct file *, loop_backing_file, return NULL)
+
+AuStubInt0(au_test_loopback_overlap, struct super_block *sb, +AuStubInt0(au_test_loopback_overlap, struct super_block *sb,
+ struct dentry *h_adding) + struct dentry *h_adding)
+AuStubInt0(au_test_loopback_kthread, void) +AuStubInt0(au_test_loopback_kthread, void)
@ -26717,7 +26728,7 @@ index 000000000000..1cd07cd30320
+} +}
diff --git a/fs/aufs/opts.h b/fs/aufs/opts.h diff --git a/fs/aufs/opts.h b/fs/aufs/opts.h
new file mode 100644 new file mode 100644
index 000000000000..43954ebd6192 index 000000000000..6326b54340c7
--- /dev/null --- /dev/null
+++ b/fs/aufs/opts.h +++ b/fs/aufs/opts.h
@@ -0,0 +1,225 @@ @@ -0,0 +1,225 @@
@ -26769,7 +26780,7 @@ index 000000000000..43954ebd6192
+#define AuOpt_SUM (1 << 10) /* summation for statfs(2) */ +#define AuOpt_SUM (1 << 10) /* summation for statfs(2) */
+#define AuOpt_SUM_W (1 << 11) /* unimplemented */ +#define AuOpt_SUM_W (1 << 11) /* unimplemented */
+#define AuOpt_WARN_PERM (1 << 12) /* warn when add-branch */ +#define AuOpt_WARN_PERM (1 << 12) /* warn when add-branch */
+#define AuOpt_VERBOSE (1 << 13) /* busy inode when del-branch */ +#define AuOpt_VERBOSE (1 << 13) /* print the cause of error */
+#define AuOpt_DIO (1 << 14) /* direct io */ +#define AuOpt_DIO (1 << 14) /* direct io */
+#define AuOpt_DIRREN (1 << 15) /* directory rename */ +#define AuOpt_DIRREN (1 << 15) /* directory rename */
+ +
@ -28280,10 +28291,10 @@ index 000000000000..2f8988fa1bda
+#endif /* __AUFS_RWSEM_H__ */ +#endif /* __AUFS_RWSEM_H__ */
diff --git a/fs/aufs/sbinfo.c b/fs/aufs/sbinfo.c diff --git a/fs/aufs/sbinfo.c b/fs/aufs/sbinfo.c
new file mode 100644 new file mode 100644
index 000000000000..803f6b11969a index 000000000000..500a920b4ea1
--- /dev/null --- /dev/null
+++ b/fs/aufs/sbinfo.c +++ b/fs/aufs/sbinfo.c
@@ -0,0 +1,313 @@ @@ -0,0 +1,314 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -28306,6 +28317,7 @@ index 000000000000..803f6b11969a
+ * superblock private data + * superblock private data
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+/* +/*
@ -28599,10 +28611,10 @@ index 000000000000..803f6b11969a
+} +}
diff --git a/fs/aufs/super.c b/fs/aufs/super.c diff --git a/fs/aufs/super.c b/fs/aufs/super.c
new file mode 100644 new file mode 100644
index 000000000000..e7570b137270 index 000000000000..bcb0b26fdfbe
--- /dev/null --- /dev/null
+++ b/fs/aufs/super.c +++ b/fs/aufs/super.c
@@ -0,0 +1,1048 @@ @@ -0,0 +1,1049 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -28625,6 +28637,7 @@ index 000000000000..e7570b137270
+ * mount and super_block operations + * mount and super_block operations
+ */ + */
+ +
+#include <linux/iversion.h>
+#include <linux/mm.h> +#include <linux/mm.h>
+#include <linux/seq_file.h> +#include <linux/seq_file.h>
+#include <linux/statfs.h> +#include <linux/statfs.h>
@ -31000,10 +31013,10 @@ index 000000000000..db10ec528f5d
+} +}
diff --git a/fs/aufs/vdir.c b/fs/aufs/vdir.c diff --git a/fs/aufs/vdir.c b/fs/aufs/vdir.c
new file mode 100644 new file mode 100644
index 000000000000..e0a6e7e20d3a index 000000000000..dc768f5d90c6
--- /dev/null --- /dev/null
+++ b/fs/aufs/vdir.c +++ b/fs/aufs/vdir.c
@@ -0,0 +1,895 @@ @@ -0,0 +1,896 @@
+// SPDX-License-Identifier: GPL-2.0 +// SPDX-License-Identifier: GPL-2.0
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -31026,6 +31039,7 @@ index 000000000000..e0a6e7e20d3a
+ * virtual or vertical directory + * virtual or vertical directory
+ */ + */
+ +
+#include <linux/iversion.h>
+#include "aufs.h" +#include "aufs.h"
+ +
+static unsigned int calc_size(int nlen) +static unsigned int calc_size(int nlen)
@ -32809,10 +32823,10 @@ index 000000000000..d6945e22593e
+} +}
diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h
new file mode 100644 new file mode 100644
index 000000000000..43779266a991 index 000000000000..51e677c7f6b7
--- /dev/null --- /dev/null
+++ b/fs/aufs/vfsub.h +++ b/fs/aufs/vfsub.h
@@ -0,0 +1,355 @@ @@ -0,0 +1,354 @@
+/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0 */
+/* +/*
+ * Copyright (C) 2005-2019 Junjiro R. Okajima + * Copyright (C) 2005-2019 Junjiro R. Okajima
@ -32841,7 +32855,6 @@ index 000000000000..43779266a991
+#ifdef __KERNEL__ +#ifdef __KERNEL__
+ +
+#include <linux/fs.h> +#include <linux/fs.h>
+#include <linux/iversion.h>
+#include <linux/mount.h> +#include <linux/mount.h>
+#include <linux/posix_acl.h> +#include <linux/posix_acl.h>
+#include <linux/xattr.h> +#include <linux/xattr.h>
@ -37982,10 +37995,10 @@ index 000000000000..7733b9a28779
+ return err; + return err;
+} +}
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index 44e5652b2664..6980d63d5979 100644 index aac41adf4743..50eb587c1253 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -1220,7 +1220,7 @@ enum d_walk_ret { @@ -1247,7 +1247,7 @@ enum d_walk_ret {
* *
* The @enter() callbacks are called with d_lock held. * The @enter() callbacks are called with d_lock held.
*/ */
@ -37994,7 +38007,7 @@ index 44e5652b2664..6980d63d5979 100644
enum d_walk_ret (*enter)(void *, struct dentry *)) enum d_walk_ret (*enter)(void *, struct dentry *))
{ {
struct dentry *this_parent; struct dentry *this_parent;
@@ -1325,6 +1325,7 @@ static void d_walk(struct dentry *parent, void *data, @@ -1352,6 +1352,7 @@ static void d_walk(struct dentry *parent, void *data,
seq = 1; seq = 1;
goto again; goto again;
} }
@ -38002,7 +38015,7 @@ index 44e5652b2664..6980d63d5979 100644
struct check_mount { struct check_mount {
struct vfsmount *mnt; struct vfsmount *mnt;
@@ -2813,6 +2814,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) @@ -2845,6 +2846,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2)
write_sequnlock(&rename_lock); write_sequnlock(&rename_lock);
} }
@ -38011,7 +38024,7 @@ index 44e5652b2664..6980d63d5979 100644
/** /**
* d_ancestor - search for an ancestor * d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c diff --git a/fs/exec.c b/fs/exec.c
index fc281b738a98..65eaacaba4f4 100644 index bcf383730bea..a97bdea3622e 100644
--- a/fs/exec.c --- a/fs/exec.c
+++ b/fs/exec.c +++ b/fs/exec.c
@@ -109,6 +109,7 @@ bool path_noexec(const struct path *path) @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
@ -38053,7 +38066,7 @@ index 083185174c6d..2072f690b121 100644
static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, static void f_modown(struct file *filp, struct pid *pid, enum pid_type type,
int force) int force)
diff --git a/fs/file_table.c b/fs/file_table.c diff --git a/fs/file_table.c b/fs/file_table.c
index e49af4caf15d..569020fd1fb3 100644 index 5679e7fcb6b0..961eec3df1eb 100644
--- a/fs/file_table.c --- a/fs/file_table.c
+++ b/fs/file_table.c +++ b/fs/file_table.c
@@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) @@ -161,6 +161,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred)
@ -38081,10 +38094,10 @@ index e49af4caf15d..569020fd1fb3 100644
void __init files_init(void) void __init files_init(void)
{ {
diff --git a/fs/inode.c b/fs/inode.c diff --git a/fs/inode.c b/fs/inode.c
index 35d2108d567c..702e4bdb9cb1 100644 index 73432e64f874..572126ca5160 100644
--- a/fs/inode.c --- a/fs/inode.c
+++ b/fs/inode.c +++ b/fs/inode.c
@@ -872,6 +872,8 @@ unsigned int get_next_ino(void) @@ -869,6 +869,8 @@ unsigned int get_next_ino(void)
unsigned int *p = &get_cpu_var(last_ino); unsigned int *p = &get_cpu_var(last_ino);
unsigned int res = *p; unsigned int res = *p;
@ -38093,7 +38106,7 @@ index 35d2108d567c..702e4bdb9cb1 100644
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) { if (unlikely((res & (LAST_INO_BATCH-1)) == 0)) {
static atomic_t shared_last_ino; static atomic_t shared_last_ino;
@@ -884,7 +886,7 @@ unsigned int get_next_ino(void) @@ -881,7 +883,7 @@ unsigned int get_next_ino(void)
res++; res++;
/* get_next_ino should not provide a 0 inode number */ /* get_next_ino should not provide a 0 inode number */
if (unlikely(!res)) if (unlikely(!res))
@ -38102,7 +38115,7 @@ index 35d2108d567c..702e4bdb9cb1 100644
*p = res; *p = res;
put_cpu_var(last_ino); put_cpu_var(last_ino);
return res; return res;
@@ -1660,7 +1662,7 @@ EXPORT_SYMBOL(generic_update_time); @@ -1657,7 +1659,7 @@ EXPORT_SYMBOL(generic_update_time);
* This does the actual work of updating an inodes time or version. Must have * This does the actual work of updating an inodes time or version. Must have
* had called mnt_want_write() before calling this. * had called mnt_want_write() before calling this.
*/ */
@ -38111,7 +38124,7 @@ index 35d2108d567c..702e4bdb9cb1 100644
{ {
int (*update_time)(struct inode *, struct timespec64 *, int); int (*update_time)(struct inode *, struct timespec64 *, int);
@@ -1669,6 +1671,7 @@ static int update_time(struct inode *inode, struct timespec64 *time, int flags) @@ -1666,6 +1668,7 @@ static int update_time(struct inode *inode, struct timespec64 *time, int flags)
return update_time(inode, time, flags); return update_time(inode, time, flags);
} }
@ -38120,10 +38133,10 @@ index 35d2108d567c..702e4bdb9cb1 100644
/** /**
* touch_atime - update the access time * touch_atime - update the access time
diff --git a/fs/namespace.c b/fs/namespace.c diff --git a/fs/namespace.c b/fs/namespace.c
index a7f91265ea67..44502c294f4b 100644 index 678ef175d63a..8c4d3d56f2df 100644
--- a/fs/namespace.c --- a/fs/namespace.c
+++ b/fs/namespace.c +++ b/fs/namespace.c
@@ -437,6 +437,7 @@ void __mnt_drop_write(struct vfsmount *mnt) @@ -434,6 +434,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
mnt_dec_writers(real_mount(mnt)); mnt_dec_writers(real_mount(mnt));
preempt_enable(); preempt_enable();
} }
@ -38131,7 +38144,7 @@ index a7f91265ea67..44502c294f4b 100644
/** /**
* mnt_drop_write - give up write access to a mount * mnt_drop_write - give up write access to a mount
@@ -770,6 +771,13 @@ static inline int check_mnt(struct mount *mnt) @@ -768,6 +769,13 @@ static inline int check_mnt(struct mount *mnt)
return mnt->mnt_ns == current->nsproxy->mnt_ns; return mnt->mnt_ns == current->nsproxy->mnt_ns;
} }
@ -38145,7 +38158,7 @@ index a7f91265ea67..44502c294f4b 100644
/* /*
* vfsmount lock must be held for write * vfsmount lock must be held for write
*/ */
@@ -1838,6 +1846,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, @@ -1836,6 +1844,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
} }
return 0; return 0;
} }
@ -38226,7 +38239,7 @@ index d2dd16cb5989..cf709b7d611a 100644
/* /*
* Destroy all marks in destroy_list, waits for SRCU period to finish before * Destroy all marks in destroy_list, waits for SRCU period to finish before
diff --git a/fs/open.c b/fs/open.c diff --git a/fs/open.c b/fs/open.c
index 0285ce7dbd51..cb81623a8b09 100644 index f1c2f855fd43..b190d39f7813 100644
--- a/fs/open.c --- a/fs/open.c
+++ b/fs/open.c +++ b/fs/open.c
@@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs, @@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@ -38238,10 +38251,10 @@ index 0285ce7dbd51..cb81623a8b09 100644
long vfs_truncate(const struct path *path, loff_t length) long vfs_truncate(const struct path *path, loff_t length)
{ {
diff --git a/fs/proc/base.c b/fs/proc/base.c diff --git a/fs/proc/base.c b/fs/proc/base.c
index ce3465479447..28508b17754c 100644 index f5ed9512d193..e8f8e59d93bb 100644
--- a/fs/proc/base.c --- a/fs/proc/base.c
+++ b/fs/proc/base.c +++ b/fs/proc/base.c
@@ -2016,7 +2016,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) @@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
down_read(&mm->mmap_sem); down_read(&mm->mmap_sem);
vma = find_exact_vma(mm, vm_start, vm_end); vma = find_exact_vma(mm, vm_start, vm_end);
if (vma && vma->vm_file) { if (vma && vma->vm_file) {
@ -38267,7 +38280,7 @@ index 3b63be64e436..fb9913bf3d10 100644
ino = inode->i_ino; ino = inode->i_ino;
} }
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index 47c3764c469b..e37e4b529dc5 100644 index 85b0ef890b28..0f7fb8138160 100644
--- a/fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) @@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
@ -38282,7 +38295,7 @@ index 47c3764c469b..e37e4b529dc5 100644
dev = inode->i_sb->s_dev; dev = inode->i_sb->s_dev;
ino = inode->i_ino; ino = inode->i_ino;
pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
@@ -1729,7 +1732,7 @@ static int show_numa_map(struct seq_file *m, void *v) @@ -1740,7 +1743,7 @@ static int show_numa_map(struct seq_file *m, void *v)
struct proc_maps_private *proc_priv = &numa_priv->proc_maps; struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct numa_maps *md = &numa_priv->md; struct numa_maps *md = &numa_priv->md;
@ -38308,7 +38321,7 @@ index 0b63d68dedb2..400d1c594ceb 100644
ino = inode->i_ino; ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/fs/read_write.c b/fs/read_write.c diff --git a/fs/read_write.c b/fs/read_write.c
index 58f30537c47a..a1366ede7b53 100644 index 27b69b85d49f..7d4dc4e44375 100644
--- a/fs/read_write.c --- a/fs/read_write.c
+++ b/fs/read_write.c +++ b/fs/read_write.c
@@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) @@ -459,6 +459,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos)
@ -38359,7 +38372,7 @@ index 58f30537c47a..a1366ede7b53 100644
static inline loff_t file_pos_read(struct file *file) static inline loff_t file_pos_read(struct file *file)
{ {
diff --git a/fs/splice.c b/fs/splice.c diff --git a/fs/splice.c b/fs/splice.c
index de2ede048473..63fe2652c67d 100644 index 90c29675d573..4b2d6f463662 100644
--- a/fs/splice.c --- a/fs/splice.c
+++ b/fs/splice.c +++ b/fs/splice.c
@@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage); @@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@ -38433,10 +38446,10 @@ index 0d6a6a4af861..7ce4701b7289 100644
ssize_t ssize_t
__vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
diff --git a/include/linux/fs.h b/include/linux/fs.h diff --git a/include/linux/fs.h b/include/linux/fs.h
index c95c0807471f..0e447054a982 100644 index fd423fec8d83..8673e424bab1 100644
--- a/include/linux/fs.h --- a/include/linux/fs.h
+++ b/include/linux/fs.h +++ b/include/linux/fs.h
@@ -1305,6 +1305,7 @@ extern void fasync_free(struct fasync_struct *); @@ -1316,6 +1316,7 @@ extern void fasync_free(struct fasync_struct *);
/* can be called from interrupts */ /* can be called from interrupts */
extern void kill_fasync(struct fasync_struct **, int, int); extern void kill_fasync(struct fasync_struct **, int, int);
@ -38444,7 +38457,7 @@ index c95c0807471f..0e447054a982 100644
extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force);
extern int f_setown(struct file *filp, unsigned long arg, int force); extern int f_setown(struct file *filp, unsigned long arg, int force);
extern void f_delown(struct file *filp); extern void f_delown(struct file *filp);
@@ -1797,6 +1798,7 @@ struct file_operations { @@ -1809,6 +1810,7 @@ struct file_operations {
ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int); ssize_t (*sendpage) (struct file *, struct page *, int, size_t, loff_t *, int);
unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
int (*check_flags)(int); int (*check_flags)(int);
@ -38452,7 +38465,7 @@ index c95c0807471f..0e447054a982 100644
int (*flock) (struct file *, int, struct file_lock *); int (*flock) (struct file *, int, struct file_lock *);
ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int);
ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
@@ -1867,6 +1869,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector, @@ -1879,6 +1881,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
struct iovec *fast_pointer, struct iovec *fast_pointer,
struct iovec **ret_pointer); struct iovec **ret_pointer);
@ -38465,7 +38478,7 @@ index c95c0807471f..0e447054a982 100644
extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *);
extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *);
@@ -2292,6 +2300,7 @@ extern int current_umask(void); @@ -2304,6 +2312,7 @@ extern int current_umask(void);
extern void ihold(struct inode * inode); extern void ihold(struct inode * inode);
extern void iput(struct inode *); extern void iput(struct inode *);
extern int generic_update_time(struct inode *, struct timespec64 *, int); extern int generic_update_time(struct inode *, struct timespec64 *, int);
@ -38473,7 +38486,7 @@ index c95c0807471f..0e447054a982 100644
/* /sys/fs */ /* /sys/fs */
extern struct kobject *fs_kobj; extern struct kobject *fs_kobj;
@@ -2579,6 +2588,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb) @@ -2591,6 +2600,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
return false; return false;
} }
#endif #endif
@ -38482,10 +38495,10 @@ index c95c0807471f..0e447054a982 100644
extern const struct file_operations def_blk_fops; extern const struct file_operations def_blk_fops;
extern const struct file_operations def_chr_fops; extern const struct file_operations def_chr_fops;
diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 1fd82ff99c65..a5ccac55b6c1 100644 index c5335df2372f..4e48a5059536 100644
--- a/include/linux/lockdep.h --- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h +++ b/include/linux/lockdep.h
@@ -308,6 +308,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, @@ -306,6 +306,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock,
return lock->key == key; return lock->key == key;
} }
@ -38494,7 +38507,7 @@ index 1fd82ff99c65..a5ccac55b6c1 100644
/* /*
* Acquire a lock. * Acquire a lock.
* *
@@ -434,6 +436,7 @@ struct lockdep_map { }; @@ -432,6 +434,7 @@ struct lockdep_map { };
#define lockdep_depth(tsk) (0) #define lockdep_depth(tsk) (0)
@ -38503,10 +38516,10 @@ index 1fd82ff99c65..a5ccac55b6c1 100644
#define lockdep_assert_held(l) do { (void)(l); } while (0) #define lockdep_assert_held(l) do { (void)(l); } while (0)
diff --git a/include/linux/mm.h b/include/linux/mm.h diff --git a/include/linux/mm.h b/include/linux/mm.h
index 5411de93a363..b3cd02555d11 100644 index 80bb6408fe73..59a1ea611ba7 100644
--- a/include/linux/mm.h --- a/include/linux/mm.h
+++ b/include/linux/mm.h +++ b/include/linux/mm.h
@@ -1460,6 +1460,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, @@ -1518,6 +1518,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
unmap_mapping_range(mapping, holebegin, holelen, 0); unmap_mapping_range(mapping, holebegin, holelen, 0);
} }
@ -38591,7 +38604,7 @@ index 74b4911ac16d..19789fbea567 100644
#endif #endif
diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h
new file mode 100644 new file mode 100644
index 000000000000..05ea4d5c4cbe index 000000000000..05cfb756e4e5
--- /dev/null --- /dev/null
+++ b/include/uapi/linux/aufs_type.h +++ b/include/uapi/linux/aufs_type.h
@@ -0,0 +1,448 @@ @@ -0,0 +1,448 @@
@ -38637,7 +38650,7 @@ index 000000000000..05ea4d5c4cbe
+ +
+#include <linux/limits.h> +#include <linux/limits.h>
+ +
+#define AUFS_VERSION "4.20.4+-20190211" +#define AUFS_VERSION "4.20.4+-20190311"
+ +
+/* todo? move this to linux-2.6.19/include/magic.h */ +/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') +#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@ -39044,10 +39057,10 @@ index 000000000000..05ea4d5c4cbe
+ +
+#endif /* __AUFS_TYPE_H__ */ +#endif /* __AUFS_TYPE_H__ */
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index 906cd0c13d15..3d21f2bd0923 100644 index b69248e6f0e0..099b89978dd3 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -552,7 +552,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, @@ -547,7 +547,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
struct inode *inode = file_inode(file); struct inode *inode = file_inode(file);
struct address_space *mapping = file->f_mapping; struct address_space *mapping = file->f_mapping;
@ -39057,11 +39070,11 @@ index 906cd0c13d15..3d21f2bd0923 100644
atomic_dec(&inode->i_writecount); atomic_dec(&inode->i_writecount);
i_mmap_lock_write(mapping); i_mmap_lock_write(mapping);
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index 1efada2dd9dd..4e7581c2b52f 100644 index e805fe3bf87f..10a2cf88add3 100644
--- a/kernel/locking/lockdep.c --- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c
@@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES]; @@ -143,7 +143,7 @@ static
unsigned long nr_lock_classes; #endif
struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; struct lock_class lock_classes[MAX_LOCKDEP_KEYS];
-static inline struct lock_class *hlock_class(struct held_lock *hlock) -static inline struct lock_class *hlock_class(struct held_lock *hlock)
@ -39069,7 +39082,7 @@ index 1efada2dd9dd..4e7581c2b52f 100644
{ {
if (!hlock->class_idx) { if (!hlock->class_idx) {
/* /*
@@ -151,6 +151,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) @@ -154,6 +154,8 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock)
} }
return lock_classes + hlock->class_idx - 1; return lock_classes + hlock->class_idx - 1;
} }
@ -39101,10 +39114,10 @@ index d210cc9d6f80..e77e80ce7298 100644
obj-y += init-mm.o obj-y += init-mm.o
obj-y += memblock.o obj-y += memblock.o
diff --git a/mm/filemap.c b/mm/filemap.c diff --git a/mm/filemap.c b/mm/filemap.c
index 81adec8ee02c..8507cec6442b 100644 index 9f5e323e883e..90db684a7cf4 100644
--- a/mm/filemap.c --- a/mm/filemap.c
+++ b/mm/filemap.c +++ b/mm/filemap.c
@@ -2609,7 +2609,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) @@ -2677,7 +2677,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf)
vm_fault_t ret = VM_FAULT_LOCKED; vm_fault_t ret = VM_FAULT_LOCKED;
sb_start_pagefault(inode->i_sb); sb_start_pagefault(inode->i_sb);
@ -39114,7 +39127,7 @@ index 81adec8ee02c..8507cec6442b 100644
if (page->mapping != inode->i_mapping) { if (page->mapping != inode->i_mapping) {
unlock_page(page); unlock_page(page);
diff --git a/mm/mmap.c b/mm/mmap.c diff --git a/mm/mmap.c b/mm/mmap.c
index 6c04292e16a7..f3629c14ef3d 100644 index fc1809b1bed6..8f62e47a60ea 100644
--- a/mm/mmap.c --- a/mm/mmap.c
+++ b/mm/mmap.c +++ b/mm/mmap.c
@@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma) @@ -180,7 +180,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@ -39145,7 +39158,7 @@ index 6c04292e16a7..f3629c14ef3d 100644
/* Undo any partial mapping done by a device driver. */ /* Undo any partial mapping done by a device driver. */
unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
@@ -2665,7 +2665,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, @@ -2675,7 +2675,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
goto out_free_mpol; goto out_free_mpol;
if (new->vm_file) if (new->vm_file)
@ -39154,7 +39167,7 @@ index 6c04292e16a7..f3629c14ef3d 100644
if (new->vm_ops && new->vm_ops->open) if (new->vm_ops && new->vm_ops->open)
new->vm_ops->open(new); new->vm_ops->open(new);
@@ -2684,7 +2684,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma, @@ -2694,7 +2694,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
if (new->vm_ops && new->vm_ops->close) if (new->vm_ops && new->vm_ops->close)
new->vm_ops->close(new); new->vm_ops->close(new);
if (new->vm_file) if (new->vm_file)
@ -39163,7 +39176,7 @@ index 6c04292e16a7..f3629c14ef3d 100644
unlink_anon_vmas(new); unlink_anon_vmas(new);
out_free_mpol: out_free_mpol:
mpol_put(vma_policy(new)); mpol_put(vma_policy(new));
@@ -2874,7 +2874,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -2884,7 +2884,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma; struct vm_area_struct *vma;
unsigned long populate = 0; unsigned long populate = 0;
unsigned long ret = -EINVAL; unsigned long ret = -EINVAL;
@ -39172,7 +39185,7 @@ index 6c04292e16a7..f3629c14ef3d 100644
pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n", pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.rst.\n",
current->comm, current->pid); current->comm, current->pid);
@@ -2949,10 +2949,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, @@ -2959,10 +2959,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
} }
} }
@ -39201,7 +39214,7 @@ index 6c04292e16a7..f3629c14ef3d 100644
out: out:
up_write(&mm->mmap_sem); up_write(&mm->mmap_sem);
if (populate) if (populate)
@@ -3258,7 +3275,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, @@ -3252,7 +3269,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
if (anon_vma_clone(new_vma, vma)) if (anon_vma_clone(new_vma, vma))
goto out_free_mempol; goto out_free_mempol;
if (new_vma->vm_file) if (new_vma->vm_file)
@ -39211,7 +39224,7 @@ index 6c04292e16a7..f3629c14ef3d 100644
new_vma->vm_ops->open(new_vma); new_vma->vm_ops->open(new_vma);
vma_link(mm, new_vma, prev, rb_link, rb_parent); vma_link(mm, new_vma, prev, rb_link, rb_parent);
diff --git a/mm/nommu.c b/mm/nommu.c diff --git a/mm/nommu.c b/mm/nommu.c
index 749276beb109..d56f8f2bbd24 100644 index 749276beb109..c7957f06fbc4 100644
--- a/mm/nommu.c --- a/mm/nommu.c
+++ b/mm/nommu.c +++ b/mm/nommu.c
@@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region) @@ -625,7 +625,7 @@ static void __put_nommu_region(struct vm_region *region)
@ -39241,7 +39254,7 @@ index 749276beb109..d56f8f2bbd24 100644
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
region = pregion; region = pregion;
result = start; result = start;
@@ -1361,7 +1361,7 @@ unsigned long do_mmap(struct file *file, @@ -1361,10 +1361,10 @@ unsigned long do_mmap(struct file *file,
up_write(&nommu_region_sem); up_write(&nommu_region_sem);
error: error:
if (region->vm_file) if (region->vm_file)
@ -39249,7 +39262,11 @@ index 749276beb109..d56f8f2bbd24 100644
+ vmr_fput(region); + vmr_fput(region);
kmem_cache_free(vm_region_jar, region); kmem_cache_free(vm_region_jar, region);
if (vma->vm_file) if (vma->vm_file)
fput(vma->vm_file); - fput(vma->vm_file);
+ vma_fput(vma);
vm_area_free(vma);
return ret;
diff --git a/mm/prfile.c b/mm/prfile.c diff --git a/mm/prfile.c b/mm/prfile.c
new file mode 100644 new file mode 100644
index 000000000000..024cdcfae1b1 index 000000000000..024cdcfae1b1
@ -39343,10 +39360,10 @@ index 000000000000..024cdcfae1b1
+} +}
+#endif /* !CONFIG_MMU */ +#endif /* !CONFIG_MMU */
diff --git a/security/commoncap.c b/security/commoncap.c diff --git a/security/commoncap.c b/security/commoncap.c
index 18a4fdf6f6eb..e49f723de452 100644 index 232db019f051..a402a5b72bf4 100644
--- a/security/commoncap.c --- a/security/commoncap.c
+++ b/security/commoncap.c +++ b/security/commoncap.c
@@ -1333,12 +1333,14 @@ int cap_mmap_addr(unsigned long addr) @@ -1332,12 +1332,14 @@ int cap_mmap_addr(unsigned long addr)
} }
return ret; return ret;
} }
@ -39379,10 +39396,10 @@ index cd97929fac66..424fd230866d 100644
} }
+EXPORT_SYMBOL_GPL(__devcgroup_check_permission); +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
diff --git a/security/security.c b/security/security.c diff --git a/security/security.c b/security/security.c
index 414a45d70c7b..720283ec3a30 100644 index 55bc49027ba9..870eaa8ebedc 100644
--- a/security/security.c --- a/security/security.c
+++ b/security/security.c +++ b/security/security.c
@@ -553,6 +553,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) @@ -566,6 +566,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
return 0; return 0;
return call_int_hook(path_rmdir, 0, dir, dentry); return call_int_hook(path_rmdir, 0, dir, dentry);
} }
@ -39390,7 +39407,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_path_unlink(const struct path *dir, struct dentry *dentry) int security_path_unlink(const struct path *dir, struct dentry *dentry)
{ {
@@ -569,6 +570,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, @@ -582,6 +583,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
return 0; return 0;
return call_int_hook(path_symlink, 0, dir, dentry, old_name); return call_int_hook(path_symlink, 0, dir, dentry, old_name);
} }
@ -39398,7 +39415,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_path_link(struct dentry *old_dentry, const struct path *new_dir, int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
struct dentry *new_dentry) struct dentry *new_dentry)
@@ -577,6 +579,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, @@ -590,6 +592,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
return 0; return 0;
return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
} }
@ -39406,7 +39423,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_path_rename(const struct path *old_dir, struct dentry *old_dentry, int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
const struct path *new_dir, struct dentry *new_dentry, const struct path *new_dir, struct dentry *new_dentry,
@@ -604,6 +607,7 @@ int security_path_truncate(const struct path *path) @@ -617,6 +620,7 @@ int security_path_truncate(const struct path *path)
return 0; return 0;
return call_int_hook(path_truncate, 0, path); return call_int_hook(path_truncate, 0, path);
} }
@ -39414,7 +39431,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_path_chmod(const struct path *path, umode_t mode) int security_path_chmod(const struct path *path, umode_t mode)
{ {
@@ -611,6 +615,7 @@ int security_path_chmod(const struct path *path, umode_t mode) @@ -624,6 +628,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
return 0; return 0;
return call_int_hook(path_chmod, 0, path, mode); return call_int_hook(path_chmod, 0, path, mode);
} }
@ -39422,7 +39439,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
{ {
@@ -618,6 +623,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) @@ -631,6 +636,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
return 0; return 0;
return call_int_hook(path_chown, 0, path, uid, gid); return call_int_hook(path_chown, 0, path, uid, gid);
} }
@ -39430,7 +39447,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_path_chroot(const struct path *path) int security_path_chroot(const struct path *path)
{ {
@@ -703,6 +709,7 @@ int security_inode_readlink(struct dentry *dentry) @@ -716,6 +722,7 @@ int security_inode_readlink(struct dentry *dentry)
return 0; return 0;
return call_int_hook(inode_readlink, 0, dentry); return call_int_hook(inode_readlink, 0, dentry);
} }
@ -39438,7 +39455,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_inode_follow_link(struct dentry *dentry, struct inode *inode, int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
bool rcu) bool rcu)
@@ -718,6 +725,7 @@ int security_inode_permission(struct inode *inode, int mask) @@ -731,6 +738,7 @@ int security_inode_permission(struct inode *inode, int mask)
return 0; return 0;
return call_int_hook(inode_permission, 0, inode, mask); return call_int_hook(inode_permission, 0, inode, mask);
} }
@ -39446,7 +39463,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_inode_setattr(struct dentry *dentry, struct iattr *attr) int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
{ {
@@ -889,6 +897,7 @@ int security_file_permission(struct file *file, int mask) @@ -902,6 +910,7 @@ int security_file_permission(struct file *file, int mask)
return fsnotify_perm(file, mask); return fsnotify_perm(file, mask);
} }
@ -39454,7 +39471,7 @@ index 414a45d70c7b..720283ec3a30 100644
int security_file_alloc(struct file *file) int security_file_alloc(struct file *file)
{ {
@@ -948,6 +957,7 @@ int security_mmap_file(struct file *file, unsigned long prot, @@ -961,6 +970,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
return ret; return ret;
return ima_file_mmap(file, prot); return ima_file_mmap(file, prot);
} }

View file

@ -118,6 +118,7 @@ CONFIG_AD5761=m
CONFIG_AD5764=m CONFIG_AD5764=m
CONFIG_AD5791=m CONFIG_AD5791=m
CONFIG_AD5933=m CONFIG_AD5933=m
CONFIG_AD7124=m
CONFIG_AD7150=m CONFIG_AD7150=m
CONFIG_AD7152=m CONFIG_AD7152=m
CONFIG_AD7192=m CONFIG_AD7192=m
@ -138,6 +139,7 @@ CONFIG_AD7793=m
CONFIG_AD7816=m CONFIG_AD7816=m
CONFIG_AD7887=m CONFIG_AD7887=m
CONFIG_AD7923=m CONFIG_AD7923=m
CONFIG_AD7949=m
CONFIG_AD799X=m CONFIG_AD799X=m
CONFIG_AD8366=m CONFIG_AD8366=m
CONFIG_AD8801=m CONFIG_AD8801=m
@ -381,8 +383,6 @@ CONFIG_ATP=m
# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
CONFIG_AUDIT_GENERIC=y CONFIG_AUDIT_GENERIC=y
CONFIG_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_TREE=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT=y CONFIG_AUDIT=y
CONFIG_AUFS_BDEV_LOOP=y CONFIG_AUFS_BDEV_LOOP=y
# CONFIG_AUFS_BRANCH_MAX_1023 is not set # CONFIG_AUFS_BRANCH_MAX_1023 is not set
@ -812,7 +812,6 @@ CONFIG_CAN_UCAN=m
CONFIG_CAN_VCAN=m CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m CONFIG_CAN_VXCAN=m
CONFIG_CAPI_AVM=y CONFIG_CAPI_AVM=y
CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set # CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4000=m
@ -830,6 +829,7 @@ CONFIG_CC10001_ADC=m
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_CCS811=m CONFIG_CCS811=m
CONFIG_CDNS_I3C_MASTER=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
# CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@ -1194,6 +1194,7 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEGIS128L=m CONFIG_CRYPTO_AEGIS128L=m
@ -1290,6 +1291,7 @@ CONFIG_CRYPTO_MD5=y
CONFIG_CRYPTO_MICHAEL_MIC=m CONFIG_CRYPTO_MICHAEL_MIC=m
CONFIG_CRYPTO_MORUS1280=m CONFIG_CRYPTO_MORUS1280=m
CONFIG_CRYPTO_MORUS640=m CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_NHPOLY1305=m
CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_NULL2=y
CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_OFB=m
@ -1316,6 +1318,8 @@ CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SIMD=m CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_SM4=m
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
@ -1824,6 +1828,7 @@ CONFIG_DWC_XLGMAC_PCI=m
CONFIG_DW_DMAC_CORE=m CONFIG_DW_DMAC_CORE=m
CONFIG_DW_DMAC=m CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=m CONFIG_DW_DMAC_PCI=m
CONFIG_DW_I3C_MASTER=m
CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_GENERIC=m
CONFIG_DW_WATCHDOG=m CONFIG_DW_WATCHDOG=m
CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_DEBUG=y
@ -1909,6 +1914,7 @@ CONFIG_ENC28J60=m
CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCLOSURE_SERVICES=m
CONFIG_ENCRYPTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y
CONFIG_ENCX24J600=m CONFIG_ENCX24J600=m
# CONFIG_ENERGY_MODEL is not set
CONFIG_ENIC=m CONFIG_ENIC=m
CONFIG_EPIC100=m CONFIG_EPIC100=m
CONFIG_EPOLL=y CONFIG_EPOLL=y
@ -1994,7 +2000,7 @@ CONFIG_FB_ATY_CT=y
CONFIG_FB_ATY_GENERIC_LCD=y CONFIG_FB_ATY_GENERIC_LCD=y
CONFIG_FB_ATY_GX=y CONFIG_FB_ATY_GX=y
CONFIG_FB_ATY=m CONFIG_FB_ATY=m
CONFIG_FB_BACKLIGHT=y CONFIG_FB_BACKLIGHT=m
# CONFIG_FB_BIG_ENDIAN is not set # CONFIG_FB_BIG_ENDIAN is not set
CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_BOTH_ENDIAN=y CONFIG_FB_BOTH_ENDIAN=y
@ -2567,6 +2573,7 @@ CONFIG_HTS221_I2C=m
CONFIG_HTS221=m CONFIG_HTS221=m
CONFIG_HTS221_SPI=m CONFIG_HTS221_SPI=m
CONFIG_HTU21=m CONFIG_HTU21=m
CONFIG_HUAWEI_WMI=m
CONFIG_HUGETLBFS=y CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE=y
CONFIG_HVC_DRIVER=y CONFIG_HVC_DRIVER=y
@ -2672,6 +2679,7 @@ CONFIG_I2C_VIAPRO=m
CONFIG_I2C_VIPERBOARD=m CONFIG_I2C_VIPERBOARD=m
CONFIG_I2C_XILINX=m CONFIG_I2C_XILINX=m
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I3C=m
CONFIG_I40E_DCB=y CONFIG_I40E_DCB=y
CONFIG_I40E=m CONFIG_I40E=m
CONFIG_I40EVF=m CONFIG_I40EVF=m
@ -3197,12 +3205,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_MIDDLEWARE=y
CONFIG_ISDN_DIVAS_BRIPCI=y
CONFIG_ISDN_DIVAS_DIVACAPI=m
CONFIG_ISDN_DIVAS=m
CONFIG_ISDN_DIVAS_MAINT=m
CONFIG_ISDN_DIVAS_PRIPCI=y
CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1ISA=m CONFIG_ISDN_DRV_AVMB1_B1ISA=m
@ -3473,6 +3475,7 @@ CONFIG_LEDS_REGULATOR=m
CONFIG_LEDS_TCA6507=m CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TLC591XX=m
CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_ACTIVITY=m
CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_CPU=y
@ -3592,6 +3595,7 @@ CONFIG_MAC_PARTITION=y
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_MACVLAN=m CONFIG_MACVLAN=m
CONFIG_MACVTAP=m CONFIG_MACVTAP=m
CONFIG_MADERA_IRQ=m
CONFIG_MAG3110=m CONFIG_MAG3110=m
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
CONFIG_MAGIC_SYSRQ_SERIAL=y CONFIG_MAGIC_SYSRQ_SERIAL=y
@ -3627,6 +3631,7 @@ CONFIG_MCP320X=m
CONFIG_MCP3422=m CONFIG_MCP3422=m
CONFIG_MCP3911=m CONFIG_MCP3911=m
CONFIG_MCP4018=m CONFIG_MCP4018=m
CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set # CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set # CONFIG_MCP4531 is not set
CONFIG_MCP4725=m CONFIG_MCP4725=m
@ -3716,9 +3721,11 @@ CONFIG_MEGARAID_SAS=m
# CONFIG_MELAN is not set # CONFIG_MELAN is not set
# CONFIG_MELLANOX_PLATFORM is not set # CONFIG_MELLANOX_PLATFORM is not set
CONFIG_MEMBARRIER=y CONFIG_MEMBARRIER=y
CONFIG_MEMCG_KMEM=y
# CONFIG_MEMCG_SWAP_ENABLED is not set # CONFIG_MEMCG_SWAP_ENABLED is not set
CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y CONFIG_MEMCG=y
CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_BALLOON=y CONFIG_MEMORY_BALLOON=y
CONFIG_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y
CONFIG_MEMORY_ISOLATION=y CONFIG_MEMORY_ISOLATION=y
@ -3743,7 +3750,6 @@ CONFIG_MFD_ARIZONA_I2C=m
CONFIG_MFD_ARIZONA_SPI=m CONFIG_MFD_ARIZONA_SPI=m
CONFIG_MFD_ARIZONA=y CONFIG_MFD_ARIZONA=y
CONFIG_MFD_AS3711=y CONFIG_MFD_AS3711=y
CONFIG_MFD_AT91_USART=m
CONFIG_MFD_AXP20X_I2C=m CONFIG_MFD_AXP20X_I2C=m
CONFIG_MFD_AXP20X=m CONFIG_MFD_AXP20X=m
CONFIG_MFD_BCM590XX=m CONFIG_MFD_BCM590XX=m
@ -3831,8 +3837,6 @@ CONFIG_MFD_WM8998=y
# CONFIG_MGEODE_LX is not set # CONFIG_MGEODE_LX is not set
CONFIG_MICREL_KS8995MA=m CONFIG_MICREL_KS8995MA=m
CONFIG_MICREL_PHY=m CONFIG_MICREL_PHY=m
CONFIG_MICROCHIP_KSZ=m
CONFIG_MICROCHIP_KSZ_SPI_DRIVER=m
CONFIG_MICROCHIP_PHY=m CONFIG_MICROCHIP_PHY=m
CONFIG_MICROCHIP_T1_PHY=m CONFIG_MICROCHIP_T1_PHY=m
CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_AMD=y
@ -3844,6 +3848,7 @@ CONFIG_MIGRATION=y
CONFIG_MII=m CONFIG_MII=m
CONFIG_MINIX_FS=m CONFIG_MINIX_FS=m
CONFIG_MINIX_SUBPARTITION=y CONFIG_MINIX_SUBPARTITION=y
CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_FILESYSTEMS=y
CONFIG_MISC_RTSX=m CONFIG_MISC_RTSX=m
CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_PCI=m
@ -3907,6 +3912,7 @@ CONFIG_MMA8452=m
# CONFIG_MMA9551 is not set # CONFIG_MMA9551 is not set
# CONFIG_MMA9553 is not set # CONFIG_MMA9553 is not set
CONFIG_MMC35240=m CONFIG_MMC35240=m
CONFIG_MMC_ALCOR=m
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m CONFIG_MMC_CB710=m
@ -4112,8 +4118,6 @@ CONFIG_MTD_SCx200_DOCFLASH=m
CONFIG_MTD_SLRAM=m CONFIG_MTD_SLRAM=m
CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SM_COMMON=m
CONFIG_MTD_SPI_NAND=m CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_SPINAND_MT29F=m
# CONFIG_MTD_SPINAND_ONDIEECC is not set
CONFIG_MTD_SPI_NOR=m CONFIG_MTD_SPI_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_MTD_SST25L=m CONFIG_MTD_SST25L=m
@ -4214,6 +4218,9 @@ CONFIG_NET_DSA_LANTIQ_GSWIP=m
CONFIG_NET_DSA_LEGACY=y CONFIG_NET_DSA_LEGACY=y
CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MT7530=m
CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6060=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
@ -4229,6 +4236,7 @@ CONFIG_NET_DSA_TAG_BRCM=y
CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_GSWIP=y CONFIG_NET_DSA_TAG_GSWIP=y
CONFIG_NET_DSA_TAG_KSZ9477=y
CONFIG_NET_DSA_TAG_KSZ=y CONFIG_NET_DSA_TAG_KSZ=y
CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_MTK=y
@ -4566,10 +4574,6 @@ CONFIG_NF_NAT_MASQUERADE_IPV4=y
CONFIG_NF_NAT_MASQUERADE_IPV6=y CONFIG_NF_NAT_MASQUERADE_IPV6=y
CONFIG_NF_NAT_NEEDED=y CONFIG_NF_NAT_NEEDED=y
CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_PPTP=m
CONFIG_NF_NAT_PROTO_DCCP=y
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_PROTO_SCTP=y
CONFIG_NF_NAT_PROTO_UDPLITE=y
CONFIG_NF_NAT_REDIRECT=y CONFIG_NF_NAT_REDIRECT=y
CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_SNMP_BASIC=m
@ -4764,11 +4768,14 @@ CONFIG_NVME_TARGET_FC=m
CONFIG_NVME_TARGET_LOOP=m CONFIG_NVME_TARGET_LOOP=m
CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET=m
CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_RDMA=m
CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM_PBLK_DEBUG is not set # CONFIG_NVM_PBLK_DEBUG is not set
CONFIG_NVM_PBLK=m CONFIG_NVM_PBLK=m
CONFIG_NVM=y CONFIG_NVM=y
CONFIG_NVRAM=m CONFIG_NVRAM=m
CONFIG_NV_TCO=m CONFIG_NV_TCO=m
CONFIG_OBJAGG=m
# CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_DEBUG_FS is not set
CONFIG_OCFS2_DEBUG_MASKLOG=y CONFIG_OCFS2_DEBUG_MASKLOG=y
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
@ -4966,6 +4973,7 @@ CONFIG_PCI_GOANY=y
CONFIG_PCI_IOV=y CONFIG_PCI_IOV=y
CONFIG_PCI_LABEL=y CONFIG_PCI_LABEL=y
CONFIG_PCI_LOCKLESS_CONFIG=y CONFIG_PCI_LOCKLESS_CONFIG=y
CONFIG_PCI_MESON=y
CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
@ -5174,6 +5182,7 @@ CONFIG_PTP_1588_CLOCK_KVM=m
CONFIG_PTP_1588_CLOCK_PCH=m CONFIG_PTP_1588_CLOCK_PCH=m
CONFIG_PTP_1588_CLOCK=y CONFIG_PTP_1588_CLOCK=y
CONFIG_PUNIT_ATOM_DEBUG=m CONFIG_PUNIT_ATOM_DEBUG=m
CONFIG_PVH=y
CONFIG_PVPANIC=m CONFIG_PVPANIC=m
CONFIG_PWM_CRC=y CONFIG_PWM_CRC=y
CONFIG_PWM_CROS_EC=m CONFIG_PWM_CROS_EC=m
@ -5215,7 +5224,7 @@ CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_QSEMI_PHY=m CONFIG_QSEMI_PHY=m
CONFIG_QTNFMAC=m CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QTNFMAC_PCIE=m
CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y CONFIG_QUEUED_SPINLOCKS=y
CONFIG_QUOTACTL=y CONFIG_QUOTACTL=y
@ -5255,6 +5264,7 @@ CONFIG_RADIO_TYPHOON=m
CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL1273=m
CONFIG_RADIO_WL128X=m CONFIG_RADIO_WL128X=m
CONFIG_RADIO_ZOLTRIX=m CONFIG_RADIO_ZOLTRIX=m
CONFIG_RAID6_PQ_BENCHMARK=y
CONFIG_RAID6_PQ=y CONFIG_RAID6_PQ=y
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
@ -5296,6 +5306,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_STALL_COMMON=y
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set # CONFIG_RCU_TRACE is not set
CONFIG_RC_XBOX_DVD=m
CONFIG_RD_BZIP2=y CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y CONFIG_RD_GZIP=y
CONFIG_RD_LZ4=y CONFIG_RD_LZ4=y
@ -5796,6 +5807,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_BSG is not set # CONFIG_SCSI_UFS_BSG is not set
CONFIG_SCSI_UFS_CDNS_PLATFORM=m
CONFIG_SCSI_UFS_DWC_TC_PCI=m CONFIG_SCSI_UFS_DWC_TC_PCI=m
CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD=m
@ -5976,11 +5988,16 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_OCC_P8_I2C=m
CONFIG_SENSORS_OCC=y
CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH56XX_COMMON=m
@ -6089,6 +6106,7 @@ CONFIG_SERIO_CT82C710=m
CONFIG_SERIO_GPIO_PS2=m CONFIG_SERIO_GPIO_PS2=m
CONFIG_SERIO_I8042=y CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_OLPC_APSP=m
CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PARKBD=m
CONFIG_SERIO_PCIPS2=m CONFIG_SERIO_PCIPS2=m
CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_PS2MULT=m
@ -6373,6 +6391,7 @@ CONFIG_SND_SOC_ADAU17X1=m
CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7002=m
CONFIG_SND_SOC_ADAU_UTILS=m CONFIG_SND_SOC_ADAU_UTILS=m
CONFIG_SND_SOC_AK4104=m CONFIG_SND_SOC_AK4104=m
CONFIG_SND_SOC_AK4118=m
CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK4458=m
CONFIG_SND_SOC_AK4554=m CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_AK4613=m
@ -6380,6 +6399,7 @@ CONFIG_SND_SOC_AK4642=m
CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5386=m
CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_ALC5623=m CONFIG_SND_SOC_ALC5623=m
CONFIG_SND_SOC_AMD_ACP3x=m
CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_ACP=m
CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@ -6435,6 +6455,7 @@ CONFIG_SND_SOC_IMG_SPDIF_OUT=m
CONFIG_SND_SOC_IMG=y CONFIG_SND_SOC_IMG=y
CONFIG_SND_SOC_IMX_AUDMUX=m CONFIG_SND_SOC_IMX_AUDMUX=m
CONFIG_SND_SOC_INNO_RK3036=m CONFIG_SND_SOC_INNO_RK3036=m
CONFIG_SND_SOC_INTEL_APL=m
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
@ -6444,23 +6465,30 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CFL=m
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
CONFIG_SND_SOC_INTEL_CNL=m
CONFIG_SND_SOC_INTEL_GLK=m
CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL=m
CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_MACH=y
CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
CONFIG_SND_SOC_INTEL_SKL=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SKYLAKE=m
CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
@ -6515,6 +6543,7 @@ CONFIG_SND_SOC_RT5631=m
CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5640=m
CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5651=m
CONFIG_SND_SOC_RT5660=m
CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5670=m CONFIG_SND_SOC_RT5670=m
CONFIG_SND_SOC_RT5677=m CONFIG_SND_SOC_RT5677=m
@ -6578,6 +6607,7 @@ CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8985=m CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_XILINX_I2S=m
CONFIG_SND_SOC_XTFPGA_I2S=m CONFIG_SND_SOC_XTFPGA_I2S=m
CONFIG_SND_SOC_ZX_AUD96P22=m CONFIG_SND_SOC_ZX_AUD96P22=m
CONFIG_SND_SONICVIBES=m CONFIG_SND_SONICVIBES=m
@ -6690,6 +6720,7 @@ CONFIG_SPI_LM70_LLP=m
# CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y CONFIG_SPI_MEM=y
CONFIG_SPI_MXIC=m
CONFIG_SPI_OC_TINY=m CONFIG_SPI_OC_TINY=m
CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX=m
CONFIG_SPI_PXA2XX_PCI=m CONFIG_SPI_PXA2XX_PCI=m
@ -6897,6 +6928,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LIST_SORT is not set
# CONFIG_TEST_LKM is not set # CONFIG_TEST_LKM is not set
# CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_OBJAGG is not set
# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_OVERFLOW is not set
# CONFIG_TEST_PARMAN is not set # CONFIG_TEST_PARMAN is not set
# CONFIG_TEST_POWER is not set # CONFIG_TEST_POWER is not set
@ -6954,11 +6986,13 @@ CONFIG_TICK_ONESHOT=y
# CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_CPSW_ALE is not set
CONFIG_TI_DAC082S085=m CONFIG_TI_DAC082S085=m
CONFIG_TI_DAC5571=m CONFIG_TI_DAC5571=m
CONFIG_TI_DAC7311=m
CONFIG_TIFM_7XX1=m CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m CONFIG_TIGON3=m
CONFIG_TIMERFD=y CONFIG_TIMERFD=y
CONFIG_TINYDRM_HX8357D=m
CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_ILI9225=m
CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_ILI9341=m
CONFIG_TINYDRM_MI0283QT=m CONFIG_TINYDRM_MI0283QT=m
@ -7093,6 +7127,7 @@ CONFIG_TPM_KEY_PARSER=m
# CONFIG_TPS6105X is not set # CONFIG_TPS6105X is not set
# CONFIG_TPS65010 is not set # CONFIG_TPS65010 is not set
# CONFIG_TPS6507X is not set # CONFIG_TPS6507X is not set
CONFIG_TQMX86_WDT=m
CONFIG_TRACE_CLOCK=y CONFIG_TRACE_CLOCK=y
# CONFIG_TRACE_EVAL_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@ -7424,6 +7459,7 @@ CONFIG_USB_MV_UDC=m
CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2272_DMA=y
CONFIG_USB_NET2272=m CONFIG_USB_NET2272=m
CONFIG_USB_NET2280=m CONFIG_USB_NET2280=m
CONFIG_USB_NET_AQC111=m
CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_EEM=m
@ -7616,6 +7652,7 @@ CONFIG_V4L_RADIO_ISA_DRIVERS=y
CONFIG_V4L_TEST_DRIVERS=y CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VBOXGUEST=m CONFIG_VBOXGUEST=m
CONFIG_VCNL4000=m CONFIG_VCNL4000=m
CONFIG_VCNL4035=m
CONFIG_VEML6070=m CONFIG_VEML6070=m
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_VFAT_FS=y CONFIG_VFAT_FS=y
@ -7649,6 +7686,7 @@ CONFIG_VIA_WDT=m
CONFIG_VIDEO_ADV7170=m CONFIG_VIDEO_ADV7170=m
CONFIG_VIDEO_ADV7175=m CONFIG_VIDEO_ADV7175=m
# CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_ASPEED=m
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_AU0828_RC=y
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
@ -7709,6 +7747,7 @@ CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_IPU3_CIO2=m CONFIG_VIDEO_IPU3_CIO2=m
CONFIG_VIDEO_IPU3_IMGU=m
CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_IR_I2C=m
CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_IVTV_ALSA=m
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
@ -7811,6 +7850,7 @@ CONFIG_VIRTIO_VSOCKETS_COMMON=m
CONFIG_VIRTIO_VSOCKETS=m CONFIG_VIRTIO_VSOCKETS=m
CONFIG_VIRT_TO_BUS=y CONFIG_VIRT_TO_BUS=y
CONFIG_VIRTUALIZATION=y CONFIG_VIRTUALIZATION=y
CONFIG_VIRT_WIFI=m
CONFIG_VITESSE_PHY=m CONFIG_VITESSE_PHY=m
CONFIG_VL53L0X_I2C=m CONFIG_VL53L0X_I2C=m
CONFIG_VL6180=m CONFIG_VL6180=m
@ -7980,6 +8020,7 @@ CONFIG_X86_CMPXCHG64=y
# CONFIG_X86_CPA_STATISTICS is not set # CONFIG_X86_CPA_STATISTICS is not set
CONFIG_X86_CPUFREQ_NFORCE2=y CONFIG_X86_CPUFREQ_NFORCE2=y
CONFIG_X86_CPUID=m CONFIG_X86_CPUID=m
# CONFIG_X86_CPU_RESCTRL is not set
CONFIG_X86_DEBUGCTLMSR=y CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_DEBUG_FPU is not set # CONFIG_X86_DEBUG_FPU is not set
# CONFIG_X86_DECODER_SELFTEST is not set # CONFIG_X86_DECODER_SELFTEST is not set

View file

@ -128,6 +128,7 @@ CONFIG_AD5761=m
CONFIG_AD5764=m CONFIG_AD5764=m
CONFIG_AD5791=m CONFIG_AD5791=m
CONFIG_AD5933=m CONFIG_AD5933=m
CONFIG_AD7124=m
CONFIG_AD7150=m CONFIG_AD7150=m
CONFIG_AD7152=m CONFIG_AD7152=m
CONFIG_AD7192=m CONFIG_AD7192=m
@ -148,6 +149,7 @@ CONFIG_AD7793=m
CONFIG_AD7816=m CONFIG_AD7816=m
CONFIG_AD7887=m CONFIG_AD7887=m
CONFIG_AD7923=m CONFIG_AD7923=m
CONFIG_AD7949=m
CONFIG_AD799X=m CONFIG_AD799X=m
CONFIG_AD8366=m CONFIG_AD8366=m
CONFIG_AD8801=m CONFIG_AD8801=m
@ -381,8 +383,6 @@ CONFIG_ATP=m
# CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set # CONFIG_AUDIT_ARCH_COMPAT_GENERIC is not set
CONFIG_AUDIT_ARCH=y CONFIG_AUDIT_ARCH=y
CONFIG_AUDITSYSCALL=y CONFIG_AUDITSYSCALL=y
CONFIG_AUDIT_TREE=y
CONFIG_AUDIT_WATCH=y
CONFIG_AUDIT=y CONFIG_AUDIT=y
CONFIG_AUFS_BDEV_LOOP=y CONFIG_AUFS_BDEV_LOOP=y
# CONFIG_AUFS_BRANCH_MAX_1023 is not set # CONFIG_AUFS_BRANCH_MAX_1023 is not set
@ -817,7 +817,6 @@ CONFIG_CAN_UCAN=m
CONFIG_CAN_VCAN=m CONFIG_CAN_VCAN=m
CONFIG_CAN_VXCAN=m CONFIG_CAN_VXCAN=m
CONFIG_CAPI_AVM=y CONFIG_CAPI_AVM=y
CONFIG_CAPI_EICON=y
# CONFIG_CAPI_TRACE is not set # CONFIG_CAPI_TRACE is not set
CONFIG_CARDBUS=y CONFIG_CARDBUS=y
CONFIG_CARDMAN_4000=m CONFIG_CARDMAN_4000=m
@ -837,6 +836,7 @@ CONFIG_CC10001_ADC=m
CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
CONFIG_CCS811=m CONFIG_CCS811=m
CONFIG_CDNS_I3C_MASTER=m
CONFIG_CDROM_PKTCDVD_BUFFERS=8 CONFIG_CDROM_PKTCDVD_BUFFERS=8
CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD=m
# CONFIG_CDROM_PKTCDVD_WCACHE is not set # CONFIG_CDROM_PKTCDVD_WCACHE is not set
@ -1194,6 +1194,7 @@ CONFIG_CROSS_COMPILE=""
CONFIG_CROSS_MEMORY_ATTACH=y CONFIG_CROSS_MEMORY_ATTACH=y
CONFIG_CRYPTO_842=m CONFIG_CRYPTO_842=m
CONFIG_CRYPTO_ACOMP2=y CONFIG_CRYPTO_ACOMP2=y
CONFIG_CRYPTO_ADIANTUM=m
CONFIG_CRYPTO_AEAD2=y CONFIG_CRYPTO_AEAD2=y
CONFIG_CRYPTO_AEAD=y CONFIG_CRYPTO_AEAD=y
CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
@ -1309,6 +1310,9 @@ CONFIG_CRYPTO_MORUS1280_SSE2=m
CONFIG_CRYPTO_MORUS640_GLUE=m CONFIG_CRYPTO_MORUS640_GLUE=m
CONFIG_CRYPTO_MORUS640=m CONFIG_CRYPTO_MORUS640=m
CONFIG_CRYPTO_MORUS640_SSE2=m CONFIG_CRYPTO_MORUS640_SSE2=m
CONFIG_CRYPTO_NHPOLY1305_AVX2=m
CONFIG_CRYPTO_NHPOLY1305=m
CONFIG_CRYPTO_NHPOLY1305_SSE2=m
CONFIG_CRYPTO_NULL2=y CONFIG_CRYPTO_NULL2=y
CONFIG_CRYPTO_NULL=y CONFIG_CRYPTO_NULL=y
CONFIG_CRYPTO_OFB=m CONFIG_CRYPTO_OFB=m
@ -1331,19 +1335,18 @@ CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
CONFIG_CRYPTO_SERPENT_AVX_X86_64=m CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_SERPENT=m
CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
CONFIG_CRYPTO_SHA1_MB=m
CONFIG_CRYPTO_SHA1_SSSE3=m CONFIG_CRYPTO_SHA1_SSSE3=m
CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA1=y
CONFIG_CRYPTO_SHA256_MB=m
CONFIG_CRYPTO_SHA256_SSSE3=m CONFIG_CRYPTO_SHA256_SSSE3=m
CONFIG_CRYPTO_SHA256=y CONFIG_CRYPTO_SHA256=y
CONFIG_CRYPTO_SHA3=m CONFIG_CRYPTO_SHA3=m
CONFIG_CRYPTO_SHA512_MB=m
CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_SHA512_SSSE3=m
CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_SHA512=y
CONFIG_CRYPTO_SIMD=m CONFIG_CRYPTO_SIMD=m
CONFIG_CRYPTO_SM3=m CONFIG_CRYPTO_SM3=m
CONFIG_CRYPTO_SM4=m CONFIG_CRYPTO_SM4=m
# CONFIG_CRYPTO_STATS is not set
CONFIG_CRYPTO_STREEBOG=m
CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_TEA=m
CONFIG_CRYPTO_TEST=m CONFIG_CRYPTO_TEST=m
CONFIG_CRYPTO_TGR192=m CONFIG_CRYPTO_TGR192=m
@ -1515,7 +1518,6 @@ CONFIG_DMA_ACPI=y
# CONFIG_DMA_CMA is not set # CONFIG_DMA_CMA is not set
# CONFIG_DMADEVICES_DEBUG is not set # CONFIG_DMADEVICES_DEBUG is not set
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=y
CONFIG_DMA_DIRECT_OPS=y
CONFIG_DMA_ENGINE_RAID=y CONFIG_DMA_ENGINE_RAID=y
CONFIG_DMA_ENGINE=y CONFIG_DMA_ENGINE=y
# CONFIG_DMA_FENCE_TRACE is not set # CONFIG_DMA_FENCE_TRACE is not set
@ -1855,6 +1857,7 @@ CONFIG_DWC_XLGMAC_PCI=m
CONFIG_DW_DMAC_CORE=y CONFIG_DW_DMAC_CORE=y
CONFIG_DW_DMAC=m CONFIG_DW_DMAC=m
CONFIG_DW_DMAC_PCI=y CONFIG_DW_DMAC_PCI=y
CONFIG_DW_I3C_MASTER=m
CONFIG_DWMAC_GENERIC=m CONFIG_DWMAC_GENERIC=m
CONFIG_DW_WATCHDOG=m CONFIG_DW_WATCHDOG=m
CONFIG_DYNAMIC_DEBUG=y CONFIG_DYNAMIC_DEBUG=y
@ -1925,6 +1928,7 @@ CONFIG_EFI_VARS_PSTORE=y
CONFIG_EFI_VARS=y CONFIG_EFI_VARS=y
CONFIG_EFI=y CONFIG_EFI=y
CONFIG_EFS_FS=m CONFIG_EFS_FS=m
# CONFIG_EISA is not set
CONFIG_ELF_CORE=y CONFIG_ELF_CORE=y
CONFIG_ELFCORE=y CONFIG_ELFCORE=y
# CONFIG_EMBEDDED is not set # CONFIG_EMBEDDED is not set
@ -1936,6 +1940,7 @@ CONFIG_ENC28J60=m
CONFIG_ENCLOSURE_SERVICES=m CONFIG_ENCLOSURE_SERVICES=m
CONFIG_ENCRYPTED_KEYS=y CONFIG_ENCRYPTED_KEYS=y
CONFIG_ENCX24J600=m CONFIG_ENCX24J600=m
# CONFIG_ENERGY_MODEL is not set
CONFIG_ENIC=m CONFIG_ENIC=m
CONFIG_EPIC100=m CONFIG_EPIC100=m
CONFIG_EPOLL=y CONFIG_EPOLL=y
@ -2022,8 +2027,7 @@ CONFIG_FB_ATY_CT=y
CONFIG_FB_ATY_GENERIC_LCD=y CONFIG_FB_ATY_GENERIC_LCD=y
CONFIG_FB_ATY_GX=y CONFIG_FB_ATY_GX=y
CONFIG_FB_ATY=m CONFIG_FB_ATY=m
# CONFIG_FB_AUO_K190X is not set CONFIG_FB_BACKLIGHT=m
CONFIG_FB_BACKLIGHT=y
# CONFIG_FB_BIG_ENDIAN is not set # CONFIG_FB_BIG_ENDIAN is not set
CONFIG_FB_BOOT_VESA_SUPPORT=y CONFIG_FB_BOOT_VESA_SUPPORT=y
CONFIG_FB_BOTH_ENDIAN=y CONFIG_FB_BOTH_ENDIAN=y
@ -2389,7 +2393,6 @@ CONFIG_HERMES_CACHE_FW_ON_INIT=y
CONFIG_HERMES=m CONFIG_HERMES=m
# CONFIG_HERMES_PRISM is not set # CONFIG_HERMES_PRISM is not set
# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set # CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
CONFIG_HFI1_VERBS_31BIT_PSN=y
CONFIG_HFS_FS=m CONFIG_HFS_FS=m
CONFIG_HFSPLUS_FS=m CONFIG_HFSPLUS_FS=m
CONFIG_HI8435=m CONFIG_HI8435=m
@ -2583,11 +2586,11 @@ CONFIG_HSR=m
CONFIG_HSU_DMA=m CONFIG_HSU_DMA=m
CONFIG_HTC_I2CPLD=y CONFIG_HTC_I2CPLD=y
CONFIG_HTC_PASIC3=m CONFIG_HTC_PASIC3=m
CONFIG_HT_IRQ=y
CONFIG_HTS221_I2C=m CONFIG_HTS221_I2C=m
CONFIG_HTS221=m CONFIG_HTS221=m
CONFIG_HTS221_SPI=m CONFIG_HTS221_SPI=m
CONFIG_HTU21=m CONFIG_HTU21=m
CONFIG_HUAWEI_WMI=m
CONFIG_HUGETLBFS=y CONFIG_HUGETLBFS=y
CONFIG_HUGETLB_PAGE=y CONFIG_HUGETLB_PAGE=y
CONFIG_HVC_DRIVER=y CONFIG_HVC_DRIVER=y
@ -2695,6 +2698,7 @@ CONFIG_I2C_VIAPRO=m
CONFIG_I2C_VIPERBOARD=m CONFIG_I2C_VIPERBOARD=m
CONFIG_I2C_XILINX=m CONFIG_I2C_XILINX=m
CONFIG_I2C=y CONFIG_I2C=y
CONFIG_I3C=m
CONFIG_I40E_DCB=y CONFIG_I40E_DCB=y
CONFIG_I40E=m CONFIG_I40E=m
CONFIG_I40EVF=m CONFIG_I40EVF=m
@ -3232,12 +3236,6 @@ CONFIG_ISDN_CAPI_CAPIDRV=m
# CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set # CONFIG_ISDN_CAPI_CAPIDRV_VERBOSE is not set
CONFIG_ISDN_CAPI=m CONFIG_ISDN_CAPI=m
CONFIG_ISDN_CAPI_MIDDLEWARE=y CONFIG_ISDN_CAPI_MIDDLEWARE=y
CONFIG_ISDN_DIVAS_BRIPCI=y
CONFIG_ISDN_DIVAS_DIVACAPI=m
CONFIG_ISDN_DIVAS=m
CONFIG_ISDN_DIVAS_MAINT=m
CONFIG_ISDN_DIVAS_PRIPCI=y
CONFIG_ISDN_DIVAS_USERIDI=m
CONFIG_ISDN_DIVERSION=m CONFIG_ISDN_DIVERSION=m
CONFIG_ISDN_DRV_AVMB1_AVM_CS=m CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
CONFIG_ISDN_DRV_AVMB1_B1PCI=m CONFIG_ISDN_DRV_AVMB1_B1PCI=m
@ -3514,6 +3512,7 @@ CONFIG_LEDS_PWM=m
CONFIG_LEDS_TCA6507=m CONFIG_LEDS_TCA6507=m
CONFIG_LEDS_TLC591XX=m CONFIG_LEDS_TLC591XX=m
CONFIG_LEDS_TRIGGER_ACTIVITY=m CONFIG_LEDS_TRIGGER_ACTIVITY=m
CONFIG_LEDS_TRIGGER_AUDIO=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_CAMERA=m
CONFIG_LEDS_TRIGGER_CPU=y CONFIG_LEDS_TRIGGER_CPU=y
@ -3632,6 +3631,7 @@ CONFIG_MAC_PARTITION=y
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_MACVLAN=m CONFIG_MACVLAN=m
CONFIG_MACVTAP=m CONFIG_MACVTAP=m
CONFIG_MADERA_IRQ=m
CONFIG_MAG3110=m CONFIG_MAG3110=m
CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
CONFIG_MAGIC_SYSRQ_SERIAL=y CONFIG_MAGIC_SYSRQ_SERIAL=y
@ -3667,6 +3667,7 @@ CONFIG_MCP320X=m
CONFIG_MCP3422=m CONFIG_MCP3422=m
CONFIG_MCP3911=m CONFIG_MCP3911=m
CONFIG_MCP4018=m CONFIG_MCP4018=m
CONFIG_MCP41010=m
# CONFIG_MCP4131 is not set # CONFIG_MCP4131 is not set
# CONFIG_MCP4531 is not set # CONFIG_MCP4531 is not set
CONFIG_MCP4725=m CONFIG_MCP4725=m
@ -3753,9 +3754,11 @@ CONFIG_MEGARAID_NEWGEN=y
CONFIG_MEGARAID_SAS=m CONFIG_MEGARAID_SAS=m
# CONFIG_MELLANOX_PLATFORM is not set # CONFIG_MELLANOX_PLATFORM is not set
CONFIG_MEMBARRIER=y CONFIG_MEMBARRIER=y
CONFIG_MEMCG_KMEM=y
# CONFIG_MEMCG_SWAP_ENABLED is not set # CONFIG_MEMCG_SWAP_ENABLED is not set
CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_SWAP=y
CONFIG_MEMCG=y CONFIG_MEMCG=y
CONFIG_MEMFD_CREATE=y
CONFIG_MEMORY_BALLOON=y CONFIG_MEMORY_BALLOON=y
CONFIG_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y
# CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set # CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE is not set
@ -3884,6 +3887,7 @@ CONFIG_MIGRATION=y
CONFIG_MII=m CONFIG_MII=m
CONFIG_MINIX_FS=m CONFIG_MINIX_FS=m
CONFIG_MINIX_SUBPARTITION=y CONFIG_MINIX_SUBPARTITION=y
CONFIG_MISC_ALCOR_PCI=m
CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_FILESYSTEMS=y
CONFIG_MISC_RTSX=m CONFIG_MISC_RTSX=m
CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_PCI=m
@ -3942,6 +3946,7 @@ CONFIG_MMA9551_CORE=m
CONFIG_MMA9551=m CONFIG_MMA9551=m
CONFIG_MMA9553=m CONFIG_MMA9553=m
CONFIG_MMC35240=m CONFIG_MMC35240=m
CONFIG_MMC_ALCOR=m
CONFIG_MMC_BLOCK=m CONFIG_MMC_BLOCK=m
CONFIG_MMC_BLOCK_MINORS=8 CONFIG_MMC_BLOCK_MINORS=8
CONFIG_MMC_CB710=m CONFIG_MMC_CB710=m
@ -4139,8 +4144,6 @@ CONFIG_MTD_SCB2_FLASH=m
CONFIG_MTD_SLRAM=m CONFIG_MTD_SLRAM=m
CONFIG_MTD_SM_COMMON=m CONFIG_MTD_SM_COMMON=m
CONFIG_MTD_SPI_NAND=m CONFIG_MTD_SPI_NAND=m
CONFIG_MTD_SPINAND_MT29F=m
CONFIG_MTD_SPINAND_ONDIEECC=y
CONFIG_MTD_SPI_NOR=m CONFIG_MTD_SPI_NOR=m
CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
CONFIG_MTD_SST25L=m CONFIG_MTD_SST25L=m
@ -4237,6 +4240,9 @@ CONFIG_NET_DSA_LANTIQ_GSWIP=m
CONFIG_NET_DSA_LEGACY=y CONFIG_NET_DSA_LEGACY=y
CONFIG_NET_DSA_LOOP=m CONFIG_NET_DSA_LOOP=m
CONFIG_NET_DSA=m CONFIG_NET_DSA=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
CONFIG_NET_DSA_MT7530=m CONFIG_NET_DSA_MT7530=m
CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6060=m
CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
@ -4252,6 +4258,8 @@ CONFIG_NET_DSA_TAG_BRCM=y
CONFIG_NET_DSA_TAG_DSA=y CONFIG_NET_DSA_TAG_DSA=y
CONFIG_NET_DSA_TAG_EDSA=y CONFIG_NET_DSA_TAG_EDSA=y
CONFIG_NET_DSA_TAG_GSWIP=y CONFIG_NET_DSA_TAG_GSWIP=y
CONFIG_NET_DSA_TAG_KSZ9477=y
CONFIG_NET_DSA_TAG_KSZ=y
CONFIG_NET_DSA_TAG_LAN9303=y CONFIG_NET_DSA_TAG_LAN9303=y
CONFIG_NET_DSA_TAG_MTK=y CONFIG_NET_DSA_TAG_MTK=y
CONFIG_NET_DSA_TAG_QCA=y CONFIG_NET_DSA_TAG_QCA=y
@ -4571,6 +4579,7 @@ CONFIG_NF_FLOW_TABLE_INET=m
CONFIG_NF_FLOW_TABLE_IPV4=m CONFIG_NF_FLOW_TABLE_IPV4=m
CONFIG_NF_FLOW_TABLE_IPV6=m CONFIG_NF_FLOW_TABLE_IPV6=m
CONFIG_NF_FLOW_TABLE=m CONFIG_NF_FLOW_TABLE=m
# CONFIG_NFIT_SECURITY_DEBUG is not set
CONFIG_NF_LOG_ARP=m CONFIG_NF_LOG_ARP=m
CONFIG_NF_LOG_BRIDGE=m CONFIG_NF_LOG_BRIDGE=m
CONFIG_NF_LOG_COMMON=m CONFIG_NF_LOG_COMMON=m
@ -4588,10 +4597,6 @@ CONFIG_NF_NAT_MASQUERADE_IPV4=y
CONFIG_NF_NAT_MASQUERADE_IPV6=y CONFIG_NF_NAT_MASQUERADE_IPV6=y
CONFIG_NF_NAT_NEEDED=y CONFIG_NF_NAT_NEEDED=y
CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_PPTP=m
CONFIG_NF_NAT_PROTO_DCCP=y
CONFIG_NF_NAT_PROTO_GRE=m
CONFIG_NF_NAT_PROTO_SCTP=y
CONFIG_NF_NAT_PROTO_UDPLITE=y
CONFIG_NF_NAT_REDIRECT=y CONFIG_NF_NAT_REDIRECT=y
CONFIG_NF_NAT_SIP=m CONFIG_NF_NAT_SIP=m
CONFIG_NF_NAT_SNMP_BASIC=m CONFIG_NF_NAT_SNMP_BASIC=m
@ -4791,11 +4796,14 @@ CONFIG_NVME_TARGET_FC=m
CONFIG_NVME_TARGET_LOOP=m CONFIG_NVME_TARGET_LOOP=m
CONFIG_NVME_TARGET=m CONFIG_NVME_TARGET=m
CONFIG_NVME_TARGET_RDMA=m CONFIG_NVME_TARGET_RDMA=m
CONFIG_NVME_TARGET_TCP=m
CONFIG_NVME_TCP=m
# CONFIG_NVM_PBLK_DEBUG is not set # CONFIG_NVM_PBLK_DEBUG is not set
CONFIG_NVM_PBLK=m CONFIG_NVM_PBLK=m
CONFIG_NVM=y CONFIG_NVM=y
CONFIG_NVRAM=m CONFIG_NVRAM=m
CONFIG_NV_TCO=m CONFIG_NV_TCO=m
CONFIG_OBJAGG=m
# CONFIG_OCFS2_DEBUG_FS is not set # CONFIG_OCFS2_DEBUG_FS is not set
CONFIG_OCFS2_DEBUG_MASKLOG=y CONFIG_OCFS2_DEBUG_MASKLOG=y
CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS=m
@ -4974,6 +4982,7 @@ CONFIG_PCI_HYPERV=m
CONFIG_PCI_IOV=y CONFIG_PCI_IOV=y
CONFIG_PCI_LABEL=y CONFIG_PCI_LABEL=y
CONFIG_PCI_LOCKLESS_CONFIG=y CONFIG_PCI_LOCKLESS_CONFIG=y
CONFIG_PCI_MESON=y
CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MMCONFIG=y
CONFIG_PCI_MSI_IRQ_DOMAIN=y CONFIG_PCI_MSI_IRQ_DOMAIN=y
CONFIG_PCI_MSI=y CONFIG_PCI_MSI=y
@ -5179,6 +5188,7 @@ CONFIG_PSTORE=y
CONFIG_PTP_1588_CLOCK_KVM=m CONFIG_PTP_1588_CLOCK_KVM=m
CONFIG_PTP_1588_CLOCK=y CONFIG_PTP_1588_CLOCK=y
CONFIG_PUNIT_ATOM_DEBUG=m CONFIG_PUNIT_ATOM_DEBUG=m
CONFIG_PVH=y
CONFIG_PVPANIC=m CONFIG_PVPANIC=m
CONFIG_PWM_CRC=y CONFIG_PWM_CRC=y
CONFIG_PWM_CROS_EC=m CONFIG_PWM_CROS_EC=m
@ -5220,7 +5230,7 @@ CONFIG_QNX4FS_FS=m
CONFIG_QNX6FS_FS=m CONFIG_QNX6FS_FS=m
CONFIG_QSEMI_PHY=m CONFIG_QSEMI_PHY=m
CONFIG_QTNFMAC=m CONFIG_QTNFMAC=m
CONFIG_QTNFMAC_PEARL_PCIE=m CONFIG_QTNFMAC_PCIE=m
CONFIG_QUEUED_RWLOCKS=y CONFIG_QUEUED_RWLOCKS=y
CONFIG_QUEUED_SPINLOCKS=y CONFIG_QUEUED_SPINLOCKS=y
CONFIG_QUOTACTL_COMPAT=y CONFIG_QUOTACTL_COMPAT=y
@ -5248,7 +5258,7 @@ CONFIG_RADIO_TEA5764=m
CONFIG_RADIO_TEF6862=m CONFIG_RADIO_TEF6862=m
CONFIG_RADIO_WL1273=m CONFIG_RADIO_WL1273=m
CONFIG_RADIO_WL128X=m CONFIG_RADIO_WL128X=m
CONFIG_RADIX_TREE_MULTIORDER=y CONFIG_RAID6_PQ_BENCHMARK=y
CONFIG_RAID6_PQ=y CONFIG_RAID6_PQ=y
CONFIG_RAID_ATTRS=m CONFIG_RAID_ATTRS=m
# CONFIG_RANDOM32_SELFTEST is not set # CONFIG_RANDOM32_SELFTEST is not set
@ -5291,6 +5301,7 @@ CONFIG_RCU_CPU_STALL_TIMEOUT=60
CONFIG_RCU_STALL_COMMON=y CONFIG_RCU_STALL_COMMON=y
# CONFIG_RCU_TORTURE_TEST is not set # CONFIG_RCU_TORTURE_TEST is not set
# CONFIG_RCU_TRACE is not set # CONFIG_RCU_TRACE is not set
CONFIG_RC_XBOX_DVD=m
CONFIG_RD_BZIP2=y CONFIG_RD_BZIP2=y
CONFIG_RD_GZIP=y CONFIG_RD_GZIP=y
CONFIG_RD_LZ4=y CONFIG_RD_LZ4=y
@ -5788,6 +5799,7 @@ CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
CONFIG_SCSI_SYM53C8XX_MMIO=y CONFIG_SCSI_SYM53C8XX_MMIO=y
# CONFIG_SCSI_UFS_BSG is not set # CONFIG_SCSI_UFS_BSG is not set
CONFIG_SCSI_UFS_CDNS_PLATFORM=m
CONFIG_SCSI_UFS_DWC_TC_PCI=m CONFIG_SCSI_UFS_DWC_TC_PCI=m
CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD=m
@ -5963,11 +5975,16 @@ CONFIG_SENSORS_NCT7802=m
CONFIG_SENSORS_NCT7904=m CONFIG_SENSORS_NCT7904=m
CONFIG_SENSORS_NPCM7XX=m CONFIG_SENSORS_NPCM7XX=m
CONFIG_SENSORS_NTC_THERMISTOR=m CONFIG_SENSORS_NTC_THERMISTOR=m
CONFIG_SENSORS_OCC_P8_I2C=m
CONFIG_SENSORS_OCC=y
CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87360=m
CONFIG_SENSORS_PC87427=m CONFIG_SENSORS_PC87427=m
CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_PCF8591=m
CONFIG_SENSORS_PMBUS=m CONFIG_SENSORS_PMBUS=m
CONFIG_SENSORS_POWR1220=m CONFIG_SENSORS_POWR1220=m
CONFIG_SENSORS_RM3100_I2C=m
CONFIG_SENSORS_RM3100=m
CONFIG_SENSORS_RM3100_SPI=m
CONFIG_SENSORS_SCH5627=m CONFIG_SENSORS_SCH5627=m
CONFIG_SENSORS_SCH5636=m CONFIG_SENSORS_SCH5636=m
CONFIG_SENSORS_SCH56XX_COMMON=m CONFIG_SENSORS_SCH56XX_COMMON=m
@ -6067,6 +6084,7 @@ CONFIG_SERIO_CT82C710=m
CONFIG_SERIO_GPIO_PS2=m CONFIG_SERIO_GPIO_PS2=m
CONFIG_SERIO_I8042=y CONFIG_SERIO_I8042=y
CONFIG_SERIO_LIBPS2=y CONFIG_SERIO_LIBPS2=y
CONFIG_SERIO_OLPC_APSP=m
CONFIG_SERIO_PARKBD=m CONFIG_SERIO_PARKBD=m
CONFIG_SERIO_PCIPS2=m CONFIG_SERIO_PCIPS2=m
CONFIG_SERIO_PS2MULT=m CONFIG_SERIO_PS2MULT=m
@ -6311,6 +6329,7 @@ CONFIG_SND_SOC_ADAU17X1=m
CONFIG_SND_SOC_ADAU7002=m CONFIG_SND_SOC_ADAU7002=m
CONFIG_SND_SOC_ADAU_UTILS=m CONFIG_SND_SOC_ADAU_UTILS=m
CONFIG_SND_SOC_AK4104=m CONFIG_SND_SOC_AK4104=m
CONFIG_SND_SOC_AK4118=m
CONFIG_SND_SOC_AK4458=m CONFIG_SND_SOC_AK4458=m
CONFIG_SND_SOC_AK4554=m CONFIG_SND_SOC_AK4554=m
CONFIG_SND_SOC_AK4613=m CONFIG_SND_SOC_AK4613=m
@ -6318,6 +6337,7 @@ CONFIG_SND_SOC_AK4642=m
CONFIG_SND_SOC_AK5386=m CONFIG_SND_SOC_AK5386=m
CONFIG_SND_SOC_AK5558=m CONFIG_SND_SOC_AK5558=m
CONFIG_SND_SOC_ALC5623=m CONFIG_SND_SOC_ALC5623=m
CONFIG_SND_SOC_AMD_ACP3x=m
CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SOC_AMD_ACP=m
CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
@ -6373,6 +6393,7 @@ CONFIG_SND_SOC_IMG_SPDIF_OUT=m
CONFIG_SND_SOC_IMG=y CONFIG_SND_SOC_IMG=y
CONFIG_SND_SOC_IMX_AUDMUX=m CONFIG_SND_SOC_IMX_AUDMUX=m
CONFIG_SND_SOC_INNO_RK3036=m CONFIG_SND_SOC_INNO_RK3036=m
CONFIG_SND_SOC_INTEL_APL=m
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
@ -6382,23 +6403,30 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set # CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
CONFIG_SND_SOC_INTEL_CFL=m
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
CONFIG_SND_SOC_INTEL_CNL=m
CONFIG_SND_SOC_INTEL_GLK=m
CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL=m
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL=m
CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
CONFIG_SND_SOC_INTEL_MACH=y CONFIG_SND_SOC_INTEL_MACH=y
CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
CONFIG_SND_SOC_INTEL_SKL=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
CONFIG_SND_SOC_INTEL_SKYLAKE=m CONFIG_SND_SOC_INTEL_SKYLAKE=m
CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
@ -6453,6 +6481,7 @@ CONFIG_SND_SOC_RT5631=m
CONFIG_SND_SOC_RT5640=m CONFIG_SND_SOC_RT5640=m
CONFIG_SND_SOC_RT5645=m CONFIG_SND_SOC_RT5645=m
CONFIG_SND_SOC_RT5651=m CONFIG_SND_SOC_RT5651=m
CONFIG_SND_SOC_RT5660=m
CONFIG_SND_SOC_RT5663=m CONFIG_SND_SOC_RT5663=m
CONFIG_SND_SOC_RT5670=m CONFIG_SND_SOC_RT5670=m
CONFIG_SND_SOC_RT5677=m CONFIG_SND_SOC_RT5677=m
@ -6516,6 +6545,7 @@ CONFIG_SND_SOC_WM8962=m
CONFIG_SND_SOC_WM8974=m CONFIG_SND_SOC_WM8974=m
CONFIG_SND_SOC_WM8978=m CONFIG_SND_SOC_WM8978=m
CONFIG_SND_SOC_WM8985=m CONFIG_SND_SOC_WM8985=m
CONFIG_SND_SOC_XILINX_I2S=m
CONFIG_SND_SOC_XTFPGA_I2S=m CONFIG_SND_SOC_XTFPGA_I2S=m
CONFIG_SND_SOC_ZX_AUD96P22=m CONFIG_SND_SOC_ZX_AUD96P22=m
CONFIG_SND_SONICVIBES=m CONFIG_SND_SONICVIBES=m
@ -6623,6 +6653,7 @@ CONFIG_SPI_LM70_LLP=m
# CONFIG_SPI_LOOPBACK_TEST is not set # CONFIG_SPI_LOOPBACK_TEST is not set
CONFIG_SPI_MASTER=y CONFIG_SPI_MASTER=y
CONFIG_SPI_MEM=y CONFIG_SPI_MEM=y
CONFIG_SPI_MXIC=m
CONFIG_SPI_OC_TINY=m CONFIG_SPI_OC_TINY=m
CONFIG_SPI_PXA2XX=m CONFIG_SPI_PXA2XX=m
CONFIG_SPI_PXA2XX_PCI=m CONFIG_SPI_PXA2XX_PCI=m
@ -6833,6 +6864,7 @@ CONFIG_TERANETICS_PHY=m
# CONFIG_TEST_LIST_SORT is not set # CONFIG_TEST_LIST_SORT is not set
# CONFIG_TEST_LKM is not set # CONFIG_TEST_LKM is not set
# CONFIG_TEST_MEMCAT_P is not set # CONFIG_TEST_MEMCAT_P is not set
# CONFIG_TEST_OBJAGG is not set
# CONFIG_TEST_OVERFLOW is not set # CONFIG_TEST_OVERFLOW is not set
# CONFIG_TEST_PARMAN is not set # CONFIG_TEST_PARMAN is not set
# CONFIG_TEST_POWER is not set # CONFIG_TEST_POWER is not set
@ -6894,11 +6926,13 @@ CONFIG_TICK_ONESHOT=y
# CONFIG_TI_CPSW_ALE is not set # CONFIG_TI_CPSW_ALE is not set
CONFIG_TI_DAC082S085=m CONFIG_TI_DAC082S085=m
CONFIG_TI_DAC5571=m CONFIG_TI_DAC5571=m
CONFIG_TI_DAC7311=m
CONFIG_TIFM_7XX1=m CONFIG_TIFM_7XX1=m
CONFIG_TIFM_CORE=m CONFIG_TIFM_CORE=m
CONFIG_TIGON3_HWMON=y CONFIG_TIGON3_HWMON=y
CONFIG_TIGON3=m CONFIG_TIGON3=m
CONFIG_TIMERFD=y CONFIG_TIMERFD=y
CONFIG_TINYDRM_HX8357D=m
CONFIG_TINYDRM_ILI9225=m CONFIG_TINYDRM_ILI9225=m
CONFIG_TINYDRM_ILI9341=m CONFIG_TINYDRM_ILI9341=m
CONFIG_TINYDRM_MI0283QT=m CONFIG_TINYDRM_MI0283QT=m
@ -7032,6 +7066,7 @@ CONFIG_TPS6105X=m
CONFIG_TPS65010=m CONFIG_TPS65010=m
CONFIG_TPS6507X=m CONFIG_TPS6507X=m
CONFIG_TPS68470_PMIC_OPREGION=y CONFIG_TPS68470_PMIC_OPREGION=y
CONFIG_TQMX86_WDT=m
CONFIG_TRACE_CLOCK=y CONFIG_TRACE_CLOCK=y
# CONFIG_TRACE_EVAL_MAP_FILE is not set # CONFIG_TRACE_EVAL_MAP_FILE is not set
CONFIG_TRACE_IRQFLAGS_SUPPORT=y CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@ -7368,6 +7403,7 @@ CONFIG_USB_MV_UDC=m
CONFIG_USB_NET2272_DMA=y CONFIG_USB_NET2272_DMA=y
CONFIG_USB_NET2272=m CONFIG_USB_NET2272=m
CONFIG_USB_NET2280=m CONFIG_USB_NET2280=m
CONFIG_USB_NET_AQC111=m
CONFIG_USB_NET_AX88179_178A=m CONFIG_USB_NET_AX88179_178A=m
CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_AX8817X=m
CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_CDC_EEM=m
@ -7560,6 +7596,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_V4L_TEST_DRIVERS=y CONFIG_V4L_TEST_DRIVERS=y
CONFIG_VBOXGUEST=m CONFIG_VBOXGUEST=m
CONFIG_VCNL4000=m CONFIG_VCNL4000=m
CONFIG_VCNL4035=m
CONFIG_VEML6070=m CONFIG_VEML6070=m
CONFIG_VETH=m CONFIG_VETH=m
CONFIG_VFAT_FS=y CONFIG_VFAT_FS=y
@ -7591,6 +7628,7 @@ CONFIG_VIA_RHINE_MMIO=y
CONFIG_VIA_VELOCITY=m CONFIG_VIA_VELOCITY=m
CONFIG_VIA_WDT=m CONFIG_VIA_WDT=m
# CONFIG_VIDEO_ADV_DEBUG is not set # CONFIG_VIDEO_ADV_DEBUG is not set
CONFIG_VIDEO_ASPEED=m
CONFIG_VIDEO_AU0828=m CONFIG_VIDEO_AU0828=m
CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_AU0828_RC=y
CONFIG_VIDEO_AU0828_V4L2=y CONFIG_VIDEO_AU0828_V4L2=y
@ -7648,6 +7686,7 @@ CONFIG_VIDEO_HDPVR=m
CONFIG_VIDEO_HEXIUM_GEMINI=m CONFIG_VIDEO_HEXIUM_GEMINI=m
CONFIG_VIDEO_HEXIUM_ORION=m CONFIG_VIDEO_HEXIUM_ORION=m
CONFIG_VIDEO_IPU3_CIO2=m CONFIG_VIDEO_IPU3_CIO2=m
CONFIG_VIDEO_IPU3_IMGU=m
CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_IR_I2C=m
CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_IVTV_ALSA=m
# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set # CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
@ -7741,6 +7780,7 @@ CONFIG_VIRTIO_VSOCKETS=m
CONFIG_VIRTIO=y CONFIG_VIRTIO=y
CONFIG_VIRT_TO_BUS=y CONFIG_VIRT_TO_BUS=y
CONFIG_VIRTUALIZATION=y CONFIG_VIRTUALIZATION=y
CONFIG_VIRT_WIFI=m
CONFIG_VITESSE_PHY=m CONFIG_VITESSE_PHY=m
CONFIG_VL53L0X_I2C=m CONFIG_VL53L0X_I2C=m
CONFIG_VL6180=m CONFIG_VL6180=m
@ -7903,6 +7943,7 @@ CONFIG_X86_CMOV=y
CONFIG_X86_CMPXCHG64=y CONFIG_X86_CMPXCHG64=y
# CONFIG_X86_CPA_STATISTICS is not set # CONFIG_X86_CPA_STATISTICS is not set
CONFIG_X86_CPUID=m CONFIG_X86_CPUID=m
# CONFIG_X86_CPU_RESCTRL is not set
CONFIG_X86_DEBUGCTLMSR=y CONFIG_X86_DEBUGCTLMSR=y
# CONFIG_X86_DEBUG_FPU is not set # CONFIG_X86_DEBUG_FPU is not set
# CONFIG_X86_DECODER_SELFTEST is not set # CONFIG_X86_DECODER_SELFTEST is not set
@ -7977,6 +8018,7 @@ CONFIG_XEN_DEV_EVTCHN=m
CONFIG_XEN_DOM0=y CONFIG_XEN_DOM0=y
CONFIG_XEN_EFI=y CONFIG_XEN_EFI=y
CONFIG_XEN_FBDEV_FRONTEND=y CONFIG_XEN_FBDEV_FRONTEND=y
CONFIG_XEN_FRONT_PGDIR_SHBUF=m
CONFIG_XENFS=m CONFIG_XENFS=m
CONFIG_XEN_GNTDEV_DMABUF=y CONFIG_XEN_GNTDEV_DMABUF=y
CONFIG_XEN_GNTDEV=m CONFIG_XEN_GNTDEV=m

View file

@ -1,7 +1,7 @@
%define kernelversion 4 %define kernelversion 5
%define patchlevel 20 %define patchlevel 0
# sublevel is now used for -stable patches # sublevel is now used for -stable patches
%define sublevel 12 %define sublevel 7
# Release number. Increase this before a rebuild. # Release number. Increase this before a rebuild.
%define rpmrel 1 %define rpmrel 1

View file

@ -20,10 +20,10 @@ Let us revert the main parts of this commit in the 32-bit kernels for now.
Signed-off-by: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru> Signed-off-by: Evgenii Shatokhin <eugene.shatokhin@rosalab.ru>
diff --git a/mm/memblock.c b/mm/memblock.c diff --git a/mm/memblock.c b/mm/memblock.c
index f45a049532fe..ede1d657fbc7 100644 index ea31045ba704..ea4b153953aa 100644
--- a/mm/memblock.c --- a/mm/memblock.c
+++ b/mm/memblock.c +++ b/mm/memblock.c
@@ -1931,9 +1931,6 @@ static unsigned long __init free_low_memory_core_early(void) @@ -1927,9 +1927,6 @@ static unsigned long __init free_low_memory_core_early(void)
memblock_clear_hotplug(0, -1); memblock_clear_hotplug(0, -1);
@ -34,13 +34,13 @@ index f45a049532fe..ede1d657fbc7 100644
* We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id * We need to use NUMA_NO_NODE instead of NODE_DATA(0)->node_id
* because in some case like Node0 doesn't have RAM installed * because in some case like Node0 doesn't have RAM installed
diff --git a/mm/page_alloc.c b/mm/page_alloc.c diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index a29043ea9212..11680c6d1f30 100644 index 20dd3283bb1b..dedd1d869762 100644
--- a/mm/page_alloc.c --- a/mm/page_alloc.c
+++ b/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -1211,6 +1211,7 @@ static void __meminit __init_single_page(struct page *page, unsigned long pfn, @@ -1222,6 +1222,7 @@ static void __meminit __init_single_page(struct page *page, unsigned long pfn,
init_page_count(page);
page_mapcount_reset(page); page_mapcount_reset(page);
page_cpupid_reset_last(page); page_cpupid_reset_last(page);
page_kasan_tag_reset(page);
+ SetPageReserved(page); + SetPageReserved(page);
INIT_LIST_HEAD(&page->lru); INIT_LIST_HEAD(&page->lru);

View file

@ -1,8 +1,8 @@
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index f2040d46f095..eb5e429b1ea5 100644 index 25f6c5ff7c09..a5a4b70e469e 100644
--- a/Documentation/admin-guide/kernel-parameters.txt --- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2979,6 +2979,10 @@ @@ -3154,6 +3154,10 @@
the specified number of seconds. This is to be used if the specified number of seconds. This is to be used if
your oopses keep scrolling off the screen. your oopses keep scrolling off the screen.
@ -14,10 +14,10 @@ index f2040d46f095..eb5e429b1ea5 100644
pcd. [PARIDE] pcd. [PARIDE]
diff --git a/fs/buffer.c b/fs/buffer.c diff --git a/fs/buffer.c b/fs/buffer.c
index 249b83fafe48..b51ce983ec7d 100644 index 48318fb74938..6e6f5fe86a2e 100644
--- a/fs/buffer.c --- a/fs/buffer.c
+++ b/fs/buffer.c +++ b/fs/buffer.c
@@ -3549,7 +3549,7 @@ void __init buffer_init(void) @@ -3447,7 +3447,7 @@ void __init buffer_init(void)
bh_cachep = kmem_cache_create("buffer_head", bh_cachep = kmem_cache_create("buffer_head",
sizeof(struct buffer_head), 0, sizeof(struct buffer_head), 0,
(SLAB_RECLAIM_ACCOUNT|SLAB_PANIC| (SLAB_RECLAIM_ACCOUNT|SLAB_PANIC|
@ -27,10 +27,10 @@ index 249b83fafe48..b51ce983ec7d 100644
/* /*
diff --git a/fs/dcache.c b/fs/dcache.c diff --git a/fs/dcache.c b/fs/dcache.c
index 2acfc69878f5..f2f575aaa27c 100644 index 50eb587c1253..3c0b1c9f955e 100644
--- a/fs/dcache.c --- a/fs/dcache.c
+++ b/fs/dcache.c +++ b/fs/dcache.c
@@ -3232,7 +3232,7 @@ void __init vfs_caches_init_early(void) @@ -3137,7 +3137,7 @@ void __init vfs_caches_init_early(void)
void __init vfs_caches_init(void) void __init vfs_caches_init(void)
{ {
names_cachep = kmem_cache_create_usercopy("names_cache", PATH_MAX, 0, names_cachep = kmem_cache_create_usercopy("names_cache", PATH_MAX, 0,
@ -40,10 +40,10 @@ index 2acfc69878f5..f2f575aaa27c 100644
dcache_init(); dcache_init();
inode_init(); inode_init();
diff --git a/include/linux/slab.h b/include/linux/slab.h diff --git a/include/linux/slab.h b/include/linux/slab.h
index 81ebd71f8c03..ccb3618c4052 100644 index 11b45f7ae405..fa75912cfe70 100644
--- a/include/linux/slab.h --- a/include/linux/slab.h
+++ b/include/linux/slab.h +++ b/include/linux/slab.h
@@ -27,6 +27,14 @@ @@ -28,6 +28,14 @@
#define SLAB_RED_ZONE ((slab_flags_t __force)0x00000400U) #define SLAB_RED_ZONE ((slab_flags_t __force)0x00000400U)
/* DEBUG: Poison objects */ /* DEBUG: Poison objects */
#define SLAB_POISON ((slab_flags_t __force)0x00000800U) #define SLAB_POISON ((slab_flags_t __force)0x00000800U)
@ -59,10 +59,10 @@ index 81ebd71f8c03..ccb3618c4052 100644
#define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U) #define SLAB_HWCACHE_ALIGN ((slab_flags_t __force)0x00002000U)
/* Use GFP_DMA memory */ /* Use GFP_DMA memory */
diff --git a/kernel/fork.c b/kernel/fork.c diff --git a/kernel/fork.c b/kernel/fork.c
index a5d21c42acfc..bdc0c9a07ae8 100644 index 91d0c0557430..8a8175cb6e4d 100644
--- a/kernel/fork.c --- a/kernel/fork.c
+++ b/kernel/fork.c +++ b/kernel/fork.c
@@ -2271,7 +2271,7 @@ void __init proc_caches_init(void) @@ -2423,7 +2423,7 @@ void __init proc_caches_init(void)
offsetof(struct mm_struct, saved_auxv), offsetof(struct mm_struct, saved_auxv),
sizeof_field(struct mm_struct, saved_auxv), sizeof_field(struct mm_struct, saved_auxv),
NULL); NULL);
@ -72,10 +72,10 @@ index a5d21c42acfc..bdc0c9a07ae8 100644
nsproxy_cache_init(); nsproxy_cache_init();
} }
diff --git a/mm/rmap.c b/mm/rmap.c diff --git a/mm/rmap.c b/mm/rmap.c
index 8d5337fed37b..95e2be039402 100644 index 0454ecc29537..c452a12e6f01 100644
--- a/mm/rmap.c --- a/mm/rmap.c
+++ b/mm/rmap.c +++ b/mm/rmap.c
@@ -431,10 +431,10 @@ static void anon_vma_ctor(void *data) @@ -432,10 +432,10 @@ static void anon_vma_ctor(void *data)
void __init anon_vma_init(void) void __init anon_vma_init(void)
{ {
anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma), anon_vma_cachep = kmem_cache_create("anon_vma", sizeof(struct anon_vma),
@ -89,10 +89,10 @@ index 8d5337fed37b..95e2be039402 100644
/* /*
diff --git a/mm/slab.c b/mm/slab.c diff --git a/mm/slab.c b/mm/slab.c
index 2f308253c3d7..9cb22d666f59 100644 index 91c1863df93d..56a4fe8f6207 100644
--- a/mm/slab.c --- a/mm/slab.c
+++ b/mm/slab.c +++ b/mm/slab.c
@@ -3507,6 +3507,17 @@ void ___cache_free(struct kmem_cache *cachep, void *objp, @@ -3503,6 +3503,17 @@ void ___cache_free(struct kmem_cache *cachep, void *objp,
struct array_cache *ac = cpu_cache_get(cachep); struct array_cache *ac = cpu_cache_get(cachep);
check_irq_off(); check_irq_off();
@ -111,7 +111,7 @@ index 2f308253c3d7..9cb22d666f59 100644
objp = cache_free_debugcheck(cachep, objp, caller); objp = cache_free_debugcheck(cachep, objp, caller);
diff --git a/mm/slab.h b/mm/slab.h diff --git a/mm/slab.h b/mm/slab.h
index 68bdf498da3b..d3ba8f16b155 100644 index 384105318779..930c8c21a8e9 100644
--- a/mm/slab.h --- a/mm/slab.h
+++ b/mm/slab.h +++ b/mm/slab.h
@@ -80,6 +80,15 @@ extern const struct kmalloc_info_struct { @@ -80,6 +80,15 @@ extern const struct kmalloc_info_struct {
@ -131,7 +131,7 @@ index 68bdf498da3b..d3ba8f16b155 100644
/* Kmalloc array related functions */ /* Kmalloc array related functions */
void setup_kmalloc_cache_index_table(void); void setup_kmalloc_cache_index_table(void);
diff --git a/mm/slab_common.c b/mm/slab_common.c diff --git a/mm/slab_common.c b/mm/slab_common.c
index 65408ced18f1..fa458ea26e52 100644 index f9d89c1b5977..1b25483a758b 100644
--- a/mm/slab_common.c --- a/mm/slab_common.c
+++ b/mm/slab_common.c +++ b/mm/slab_common.c
@@ -58,7 +58,11 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work, @@ -58,7 +58,11 @@ static DECLARE_WORK(slab_caches_to_rcu_destroy_work,
@ -167,7 +167,7 @@ index 65408ced18f1..fa458ea26e52 100644
#ifdef CONFIG_DEBUG_VM #ifdef CONFIG_DEBUG_VM
static int kmem_cache_sanity_check(const char *name, unsigned int size) static int kmem_cache_sanity_check(const char *name, unsigned int size)
{ {
@@ -291,7 +309,11 @@ static unsigned int calculate_alignment(slab_flags_t flags, @@ -292,7 +310,11 @@ static unsigned int calculate_alignment(slab_flags_t flags,
*/ */
int slab_unmergeable(struct kmem_cache *s) int slab_unmergeable(struct kmem_cache *s)
{ {
@ -180,7 +180,7 @@ index 65408ced18f1..fa458ea26e52 100644
return 1; return 1;
if (!is_root_cache(s)) if (!is_root_cache(s))
@@ -317,7 +339,11 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align, @@ -318,7 +340,11 @@ struct kmem_cache *find_mergeable(unsigned int size, unsigned int align,
{ {
struct kmem_cache *s; struct kmem_cache *s;
@ -193,7 +193,7 @@ index 65408ced18f1..fa458ea26e52 100644
return NULL; return NULL;
if (ctor) if (ctor)
@@ -467,6 +493,11 @@ kmem_cache_create_usercopy(const char *name, @@ -470,6 +496,11 @@ kmem_cache_create_usercopy(const char *name,
*/ */
flags &= CACHE_CREATE_MASK; flags &= CACHE_CREATE_MASK;
@ -206,7 +206,7 @@ index 65408ced18f1..fa458ea26e52 100644
if (WARN_ON(!usersize && useroffset) || if (WARN_ON(!usersize && useroffset) ||
WARN_ON(size < usersize || size - usersize < useroffset)) WARN_ON(size < usersize || size - usersize < useroffset))
diff --git a/mm/slob.c b/mm/slob.c diff --git a/mm/slob.c b/mm/slob.c
index 623e8a5c46ce..1f2985096f84 100644 index 307c2c9feb44..2356d7787c5a 100644
--- a/mm/slob.c --- a/mm/slob.c
+++ b/mm/slob.c +++ b/mm/slob.c
@@ -366,6 +366,11 @@ static void slob_free(void *block, int size) @@ -366,6 +366,11 @@ static void slob_free(void *block, int size)
@ -222,10 +222,10 @@ index 623e8a5c46ce..1f2985096f84 100644
/* This slob page is about to become partially free. Easy! */ /* This slob page is about to become partially free. Easy! */
sp->units = units; sp->units = units;
diff --git a/mm/slub.c b/mm/slub.c diff --git a/mm/slub.c b/mm/slub.c
index 613c8dc2f409..3ae38641924a 100644 index dc777761b6b7..88ed9719a1db 100644
--- a/mm/slub.c --- a/mm/slub.c
+++ b/mm/slub.c +++ b/mm/slub.c
@@ -2985,8 +2985,25 @@ static __always_inline void slab_free(struct kmem_cache *s, struct page *page, @@ -3002,8 +3002,25 @@ static __always_inline void slab_free(struct kmem_cache *s, struct page *page,
* With KASAN enabled slab_free_freelist_hook modifies the freelist * With KASAN enabled slab_free_freelist_hook modifies the freelist
* to remove objects, whose reuse must be delayed. * to remove objects, whose reuse must be delayed.
*/ */
@ -251,8 +251,8 @@ index 613c8dc2f409..3ae38641924a 100644
+ } + }
} }
#ifdef CONFIG_KASAN #ifdef CONFIG_KASAN_GENERIC
@@ -3512,6 +3529,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order) @@ -3529,6 +3546,9 @@ static int calculate_sizes(struct kmem_cache *s, int forced_order)
s->inuse = size; s->inuse = size;
if (((flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON)) || if (((flags & (SLAB_TYPESAFE_BY_RCU | SLAB_POISON)) ||
@ -263,10 +263,10 @@ index 613c8dc2f409..3ae38641924a 100644
/* /*
* Relocate free pointer after the object if it is not * Relocate free pointer after the object if it is not
diff --git a/net/core/skbuff.c b/net/core/skbuff.c diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 345b51837ca8..a2888903091d 100644 index 2415d9cb9b89..b855e700f059 100644
--- a/net/core/skbuff.c --- a/net/core/skbuff.c
+++ b/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -3917,14 +3917,14 @@ void __init skb_init(void) @@ -3949,14 +3949,14 @@ void __init skb_init(void)
skbuff_head_cache = kmem_cache_create_usercopy("skbuff_head_cache", skbuff_head_cache = kmem_cache_create_usercopy("skbuff_head_cache",
sizeof(struct sk_buff), sizeof(struct sk_buff),
0, 0,
@ -281,15 +281,15 @@ index 345b51837ca8..a2888903091d 100644
- SLAB_HWCACHE_ALIGN|SLAB_PANIC, - SLAB_HWCACHE_ALIGN|SLAB_PANIC,
+ SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NO_SANITIZE, + SLAB_HWCACHE_ALIGN|SLAB_PANIC|SLAB_NO_SANITIZE,
NULL); NULL);
skb_extensions_init();
} }
diff --git a/security/Kconfig b/security/Kconfig diff --git a/security/Kconfig b/security/Kconfig
index c4302067a3ad..0846636e8b96 100644 index aaf50403a138..cda44eeefff0 100644
--- a/security/Kconfig --- a/security/Kconfig
+++ b/security/Kconfig +++ b/security/Kconfig
@@ -6,6 +6,37 @@ menu "Security options" @@ -6,6 +6,37 @@ menu "Security options"
source security/keys/Kconfig source "security/keys/Kconfig"
+menu "Miscellaneous hardening features" +menu "Miscellaneous hardening features"
+ +