[packages/kernel] - up to 4.17, apparmor needs update

arekm arekm at pld-linux.org
Mon Jun 4 10:06:34 CEST 2018


commit b00004a5d0fd07492be037c18e98bb26326881d1
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jun 4 10:06:22 2018 +0200

    - up to 4.17, apparmor needs update

 ...d-base-infastructure-for-socket-mediation.patch | 1100 --------------------
 0002-apparmor-af_unix-mediation.patch              |   13 -
 kernel-aufs4.patch                                 |  549 +++++-----
 kernel-multiarch.config                            |  281 +++--
 kernel.spec                                        |   12 +-
 5 files changed, 448 insertions(+), 1507 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index cf67ca2e..b52abf55 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,9 +68,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		4.16
-%define		postver		.13
+%define		rel		0.1
+%define		basever		4.17
+%define		postver		.0
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -119,7 +119,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:	1357fb4ee7c288fdeac5d4e0048f5c18
+# Source0-md5:	5bb13a03274b66b56c85b26682e407d7
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
 # Patch0-md5:	ace51349b2f09e3731709b95b8053289
@@ -217,8 +217,7 @@ Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
 
 # https://gitlab.com/apparmor/apparmor/tree/master/kernel-patches/v4.15
-Patch5001:	0001-apparmor-add-base-infastructure-for-socket-mediation.patch
-Patch5002:	0002-apparmor-af_unix-mediation.patch
+Patch5001:	0002-apparmor-af_unix-mediation.patch
 
 # for rescuecd
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
@@ -685,7 +684,6 @@ rm -f localversion-rt
 # apparmor
 %if %{with apparmor}
 %patch5001 -p1
-%patch5002 -p1
 %endif
 
 %patch250 -p1
diff --git a/0001-apparmor-add-base-infastructure-for-socket-mediation.patch b/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
deleted file mode 100644
index 184fbdd6..00000000
--- a/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
+++ /dev/null
@@ -1,1100 +0,0 @@
-From 27d9aac1346ff7feb6a49bfb33510c2d79a41da7 Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen at canonical.com>
-Date: Tue, 18 Jul 2017 23:18:33 -0700
-Subject: [PATCH 1/2] apparmor: add base infastructure for socket mediation
-
-Provide a basic mediation of sockets. This is not a full net mediation
-but just whether a spcific family of socket can be used by an
-application, along with setting up some basic infrastructure for
-network mediation to follow.
-
-the user space rule hav the basic form of
-  NETWORK RULE = [ QUALIFIERS ] 'network' [ DOMAIN ]
-                 [ TYPE | PROTOCOL ]
-
-  DOMAIN = ( 'inet' | 'ax25' | 'ipx' | 'appletalk' | 'netrom' |
-             'bridge' | 'atmpvc' | 'x25' | 'inet6' | 'rose' |
-	     'netbeui' | 'security' | 'key' | 'packet' | 'ash' |
-	     'econet' | 'atmsvc' | 'sna' | 'irda' | 'pppox' |
-	     'wanpipe' | 'bluetooth' | 'netlink' | 'unix' | 'rds' |
-	     'llc' | 'can' | 'tipc' | 'iucv' | 'rxrpc' | 'isdn' |
-	     'phonet' | 'ieee802154' | 'caif' | 'alg' | 'nfc' |
-	     'vsock' | 'mpls' | 'ib' | 'kcm' ) ','
-
-  TYPE = ( 'stream' | 'dgram' | 'seqpacket' |  'rdm' | 'raw' |
-           'packet' )
-
-  PROTOCOL = ( 'tcp' | 'udp' | 'icmp' )
-
-eg.
-  network,
-  network inet,
-
-Signed-off-by: John Johansen <john.johansen at canonical.com>
-Acked-by: Seth Arnold <seth.arnold at canonical.com>
----
- security/apparmor/.gitignore       |   1 +
- security/apparmor/Makefile         |  43 ++++-
- security/apparmor/apparmorfs.c     |   1 +
- security/apparmor/file.c           |  30 +++
- security/apparmor/include/audit.h  |  16 +-
- security/apparmor/include/net.h    | 114 +++++++++++
- security/apparmor/include/perms.h  |   5 +-
- security/apparmor/include/policy.h |  13 ++
- security/apparmor/lib.c            |   5 +-
- security/apparmor/lsm.c            | 387 +++++++++++++++++++++++++++++++++++++
- security/apparmor/net.c            | 184 ++++++++++++++++++
- security/apparmor/policy_unpack.c  |  47 ++++-
- 12 files changed, 834 insertions(+), 12 deletions(-)
- create mode 100644 security/apparmor/include/net.h
- create mode 100644 security/apparmor/net.c
-
-diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore
-index 9cdec70d72b8..d5b291e94264 100644
---- a/security/apparmor/.gitignore
-+++ b/security/apparmor/.gitignore
-@@ -1,5 +1,6 @@
- #
- # Generated include files
- #
-+net_names.h
- capability_names.h
- rlim_names.h
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index 9a6b4033d52b..e7ff2183532a 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -5,11 +5,44 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
- 
- apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
-               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
--              resource.o secid.o file.o policy_ns.o label.o mount.o
-+              resource.o secid.o file.o policy_ns.o label.o mount.o net.o
- apparmor-$(CONFIG_SECURITY_APPARMOR_HASH) += crypto.o
- 
--clean-files := capability_names.h rlim_names.h
-+clean-files := capability_names.h rlim_names.h net_names.h
- 
-+# Build a lower case string table of address family names
-+# Transform lines from
-+#    #define AF_LOCAL		1	/* POSIX name for AF_UNIX	*/
-+#    #define AF_INET		2	/* Internet IP Protocol 	*/
-+# to
-+#    [1] = "local",
-+#    [2] = "inet",
-+#
-+# and build the securityfs entries for the mapping.
-+# Transforms lines from
-+#    #define AF_INET		2	/* Internet IP Protocol 	*/
-+# to
-+#    #define AA_SFS_AF_MASK "local inet"
-+quiet_cmd_make-af = GEN     $@
-+cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\
-+	sed $< >>$@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e "/AF_ROUTE/d" -e \
-+	 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\
-+	echo "};" >> $@ ;\
-+	printf '%s' '\#define AA_SFS_AF_MASK "' >> $@ ;\
-+	sed -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e "/AF_ROUTE/d" -e \
-+	 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/\L\1/p'\
-+	 $< | tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
-+
-+# Build a lower case string table of sock type names
-+# Transform lines from
-+#    SOCK_STREAM	= 1,
-+# to
-+#    [1] = "stream",
-+quiet_cmd_make-sock = GEN     $@
-+cmd_make-sock = echo "static const char *sock_type_names[] = {" >> $@ ;\
-+	sed $^ >>$@ -r -n \
-+	-e 's/^\tSOCK_([A-Z0-9_]+)[\t]+=[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\
-+	echo "};" >> $@
- 
- # Build a lower case string table of capability names
- # Transforms lines from
-@@ -62,6 +95,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
- 	    tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
- 
- $(obj)/capability.o : $(obj)/capability_names.h
-+$(obj)/net.o : $(obj)/net_names.h
- $(obj)/resource.o : $(obj)/rlim_names.h
- $(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
- 			    $(src)/Makefile
-@@ -69,3 +103,8 @@ $(obj)/capability_names.h : $(srctree)/include/uapi/linux/capability.h \
- $(obj)/rlim_names.h : $(srctree)/include/uapi/asm-generic/resource.h \
- 		      $(src)/Makefile
- 	$(call cmd,make-rlim)
-+$(obj)/net_names.h : $(srctree)/include/linux/socket.h \
-+		     $(srctree)/include/linux/net.h \
-+		     $(src)/Makefile
-+	$(call cmd,make-af)
-+	$(call cmd,make-sock)
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index d4fa04d91439..694c4f48a975 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -2202,6 +2202,7 @@ static struct aa_sfs_entry aa_sfs_entry_features[] = {
- 	AA_SFS_DIR("policy",			aa_sfs_entry_policy),
- 	AA_SFS_DIR("domain",			aa_sfs_entry_domain),
- 	AA_SFS_DIR("file",			aa_sfs_entry_file),
-+	AA_SFS_DIR("network",			aa_sfs_entry_network),
- 	AA_SFS_DIR("mount",			aa_sfs_entry_mount),
- 	AA_SFS_DIR("namespaces",		aa_sfs_entry_ns),
- 	AA_SFS_FILE_U64("capability",		VFS_CAP_FLAGS_MASK),
-diff --git a/security/apparmor/file.c b/security/apparmor/file.c
-index e79bf44396a3..86d57e56fabe 100644
---- a/security/apparmor/file.c
-+++ b/security/apparmor/file.c
-@@ -21,6 +21,7 @@
- #include "include/context.h"
- #include "include/file.h"
- #include "include/match.h"
-+#include "include/net.h"
- #include "include/path.h"
- #include "include/policy.h"
- #include "include/label.h"
-@@ -560,6 +561,32 @@ static int __file_path_perm(const char *op, struct aa_label *label,
- 	return error;
- }
- 
-+static int __file_sock_perm(const char *op, struct aa_label *label,
-+			    struct aa_label *flabel, struct file *file,
-+			    u32 request, u32 denied)
-+{
-+	struct socket *sock = (struct socket *) file->private_data;
-+	int error;
-+
-+	AA_BUG(!sock);
-+
-+	/* revalidation due to label out of date. No revocation at this time */
-+	if (!denied && aa_label_is_subset(flabel, label))
-+		return 0;
-+
-+	/* TODO: improve to skip profiles cached in flabel */
-+	error = aa_sock_file_perm(label, op, request, sock);
-+	if (denied) {
-+		/* TODO: improve to skip profiles checked above */
-+		/* check every profile in file label to is cached */
-+		last_error(error, aa_sock_file_perm(flabel, op, request, sock));
-+	}
-+	if (!error)
-+		update_file_ctx(file_ctx(file), label, request);
-+
-+	return error;
-+}
-+
- /**
-  * aa_file_perm - do permission revalidation check & audit for @file
-  * @op: operation being checked
-@@ -604,6 +631,9 @@ int aa_file_perm(const char *op, struct aa_label *label, struct file *file,
- 		error = __file_path_perm(op, label, flabel, file, request,
- 					 denied);
- 
-+	else if (S_ISSOCK(file_inode(file)->i_mode))
-+		error = __file_sock_perm(op, label, flabel, file, request,
-+					 denied);
- done:
- 	rcu_read_unlock();
- 
-diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
-index 4ac095118717..ff4316e1068d 100644
---- a/security/apparmor/include/audit.h
-+++ b/security/apparmor/include/audit.h
-@@ -123,9 +123,15 @@ struct apparmor_audit_data {
- 			struct aa_label *peer;
- 			union {
- 				struct {
--					const char *target;
- 					kuid_t ouid;
-+					const char *target;
- 				} fs;
-+				struct {
-+					int type, protocol;
-+					struct sock *peer_sk;
-+					void *addr;
-+					int addrlen;
-+				} net;
- 				struct {
- 					int rlim;
- 					unsigned long max;
-diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
-new file mode 100644
-index 000000000000..140c8efcf364
---- /dev/null
-+++ b/security/apparmor/include/net.h
-@@ -0,0 +1,114 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor network mediation definitions.
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2017 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#ifndef __AA_NET_H
-+#define __AA_NET_H
-+
-+#include <net/sock.h>
-+#include <linux/path.h>
-+
-+#include "apparmorfs.h"
-+#include "label.h"
-+#include "perms.h"
-+#include "policy.h"
-+
-+#define AA_MAY_SEND		AA_MAY_WRITE
-+#define AA_MAY_RECEIVE		AA_MAY_READ
-+
-+#define AA_MAY_SHUTDOWN		AA_MAY_DELETE
-+
-+#define AA_MAY_CONNECT		AA_MAY_OPEN
-+#define AA_MAY_ACCEPT		0x00100000
-+
-+#define AA_MAY_BIND		0x00200000
-+#define AA_MAY_LISTEN		0x00400000
-+
-+#define AA_MAY_SETOPT		0x01000000
-+#define AA_MAY_GETOPT		0x02000000
-+
-+#define NET_PERMS_MASK (AA_MAY_SEND | AA_MAY_RECEIVE | AA_MAY_CREATE |    \
-+			AA_MAY_SHUTDOWN | AA_MAY_BIND | AA_MAY_LISTEN |	  \
-+			AA_MAY_CONNECT | AA_MAY_ACCEPT | AA_MAY_SETATTR | \
-+			AA_MAY_GETATTR | AA_MAY_SETOPT | AA_MAY_GETOPT)
-+
-+#define NET_FS_PERMS (AA_MAY_SEND | AA_MAY_RECEIVE | AA_MAY_CREATE |	\
-+		      AA_MAY_SHUTDOWN | AA_MAY_CONNECT | AA_MAY_RENAME |\
-+		      AA_MAY_SETATTR | AA_MAY_GETATTR | AA_MAY_CHMOD |	\
-+		      AA_MAY_CHOWN | AA_MAY_CHGRP | AA_MAY_LOCK |	\
-+		      AA_MAY_MPROT)
-+
-+#define NET_PEER_MASK (AA_MAY_SEND | AA_MAY_RECEIVE | AA_MAY_CONNECT |	\
-+		       AA_MAY_ACCEPT)
-+struct aa_sk_ctx {
-+	struct aa_label *label;
-+	struct aa_label *peer;
-+	struct path path;
-+};
-+
-+#define SK_CTX(X) ((X)->sk_security)
-+#define SOCK_ctx(X) SOCK_INODE(X)->i_security
-+#define DEFINE_AUDIT_NET(NAME, OP, SK, F, T, P)				  \
-+	struct lsm_network_audit NAME ## _net = { .sk = (SK),		  \
-+						  .family = (F)};	  \
-+	DEFINE_AUDIT_DATA(NAME,						  \
-+			  ((SK) && (F) != AF_UNIX) ? LSM_AUDIT_DATA_NET : \
-+						     LSM_AUDIT_DATA_NONE, \
-+			  OP);						  \
-+	NAME.u.net = &(NAME ## _net);					  \
-+	aad(&NAME)->net.type = (T);					  \
-+	aad(&NAME)->net.protocol = (P)
-+
-+#define DEFINE_AUDIT_SK(NAME, OP, SK)					\
-+	DEFINE_AUDIT_NET(NAME, OP, SK, (SK)->sk_family, (SK)->sk_type,	\
-+			 (SK)->sk_protocol)
-+
-+/* struct aa_net - network confinement data
-+ * @allow: basic network families permissions
-+ * @audit: which network permissions to force audit
-+ * @quiet: which network permissions to quiet rejects
-+ */
-+struct aa_net {
-+	u16 allow[AF_MAX];
-+	u16 audit[AF_MAX];
-+	u16 quiet[AF_MAX];
-+};
-+
-+
-+extern struct aa_sfs_entry aa_sfs_entry_network[];
-+
-+void audit_net_cb(struct audit_buffer *ab, void *va);
-+int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa,
-+		       u32 request, u16 family, int type);
-+int aa_af_perm(struct aa_label *label, const char *op, u32 request, u16 family,
-+	       int type, int protocol);
-+static inline int aa_profile_af_sk_perm(struct aa_profile *profile,
-+					struct common_audit_data *sa,
-+					u32 request,
-+					struct sock *sk)
-+{
-+	return aa_profile_af_perm(profile, sa, request, sk->sk_family,
-+				  sk->sk_type);
-+}
-+int aa_sk_perm(const char *op, u32 request, struct sock *sk);
-+
-+int aa_sock_file_perm(struct aa_label *label, const char *op, u32 request,
-+		      struct socket *sock);
-+
-+
-+static inline void aa_free_net_rules(struct aa_net *new)
-+{
-+	/* NOP */
-+}
-+
-+#endif /* __AA_NET_H */
-diff --git a/security/apparmor/include/perms.h b/security/apparmor/include/perms.h
-index d7b7e7115160..38aa6247d00f 100644
---- a/security/apparmor/include/perms.h
-+++ b/security/apparmor/include/perms.h
-@@ -138,9 +138,10 @@ extern struct aa_perms allperms;
- 
- 
- void aa_perm_mask_to_str(char *str, const char *chrs, u32 mask);
--void aa_audit_perm_names(struct audit_buffer *ab, const char **names, u32 mask);
-+void aa_audit_perm_names(struct audit_buffer *ab, const char * const *names,
-+			 u32 mask);
- void aa_audit_perm_mask(struct audit_buffer *ab, u32 mask, const char *chrs,
--			u32 chrsmask, const char **names, u32 namesmask);
-+			u32 chrsmask, const char * const *names, u32 namesmask);
- void aa_apply_modes_to_perms(struct aa_profile *profile,
- 			     struct aa_perms *perms);
- void aa_compute_perms(struct aa_dfa *dfa, unsigned int state,
-diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
-index 17fe41a9cac3..4364088a0b9e 100644
---- a/security/apparmor/include/policy.h
-+++ b/security/apparmor/include/policy.h
-@@ -30,6 +30,7 @@
- #include "file.h"
- #include "lib.h"
- #include "label.h"
-+#include "net.h"
- #include "perms.h"
- #include "resource.h"
- 
-@@ -111,6 +112,7 @@ struct aa_data {
-  * @policy: general match rules governing policy
-  * @file: The set of rules governing basic file access and domain transitions
-  * @caps: capabilities for the profile
-+ * @net: network controls for the profile
-  * @rlimits: rlimits for the profile
-  *
-  * @dents: dentries for the profiles file entries in apparmorfs
-@@ -148,6 +150,7 @@ struct aa_profile {
- 	struct aa_policydb policy;
- 	struct aa_file_rules file;
- 	struct aa_caps caps;
-+	struct aa_net net;
- 	struct aa_rlimit rlimits;
- 
- 	struct aa_loaddata *rawdata;
-@@ -220,6 +223,16 @@ static inline unsigned int PROFILE_MEDIATES_SAFE(struct aa_profile *profile,
- 	return 0;
- }
- 
-+static inline unsigned int PROFILE_MEDIATES_AF(struct aa_profile *profile,
-+					       u16 AF) {
-+	unsigned int state = PROFILE_MEDIATES(profile, AA_CLASS_NET);
-+	u16 be_af = cpu_to_be16(AF);
-+
-+	if (!state)
-+		return 0;
-+	return aa_dfa_match_len(profile->policy.dfa, state, (char *) &be_af, 2);
-+}
-+
- /**
-  * aa_get_profile - increment refcount on profile @p
-  * @p: profile  (MAYBE NULL)
-diff --git a/security/apparmor/lib.c b/security/apparmor/lib.c
-index 4d5e98e49d5e..068a9f471f77 100644
---- a/security/apparmor/lib.c
-+++ b/security/apparmor/lib.c
-@@ -211,7 +211,8 @@ void aa_perm_mask_to_str(char *str, const char *chrs, u32 mask)
- 	*str = '\0';
- }
- 
--void aa_audit_perm_names(struct audit_buffer *ab, const char **names, u32 mask)
-+void aa_audit_perm_names(struct audit_buffer *ab, const char * const *names,
-+			 u32 mask)
- {
- 	const char *fmt = "%s";
- 	unsigned int i, perm = 1;
-@@ -229,7 +230,7 @@ void aa_audit_perm_names(struct audit_buffer *ab, const char **names, u32 mask)
- }
- 
- void aa_audit_perm_mask(struct audit_buffer *ab, u32 mask, const char *chrs,
--			u32 chrsmask, const char **names, u32 namesmask)
-+			u32 chrsmask, const char * const *names, u32 namesmask)
- {
- 	char str[33];
- 
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 9a65eeaf7dfa..0cd717614fd0 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -33,6 +33,7 @@
- #include "include/context.h"
- #include "include/file.h"
- #include "include/ipc.h"
-+#include "include/net.h"
- #include "include/path.h"
- #include "include/label.h"
- #include "include/policy.h"
-@@ -736,6 +737,368 @@ static int apparmor_task_kill(struct task_struct *target, struct siginfo *info,
- 	return error;
- }
- 
-+/**
-+ * apparmor_sk_alloc_security - allocate and attach the sk_security field
-+ */
-+static int apparmor_sk_alloc_security(struct sock *sk, int family, gfp_t flags)
-+{
-+	struct aa_sk_ctx *ctx;
-+
-+	ctx = kzalloc(sizeof(*ctx), flags);
-+	if (!ctx)
-+		return -ENOMEM;
-+
-+	SK_CTX(sk) = ctx;
-+
-+	return 0;
-+}
-+
-+/**
-+ * apparmor_sk_free_security - free the sk_security field
-+ */
-+static void apparmor_sk_free_security(struct sock *sk)
-+{
-+	struct aa_sk_ctx *ctx = SK_CTX(sk);
-+
-+	SK_CTX(sk) = NULL;
-+	aa_put_label(ctx->label);
-+	aa_put_label(ctx->peer);
-+	path_put(&ctx->path);
-+	kfree(ctx);
-+}
-+
-+/**
-+ * apparmor_clone_security - clone the sk_security field
-+ */
-+static void apparmor_sk_clone_security(const struct sock *sk,
-+				       struct sock *newsk)
-+{
-+	struct aa_sk_ctx *ctx = SK_CTX(sk);
-+	struct aa_sk_ctx *new = SK_CTX(newsk);
-+
-+	new->label = aa_get_label(ctx->label);
-+	new->peer = aa_get_label(ctx->peer);
-+	new->path = ctx->path;
-+	path_get(&new->path);
-+}
-+
-+static int aa_sock_create_perm(struct aa_label *label, int family, int type,
-+			       int protocol)
-+{
-+	AA_BUG(!label);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_af_perm(label, OP_CREATE, AA_MAY_CREATE, family, type,
-+			  protocol);
-+}
-+
-+
-+/**
-+ * apparmor_socket_create - check perms before creating a new socket
-+ */
-+static int apparmor_socket_create(int family, int type, int protocol, int kern)
-+{
-+	struct aa_label *label;
-+	int error = 0;
-+
-+	label = begin_current_label_crit_section();
-+	if (!(kern || unconfined(label)))
-+		error = aa_sock_create_perm(label, family, type, protocol);
-+	end_current_label_crit_section(label);
-+
-+	return error;
-+}
-+
-+/**
-+ * apparmor_socket_post_create - setup the per-socket security struct
-+ *
-+ * Note:
-+ * -   kernel sockets currently labeled unconfined but we may want to
-+ *     move to a special kernel label
-+ * -   socket may not have sk here if created with sock_create_lite or
-+ *     sock_alloc. These should be accept cases which will be handled in
-+ *     sock_graft.
-+ */
-+static int apparmor_socket_post_create(struct socket *sock, int family,
-+				       int type, int protocol, int kern)
-+{
-+	struct aa_label *label;
-+
-+	if (kern) {
-+		struct aa_ns *ns = aa_get_current_ns();
-+
-+		label = aa_get_label(ns_unconfined(ns));
-+		aa_put_ns(ns);
-+	} else
-+		label = aa_get_current_label();
-+
-+	if (sock->sk) {
-+		struct aa_sk_ctx *ctx = SK_CTX(sock->sk);
-+
-+		aa_put_label(ctx->label);
-+		ctx->label = aa_get_label(label);
-+	}
-+	aa_put_label(label);
-+
-+	return 0;
-+}
-+
-+/**
-+ * apparmor_socket_bind - check perms before bind addr to socket
-+ */
-+static int apparmor_socket_bind(struct socket *sock,
-+				struct sockaddr *address, int addrlen)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(!address);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(OP_BIND, AA_MAY_BIND, sock->sk);
-+}
-+
-+/**
-+ * apparmor_socket_connect - check perms before connecting @sock to @address
-+ */
-+static int apparmor_socket_connect(struct socket *sock,
-+				   struct sockaddr *address, int addrlen)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(!address);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(OP_CONNECT, AA_MAY_CONNECT, sock->sk);
-+}
-+
-+/**
-+ * apparmor_socket_list - check perms before allowing listen
-+ */
-+static int apparmor_socket_listen(struct socket *sock, int backlog)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(OP_LISTEN, AA_MAY_LISTEN, sock->sk);
-+}
-+
-+/**
-+ * apparmor_socket_accept - check perms before accepting a new connection.
-+ *
-+ * Note: while @newsock is created and has some information, the accept
-+ *       has not been done.
-+ */
-+static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(!newsock);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(OP_ACCEPT, AA_MAY_ACCEPT, sock->sk);
-+}
-+
-+static int aa_sock_msg_perm(const char *op, u32 request, struct socket *sock,
-+			    struct msghdr *msg, int size)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(!msg);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(op, request, sock->sk);
-+}
-+
-+/**
-+ * apparmor_socket_sendmsg - check perms before sending msg to another socket
-+ */
-+static int apparmor_socket_sendmsg(struct socket *sock,
-+				   struct msghdr *msg, int size)
-+{
-+	return aa_sock_msg_perm(OP_SENDMSG, AA_MAY_SEND, sock, msg, size);
-+}
-+
-+/**
-+ * apparmor_socket_recvmsg - check perms before receiving a message
-+ */
-+static int apparmor_socket_recvmsg(struct socket *sock,
-+				   struct msghdr *msg, int size, int flags)
-+{
-+	return aa_sock_msg_perm(OP_RECVMSG, AA_MAY_RECEIVE, sock, msg, size);
-+}
-+
-+/* revaliation, get/set attr, shutdown */
-+static int aa_sock_perm(const char *op, u32 request, struct socket *sock)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(op, request, sock->sk);
-+}
-+
-+/**
-+ * apparmor_socket_getsockname - check perms before getting the local address
-+ */
-+static int apparmor_socket_getsockname(struct socket *sock)
-+{
-+	return aa_sock_perm(OP_GETSOCKNAME, AA_MAY_GETATTR, sock);
-+}
-+
-+/**
-+ * apparmor_socket_getpeername - check perms before getting remote address
-+ */
-+static int apparmor_socket_getpeername(struct socket *sock)
-+{
-+	return aa_sock_perm(OP_GETPEERNAME, AA_MAY_GETATTR, sock);
-+}
-+
-+/* revaliation, get/set attr, opt */
-+static int aa_sock_opt_perm(const char *op, u32 request, struct socket *sock,
-+			    int level, int optname)
-+{
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+	AA_BUG(in_interrupt());
-+
-+	return aa_sk_perm(op, request, sock->sk);
-+}
-+
-+/**
-+ * apparmor_getsockopt - check perms before getting socket options
-+ */
-+static int apparmor_socket_getsockopt(struct socket *sock, int level,
-+				      int optname)
-+{
-+	return aa_sock_opt_perm(OP_GETSOCKOPT, AA_MAY_GETOPT, sock,
-+				level, optname);
-+}
-+
-+/**
-+ * apparmor_setsockopt - check perms before setting socket options
-+ */
-+static int apparmor_socket_setsockopt(struct socket *sock, int level,
-+				      int optname)
-+{
-+	return aa_sock_opt_perm(OP_SETSOCKOPT, AA_MAY_SETOPT, sock,
-+				level, optname);
-+}
-+
-+/**
-+ * apparmor_socket_shutdown - check perms before shutting down @sock conn
-+ */
-+static int apparmor_socket_shutdown(struct socket *sock, int how)
-+{
-+	return aa_sock_perm(OP_SHUTDOWN, AA_MAY_SHUTDOWN, sock);
-+}
-+
-+/**
-+ * apparmor_socket_sock_recv_skb - check perms before associating skb to sk
-+ *
-+ * Note: can not sleep may be called with locks held
-+ *
-+ * dont want protocol specific in __skb_recv_datagram()
-+ * to deny an incoming connection  socket_sock_rcv_skb()
-+ */
-+static int apparmor_socket_sock_rcv_skb(struct sock *sk, struct sk_buff *skb)
-+{
-+	return 0;
-+}
-+
-+
-+static struct aa_label *sk_peer_label(struct sock *sk)
-+{
-+	struct aa_sk_ctx *ctx = SK_CTX(sk);
-+
-+	if (ctx->peer)
-+		return ctx->peer;
-+
-+	return ERR_PTR(-ENOPROTOOPT);
-+}
-+
-+/**
-+ * apparmor_socket_getpeersec_stream - get security context of peer
-+ *
-+ * Note: for tcp only valid if using ipsec or cipso on lan
-+ */
-+static int apparmor_socket_getpeersec_stream(struct socket *sock,
-+					     char __user *optval,
-+					     int __user *optlen,
-+					     unsigned int len)
-+{
-+	char *name;
-+	int slen, error = 0;
-+	struct aa_label *label;
-+	struct aa_label *peer;
-+
-+	label = begin_current_label_crit_section();
-+	peer = sk_peer_label(sock->sk);
-+	if (IS_ERR(peer)) {
-+		error = PTR_ERR(peer);
-+		goto done;
-+	}
-+	slen = aa_label_asxprint(&name, labels_ns(label), peer,
-+				 FLAG_SHOW_MODE | FLAG_VIEW_SUBNS |
-+				 FLAG_HIDDEN_UNCONFINED, GFP_KERNEL);
-+	/* don't include terminating \0 in slen, it breaks some apps */
-+	if (slen < 0) {
-+		error = -ENOMEM;
-+	} else {
-+		if (slen > len) {
-+			error = -ERANGE;
-+		} else if (copy_to_user(optval, name, slen)) {
-+			error = -EFAULT;
-+			goto out;
-+		}
-+		if (put_user(slen, optlen))
-+			error = -EFAULT;
-+out:
-+		kfree(name);
-+
-+	}
-+
-+done:
-+	end_current_label_crit_section(label);
-+
-+	return error;
-+}
-+
-+/**
-+ * apparmor_socket_getpeersec_dgram - get security label of packet
-+ * @sock: the peer socket
-+ * @skb: packet data
-+ * @secid: pointer to where to put the secid of the packet
-+ *
-+ * Sets the netlabel socket state on sk from parent
-+ */
-+static int apparmor_socket_getpeersec_dgram(struct socket *sock,
-+					    struct sk_buff *skb, u32 *secid)
-+
-+{
-+	/* TODO: requires secid support */
-+	return -ENOPROTOOPT;
-+}
-+
-+/**
-+ * apparmor_sock_graft - Initialize newly created socket
-+ * @sk: child sock
-+ * @parent: parent socket
-+ *
-+ * Note: could set off of SOCK_CTX(parent) but need to track inode and we can
-+ *       just set sk security information off of current creating process label
-+ *       Labeling of sk for accept case - probably should be sock based
-+ *       instead of task, because of the case where an implicitly labeled
-+ *       socket is shared by different tasks.
-+ */
-+static void apparmor_sock_graft(struct sock *sk, struct socket *parent)
-+{
-+	struct aa_sk_ctx *ctx = SK_CTX(sk);
-+
-+	if (!ctx->label)
-+		ctx->label = aa_get_current_label();
-+}
-+
- static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
- 	LSM_HOOK_INIT(ptrace_access_check, apparmor_ptrace_access_check),
- 	LSM_HOOK_INIT(ptrace_traceme, apparmor_ptrace_traceme),
-@@ -770,6 +1133,30 @@ static struct security_hook_list apparmor_hooks[] __lsm_ro_after_init = {
- 	LSM_HOOK_INIT(getprocattr, apparmor_getprocattr),
- 	LSM_HOOK_INIT(setprocattr, apparmor_setprocattr),
- 
-+	LSM_HOOK_INIT(sk_alloc_security, apparmor_sk_alloc_security),
-+	LSM_HOOK_INIT(sk_free_security, apparmor_sk_free_security),
-+	LSM_HOOK_INIT(sk_clone_security, apparmor_sk_clone_security),
-+
-+	LSM_HOOK_INIT(socket_create, apparmor_socket_create),
-+	LSM_HOOK_INIT(socket_post_create, apparmor_socket_post_create),
-+	LSM_HOOK_INIT(socket_bind, apparmor_socket_bind),
-+	LSM_HOOK_INIT(socket_connect, apparmor_socket_connect),
-+	LSM_HOOK_INIT(socket_listen, apparmor_socket_listen),
-+	LSM_HOOK_INIT(socket_accept, apparmor_socket_accept),
-+	LSM_HOOK_INIT(socket_sendmsg, apparmor_socket_sendmsg),
-+	LSM_HOOK_INIT(socket_recvmsg, apparmor_socket_recvmsg),
-+	LSM_HOOK_INIT(socket_getsockname, apparmor_socket_getsockname),
-+	LSM_HOOK_INIT(socket_getpeername, apparmor_socket_getpeername),
-+	LSM_HOOK_INIT(socket_getsockopt, apparmor_socket_getsockopt),
-+	LSM_HOOK_INIT(socket_setsockopt, apparmor_socket_setsockopt),
-+	LSM_HOOK_INIT(socket_shutdown, apparmor_socket_shutdown),
-+	LSM_HOOK_INIT(socket_sock_rcv_skb, apparmor_socket_sock_rcv_skb),
-+	LSM_HOOK_INIT(socket_getpeersec_stream,
-+		      apparmor_socket_getpeersec_stream),
-+	LSM_HOOK_INIT(socket_getpeersec_dgram,
-+		      apparmor_socket_getpeersec_dgram),
-+	LSM_HOOK_INIT(sock_graft, apparmor_sock_graft),
-+
- 	LSM_HOOK_INIT(cred_alloc_blank, apparmor_cred_alloc_blank),
- 	LSM_HOOK_INIT(cred_free, apparmor_cred_free),
- 	LSM_HOOK_INIT(cred_prepare, apparmor_cred_prepare),
-diff --git a/security/apparmor/net.c b/security/apparmor/net.c
-new file mode 100644
-index 000000000000..33d54435f8d6
---- /dev/null
-+++ b/security/apparmor/net.c
-@@ -0,0 +1,184 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor network mediation
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2017 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#include "include/apparmor.h"
-+#include "include/audit.h"
-+#include "include/context.h"
-+#include "include/label.h"
-+#include "include/net.h"
-+#include "include/policy.h"
-+
-+#include "net_names.h"
-+
-+
-+struct aa_sfs_entry aa_sfs_entry_network[] = {
-+	AA_SFS_FILE_STRING("af_mask",	AA_SFS_AF_MASK),
-+	{ }
-+};
-+
-+static const char * const net_mask_names[] = {
-+	"unknown",
-+	"send",
-+	"receive",
-+	"unknown",
-+
-+	"create",
-+	"shutdown",
-+	"connect",
-+	"unknown",
-+
-+	"setattr",
-+	"getattr",
-+	"setcred",
-+	"getcred",
-+
-+	"chmod",
-+	"chown",
-+	"chgrp",
-+	"lock",
-+
-+	"mmap",
-+	"mprot",
-+	"unknown",
-+	"unknown",
-+
-+	"accept",
-+	"bind",
-+	"listen",
-+	"unknown",
-+
-+	"setopt",
-+	"getopt",
-+	"unknown",
-+	"unknown",
-+
-+	"unknown",
-+	"unknown",
-+	"unknown",
-+	"unknown",
-+};
-+
-+
-+/* audit callback for net specific fields */
-+void audit_net_cb(struct audit_buffer *ab, void *va)
-+{
-+	struct common_audit_data *sa = va;
-+
-+	audit_log_format(ab, " family=");
-+	if (address_family_names[sa->u.net->family])
-+		audit_log_string(ab, address_family_names[sa->u.net->family]);
-+	else
-+		audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family);
-+	audit_log_format(ab, " sock_type=");
-+	if (sock_type_names[aad(sa)->net.type])
-+		audit_log_string(ab, sock_type_names[aad(sa)->net.type]);
-+	else
-+		audit_log_format(ab, "\"unknown(%d)\"", aad(sa)->net.type);
-+	audit_log_format(ab, " protocol=%d", aad(sa)->net.protocol);
-+
-+	if (aad(sa)->request & NET_PERMS_MASK) {
-+		audit_log_format(ab, " requested_mask=");
-+		aa_audit_perm_mask(ab, aad(sa)->request, NULL, 0,
-+				   net_mask_names, NET_PERMS_MASK);
-+
-+		if (aad(sa)->denied & NET_PERMS_MASK) {
-+			audit_log_format(ab, " denied_mask=");
-+			aa_audit_perm_mask(ab, aad(sa)->denied, NULL, 0,
-+					   net_mask_names, NET_PERMS_MASK);
-+		}
-+	}
-+	if (aad(sa)->peer) {
-+		audit_log_format(ab, " peer=");
-+		aa_label_xaudit(ab, labels_ns(aad(sa)->label), aad(sa)->peer,
-+				FLAGS_NONE, GFP_ATOMIC);
-+	}
-+}
-+
-+
-+/* Generic af perm */
-+int aa_profile_af_perm(struct aa_profile *profile, struct common_audit_data *sa,
-+		       u32 request, u16 family, int type)
-+{
-+	struct aa_perms perms = { };
-+
-+	AA_BUG(family >= AF_MAX);
-+	AA_BUG(type < 0 || type >= SOCK_MAX);
-+
-+	if (profile_unconfined(profile))
-+		return 0;
-+
-+	perms.allow = (profile->net.allow[family] & (1 << type)) ?
-+		ALL_PERMS_MASK : 0;
-+	perms.audit = (profile->net.audit[family] & (1 << type)) ?
-+		ALL_PERMS_MASK : 0;
-+	perms.quiet = (profile->net.quiet[family] & (1 << type)) ?
-+		ALL_PERMS_MASK : 0;
-+	aa_apply_modes_to_perms(profile, &perms);
-+
-+	return aa_check_perms(profile, &perms, request, sa, audit_net_cb);
-+}
-+
-+int aa_af_perm(struct aa_label *label, const char *op, u32 request, u16 family,
-+	       int type, int protocol)
-+{
-+	struct aa_profile *profile;
-+	DEFINE_AUDIT_NET(sa, op, NULL, family, type, protocol);
-+
-+	return fn_for_each_confined(label, profile,
-+			aa_profile_af_perm(profile, &sa, request, family,
-+					   type));
-+}
-+
-+static int aa_label_sk_perm(struct aa_label *label, const char *op, u32 request,
-+			    struct sock *sk)
-+{
-+	struct aa_profile *profile;
-+	DEFINE_AUDIT_SK(sa, op, sk);
-+
-+	AA_BUG(!label);
-+	AA_BUG(!sk);
-+
-+	if (unconfined(label))
-+		return 0;
-+
-+	return fn_for_each_confined(label, profile,
-+			aa_profile_af_sk_perm(profile, &sa, request, sk));
-+}
-+
-+int aa_sk_perm(const char *op, u32 request, struct sock *sk)
-+{
-+	struct aa_label *label;
-+	int error;
-+
-+	AA_BUG(!sk);
-+	AA_BUG(in_interrupt());
-+
-+	/* TODO: switch to begin_current_label ???? */
-+	label = begin_current_label_crit_section();
-+	error = aa_label_sk_perm(label, op, request, sk);
-+	end_current_label_crit_section(label);
-+
-+	return error;
-+}
-+
-+
-+int aa_sock_file_perm(struct aa_label *label, const char *op, u32 request,
-+		      struct socket *sock)
-+{
-+	AA_BUG(!label);
-+	AA_BUG(!sock);
-+	AA_BUG(!sock->sk);
-+
-+	return aa_label_sk_perm(label, op, request, sock->sk);
-+}
-diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
-index 59a1a25b7d43..68b168e8f499 100644
---- a/security/apparmor/policy_unpack.c
-+++ b/security/apparmor/policy_unpack.c
-@@ -275,6 +275,19 @@ static bool unpack_nameX(struct aa_ext *e, enum aa_code code, const char *name)
- 	return 0;
- }
- 
-+static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
-+{
-+	if (unpack_nameX(e, AA_U16, name)) {
-+		if (!inbounds(e, sizeof(u16)))
-+			return 0;
-+		if (data)
-+			*data = le16_to_cpu(get_unaligned((__le16 *) e->pos));
-+		e->pos += sizeof(u16);
-+		return 1;
-+	}
-+	return 0;
-+}
-+
- static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
- {
- 	if (unpack_nameX(e, AA_U32, name)) {
-@@ -584,7 +597,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
- 	struct aa_profile *profile = NULL;
- 	const char *tmpname, *tmpns = NULL, *name = NULL;
- 	const char *info = "failed to unpack profile";
--	size_t ns_len;
-+	size_t size = 0, ns_len;
- 	struct rhashtable_params params = { 0 };
- 	char *key = NULL;
- 	struct aa_data *data;
-@@ -717,6 +730,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e, char **ns_name)
- 		goto fail;
- 	}
- 
-+	size = unpack_array(e, "net_allowed_af");
-+	if (size) {
-+
-+		for (i = 0; i < size; i++) {
-+			/* discard extraneous rules that this kernel will
-+			 * never request
-+			 */
-+			if (i >= AF_MAX) {
-+				u16 tmp;
-+
-+				if (!unpack_u16(e, &tmp, NULL) ||
-+				    !unpack_u16(e, &tmp, NULL) ||
-+				    !unpack_u16(e, &tmp, NULL))
-+					goto fail;
-+				continue;
-+			}
-+			if (!unpack_u16(e, &profile->net.allow[i], NULL))
-+				goto fail;
-+			if (!unpack_u16(e, &profile->net.audit[i], NULL))
-+				goto fail;
-+			if (!unpack_u16(e, &profile->net.quiet[i], NULL))
-+				goto fail;
-+		}
-+		if (!unpack_nameX(e, AA_ARRAYEND, NULL))
-+			goto fail;
-+	}
-+	if (VERSION_LT(e->version, v7)) {
-+		/* pre v7 policy always allowed these */
-+		profile->net.allow[AF_UNIX] = 0xffff;
-+		profile->net.allow[AF_NETLINK] = 0xffff;
-+	}
-+
- 	if (unpack_nameX(e, AA_STRUCT, "policydb")) {
- 		/* generic policy dfa - optional and may be NULL */
- 		info = "failed to unpack policydb";
--- 
-2.14.1
-
diff --git a/0002-apparmor-af_unix-mediation.patch b/0002-apparmor-af_unix-mediation.patch
index e01c72fc..95228c41 100644
--- a/0002-apparmor-af_unix-mediation.patch
+++ b/0002-apparmor-af_unix-mediation.patch
@@ -907,19 +907,6 @@ index 05fb3305671e..26762db2207d 100644
  	PATH_CONNECT_PATH = 0x4,	/* connect disconnected paths to / */
  	PATH_CHROOT_REL = 0x8,		/* do path lookup relative to chroot */
  	PATH_CHROOT_NSCONNECT = 0x10,	/* connect paths that are at ns root */
-diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
-index 4364088a0b9e..26660a1a50b0 100644
---- a/security/apparmor/include/policy.h
-+++ b/security/apparmor/include/policy.h
-@@ -226,7 +226,7 @@ static inline unsigned int PROFILE_MEDIATES_SAFE(struct aa_profile *profile,
- static inline unsigned int PROFILE_MEDIATES_AF(struct aa_profile *profile,
- 					       u16 AF) {
- 	unsigned int state = PROFILE_MEDIATES(profile, AA_CLASS_NET);
--	u16 be_af = cpu_to_be16(AF);
-+	__be16 be_af = cpu_to_be16(AF);
- 
- 	if (!state)
- 		return 0;
 diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
 index 0cd717614fd0..245c98ef311e 100644
 --- a/security/apparmor/lsm.c
diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index 0d060448..40d9b916 100644
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -14,7 +14,7 @@ index bc821a8..7ae814c 100644
  endif # MISC_FILESYSTEMS
  
 diff --git a/fs/Makefile b/fs/Makefile
-index add789e..26100d6 100644
+index c9375fd..8af5671 100644
 --- a/fs/Makefile
 +++ b/fs/Makefile
 @@ -128,3 +128,4 @@ obj-y				+= exofs/ # Multiple modules
@@ -26,10 +26,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs4.x-rcN base patch
 
 diff --git a/MAINTAINERS b/MAINTAINERS
-index 4623caf..7617c0e 100644
+index 92be777..138f5e6 100644
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -2484,6 +2484,19 @@ F:	include/linux/audit.h
+@@ -2517,6 +2517,19 @@ F:	include/linux/audit.h
  F:	include/uapi/linux/audit.h
  F:	kernel/audit*
  
@@ -50,7 +50,7 @@ index 4623caf..7617c0e 100644
  M:	Miguel Ojeda Sandonis <miguel.ojeda.sandonis at gmail.com>
  W:	http://miguelojeda.es/auxdisplay.htm
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 87855b5..962b2d6 100644
+index c9d0449..79902c1 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -691,6 +691,24 @@ static inline int is_loop_device(struct file *file)
@@ -79,10 +79,10 @@ index 87855b5..962b2d6 100644
  
  static ssize_t loop_attr_show(struct device *dev, char *page,
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 7c38f39..9ce5e26 100644
+index 86d2de6..213ddcd 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1200,7 +1200,7 @@ enum d_walk_ret {
+@@ -1234,7 +1234,7 @@ enum d_walk_ret {
   *
   * The @enter() and @finish() callbacks are called with d_lock held.
   */
@@ -92,7 +92,7 @@ index 7c38f39..9ce5e26 100644
  		   void (*finish)(void *))
  {
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 1e97f1f..8cd01f7 100644
+index d737ff0..7550799 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -32,7 +32,7 @@
@@ -114,10 +114,10 @@ index 1e97f1f..8cd01f7 100644
  		return error;
  
 diff --git a/fs/inode.c b/fs/inode.c
-index ef36236..929a5a3 100644
+index 13ceb98..68b3b45 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1659,7 +1659,7 @@ EXPORT_SYMBOL(generic_update_time);
+@@ -1662,7 +1662,7 @@ EXPORT_SYMBOL(generic_update_time);
   * This does the actual work of updating an inodes time or version.  Must have
   * had called mnt_want_write() before calling this.
   */
@@ -127,7 +127,7 @@ index ef36236..929a5a3 100644
  	int (*update_time)(struct inode *, struct timespec *, int);
  
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 9d1374a..26ef600 100644
+index 5f75969..61129ff 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -846,6 +846,12 @@ static inline int check_mnt(struct mount *mnt)
@@ -144,10 +144,10 @@ index 9d1374a..26ef600 100644
   * vfsmount lock must be held for write
   */
 diff --git a/fs/read_write.c b/fs/read_write.c
-index f8547b8..0a5c47b 100644
+index c4eabbf..ddd6e67 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -484,6 +484,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
+@@ -489,6 +489,28 @@ ssize_t __vfs_write(struct file *file, const char __user *p, size_t count,
  		return -EINVAL;
  }
  
@@ -177,7 +177,7 @@ index f8547b8..0a5c47b 100644
  {
  	mm_segment_t old_fs;
 diff --git a/fs/splice.c b/fs/splice.c
-index 39e2dc0..c5fb195 100644
+index 005d09c..f617ab0 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -837,8 +837,8 @@ EXPORT_SYMBOL(generic_splice_sendpage);
@@ -205,7 +205,7 @@ index 39e2dc0..c5fb195 100644
  	ssize_t (*splice_read)(struct file *, loff_t *,
  			       struct pipe_inode_info *, size_t, unsigned int);
 diff --git a/fs/sync.c b/fs/sync.c
-index 6e0a2cb..a6891ee 100644
+index b54e054..2860782 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -28,7 +28,7 @@
@@ -230,7 +230,7 @@ index 279720d..76e38ea 100644
  static inline void fput_light(struct file *file, int fput_needed)
  {
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 79c41398..383ab06 100644
+index 760d8da..09a2542 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
 @@ -1270,6 +1270,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -241,7 +241,7 @@ index 79c41398..383ab06 100644
  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 void f_delown(struct file *filp);
-@@ -1721,6 +1722,7 @@ struct file_operations {
+@@ -1724,6 +1725,7 @@ struct file_operations {
  	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);
  	int (*check_flags)(int);
@@ -249,7 +249,7 @@ index 79c41398..383ab06 100644
  	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_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int);
-@@ -1791,6 +1793,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
+@@ -1794,6 +1796,12 @@ ssize_t rw_copy_check_uvector(int type, const struct iovec __user * uvector,
  			      struct iovec *fast_pointer,
  			      struct iovec **ret_pointer);
  
@@ -262,7 +262,7 @@ index 79c41398..383ab06 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_write(struct file *, const char __user *, size_t, loff_t *);
-@@ -2195,6 +2203,7 @@ extern int current_umask(void);
+@@ -2199,6 +2207,7 @@ extern int current_umask(void);
  extern void ihold(struct inode * inode);
  extern void iput(struct inode *);
  extern int generic_update_time(struct inode *, struct timespec *, int);
@@ -270,7 +270,7 @@ index 79c41398..383ab06 100644
  
  /* /sys/fs */
  extern struct kobject *fs_kobj;
-@@ -2475,6 +2484,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
+@@ -2485,6 +2494,7 @@ static inline bool sb_is_blkdev_sb(struct super_block *sb)
  	return false;
  }
  #endif
@@ -334,7 +334,7 @@ index 74b4911..19789fb 100644
 +			 unsigned int flags);
  #endif
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 89b5f83..0dca42f 100644
+index 0233863..06e0d7a 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -140,7 +140,7 @@ static struct lock_list list_entries[MAX_LOCKDEP_ENTRIES];
@@ -358,10 +358,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs4.x-rcN mmap patch
 
 diff --git a/fs/proc/base.c b/fs/proc/base.c
-index 9298324..da5bf4f9 100644
+index 1b2ede6..dc3fd6d 100644
 --- a/fs/proc/base.c
 +++ b/fs/proc/base.c
-@@ -2014,7 +2014,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
+@@ -2024,7 +2024,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path)
  	down_read(&mm->mmap_sem);
  	vma = find_exact_vma(mm, vm_start, vm_end);
  	if (vma && vma->vm_file) {
@@ -387,10 +387,10 @@ index 7563437..7c0dc0f 100644
  		ino = inode->i_ino;
  	}
 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index ec6d298..34c7193 100644
+index c486ad4..76b71f8 100644
 --- a/fs/proc/task_mmu.c
 +++ b/fs/proc/task_mmu.c
-@@ -311,7 +311,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
+@@ -305,7 +305,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma, int is_pid)
  	const char *name = NULL;
  
  	if (file) {
@@ -402,7 +402,7 @@ index ec6d298..34c7193 100644
  		dev = inode->i_sb->s_dev;
  		ino = inode->i_ino;
  		pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT;
-@@ -1741,7 +1744,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
+@@ -1726,7 +1729,7 @@ static int show_numa_map(struct seq_file *m, void *v, int is_pid)
  	struct proc_maps_private *proc_priv = &numa_priv->proc_maps;
  	struct vm_area_struct *vma = v;
  	struct numa_maps *md = &numa_priv->md;
@@ -428,10 +428,10 @@ index 5b62f57..dfb4a3b 100644
  		ino = inode->i_ino;
  		pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
 diff --git a/include/linux/mm.h b/include/linux/mm.h
-index ad06d42..75e5d37 100644
+index 1ac1f06..49997d9 100644
 --- a/include/linux/mm.h
 +++ b/include/linux/mm.h
-@@ -1368,6 +1368,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
+@@ -1380,6 +1380,28 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
  	unmap_mapping_range(mapping, holebegin, holelen, 0);
  }
  
@@ -461,10 +461,10 @@ index ad06d42..75e5d37 100644
  		void *buf, int len, unsigned int gup_flags);
  extern int access_remote_vm(struct mm_struct *mm, unsigned long addr,
 diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
-index fd1af6b..89ec438 100644
+index 2161234..78aa367 100644
 --- a/include/linux/mm_types.h
 +++ b/include/linux/mm_types.h
-@@ -249,6 +249,7 @@ struct vm_region {
+@@ -251,6 +251,7 @@ struct vm_region {
  	unsigned long	vm_top;		/* region allocated to here */
  	unsigned long	vm_pgoff;	/* the offset in vm_file corresponding to vm_start */
  	struct file	*vm_file;	/* the backing file or NULL */
@@ -472,7 +472,7 @@ index fd1af6b..89ec438 100644
  
  	int		vm_usage;	/* region usage count (access under nommu_region_sem) */
  	bool		vm_icache_flushed : 1; /* true if the icache has been flushed for
-@@ -323,6 +324,7 @@ struct vm_area_struct {
+@@ -325,6 +326,7 @@ struct vm_area_struct {
  	unsigned long vm_pgoff;		/* Offset (within vm_file) in PAGE_SIZE
  					   units */
  	struct file * vm_file;		/* File we map to (can be NULL). */
@@ -481,10 +481,10 @@ index fd1af6b..89ec438 100644
  
  	atomic_long_t swap_readahead_info;
 diff --git a/kernel/fork.c b/kernel/fork.c
-index e5d9d40..f6f6fbf 100644
+index a5d21c4..e965e09 100644
 --- a/kernel/fork.c
 +++ b/kernel/fork.c
-@@ -474,7 +474,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
+@@ -473,7 +473,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm,
  			struct inode *inode = file_inode(file);
  			struct address_space *mapping = file->f_mapping;
  
@@ -494,12 +494,12 @@ index e5d9d40..f6f6fbf 100644
  				atomic_dec(&inode->i_writecount);
  			i_mmap_lock_write(mapping);
 diff --git a/mm/Makefile b/mm/Makefile
-index e669f02..9c36567 100644
+index b4e54a9a..77892ae 100644
 --- a/mm/Makefile
 +++ b/mm/Makefile
 @@ -39,7 +39,7 @@ obj-y			:= filemap.o mempool.o oom_kill.o \
  			   mm_init.o mmu_context.o percpu.o slab_common.o \
- 			   compaction.o vmacache.o swap_slots.o \
+ 			   compaction.o vmacache.o \
  			   interval_tree.o list_lru.o workingset.o \
 -			   debug.o $(mmu-y)
 +			   prfile.o debug.o $(mmu-y)
@@ -507,10 +507,10 @@ index e669f02..9c36567 100644
  obj-y += init-mm.o
  
 diff --git a/mm/filemap.c b/mm/filemap.c
-index 693f622..ea46048 100644
+index 0604cb0..45d2369 100644
 --- a/mm/filemap.c
 +++ b/mm/filemap.c
-@@ -2703,7 +2703,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
+@@ -2700,7 +2700,7 @@ int filemap_page_mkwrite(struct vm_fault *vmf)
  	int ret = VM_FAULT_LOCKED;
  
  	sb_start_pagefault(inode->i_sb);
@@ -520,7 +520,7 @@ index 693f622..ea46048 100644
  	if (page->mapping != inode->i_mapping) {
  		unlock_page(page);
 diff --git a/mm/mmap.c b/mm/mmap.c
-index 9efdc021..d77f01f 100644
+index 188f195..3c1ca1d 100644
 --- a/mm/mmap.c
 +++ b/mm/mmap.c
 @@ -171,7 +171,7 @@ static struct vm_area_struct *remove_vma(struct vm_area_struct *vma)
@@ -541,7 +541,7 @@ index 9efdc021..d77f01f 100644
  		}
  		if (next->anon_vma)
  			anon_vma_merge(vma, next);
-@@ -1761,8 +1761,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
+@@ -1779,8 +1779,8 @@ unsigned long mmap_region(struct file *file, unsigned long addr,
  	return addr;
  
  unmap_and_free_vma:
@@ -551,7 +551,7 @@ index 9efdc021..d77f01f 100644
  
  	/* Undo any partial mapping done by a device driver. */
  	unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end);
-@@ -2586,7 +2586,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2604,7 +2604,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  		goto out_free_mpol;
  
  	if (new->vm_file)
@@ -560,7 +560,7 @@ index 9efdc021..d77f01f 100644
  
  	if (new->vm_ops && new->vm_ops->open)
  		new->vm_ops->open(new);
-@@ -2605,7 +2605,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
+@@ -2623,7 +2623,7 @@ int __split_vma(struct mm_struct *mm, struct vm_area_struct *vma,
  	if (new->vm_ops && new->vm_ops->close)
  		new->vm_ops->close(new);
  	if (new->vm_file)
@@ -569,7 +569,7 @@ index 9efdc021..d77f01f 100644
  	unlink_anon_vmas(new);
   out_free_mpol:
  	mpol_put(vma_policy(new));
-@@ -2767,7 +2767,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2785,7 +2785,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  	struct vm_area_struct *vma;
  	unsigned long populate = 0;
  	unsigned long ret = -EINVAL;
@@ -578,7 +578,7 @@ index 9efdc021..d77f01f 100644
  
  	pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/vm/remap_file_pages.txt.\n",
  		     current->comm, current->pid);
-@@ -2842,10 +2842,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
+@@ -2860,10 +2860,27 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
  		}
  	}
  
@@ -607,7 +607,7 @@ index 9efdc021..d77f01f 100644
  out:
  	up_write(&mm->mmap_sem);
  	if (populate)
-@@ -3153,7 +3170,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
+@@ -3171,7 +3188,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap,
  		if (anon_vma_clone(new_vma, vma))
  			goto out_free_mempol;
  		if (new_vma->vm_file)
@@ -617,10 +617,10 @@ index 9efdc021..d77f01f 100644
  			new_vma->vm_ops->open(new_vma);
  		vma_link(mm, new_vma, prev, rb_link, rb_parent);
 diff --git a/mm/nommu.c b/mm/nommu.c
-index ebb6e61..8cf2428 100644
+index 1372373..6362dde 100644
 --- a/mm/nommu.c
 +++ b/mm/nommu.c
-@@ -641,7 +641,7 @@ static void __put_nommu_region(struct vm_region *region)
+@@ -629,7 +629,7 @@ static void __put_nommu_region(struct vm_region *region)
  		up_write(&nommu_region_sem);
  
  		if (region->vm_file)
@@ -629,7 +629,7 @@ index ebb6e61..8cf2428 100644
  
  		/* IO memory and memory shared directly out of the pagecache
  		 * from ramfs/tmpfs mustn't be released here */
-@@ -799,7 +799,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
+@@ -767,7 +767,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma)
  	if (vma->vm_ops && vma->vm_ops->close)
  		vma->vm_ops->close(vma);
  	if (vma->vm_file)
@@ -638,7 +638,7 @@ index ebb6e61..8cf2428 100644
  	put_nommu_region(vma->vm_region);
  	kmem_cache_free(vm_area_cachep, vma);
  }
-@@ -1321,7 +1321,7 @@ unsigned long do_mmap(struct file *file,
+@@ -1289,7 +1289,7 @@ unsigned long do_mmap(struct file *file,
  					goto error_just_free;
  				}
  			}
@@ -647,7 +647,7 @@ index ebb6e61..8cf2428 100644
  			kmem_cache_free(vm_region_jar, region);
  			region = pregion;
  			result = start;
-@@ -1396,10 +1396,10 @@ unsigned long do_mmap(struct file *file,
+@@ -1364,10 +1364,10 @@ unsigned long do_mmap(struct file *file,
  	up_write(&nommu_region_sem);
  error:
  	if (region->vm_file)
@@ -662,7 +662,7 @@ index ebb6e61..8cf2428 100644
  
 diff --git a/mm/prfile.c b/mm/prfile.c
 new file mode 100644
-index 0000000..3f56669
+index 0000000..14efc4f
 --- /dev/null
 +++ b/mm/prfile.c
 @@ -0,0 +1,86 @@
@@ -674,7 +674,7 @@ index 0000000..3f56669
 + *
 + * See Documentation/filesystems/aufs/design/06mmap.txt
 + *
-+ * Copyright (c) 2014-2017 Junjro R. Okajima
++ * Copyright (c) 2014-2018 Junjro R. Okajima
 + * Copyright (c) 2014 Ian Campbell
 + */
 +
@@ -756,10 +756,10 @@ SPDX-License-Identifier: GPL-2.0
 aufs4.x-rcN standalone patch
 
 diff --git a/fs/dcache.c b/fs/dcache.c
-index 9ce5e26..0f59369 100644
+index 213ddcd..137176b 100644
 --- a/fs/dcache.c
 +++ b/fs/dcache.c
-@@ -1308,6 +1308,7 @@ void d_walk(struct dentry *parent, void *data,
+@@ -1342,6 +1342,7 @@ void d_walk(struct dentry *parent, void *data,
  	seq = 1;
  	goto again;
  }
@@ -776,7 +776,7 @@ index 9ce5e26..0f59369 100644
  /**
   * d_ancestor - search for an ancestor
 diff --git a/fs/exec.c b/fs/exec.c
-index 7eb8d21..56d7985 100644
+index 183059c..35adee4 100644
 --- a/fs/exec.c
 +++ b/fs/exec.c
 @@ -109,6 +109,7 @@ bool path_noexec(const struct path *path)
@@ -788,7 +788,7 @@ index 7eb8d21..56d7985 100644
  #ifdef CONFIG_USELIB
  /*
 diff --git a/fs/fcntl.c b/fs/fcntl.c
-index 8cd01f7..bdd1c6c 100644
+index 7550799..d403576 100644
 --- a/fs/fcntl.c
 +++ b/fs/fcntl.c
 @@ -85,6 +85,7 @@ int setfl(int fd, struct file * filp, unsigned long arg)
@@ -836,10 +836,10 @@ index 7ec0b3e..819ee07 100644
  void __init files_init(void)
  {
 diff --git a/fs/inode.c b/fs/inode.c
-index 929a5a3..d93653e 100644
+index 68b3b45..af4551e 100644
 --- a/fs/inode.c
 +++ b/fs/inode.c
-@@ -1668,6 +1668,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
+@@ -1671,6 +1671,7 @@ int update_time(struct inode *inode, struct timespec *time, int flags)
  
  	return update_time(inode, time, flags);
  }
@@ -848,7 +848,7 @@ index 929a5a3..d93653e 100644
  /**
   *	touch_atime	-	update the access time
 diff --git a/fs/namespace.c b/fs/namespace.c
-index 26ef600..a4b9707 100644
+index 61129ff..5d3e0382 100644
 --- a/fs/namespace.c
 +++ b/fs/namespace.c
 @@ -517,6 +517,7 @@ void __mnt_drop_write(struct vfsmount *mnt)
@@ -867,7 +867,7 @@ index 26ef600..a4b9707 100644
  
  /*
   * vfsmount lock must be held for write
-@@ -1887,6 +1889,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
+@@ -1893,6 +1895,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg,
  	}
  	return 0;
  }
@@ -948,7 +948,7 @@ index e9191b4..1f8ccfa 100644
  /*
   * Destroy all marks in destroy_list, waits for SRCU period to finish before
 diff --git a/fs/open.c b/fs/open.c
-index 7ea1184..6e2e241 100644
+index c5ee7cd..86bfe2d 100644
 --- a/fs/open.c
 +++ b/fs/open.c
 @@ -64,6 +64,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
@@ -959,19 +959,11 @@ index 7ea1184..6e2e241 100644
  
  long vfs_truncate(const struct path *path, loff_t length)
  {
-@@ -691,6 +692,7 @@ int open_check_o_direct(struct file *f)
- 	}
- 	return 0;
- }
-+EXPORT_SYMBOL_GPL(open_check_o_direct);
- 
- static int do_dentry_open(struct file *f,
- 			  struct inode *inode,
 diff --git a/fs/read_write.c b/fs/read_write.c
-index 0a5c47b..d423a5f 100644
+index ddd6e67..aabf92d 100644
 --- a/fs/read_write.c
 +++ b/fs/read_write.c
-@@ -454,6 +454,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)
  
  	return ret;
  }
@@ -979,7 +971,7 @@ index 0a5c47b..d423a5f 100644
  
  static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos)
  {
-@@ -494,6 +495,7 @@ vfs_readf_t vfs_readf(struct file *file)
+@@ -499,6 +500,7 @@ vfs_readf_t vfs_readf(struct file *file)
  		return new_sync_read;
  	return ERR_PTR(-ENOSYS);
  }
@@ -987,7 +979,7 @@ index 0a5c47b..d423a5f 100644
  
  vfs_writef_t vfs_writef(struct file *file)
  {
-@@ -505,6 +507,7 @@ vfs_writef_t vfs_writef(struct file *file)
+@@ -510,6 +512,7 @@ vfs_writef_t vfs_writef(struct file *file)
  		return new_sync_write;
  	return ERR_PTR(-ENOSYS);
  }
@@ -995,7 +987,7 @@ index 0a5c47b..d423a5f 100644
  
  ssize_t __kernel_write(struct file *file, const void *buf, size_t count, loff_t *pos)
  {
-@@ -574,6 +577,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
+@@ -579,6 +582,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
  
  	return ret;
  }
@@ -1004,7 +996,7 @@ index 0a5c47b..d423a5f 100644
  static inline loff_t file_pos_read(struct file *file)
  {
 diff --git a/fs/splice.c b/fs/splice.c
-index c5fb195..ce01a74 100644
+index f617ab0..ec0ad02 100644
 --- a/fs/splice.c
 +++ b/fs/splice.c
 @@ -850,6 +850,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
@@ -1024,7 +1016,7 @@ index c5fb195..ce01a74 100644
  /**
   * splice_direct_to_actor - splices data directly between two non-pipes
 diff --git a/fs/sync.c b/fs/sync.c
-index a6891ee..47a78bd 100644
+index 2860782..ffd7ea4 100644
 --- a/fs/sync.c
 +++ b/fs/sync.c
 @@ -39,6 +39,7 @@ int __sync_filesystem(struct super_block *sb, int wait)
@@ -1048,7 +1040,7 @@ index 61cd28b..35570cd 100644
  ssize_t
  __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name,
 diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 0dca42f..7bb20c5 100644
+index 06e0d7a..6af91bd 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
 @@ -151,6 +151,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock)
@@ -1105,10 +1097,10 @@ index c65b39b..e363d22 100644
  }
 +EXPORT_SYMBOL_GPL(__devcgroup_check_permission);
 diff --git a/security/security.c b/security/security.c
-index 1cd8526..f2e4736 100644
+index 7bc2fde..6bd0468 100644
 --- a/security/security.c
 +++ b/security/security.c
-@@ -531,6 +531,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
+@@ -537,6 +537,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry)
  		return 0;
  	return call_int_hook(path_rmdir, 0, dir, dentry);
  }
@@ -1116,7 +1108,7 @@ index 1cd8526..f2e4736 100644
  
  int security_path_unlink(const struct path *dir, struct dentry *dentry)
  {
-@@ -547,6 +548,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
+@@ -553,6 +554,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry,
  		return 0;
  	return call_int_hook(path_symlink, 0, dir, dentry, old_name);
  }
@@ -1124,7 +1116,7 @@ index 1cd8526..f2e4736 100644
  
  int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		       struct dentry *new_dentry)
-@@ -555,6 +557,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
+@@ -561,6 +563,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir,
  		return 0;
  	return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry);
  }
@@ -1132,7 +1124,7 @@ index 1cd8526..f2e4736 100644
  
  int security_path_rename(const struct path *old_dir, struct dentry *old_dentry,
  			 const struct path *new_dir, struct dentry *new_dentry,
-@@ -582,6 +585,7 @@ int security_path_truncate(const struct path *path)
+@@ -588,6 +591,7 @@ int security_path_truncate(const struct path *path)
  		return 0;
  	return call_int_hook(path_truncate, 0, path);
  }
@@ -1140,7 +1132,7 @@ index 1cd8526..f2e4736 100644
  
  int security_path_chmod(const struct path *path, umode_t mode)
  {
-@@ -589,6 +593,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
+@@ -595,6 +599,7 @@ int security_path_chmod(const struct path *path, umode_t mode)
  		return 0;
  	return call_int_hook(path_chmod, 0, path, mode);
  }
@@ -1148,7 +1140,7 @@ index 1cd8526..f2e4736 100644
  
  int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  {
-@@ -596,6 +601,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
+@@ -602,6 +607,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid)
  		return 0;
  	return call_int_hook(path_chown, 0, path, uid, gid);
  }
@@ -1156,7 +1148,7 @@ index 1cd8526..f2e4736 100644
  
  int security_path_chroot(const struct path *path)
  {
-@@ -681,6 +687,7 @@ int security_inode_readlink(struct dentry *dentry)
+@@ -687,6 +693,7 @@ int security_inode_readlink(struct dentry *dentry)
  		return 0;
  	return call_int_hook(inode_readlink, 0, dentry);
  }
@@ -1164,7 +1156,7 @@ index 1cd8526..f2e4736 100644
  
  int security_inode_follow_link(struct dentry *dentry, struct inode *inode,
  			       bool rcu)
-@@ -696,6 +703,7 @@ int security_inode_permission(struct inode *inode, int mask)
+@@ -702,6 +709,7 @@ int security_inode_permission(struct inode *inode, int mask)
  		return 0;
  	return call_int_hook(inode_permission, 0, inode, mask);
  }
@@ -1172,7 +1164,7 @@ index 1cd8526..f2e4736 100644
  
  int security_inode_setattr(struct dentry *dentry, struct iattr *attr)
  {
-@@ -867,6 +875,7 @@ int security_file_permission(struct file *file, int mask)
+@@ -873,6 +881,7 @@ int security_file_permission(struct file *file, int mask)
  
  	return fsnotify_perm(file, mask);
  }
@@ -1180,7 +1172,7 @@ index 1cd8526..f2e4736 100644
  
  int security_file_alloc(struct file *file)
  {
-@@ -926,6 +935,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
+@@ -932,6 +941,7 @@ int security_mmap_file(struct file *file, unsigned long prot,
  		return ret;
  	return ima_file_mmap(file, prot);
  }
@@ -1190,7 +1182,7 @@ index 1cd8526..f2e4736 100644
  {
 diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Documentation/ABI/testing/debugfs-aufs
 --- /usr/share/empty/Documentation/ABI/testing/debugfs-aufs	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/debugfs-aufs	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/ABI/testing/debugfs-aufs	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,50 @@
 +What:		/debug/aufs/si_<id>/
 +Date:		March 2009
@@ -1244,7 +1236,7 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/debugfs-aufs linux/Document
 +		will be empty. About XINO files, see the aufs manual.
 diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentation/ABI/testing/sysfs-aufs
 --- /usr/share/empty/Documentation/ABI/testing/sysfs-aufs	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/ABI/testing/sysfs-aufs	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/ABI/testing/sysfs-aufs	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,31 @@
 +What:		/sys/fs/aufs/si_<id>/
 +Date:		March 2009
@@ -1279,10 +1271,10 @@ diff -urN /usr/share/empty/Documentation/ABI/testing/sysfs-aufs linux/Documentat
 +		will be empty. About XINO files, see the aufs manual.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt linux/Documentation/filesystems/aufs/design/01intro.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/01intro.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/01intro.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,171 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -1454,10 +1446,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/01intro.txt lin
 +about it. But currently I have implemented it in kernel space.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt linux/Documentation/filesystems/aufs/design/02struct.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/02struct.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/02struct.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,258 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -1716,10 +1708,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/02struct.txt li
 +For this purpose, use "aumvdown" command in aufs-util.git.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt linux/Documentation/filesystems/aufs/design/03atomic_open.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/03atomic_open.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,85 @@
 +
-+# Copyright (C) 2015-2017 Junjiro R. Okajima
++# Copyright (C) 2015-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -1805,10 +1797,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03atomic_open.t
 +       be implemented in aufs, but not all I am afraid.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt linux/Documentation/filesystems/aufs/design/03lookup.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/03lookup.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,113 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -1922,10 +1914,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/03lookup.txt li
 +   by over-mounting something (or another method).
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt linux/Documentation/filesystems/aufs/design/04branch.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/04branch.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/04branch.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,74 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2000,10 +1992,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/04branch.txt li
 +    same named entry on the upper branch.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt linux/Documentation/filesystems/aufs/design/05wbr_policy.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/05wbr_policy.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,64 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2068,7 +2060,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/05wbr_policy.tx
 +  copyup policy.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot linux/Documentation/filesystems/aufs/design/06dirren.dot
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.dot	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/06dirren.dot	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,31 @@
 +
 +// to view this graph, run dot(1) command in GRAPHVIZ.
@@ -2103,10 +2095,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.dot li
 +}
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt linux/Documentation/filesystems/aufs/design/06dirren.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06dirren.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/06dirren.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,102 @@
 +
-+# Copyright (C) 2017 Junjiro R. Okajima
++# Copyright (C) 2017-2018 Junjiro R. Okajima
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2209,10 +2201,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06dirren.txt li
 +equivalen to udba=reval case.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linux/Documentation/filesystems/aufs/design/06fhsm.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/06fhsm.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,120 @@
 +
-+# Copyright (C) 2011-2017 Junjiro R. Okajima
++# Copyright (C) 2011-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2333,10 +2325,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06fhsm.txt linu
 +should restore the original file state after an error happens.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linux/Documentation/filesystems/aufs/design/06mmap.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/06mmap.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,72 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2409,10 +2401,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06mmap.txt linu
 +I have to give up this "looks-smater" approach.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt linux/Documentation/filesystems/aufs/design/06xattr.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/06xattr.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,96 @@
 +
-+# Copyright (C) 2014-2017 Junjiro R. Okajima
++# Copyright (C) 2014-2018 Junjiro R. Okajima
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2509,10 +2501,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/06xattr.txt lin
 +now, aufs implements the branch attributes to ignore the error.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt linux/Documentation/filesystems/aufs/design/07export.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/07export.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/07export.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,58 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2571,10 +2563,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/07export.txt li
 +  lookup_one_len(), vfs_getattr(), encode_fh() and others.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linux/Documentation/filesystems/aufs/design/08shwh.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/08shwh.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,52 @@
 +
-+# Copyright (C) 2005-2017 Junjiro R. Okajima
++# Copyright (C) 2005-2018 Junjiro R. Okajima
 +# 
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2627,10 +2619,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/08shwh.txt linu
 +initramfs will use it to replace the old one at the next boot.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt linux/Documentation/filesystems/aufs/design/10dynop.txt
 --- /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/design/10dynop.txt	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,47 @@
 +
-+# Copyright (C) 2010-2017 Junjiro R. Okajima
++# Copyright (C) 2010-2018 Junjiro R. Okajima
 +#
 +# This program is free software; you can redistribute it and/or modify
 +# it under the terms of the GNU General Public License as published by
@@ -2678,7 +2670,7 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/design/10dynop.txt lin
 +regular files only.
 diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documentation/filesystems/aufs/README
 --- /usr/share/empty/Documentation/filesystems/aufs/README	1970-01-01 01:00:00.000000000 +0100
-+++ linux/Documentation/filesystems/aufs/README	2018-04-06 07:48:44.201271351 +0200
++++ linux/Documentation/filesystems/aufs/README	2017-07-29 12:14:25.893041746 +0200
 @@ -0,0 +1,393 @@
 +
 +Aufs4 -- advanced multi layered unification filesystem version 4.x
@@ -3075,10 +3067,10 @@ diff -urN /usr/share/empty/Documentation/filesystems/aufs/README linux/Documenta
 +# End: ;
 diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
 --- /usr/share/empty/fs/aufs/aufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/aufs.h	2018-04-06 07:48:44.201271351 +0200
++++ linux/fs/aufs/aufs.h	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,60 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -3139,10 +3131,10 @@ diff -urN /usr/share/empty/fs/aufs/aufs.h linux/fs/aufs/aufs.h
 +#endif /* __AUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 --- /usr/share/empty/fs/aufs/branch.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/branch.c	2018-04-15 08:49:13.394483860 +0200
 @@ -0,0 +1,1432 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -4575,10 +4567,10 @@ diff -urN /usr/share/empty/fs/aufs/branch.c linux/fs/aufs/branch.c
 +}
 diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 --- /usr/share/empty/fs/aufs/branch.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/branch.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/branch.h	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,333 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -4912,7 +4904,7 @@ diff -urN /usr/share/empty/fs/aufs/branch.h linux/fs/aufs/branch.h
 +#endif /* __AUFS_BRANCH_H__ */
 diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
 --- /usr/share/empty/fs/aufs/conf.mk	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/conf.mk	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/conf.mk	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,40 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -4956,10 +4948,10 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
 +-include ${srctree}/${src}/conf_priv.mk
 diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 --- /usr/share/empty/fs/aufs/cpup.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/cpup.c	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,1441 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -6401,10 +6393,10 @@ diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
 +}
 diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
 --- /usr/share/empty/fs/aufs/cpup.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/cpup.h	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,99 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -6504,10 +6496,10 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
 +#endif /* __AUFS_CPUP_H__ */
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 --- /usr/share/empty/fs/aufs/dbgaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dbgaufs.c	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,437 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -6945,10 +6937,10 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
 --- /usr/share/empty/fs/aufs/dbgaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dbgaufs.h	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,48 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -6997,10 +6989,10 @@ diff -urN /usr/share/empty/fs/aufs/dbgaufs.h linux/fs/aufs/dbgaufs.h
 +#endif /* __DBGAUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 --- /usr/share/empty/fs/aufs/dcsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dcsub.c	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,225 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -7226,10 +7218,10 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.c linux/fs/aufs/dcsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
 --- /usr/share/empty/fs/aufs/dcsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dcsub.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dcsub.h	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,136 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -7366,10 +7358,10 @@ diff -urN /usr/share/empty/fs/aufs/dcsub.h linux/fs/aufs/dcsub.h
 +#endif /* __AUFS_DCSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 --- /usr/share/empty/fs/aufs/debug.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/debug.c	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,440 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -7810,10 +7802,10 @@ diff -urN /usr/share/empty/fs/aufs/debug.c linux/fs/aufs/debug.c
 +}
 diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 --- /usr/share/empty/fs/aufs/debug.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/debug.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/debug.h	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,225 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -8039,10 +8031,10 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
 +#endif /* __AUFS_DEBUG_H__ */
 diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 --- /usr/share/empty/fs/aufs/dentry.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dentry.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,1152 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -9195,10 +9187,10 @@ diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
 +};
 diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 --- /usr/share/empty/fs/aufs/dentry.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dentry.h	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,266 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -9465,10 +9457,10 @@ diff -urN /usr/share/empty/fs/aufs/dentry.h linux/fs/aufs/dentry.h
 +#endif /* __AUFS_DENTRY_H__ */
 diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 --- /usr/share/empty/fs/aufs/dinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dinfo.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dinfo.c	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,553 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -10022,10 +10014,10 @@ diff -urN /usr/share/empty/fs/aufs/dinfo.c linux/fs/aufs/dinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 --- /usr/share/empty/fs/aufs/dir.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dir.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,759 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -10785,10 +10777,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.c linux/fs/aufs/dir.c
 +};
 diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 --- /usr/share/empty/fs/aufs/dir.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dir.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dir.h	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,131 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -10920,10 +10912,10 @@ diff -urN /usr/share/empty/fs/aufs/dir.h linux/fs/aufs/dir.h
 +#endif /* __AUFS_DIR_H__ */
 diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
 --- /usr/share/empty/fs/aufs/dirren.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dirren.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,1315 @@
 +/*
-+ * Copyright (C) 2017 Junjiro R. Okajima
++ * Copyright (C) 2017-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -12239,10 +12231,10 @@ diff -urN /usr/share/empty/fs/aufs/dirren.c linux/fs/aufs/dirren.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
 --- /usr/share/empty/fs/aufs/dirren.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dirren.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dirren.h	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,139 @@
 +/*
-+ * Copyright (C) 2017 Junjiro R. Okajima
++ * Copyright (C) 2017-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -12382,10 +12374,10 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
 +#endif /* __AUFS_DIRREN_H__ */
 diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 --- /usr/share/empty/fs/aufs/dynop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dynop.c	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,369 @@
 +/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -12755,10 +12747,10 @@ diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
 +}
 diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
 --- /usr/share/empty/fs/aufs/dynop.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/dynop.h	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,74 @@
 +/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -12833,10 +12825,10 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
 +#endif /* __AUFS_DYNOP_H__ */
 diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 --- /usr/share/empty/fs/aufs/export.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/export.c	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,836 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -13673,10 +13665,10 @@ diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
 +}
 diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 --- /usr/share/empty/fs/aufs/fhsm.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fhsm.c	2018-04-06 07:48:44.204604724 +0200
-@@ -0,0 +1,425 @@
++++ linux/fs/aufs/fhsm.c	2018-06-04 09:08:09.184746078 +0200
+@@ -0,0 +1,426 @@
 +/*
-+ * Copyright (C) 2011-2017 Junjiro R. Okajima
++ * Copyright (C) 2011-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -13859,7 +13851,8 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +	if (atomic_read(&fhsm->fhsm_readable))
 +		mask = EPOLLIN /* | EPOLLRDNORM */;
 +
-+	AuDbg("mask 0x%x\n", mask);
++	if (!mask)
++		AuDbg("mask 0x%x\n", mask);
 +	return mask;
 +}
 +
@@ -14102,10 +14095,10 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
 +}
 diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 --- /usr/share/empty/fs/aufs/file.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/file.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,856 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -14962,10 +14955,10 @@ diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
 +};
 diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 --- /usr/share/empty/fs/aufs/file.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/file.h	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,340 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -15306,10 +15299,10 @@ diff -urN /usr/share/empty/fs/aufs/file.h linux/fs/aufs/file.h
 +#endif /* __AUFS_FILE_H__ */
 diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 --- /usr/share/empty/fs/aufs/finfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/finfo.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/finfo.c	2018-04-15 08:49:13.397817296 +0200
 @@ -0,0 +1,148 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -15458,10 +15451,10 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 --- /usr/share/empty/fs/aufs/f_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/f_op.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,817 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -16279,10 +16272,10 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
 +};
 diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
 --- /usr/share/empty/fs/aufs/fstype.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fstype.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/fstype.h	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,400 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -16683,10 +16676,10 @@ diff -urN /usr/share/empty/fs/aufs/fstype.h linux/fs/aufs/fstype.h
 +#endif /* __AUFS_FSTYPE_H__ */
 diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
 --- /usr/share/empty/fs/aufs/hbl.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hbl.h	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/hbl.h	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,64 @@
 +/*
-+ * Copyright (C) 2017 Junjiro R. Okajima
++ * Copyright (C) 2017-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -16751,10 +16744,10 @@ diff -urN /usr/share/empty/fs/aufs/hbl.h linux/fs/aufs/hbl.h
 +#endif /* __AUFS_HBL_H__ */
 diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 --- /usr/share/empty/fs/aufs/hfsnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsnotify.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/hfsnotify.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,289 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -17044,10 +17037,10 @@ diff -urN /usr/share/empty/fs/aufs/hfsnotify.c linux/fs/aufs/hfsnotify.c
 +};
 diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
 --- /usr/share/empty/fs/aufs/hfsplus.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hfsplus.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/hfsplus.c	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,56 @@
 +/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -17104,10 +17097,10 @@ diff -urN /usr/share/empty/fs/aufs/hfsplus.c linux/fs/aufs/hfsplus.c
 +}
 diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 --- /usr/share/empty/fs/aufs/hnotify.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/hnotify.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/hnotify.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,719 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -17827,10 +17820,10 @@ diff -urN /usr/share/empty/fs/aufs/hnotify.c linux/fs/aufs/hnotify.c
 +}
 diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 --- /usr/share/empty/fs/aufs/iinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/iinfo.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/iinfo.c	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,285 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -18116,10 +18109,10 @@ diff -urN /usr/share/empty/fs/aufs/iinfo.c linux/fs/aufs/iinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 --- /usr/share/empty/fs/aufs/inode.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/inode.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,527 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -18647,10 +18640,10 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
 +}
 diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 --- /usr/share/empty/fs/aufs/inode.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/inode.h	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,695 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -19346,10 +19339,10 @@ diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
 +#endif /* __AUFS_INODE_H__ */
 diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 --- /usr/share/empty/fs/aufs/ioctl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/ioctl.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/ioctl.c	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,219 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -19569,10 +19562,10 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
 +#endif
 diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 --- /usr/share/empty/fs/aufs/i_op_add.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/i_op_add.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,920 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -20493,10 +20486,10 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 --- /usr/share/empty/fs/aufs/i_op.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/i_op.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,1459 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -21956,10 +21949,10 @@ diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
 +};
 diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 --- /usr/share/empty/fs/aufs/i_op_del.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_del.c	2018-04-06 07:48:44.204604724 +0200
++++ linux/fs/aufs/i_op_del.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,511 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -22471,10 +22464,10 @@ diff -urN /usr/share/empty/fs/aufs/i_op_del.c linux/fs/aufs/i_op_del.c
 +}
 diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 --- /usr/share/empty/fs/aufs/i_op_ren.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_ren.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/i_op_ren.c	2018-06-04 09:08:09.184746078 +0200
 @@ -0,0 +1,1246 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -23721,7 +23714,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_ren.c linux/fs/aufs/i_op_ren.c
 +}
 diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
 --- /usr/share/empty/fs/aufs/Kconfig	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Kconfig	2018-04-06 07:48:44.201271351 +0200
++++ linux/fs/aufs/Kconfig	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,199 @@
 +# SPDX-License-Identifier: GPL-2.0
 +config AUFS_FS
@@ -23924,10 +23917,10 @@ diff -urN /usr/share/empty/fs/aufs/Kconfig linux/fs/aufs/Kconfig
 +endif
 diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
 --- /usr/share/empty/fs/aufs/loop.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/loop.c	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,147 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -24075,10 +24068,10 @@ diff -urN /usr/share/empty/fs/aufs/loop.c linux/fs/aufs/loop.c
 +}
 diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 --- /usr/share/empty/fs/aufs/loop.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/loop.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/loop.h	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,52 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -24131,7 +24124,7 @@ diff -urN /usr/share/empty/fs/aufs/loop.h linux/fs/aufs/loop.h
 +#endif /* __AUFS_LOOP_H__ */
 diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
 --- /usr/share/empty/fs/aufs/magic.mk	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/magic.mk	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/magic.mk	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,31 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -24166,7 +24159,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
 +endif
 diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
 --- /usr/share/empty/fs/aufs/Makefile	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile	2018-04-06 07:48:44.201271351 +0200
++++ linux/fs/aufs/Makefile	2018-06-04 09:08:09.181412645 +0200
 @@ -0,0 +1,46 @@
 +# SPDX-License-Identifier: GPL-2.0
 +
@@ -24216,10 +24209,10 @@ diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
 +aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o
 diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 --- /usr/share/empty/fs/aufs/module.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/module.c	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,266 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -24486,10 +24479,10 @@ diff -urN /usr/share/empty/fs/aufs/module.c linux/fs/aufs/module.c
 +module_exit(aufs_exit);
 diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 --- /usr/share/empty/fs/aufs/module.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/module.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/module.h	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,101 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -24591,10 +24584,10 @@ diff -urN /usr/share/empty/fs/aufs/module.h linux/fs/aufs/module.h
 +#endif /* __AUFS_MODULE_H__ */
 diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
 --- /usr/share/empty/fs/aufs/mvdown.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/mvdown.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/mvdown.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,704 @@
 +/*
-+ * Copyright (C) 2011-2017 Junjiro R. Okajima
++ * Copyright (C) 2011-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -25299,10 +25292,10 @@ diff -urN /usr/share/empty/fs/aufs/mvdown.c linux/fs/aufs/mvdown.c
 +}
 diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 --- /usr/share/empty/fs/aufs/opts.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/opts.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,1891 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -27194,10 +27187,10 @@ diff -urN /usr/share/empty/fs/aufs/opts.c linux/fs/aufs/opts.c
 +}
 diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 --- /usr/share/empty/fs/aufs/opts.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/opts.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/opts.h	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,224 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -27422,10 +27415,10 @@ diff -urN /usr/share/empty/fs/aufs/opts.h linux/fs/aufs/opts.h
 +#endif /* __AUFS_OPTS_H__ */
 diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
 --- /usr/share/empty/fs/aufs/plink.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/plink.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/plink.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,515 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -27941,10 +27934,10 @@ diff -urN /usr/share/empty/fs/aufs/plink.c linux/fs/aufs/plink.c
 +}
 diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
 --- /usr/share/empty/fs/aufs/poll.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/poll.c	2018-04-06 07:48:44.207938097 +0200
-@@ -0,0 +1,52 @@
++++ linux/fs/aufs/poll.c	2018-06-04 09:08:09.188079511 +0200
+@@ -0,0 +1,53 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -27992,15 +27985,16 @@ diff -urN /usr/share/empty/fs/aufs/poll.c linux/fs/aufs/poll.c
 +
 +out:
 +	si_read_unlock(sb);
-+	AuDbg("mask 0x%x\n", mask);
++	if (mask & POLLERR)
++		AuDbg("mask 0x%x\n", mask);
 +	return mask;
 +}
 diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
 --- /usr/share/empty/fs/aufs/posix_acl.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/posix_acl.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/posix_acl.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,102 @@
 +/*
-+ * Copyright (C) 2014-2017 Junjiro R. Okajima
++ * Copyright (C) 2014-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -28103,10 +28097,10 @@ diff -urN /usr/share/empty/fs/aufs/posix_acl.c linux/fs/aufs/posix_acl.c
 +}
 diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
 --- /usr/share/empty/fs/aufs/procfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/procfs.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/procfs.c	2018-04-15 08:49:13.401150731 +0200
 @@ -0,0 +1,170 @@
 +/*
-+ * Copyright (C) 2010-2017 Junjiro R. Okajima
++ * Copyright (C) 2010-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -28277,10 +28271,10 @@ diff -urN /usr/share/empty/fs/aufs/procfs.c linux/fs/aufs/procfs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
 --- /usr/share/empty/fs/aufs/rdu.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rdu.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/rdu.c	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,381 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -28662,10 +28656,10 @@ diff -urN /usr/share/empty/fs/aufs/rdu.c linux/fs/aufs/rdu.c
 +#endif
 diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
 --- /usr/share/empty/fs/aufs/rwsem.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/rwsem.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/rwsem.h	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,72 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -28738,10 +28732,10 @@ diff -urN /usr/share/empty/fs/aufs/rwsem.h linux/fs/aufs/rwsem.h
 +#endif /* __AUFS_RWSEM_H__ */
 diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 --- /usr/share/empty/fs/aufs/sbinfo.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sbinfo.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/sbinfo.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,304 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -29046,10 +29040,10 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
 +}
 diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 --- /usr/share/empty/fs/aufs/super.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/super.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,1051 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -30101,10 +30095,10 @@ diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
 +};
 diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
 --- /usr/share/empty/fs/aufs/super.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/super.h	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,626 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -30731,10 +30725,10 @@ diff -urN /usr/share/empty/fs/aufs/super.h linux/fs/aufs/super.h
 +#endif /* __AUFS_SUPER_H__ */
 diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 --- /usr/share/empty/fs/aufs/sysaufs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/sysaufs.c	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,104 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -30839,10 +30833,10 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.c linux/fs/aufs/sysaufs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
 --- /usr/share/empty/fs/aufs/sysaufs.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysaufs.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/sysaufs.h	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,101 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -30944,10 +30938,10 @@ diff -urN /usr/share/empty/fs/aufs/sysaufs.h linux/fs/aufs/sysaufs.h
 +#endif /* __SYSAUFS_H__ */
 diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
 --- /usr/share/empty/fs/aufs/sysfs.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysfs.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/sysfs.c	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,376 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -31324,10 +31318,10 @@ diff -urN /usr/share/empty/fs/aufs/sysfs.c linux/fs/aufs/sysfs.c
 +}
 diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
 --- /usr/share/empty/fs/aufs/sysrq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/sysrq.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/sysrq.c	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,159 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -31487,10 +31481,10 @@ diff -urN /usr/share/empty/fs/aufs/sysrq.c linux/fs/aufs/sysrq.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 --- /usr/share/empty/fs/aufs/vdir.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vdir.c	2018-04-06 07:48:44.207938097 +0200
-@@ -0,0 +1,892 @@
++++ linux/fs/aufs/vdir.c	2018-06-04 09:08:09.188079511 +0200
+@@ -0,0 +1,893 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -32332,7 +32326,8 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +
 +out:
 +	/* smp_mb(); */
-+	AuDbg("valid %d\n", !valid);
++	if (!valid)
++		AuDbg("valid %d\n", !valid);
 +	return valid;
 +}
 +
@@ -32383,10 +32378,10 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 --- /usr/share/empty/fs/aufs/vfsub.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c	2018-04-06 07:48:44.207938097 +0200
-@@ -0,0 +1,894 @@
++++ linux/fs/aufs/vfsub.c	2018-06-04 09:08:11.628152835 +0200
+@@ -0,0 +1,893 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -32525,7 +32520,6 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +
 +	if (!err) {
 +		/* todo: call VFS:may_open() here */
-+		err = open_check_o_direct(file);
 +		/* todo: ima_file_check() too? */
 +		if (!err && (args->open_flag & __FMODE_EXEC))
 +			err = deny_write_access(file);
@@ -33281,10 +33275,10 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
 +}
 diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 --- /usr/share/empty/fs/aufs/vfsub.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h	2018-04-06 07:48:44.207938097 +0200
-@@ -0,0 +1,354 @@
++++ linux/fs/aufs/vfsub.h	2018-06-04 09:08:11.628152835 +0200
+@@ -0,0 +1,353 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -33319,7 +33313,6 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 +/* copied from linux/fs/internal.h */
 +/* todo: BAD approach!! */
 +extern void __mnt_drop_write(struct vfsmount *);
-+extern int open_check_o_direct(struct file *f);
 +
 +/* ---------------------------------------------------------------------- */
 +
@@ -33639,10 +33632,10 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
 +#endif /* __AUFS_VFSUB_H__ */
 diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 --- /usr/share/empty/fs/aufs/wbr_policy.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/wbr_policy.c	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,830 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -34473,10 +34466,10 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
 +};
 diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 --- /usr/share/empty/fs/aufs/whout.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/whout.c	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,1061 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -35538,10 +35531,10 @@ diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
 +}
 diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
 --- /usr/share/empty/fs/aufs/whout.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/whout.h	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,85 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -35627,10 +35620,10 @@ diff -urN /usr/share/empty/fs/aufs/whout.h linux/fs/aufs/whout.h
 +#endif /* __AUFS_WHOUT_H__ */
 diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 --- /usr/share/empty/fs/aufs/wkq.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/wkq.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,390 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -36021,10 +36014,10 @@ diff -urN /usr/share/empty/fs/aufs/wkq.c linux/fs/aufs/wkq.c
 +}
 diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
 --- /usr/share/empty/fs/aufs/wkq.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wkq.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/wkq.h	2018-04-15 08:49:13.404484168 +0200
 @@ -0,0 +1,93 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -36118,10 +36111,10 @@ diff -urN /usr/share/empty/fs/aufs/wkq.h linux/fs/aufs/wkq.h
 +#endif /* __AUFS_WKQ_H__ */
 diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 --- /usr/share/empty/fs/aufs/xattr.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xattr.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/xattr.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,355 @@
 +/*
-+ * Copyright (C) 2014-2017 Junjiro R. Okajima
++ * Copyright (C) 2014-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -36477,10 +36470,10 @@ diff -urN /usr/share/empty/fs/aufs/xattr.c linux/fs/aufs/xattr.c
 +}
 diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 --- /usr/share/empty/fs/aufs/xino.c	1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/xino.c	2018-04-06 07:48:44.207938097 +0200
++++ linux/fs/aufs/xino.c	2018-06-04 09:08:09.188079511 +0200
 @@ -0,0 +1,1469 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -37950,10 +37943,10 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
 +}
 diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
 --- /usr/share/empty/include/uapi/linux/aufs_type.h	1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h	2018-04-06 07:48:44.207938097 +0200
++++ linux/include/uapi/linux/aufs_type.h	2018-06-04 09:08:11.628152835 +0200
 @@ -0,0 +1,447 @@
 +/*
-+ * Copyright (C) 2005-2017 Junjiro R. Okajima
++ * Copyright (C) 2005-2018 Junjiro R. Okajima
 + *
 + * This program, aufs is free software; you can redistribute it and/or modify
 + * it under the terms of the GNU General Public License as published by
@@ -37993,7 +37986,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
 +
 +#include <linux/limits.h>
 +
-+#define AUFS_VERSION	"4.x-rcN-20180312"
++#define AUFS_VERSION	"4.x-rcN-20180430"
 +
 +/* todo? move this to linux-2.6.19/include/magic.h */
 +#define AUFS_SUPER_MAGIC	('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -38403,7 +38396,7 @@ SPDX-License-Identifier: GPL-2.0
 aufs4.x-rcN loopback patch
 
 diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 962b2d6..d17f695 100644
+index 79902c1..40db6d1 100644
 --- a/drivers/block/loop.c
 +++ b/drivers/block/loop.c
 @@ -600,6 +600,15 @@ static inline void loop_update_dio(struct loop_device *lo)
@@ -38550,7 +38543,7 @@ index 0f45416..101f193 100644
  	void		*key_data; 
  
 diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c
-index 0d4ea929..af293c2 100644
+index ad30f42..5caf353 100644
 --- a/fs/aufs/f_op.c
 +++ b/fs/aufs/f_op.c
 @@ -358,7 +358,7 @@ static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter)
@@ -38563,7 +38556,7 @@ index 0d4ea929..af293c2 100644
  		if (file->f_mapping != h_file->f_mapping) {
  			file->f_mapping = h_file->f_mapping;
 diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c
-index 3b217c2..0f5ab22 100644
+index 3e9d59a..42811d3 100644
 --- a/fs/aufs/loop.c
 +++ b/fs/aufs/loop.c
 @@ -133,3 +133,19 @@ void au_loopback_fin(void)
@@ -38587,7 +38580,7 @@ index 3b217c2..0f5ab22 100644
 +	return f;
 +}
 diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h
-index 7d7bf34..ba7c188 100644
+index dc3f3be..c33d060 100644
 --- a/fs/aufs/loop.h
 +++ b/fs/aufs/loop.h
 @@ -26,7 +26,11 @@ void au_warn_loopback(struct super_block *h_sb);
@@ -38612,7 +38605,7 @@ index 7d7bf34..ba7c188 100644
  
  #endif /* __KERNEL__ */
 diff --git a/fs/aufs/super.c b/fs/aufs/super.c
-index eef60a6..e03a658 100644
+index 80644ef..19cde48 100644
 --- a/fs/aufs/super.c
 +++ b/fs/aufs/super.c
 @@ -843,7 +843,10 @@ static const struct super_operations aufs_sop = {
@@ -38628,10 +38621,10 @@ index eef60a6..e03a658 100644
  
  /* ---------------------------------------------------------------------- */
 diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 383ab06..e899b15 100644
+index 09a2542..11a6346 100644
 --- a/include/linux/fs.h
 +++ b/include/linux/fs.h
-@@ -1849,6 +1849,10 @@ struct super_operations {
+@@ -1852,6 +1852,10 @@ struct super_operations {
  				  struct shrink_control *);
  	long (*free_cached_objects)(struct super_block *,
  				    struct shrink_control *);
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 09fd7ada..c271828e 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -166,6 +166,7 @@ CRYPTO_SEQIV all=m
 CRYPTO_ECHAINIV all=m
 #- Block modes
 CRYPTO_CBC all=y
+CRYPTO_CFB all=m
 CRYPTO_CTR all=m
 CRYPTO_CTS all=m
 CRYPTO_ECB all=m
@@ -241,6 +242,8 @@ CRYPTO_SERPENT all=m
 CRYPTO_SERPENT_SSE2_X86_64 all=m
 CRYPTO_SERPENT_AVX_X86_64 all=m
 CRYPTO_SERPENT_AVX2_X86_64 all=m
+CRYPTO_SM4 all=m
+CRYPTO_SPECK all=m
 CRYPTO_TEA all=m
 CRYPTO_TWOFISH all=m
 CRYPTO_TWOFISH_COMMON all=m
@@ -300,6 +303,7 @@ ACPI_BATTERY x86=m
 ACPI_BUTTON all=m
 ACPI_VIDEO x86=m
 ACPI_FAN all=m
+ACPI_TAD all=m
 ACPI_DOCK all=y
 ACPI_PROCESSOR all=y
 ACPI_IPMI all=m
@@ -662,7 +666,6 @@ BT_HCIBFUSB all=m
 BT_HCIDTL1 all=m
 BT_HCIBT3C all=m
 BT_HCIBLUECARD all=m
-BT_HCIBTUART all=m
 BT_HCIVHCI all=m
 BT_MRVL all=m
 BT_MRVL_SDIO all=m
@@ -673,6 +676,7 @@ BT_WILINK all=m
 #- *** FILE: drivers/bus/Kconfig ***
 #-
 OMAP_OCP2SCP all=m
+#- file drivers/bus/fsl-mc/Kconfig goes here
 
 #-
 #- *** FILE: drivers/char/Kconfig ***
@@ -815,6 +819,7 @@ COMMON_CLK_WM831X all=m
 #- file drivers/clk/versatile/Kconfig goes here
 COMMON_CLK_SCPI all=m
 COMMON_CLK_SI5351 all=m
+COMMON_CLK_SI544 all=m
 COMMON_CLK_CDCE706 all=m
 COMMON_CLK_CS2000_CP all=m
 COMMON_CLK_PWM all=m
@@ -938,6 +943,7 @@ CRYPTO_DEV_SP_PSP all=y
 #-
 CRYPTO_DEV_CHELSIO all=m
 CHELSIO_IPSEC_INLINE all=y
+CRYPTO_DEV_CHELSIO_TLS all=m
 
 #-
 #- *** FILE: drivers/crypto/qat/Kconfig ***
@@ -999,6 +1005,7 @@ INTEL_MIC_X100_DMA all=m
 PCH_DMA all=m
 TIMB_DMA all=m
 #- file drivers/dma/bestcomm/Kconfig goes here
+#- file drivers/dma/mediatek/Kconfig goes here
 #- file drivers/dma/qcom/Kconfig goes here
 #- file drivers/dma/dw/Kconfig goes here
 #- file drivers/dma/hsu/Kconfig goes here
@@ -1199,6 +1206,7 @@ GPIO_IT87 all=m
 GPIO_SCH all=m
 GPIO_SCH311X all=m
 GPIO_TS5500 all=m
+GPIO_WINBOND all=m
 GPIO_WS16C48 all=m
 GPIO_ADP5588 all=m
 GPIO_MAX7300 all=m
@@ -1492,6 +1500,7 @@ HID_CYPRESS all=m
 HID_DRAGONRISE all=m
 DRAGONRISE_FF all=y
 HID_EMS_FF all=m
+HID_ELAN all=m
 HID_ELECOM all=m
 HID_ELO all=m
 HID_EZKEY all=m
@@ -1499,6 +1508,7 @@ HID_GEMBIRD all=m
 HID_GFRM all=m
 HID_HOLTEK all=m
 HOLTEK_FF all=y
+HID_GOOGLE_HAMMER all=m
 HID_GT683R all=m
 HID_KEYTOUCH all=m
 HID_KYE all=m
@@ -1806,6 +1816,7 @@ HWSPINLOCK all=y
 #-
 INTEL_TH all=m
 INTEL_TH_PCI all=m
+INTEL_TH_ACPI all=m
 INTEL_TH_GTH all=m
 INTEL_TH_STH all=m
 INTEL_TH_MSU all=m
@@ -2278,6 +2289,7 @@ JSA1212 all=m
 RPR0521 all=m
 SENSORS_LM3533 all=m
 LTR501 all=m
+LV0104CS all=m
 MAX44000 all=m
 OPT3001 all=m
 PA12203001 all=m
@@ -2320,9 +2332,11 @@ HID_SENSOR_DEVICE_ROTATION all=m
 #-
 #- *** FILE: drivers/iio/potentiometer/Kconfig ***
 #-
+AD5272 all=m
 DS1803 all=m
 MAX5481 all=m
 MAX5487 all=m
+MCP4018 all=m
 MCP4131 all=m
 MCP4531 all=m
 TPL0102 all=m
@@ -2369,6 +2383,7 @@ SRF08 all=m
 MAXIM_THERMOCOUPLE all=m
 HID_SENSOR_TEMP all=m
 MLX90614 all=m
+MLX90632 all=m
 TMP006 all=m
 TMP007 all=m
 TSYS01 all=m
@@ -2388,7 +2403,7 @@ IIO_SYSFS_TRIGGER all=m
 INFINIBAND all=m sparc=n
 INFINIBAND_USER_MAD all=m sparc=
 INFINIBAND_USER_ACCESS all=m sparc=
-INFINIBAND_EXP_USER_ACCESS all=y
+INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI all=y
 INFINIBAND_USER_MEM all=y sparc=
 INFINIBAND_ON_DEMAND_PAGING all=y
 INFINIBAND_ADDR_TRANS all=y sparc=
@@ -2425,7 +2440,6 @@ INFINIBAND_BNXT_RE all=m
 #- *** FILE: drivers/infiniband/hw/cxgb3/Kconfig ***
 #-
 INFINIBAND_CXGB3 all=m sparc=
-INFINIBAND_CXGB3_DEBUG all=n sparc=
 
 #-
 #- *** FILE: drivers/infiniband/hw/cxgb4/Kconfig ***
@@ -2605,6 +2619,7 @@ JOYSTICK_XPAD_LEDS all=y ia64=n
 JOYSTICK_WALKERA0701 all=m
 JOYSTICK_PSXPAD_SPI all=m
 JOYSTICK_PSXPAD_SPI_FF all=y
+JOYSTICK_PXRC all=m
 
 #-
 #- *** FILE: drivers/input/joystick/iforce/Kconfig ***
@@ -2705,6 +2720,7 @@ INPUT_SOC_BUTTON_ARRAY all=m
 INPUT_DRV260X_HAPTICS all=m
 INPUT_DRV2665_HAPTICS all=m
 INPUT_DRV2667_HAPTICS all=m
+INPUT_RAVE_SP_PWRBUTTON all=m
 
 #-
 #- *** FILE: drivers/input/mouse/Kconfig ***
@@ -3074,6 +3090,7 @@ LEDS_MENF21BMC all=m
 #- LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
 LEDS_BLINKM all=m
 LEDS_MLXCPLD all=m
+LEDS_MLXREG all=m
 LEDS_USER all=m
 LEDS_NIC78BX all=m
 #- LED Triggers
@@ -3323,6 +3340,7 @@ DVB_TDA10048 all=m
 DVB_STV0367 all=m
 DVB_CXD2820R all=m
 DVB_RTL2832_SDR all=m
+#- file drivers/media/dvb-frontends/cxd2880/Kconfig goes here
 #- DVB-C (cable) frontends
 DVB_VES1820 all=m
 DVB_TDA10021 all=m
@@ -3348,8 +3366,10 @@ DVB_TUNER_DIB0070 all=m
 DVB_LNBP21 all=m
 DVB_ISL6405 all=m
 DVB_ISL6421 all=m
-DVB_SP2 all=m
 DVB_LGS8GL5 all=m
+#- Common Interface (EN50221) controller drivers
+DVB_CXD2099 all=m
+DVB_SP2 all=m
 #- Tools to develop new frontends
 
 #-
@@ -3418,10 +3438,8 @@ VIDEO_M5MOLS all=m
 #- *** FILE: drivers/media/i2c/soc_camera/Kconfig ***
 #-
 #- soc_camera sensor drivers
-SOC_CAMERA_IMX074 all=m
 SOC_CAMERA_MT9M001 all=m
 SOC_CAMERA_MT9M111 all=m
-SOC_CAMERA_MT9T031 all=m
 SOC_CAMERA_MT9T112 all=m
 SOC_CAMERA_MT9V022 all=m
 SOC_CAMERA_OV5642 all=m
@@ -3663,7 +3681,6 @@ V4L_PLATFORM_DRIVERS all=y
 VIDEO_VIA_CAMERA all=m
 #- file drivers/media/platform/davinci/Kconfig goes here
 #- file drivers/media/platform/omap/Kconfig goes here
-#- file drivers/media/platform/blackfin/Kconfig goes here
 #- file drivers/media/platform/soc_camera/Kconfig goes here
 #- file drivers/media/platform/exynos4-is/Kconfig goes here
 #- file drivers/media/platform/am437x/Kconfig goes here
@@ -3769,11 +3786,13 @@ IR_SANYO_DECODER all=m
 IR_SHARP_DECODER all=m
 IR_MCE_KBD_DECODER all=m
 IR_XMP_DECODER all=m
+IR_IMON_DECODER all=m
 RC_DEVICES all=y
 RC_ATI_REMOTE all=m
 IR_ENE all=m
 IR_HIX5HD2 all=m
 IR_IMON all=m
+IR_IMON_RAW all=m
 IR_MCEUSB all=m
 IR_ITE_CIR all=m
 IR_FINTEK all=m
@@ -3811,6 +3830,11 @@ IR_IMG_SANYO all=y
 #-
 RC_MAP all=m
 
+#-
+#- *** FILE: drivers/media/spi/Kconfig ***
+#-
+CXD2880_SPI_DRV all=m
+
 #-
 #- *** FILE: drivers/media/tuners/Kconfig ***
 #-
@@ -4492,7 +4516,6 @@ MTD_PARTITIONED_MASTER all=y
 #- file drivers/mtd/maps/Kconfig goes here
 #- file drivers/mtd/devices/Kconfig goes here
 #- file drivers/mtd/nand/Kconfig goes here
-#- file drivers/mtd/onenand/Kconfig goes here
 #- file drivers/mtd/lpddr/Kconfig goes here
 #- file drivers/mtd/spi-nor/Kconfig goes here
 #- file drivers/mtd/ubi/Kconfig goes here
@@ -4585,7 +4608,16 @@ MTD_PLATRAM all=m
 MTD_LATCH_ADDR all=m
 
 #-
-#- *** FILE: drivers/mtd/nand/Kconfig ***
+#- *** FILE: drivers/mtd/nand/onenand/Kconfig ***
+#-
+MTD_ONENAND all=m
+MTD_ONENAND_VERIFY_WRITE all=n sparc=y sparc64=y
+MTD_ONENAND_GENERIC all=m
+MTD_ONENAND_OTP all=n alpha=y i386=y x86_64=y
+MTD_ONENAND_2X_PROGRAM all=y
+
+#-
+#- *** FILE: drivers/mtd/nand/raw/Kconfig ***
 #-
 MTD_NAND_ECC_SMC all=y
 MTD_NAND all=m
@@ -4611,15 +4643,6 @@ MTD_NAND_FSL_ELBC ppc=m ppc64=m
 MTD_NAND_HISI504 all=m
 MTD_NAND_MTK all=m
 
-#-
-#- *** FILE: drivers/mtd/onenand/Kconfig ***
-#-
-MTD_ONENAND all=m
-MTD_ONENAND_VERIFY_WRITE all=n sparc=y sparc64=y
-MTD_ONENAND_GENERIC all=m
-MTD_ONENAND_OTP all=n alpha=y i386=y x86_64=y
-MTD_ONENAND_2X_PROGRAM all=y
-
 #-
 #- *** FILE: drivers/mtd/spi-nor/Kconfig ***
 #-
@@ -4862,6 +4885,7 @@ MICROCHIP_KSZ_SPI_DRIVER all=m
 #-
 NET_DSA_MV88E6XXX all=m
 NET_DSA_MV88E6XXX_GLOBAL2 all=y
+NET_DSA_MV88E6XXX_PTP all=y
 
 #-
 #- *** FILE: drivers/net/ethernet/3com/Kconfig ***
@@ -4905,7 +4929,6 @@ WD80x3 alpha=m i386=m
 #- file drivers/net/ethernet/atheros/Kconfig goes here
 #- file drivers/net/ethernet/aurora/Kconfig goes here
 #- file drivers/net/ethernet/cadence/Kconfig goes here
-#- file drivers/net/ethernet/adi/Kconfig goes here
 #- file drivers/net/ethernet/broadcom/Kconfig goes here
 #- file drivers/net/ethernet/brocade/Kconfig goes here
 #- file drivers/net/ethernet/calxeda/Kconfig goes here
@@ -4943,6 +4966,7 @@ JME all=m
 FEALNX all=m
 #- file drivers/net/ethernet/natsemi/Kconfig goes here
 #- file drivers/net/ethernet/netronome/Kconfig goes here
+#- file drivers/net/ethernet/ni/Kconfig goes here
 #- file drivers/net/ethernet/8390/Kconfig goes here
 #- file drivers/net/ethernet/nuvoton/Kconfig goes here
 #- file drivers/net/ethernet/nvidia/Kconfig goes here
@@ -4969,7 +4993,6 @@ ETHOC all=m
 #- file drivers/net/ethernet/sun/Kconfig goes here
 #- file drivers/net/ethernet/tehuti/Kconfig goes here
 #- file drivers/net/ethernet/ti/Kconfig goes here
-#- file drivers/net/ethernet/tile/Kconfig goes here
 #- file drivers/net/ethernet/toshiba/Kconfig goes here
 #- file drivers/net/ethernet/tundra/Kconfig goes here
 #- file drivers/net/ethernet/via/Kconfig goes here
@@ -5263,6 +5286,7 @@ IXGBEVF all=m
 I40E all=m
 I40E_DCB all=y
 I40EVF all=m
+ICE all=m
 FM10K all=m
 
 #-
@@ -5333,6 +5357,7 @@ NET_VENDOR_MICROCHIP all=y
 ENC28J60 all=m
 ENC28J60_WRITEVERIFY all=n
 ENCX24J600 all=m
+LAN743X all=m
 
 #-
 #- *** FILE: drivers/net/ethernet/myricom/Kconfig ***
@@ -5364,6 +5389,11 @@ NFP all=m
 NFP_APP_FLOWER all=y
 NFP_DEBUG all=n
 
+#-
+#- *** FILE: drivers/net/ethernet/ni/Kconfig ***
+#-
+NET_VENDOR_NI all=y
+
 #-
 #- *** FILE: drivers/net/ethernet/nvidia/Kconfig ***
 #-
@@ -5638,6 +5668,7 @@ IEEE802154_ATUSB all=m
 IEEE802154_ADF7242 all=m
 IEEE802154_CA8210 all=m
 IEEE802154_CA8210_DEBUGFS all=y
+IEEE802154_MCR20A all=m
 
 #-
 #- *** FILE: drivers/net/phy/Kconfig ***
@@ -6210,6 +6241,7 @@ RSI_91X all=m
 RSI_DEBUGFS all=y
 RSI_SDIO all=m
 RSI_USB all=m
+RSI_COEX all=y
 
 #-
 #- *** FILE: drivers/net/wireless/st/Kconfig ***
@@ -6941,6 +6973,7 @@ REGULATOR_DEBUG all=n
 REGULATOR_FIXED_VOLTAGE all=m
 REGULATOR_VIRTUAL_CONSUMER all=m
 REGULATOR_USERSPACE_CONSUMER all=m
+REGULATOR_88PG86X all=m
 REGULATOR_88PM800 all=m
 REGULATOR_ACT8865 all=m
 REGULATOR_AD5398 all=m
@@ -7228,11 +7261,6 @@ FCOE_FNIC all=m
 SCSI_SNIC all=m
 SCSI_SNIC_DEBUG_FS all=y
 SCSI_DMX3191D all=m
-SCSI_EATA all=m
-SCSI_EATA_TAGGED_QUEUE all=y
-SCSI_EATA_LINKED_COMMANDS all=y
-SCSI_EATA_MAX_TAGS all=16 i386=62 x86_64=62
-SCSI_FUTURE_DOMAIN all=m
 SCSI_GDTH all=m
 SCSI_ISCI all=m
 SCSI_GENERIC_NCR5380 alpha=m i386=m
@@ -7246,7 +7274,6 @@ SCSI_PPA all=m
 SCSI_IMM all=m
 SCSI_IZIP_EPP16 all=n
 SCSI_IZIP_SLOW_CTR all=n
-SCSI_NCR53C406A alpha=m i386=m
 SCSI_NCR_D700 i386=m
 SCSI_STEX all=m sparc=n
 SCSI_SYM53C8XX_2 all=m
@@ -7271,7 +7298,6 @@ SCSI_QLOGICPTI sparc=m sparc64=m
 SCSI_LPFC all=m sparc=n
 SCSI_LPFC_DEBUG_FS all=n
 SCSI_SIM710 alpha=m i386=m
-SCSI_SYM53C416 alpha=m i386=m
 SCSI_DC395x all=m
 SCSI_AM53C974 all=m
 SCSI_NSP32 i386=m ppc=n sparc=n
@@ -7406,7 +7432,6 @@ SCSI_OSD_DEBUG all=n
 #-
 SCSI_LOWLEVEL_PCMCIA all=y ia64=n
 PCMCIA_AHA152X i386=m ppc=n x86_64=m
-PCMCIA_FDOMAIN all=m
 PCMCIA_NINJA_SCSI i386=m ppc=n x86_64=m
 PCMCIA_QLOGIC all=m
 PCMCIA_SYM53C500 all=m
@@ -7549,7 +7574,6 @@ SSB_DRIVER_GPIO all=y
 #- *** FILE: drivers/staging/Kconfig ***
 #-
 STAGING all=y
-#- file drivers/staging/irda/net/Kconfig goes here
 #- file drivers/staging/ipx/Kconfig goes here
 #- file drivers/staging/ncpfs/Kconfig goes here
 #- file drivers/staging/wlan-ng/Kconfig goes here
@@ -7594,10 +7618,16 @@ STAGING all=y
 #- file drivers/staging/ks7010/Kconfig goes here
 #- file drivers/staging/greybus/Kconfig goes here
 #- file drivers/staging/vc04_services/Kconfig goes here
-#- file drivers/staging/ccree/Kconfig goes here
 #- file drivers/staging/typec/Kconfig goes here
 #- file drivers/staging/vboxvideo/Kconfig goes here
 #- file drivers/staging/pi433/Kconfig goes here
+#- file drivers/staging/mt7621-pinctrl/Kconfig goes here
+#- file drivers/staging/mt7621-gpio/Kconfig goes here
+#- file drivers/staging/mt7621-spi/Kconfig goes here
+#- file drivers/staging/mt7621-dma/Kconfig goes here
+#- file drivers/staging/mt7621-mmc/Kconfig goes here
+#- file drivers/staging/mt7621-eth/Kconfig goes here
+#- file drivers/staging/mt7621-dts/Kconfig goes here
 
 #-
 #- *** FILE: drivers/staging/comedi/Kconfig ***
@@ -7898,68 +7928,6 @@ AD2S1210 all=m
 IPX all=m
 IPX_INTERN all=n
 
-#-
-#- *** FILE: drivers/staging/irda/drivers/Kconfig ***
-#-
-#- SIR device drivers
-IRTTY_SIR all=m
-#- Dongle support
-DONGLE all=y
-ESI_DONGLE all=m
-ACTISYS_DONGLE all=m
-TEKRAM_DONGLE all=m
-TOIM3232_DONGLE all=m
-LITELINK_DONGLE all=m
-MA600_DONGLE all=m
-GIRBIL_DONGLE all=m
-MCP2120_DONGLE all=m
-OLD_BELKIN_DONGLE all=m
-ACT200L_DONGLE all=m
-KINGSUN_DONGLE all=m
-KSDAZZLE_DONGLE all=m
-KS959_DONGLE all=m
-#- FIR device drivers
-USB_IRDA all=m
-SIGMATEL_FIR all=m
-NSC_FIR all=m
-WINBOND_FIR all=m
-TOSHIBA_FIR i386=m ppc=n
-SMC_IRCC_FIR all=m
-ALI_FIR all=m
-VLSI_FIR all=m sparc=n
-VIA_FIR all=m
-MCS_FIR all=m
-
-#-
-#- *** FILE: drivers/staging/irda/net/Kconfig ***
-#-
-IRDA all=m
-#- IrDA protocols
-#- file drivers/staging/irda/net/irlan/Kconfig goes here
-#- file drivers/staging/irda/net/irnet/Kconfig goes here
-#- file drivers/staging/irda/net/ircomm/Kconfig goes here
-IRDA_ULTRA all=y
-#- IrDA options
-IRDA_CACHE_LAST_LSAP all=y
-IRDA_FAST_RR all=y
-IRDA_DEBUG all=n
-#- file drivers/staging/irda/drivers/Kconfig goes here
-
-#-
-#- *** FILE: drivers/staging/irda/net/ircomm/Kconfig ***
-#-
-IRCOMM all=m
-
-#-
-#- *** FILE: drivers/staging/irda/net/irlan/Kconfig ***
-#-
-IRLAN all=m
-
-#-
-#- *** FILE: drivers/staging/irda/net/irnet/Kconfig ***
-#-
-IRNET all=m
-
 #-
 #- *** FILE: drivers/staging/ks7010/Kconfig ***
 #-
@@ -7985,9 +7953,10 @@ LUSTRE_DEBUG_EXPENSIVE_CHECK all=n
 STAGING_MEDIA all=y
 #- file drivers/staging/media/atomisp/Kconfig goes here
 #- file drivers/staging/media/bcm2048/Kconfig goes here
-#- file drivers/staging/media/cxd2099/Kconfig goes here
 #- file drivers/staging/media/davinci_vpfe/Kconfig goes here
 #- file drivers/staging/media/imx/Kconfig goes here
+#- file drivers/staging/media/imx074/Kconfig goes here
+#- file drivers/staging/media/mt9t031/Kconfig goes here
 #- file drivers/staging/media/omap4iss/Kconfig goes here
 #- file drivers/staging/media/tegra-vde/Kconfig goes here
 
@@ -8004,7 +7973,6 @@ INTEL_ATOMISP all=y
 #- file drivers/staging/media/atomisp/i2c/ov5693/Kconfig goes here
 VIDEO_ATOMISP_OV2722 all=m
 VIDEO_ATOMISP_GC2235 all=m
-VIDEO_ATOMISP_OV8858 all=m
 VIDEO_ATOMISP_MSRLIST_HELPER all=m
 VIDEO_ATOMISP_MT9M114 all=m
 VIDEO_ATOMISP_GC0310 all=m
@@ -8027,9 +7995,14 @@ VIDEO_ATOMISP all=m
 I2C_BCM2048 all=m
 
 #-
-#- *** FILE: drivers/staging/media/cxd2099/Kconfig ***
+#- *** FILE: drivers/staging/media/imx074/Kconfig ***
 #-
-DVB_CXD2099 all=m
+SOC_CAMERA_IMX074 all=m
+
+#-
+#- *** FILE: drivers/staging/media/mt9t031/Kconfig ***
+#-
+SOC_CAMERA_MT9T031 all=m
 
 #-
 #- *** FILE: drivers/staging/most/Kconfig ***
@@ -8084,6 +8057,13 @@ MOST_VIDEO all=m
 MTD_SPINAND_MT29F all=m
 MTD_SPINAND_ONDIEECC all=y
 
+#-
+#- *** FILE: drivers/staging/mt7621-mmc/Kconfig ***
+#-
+MTK_MMC all=m
+MTK_AEE_KDUMP all=y
+MTK_MMC_CD_POLL all=y
+
 #-
 #- *** FILE: drivers/staging/ncpfs/Kconfig ***
 #-
@@ -8286,6 +8266,7 @@ TCM_FC all=m
 #- *** FILE: drivers/thermal/Kconfig ***
 #-
 THERMAL all=y
+THERMAL_STATISTICS all=y
 THERMAL_EMERGENCY_POWEROFF_DELAY_MS all=0
 THERMAL_WRITABLE_TRIPS all=y
 THERMAL_DEFAULT_GOV_STEP_WISE all=y
@@ -8504,6 +8485,7 @@ USB_USS720 all=m
 #- file drivers/usb/phy/Kconfig goes here
 #- file drivers/usb/gadget/Kconfig goes here
 #- file drivers/usb/typec/Kconfig goes here
+#- file drivers/usb/roles/Kconfig goes here
 USB_LED_TRIG all=y
 USB_ULPI_BUS all=m
 
@@ -8786,6 +8768,11 @@ USB_MV_OTG all=m
 #-
 USB_RENESAS_USBHS all=m
 
+#-
+#- *** FILE: drivers/usb/roles/Kconfig ***
+#-
+USB_ROLES_INTEL_XHCI all=m
+
 #-
 #- *** FILE: drivers/usb/serial/Kconfig ***
 #-
@@ -8876,12 +8863,18 @@ TYPEC_TCPM all=m
 #- file drivers/usb/typec/fusb302/Kconfig goes here
 #- file drivers/usb/typec/ucsi/Kconfig goes here
 TYPEC_TPS6598X all=m
+#- file drivers/usb/typec/mux/Kconfig goes here
 
 #-
 #- *** FILE: drivers/usb/typec/fusb302/Kconfig ***
 #-
 TYPEC_FUSB302 all=m
 
+#-
+#- *** FILE: drivers/usb/typec/mux/Kconfig ***
+#-
+TYPEC_MUX_PI3USB30532 all=m
+
 #-
 #- *** FILE: drivers/usb/typec/ucsi/Kconfig ***
 #-
@@ -9879,6 +9872,7 @@ OVERLAY_FS_REDIRECT_DIR all=y
 OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW all=n
 OVERLAY_FS_INDEX all=y
 OVERLAY_FS_NFS_EXPORT all=n
+OVERLAY_FS_XINO_AUTO all=y
 
 #-
 #- *** FILE: fs/proc/Kconfig ***
@@ -9892,9 +9886,15 @@ PROC_CHILDREN all=y
 #- *** FILE: fs/pstore/Kconfig ***
 #-
 PSTORE all=y
-PSTORE_ZLIB_COMPRESS all=n
+PSTORE_DEFLATE_COMPRESS all=m
 PSTORE_LZO_COMPRESS all=n
 PSTORE_LZ4_COMPRESS all=y
+PSTORE_LZ4HC_COMPRESS all=m
+PSTORE_842_COMPRESS all=y
+PSTORE_DEFLATE_COMPRESS_DEFAULT all=n
+PSTORE_LZ4_COMPRESS_DEFAULT all=y
+PSTORE_LZ4HC_COMPRESS_DEFAULT all=n
+PSTORE_842_COMPRESS_DEFAULT all=n
 PSTORE_CONSOLE all=y
 PSTORE_PMSG all=y
 PSTORE_FTRACE all=n
@@ -10350,10 +10350,10 @@ KCOV all=n
 DEBUG_SHIRQ all=n
 LOCKUP_DETECTOR all=y
 SOFTLOCKUP_DETECTOR all=y
+BOOTPARAM_SOFTLOCKUP_PANIC all=n
 HARDLOCKUP_DETECTOR all=y
 BOOTPARAM_HARDLOCKUP_PANIC all=n
 BOOTPARAM_HARDLOCKUP_PANIC_VALUE all=0
-BOOTPARAM_SOFTLOCKUP_PANIC all=n
 DETECT_HUNG_TASK all=y
 DEFAULT_HUNG_TASK_TIMEOUT all=120
 BOOTPARAM_HUNG_TASK_PANIC all=n
@@ -10364,13 +10364,14 @@ SCHED_DEBUG all=n
 SCHEDSTATS all=n
 SCHED_STACK_END_CHECK all=y
 DEBUG_TIMEKEEPING all=n
+PROVE_LOCKING all=n
+LOCK_STAT all=n
 DEBUG_RT_MUTEXES all=n
 DEBUG_SPINLOCK all=n
 DEBUG_MUTEXES all=n
 DEBUG_WW_MUTEX_SLOWPATH all=n
+DEBUG_RWSEMS all=n
 DEBUG_LOCK_ALLOC all=n
-PROVE_LOCKING all=n
-LOCK_STAT all=n
 DEBUG_ATOMIC_SLEEP all=n
 DEBUG_LOCKING_API_SELFTESTS all=n
 LOCK_TORTURE_TEST all=m
@@ -10738,7 +10739,7 @@ BRIDGE_VLAN_FILTERING all=y
 #-
 #- *** FILE: net/bridge/netfilter/Kconfig ***
 #-
-NF_TABLES_BRIDGE all=m
+NF_TABLES_BRIDGE all=y
 NFT_BRIDGE_META all=m
 NFT_BRIDGE_REJECT all=m
 NF_LOG_BRIDGE all=m
@@ -10930,7 +10931,7 @@ NFT_CHAIN_ROUTE_IPV4 all=m
 NFT_REJECT_IPV4 all=m
 NFT_DUP_IPV4 all=m
 NFT_FIB_IPV4 all=m
-NF_TABLES_ARP all=m
+NF_TABLES_ARP all=y
 NF_FLOW_TABLE_IPV4 all=m
 NF_LOG_ARP all=m
 NF_LOG_IPV4 all=m
@@ -11001,15 +11002,15 @@ NF_CONNTRACK_IPV6 all=m
 NF_SOCKET_IPV6 all=m
 NF_TABLES_IPV6 all=m
 NFT_CHAIN_ROUTE_IPV6 all=m
+NFT_CHAIN_NAT_IPV6 all=m
+NFT_MASQ_IPV6 all=m
+NFT_REDIR_IPV6 all=m
 NFT_DUP_IPV6 all=m
 NFT_FIB_IPV6 all=m
 NF_FLOW_TABLE_IPV6 all=m
 NF_REJECT_IPV6 all=m
 NF_LOG_IPV6 all=m
 NF_NAT_IPV6 all=m
-NFT_CHAIN_NAT_IPV6 all=m
-NFT_MASQ_IPV6 all=m
-NFT_REDIR_IPV6 all=m
 IP6_NF_IPTABLES all=m
 IP6_NF_MATCH_AH all=m
 IP6_NF_MATCH_EUI64 all=m
@@ -11131,8 +11132,8 @@ NETFILTER_NETLINK_GLUE_CT all=y
 NF_NAT all=m
 NF_NAT_REDIRECT all=m
 NF_TABLES all=m
-NF_TABLES_INET all=m
-NF_TABLES_NETDEV all=m
+NF_TABLES_INET all=y
+NF_TABLES_NETDEV all=y
 NFT_EXTHDR all=m
 NFT_META all=m
 NFT_RT all=m
@@ -11442,6 +11443,7 @@ NET_EMATCH_META all=m
 NET_EMATCH_TEXT all=m
 NET_EMATCH_CANID all=m
 NET_EMATCH_IPSET all=m
+NET_EMATCH_IPT all=m
 NET_CLS_ACT all=y
 NET_ACT_POLICE all=m
 NET_ACT_GACT all=m
@@ -11502,6 +11504,7 @@ NET_SWITCHDEV all=y
 TIPC all=m
 TIPC_MEDIA_IB all=y
 TIPC_MEDIA_UDP all=y
+TIPC_DIAG all=m
 
 #-
 #- *** FILE: net/tls/Kconfig ***
@@ -11986,7 +11989,6 @@ SND_SOC all=m
 #- file sound/soc/atmel/Kconfig goes here
 #- file sound/soc/au1x/Kconfig goes here
 #- file sound/soc/bcm/Kconfig goes here
-#- file sound/soc/blackfin/Kconfig goes here
 #- file sound/soc/cirrus/Kconfig goes here
 #- file sound/soc/davinci/Kconfig goes here
 #- file sound/soc/dwc/Kconfig goes here
@@ -12023,6 +12025,7 @@ SND_SOC all=m
 #- *** FILE: sound/soc/amd/Kconfig ***
 #-
 SND_SOC_AMD_ACP all=m
+SND_SOC_AMD_CZ_DA7219MX98357_MACH all=m
 SND_SOC_AMD_CZ_RT5645_MACH all=m
 
 #-
@@ -12040,12 +12043,15 @@ SND_SOC_ADAU1761_I2C all=m
 SND_SOC_ADAU1761_SPI all=m
 SND_SOC_ADAU7002 all=m
 SND_SOC_AK4104 all=m
+SND_SOC_AK4458 all=m
 SND_SOC_AK4554 all=m
 SND_SOC_AK4613 all=m
 SND_SOC_AK4641 all=m
 SND_SOC_AK4642 all=m
 SND_SOC_AK5386 all=m
+SND_SOC_AK5558 all=m
 SND_SOC_ALC5623 all=m
+SND_SOC_BD28623 all=m
 SND_SOC_BT_SCO all=m
 SND_SOC_CS35L32 all=m
 SND_SOC_CS35L33 all=m
@@ -12076,6 +12082,7 @@ SND_SOC_HDAC_HDMI all=m
 SND_SOC_INNO_RK3036 all=m
 SND_SOC_MAX98095 all=m
 SND_SOC_MAX98504 all=m
+SND_SOC_MAX9867 all=m
 SND_SOC_MAX98927 all=m
 SND_SOC_MAX98373 all=m
 SND_SOC_MAX9850 all=m
@@ -12083,6 +12090,7 @@ SND_SOC_MAX9860 all=m
 SND_SOC_MSM8916_WCD_ANALOG all=m
 SND_SOC_MSM8916_WCD_DIGITAL all=m
 SND_SOC_PCM1681 all=m
+SND_SOC_PCM1789_I2C all=m
 SND_SOC_PCM179X all=m
 SND_SOC_PCM179X_I2C all=m
 SND_SOC_PCM179X_SPI all=m
@@ -12111,6 +12119,7 @@ SND_SOC_TAS5086 all=m
 SND_SOC_TAS571X all=m
 SND_SOC_TAS5720 all=m
 SND_SOC_TAS6424 all=m
+SND_SOC_TDA7419 all=m
 SND_SOC_TFA9879 all=m
 SND_SOC_TLV320AIC23 all=m
 SND_SOC_TLV320AIC23_I2C all=m
@@ -12147,6 +12156,7 @@ SND_SOC_WM8985 all=m
 SND_SOC_WM8991 all=m
 SND_SOC_ZX_AUD96P22 all=m
 SND_SOC_LM4857 all=m
+SND_SOC_MAX9759 all=m
 SND_SOC_NAU8540 all=m
 SND_SOC_NAU8810 all=m
 SND_SOC_NAU8824 all=m
@@ -12205,8 +12215,9 @@ SND_SST_IPC_ACPI all=m
 SND_SOC_INTEL_SST all=m
 SND_SOC_INTEL_HASWELL all=m
 SND_SOC_INTEL_BAYTRAIL all=m
-SND_SST_ATOM_HIFI2_PLATFORM_PCI all=m
 SND_SST_ATOM_HIFI2_PLATFORM all=m
+SND_SST_ATOM_HIFI2_PLATFORM_PCI all=m
+SND_SST_ATOM_HIFI2_PLATFORM_ACPI all=m
 SND_SOC_INTEL_SKYLAKE all=m
 #- file sound/soc/intel/boards/Kconfig goes here
 
@@ -12223,6 +12234,7 @@ SND_SOC_INTEL_BYTCR_RT5651_MACH all=m
 SND_SOC_INTEL_CHT_BSW_RT5672_MACH all=m
 SND_SOC_INTEL_CHT_BSW_RT5645_MACH all=m
 SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH all=m
+SND_SOC_INTEL_CHT_BSW_NAU8824_MACH all=m
 SND_SOC_INTEL_BYT_CHT_DA7213_MACH all=m
 SND_SOC_INTEL_BYT_CHT_ES8316_MACH all=m
 SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH all=m
@@ -12233,6 +12245,7 @@ SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH all=m
 SND_SOC_INTEL_BXT_RT298_MACH all=m
 SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH all=m
 SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH all=m
+SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH all=m
 
 #-
 #- *** FILE: sound/soc/qcom/Kconfig ***
@@ -12309,3 +12322,53 @@ RD_LZMA all=y
 RD_XZ all=y
 RD_LZO all=y
 RD_LZ4 all=y
+
+#-
+#- *** PROBABLY REMOVED OPTIONS ***
+#-
+ACT200L_DONGLE all=m
+ACTISYS_DONGLE all=m
+ALI_FIR all=m
+BT_HCIBTUART all=m
+DONGLE all=y
+ESI_DONGLE all=m
+GIRBIL_DONGLE all=m
+INFINIBAND_CXGB3_DEBUG all=n sparc=
+INFINIBAND_EXP_USER_ACCESS all=y
+IRCOMM all=m
+IRDA all=m
+IRDA_CACHE_LAST_LSAP all=y
+IRDA_DEBUG all=n
+IRDA_FAST_RR all=y
+IRDA_ULTRA all=y
+IRLAN all=m
+IRNET all=m
+IRTTY_SIR all=m
+KINGSUN_DONGLE all=m
+KS959_DONGLE all=m
+KSDAZZLE_DONGLE all=m
+LITELINK_DONGLE all=m
+MA600_DONGLE all=m
+MCP2120_DONGLE all=m
+MCS_FIR all=m
+NSC_FIR all=m
+OLD_BELKIN_DONGLE all=m
+PCMCIA_FDOMAIN all=m
+PSTORE_ZLIB_COMPRESS all=n
+SCSI_EATA all=m
+SCSI_EATA_LINKED_COMMANDS all=y
+SCSI_EATA_MAX_TAGS all=16 i386=62 x86_64=62
+SCSI_EATA_TAGGED_QUEUE all=y
+SCSI_FUTURE_DOMAIN all=m
+SCSI_NCR53C406A alpha=m i386=m
+SCSI_SYM53C416 alpha=m i386=m
+SIGMATEL_FIR all=m
+SMC_IRCC_FIR all=m
+TEKRAM_DONGLE all=m
+TOIM3232_DONGLE all=m
+TOSHIBA_FIR i386=m ppc=n
+USB_IRDA all=m
+VIA_FIR all=m
+VIDEO_ATOMISP_OV8858 all=m
+VLSI_FIR all=m sparc=n
+WINBOND_FIR all=m
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list