[packages/kernel] - up to 4.8.0; esfq disabled (unmaintained); builds without imq

arekm arekm at pld-linux.org
Wed Oct 5 20:51:51 CEST 2016


commit 746b5ec83b36aa06545622d4109e63f0fc911b03
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Oct 5 20:51:43 2016 +0200

    - up to 4.8.0; esfq disabled (unmaintained); builds without imq

 kernel-apparmor.patch    | 998 -----------------------------------------------
 kernel-imq.patch         |   2 +-
 kernel-layer7.patch      |  11 +-
 kernel-multiarch.config  | 511 ++++++++++++++++--------
 kernel-small_fixes.patch |   1 +
 kernel.spec              |  10 +-
 6 files changed, 368 insertions(+), 1165 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index a691ddc..98d91a8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -27,7 +27,7 @@
 %bcond_with	nfsroot		# build with root on NFS support
 
 %bcond_without	imq		# imq support
-%bcond_without	esfq		# esfq support
+%bcond_with	esfq		# esfq support
 %bcond_without	ipv6		# ipv6 support
 
 %bcond_with	vserver		# support for VServer
@@ -68,9 +68,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		4.7
-%define		postver		.6
+%define		rel		0.1
+%define		basever		4.8
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -116,7 +116,7 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	5276563eb1f39a048e4a8a887408c031
+# Source0-md5:	c1af0afbd3df35c1ccdc7a5118cd2d07
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
 # Patch0-md5:	e0d02f6c4d6b600b91c3492c5cc825a3
diff --git a/kernel-apparmor.patch b/kernel-apparmor.patch
index 29fa055..4a5cc80 100644
--- a/kernel-apparmor.patch
+++ b/kernel-apparmor.patch
@@ -1,1001 +1,3 @@
-commit 5ea33f587f5f7324c40c5986286d0f38307923bb
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Mon Apr 11 16:55:10 2016 -0700
-
-    apparmor: fix refcount bug in profile replacement
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index 705c287..222052f 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -1189,12 +1189,12 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- 				aa_get_profile(newest);
- 				aa_put_profile(parent);
- 				rcu_assign_pointer(ent->new->parent, newest);
--			} else
--				aa_put_profile(newest);
-+			}
- 			/* aafs interface uses replacedby */
- 			rcu_assign_pointer(ent->new->replacedby->profile,
- 					   aa_get_profile(ent->new));
- 			__list_add_profile(&parent->base.profiles, ent->new);
-+			aa_put_profile(newest);
- 		} else {
- 			/* aafs interface uses replacedby */
- 			rcu_assign_pointer(ent->new->replacedby->profile,
-
-commit f65b1c9b72442e6166332c04f332e4b4d4797887
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Mon Apr 11 16:57:19 2016 -0700
-
-    apparmor: fix replacement bug that adds new child to old parent
-    
-    When set atomic replacement is used and the parent is updated before the
-    child, and the child did not exist in the old parent so there is no
-    direct replacement then the new child is incorrectly added to the old
-    parent. This results in the new parent not having the child(ren) that
-    it should and the old parent when being destroyed asserting the
-    following error.
-    
-    AppArmor: policy_destroy: internal error, policy '<profile/name>' still
-    contains profiles
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index 222052f..c92a9f6 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -1193,7 +1193,7 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- 			/* aafs interface uses replacedby */
- 			rcu_assign_pointer(ent->new->replacedby->profile,
- 					   aa_get_profile(ent->new));
--			__list_add_profile(&parent->base.profiles, ent->new);
-+			__list_add_profile(&newest->base.profiles, ent->new);
- 			aa_put_profile(newest);
- 		} else {
- 			/* aafs interface uses replacedby */
-
-commit b6669bef20c9d934bc6498e79fffa220f6226518
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Sun Jun 8 11:20:54 2014 -0700
-
-    apparmor: fix uninitialized lsm_audit member
-    
-    BugLink: http://bugs.launchpad.net/bugs/1268727
-    
-    The task field in the lsm_audit struct needs to be initialized if
-    a change_hat fails, otherwise the following oops will occur
-    
-    BUG: unable to handle kernel paging request at 0000002fbead7d08
-    IP: [<ffffffff8171153e>] _raw_spin_lock+0xe/0x50
-    PGD 1e3f35067 PUD 0
-    Oops: 0002 [#1] SMP
-    Modules linked in: pppox crc_ccitt p8023 p8022 psnap llc ax25 btrfs raid6_pq xor xfs libcrc32c dm_multipath scsi_dh kvm_amd dcdbas kvm microcode amd64_edac_mod joydev edac_core psmouse edac_mce_amd serio_raw k10temp sp5100_tco i2c_piix4 ipmi_si ipmi_msghandler acpi_power_meter mac_hid lp parport hid_generic usbhid hid pata_acpi mpt2sas ahci raid_class pata_atiixp bnx2 libahci scsi_transport_sas [last unloaded: tipc]
-    CPU: 2 PID: 699 Comm: changehat_twice Tainted: GF          O 3.13.0-7-generic #25-Ubuntu
-    Hardware name: Dell Inc. PowerEdge R415/08WNM9, BIOS 1.8.6 12/06/2011
-    task: ffff8802135c6000 ti: ffff880212986000 task.ti: ffff880212986000
-    RIP: 0010:[<ffffffff8171153e>]  [<ffffffff8171153e>] _raw_spin_lock+0xe/0x50
-    RSP: 0018:ffff880212987b68  EFLAGS: 00010006
-    RAX: 0000000000020000 RBX: 0000002fbead7500 RCX: 0000000000000000
-    RDX: 0000000000000292 RSI: ffff880212987ba8 RDI: 0000002fbead7d08
-    RBP: ffff880212987b68 R08: 0000000000000246 R09: ffff880216e572a0
-    R10: ffffffff815fd677 R11: ffffea0008469580 R12: ffffffff8130966f
-    R13: ffff880212987ba8 R14: 0000002fbead7d08 R15: ffff8800d8c6b830
-    FS:  00002b5e6c84e7c0(0000) GS:ffff880216e40000(0000) knlGS:0000000055731700
-    CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
-    CR2: 0000002fbead7d08 CR3: 000000021270f000 CR4: 00000000000006e0
-    Stack:
-     ffff880212987b98 ffffffff81075f17 ffffffff8130966f 0000000000000009
-     0000000000000000 0000000000000000 ffff880212987bd0 ffffffff81075f7c
-     0000000000000292 ffff880212987c08 ffff8800d8c6b800 0000000000000026
-    Call Trace:
-     [<ffffffff81075f17>] __lock_task_sighand+0x47/0x80
-     [<ffffffff8130966f>] ? apparmor_cred_prepare+0x2f/0x50
-     [<ffffffff81075f7c>] do_send_sig_info+0x2c/0x80
-     [<ffffffff81075fee>] send_sig_info+0x1e/0x30
-     [<ffffffff8130242d>] aa_audit+0x13d/0x190
-     [<ffffffff8130c1dc>] aa_audit_file+0xbc/0x130
-     [<ffffffff8130966f>] ? apparmor_cred_prepare+0x2f/0x50
-     [<ffffffff81304cc2>] aa_change_hat+0x202/0x530
-     [<ffffffff81308fc6>] aa_setprocattr_changehat+0x116/0x1d0
-     [<ffffffff8130a11d>] apparmor_setprocattr+0x25d/0x300
-     [<ffffffff812cee56>] security_setprocattr+0x16/0x20
-     [<ffffffff8121fc87>] proc_pid_attr_write+0x107/0x130
-     [<ffffffff811b7604>] vfs_write+0xb4/0x1f0
-     [<ffffffff811b8039>] SyS_write+0x49/0xa0
-     [<ffffffff8171a1bf>] tracesys+0xe1/0xe6
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
-index 89c7865..3a7f1da 100644
---- a/security/apparmor/audit.c
-+++ b/security/apparmor/audit.c
-@@ -200,7 +200,8 @@ int aa_audit(int type, struct aa_profile *profile, gfp_t gfp,
- 
- 	if (sa->aad->type == AUDIT_APPARMOR_KILL)
- 		(void)send_sig_info(SIGKILL, NULL,
--				    sa->u.tsk ?  sa->u.tsk : current);
-+			sa->type == LSM_AUDIT_DATA_TASK && sa->u.tsk ?
-+				    sa->u.tsk : current);
- 
- 	if (sa->aad->type == AUDIT_APPARMOR_ALLOWED)
- 		return complain_error(sa->aad->error);
-diff --git a/security/apparmor/file.c b/security/apparmor/file.c
-index d186674..4d2af4b 100644
---- a/security/apparmor/file.c
-+++ b/security/apparmor/file.c
-@@ -110,7 +110,8 @@ int aa_audit_file(struct aa_profile *profile, struct file_perms *perms,
- 	int type = AUDIT_APPARMOR_AUTO;
- 	struct common_audit_data sa;
- 	struct apparmor_audit_data aad = {0,};
--	sa.type = LSM_AUDIT_DATA_NONE;
-+	sa.type = LSM_AUDIT_DATA_TASK;
-+	sa.u.tsk = NULL;
- 	sa.aad = &aad;
- 	aad.op = op,
- 	aad.fs.request = request;
-
-commit aeab4cbfb86d0faeeb709e8201672e0662aa2c6f
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Fri Jul 25 04:02:03 2014 -0700
-
-    apparmor: exec should not be returning ENOENT when it denies
-    
-    The current behavior is confusing as it causes exec failures to report
-    the executable is missing instead of identifying that apparmor
-    caused the failure.
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
-index dc0027b..67a7418 100644
---- a/security/apparmor/domain.c
-+++ b/security/apparmor/domain.c
-@@ -433,7 +433,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 				new_profile = aa_get_newest_profile(ns->unconfined);
- 				info = "ux fallback";
- 			} else {
--				error = -ENOENT;
-+				error = -EACCES;
- 				info = "profile not found";
- 				/* remove MAY_EXEC to audit as failure */
- 				perms.allow &= ~MAY_EXEC;
-
-commit 752e4263021d90cf23c262f2fd3ebfd6dbccd455
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Fri Jul 25 04:01:56 2014 -0700
-
-    apparmor: fix update the mtime of the profile file on replacement
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index ad4fa49..45a6199 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -379,6 +379,8 @@ void __aa_fs_profile_migrate_dents(struct aa_profile *old,
- 
- 	for (i = 0; i < AAFS_PROF_SIZEOF; i++) {
- 		new->dents[i] = old->dents[i];
-+		if (new->dents[i])
-+			new->dents[i]->d_inode->i_mtime = CURRENT_TIME;
- 		old->dents[i] = NULL;
- 	}
- }
-
-commit 0c67233b18406dc7a8629faf8f9452feace6fb13
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Fri Jul 25 04:02:08 2014 -0700
-
-    apparmor: fix disconnected bind mnts reconnection
-    
-    Bind mounts can fail to be properly reconnected when PATH_CONNECT is
-    specified. Ensure that when PATH_CONNECT is specified the path has
-    a root.
-    
-    BugLink: http://bugs.launchpad.net/bugs/1319984
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/path.c b/security/apparmor/path.c
-index edddc02..f261678 100644
---- a/security/apparmor/path.c
-+++ b/security/apparmor/path.c
-@@ -141,7 +141,10 @@ static int d_namespace_path(const struct path *path, char *buf, int buflen,
- 			error = -EACCES;
- 			if (*res == '/')
- 				*name = res + 1;
--		}
-+		} else if (*res != '/')
-+			/* CONNECT_PATH with missing root */
-+			error = prepend(name, *name - buf, "/", 1);
-+
- 	}
- 
- out:
-
-commit 30c2b759b4f456e97e859ca550666c8abe84ff3c
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Fri Jul 25 04:02:10 2014 -0700
-
-    apparmor: internal paths should be treated as disconnected
-    
-    Internal mounts are not mounted anywhere and as such should be treated
-    as disconnected paths.
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/path.c b/security/apparmor/path.c
-index f261678..a8fc7d0 100644
---- a/security/apparmor/path.c
-+++ b/security/apparmor/path.c
-@@ -25,7 +25,6 @@
- #include "include/path.h"
- #include "include/policy.h"
- 
--
- /* modified from dcache.c */
- static int prepend(char **buffer, int buflen, const char *str, int namelen)
- {
-@@ -39,6 +38,38 @@ static int prepend(char **buffer, int buflen, const char *str, int namelen)
- 
- #define CHROOT_NSCONNECT (PATH_CHROOT_REL | PATH_CHROOT_NSCONNECT)
- 
-+/* If the path is not connected to the expected root,
-+ * check if it is a sysctl and handle specially else remove any
-+ * leading / that __d_path may have returned.
-+ * Unless
-+ *     specifically directed to connect the path,
-+ * OR
-+ *     if in a chroot and doing chroot relative paths and the path
-+ *     resolves to the namespace root (would be connected outside
-+ *     of chroot) and specifically directed to connect paths to
-+ *     namespace root.
-+ */
-+static int disconnect(const struct path *path, char *buf, char **name,
-+		      int flags)
-+{
-+	int error = 0;
-+
-+	if (!(flags & PATH_CONNECT_PATH) &&
-+	    !(((flags & CHROOT_NSCONNECT) == CHROOT_NSCONNECT) &&
-+	      our_mnt(path->mnt))) {
-+		/* disconnected path, don't return pathname starting
-+		 * with '/'
-+		 */
-+		error = -EACCES;
-+		if (**name == '/')
-+			*name = *name + 1;
-+	} else if (**name != '/')
-+		/* CONNECT_PATH with missing root */
-+		error = prepend(name, *name - buf, "/", 1);
-+
-+	return error;
-+}
-+
- /**
-  * d_namespace_path - lookup a name associated with a given path
-  * @path: path to lookup  (NOT NULL)
-@@ -74,7 +105,8 @@ static int d_namespace_path(const struct path *path, char *buf, int buflen,
- 			 * control instead of hard coded /proc
- 			 */
- 			return prepend(name, *name - buf, "/proc", 5);
--		}
-+		} else
-+			return disconnect(path, buf, name, flags);
- 		return 0;
- 	}
- 
-@@ -120,32 +152,8 @@ static int d_namespace_path(const struct path *path, char *buf, int buflen,
- 			goto out;
- 	}
- 
--	/* If the path is not connected to the expected root,
--	 * check if it is a sysctl and handle specially else remove any
--	 * leading / that __d_path may have returned.
--	 * Unless
--	 *     specifically directed to connect the path,
--	 * OR
--	 *     if in a chroot and doing chroot relative paths and the path
--	 *     resolves to the namespace root (would be connected outside
--	 *     of chroot) and specifically directed to connect paths to
--	 *     namespace root.
--	 */
--	if (!connected) {
--		if (!(flags & PATH_CONNECT_PATH) &&
--			   !(((flags & CHROOT_NSCONNECT) == CHROOT_NSCONNECT) &&
--			     our_mnt(path->mnt))) {
--			/* disconnected path, don't return pathname starting
--			 * with '/'
--			 */
--			error = -EACCES;
--			if (*res == '/')
--				*name = res + 1;
--		} else if (*res != '/')
--			/* CONNECT_PATH with missing root */
--			error = prepend(name, *name - buf, "/", 1);
--
--	}
-+	if (!connected)
-+		error = disconnect(path, buf, name, flags);
- 
- out:
- 	return error;
-
-commit 35f89b597a40c870f93a068bc92a7ef4f9b16a66
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Sat Apr 16 13:59:02 2016 -0700
-
-    apparmor: fix put() parent ref after updating the active ref
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index c92a9f6..455c9f8 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -1187,8 +1187,8 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- 			/* parent replaced in this atomic set? */
- 			if (newest != parent) {
- 				aa_get_profile(newest);
--				aa_put_profile(parent);
- 				rcu_assign_pointer(ent->new->parent, newest);
-+				aa_put_profile(parent);
- 			}
- 			/* aafs interface uses replacedby */
- 			rcu_assign_pointer(ent->new->replacedby->profile,
-
-commit 7b1ec6a04ca57fabe250f1102f2803dea7fbd03b
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Sat Apr 16 14:16:50 2016 -0700
-
-    apparmor: fix log failures for all profiles in a set
-    
-    currently only the profile that is causing the failure is logged. This
-    makes it more confusing than necessary about which profiles loaded
-    and which didn't. So make sure to log success and failure messages for
-    all profiles in the set being loaded.
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index 455c9f8..db31bc5 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -1067,7 +1067,7 @@ static int __lookup_replace(struct aa_namespace *ns, const char *hname,
-  */
- ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- {
--	const char *ns_name, *name = NULL, *info = NULL;
-+	const char *ns_name, *info = NULL;
- 	struct aa_namespace *ns = NULL;
- 	struct aa_load_ent *ent, *tmp;
- 	int op = OP_PROF_REPL;
-@@ -1082,18 +1082,15 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- 	/* released below */
- 	ns = aa_prepare_namespace(ns_name);
- 	if (!ns) {
--		info = "failed to prepare namespace";
--		error = -ENOMEM;
--		name = ns_name;
--		goto fail;
-+		error = audit_policy(op, GFP_KERNEL, ns_name,
-+				     "failed to prepare namespace", -ENOMEM);
-+		goto free;
- 	}
- 
- 	mutex_lock(&ns->lock);
- 	/* setup parent and ns info */
- 	list_for_each_entry(ent, &lh, list) {
- 		struct aa_policy *policy;
--
--		name = ent->new->base.hname;
- 		error = __lookup_replace(ns, ent->new->base.hname, noreplace,
- 					 &ent->old, &info);
- 		if (error)
-@@ -1121,7 +1118,6 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- 			if (!p) {
- 				error = -ENOENT;
- 				info = "parent does not exist";
--				name = ent->new->base.hname;
- 				goto fail_lock;
- 			}
- 			rcu_assign_pointer(ent->new->parent, aa_get_profile(p));
-@@ -1214,9 +1210,22 @@ out:
- 
- fail_lock:
- 	mutex_unlock(&ns->lock);
--fail:
--	error = audit_policy(op, GFP_KERNEL, name, info, error);
- 
-+	/* audit cause of failure */
-+	op = (!ent->old) ? OP_PROF_LOAD : OP_PROF_REPL;
-+	audit_policy(op, GFP_KERNEL, ent->new->base.hname, info, error);
-+	/* audit status that rest of profiles in the atomic set failed too */
-+	info = "valid profile in failed atomic policy load";
-+	list_for_each_entry(tmp, &lh, list) {
-+		if (tmp == ent) {
-+			info = "unchecked profile in failed atomic policy load";
-+			/* skip entry that caused failure */
-+			continue;
-+		}
-+		op = (!ent->old) ? OP_PROF_LOAD : OP_PROF_REPL;
-+		audit_policy(op, GFP_KERNEL, tmp->new->base.hname, info, error);
-+	}
-+free:
- 	list_for_each_entry_safe(ent, tmp, &lh, list) {
- 		list_del_init(&ent->list);
- 		aa_load_ent_free(ent);
-
-commit 4c475747a31b0637f0d47cb9bddaf2c6efb02854
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Sat Apr 16 14:19:38 2016 -0700
-
-    apparmor: fix audit full profile hname on successful load
-    
-    Currently logging of a successful profile load only logs the basename
-    of the profile. This can result in confusion when a child profile has
-    the same name as the another profile in the set. Logging the hname
-    will ensure there is no confusion.
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index db31bc5..ca402d0 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -1159,7 +1159,7 @@ ssize_t aa_replace_profiles(void *udata, size_t size, bool noreplace)
- 		list_del_init(&ent->list);
- 		op = (!ent->old && !ent->rename) ? OP_PROF_LOAD : OP_PROF_REPL;
- 
--		audit_policy(op, GFP_ATOMIC, ent->new->base.name, NULL, error);
-+		audit_policy(op, GFP_ATOMIC, ent->new->base.hname, NULL, error);
- 
- 		if (ent->old) {
- 			__replace_profile(ent->old, ent->new, 1);
-
-commit 430741dd766291d2e618b04e918ee6da844c230a
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Wed Apr 20 14:18:18 2016 -0700
-
-    apparmor: ensure the target profile name is always audited
-    
-    The target profile name was not being correctly audited in a few
-    cases because the target variable was not being set and gotos
-    passed the code to set it at apply:
-    
-    Since it is always based on new_profile just drop the target var
-    and conditionally report based on new_profile.
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
-index 67a7418..fc3036b 100644
---- a/security/apparmor/domain.c
-+++ b/security/apparmor/domain.c
-@@ -346,7 +346,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 		file_inode(bprm->file)->i_uid,
- 		file_inode(bprm->file)->i_mode
- 	};
--	const char *name = NULL, *target = NULL, *info = NULL;
-+	const char *name = NULL, *info = NULL;
- 	int error = 0;
- 
- 	if (bprm->cred_prepared)
-@@ -399,6 +399,7 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 	if (cxt->onexec) {
- 		struct file_perms cp;
- 		info = "change_profile onexec";
-+		new_profile = aa_get_newest_profile(cxt->onexec);
- 		if (!(perms.allow & AA_MAY_ONEXEC))
- 			goto audit;
- 
-@@ -413,7 +414,6 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 
- 		if (!(cp.allow & AA_MAY_ONEXEC))
- 			goto audit;
--		new_profile = aa_get_newest_profile(cxt->onexec);
- 		goto apply;
- 	}
- 
-@@ -445,10 +445,8 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 		if (!new_profile) {
- 			error = -ENOMEM;
- 			info = "could not create null profile";
--		} else {
-+		} else
- 			error = -EACCES;
--			target = new_profile->base.hname;
--		}
- 		perms.xindex |= AA_X_UNSAFE;
- 	} else
- 		/* fail exec */
-@@ -459,7 +457,6 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 	 * fail the exec.
- 	 */
- 	if (bprm->unsafe & LSM_UNSAFE_NO_NEW_PRIVS) {
--		aa_put_profile(new_profile);
- 		error = -EPERM;
- 		goto cleanup;
- 	}
-@@ -474,10 +471,8 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 
- 	if (bprm->unsafe & (LSM_UNSAFE_PTRACE | LSM_UNSAFE_PTRACE_CAP)) {
- 		error = may_change_ptraced_domain(new_profile);
--		if (error) {
--			aa_put_profile(new_profile);
-+		if (error)
- 			goto audit;
--		}
- 	}
- 
- 	/* Determine if secure exec is needed.
-@@ -498,7 +493,6 @@ int apparmor_bprm_set_creds(struct linux_binprm *bprm)
- 		bprm->unsafe |= AA_SECURE_X_NEEDED;
- 	}
- apply:
--	target = new_profile->base.hname;
- 	/* when transitioning profiles clear unsafe personality bits */
- 	bprm->per_clear |= PER_CLEAR_ON_SETID;
- 
-@@ -506,15 +500,19 @@ x_clear:
- 	aa_put_profile(cxt->profile);
- 	/* transfer new profile reference will be released when cxt is freed */
- 	cxt->profile = new_profile;
-+	new_profile = NULL;
- 
- 	/* clear out all temporary/transitional state from the context */
- 	aa_clear_task_cxt_trans(cxt);
- 
- audit:
- 	error = aa_audit_file(profile, &perms, GFP_KERNEL, OP_EXEC, MAY_EXEC,
--			      name, target, cond.uid, info, error);
-+			      name,
-+			      new_profile ? new_profile->base.hname : NULL,
-+			      cond.uid, info, error);
- 
- cleanup:
-+	aa_put_profile(new_profile);
- 	aa_put_profile(profile);
- 	kfree(buffer);
- 
-
-commit 06763d057300b3d5bbe1894acfe236cf193bab78
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Thu Mar 17 12:02:54 2016 -0700
-
-    apparmor: check that xindex is in trans_table bounds
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-    Acked-by: Seth Arnold <seth.arnold at canonical.com>
-
-diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
-index a689f10..c841b12 100644
---- a/security/apparmor/policy_unpack.c
-+++ b/security/apparmor/policy_unpack.c
-@@ -676,7 +676,7 @@ static bool verify_xindex(int xindex, int table_size)
- 	int index, xtype;
- 	xtype = xindex & AA_X_TYPE_MASK;
- 	index = xindex & AA_X_INDEX_MASK;
--	if (xtype == AA_X_TABLE && index > table_size)
-+	if (xtype == AA_X_TABLE && index >= table_size)
- 		return 0;
- 	return 1;
- }
-
-commit 5833ccff1227fbc8f1bab64351f6747a6c71bdeb
-Author: Geliang Tang <geliangtang at 163.com>
-Date:   Mon Nov 16 21:46:33 2015 +0800
-
-    apparmor: use list_next_entry instead of list_entry_next
-    
-    list_next_entry has been defined in list.h, so I replace list_entry_next
-    with it.
-    
-    Signed-off-by: Geliang Tang <geliangtang at 163.com>
-    Acked-by: Serge Hallyn <serge.hallyn at canonical.com>
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index 0d8dd71..729e595 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -553,8 +553,6 @@ fail2:
- }
- 
- 
--#define list_entry_next(pos, member) \
--	list_entry(pos->member.next, typeof(*pos), member)
- #define list_entry_is_head(pos, head, member) (&pos->member == (head))
- 
- /**
-@@ -585,7 +583,7 @@ static struct aa_namespace *__next_namespace(struct aa_namespace *root,
- 	parent = ns->parent;
- 	while (ns != root) {
- 		mutex_unlock(&ns->lock);
--		next = list_entry_next(ns, base.list);
-+		next = list_next_entry(ns, base.list);
- 		if (!list_entry_is_head(next, &parent->sub_ns, base.list)) {
- 			mutex_lock(&next->lock);
- 			return next;
-@@ -639,7 +637,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
- 	parent = rcu_dereference_protected(p->parent,
- 					   mutex_is_locked(&p->ns->lock));
- 	while (parent) {
--		p = list_entry_next(p, base.list);
-+		p = list_next_entry(p, base.list);
- 		if (!list_entry_is_head(p, &parent->base.profiles, base.list))
- 			return p;
- 		p = parent;
-@@ -648,7 +646,7 @@ static struct aa_profile *__next_profile(struct aa_profile *p)
- 	}
- 
- 	/* is next another profile in the namespace */
--	p = list_entry_next(p, base.list);
-+	p = list_next_entry(p, base.list);
- 	if (!list_entry_is_head(p, &ns->base.profiles, base.list))
- 		return p;
- 
-
-commit 645801f1ddd183109c011e5ecee23ed3fdcae244
-Author: Jeff Mahoney <jeffm at suse.com>
-Date:   Fri Nov 6 15:17:30 2015 -0500
-
-    apparmor: allow SYS_CAP_RESOURCE to be sufficient to prlimit another task
-    
-    While using AppArmor, SYS_CAP_RESOURCE is insufficient to call prlimit
-    on another task. The only other example of a AppArmor mediating access to
-    another, already running, task (ignoring fork+exec) is ptrace.
-    
-    The AppArmor model for ptrace is that one of the following must be true:
-    1) The tracer is unconfined
-    2) The tracer is in complain mode
-    3) The tracer and tracee are confined by the same profile
-    4) The tracer is confined but has SYS_CAP_PTRACE
-    
-    1), 2, and 3) are already true for setrlimit.
-    
-    We can match the ptrace model just by allowing CAP_SYS_RESOURCE.
-    
-    We still test the values of the rlimit since it can always be overridden
-    using a value that means unlimited for a particular resource.
-    
-    Signed-off-by: Jeff Mahoney <jeffm at suse.com>
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c
-index 748bf0c..67a6072 100644
---- a/security/apparmor/resource.c
-+++ b/security/apparmor/resource.c
-@@ -101,9 +101,11 @@ int aa_task_setrlimit(struct aa_profile *profile, struct task_struct *task,
- 	/* TODO: extend resource control to handle other (non current)
- 	 * profiles.  AppArmor rules currently have the implicit assumption
- 	 * that the task is setting the resource of a task confined with
--	 * the same profile.
-+	 * the same profile or that the task setting the resource of another
-+	 * task has CAP_SYS_RESOURCE.
- 	 */
--	if (profile != task_profile ||
-+	if ((profile != task_profile &&
-+	     aa_capable(profile, CAP_SYS_RESOURCE, 1)) ||
- 	    (profile->rlimits.mask & (1 << resource) &&
- 	     new_rlim->rlim_max > profile->rlimits.limits[resource].rlim_max))
- 		error = -EACCES;
-
-commit 2be4aed1f3332d87273eb593944332054f3cffac
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Thu Jun 2 02:37:02 2016 -0700
-
-    apparmor: add missing id bounds check on dfa verification
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/include/match.h b/security/apparmor/include/match.h
-index 001c43a..a1c04fe 100644
---- a/security/apparmor/include/match.h
-+++ b/security/apparmor/include/match.h
-@@ -62,6 +62,7 @@ struct table_set_header {
- #define YYTD_ID_ACCEPT2 6
- #define YYTD_ID_NXT	7
- #define YYTD_ID_TSIZE	8
-+#define YYTD_ID_MAX	8
- 
- #define YYTD_DATA8	1
- #define YYTD_DATA16	2
-diff --git a/security/apparmor/match.c b/security/apparmor/match.c
-index 727eb42..f9f57c6 100644
---- a/security/apparmor/match.c
-+++ b/security/apparmor/match.c
-@@ -47,6 +47,8 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
- 	 * it every time we use td_id as an index
- 	 */
- 	th.td_id = be16_to_cpu(*(u16 *) (blob)) - 1;
-+	if (th.td_id > YYTD_ID_MAX)
-+		goto out;
- 	th.td_flags = be16_to_cpu(*(u16 *) (blob + 2));
- 	th.td_lolen = be32_to_cpu(*(u32 *) (blob + 8));
- 	blob += sizeof(struct table_header);
-
-commit c7f87d3c3363b1a0c4724e627e5c8e640a883c89
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Wed Jun 15 09:57:55 2016 +0300
-
-    apparmor: don't check for vmalloc_addr if kvzalloc() failed
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/match.c b/security/apparmor/match.c
-index f9f57c6..32b72eb 100644
---- a/security/apparmor/match.c
-+++ b/security/apparmor/match.c
-@@ -75,14 +75,14 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
- 				     u32, be32_to_cpu);
- 		else
- 			goto fail;
-+		/* if table was vmalloced make sure the page tables are synced
-+		 * before it is used, as it goes live to all cpus.
-+		 */
-+		if (is_vmalloc_addr(table))
-+			vm_unmap_aliases();
- 	}
- 
- out:
--	/* if table was vmalloced make sure the page tables are synced
--	 * before it is used, as it goes live to all cpus.
--	 */
--	if (is_vmalloc_addr(table))
--		vm_unmap_aliases();
- 	return table;
- fail:
- 	kvfree(table);
-
-commit 0f7e61013dd1e67ebb54d58eee11ab009ceb5ef3
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Wed Jun 15 10:00:55 2016 +0300
-
-    apparmor: fix oops in profile_unpack() when policy_db is not present
-    
-    BugLink: http://bugs.launchpad.net/bugs/1592547
-    
-    If unpack_dfa() returns NULL due to the dfa not being present,
-    profile_unpack() is not checking if the dfa is not present (NULL).
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
-index c841b12..dac2121 100644
---- a/security/apparmor/policy_unpack.c
-+++ b/security/apparmor/policy_unpack.c
-@@ -583,6 +583,9 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
- 			error = PTR_ERR(profile->policy.dfa);
- 			profile->policy.dfa = NULL;
- 			goto fail;
-+		} else if (!profile->policy.dfa) {
-+			error = -EPROTO;
-+			goto fail;
- 		}
- 		if (!unpack_u32(e, &profile->policy.start[0], "start"))
- 			/* default start state */
-
-commit de4ca46ec035283928e8fa40797897cefcf6ec3e
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Wed Jun 22 18:01:08 2016 -0700
-
-    apparmor: fix module parameters can be changed after policy is locked
-    
-    the policy_lock parameter is a one way switch that prevents policy
-    from being further modified. Unfortunately some of the module parameters
-    can effectively modify policy by turning off enforcement.
-    
-    split policy_admin_capable into a view check and a full admin check,
-    and update the admin check to test the policy_lock parameter.
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
-index c28b0f2..52275f0 100644
---- a/security/apparmor/include/policy.h
-+++ b/security/apparmor/include/policy.h
-@@ -403,6 +403,8 @@ static inline int AUDIT_MODE(struct aa_profile *profile)
- 	return profile->audit;
- }
- 
-+bool policy_view_capable(void);
-+bool policy_admin_capable(void);
- bool aa_may_manage_policy(int op);
- 
- #endif /* __AA_POLICY_H */
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 7798e16..e83eefb 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -728,51 +728,49 @@ __setup("apparmor=", apparmor_enabled_setup);
- /* set global flag turning off the ability to load policy */
- static int param_set_aalockpolicy(const char *val, const struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_admin_capable())
- 		return -EPERM;
--	if (aa_g_lock_policy)
--		return -EACCES;
- 	return param_set_bool(val, kp);
- }
- 
- static int param_get_aalockpolicy(char *buffer, const struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_view_capable())
- 		return -EPERM;
- 	return param_get_bool(buffer, kp);
- }
- 
- static int param_set_aabool(const char *val, const struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_admin_capable())
- 		return -EPERM;
- 	return param_set_bool(val, kp);
- }
- 
- static int param_get_aabool(char *buffer, const struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_view_capable())
- 		return -EPERM;
- 	return param_get_bool(buffer, kp);
- }
- 
- static int param_set_aauint(const char *val, const struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_admin_capable())
- 		return -EPERM;
- 	return param_set_uint(val, kp);
- }
- 
- static int param_get_aauint(char *buffer, const struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_view_capable())
- 		return -EPERM;
- 	return param_get_uint(buffer, kp);
- }
- 
- static int param_get_audit(char *buffer, struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_view_capable())
- 		return -EPERM;
- 
- 	if (!apparmor_enabled)
-@@ -784,7 +782,7 @@ static int param_get_audit(char *buffer, struct kernel_param *kp)
- static int param_set_audit(const char *val, struct kernel_param *kp)
- {
- 	int i;
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_admin_capable())
- 		return -EPERM;
- 
- 	if (!apparmor_enabled)
-@@ -805,7 +803,7 @@ static int param_set_audit(const char *val, struct kernel_param *kp)
- 
- static int param_get_mode(char *buffer, struct kernel_param *kp)
- {
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_admin_capable())
- 		return -EPERM;
- 
- 	if (!apparmor_enabled)
-@@ -817,7 +815,7 @@ static int param_get_mode(char *buffer, struct kernel_param *kp)
- static int param_set_mode(const char *val, struct kernel_param *kp)
- {
- 	int i;
--	if (!capable(CAP_MAC_ADMIN))
-+	if (!policy_admin_capable())
- 		return -EPERM;
- 
- 	if (!apparmor_enabled)
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index 7807125..179e68d 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -918,6 +918,22 @@ static int audit_policy(int op, gfp_t gfp, const char *name, const char *info,
- 			&sa, NULL);
- }
- 
-+bool policy_view_capable(void)
-+{
-+	struct user_namespace *user_ns = current_user_ns();
-+	bool response = false;
-+
-+	if (ns_capable(user_ns, CAP_MAC_ADMIN))
-+		response = true;
-+
-+	return response;
-+}
-+
-+bool policy_admin_capable(void)
-+{
-+	return policy_view_capable() && !aa_g_lock_policy;
-+}
-+
- /**
-  * aa_may_manage_policy - can the current task manage policy
-  * @op: the policy manipulation operation being done
-@@ -932,7 +948,7 @@ bool aa_may_manage_policy(int op)
- 		return 0;
- 	}
- 
--	if (!capable(CAP_MAC_ADMIN)) {
-+	if (!policy_admin_capable()) {
- 		audit_policy(op, GFP_KERNEL, NULL, "not policy admin", -EACCES);
- 		return 0;
- 	}
-
-commit 46c339f46b83e4cf8098f599cd182e65e9d054fc
-Author: Heinrich Schuchardt <xypron.glpk at gmx.de>
-Date:   Fri Jun 10 23:34:26 2016 +0200
-
-    apparmor: do not expose kernel stack
-    
-    Do not copy uninitalized fields th.td_hilen, th.td_data.
-    
-    Signed-off-by: Heinrich Schuchardt <xypron.glpk at gmx.de>
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/match.c b/security/apparmor/match.c
-index 32b72eb..3f900fc 100644
---- a/security/apparmor/match.c
-+++ b/security/apparmor/match.c
-@@ -63,7 +63,9 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
- 
- 	table = kvzalloc(tsize);
- 	if (table) {
--		*table = th;
-+		table->td_id = th.td_id;
-+		table->td_flags = th.td_flags;
-+		table->td_lolen = th.td_lolen;
- 		if (th.td_flags == YYTD_DATA8)
- 			UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
- 				     u8, byte_to_byte);
-
-commit 7e65e8142b2ea4891581173d6e92fc337b02ff8b
-Author: John Johansen <john.johansen at canonical.com>
-Date:   Sat Jul 9 23:46:33 2016 -0700
-
-    apparmor: fix arg_size computation for when setprocattr is null terminated
-    
-    Signed-off-by: John Johansen <john.johansen at canonical.com>
-
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index e83eefb..ba8207b 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -529,7 +529,7 @@ static int apparmor_setprocattr(struct task_struct *task, char *name,
- 	if (!*args)
- 		goto out;
- 
--	arg_size = size - (args - (char *) value);
-+	arg_size = size - (args - (largs ? largs : (char *) value));
- 	if (strcmp(name, "current") == 0) {
- 		if (strcmp(command, "changehat") == 0) {
- 			error = aa_setprocattr_changehat(args, arg_size,
-
 commit b661b13237991be6b5cdf0849f137c5ec58217bf
 Author: John Johansen <john.johansen at canonical.com>
 Date:   Mon Oct 4 15:03:36 2010 -0700
diff --git a/kernel-imq.patch b/kernel-imq.patch
index b28cac4..cc4028b 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1255,9 +1255,9 @@ diff -Naupr linux-4.7_orig/net/core/dev.c linux-4.7/net/core/dev.c
 --- linux-4.7_orig/net/core/dev.c	2016-07-25 02:23:50.000000000 +0700
 +++ linux-4.7/net/core/dev.c	2016-07-26 20:58:55.642568359 +0700
 @@ -139,6 +139,9 @@
- #include <linux/hrtimer.h>
  #include <linux/netfilter_ingress.h>
  #include <linux/sctp.h>
+ #include <linux/crash_dump.h>
 +#if defined(CONFIG_IMQ) || defined(CONFIG_IMQ_MODULE)
 +#include <linux/imq.h>
 +#endif
diff --git a/kernel-layer7.patch b/kernel-layer7.patch
index 612c295..0701dbe 100644
--- a/kernel-layer7.patch
+++ b/kernel-layer7.patch
@@ -2081,12 +2081,13 @@
  	if (seq_has_overflowed(s))
 --- linux-2.6.28-stock/include/net/netfilter/nf_conntrack.h	2009-01-07 16:05:30.000000000 -0600
 +++ linux-2.6.28/include/net/netfilter/nf_conntrack.h	2009-01-07 16:07:31.000000000 -0600
-@@ -118,6 +118,22 @@ struct nf_conn
- 	struct net *ct_net;
+@@ -121,6 +121,23 @@ struct nf_conn {
+ #if IS_ENABLED(CONFIG_NF_NAT)
+ 	struct rhash_head	nat_bysource;
  #endif
- 
++
 +#if defined(CONFIG_NETFILTER_XT_MATCH_LAYER7) || \
-+    defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
++	defined(CONFIG_NETFILTER_XT_MATCH_LAYER7_MODULE)
 +	struct {
 +		/*
 +		 * e.g. "http". NULL before decision. "unknown" after decision
@@ -2103,7 +2104,7 @@
 +
  	/* Storage reserved for other modules, must be the last member */
  	union nf_conntrack_proto proto;
- 
+ };
 --- linux-2.6.28-stock/include/linux/netfilter/xt_layer7.h	1969-12-31 18:00:00.000000000 -0600
 +++ linux-2.6.28/include/linux/netfilter/xt_layer7.h	2009-01-07 16:07:31.000000000 -0600
 @@ -0,0 +1,13 @@
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 36efe3e..c2d10f4 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -2,7 +2,6 @@
 #-
 #- *** FILE: arch/* - ARCH SPECIFIC OPTIONS ***
 #-
-AMD_MCE_INJ all=m
 ARCH_MEMORY_PROBE all=n
 CC_STACKPROTECTOR all=y
 CC_STACKPROTECTOR_NONE all=n
@@ -15,6 +14,9 @@ DEBUG_WX all=y
 EARLY_PRINTK_EFI all=n
 EFI_MIXED all=y
 EFI_PGT_DUMP all=n
+GCC_PLUGINS all=y
+GCC_PLUGIN_CYC_COMPLEXITY all=n
+GEN_RTC all=n
 HAVE_STACK_VALIDATION all=y
 IOSF_MBI all=m
 IOSF_MBI_DEBUG all=y
@@ -22,8 +24,13 @@ KEXEC_FILE all=y
 KEXEC_VERIFY_SIG all=n
 KVM_DEBUG_FS all=n
 KVM_DEVICE_ASSIGNMENT all=y
+MCE_AMD_INJ all=m
 PERF_EVENTS_AMD_POWER all=m
+PERF_EVENTS_INTEL_CSTATE all=m
+PERF_EVENTS_INTEL_RAPL all=m
+PERF_EVENTS_INTEL_UNCORE all=m
 PUNIT_ATOM_DEBUG all=m
+RANDOMIZE_MEMORY all=y
 STATIC_KEYS_SELFTEST all=y
 X86_AMD_PLATFORM_DEVICE all=y
 X86_DEBUG_FPU all=n
@@ -94,6 +101,7 @@ SYSTEM_TRUSTED_KEYRING all=y
 SYSTEM_TRUSTED_KEYS all=""
 SYSTEM_EXTRA_CERTIFICATE all=y
 SYSTEM_EXTRA_CERTIFICATE_SIZE all=4096
+SECONDARY_TRUSTED_KEYRING all=y
 
 #-
 #- *** FILE: crypto/Kconfig ***
@@ -108,6 +116,8 @@ CRYPTO_BLKCIPHER all=m
 CRYPTO_HASH all=y
 CRYPTO_AKCIPHER all=y
 CRYPTO_RSA all=m
+CRYPTO_DH all=m
+CRYPTO_ECDH all=m
 CRYPTO_MANAGER all=y
 CRYPTO_USER all=m
 CRYPTO_MANAGER_DISABLE_TESTS all=y
@@ -160,8 +170,11 @@ CRYPTO_SHA1_SSSE3 all=m
 CRYPTO_SHA256_SSSE3 all=m
 CRYPTO_SHA512_SSSE3 all=m
 CRYPTO_SHA1_MB all=m
+CRYPTO_SHA256_MB all=m
+CRYPTO_SHA512_MB all=m
 CRYPTO_SHA256 all=y
 CRYPTO_SHA512 all=m
+CRYPTO_SHA3 all=m
 CRYPTO_TGR192 all=m
 CRYPTO_WP512 all=m
 CRYPTO_GHASH_CLMUL_NI_INTEL all=m
@@ -262,7 +275,7 @@ ACPI_THERMAL all=m
 ACPI_NUMA ia64=y x86_64=y
 ACPI_CUSTOM_DSDT_FILE all=""
 ACPI_CUSTOM_DSDT all=n
-ACPI_INITRD_TABLE_OVERRIDE all=y
+ACPI_TABLE_UPGRADE all=y
 ACPI_DEBUG all=n
 ACPI_PCI_SLOT all=y
 X86_PM_TIMER x86=y
@@ -270,10 +283,12 @@ ACPI_HOTPLUG_MEMORY all=y
 ACPI_SBS x86=m
 ACPI_CUSTOM_METHOD all=m
 ACPI_BGRT all=y
-ACPI_NFIT all=m
+#- file drivers/acpi/nfit/Kconfig goes here
 #- file drivers/acpi/apei/Kconfig goes here
+#- file drivers/acpi/dptf/Kconfig goes here
 ACPI_EXTLOG all=m
 PMIC_OPREGION all=y
+ACPI_CONFIGFS all=m
 
 #-
 #- *** FILE: drivers/acpi/apei/Kconfig ***
@@ -286,6 +301,16 @@ ACPI_APEI_EINJ all=m
 ACPI_APEI_ERST_DEBUG all=m
 
 #-
+#- *** FILE: drivers/acpi/dptf/Kconfig ***
+#-
+DPTF_POWER all=m
+
+#-
+#- *** FILE: drivers/acpi/nfit/Kconfig ***
+#-
+ACPI_NFIT all=m
+
+#-
 #- *** FILE: drivers/android/Kconfig ***
 #-
 ANDROID all=n
@@ -315,6 +340,9 @@ SATA_SX4 all=m sparc=n
 ATA_BMDMA all=y
 #- SATA SFF controllers with BMDMA
 ATA_PIIX all=m sparc=n
+SATA_DWC all=m
+SATA_DWC_OLD_DMA all=y
+SATA_DWC_DEBUG all=n
 SATA_HIGHBANK all=m
 SATA_MV all=m sparc=n
 SATA_NV all=m sparc=n
@@ -470,6 +498,7 @@ BCMA all=m
 BCMA_HOST_PCI_POSSIBLE all=y
 BCMA_HOST_PCI all=y
 BCMA_HOST_SOC all=y
+BCMA_SFLASH all=y
 BCMA_DRIVER_GMAC_CMN all=y
 BCMA_DRIVER_GPIO all=y
 BCMA_DEBUG all=n
@@ -558,7 +587,6 @@ PARIDE_ON26 all=m
 #- *** FILE: drivers/block/zram/Kconfig ***
 #-
 ZRAM all=m
-ZRAM_LZ4_COMPRESS all=y
 
 #-
 #- *** FILE: drivers/bluetooth/Kconfig ***
@@ -617,8 +645,6 @@ IBM_BSR ppc64=m
 NVRAM all=m
 RTC all=m sparc=n
 JS_RTC sparc=n
-GEN_RTC all=n
-GEN_RTC_X all=n
 EFI_RTC ia64=y
 DTLK all=m
 R3964 all=m
@@ -685,7 +711,6 @@ IPMI_HANDLER all=m
 IPMI_PANIC_EVENT all=n
 IPMI_DEVICE_INTERFACE all=m
 IPMI_SI all=m
-IPMI_SI_PROBE_DEFAULTS all=n
 IPMI_SSIF all=m
 IPMI_WATCHDOG all=m
 IPMI_POWEROFF all=m
@@ -705,6 +730,7 @@ IPWIRELESS all=m
 TCG_TPM all=m x86=y ia64=y
 #* TCG_TIS forced to 'y' by IMA
 TCG_TIS all=m x86=y ia64=y
+TCG_TIS_SPI all=m
 TCG_TIS_I2C_ATMEL all=m
 TCG_TIS_I2C_INFINEON all=m
 TCG_TIS_I2C_NUVOTON all=m
@@ -713,6 +739,7 @@ TCG_ATMEL all=m
 TCG_INFINEON all=m
 TCG_XEN all=m
 TCG_CRB all=m
+TCG_VTPM_PROXY all=m
 #- file drivers/char/tpm/st33zp24/Kconfig goes here
 
 #-
@@ -733,19 +760,30 @@ XILLYBUS_PCIE all=m
 #-
 COMMON_CLK_WM831X all=m
 #- file drivers/clk/versatile/Kconfig goes here
+COMMON_CLK_SCPI all=m
 COMMON_CLK_SI5351 all=m
 COMMON_CLK_CDCE706 all=m
 COMMON_CLK_CS2000_CP all=m
 COMMON_CLK_PWM all=m
+COMMON_CLK_OXNAS all=n
 #- file drivers/clk/bcm/Kconfig goes here
 #- file drivers/clk/hisilicon/Kconfig goes here
+#- file drivers/clk/meson/Kconfig goes here
 #- file drivers/clk/mvebu/Kconfig goes here
 #- file drivers/clk/qcom/Kconfig goes here
+#- file drivers/clk/renesas/Kconfig goes here
 #- file drivers/clk/samsung/Kconfig goes here
+#- file drivers/clk/sunxi-ng/Kconfig goes here
 #- file drivers/clk/tegra/Kconfig goes here
 #- file drivers/clk/ti/Kconfig goes here
 
 #-
+#- *** FILE: drivers/clk/sunxi-ng/Kconfig ***
+#-
+SUNXI_CCU all=y
+SUN8I_H3_CCU all=y
+
+#-
 #- *** FILE: drivers/connector/Kconfig ***
 #-
 CONNECTOR all=y
@@ -755,17 +793,19 @@ PROC_EVENTS all=y
 #- *** FILE: drivers/cpufreq/Kconfig ***
 #-
 CPU_FREQ all=y
-CPU_FREQ_STAT all=m
+CPU_FREQ_STAT all=y
 CPU_FREQ_STAT_DETAILS all=y
 CPU_FREQ_DEFAULT_GOV_PERFORMANCE all=y
 CPU_FREQ_DEFAULT_GOV_POWERSAVE all=n
 CPU_FREQ_DEFAULT_GOV_USERSPACE all=n
 CPU_FREQ_DEFAULT_GOV_ONDEMAND all=n
 CPU_FREQ_DEFAULT_GOV_CONSERVATIVE all=n
+CPU_FREQ_DEFAULT_GOV_SCHEDUTIL all=n
 CPU_FREQ_GOV_POWERSAVE all=m
 CPU_FREQ_GOV_USERSPACE all=m
 CPU_FREQ_GOV_ONDEMAND all=m
 CPU_FREQ_GOV_CONSERVATIVE all=m
+CPU_FREQ_GOV_SCHEDUTIL all=m
 #- CPU frequency scaling drivers
 #- file drivers/cpufreq/Kconfig.x86 goes here
 #- file drivers/cpufreq/Kconfig.arm goes here
@@ -824,6 +864,12 @@ CRYPTO_DEV_QAT_C3XXXVF all=m
 CRYPTO_DEV_QAT_C62XVF all=m
 
 #-
+#- *** FILE: drivers/dax/Kconfig ***
+#-
+DEV_DAX all=m
+DEV_DAX_PMEM all=m
+
+#-
 #- *** FILE: drivers/devfreq/Kconfig ***
 #-
 PM_DEVFREQ all=y
@@ -832,6 +878,7 @@ DEVFREQ_GOV_SIMPLE_ONDEMAND all=y
 DEVFREQ_GOV_PERFORMANCE all=y
 DEVFREQ_GOV_POWERSAVE all=y
 DEVFREQ_GOV_USERSPACE all=y
+DEVFREQ_GOV_PASSIVE all=m
 #- DEVFREQ Drivers
 #- file drivers/devfreq/event/Kconfig goes here
 
@@ -841,6 +888,11 @@ DEVFREQ_GOV_USERSPACE all=y
 PM_DEVFREQ_EVENT all=y
 
 #-
+#- *** FILE: drivers/dma-buf/Kconfig ***
+#-
+SYNC_FILE all=y
+
+#-
 #- *** FILE: drivers/dma/Kconfig ***
 #-
 DMADEVICES all=y
@@ -908,6 +960,7 @@ EDAC_I5000 i386=m x86_64=m
 EDAC_I5100 i386=m x86_64=m
 EDAC_I7300 all=m
 EDAC_SBRIDGE all=m
+EDAC_SKX all=m
 EDAC_PASEMI ppc64=m
 EDAC_CELL ppc64=m
 EDAC_AMD8131 powerpc=m
@@ -929,7 +982,9 @@ EXTCON_ADC_JACK all=m
 EXTCON_ARIZONA all=m
 EXTCON_AXP288 all=m
 EXTCON_GPIO all=m
+EXTCON_MAX14577 all=m
 EXTCON_MAX3355 all=m
+EXTCON_MAX77693 all=m
 EXTCON_RT8973A all=m
 EXTCON_SM5502 all=m
 EXTCON_USB_GPIO all=m
@@ -946,6 +1001,8 @@ FIREWIRE_NOSY all=m
 #-
 #- *** FILE: drivers/firmware/Kconfig ***
 #-
+ARM_SCPI_PROTOCOL all=m
+ARM_SCPI_POWER_DOMAIN all=m
 EDD i386=m x86_64=m
 EDD_OFF all=n
 FIRMWARE_MEMMAP all=y
@@ -970,6 +1027,8 @@ EFI_VARS_PSTORE all=m
 EFI_VARS_PSTORE_DEFAULT_DISABLE all=n
 EFI_RUNTIME_MAP all=y
 EFI_FAKE_MEMMAP all=n
+EFI_BOOTLOADER_CONTROL all=m
+EFI_CAPSULE_LOADER all=m
 
 #-
 #- *** FILE: drivers/firmware/google/Kconfig ***
@@ -1089,6 +1148,7 @@ DRM_VGEM all=m
 #- file drivers/gpu/drm/atmel-hlcdc/Kconfig goes here
 #- file drivers/gpu/drm/rcar-du/Kconfig goes here
 #- file drivers/gpu/drm/shmobile/Kconfig goes here
+#- file drivers/gpu/drm/sun4i/Kconfig goes here
 #- file drivers/gpu/drm/omapdrm/Kconfig goes here
 #- file drivers/gpu/drm/tilcdc/Kconfig goes here
 #- file drivers/gpu/drm/qxl/Kconfig goes here
@@ -1104,6 +1164,9 @@ DRM_VGEM all=m
 #- file drivers/gpu/drm/imx/Kconfig goes here
 #- file drivers/gpu/drm/vc4/Kconfig goes here
 #- file drivers/gpu/drm/etnaviv/Kconfig goes here
+#- file drivers/gpu/drm/arc/Kconfig goes here
+#- file drivers/gpu/drm/hisilicon/Kconfig goes here
+#- file drivers/gpu/drm/mediatek/Kconfig goes here
 
 #-
 #- *** FILE: drivers/gpu/drm/amd/acp/Kconfig ***
@@ -1115,6 +1178,7 @@ DRM_AMD_ACP all=y
 #-
 DRM_AMDGPU_CIK all=y
 DRM_AMDGPU_USERPTR all=y
+DRM_AMDGPU_GART_DEBUGFS all=n
 
 #-
 #- *** FILE: drivers/gpu/drm/amd/amdkfd/Kconfig ***
@@ -1137,6 +1201,18 @@ DRM_AST all=m
 DRM_BOCHS all=m
 
 #-
+#- *** FILE: drivers/gpu/drm/bridge/Kconfig ***
+#-
+DRM_ANALOGIX_ANX78XX all=m
+#- file drivers/gpu/drm/bridge/analogix/Kconfig goes here
+#- file drivers/gpu/drm/bridge/adv7511/Kconfig goes here
+
+#-
+#- *** FILE: drivers/gpu/drm/bridge/adv7511/Kconfig ***
+#-
+DRM_I2C_ADV7511 all=m
+
+#-
 #- *** FILE: drivers/gpu/drm/cirrus/Kconfig ***
 #-
 DRM_CIRRUS_QEMU all=m
@@ -1151,7 +1227,6 @@ DRM_GMA3600 all=y
 #-
 #- *** FILE: drivers/gpu/drm/i2c/Kconfig ***
 #-
-DRM_I2C_ADV7511 all=m
 DRM_I2C_CH7006 all=m
 DRM_I2C_SIL164 all=m
 DRM_I2C_NXP_TDA998X all=m
@@ -1162,6 +1237,8 @@ DRM_I2C_NXP_TDA998X all=m
 DRM_I915 i386=m x86_64=m
 DRM_I915_PRELIMINARY_HW_SUPPORT all=y
 DRM_I915_USERPTR all=y
+DRM_I915_GVT all=y
+#- file drivers/gpu/drm/i915/Kconfig.debug goes here
 
 #-
 #- *** FILE: drivers/gpu/drm/mgag200/Kconfig ***
@@ -1222,6 +1299,7 @@ HID_ACRUX all=m
 HID_ACRUX_FF all=y
 HID_APPLE all=m
 HID_APPLEIR all=m
+HID_ASUS all=m
 HID_AUREAL all=m
 HID_BELKIN all=m
 HID_BETOP_FF all=m
@@ -1304,6 +1382,7 @@ ZEROPLUS_FF all=y
 HID_ZYDACRON all=m
 HID_SENSOR_HUB all=m
 HID_SENSOR_CUSTOM_SENSOR all=m
+HID_ALPS all=m
 #- file drivers/hid/usbhid/Kconfig goes here
 #- file drivers/hid/i2c-hid/Kconfig goes here
 
@@ -1371,6 +1450,7 @@ SENSORS_K8TEMP all=m
 SENSORS_K10TEMP all=m
 SENSORS_FAM15H_POWER all=m
 SENSORS_APPLESMC all=m
+SENSORS_ARM_SCPI all=m
 SENSORS_ASB100 all=m
 SENSORS_ATXP1 all=m
 SENSORS_DS620 all=m
@@ -1382,6 +1462,7 @@ SENSORS_F71882FG all=m
 SENSORS_F75375S all=m
 SENSORS_MC13783_ADC all=m
 SENSORS_FSCHMD all=m
+SENSORS_FTSTEUTATES all=m
 SENSORS_GL518SM all=m
 SENSORS_GL520SM all=m
 SENSORS_G760A all=m
@@ -1410,6 +1491,7 @@ SENSORS_MAX16065 all=m
 SENSORS_MAX1619 all=m
 SENSORS_MAX1668 all=m
 SENSORS_MAX197 all=m
+SENSORS_MAX31722 all=m
 SENSORS_MAX6639 all=m
 SENSORS_MAX6642 all=m
 SENSORS_MAX6650 all=m
@@ -1445,6 +1527,7 @@ SENSORS_PCF8591 all=m
 #- file drivers/hwmon/pmbus/Kconfig goes here
 SENSORS_SHT15 all=m
 SENSORS_SHT21 all=m
+SENSORS_SHT3x all=m
 SENSORS_SHTC1 all=m
 SENSORS_SIS5595 all=m
 SENSORS_DME1737 all=m
@@ -1464,6 +1547,7 @@ SENSORS_ADS7871 all=m
 SENSORS_AMC6821 all=m
 SENSORS_INA209 all=m
 SENSORS_INA2XX all=m
+SENSORS_INA3221 all=m
 SENSORS_TC74 all=m
 SENSORS_THMC50 all=m
 SENSORS_TMP102 all=m
@@ -1709,6 +1793,7 @@ IIO all=m
 IIO_CONFIGFS all=m
 IIO_TRIGGER all=y
 IIO_CONSUMERS_PER_TRIGGER all=2
+IIO_SW_DEVICE all=m
 IIO_SW_TRIGGER all=m
 #- file drivers/iio/accel/Kconfig goes here
 #- file drivers/iio/adc/Kconfig goes here
@@ -1735,6 +1820,7 @@ IIO_SW_TRIGGER all=m
 #- *** FILE: drivers/iio/accel/Kconfig ***
 #-
 BMA180 all=m
+BMA220 all=m
 BMC150_ACCEL all=m
 HID_SENSOR_ACCEL_3D all=m
 IIO_ST_ACCEL_3AXIS all=m
@@ -1742,6 +1828,7 @@ KXSD9 all=m
 KXCJK1013 all=m
 MMA7455_I2C all=m
 MMA7455_SPI all=m
+MMA7660 all=m
 MMA8452 all=m
 MMA9551 all=m
 MMA9553 all=m
@@ -1815,6 +1902,8 @@ AD5380 all=m
 AD5421 all=m
 AD5446 all=m
 AD5449 all=m
+AD5592R all=m
+AD5593R all=m
 AD5504 all=m
 AD5624R_SPI all=m
 AD5686 all=m
@@ -1864,6 +1953,7 @@ MAX30100 all=m
 #-
 #- *** FILE: drivers/iio/humidity/Kconfig ***
 #-
+AM2315 all=m
 DHT11 all=m
 HDC100X all=m
 HTU21 all=m
@@ -1875,10 +1965,17 @@ SI7020 all=m
 #-
 ADIS16400 all=m
 ADIS16480 all=m
+#- file drivers/iio/imu/bmi160/Kconfig goes here
 KMX61 all=m
 #- file drivers/iio/imu/inv_mpu6050/Kconfig goes here
 
 #-
+#- *** FILE: drivers/iio/imu/bmi160/Kconfig ***
+#-
+BMI160_I2C all=m
+BMI160_SPI all=m
+
+#-
 #- *** FILE: drivers/iio/imu/inv_mpu6050/Kconfig ***
 #-
 INV_MPU6050_IIO all=m
@@ -1894,6 +1991,7 @@ AL3320A all=m
 APDS9300 all=m
 APDS9960 all=m
 BH1750 all=m
+BH1780 all=m
 CM32181 all=m
 CM3232 all=m
 CM3323 all=m
@@ -1906,6 +2004,7 @@ JSA1212 all=m
 RPR0521 all=m
 SENSORS_LM3533 all=m
 LTR501 all=m
+MAX44000 all=m
 OPT3001 all=m
 PA12203001 all=m
 STK3310 all=m
@@ -1915,6 +2014,7 @@ SENSORS_TSL2563 all=m
 TSL4531 all=m
 US5182D all=m
 VCNL4000 all=m
+VEML6070 all=m
 
 #-
 #- *** FILE: drivers/iio/magnetometer/Kconfig ***
@@ -1922,6 +2022,8 @@ VCNL4000 all=m
 AK8975 all=m
 AK09911 all=m
 BMC150_MAGN all=m
+BMC150_MAGN_I2C all=m
+BMC150_MAGN_SPI all=m
 MAG3110 all=m
 HID_SENSOR_MAGNETOMETER_3D all=m
 MMC35240 all=m
@@ -1939,6 +2041,9 @@ HID_SENSOR_DEVICE_ROTATION all=m
 #-
 #- *** FILE: drivers/iio/potentiometer/Kconfig ***
 #-
+DS1803 all=m
+MAX5487 all=m
+MCP4131 all=m
 MCP4531 all=m
 TPL0102 all=m
 
@@ -1947,6 +2052,7 @@ TPL0102 all=m
 #-
 BMP280 all=m
 HID_SENSOR_PRESS all=m
+HP03 all=m
 MPL115 all=m
 MPL115_I2C all=m
 MPL115_SPI all=m
@@ -1957,6 +2063,7 @@ MS5611_SPI all=m
 MS5637 all=m
 IIO_ST_PRESS all=m
 T5403 all=m
+HP206C all=m
 
 #-
 #- *** FILE: drivers/iio/proximity/Kconfig ***
@@ -1978,6 +2085,7 @@ TSYS02D all=m
 #-
 IIO_HRTIMER_TRIGGER all=m
 IIO_INTERRUPT_TRIGGER all=m
+IIO_TIGHTLOOP_TRIGGER all=m
 IIO_SYSFS_TRIGGER all=m
 
 #-
@@ -2005,6 +2113,8 @@ INFINIBAND_ADDR_TRANS all=y sparc=
 #- file drivers/infiniband/ulp/iser/Kconfig goes here
 #- file drivers/infiniband/ulp/isert/Kconfig goes here
 #- file drivers/infiniband/sw/rdmavt/Kconfig goes here
+#- file drivers/infiniband/sw/rxe/Kconfig goes here
+#- file drivers/infiniband/hw/hfi1/Kconfig goes here
 
 #-
 #- *** FILE: drivers/infiniband/hw/cxgb3/Kconfig ***
@@ -2018,6 +2128,14 @@ INFINIBAND_CXGB3_DEBUG all=n sparc=
 INFINIBAND_CXGB4 all=m
 
 #-
+#- *** FILE: drivers/infiniband/hw/hfi1/Kconfig ***
+#-
+INFINIBAND_HFI1 all=m
+HFI1_DEBUG_SDMA_ORDER all=n
+HFI1_VERBS_31BIT_PSN all=y
+SDMA_VERBOSITY all=n
+
+#-
 #- *** FILE: drivers/infiniband/hw/i40iw/Kconfig ***
 #-
 INFINIBAND_I40IW all=m
@@ -2065,6 +2183,11 @@ INFINIBAND_USNIC all=m
 INFINIBAND_RDMAVT all=m
 
 #-
+#- *** FILE: drivers/infiniband/sw/rxe/Kconfig ***
+#-
+RDMA_RXE all=m
+
+#-
 #- *** FILE: drivers/infiniband/ulp/ipoib/Kconfig ***
 #-
 INFINIBAND_IPOIB all=m sparc=
@@ -2215,6 +2338,7 @@ INPUT_BMA150 all=m
 INPUT_E3X0_BUTTON all=m
 INPUT_PCSPKR all=m
 INPUT_SPARCSPKR sparc64=m
+INPUT_MAX77693_HAPTIC all=m
 INPUT_MC13783_PWRBUTTON all=m
 INPUT_MMA8450 all=m
 INPUT_MPU3050 all=m
@@ -2327,6 +2451,7 @@ TABLET_USB_AIPTEK all=m
 TABLET_USB_GTCO all=m
 TABLET_USB_HANWANG all=m
 TABLET_USB_KBTAB all=m
+TABLET_USB_PEGASUS all=m
 TABLET_SERIAL_WACOM4 all=m
 
 #-
@@ -2411,9 +2536,13 @@ TOUCHSCREEN_TSC2005 all=m
 TOUCHSCREEN_TSC2007 all=m
 TOUCHSCREEN_W90X900 all=m
 TOUCHSCREEN_PCAP all=m
+TOUCHSCREEN_RM_TS all=m
+TOUCHSCREEN_SILEAD all=m
+TOUCHSCREEN_SIS_I2C all=m
 TOUCHSCREEN_ST1232 all=m
 TOUCHSCREEN_STMPE all=m
 TOUCHSCREEN_SUR40 all=m
+TOUCHSCREEN_SURFACE3_SPI all=m
 TOUCHSCREEN_SX8654 all=m
 TOUCHSCREEN_TPS6507X all=m
 TOUCHSCREEN_ZFORCE all=m
@@ -2577,6 +2706,7 @@ LEDS_PCA9532 all=m
 LEDS_PCA9532_GPIO all=y
 LEDS_GPIO all=m
 LEDS_LP3944 all=m
+LEDS_LP3952 all=m
 LEDS_LP5521 all=m
 LEDS_LP5523 all=m
 LEDS_LP5562 all=m
@@ -2613,7 +2743,8 @@ LEDS_BLINKM all=m
 LEDS_TRIGGERS all=y
 LEDS_TRIGGER_TIMER all=m
 LEDS_TRIGGER_ONESHOT all=m
-LEDS_TRIGGER_IDE_DISK all=y
+LEDS_TRIGGER_DISK all=y
+LEDS_TRIGGER_MTD all=y
 LEDS_TRIGGER_HEARTBEAT all=m
 LEDS_TRIGGER_BACKLIGHT all=m
 LEDS_TRIGGER_CPU all=y
@@ -2622,6 +2753,7 @@ LEDS_TRIGGER_DEFAULT_ON all=m
 #- iptables trigger is under Netfilter config (LED target)
 LEDS_TRIGGER_TRANSIENT all=m
 LEDS_TRIGGER_CAMERA all=m
+LEDS_TRIGGER_PANIC all=y
 
 #-
 #- *** FILE: drivers/lguest/Kconfig ***
@@ -2644,7 +2776,6 @@ ADB ppc=y
 ADB_CUDA ppc=y
 ADB_PMU ppc=y ppc64=y
 ADB_PMU_LED ppc=y ppc64=y
-ADB_PMU_LED_IDE ppc=y ppc64=y
 PMAC_SMU ppc64=n
 PMAC_APM_EMU ppc=m
 PMAC_MEDIABAY ppc=y
@@ -2768,6 +2899,7 @@ VIDEO_TVEEPROM all=m
 #- file drivers/media/common/b2c2/Kconfig goes here
 #- file drivers/media/common/saa7146/Kconfig goes here
 #- file drivers/media/common/siano/Kconfig goes here
+#- file drivers/media/common/v4l2-tpg/Kconfig goes here
 
 #-
 #- *** FILE: drivers/media/common/b2c2/Kconfig ***
@@ -2799,6 +2931,7 @@ DVB_DYNAMIC_MINORS all=y
 #-
 #- Multistandard (satellite) frontends
 #- Multistandard (cable + terrestrial) frontends
+DVB_MN88472 all=m
 DVB_MN88473 all=m
 #- DVB-S (satellite) frontends
 DVB_CX24110 all=m
@@ -2952,6 +3085,7 @@ MEDIA_PCI_SUPPORT all=y
 #- file drivers/media/pci/solo6x10/Kconfig goes here
 #- file drivers/media/pci/sta2x11/Kconfig goes here
 #- file drivers/media/pci/tw68/Kconfig goes here
+#- file drivers/media/pci/tw686x/Kconfig goes here
 #- file drivers/media/pci/zoran/Kconfig goes here
 #- Media capture/analog TV support
 #- file drivers/media/pci/ivtv/Kconfig goes here
@@ -3131,6 +3265,11 @@ DVB_BUDGET_PATCH all=m
 VIDEO_TW68 all=m
 
 #-
+#- *** FILE: drivers/media/pci/tw686x/Kconfig ***
+#-
+VIDEO_TW686X all=m
+
+#-
 #- *** FILE: drivers/media/pci/zoran/Kconfig ***
 #-
 VIDEO_ZORAN all=m ppc=n sparc=n
@@ -3156,6 +3295,7 @@ VIDEO_VIA_CAMERA all=m
 #- file drivers/media/platform/s5p-tv/Kconfig goes here
 #- file drivers/media/platform/am437x/Kconfig goes here
 #- file drivers/media/platform/xilinx/Kconfig goes here
+#- file drivers/media/platform/rcar-vin/Kconfig goes here
 V4L_MEM2MEM_DRIVERS all=y
 VIDEO_MEM2MEM_DEINTERLACE all=m
 VIDEO_SH_VEU all=m
@@ -3171,11 +3311,15 @@ DVB_PLATFORM_DRIVERS all=y
 VIDEO_CAFE_CCIC all=m sparc=n
 
 #-
+#- *** FILE: drivers/media/platform/rcar-vin/Kconfig ***
+#-
+VIDEO_RCAR_VIN all=m
+
+#-
 #- *** FILE: drivers/media/platform/soc_camera/Kconfig ***
 #-
 SOC_CAMERA all=m
 SOC_CAMERA_PLATFORM all=m
-VIDEO_RCAR_VIN all=m
 VIDEO_SH_MOBILE_CSI2 all=m
 VIDEO_SH_MOBILE_CEU all=m
 
@@ -3606,6 +3750,7 @@ VIDEOBUF2_VMALLOC all=m
 #- *** FILE: drivers/memory/Kconfig ***
 #-
 MEMORY all=y
+#- file drivers/memory/samsung/Kconfig goes here
 #- file drivers/memory/tegra/Kconfig goes here
 
 #-
@@ -3675,6 +3820,8 @@ MFD_JANZ_CMODIO all=m
 MFD_KEMPLD all=m
 MFD_88PM800 all=m
 MFD_88PM805 all=m
+MFD_MAX14577 all=m
+MFD_MAX77693 all=m
 MFD_MAX8907 all=m
 MFD_MT6397 all=m
 MFD_MENF21BMC all=m
@@ -3757,7 +3904,6 @@ APDS9802ALS all=m
 ISL29003 all=m
 ISL29020 all=m
 SENSORS_TSL2550 all=m
-SENSORS_BH1780 all=m
 SENSORS_BH1770 all=m
 SENSORS_APDS990X all=m
 HMC6352 all=m
@@ -3858,6 +4004,7 @@ SCIF all=m
 MIC_COSM all=m
 #- VOP Driver
 VOP all=m
+#- file drivers/vhost/Kconfig.vringh goes here
 
 #-
 #- *** FILE: drivers/misc/ti-st/Kconfig ***
@@ -4061,6 +4208,7 @@ MTD_NAND_NANDSIM all=m ppc=n ppc64=n sparc=n
 MTD_NAND_PLATFORM all=m sparc=n
 MTD_NAND_FSL_ELBC ppc=m ppc64=m
 MTD_NAND_HISI504 all=m
+MTD_NAND_MTK all=m
 
 #-
 #- *** FILE: drivers/mtd/onenand/Kconfig ***
@@ -4105,6 +4253,7 @@ MACVTAP all=m
 IPVLAN all=m
 VXLAN all=m
 GENEVE all=m
+GTP all=m
 MACSEC all=m
 NETCONSOLE all=m
 NETCONSOLE_DYNAMIC all=y
@@ -4179,7 +4328,7 @@ CAIF_SPI_SLAVE all=m
 CAIF_SPI_SYNC all=y
 CAIF_HSI all=m
 CAIF_VIRTIO all=m
-#- file drivers/vhost/Kconfig goes here
+#- file drivers/vhost/Kconfig.vringh goes here
 
 #-
 #- *** FILE: drivers/net/can/Kconfig ***
@@ -4196,6 +4345,7 @@ PCH_CAN all=m
 #- file drivers/net/can/ifi_canfd/Kconfig goes here
 #- file drivers/net/can/m_can/Kconfig goes here
 #- file drivers/net/can/mscan/Kconfig goes here
+#- file drivers/net/can/rcar/Kconfig goes here
 #- file drivers/net/can/sja1000/Kconfig goes here
 #- file drivers/net/can/softing/Kconfig goes here
 #- file drivers/net/can/spi/Kconfig goes here
@@ -4266,11 +4416,23 @@ CAN_8DEV_USB all=m
 #- *** FILE: drivers/net/dsa/Kconfig ***
 #-
 NET_DSA_MV88E6060 all=y
-NET_DSA_MV88E6131 all=y
-NET_DSA_MV88E6123 all=m
-NET_DSA_MV88E6171 all=m
-NET_DSA_MV88E6352 all=m
 NET_DSA_BCM_SF2 all=m
+#- file drivers/net/dsa/b53/Kconfig goes here
+#- file drivers/net/dsa/mv88e6xxx/Kconfig goes here
+
+#-
+#- *** FILE: drivers/net/dsa/b53/Kconfig ***
+#-
+B53 all=m
+B53_SPI_DRIVER all=m
+B53_MDIO_DRIVER all=m
+B53_MMAP_DRIVER all=m
+B53_SRAB_DRIVER all=m
+
+#-
+#- *** FILE: drivers/net/dsa/mv88e6xxx/Kconfig ***
+#-
+NET_DSA_MV88E6XXX all=m
 
 #-
 #- *** FILE: drivers/net/ethernet/3com/Kconfig ***
@@ -4461,8 +4623,6 @@ CNIC all=m
 TIGON3 all=m
 BNX2X all=m
 BNX2X_SRIOV all=y
-BNX2X_VXLAN all=y
-BNX2X_GENEVE all=y
 BNXT all=m
 BNXT_SRIOV all=y
 
@@ -4505,7 +4665,6 @@ CHELSIO_T1_1G all=y
 CHELSIO_T3 all=m
 CHELSIO_T4 all=m
 CHELSIO_T4_DCB all=y
-CHELSIO_T4_UWIRE all=y
 CHELSIO_T4_FCOE all=y
 CHELSIO_T4VF all=m
 
@@ -4567,7 +4726,6 @@ NET_VENDOR_EMULEX all=y
 #-
 BE2NET all=m
 BE2NET_HWMON all=y
-BE2NET_VXLAN all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/ezchip/Kconfig ***
@@ -4620,19 +4778,15 @@ IGB_DCA all=y
 IGBVF all=m
 IXGB all=m sparc=n
 IXGBE all=m
-IXGBE_VXLAN all=y
 IXGBE_HWMON all=y
 IXGBE_DCA all=y
 IXGBE_DCB all=y
 IXGBEVF all=m
 I40E all=m
-I40E_VXLAN all=y
-I40E_GENEVE all=y
 I40E_DCB all=y
 I40E_FCOE all=y
 I40EVF all=m
 FM10K all=m
-FM10K_VXLAN all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/marvell/Kconfig ***
@@ -4652,7 +4806,6 @@ SKY2_DEBUG all=n
 #-
 MLX4_EN all=m
 MLX4_EN_DCB all=y
-MLX4_EN_VXLAN all=y
 MLX4_CORE all=m
 
 #-
@@ -4661,7 +4814,6 @@ MLX4_CORE all=m
 MLX5_CORE all=m
 MLX5_CORE_EN all=y
 MLX5_CORE_EN_DCB all=y
-MLX5_CORE_EN_VXLAN all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/mellanox/mlxsw/Kconfig ***
@@ -4671,6 +4823,7 @@ MLXSW_CORE_HWMON all=y
 MLXSW_PCI all=m
 MLXSW_SWITCHX2 all=m
 MLXSW_SPECTRUM all=m
+MLXSW_SPECTRUM_DCB all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/micrel/Kconfig ***
@@ -4755,11 +4908,11 @@ QLA3XXX all=m sparc=n
 QLCNIC all=m
 QLCNIC_SRIOV all=y
 QLCNIC_DCB all=y
-QLCNIC_VXLAN all=y
 QLCNIC_HWMON all=y
 QLGE all=m
 NETXEN_NIC all=m sparc=n
 QED all=m
+QED_SRIOV all=y
 QEDE all=m
 
 #-
@@ -4908,6 +5061,7 @@ WIZNET_W5300 all=m
 WIZNET_BUS_DIRECT all=n
 WIZNET_BUS_INDIRECT all=n
 WIZNET_BUS_ANY all=y
+WIZNET_W5100_SPI all=m
 
 #-
 #- *** FILE: drivers/net/ethernet/xilinx/Kconfig ***
@@ -5036,6 +5190,7 @@ MDIO_CAVIUM all=m
 MDIO_OCTEON all=m
 MDIO_THUNDER all=m
 MDIO_BCM_UNIMAC all=m
+INTEL_XWAY_PHY all=m
 MICREL_KS8995MA all=m
 
 #-
@@ -5373,10 +5528,8 @@ IWLDVM all=m
 IWLMVM all=m
 #- WARNING: iwlwifi is useless without IWLDVM or IWLMVM
 IWLWIFI_BCAST_FILTERING all=y
-IWLWIFI_UAPSD all=y
 IWLWIFI_PCIE_RTPM all=y
 IWLWIFI_DEBUG all=y
-IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=y
 IWLWIFI_DEVICE_TRACING all=n
 
 #-
@@ -5605,7 +5758,6 @@ ZD1211RW_DEBUG all=n
 #-
 #- *** FILE: drivers/nfc/Kconfig ***
 #-
-NFC_PN533 all=m
 NFC_WILINK all=m
 NFC_TRF7970A all=m
 NFC_MEI_PHY all=m
@@ -5613,6 +5765,7 @@ NFC_SIM all=m
 NFC_PORT100 all=m
 #- file drivers/nfc/fdp/Kconfig goes here
 #- file drivers/nfc/pn544/Kconfig goes here
+#- file drivers/nfc/pn533/Kconfig goes here
 #- file drivers/nfc/microread/Kconfig goes here
 #- file drivers/nfc/nfcmrvl/Kconfig goes here
 #- file drivers/nfc/st21nfca/Kconfig goes here
@@ -5650,6 +5803,13 @@ NFC_NXP_NCI all=m
 NFC_NXP_NCI_I2C all=m
 
 #-
+#- *** FILE: drivers/nfc/pn533/Kconfig ***
+#-
+NFC_PN533 all=m
+NFC_PN533_USB all=m
+NFC_PN533_I2C all=m
+
+#-
 #- *** FILE: drivers/nfc/pn544/Kconfig ***
 #-
 NFC_PN544 all=m
@@ -5710,6 +5870,8 @@ NTB_PERF all=m
 BLK_DEV_PMEM all=m
 ND_BLK all=m
 BTT all=y
+NVDIMM_PFN all=y
+NVDIMM_DAX all=y
 
 #-
 #- *** FILE: drivers/nvme/host/Kconfig ***
@@ -5717,6 +5879,14 @@ BTT all=y
 NVME_CORE all=m
 BLK_DEV_NVME all=m
 BLK_DEV_NVME_SCSI all=y
+NVME_RDMA all=m
+
+#-
+#- *** FILE: drivers/nvme/target/Kconfig ***
+#-
+NVME_TARGET all=m
+NVME_TARGET_LOOP all=m
+NVME_TARGET_RDMA all=m
 
 #-
 #- *** FILE: drivers/nvmem/Kconfig ***
@@ -5802,6 +5972,7 @@ PCIEASPM_DEBUG all=n
 PCIEASPM_DEFAULT all=y
 PCIEASPM_POWERSAVE all=n
 PCIEASPM_PERFORMANCE all=n
+PCIE_DPC all=y
 
 #-
 #- *** FILE: drivers/pci/pcie/aer/Kconfig ***
@@ -5850,6 +6021,7 @@ TWL4030_USB all=m
 BCM_KONA_USB2_PHY all=m
 PHY_SAMSUNG_USB2 all=m
 PHY_TUSB1210 all=m
+#- file drivers/phy/tegra/Kconfig goes here
 
 #-
 #- *** FILE: drivers/pinctrl/Kconfig ***
@@ -5893,6 +6065,7 @@ CHROMEOS_LAPTOP all=m
 CHROMEOS_PSTORE all=m
 CROS_EC_CHARDEV all=m
 CROS_EC_LPC all=m
+CROS_KBD_LED_BACKLIGHT all=m
 
 #-
 #- *** FILE: drivers/platform/goldfish/Kconfig ***
@@ -5952,9 +6125,11 @@ TOSHIBA_HAPS all=m
 TOSHIBA_WMI all=m
 ACPI_CMPC all=m
 INTEL_HID_EVENT all=m
+INTEL_VBTN all=m
 INTEL_SCU_IPC i386=y
 GPIO_INTEL_PMIC i386=y
 INTEL_IPS all=m
+INTEL_PMC_CORE all=y
 IBM_RTL all=m
 XO15_EBOOK all=m
 SAMSUNG_LAPTOP all=m
@@ -6032,6 +6207,8 @@ CHARGER_MAX8903 all=m
 CHARGER_LP8727 all=m
 CHARGER_GPIO all=m
 CHARGER_MANAGER all=y
+CHARGER_MAX14577 all=m
+CHARGER_MAX77693 all=m
 CHARGER_BQ2415X all=m
 CHARGER_BQ24190 all=m
 CHARGER_BQ24257 all=m
@@ -6093,6 +6270,7 @@ PTP_1588_CLOCK_PCH all=m
 #- *** FILE: drivers/pwm/Kconfig ***
 #-
 PWM all=y
+PWM_CROS_EC all=m
 PWM_LP3943 all=m
 PWM_LPSS all=m
 PWM_LPSS_PCI all=m
@@ -6108,6 +6286,7 @@ RAPIDIO_ENABLE_RX_TX_PORTS all=y
 RAPIDIO_DMA_ENGINE all=y
 RAPIDIO_DEBUG all=n
 RAPIDIO_ENUM_BASIC all=m
+RAPIDIO_CHMAN all=m
 RAPIDIO_MPORT_CDEV all=m
 #- file drivers/rapidio/switches/Kconfig goes here
 
@@ -6123,6 +6302,7 @@ RAPIDIO_TSI57X all=y
 RAPIDIO_CPS_XX all=y
 RAPIDIO_TSI568 all=y
 RAPIDIO_CPS_GEN2 all=y
+RAPIDIO_RXS_GEN3 all=m
 
 #-
 #- *** FILE: drivers/regulator/Kconfig ***
@@ -6156,20 +6336,24 @@ REGULATOR_LP3972 all=m
 REGULATOR_LP872X all=m
 REGULATOR_LP8755 all=m
 REGULATOR_LTC3589 all=m
+REGULATOR_MAX14577 all=m
 REGULATOR_MAX1586 all=m
 REGULATOR_MAX8649 all=m
 REGULATOR_MAX8660 all=m
 REGULATOR_MAX8907 all=m
 REGULATOR_MAX8952 all=m
 REGULATOR_MAX8973 all=m
+REGULATOR_MAX77693 all=m
 REGULATOR_MC13783 all=m
 REGULATOR_MC13892 all=m
 REGULATOR_MT6311 all=m
+REGULATOR_MT6323 all=m
 REGULATOR_MT6397 all=m
 REGULATOR_PCAP all=m
 REGULATOR_PCF50633 all=m
 REGULATOR_PFUZE100 all=m
 REGULATOR_PV88060 all=m
+REGULATOR_PV88080 all=m
 REGULATOR_PV88090 all=m
 REGULATOR_PWM all=m
 REGULATOR_QCOM_SPMI all=m
@@ -6201,6 +6385,7 @@ STE_MODEM_RPROC all=m
 #- *** FILE: drivers/reset/Kconfig ***
 #-
 RESET_CONTROLLER all=y
+TI_SYSCON_RESET all=m
 #- file drivers/reset/sti/Kconfig goes here
 #- file drivers/reset/hisilicon/Kconfig goes here
 
@@ -6250,16 +6435,16 @@ RTC_DRV_RX8010 all=m
 RTC_DRV_RX8581 all=m
 RTC_DRV_RX8025 all=m
 RTC_DRV_EM3027 all=m
-RTC_DRV_RV3029C2 all=m
-RTC_DRV_RV3029_HWMON all=y
 RTC_DRV_RV8803 all=m
 #- SPI RTC drivers
 RTC_DRV_M41T93 all=m
 RTC_DRV_M41T94 all=m
+RTC_DRV_DS1302 all=m
 RTC_DRV_DS1305 all=m
 RTC_DRV_DS1343 all=m
 RTC_DRV_DS1347 all=m
 RTC_DRV_DS1390 all=m
+RTC_DRV_MAX6916 all=m
 RTC_DRV_R9701 all=m
 RTC_DRV_RX4581 all=m
 RTC_DRV_RX6110 all=m
@@ -6271,6 +6456,8 @@ RTC_I2C_AND_SPI all=m
 #- SPI and I2C RTC drivers
 RTC_DRV_DS3232 all=m
 RTC_DRV_PCF2127 all=m
+RTC_DRV_RV3029C2 all=m
+RTC_DRV_RV3029_HWMON all=y
 #- Platform RTC drivers
 RTC_DRV_CMOS all=y
 RTC_DRV_DS1286 all=m
@@ -6405,7 +6592,6 @@ SCSI_GDTH all=m
 SCSI_ISCI all=m
 SCSI_GENERIC_NCR5380 alpha=m i386=m
 SCSI_GENERIC_NCR5380_MMIO alpha=m i386=m
-SCSI_GENERIC_NCR53C400 alpha=y i386=y
 SCSI_IPS all=m sparc=n sparc64=n
 SCSI_IBMVSCSI ppc64=n
 SCSI_IBMVFC ppc64=m
@@ -6591,6 +6777,7 @@ PCMCIA_SYM53C500 all=m
 #-
 SCSI_QLA_FC all=m sparc=n
 TCM_QLA2XXX all=m
+TCM_QLA2XXX_DEBUG all=n
 
 #-
 #- *** FILE: drivers/scsi/qla4xxx/Kconfig ***
@@ -6602,7 +6789,9 @@ SCSI_QLA_ISCSI all=m sparc=n
 #-
 SCSI_UFSHCD all=m
 SCSI_UFSHCD_PCI all=m
+SCSI_UFS_DWC_TC_PCI all=m
 SCSI_UFSHCD_PLATFORM all=m
+SCSI_UFS_DWC_TC_PLATFORM all=m
 
 #-
 #- *** FILE: drivers/sfi/Kconfig ***
@@ -6642,6 +6831,7 @@ SPI_MPC52xx_PSC ppc=m
 SPI_FSL_DSPI all=m
 SPI_OC_TINY all=m
 SPI_PXA2XX all=m
+SPI_ROCKCHIP all=m
 SPI_SC18IS602 all=m
 SPI_TOPCLIFF_PCH all=m
 SPI_XCOMM all=m
@@ -6693,7 +6883,6 @@ STAGING all=y
 #- file drivers/staging/speakup/Kconfig goes here
 #- file drivers/staging/nvec/Kconfig goes here
 #- file drivers/staging/media/Kconfig goes here
-#- file drivers/staging/rdma/Kconfig goes here
 #- file drivers/staging/android/Kconfig goes here
 #- file drivers/staging/board/Kconfig goes here
 #- file drivers/staging/gdm724x/Kconfig goes here
@@ -6712,6 +6901,7 @@ STAGING all=y
 #- file drivers/staging/wilc1000/Kconfig goes here
 #- file drivers/staging/most/Kconfig goes here
 #- file drivers/staging/i4l/Kconfig goes here
+#- file drivers/staging/ks7010/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
@@ -6930,11 +7120,8 @@ ISDN_DRV_PCBIT all=m
 #-
 ADIS16201 all=m
 ADIS16203 all=m
-ADIS16204 all=m
 ADIS16209 all=m
-ADIS16220 all=m
 ADIS16240 all=m
-LIS3L02DQ all=m
 SCA3000 all=m
 
 #-
@@ -7005,6 +7192,11 @@ AD2S1200 all=m
 AD2S1210 all=m
 
 #-
+#- *** FILE: drivers/staging/ks7010/Kconfig ***
+#-
+KS7010 all=m
+
+#-
 #- *** FILE: drivers/staging/lustre/lnet/Kconfig ***
 #-
 LNET all=m
@@ -7018,21 +7210,19 @@ LNET_XPRT_IB all=m
 LUSTRE_FS all=m
 LUSTRE_OBD_MAX_IOCTL_BUFFER all=8192
 LUSTRE_DEBUG_EXPENSIVE_CHECK all=n
-LUSTRE_LLITE_LLOOP all=m
 
 #-
 #- *** FILE: drivers/staging/media/Kconfig ***
 #-
 STAGING_MEDIA all=y
 #- file drivers/staging/media/bcm2048/Kconfig goes here
+#- file drivers/staging/media/cec/Kconfig goes here
 #- file drivers/staging/media/cxd2099/Kconfig goes here
 #- file drivers/staging/media/davinci_vpfe/Kconfig goes here
-#- file drivers/staging/media/mn88472/Kconfig goes here
-#- file drivers/staging/media/mx2/Kconfig goes here
-#- file drivers/staging/media/mx3/Kconfig goes here
-#- file drivers/staging/media/omap1/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
-#- file drivers/staging/media/timb/Kconfig goes here
+#- file drivers/staging/media/pulse8-cec/Kconfig goes here
+#- file drivers/staging/media/tw686x-kh/Kconfig goes here
+#- file drivers/staging/media/s5p-cec/Kconfig goes here
 #- file drivers/staging/media/lirc/Kconfig goes here
 
 #-
@@ -7041,6 +7231,12 @@ STAGING_MEDIA all=y
 I2C_BCM2048 all=m
 
 #-
+#- *** FILE: drivers/staging/media/cec/Kconfig ***
+#-
+MEDIA_CEC all=y
+MEDIA_CEC_DEBUG all=n
+
+#-
 #- *** FILE: drivers/staging/media/cxd2099/Kconfig ***
 #-
 DVB_CXD2099 all=m
@@ -7059,14 +7255,9 @@ LIRC_SIR all=m
 LIRC_ZILOG all=m
 
 #-
-#- *** FILE: drivers/staging/media/mn88472/Kconfig ***
+#- *** FILE: drivers/staging/media/pulse8-cec/Kconfig ***
 #-
-DVB_MN88472 all=m
-
-#-
-#- *** FILE: drivers/staging/media/timb/Kconfig ***
-#-
-VIDEO_TIMBERDALE all=m
+USB_PULSE8_CEC all=m
 
 #-
 #- *** FILE: drivers/staging/most/Kconfig ***
@@ -7123,20 +7314,6 @@ MTD_SPINAND_MT29F all=m
 MTD_SPINAND_ONDIEECC all=y
 
 #-
-#- *** FILE: drivers/staging/rdma/Kconfig ***
-#-
-STAGING_RDMA all=y
-#- file drivers/staging/rdma/hfi1/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/rdma/hfi1/Kconfig ***
-#-
-INFINIBAND_HFI1 all=m
-HFI1_DEBUG_SDMA_ORDER all=n
-HFI1_VERBS_31BIT_PSN all=y
-SDMA_VERBOSITY all=n
-
-#-
 #- *** FILE: drivers/staging/rtl8188eu/Kconfig ***
 #-
 R8188EU all=m
@@ -7293,6 +7470,12 @@ TCM_USER2 all=m
 #- *** FILE: drivers/target/iscsi/Kconfig ***
 #-
 ISCSI_TARGET all=m
+#- file drivers/target/iscsi/cxgbit/Kconfig goes here
+
+#-
+#- *** FILE: drivers/target/iscsi/cxgbit/Kconfig ***
+#-
+ISCSI_TARGET_CXGB4 all=m
 
 #-
 #- *** FILE: drivers/target/loopback/Kconfig ***
@@ -7328,11 +7511,19 @@ INTEL_POWERCLAMP all=m
 X86_PKG_TEMP_THERMAL all=m
 INTEL_SOC_DTS_THERMAL all=m
 INTEL_QUARK_DTS_THERMAL i386=m
-INT340X_THERMAL all=m
+#- file drivers/thermal/int340x_thermal/Kconfig goes here
 INTEL_PCH_THERMAL all=m
 #- file drivers/thermal/ti-soc-thermal/Kconfig goes here
 #- file drivers/thermal/samsung/Kconfig goes here
 #- file drivers/thermal/st/Kconfig goes here
+#- file drivers/thermal/tegra/Kconfig goes here
+GENERIC_ADC_THERMAL all=m
+
+#-
+#- *** FILE: drivers/thermal/int340x_thermal/Kconfig ***
+#-
+INT340X_THERMAL all=m
+INT3406_THERMAL all=m
 
 #-
 #- *** FILE: drivers/thunderbolt/Kconfig ***
@@ -7348,7 +7539,6 @@ VT_CONSOLE all=y
 HW_CONSOLE all=y
 VT_HW_CONSOLE_BINDING all=y
 UNIX98_PTYS all=y
-DEVPTS_MULTIPLE_INSTANCES all=y
 LEGACY_PTYS all=y
 LEGACY_PTY_COUNT all=256
 SERIAL_NONSTANDARD all=y
@@ -7385,6 +7575,7 @@ HVCS ppc64=n
 SERIAL_8250 all=y
 SERIAL_8250_DEPRECATED_OPTIONS all=y
 SERIAL_8250_PNP all=y
+SERIAL_8250_FINTEK all=y
 SERIAL_8250_CONSOLE all=y
 SERIAL_8250_PCI all=y
 SERIAL_8250_CS all=m
@@ -7402,7 +7593,6 @@ SERIAL_8250_DETECT_IRQ all=y
 SERIAL_8250_RSA all=y
 SERIAL_8250_DW all=m
 SERIAL_8250_RT288X all=y
-SERIAL_8250_FINTEK all=y
 SERIAL_8250_MID all=m
 SERIAL_8250_MOXA all=m
 SERIAL_OF_PLATFORM ppc=m ppc64=m
@@ -7726,7 +7916,6 @@ USB_SEVSEG all=m
 USB_RIO500 all=m
 USB_LEGOTOWER all=m
 USB_LCD all=m
-USB_LED all=m
 USB_CYPRESS_CY7C63 all=m
 USB_CYTHERM all=m
 USB_IDMOUSE all=m
@@ -7744,6 +7933,7 @@ USB_EZUSB_FX2 all=m
 USB_HSIC_USB3503 all=m
 USB_LINK_LAYER_TEST all=m
 USB_CHAOSKEY all=m
+UCSI all=m
 
 #-
 #- *** FILE: drivers/usb/misc/sisusbvga/Kconfig ***
@@ -7880,6 +8070,7 @@ USB_UAS all=m
 USBIP_CORE all=m
 USBIP_VHCI_HCD all=m
 USBIP_HOST all=m
+USBIP_VUDC all=m
 USBIP_DEBUG all=n
 
 #-
@@ -7919,6 +8110,7 @@ VFIO_PCI_IGD all=y
 #-
 VHOST_NET all=m
 VHOST_SCSI all=m
+VHOST_VSOCK all=m
 VHOST_CROSS_ENDIAN_LEGACY all=n
 
 #-
@@ -7931,7 +8123,6 @@ VHOST_CROSS_ENDIAN_LEGACY all=n
 #- file drivers/gpu/drm/Kconfig goes here
 #- file drivers/video/fbdev/Kconfig goes here
 #- file drivers/video/backlight/Kconfig goes here
-#- file drivers/gpu/misc/Kconfig goes here
 VGASTATE all=m
 #- file drivers/video/console/Kconfig goes here
 #- file drivers/video/logo/Kconfig goes here
@@ -8576,7 +8767,7 @@ EXT4_FS all=m
 EXT4_USE_FOR_EXT2 all=y
 EXT4_FS_POSIX_ACL all=y
 EXT4_FS_SECURITY all=y
-EXT4_ENCRYPTION all=m
+EXT4_ENCRYPTION all=y
 EXT4_DEBUG all=n
 
 #-
@@ -8590,6 +8781,7 @@ F2FS_FS_SECURITY all=y
 F2FS_CHECK_FS all=y
 F2FS_FS_ENCRYPTION all=y
 F2FS_IO_TRACE all=y
+F2FS_FAULT_INJECTION all=n
 
 #-
 #- *** FILE: fs/fat/Kconfig ***
@@ -8733,6 +8925,7 @@ NFSD_V4 all=y
 NFSD_PNFS all=y
 NFSD_BLOCKLAYOUT all=y
 NFSD_SCSILAYOUT all=y
+NFSD_FLEXFILELAYOUT all=y
 NFSD_V4_SECURITY_LABEL all=y
 NFSD_FAULT_INJECTION all=n
 
@@ -8856,6 +9049,9 @@ PROC_CHILDREN all=y
 #- *** FILE: fs/pstore/Kconfig ***
 #-
 PSTORE all=y
+PSTORE_ZLIB_COMPRESS all=n
+PSTORE_LZO_COMPRESS all=n
+PSTORE_LZ4_COMPRESS all=y
 PSTORE_CONSOLE all=y
 PSTORE_PMSG all=y
 PSTORE_FTRACE all=n
@@ -9011,6 +9207,7 @@ IKCONFIG all=m
 IKCONFIG_PROC all=y
 LOG_BUF_SHIFT all=18
 LOG_CPU_MAX_BUF_SHIFT all=12
+NMI_LOG_BUF_SHIFT all=13
 NUMA_BALANCING all=y
 NUMA_BALANCING_DEFAULT_ENABLED all=y
 CGROUPS all=y
@@ -9045,8 +9242,8 @@ SYSFS_DEPRECATED_V2 all=n
 RELAY all=y
 BLK_DEV_INITRD all=y
 #- file usr/Kconfig goes here
-CC_OPTIMIZE_FOR_SIZE all=n
 CC_OPTIMIZE_FOR_PERFORMANCE all=y
+CC_OPTIMIZE_FOR_SIZE all=n
 SYSCTL all=y
 ANON_INODES all=y
 EXPERT all=n
@@ -9078,6 +9275,7 @@ COMPAT_BRK all=n
 SLAB all=n
 SLUB all=y
 SLOB all=n
+SLAB_FREELIST_RANDOM all=y
 SLUB_CPU_PARTIAL all=y
 PROFILING all=y
 #- file arch/Kconfig goes here
@@ -9189,6 +9387,7 @@ FUNCTION_PROFILER all=y
 FTRACE_MCOUNT_RECORD all=y
 FTRACE_STARTUP_TEST all=n
 MMIOTRACE x86=n
+HIST_TRIGGERS all=n
 TRACEPOINT_BENCHMARK all=n
 RING_BUFFER_BENCHMARK all=m
 RING_BUFFER_STARTUP_TEST all=n
@@ -9315,6 +9514,7 @@ DEBUG_SG all=n
 DEBUG_NOTIFIERS all=n
 DEBUG_CREDENTIALS all=n
 SPARSE_RCU_POINTER all=n
+RCU_PERF_TEST all=m
 RCU_TORTURE_TEST all=m
 RCU_TORTURE_TEST_SLOW_PREINIT all=n
 RCU_TORTURE_TEST_SLOW_INIT all=n
@@ -9346,7 +9546,9 @@ TEST_STRING_HELPERS all=m
 TEST_KSTRTOX all=m
 TEST_PRINTF all=m
 TEST_BITMAP all=m
+TEST_UUID all=m
 TEST_RHASHTABLE all=n
+TEST_HASH all=m
 PROVIDE_OHCI1394_DMA_INIT all=n
 BUILD_DOCSRC all=n
 DMA_API_DEBUG all=n
@@ -9423,12 +9625,12 @@ SPARSEMEM_MANUAL all=y alpha=n ppc=n sparc=n sparc64=y
 SPARSEMEM_VMEMMAP all=y
 MOVABLE_NODE all=y
 MEMORY_HOTPLUG all=y
+MEMORY_HOTPLUG_DEFAULT_ONLINE all=y
 MEMORY_HOTREMOVE all=y
 SPLIT_PTLOCK_CPUS all=4
 BALLOON_COMPACTION all=y
 COMPACTION all=y
 MIGRATION all=y
-ZONE_DMA_FLAG all=1 sparc64=0
 BOUNCE all=y
 NR_QUICK sparc64=1
 KSM all=y
@@ -9446,11 +9648,13 @@ CMA_DEBUGFS all=n
 CMA_AREAS all=7
 ZSWAP all=y
 ZBUD all=m
+Z3FOLD all=m
 ZSMALLOC all=y
 PGTABLE_MAPPING all=n
 ZSMALLOC_STAT all=y
 DEFERRED_STRUCT_PAGE_INIT all=n
 IDLE_PAGE_TRACKING all=y
+ZONE_DEVICE all=y
 
 #-
 #- *** FILE: mm/Kconfig.debug ***
@@ -9549,6 +9753,8 @@ BRIDGE_NETFILTER all=m
 #- file net/hsr/Kconfig goes here
 #- file net/switchdev/Kconfig goes here
 #- file net/l3mdev/Kconfig goes here
+#- file net/qrtr/Kconfig goes here
+#- file net/ncsi/Kconfig goes here
 RFS_ACCEL all=y
 CGROUP_NET_PRIO all=y
 BPF_JIT all=y
@@ -9574,7 +9780,6 @@ WIRELESS all=y
 DST_CACHE all=y
 NET_DEVLINK all=m
 MAY_USE_DEVLINK all=m
-HAVE_BPF_JIT all=y
 
 #-
 #- *** FILE: net/atm/Kconfig ***
@@ -9816,6 +10021,7 @@ TCP_CONG_HTCP all=m
 TCP_CONG_HSTCP all=m
 TCP_CONG_HYBLA all=m
 TCP_CONG_VEGAS all=m
+TCP_CONG_NV all=m
 TCP_CONG_SCALABLE all=m
 TCP_CONG_LP all=m
 TCP_CONG_VENO all=m
@@ -10029,6 +10235,11 @@ MPLS_ROUTING all=m
 MPLS_IPTUNNEL all=m
 
 #-
+#- *** FILE: net/ncsi/Kconfig ***
+#-
+NET_NCSI all=y
+
+#-
 #- *** FILE: net/netfilter/Kconfig ***
 #-
 NETFILTER_INGRESS all=y
@@ -10288,6 +10499,7 @@ RFKILL_GPIO all=m
 #-
 AF_RXRPC all=m
 AF_RXRPC_DEBUG all=n
+RXKAD all=y
 
 #-
 #- *** FILE: net/sched/Kconfig ***
@@ -10334,6 +10546,7 @@ NET_CLS_FLOW all=m
 NET_CLS_CGROUP all=y
 NET_CLS_BPF all=m
 NET_CLS_FLOWER all=m
+NET_CLS_MATCHALL all=m
 NET_EMATCH all=y
 NET_EMATCH_STACK all=32
 NET_EMATCH_CMP all=m
@@ -10406,6 +10619,7 @@ UNIX_DIAG all=m
 #-
 VSOCKETS all=m
 VMWARE_VMCI_VSOCKETS all=m
+VIRTIO_VSOCKETS all=m
 
 #-
 #- *** FILE: net/wimax/Kconfig ***
@@ -10459,10 +10673,12 @@ SECURITY_NETWORK_XFRM all=y
 SECURITY_PATH all=y
 INTEL_TXT all=y
 LSM_MMAP_MIN_ADDR all=0 x86_64=65536 i386=65536 sparc64=8192 ppc=65536
+HARDENED_USERCOPY all=y
 #- file security/selinux/Kconfig goes here
 #- file security/smack/Kconfig goes here
 #- file security/tomoyo/Kconfig goes here
 #- file security/apparmor/Kconfig goes here
+#- file security/loadpin/Kconfig goes here
 #- file security/yama/Kconfig goes here
 #- file security/integrity/Kconfig goes here
 DEFAULT_SECURITY_SELINUX all=n
@@ -10478,6 +10694,7 @@ DEFAULT_SECURITY all=""
 SECURITY_APPARMOR=y
 SECURITY_APPARMOR_BOOTPARAM_VALUE=1
 SECURITY_APPARMOR_HASH all=y
+SECURITY_APPARMOR_HASH_DEFAULT all=y
 
 #-
 #- *** FILE: security/integrity/Kconfig ***
@@ -10503,6 +10720,7 @@ EVM_X509_PATH all="/etc/keys/x509_evm.der"
 #- *** FILE: security/integrity/ima/Kconfig ***
 #-
 IMA all=n
+IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY all=n
 
 #-
 #- *** FILE: security/keys/Kconfig ***
@@ -10512,6 +10730,12 @@ PERSISTENT_KEYRINGS all=y
 BIG_KEYS all=y
 TRUSTED_KEYS all=m
 ENCRYPTED_KEYS all=m
+KEY_DH_OPERATIONS all=y
+
+#-
+#- *** FILE: security/loadpin/Kconfig ***
+#-
+SECURITY_LOADPIN all=n
 
 #-
 #- *** FILE: security/selinux/Kconfig ***
@@ -10620,8 +10844,6 @@ SND_PCM_OSS_PLUGINS all=y
 SND_SEQUENCER_OSS all=y
 SND_HRTIMER all=m
 SND_SEQ_HRTIMER_DEFAULT all=y
-SND_RTCTIMER alpha=m i386=m ia64=m x86_64=m
-SND_SEQ_RTCTIMER_DEFAULT alpha=y i386=y ia64=y x86_64=y
 SND_DYNAMIC_MINORS all=y
 SND_MAX_CARDS all=32
 SND_SUPPORT_OLD_API all=y
@@ -10927,6 +11149,7 @@ SND_ATMEL_SOC all=m
 SND_SOC_ALL_CODECS all=m
 SND_SOC_AC97_CODEC all=m
 SND_SOC_ADAU1701 all=m
+SND_SOC_ADAU7002 all=m
 SND_SOC_AK4104 all=m
 SND_SOC_AK4554 all=m
 SND_SOC_AK4613 all=m
@@ -10934,7 +11157,9 @@ SND_SOC_AK4641 all=m
 SND_SOC_AK4642 all=m
 SND_SOC_AK5386 all=m
 SND_SOC_ALC5623 all=m
+SND_SOC_BT_SCO all=m
 SND_SOC_CS35L32 all=m
+SND_SOC_CS35L33 all=m
 SND_SOC_CS42L51 all=m
 SND_SOC_CS42L51_I2C all=m
 SND_SOC_CS42L52 all=m
@@ -10947,12 +11172,15 @@ SND_SOC_CS4271_I2C all=m
 SND_SOC_CS4271_SPI all=m
 SND_SOC_CS42XX8_I2C all=m
 SND_SOC_CS4349 all=m
+SND_SOC_CS53L30 all=m
 SND_SOC_ES8328 all=m
 SND_SOC_GTM601 all=m
 SND_SOC_HDAC_HDMI all=m
 SND_SOC_INNO_RK3036 all=m
 SND_SOC_MAX98095 all=m
+SND_SOC_MAX98504 all=m
 SND_SOC_MAX9850 all=m
+SND_SOC_MAX9860 all=m
 SND_SOC_PCM1681 all=m
 SND_SOC_PCM179X all=m
 SND_SOC_PCM179X_I2C all=m
@@ -10978,6 +11206,7 @@ SND_SOC_STI_SAS all=m
 SND_SOC_TAS2552 all=m
 SND_SOC_TAS5086 all=m
 SND_SOC_TAS571X all=m
+SND_SOC_TAS5720 all=m
 SND_SOC_TFA9879 all=m
 SND_SOC_TLV320AIC23 all=m
 SND_SOC_TLV320AIC23_I2C all=m
@@ -11002,9 +11231,11 @@ SND_SOC_WM8804 all=m
 SND_SOC_WM8804_I2C all=m
 SND_SOC_WM8804_SPI all=m
 SND_SOC_WM8903 all=m
+SND_SOC_WM8960 all=m
 SND_SOC_WM8962 all=m
 SND_SOC_WM8974 all=m
 SND_SOC_WM8978 all=m
+SND_SOC_WM8985 all=m
 SND_SOC_WM8991 all=m
 SND_SOC_LM4857 all=m
 SND_SOC_TPA6130A2 all=m
@@ -11013,6 +11244,7 @@ SND_SOC_TPA6130A2 all=m
 #- *** FILE: sound/soc/dwc/Kconfig ***
 #-
 SND_DESIGNWARE_I2S all=m
+SND_DESIGNWARE_PCM all=m
 
 #-
 #- *** FILE: sound/soc/fsl/Kconfig ***
@@ -11055,6 +11287,8 @@ SND_SST_IPC all=m
 SND_SST_IPC_ACPI all=m
 SND_SOC_INTEL_SST all=m
 SND_SOC_INTEL_HASWELL_MACH all=m
+SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH all=m
+SND_SOC_INTEL_BXT_RT298_MACH all=m
 SND_SOC_INTEL_BYT_RT5640_MACH all=m
 SND_SOC_INTEL_BYT_MAX98090_MACH all=m
 SND_SOC_INTEL_BROADWELL_MACH all=m
@@ -11076,6 +11310,7 @@ SND_SOC_QCOM all=m
 #- *** FILE: sound/soc/sunxi/Kconfig ***
 #-
 SND_SUN4I_CODEC all=m
+SND_SUN4I_I2S all=m
 
 #-
 #- *** FILE: sound/soc/xtensa/Kconfig ***
@@ -11130,83 +11365,47 @@ RD_LZMA all=y
 RD_XZ all=y
 RD_LZO all=y
 RD_LZ4 all=y
-NMI_LOG_BUF_SHIFT all=13
-PERF_EVENTS_INTEL_UNCORE all=m
-PERF_EVENTS_INTEL_RAPL all=m
-PERF_EVENTS_INTEL_CSTATE all=m
-MEMORY_HOTPLUG_DEFAULT_ONLINE all=y
-Z3FOLD all=m
-ACPI_TABLE_UPGRADE all=y
-CPU_FREQ_DEFAULT_GOV_SCHEDUTIL all=n
-CPU_FREQ_GOV_SCHEDUTIL all=m
-PCIE_DPC all=m
-RXKAD all=y
-NFC_PN533_USB all=m
-NFC_PN533_I2C all=m
-TCM_QLA2XXX_DEBUG all=n
-SATA_DWC all=m
-SATA_DWC_OLD_DMA all=y
-SATA_DWC_DEBUG all=n
-ISCSI_TARGET_CXGB4 all=m
-GTP all=m
-NET_DSA_MV88E6XXX all=m
-MLXSW_SPECTRUM_DCB all=y
-QED_SRIOV all=y
-QEDE_VXLAN all=y
-QEDE_GENEVE all=y
-WIZNET_W5100_SPI all=m
-SPI_ROCKCHIP all=m
-SENSORS_MAX31722 all=m
-INT3406_THERMAL all=m
-GENERIC_ADC_THERMAL all=m
-MFD_MAX77693 all=m
-REGULATOR_MAX77693 all=m
-REGULATOR_PV88080 all=m
-VIDEO_TW686X all=m
-DRM_AMDGPU_GART_DEBUGFS all=n
-DRM_ANALOGIX_ANX78XX all=m
-SND_SOC_INTEL_BXT_RT298_MACH all=m
-SND_SOC_TAS5720 all=m
-SND_SOC_WM8960 all=m
-HID_ASUS all=m
-USBIP_VUDC all=m
-UCSI all=m
-LEDS_TRIGGER_MTD all=y
-LEDS_TRIGGER_PANIC all=y
-RTC_DRV_DS1302 all=m
-SYNC_FILE all=y
-INTEL_PMC_CORE all=y
-CROS_KBD_LED_BACKLIGHT all=m
-COMMON_CLK_OXNAS all=n
-DEVFREQ_GOV_PASSIVE all=m
-EXTCON_MAX77693 all=m
-AD5592R all=m
-AD5593R all=m
-AM2315 all=m
-BMI160_I2C all=m
-BMI160_SPI all=m
-BH1780 all=m
-MAX44000 all=m
-VEML6070 all=m
-BMC150_MAGN_I2C all=m
-BMC150_MAGN_SPI all=m
-DS1803 all=m
-MCP4131 all=m
-HP03 all=m
-HP206C all=m
-MCE_AMD_INJ all=m
-DEV_DAX all=m
-EFI_BOOTLOADER_CONTROL all=m
-EFI_CAPSULE_LOADER all=m
-F2FS_FAULT_INJECTION all=n
-RCU_PERF_TEST all=m
-HIST_TRIGGERS all=n
-TEST_UUID all=m
-TEST_HASH all=m
-KEY_DH_OPERATIONS all=y
-SECURITY_LOADPIN all=n
-SECONDARY_TRUSTED_KEYRING all=y
-INPUT_MAX77693_HAPTIC all=m
-CHARGER_MAX77693 all=m
-IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY all=n
 
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+ACPI_INITRD_TABLE_OVERRIDE all=y
+ADB_PMU_LED_IDE ppc=y ppc64=y
+ADIS16204 all=m
+ADIS16220 all=m
+AMD_MCE_INJ all=m
+BE2NET_VXLAN all=y
+BNX2X_GENEVE all=y
+BNX2X_VXLAN all=y
+CHELSIO_T4_UWIRE all=y
+DEVPTS_MULTIPLE_INSTANCES all=y
+FM10K_VXLAN all=y
+GEN_RTC_X all=n
+HAVE_BPF_JIT all=y
+I40E_GENEVE all=y
+I40E_VXLAN all=y
+IPMI_SI_PROBE_DEFAULTS all=n
+IWLWIFI_DEBUG_EXPERIMENTAL_UCODE all=y
+IWLWIFI_UAPSD all=y
+IXGBE_VXLAN all=y
+LEDS_TRIGGER_IDE_DISK all=y
+LIS3L02DQ all=m
+LUSTRE_LLITE_LLOOP all=m
+MLX4_EN_VXLAN all=y
+MLX5_CORE_EN_VXLAN all=y
+NET_DSA_MV88E6123 all=m
+NET_DSA_MV88E6131 all=y
+NET_DSA_MV88E6171 all=m
+NET_DSA_MV88E6352 all=m
+QEDE_GENEVE all=y
+QEDE_VXLAN all=y
+QLCNIC_VXLAN all=y
+SCSI_GENERIC_NCR53C400 alpha=y i386=y
+SENSORS_BH1780 all=m
+SND_RTCTIMER alpha=m i386=m ia64=m x86_64=m
+SND_SEQ_RTCTIMER_DEFAULT alpha=y i386=y ia64=y x86_64=y
+STAGING_RDMA all=y
+USB_LED all=m
+VIDEO_TIMBERDALE all=m
+ZONE_DMA_FLAG all=1 sparc64=0
+ZRAM_LZ4_COMPRESS all=y
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch
index d4b6034..28517b8 100644
--- a/kernel-small_fixes.patch
+++ b/kernel-small_fixes.patch
@@ -26,3 +26,4 @@
  				exit
  			fi
  		done
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/746b5ec83b36aa06545622d4109e63f0fc911b03



More information about the pld-cvs-commit mailing list