aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorLuka Perkov <luka@openwrt.org>2015-01-28 01:00:08 +0000
committerLuka Perkov <luka@openwrt.org>2015-01-28 01:00:08 +0000
commita9568263f674085d67e750ad6849109d21641999 (patch)
treed520b8493d6ff343ae8c38e34afe32c8aa10da29 /target
parent3579379dbaa94da6f10f95460f0f0979135d5668 (diff)
downloadupstream-a9568263f674085d67e750ad6849109d21641999.tar.gz
upstream-a9568263f674085d67e750ad6849109d21641999.tar.bz2
upstream-a9568263f674085d67e750ad6849109d21641999.zip
kernel: update 3.14 to 3.14.30
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 44158
Diffstat (limited to 'target')
-rw-r--r--target/linux/generic/patches-3.14/431-mtd-bcm47xxpart-support-for-Xiaomi-specific-board_da.patch5
-rw-r--r--target/linux/generic/patches-3.14/653-disable_netlink_trim.patch2
-rw-r--r--target/linux/generic/patches-3.14/721-phy_packets.patch2
-rw-r--r--target/linux/generic/patches-3.14/811-pci_disable_usb_common_quirks.patch2
-rw-r--r--target/linux/generic/patches-3.14/902-debloat_proc.patch6
5 files changed, 6 insertions, 11 deletions
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 <zajec5@gmail.com>
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;