From 5d4be21553ddc62ac97b9698c656829d7e814ee1 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 18 Mar 2015 18:21:08 +0000 Subject: kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4 also refresh generic patches for 3.14, 3.18, 3.19 and 4.0 targets might need a minor refresh as well, however, it looks like everything still applies cleanly with occasional small offsets. Signed-off-by: Daniel Golle git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44876 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../generic/patches-4.0/505-yaffs-3.16-new-fops.patch | 4 ++-- .../generic/patches-4.0/630-packet_socket_type.patch | 16 ++++++++-------- .../patches-4.0/643-bridge_remove_ipv6_dependency.patch | 4 ++-- target/linux/generic/patches-4.0/700-swconfig.patch | 2 +- target/linux/generic/patches-4.0/701-phy_extension.patch | 2 +- .../generic/patches-4.0/773-bgmac-add-srab-switch.patch | 6 +++--- .../775-bgmac-check-length-of-received-frame.patch | 2 +- target/linux/generic/patches-4.0/863-gpiommc.patch | 2 +- target/linux/generic/patches-4.0/902-debloat_proc.patch | 4 ++-- target/linux/generic/patches-4.0/930-crashlog.patch | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) (limited to 'target/linux/generic/patches-4.0') diff --git a/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch b/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch index 855b9fc134..1ef630f844 100644 --- a/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch +++ b/target/linux/generic/patches-4.0/505-yaffs-3.16-new-fops.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -796,13 +796,13 @@ +@@ -796,13 +796,13 @@ static int yaffs_sync_object(struct file static const struct file_operations yaffs_file_operations = { .read = do_sync_read, .write = do_sync_write, @@ -17,7 +17,7 @@ .llseek = generic_file_llseek, }; -@@ -1050,7 +1050,7 @@ +@@ -1050,7 +1050,7 @@ static int yaffs_readlink(struct dentry if (!alias) return -ENOMEM; diff --git a/target/linux/generic/patches-4.0/630-packet_socket_type.patch b/target/linux/generic/patches-4.0/630-packet_socket_type.patch index f96ee28e7b..8c5711ba7a 100644 --- a/target/linux/generic/patches-4.0/630-packet_socket_type.patch +++ b/target/linux/generic/patches-4.0/630-packet_socket_type.patch @@ -26,7 +26,7 @@ Signed-off-by: Felix Fietkau #define PACKET_FANOUT_LB 1 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c -@@ -1533,6 +1533,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1541,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf { struct sock *sk; struct sockaddr_pkt *spkt; @@ -34,7 +34,7 @@ Signed-off-by: Felix Fietkau /* * When we registered the protocol we saved the socket in the data -@@ -1540,6 +1541,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1548,6 +1549,7 @@ static int packet_rcv_spkt(struct sk_buf */ sk = pt->af_packet_priv; @@ -42,7 +42,7 @@ Signed-off-by: Felix Fietkau /* * Yank back the headers [hope the device set this -@@ -1552,7 +1554,7 @@ static int packet_rcv_spkt(struct sk_buf +@@ -1560,7 +1562,7 @@ static int packet_rcv_spkt(struct sk_buf * so that this procedure is noop. */ @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau goto out; if (!net_eq(dev_net(dev), sock_net(sk))) -@@ -1759,12 +1761,12 @@ static int packet_rcv(struct sk_buff *sk +@@ -1767,12 +1769,12 @@ static int packet_rcv(struct sk_buff *sk int skb_len = skb->len; unsigned int snaplen, res; @@ -67,7 +67,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -1884,12 +1886,12 @@ static int tpacket_rcv(struct sk_buff *s +@@ -1892,12 +1894,12 @@ static int tpacket_rcv(struct sk_buff *s BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h2)) != 32); BUILD_BUG_ON(TPACKET_ALIGN(sizeof(*h.h3)) != 48); @@ -83,7 +83,7 @@ Signed-off-by: Felix Fietkau if (!net_eq(dev_net(dev), sock_net(sk))) goto drop; -@@ -2845,6 +2847,7 @@ static int packet_create(struct net *net +@@ -2853,6 +2855,7 @@ static int packet_create(struct net *net spin_lock_init(&po->bind_lock); mutex_init(&po->pg_vec_lock); po->prot_hook.func = packet_rcv; @@ -91,7 +91,7 @@ Signed-off-by: Felix Fietkau if (sock->type == SOCK_PACKET) po->prot_hook.func = packet_rcv_spkt; -@@ -3428,6 +3431,16 @@ packet_setsockopt(struct socket *sock, i +@@ -3442,6 +3445,16 @@ packet_setsockopt(struct socket *sock, i po->xmit = val ? packet_direct_xmit : dev_queue_xmit; return 0; } @@ -108,7 +108,7 @@ Signed-off-by: Felix Fietkau default: return -ENOPROTOOPT; } -@@ -3479,6 +3492,13 @@ static int packet_getsockopt(struct sock +@@ -3493,6 +3506,13 @@ static int packet_getsockopt(struct sock case PACKET_VNET_HDR: val = po->has_vnet_hdr; break; diff --git a/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch index f0c373cc41..50e4fe4b10 100644 --- a/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-4.0/643-bridge_remove_ipv6_dependency.patch @@ -52,7 +52,7 @@ int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, u32 banned_flags) -@@ -5524,6 +5523,9 @@ int __init addrconf_init(void) +@@ -5539,6 +5538,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -62,7 +62,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -5543,6 +5545,9 @@ void addrconf_cleanup(void) +@@ -5558,6 +5560,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-4.0/700-swconfig.patch b/target/linux/generic/patches-4.0/700-swconfig.patch index cdce89e239..bf62025d2a 100644 --- a/target/linux/generic/patches-4.0/700-swconfig.patch +++ b/target/linux/generic/patches-4.0/700-swconfig.patch @@ -29,7 +29,7 @@ obj-$(CONFIG_CICADA_PHY) += cicada.o --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild -@@ -380,6 +380,7 @@ header-y += stddef.h +@@ -379,6 +379,7 @@ header-y += stddef.h header-y += string.h header-y += suspend_ioctls.h header-y += swab.h diff --git a/target/linux/generic/patches-4.0/701-phy_extension.patch b/target/linux/generic/patches-4.0/701-phy_extension.patch index 3d482fa49c..55b37bacb9 100644 --- a/target/linux/generic/patches-4.0/701-phy_extension.patch +++ b/target/linux/generic/patches-4.0/701-phy_extension.patch @@ -1,6 +1,6 @@ --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c -@@ -338,6 +338,50 @@ int phy_ethtool_gset(struct phy_device * +@@ -357,6 +357,50 @@ int phy_ethtool_gset(struct phy_device * } EXPORT_SYMBOL(phy_ethtool_gset); diff --git a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch index ef12cac9bf..e49a841b0b 100644 --- a/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-4.0/773-bgmac-add-srab-switch.patch @@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens #include static const struct bcma_device_id bgmac_bcma_tbl[] = { -@@ -1405,6 +1406,17 @@ static void bgmac_mii_unregister(struct +@@ -1398,6 +1399,17 @@ static void bgmac_mii_unregister(struct mdiobus_free(mii_bus); } @@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens /************************************************** * BCMA bus ops **************************************************/ -@@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1517,6 +1529,16 @@ static int bgmac_probe(struct bcma_devic goto err_dma_free; } @@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens err = register_netdev(bgmac->net_dev); if (err) { bgmac_err(bgmac, "Cannot register net device\n"); -@@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1543,6 +1565,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); diff --git a/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch b/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch index c3d63b65fa..d39626b160 100644 --- a/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch +++ b/target/linux/generic/patches-4.0/775-bgmac-check-length-of-received-frame.patch @@ -9,7 +9,7 @@ Subject: [PATCH] bgmac: check length of received frame --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -363,6 +363,27 @@ static int bgmac_dma_rx_read(struct bgma +@@ -360,6 +360,27 @@ static int bgmac_dma_rx_read(struct bgma dma_addr_t old_dma_addr = slot->dma_addr; int err; diff --git a/target/linux/generic/patches-4.0/863-gpiommc.patch b/target/linux/generic/patches-4.0/863-gpiommc.patch index 36fc8ec86d..5fd329783d 100644 --- a/target/linux/generic/patches-4.0/863-gpiommc.patch +++ b/target/linux/generic/patches-4.0/863-gpiommc.patch @@ -830,7 +830,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -4463,6 +4463,11 @@ T: git git://linuxtv.org/anttip/media_tr +@@ -4474,6 +4474,11 @@ T: git git://linuxtv.org/anttip/media_tr S: Maintained F: drivers/media/usb/hackrf/ diff --git a/target/linux/generic/patches-4.0/902-debloat_proc.patch b/target/linux/generic/patches-4.0/902-debloat_proc.patch index b32cce41fe..b30bd7dfa9 100644 --- a/target/linux/generic/patches-4.0/902-debloat_proc.patch +++ b/target/linux/generic/patches-4.0/902-debloat_proc.patch @@ -1,6 +1,6 @@ --- a/fs/locks.c +++ b/fs/locks.c -@@ -2640,6 +2640,8 @@ static const struct file_operations proc +@@ -2641,6 +2641,8 @@ static const struct file_operations proc static int __init proc_locks_init(void) { @@ -122,7 +122,7 @@ return -ENOMEM; --- a/mm/vmalloc.c +++ b/mm/vmalloc.c -@@ -2661,6 +2661,8 @@ static const struct file_operations proc +@@ -2662,6 +2662,8 @@ static const struct file_operations proc static int __init proc_vmalloc_init(void) { diff --git a/target/linux/generic/patches-4.0/930-crashlog.patch b/target/linux/generic/patches-4.0/930-crashlog.patch index 594a55fc14..d9c5ecd015 100644 --- a/target/linux/generic/patches-4.0/930-crashlog.patch +++ b/target/linux/generic/patches-4.0/930-crashlog.patch @@ -245,7 +245,7 @@ end = bdata->node_low_pfn; --- a/kernel/module.c +++ b/kernel/module.c -@@ -105,6 +105,9 @@ static LIST_HEAD(modules); +@@ -104,6 +104,9 @@ static LIST_HEAD(modules); #ifdef CONFIG_KGDB_KDB struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ #endif /* CONFIG_KGDB_KDB */ -- cgit v1.2.3