From mboxrd@z Thu Jan  1 00:00:00 1970
From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated.
 038169b894f1914b3cbd6513fea5f307bcc4ab12
Date: Fri, 23 Oct 2015 11:02:22 +0200
Message-ID: <20151023090223.21C0F2143E@argus.ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1659306798423263395=="
List-Id: <ipfire-scm.lists.ipfire.org>

--===============1659306798423263395==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  038169b894f1914b3cbd6513fea5f307bcc4ab12 (commit)
      from  39ed5389fc6de2c7f602d26ba21f0cf9e5fdabc6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 038169b894f1914b3cbd6513fea5f307bcc4ab12
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Fri Oct 23 11:00:03 2015 +0200

    kernel: uppdate to 3.14.55
   =20
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 lfs/linux                                         | 19 ++++++++-----------
 src/patches/linux-3.14.54_fix_ip_route_list.patch | 12 ------------
 2 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 src/patches/linux-3.14.54_fix_ip_route_list.patch

Difference in files:
diff --git a/lfs/linux b/lfs/linux
index 85b4060..8d59865 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,10 +24,10 @@
=20
 include Config
=20
-VER         =3D 3.14.54
-RPI_PATCHES =3D 3.14.54-grsec-ipfire1
-A7M_PATCHES =3D 3.14.54-grsec-ipfire1
-GRS_PATCHES =3D grsecurity-3.1ipfire-3.14.54-v1.patch.xz
+VER         =3D 3.14.55
+RPI_PATCHES =3D 3.14.55-grsec-ipfire1
+A7M_PATCHES =3D 3.14.55-grsec-ipfire1
+GRS_PATCHES =3D grsecurity-3.1ipfire-3.14.55-v1.patch.xz
=20
=20
 THISAPP    =3D linux-$(VER)
@@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz		=3D $(URL_IPFIRE)/rp=
i-patches-$(RPI_PATCHES).
 arm7-multi-patches-$(A7M_PATCHES).patch.xz	=3D $(URL_IPFIRE)/arm7-multi-patc=
hes-$(A7M_PATCHES).patch.xz
 $(GRS_PATCHES)					=3D $(URL_IPFIRE)/$(GRS_PATCHES)
=20
-$(DL_FILE)_MD5					=3D 61a0568abd96bef9b682d0d46977fbdd
-rpi-patches-$(RPI_PATCHES).patch.xz_MD5		=3D db92bc85979895efdc6d9da2877ce0ae
-arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	=3D 9092711bcac325c5d0dac5eed=
98f1c5d
-$(GRS_PATCHES)_MD5				=3D 0c1e505cf87177bfb7d62c95e67f10ef
+$(DL_FILE)_MD5					=3D 5358dcd2655874496ede6f3a8ada5054
+rpi-patches-$(RPI_PATCHES).patch.xz_MD5		=3D 4ab53e184441c895adf318a1c2874d43
+arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5	=3D f29bd5c156384b0a4bb7c6e2c=
973ea06
+$(GRS_PATCHES)_MD5				=3D dc0e0195a362087c71227173eab062d4
=20
 install : $(TARGET)
=20
@@ -134,9 +134,6 @@ ifneq "$(KCFG)" "-headers"
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-comp=
at_vdso.patch
 endif
=20
-	# Fix ip route list hang introduced with linux 3.14.54
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.54_fix_ip_r=
oute_list.patch
-
 	# DVB Patches
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.22-dvbsky.p=
atch
 	cd $(DIR_APP) && patch -Np2 < $(DIR_SRC)/src/patches/v4l-dvb_fix_tua6034_pl=
l.patch
diff --git a/src/patches/linux-3.14.54_fix_ip_route_list.patch b/src/patches/=
linux-3.14.54_fix_ip_route_list.patch
deleted file mode 100644
index 6613d15..0000000
--- a/src/patches/linux-3.14.54_fix_ip_route_list.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/net/core/fib_rules.c b/net/core/fib_rules.c
---- a/net/core/fib_rules.c	2015-10-19 16:40:32.000000000 +0200
-+++ b/net/core/fib_rules.c	2015-10-19 16:54:37.836777983 +0200
-@@ -631,7 +631,7 @@
- 		err =3D fib_nl_fill_rule(skb, rule, NETLINK_CB(cb->skb).portid,
- 				       cb->nlh->nlmsg_seq, RTM_NEWRULE,
- 				       NLM_F_MULTI, ops);
--		if (err)
-+		if (err < 0)
- 			break;
- skip:
- 		idx++;


hooks/post-receive
--
IPFire 2.x development tree

--===============1659306798423263395==--