Bump to 4.2.3

3 files changed, 8 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32e0f7be7641..55fa7e420994 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = linux-bfq
-	pkgver = 4.2.2
+	pkgver = 4.2.3
 	pkgrel = 1
 	url = http://algo.ing.unimo.it
 	arch = i686
@@ -11,8 +11,8 @@ pkgbase = linux-bfq
 	options = !strip
 	source = http://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.xz
 	source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.2.tar.sign
-	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.2.xz
-	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.2.sign
+	source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.3.xz
+	source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.2.3.sign
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.2.0-v7r9/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r9-4.2.patch
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.2.0-v7r9/0002-block-introduce-the-BFQ-v7r9-I-O-sched-for-4.2.patch
 	source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.2.0-v7r9/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r9-for-4.2.0.patch
@@ -23,10 +23,9 @@ pkgbase = linux-bfq
 	source = config.x86_64
 	source = 0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch
 	source = 0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch
-	source = 0001-fix-bridge-regression.patch
 	sha512sums = a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee
 	sha512sums = SKIP
-	sha512sums = b37c71cb46cdbf3b7d2dac84ebf3e09d4e5e2433b150078e0e40ea881296401954b359d7bba6e9358957260cb0ccabafc0579feaef19c949d02ac9cfb48a3002
+	sha512sums = 08ea0f7da5892ab564310562d511c631a41a06681a0bc602176cdae0827c762bc33804970f66185f4ba27af6eaaf9f0297d5e81fdb0c7705fd8c2df4539d0186
 	sha512sums = SKIP
 	sha512sums = 077f2c0d5b8e43b295ae52d9b742dc5a7119765016725e4997d0a7cd7941a7622ac057f9bae4b8ed284499853334984f462afbb72ac492806f9657b39ff8503c
 	sha512sums = a3722869b6bc046a9969efea3c20d96a79ba786a6ce6a834adb70c32453f0c0dac58a456daa842beae53628a30868088efde566be91c7821b74946f2f8dd9c60
@@ -38,7 +37,6 @@ pkgbase = linux-bfq
 	sha512sums = b778ce82f1a8b99b883e802136dc8d3248197198f777e4f96cb1e1ea0990250d88141771f6e6e0139e034e63856f0ae82ef5e470eab64e368278e54fb6e62930
 	sha512sums = 790f82eb281d698db6d3b599a0dcece93345c183a6ebe4478d3e17fa916a2a6d763e89058543b32a87beddab37924078c618e8de1bd3cbcc0747be681be3349b
 	sha512sums = 151f797ee9c7756bf711422e47482644072988803fa894e62d34ec8d85375e5097dbdc70eecfb7ac8b0d813c634e043a522dba6e3155424013537939cdc931da
-	sha512sums = df396cf09a42b1ce1cbf5e611d9322e6136f47a033131f77533efdc678f70e8d91dd7ce8a6050bc3b6e30d82a8ccc3f53e677079d813c1ae0d22b4b6c2746c44
 
 pkgname = linux-bfq
 	pkgdesc = Linux Kernel and modules with the BFQ scheduler.
diff --git a/0001-fix-bridge-regression.patch b/0001-fix-bridge-regression.patch
deleted file mode 100644
index 250dfcbcfbf8..000000000000
--- a/0001-fix-bridge-regression.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-@@ -, +, @@ 
----
- net/bridge/br_multicast.c |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
---- a/net/bridge/br_multicast.c	
-+++ a/net/bridge/br_multicast.c	
-@@ -991,7 +991,7 @@ static int br_ip4_multicast_igmp3_report(struct net_bridge *br,
- 
- 	ih = igmpv3_report_hdr(skb);
- 	num = ntohs(ih->ngrec);
--	len = sizeof(*ih);
-+	len = skb_transport_offset(skb) + sizeof(*ih);
- 
- 	for (i = 0; i < num; i++) {
- 		len += sizeof(*grec);
-@@ -1052,7 +1052,7 @@ static int br_ip6_multicast_mld2_report(struct net_bridge *br,
- 
- 	icmp6h = icmp6_hdr(skb);
- 	num = ntohs(icmp6h->icmp6_dataun.un_data16[1]);
--	len = sizeof(*icmp6h);
-+	len = skb_transport_offset(skb) + sizeof(*icmp6h);
- 
- 	for (i = 0; i < num; i++) {
- 		__be16 *nsrcs, _nsrcs;
--- 
diff --git a/PKGBUILD b/PKGBUILD
index f79cce06f932..542e0e1963ad 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -52,7 +52,7 @@ pkgbase=linux-bfq
 pkgname=('linux-bfq' 'linux-bfq-headers' 'linux-bfq-docs')
 _kernelname=-bfq
 _srcname=linux-4.2
-pkgver=4.2.2
+pkgver=4.2.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://algo.ing.unimo.it"
@@ -76,8 +76,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         'change-default-console-loglevel.patch'
         'config' 'config.x86_64'
         '0001-e1000e-Fix-tight-loop-implementation-of-systime-read.patch'
-        '0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch'
-        '0001-fix-bridge-regression.patch')
+        '0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch')
         
 prepare() {
     cd ${_srcname}
@@ -96,11 +95,6 @@ prepare() {
     # many instances of this error: nf_conntrack: table full, dropping packet
         msg "Add not-yet-mainline-oldd patch to fix network unavailability"
 	patch -p1 -i "${srcdir}/0001-netfilter-conntrack-use-nf_ct_tmpl_free-in-CT-synpro.patch"
-	
-    ### Add not-yes-mainline-oldd patch to fix bridge code
-    # https://bugzilla.kernel.org/show_bug.cgi?id=104161
-        msg "Add not-yes-mainline-oldd patch to fix bridge code"
-        patch -Np1 -i "${srcdir}/0001-fix-bridge-regression.patch"
         
     ### set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
     # remove this when a Kconfig knob is made available by upstream
@@ -451,7 +445,7 @@ package_linux-bfq-docs() {
 
 sha512sums=('a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf52d260911412f7c7da3171a5114e89d63da14b1753b9a3eb2cc38fd89b9ee'
             'SKIP'
-            'b37c71cb46cdbf3b7d2dac84ebf3e09d4e5e2433b150078e0e40ea881296401954b359d7bba6e9358957260cb0ccabafc0579feaef19c949d02ac9cfb48a3002'
+            '08ea0f7da5892ab564310562d511c631a41a06681a0bc602176cdae0827c762bc33804970f66185f4ba27af6eaaf9f0297d5e81fdb0c7705fd8c2df4539d0186'
             'SKIP'
             '077f2c0d5b8e43b295ae52d9b742dc5a7119765016725e4997d0a7cd7941a7622ac057f9bae4b8ed284499853334984f462afbb72ac492806f9657b39ff8503c'
             'a3722869b6bc046a9969efea3c20d96a79ba786a6ce6a834adb70c32453f0c0dac58a456daa842beae53628a30868088efde566be91c7821b74946f2f8dd9c60'
@@ -462,9 +456,7 @@ sha512sums=('a87bbce3c0c6d810a41bbba1c0dcaae80dc38dded9f8571e97fa4ee5a468d655daf
             'f8fedf212f655b4241c9aa4b1161b55ef8f67754b278b46714767819206286d6cee3425268df92aa05cd699b01cc4df72266cc7ba5af7da2986bbdef91c90993'
             'b778ce82f1a8b99b883e802136dc8d3248197198f777e4f96cb1e1ea0990250d88141771f6e6e0139e034e63856f0ae82ef5e470eab64e368278e54fb6e62930'
             '790f82eb281d698db6d3b599a0dcece93345c183a6ebe4478d3e17fa916a2a6d763e89058543b32a87beddab37924078c618e8de1bd3cbcc0747be681be3349b'
-            '151f797ee9c7756bf711422e47482644072988803fa894e62d34ec8d85375e5097dbdc70eecfb7ac8b0d813c634e043a522dba6e3155424013537939cdc931da'
-            'df396cf09a42b1ce1cbf5e611d9322e6136f47a033131f77533efdc678f70e8d91dd7ce8a6050bc3b6e30d82a8ccc3f53e677079d813c1ae0d22b4b6c2746c44')
-
+            '151f797ee9c7756bf711422e47482644072988803fa894e62d34ec8d85375e5097dbdc70eecfb7ac8b0d813c634e043a522dba6e3155424013537939cdc931da')
 
 validpgpkeys=(
               'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds