[packages/kernel] - started work on 4.10.1 - IMQ needs love, as usual - aufs4 needs proper update

[baggins]

commit 68ebd1d16f5bd4744a633c8f0b5c85a661b12eca
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Feb 26 22:13:24 2017 +0100

    - started work on 4.10.1
    - IMQ needs love, as usual
    - aufs4 needs proper update

 kernel-aufs4.patch | 12 ++++++------
 kernel-imq.patch   | 26 ++++++++++++--------------
 kernel.spec        | 12 ++++++------
 3 files changed, 24 insertions(+), 26 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 38f969e..52a9f6e 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -71,9 +71,9 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		1
-%define		basever		4.9
-%define		postver		.13
+%define		rel		0.1
+%define		basever		4.10
+%define		postver		.1
 
 # define this to '-%{basever}' for longterm branch
 %define		versuffix	%{nil}
@@ -122,10 +122,10 @@ Epoch:		3
 License:	GPL v2
 Group:		Base/Kernel
 Source0:	https://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz
-# Source0-md5:	0a68ef3615c64bd5ee54a3320e46667d
+# Source0-md5:	b5e7f6b9b2fe1b6cc7bc56a3a0bfc090
 %if "%{postver}" != ".0"
 Patch0:		https://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz
-# Patch0-md5:	0a230f5a610d0724e7435d945bfe91a6
+# Patch0-md5:	d4ab54e17b686d1dbb1d28238fd0b081
 %endif
 Source1:	kernel.sysconfig
 
@@ -675,7 +675,7 @@ cd linux-%{basever}
 # end of netfilter
 
 %if %{with imq}
-%patch50 -p1
+#%patch50 -p1
 %endif
 
 %patch55 -p1
diff --git a/kernel-aufs4.patch b/kernel-aufs4.patch
index 16f65cb..6cc5ab9 100644
--- a/kernel-aufs4.patch
+++ b/kernel-aufs4.patch
@@ -434,14 +434,14 @@ index e18c57b..7be4a39 100644
 --- a/mm/memory.c
 +++ b/mm/memory.c
 @@ -2117,7 +2117,7 @@ static inline int wp_page_reuse(struct fault_env *fe, pte_t orig_pte,
- 		}
- 
- 		if (!page_mkwrite)
--			file_update_time(vma->vm_file);
-+			vma_file_update_time(vma);
  	}
  
- 	return VM_FAULT_WRITE;
+ 	if (!page_mkwrite)
+-		file_update_time(vma->vm_file);
++		vma_file_update_time(vma);
+ }
+ 
+ /*
 diff --git a/mm/mmap.c b/mm/mmap.c
 index 1af87c1..95b0ff4 100644
 --- a/mm/mmap.c
diff --git a/kernel-imq.patch b/kernel-imq.patch
index 3288280..50e3052 100644
--- a/kernel-imq.patch
+++ b/kernel-imq.patch
@@ -1267,7 +1267,7 @@ index d93f949..23fb6d1 100644
 @@ -14,7 +14,8 @@
  #define NF_QUEUE 3
  #define NF_REPEAT 4
- #define NF_STOP 5
+ #define NF_STOP 5	/* Deprecated, for userspace nf_queue compatibility. */
 -#define NF_MAX_VERDICT NF_STOP
 +#define NF_IMQ_QUEUE 6
 +#define NF_MAX_VERDICT NF_IMQ_QUEUE
@@ -1523,19 +1523,17 @@ diff --git a/net/netfilter/core.c b/net/netfilter/core.c
 index 004af03..768a08b 100644
 --- a/net/netfilter/core.c
 +++ b/net/netfilter/core.c
-@@ -360,8 +360,11 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state)
- 		ret = NF_DROP_GETERR(verdict);
- 		if (ret == 0)
- 			ret = -EPERM;
--	} else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE) {
-+	} else if ((verdict & NF_VERDICT_MASK) == NF_QUEUE ||
-+		   (verdict & NF_VERDICT_MASK) == NF_IMQ_QUEUE) {
- 		ret = nf_queue(skb, state, &entry, verdict);
-+		if (ret == -ECANCELED)
-+			goto next_hook;
- 		if (ret == 1 && entry)
- 			goto next_hook;
- 	}
+@@ -360,7 +360,10 @@ int nf_hook_slow(struct sk_buff *skb, struct nf_hook_state *state)
+ 				ret = -EPERM;
+ 			return ret;
+ 		case NF_QUEUE:
++		case NF_IMQ_QUEUE:
+ 			ret = nf_queue(skb, state, &entry, verdict);
++			if (ret == -ECANCELED)
++				continue;
+ 			if (ret == 1 && entry)
+ 				continue;
+ 			return ret;
 diff --git a/net/netfilter/nf_queue.c b/net/netfilter/nf_queue.c
 index 8f08d75..8d362c0 100644
 --- a/net/netfilter/nf_queue.c
================================================================

---- gitweb:

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