From: Luka Perkov Date: Wed, 28 Jan 2015 01:00:08 +0000 (+0000) Subject: kernel: update 3.14 to 3.14.30 X-Git-Tag: reboot~4527 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=a9568263f674085d67e750ad6849109d21641999;p=openwrt%2Fstaging%2Flynxis.git kernel: update 3.14 to 3.14.30 Signed-off-by: Luka Perkov SVN-Revision: 44158 --- diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 5d621a1ec4..4c894c670c 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -5,14 +5,14 @@ LINUX_RELEASE?=1 LINUX_VERSION-3.8 = .13 LINUX_VERSION-3.10 = .58 LINUX_VERSION-3.13 = .7 -LINUX_VERSION-3.14 = .29 +LINUX_VERSION-3.14 = .30 LINUX_VERSION-3.18 = .3 LINUX_VERSION-3.19 = -rc5 LINUX_KERNEL_MD5SUM-3.8.13 = 2af19d06cd47ec459519159cdd10542d LINUX_KERNEL_MD5SUM-3.10.58 = 3ff3478b6351143cef22d4b81cf48b01 LINUX_KERNEL_MD5SUM-3.13.7 = 370adced5e5c1cb1d0d621c2dae2723f -LINUX_KERNEL_MD5SUM-3.14.29 = a745f70181b573a34579d685ca16370e +LINUX_KERNEL_MD5SUM-3.14.30 = 5926982f20bbef0988fca03b92fe43a5 LINUX_KERNEL_MD5SUM-3.18.3 = 7f37f59b9f01945c9503bc9deed88820 ifdef KERNEL_PATCHVER diff --git a/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch b/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch index 7893adf5c2..ea796f65dd 100644 --- a/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch +++ b/target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch @@ -12,8 +12,6 @@ Signed-off-by: Rafał Miłecki drivers/mtd/bcm47xxpart.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -diff --git a/drivers/mtd/bcm47xxpart.c b/drivers/mtd/bcm47xxpart.c -index c0720c1..f14ec0f 100644 --- a/drivers/mtd/bcm47xxpart.c +++ b/drivers/mtd/bcm47xxpart.c @@ -33,6 +33,7 @@ @@ -34,6 +32,3 @@ index c0720c1..f14ec0f 100644 bcm47xxpart_add_part(&parts[curr_part++], "board_data", offset, MTD_WRITEABLE); continue; --- -1.8.4.5 - diff --git a/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch b/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch index 7ce7c65892..22f5e6e02d 100644 --- a/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-3.14/653-disable_netlink_trim.patch @@ -1,6 +1,6 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -1740,27 +1740,7 @@ void netlink_detachskb(struct sock *sk, +@@ -1720,27 +1720,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { diff --git a/target/linux/generic/patches-3.14/721-phy_packets.patch b/target/linux/generic/patches-3.14/721-phy_packets.patch index 23d7b16ef4..fec1839a41 100644 --- a/target/linux/generic/patches-3.14/721-phy_packets.patch +++ b/target/linux/generic/patches-3.14/721-phy_packets.patch @@ -79,7 +79,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2614,10 +2614,20 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -2618,10 +2618,20 @@ int dev_hard_start_xmit(struct sk_buff * if (!list_empty(&ptype_all)) dev_queue_xmit_nit(skb, dev); diff --git a/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch index 4c8ee4a7e0..5f813c9ba1 100644 --- a/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch @@ -39,7 +39,7 @@ static inline int io_type_enabled(struct pci_dev *pdev, unsigned int mask) { u16 cmd; -@@ -1083,3 +1098,4 @@ static void quirk_usb_early_handoff(stru +@@ -1095,3 +1110,4 @@ static void quirk_usb_early_handoff(stru } DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_SERIAL_USB, 8, quirk_usb_early_handoff); diff --git a/target/linux/generic/patches-3.14/902-debloat_proc.patch b/target/linux/generic/patches-3.14/902-debloat_proc.patch index 53614da884..9024d6401e 100644 --- a/target/linux/generic/patches-3.14/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.14/902-debloat_proc.patch @@ -79,7 +79,7 @@ } --- a/kernel/irq/proc.c +++ b/kernel/irq/proc.c -@@ -311,6 +311,9 @@ void register_irq_proc(unsigned int irq, +@@ -328,6 +328,9 @@ void register_irq_proc(unsigned int irq, { char name [MAX_NAMELEN]; @@ -89,7 +89,7 @@ if (!root_irq_dir || (desc->irq_data.chip == &no_irq_chip) || desc->dir) return; -@@ -347,6 +350,9 @@ void unregister_irq_proc(unsigned int ir +@@ -364,6 +367,9 @@ void unregister_irq_proc(unsigned int ir { char name [MAX_NAMELEN]; @@ -99,7 +99,7 @@ if (!root_irq_dir || !desc->dir) return; #ifdef CONFIG_SMP -@@ -382,6 +388,9 @@ void init_irq_proc(void) +@@ -399,6 +405,9 @@ void init_irq_proc(void) unsigned int irq; struct irq_desc *desc;