ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-30 10:39:04 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

generic/4.4: update to 4.4-rc7

Browse Source 
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 48059
This commit is contained in:
Imre Kaloz 2016-01-01 22:02:47 +00:00
parent 9242d27b4a
commit cae1c44e4f
6 changed files with 7 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -5,12 +5,12 @@ LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .23 LINUX_VERSION-3.18 = .23
LINUX_VERSION-4.1 = .13 LINUX_VERSION-4.1 = .13
LINUX_VERSION-4.3 = LINUX_VERSION-4.3 =
LINUX_VERSION-4.4 = -rc5 LINUX_VERSION-4.4 = -rc7
LINUX_KERNEL_MD5SUM-3.18.23 = dc6d265ab38716be3676ac294b481ad8 LINUX_KERNEL_MD5SUM-3.18.23 = dc6d265ab38716be3676ac294b481ad8
LINUX_KERNEL_MD5SUM-4.1.13 = af9dd5d8f71185a64a8eccface15fc00 LINUX_KERNEL_MD5SUM-4.1.13 = af9dd5d8f71185a64a8eccface15fc00
LINUX_KERNEL_MD5SUM-4.3 = 58b35794eee3b6d52ce7be39357801e7 LINUX_KERNEL_MD5SUM-4.3 = 58b35794eee3b6d52ce7be39357801e7
LINUX_KERNEL_MD5SUM-4.4-rc5 = 7516a83ce861c7b2324975c82c413157 LINUX_KERNEL_MD5SUM-4.4-rc7 = 7f4b1d85736a180df73af45adde8937b
ifdef KERNEL_PATCHVER ifdef KERNEL_PATCHVER
LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER))) LINUX_VERSION:=$(KERNEL_PATCHVER)$(strip $(LINUX_VERSION-$(KERNEL_PATCHVER)))

24
target/linux/generic/patches-4.4/010-net-remove-unnecessary-semicolon-in-netdev_alloc_pcp.patch
View File

@ -1,24 +0,0 @@
From: Felix Fietkau <nbd@openwrt.org>
Date: Sat, 5 Dec 2015 13:53:36 +0100
Subject: [PATCH] net: remove unnecessary semicolon in
netdev_alloc_pcpu_stats()
This semicolon causes a build error if the function call is wrapped in
parentheses.
Fixes: aabc92bbe3cf ("net: add __netdev_alloc_pcpu_stats() to indicate gfp flags")
Reported-by: Imre Kaloz <kaloz@openwrt.org>
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -2084,7 +2084,7 @@ struct pcpu_sw_netstats {
})
#define netdev_alloc_pcpu_stats(type) \
- __netdev_alloc_pcpu_stats(type, GFP_KERNEL);
+ __netdev_alloc_pcpu_stats(type, GFP_KERNEL)
#include <linux/notifier.h>

4
target/linux/generic/patches-4.4/650-pppoe_header_pad.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ppp/pppoe.c --- a/drivers/net/ppp/pppoe.c
+++ b/drivers/net/ppp/pppoe.c +++ b/drivers/net/ppp/pppoe.c
@@ -871,7 +871,7 @@ static int pppoe_sendmsg(struct socket * @@ -877,7 +877,7 @@ static int pppoe_sendmsg(struct socket *
goto end; goto end;
@ -9,7 +9,7 @@
0, GFP_KERNEL); 0, GFP_KERNEL);
if (!skb) { if (!skb) {
error = -ENOMEM; error = -ENOMEM;
@@ -879,7 +879,7 @@ static int pppoe_sendmsg(struct socket * @@ -885,7 +885,7 @@ static int pppoe_sendmsg(struct socket *
} }
/* Reserve space for headers. */ /* Reserve space for headers. */

2
target/linux/generic/patches-4.4/700-swconfig.patch
View File

@ -29,7 +29,7 @@
obj-$(CONFIG_DAVICOM_PHY) += davicom.o obj-$(CONFIG_DAVICOM_PHY) += davicom.o
--- a/include/uapi/linux/Kbuild --- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild
@@ -387,6 +387,7 @@ header-y += stddef.h @@ -388,6 +388,7 @@ header-y += stddef.h
header-y += string.h header-y += string.h
header-y += suspend_ioctls.h header-y += suspend_ioctls.h
header-y += swab.h header-y += swab.h

2
target/linux/generic/patches-4.4/901-debloat_sock_diag.patch
View File

@ -25,7 +25,7 @@
obj-$(CONFIG_PROC_FS) += net-procfs.o obj-$(CONFIG_PROC_FS) += net-procfs.o
--- a/net/core/sock.c --- a/net/core/sock.c
+++ b/net/core/sock.c +++ b/net/core/sock.c
@@ -1470,9 +1470,11 @@ void sk_destruct(struct sock *sk) @@ -1469,9 +1469,11 @@ void sk_destruct(struct sock *sk)
static void __sk_free(struct sock *sk) static void __sk_free(struct sock *sk)
{ {

2
target/linux/generic/patches-4.4/902-debloat_proc.patch
View File

@ -173,7 +173,7 @@
goto err; goto err;
--- a/net/core/sock.c --- a/net/core/sock.c
+++ b/net/core/sock.c +++ b/net/core/sock.c
@@ -3036,6 +3036,8 @@ static __net_initdata struct pernet_oper @@ -3035,6 +3035,8 @@ static __net_initdata struct pernet_oper
static int __init proto_init(void) static int __init proto_init(void)
{ {