kernel: update 4.0 to 4.0.7

Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.6
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.0.7

Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 46151
This commit is contained in:
Jonas Gorski 2015-06-30 23:26:13 +00:00
parent 901a7fa067
commit 831d1c8b45
6 changed files with 6 additions and 11 deletions

View File

@ -3,11 +3,11 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-3.18 = .17 LINUX_VERSION-3.18 = .17
LINUX_VERSION-4.0 = .5 LINUX_VERSION-4.0 = .7
LINUX_VERSION-4.1 = LINUX_VERSION-4.1 =
LINUX_KERNEL_MD5SUM-3.18.17 = f05d7620c587d8b0ab3cd944ff9dc9f7 LINUX_KERNEL_MD5SUM-3.18.17 = f05d7620c587d8b0ab3cd944ff9dc9f7
LINUX_KERNEL_MD5SUM-4.0.5 = 214836ae60a5674c31bb7cede5f47794 LINUX_KERNEL_MD5SUM-4.0.7 = 7993e5389c189d5c7dbc21135aebc0c1
LINUX_KERNEL_MD5SUM-4.1 = fe9dc0f6729f36400ea81aa41d614c37 LINUX_KERNEL_MD5SUM-4.1 = fe9dc0f6729f36400ea81aa41d614c37
ifdef KERNEL_PATCHVER ifdef KERNEL_PATCHVER

View File

@ -21,8 +21,6 @@ V2: Drop useless "default n", thanks Sergei :)
drivers/usb/host/Kconfig | 9 ++++++++- drivers/usb/host/Kconfig | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-) 1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index 197a6a3..688698a 100644
--- a/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig
@@ -32,7 +32,14 @@ config USB_XHCI_PCI @@ -32,7 +32,14 @@ config USB_XHCI_PCI
@ -41,6 +39,3 @@ index 197a6a3..688698a 100644
config USB_XHCI_MVEBU config USB_XHCI_MVEBU
tristate "xHCI support for Marvell Armada 375/38x" tristate "xHCI support for Marvell Armada 375/38x"
--
1.8.4.5

View File

@ -140,7 +140,7 @@
err = br_ip6_multicast_add_group(br, port, &grec->grec_mca, err = br_ip6_multicast_add_group(br, port, &grec->grec_mca,
- vid); - vid);
+ vid, src); + vid, src);
if (!err) if (err)
break; break;
} }
@@ -1407,7 +1434,8 @@ br_multicast_leave_group(struct net_brid @@ -1407,7 +1434,8 @@ br_multicast_leave_group(struct net_brid

View File

@ -1,6 +1,6 @@
--- a/net/netlink/af_netlink.c --- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c
@@ -1710,27 +1710,7 @@ void netlink_detachskb(struct sock *sk, @@ -1713,27 +1713,7 @@ void netlink_detachskb(struct sock *sk,
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
{ {

View File

@ -1,6 +1,6 @@
--- a/net/sched/sch_api.c --- a/net/sched/sch_api.c
+++ b/net/sched/sch_api.c +++ b/net/sched/sch_api.c
@@ -1945,7 +1945,7 @@ static int __init pktsched_init(void) @@ -1947,7 +1947,7 @@ static int __init pktsched_init(void)
return err; return err;
} }

View File

@ -1,6 +1,6 @@
--- a/drivers/usb/host/Kconfig --- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig
@@ -306,6 +306,13 @@ config USB_OCTEON_EHCI @@ -313,6 +313,13 @@ config USB_OCTEON_EHCI
USB 2.0 device support. All CN6XXX based chips with USB are USB 2.0 device support. All CN6XXX based chips with USB are
supported. supported.