diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2013-04-06 11:40:44 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2013-04-06 11:40:44 +0000 |
commit | f78c902cfd5c5f3375964be90878c44c4180cfa0 (patch) | |
tree | ba128669b4d02fa8157fa7edbccfe3962898b050 /target/linux/generic | |
parent | 202fb45debb80148c280275e299d90475d032490 (diff) | |
download | upstream-f78c902cfd5c5f3375964be90878c44c4180cfa0.tar.gz upstream-f78c902cfd5c5f3375964be90878c44c4180cfa0.tar.bz2 upstream-f78c902cfd5c5f3375964be90878c44c4180cfa0.zip |
kernel: update linux 3.8 to 3.8.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 36215
Diffstat (limited to 'target/linux/generic')
9 files changed, 18 insertions, 20 deletions
diff --git a/target/linux/generic/patches-3.8/060-hso_devices.patch b/target/linux/generic/patches-3.8/060-hso_devices.patch index 0080bd58b7..ab0c120dd4 100644 --- a/target/linux/generic/patches-3.8/060-hso_devices.patch +++ b/target/linux/generic/patches-3.8/060-hso_devices.patch @@ -15,7 +15,7 @@ {USB_DEVICE(0x0af0, 0xd155)}, --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h -@@ -1237,6 +1237,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 +@@ -1244,6 +1244,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 0 ), diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch index 6c7648d569..26f373d1eb 100644 --- a/target/linux/generic/patches-3.8/100-overlayfs.patch +++ b/target/linux/generic/patches-3.8/100-overlayfs.patch @@ -319,7 +319,7 @@ goto out; --- a/fs/namespace.c +++ b/fs/namespace.c -@@ -1417,6 +1417,24 @@ void drop_collected_mounts(struct vfsmou +@@ -1421,6 +1421,24 @@ void drop_collected_mounts(struct vfsmou release_mounts(&umount_list); } @@ -3163,7 +3163,7 @@ static inline bool execute_ok(struct inode *inode) --- a/include/linux/mount.h +++ b/include/linux/mount.h -@@ -66,6 +66,9 @@ extern void mnt_pin(struct vfsmount *mnt +@@ -68,6 +68,9 @@ extern void mnt_pin(struct vfsmount *mnt extern void mnt_unpin(struct vfsmount *mnt); extern int __mnt_is_readonly(struct vfsmount *mnt); diff --git a/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch b/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch index 92f897f9f2..bed5f2d0c3 100644 --- a/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch +++ b/target/linux/generic/patches-3.8/102-ehci_hcd_ignore_oc.patch @@ -20,7 +20,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -630,7 +630,7 @@ static int ehci_run (struct usb_hcd *hcd +@@ -631,7 +631,7 @@ static int ehci_run (struct usb_hcd *hcd "USB %x.%x started, EHCI %x.%02x%s\n", ((ehci->sbrn & 0xf0)>>4), (ehci->sbrn & 0x0f), temp >> 8, temp & 0xff, diff --git a/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch index f1783d0de3..c82c176271 100644 --- a/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch +++ b/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch @@ -5,7 +5,7 @@ --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h -@@ -647,6 +647,7 @@ struct platform_nand_chip { +@@ -654,6 +654,7 @@ struct platform_nand_chip { unsigned int options; unsigned int bbt_options; const char **part_probe_types; diff --git a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch index 0a963342c9..5c60d1347b 100644 --- a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch @@ -49,7 +49,7 @@ int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, unsigned char banned_flags) -@@ -4947,6 +4946,9 @@ int __init addrconf_init(void) +@@ -4941,6 +4940,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -4965,6 +4967,9 @@ void addrconf_cleanup(void) +@@ -4959,6 +4961,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.8/655-increase_skb_pad.patch b/target/linux/generic/patches-3.8/655-increase_skb_pad.patch index e65ae0d461..6150d5237d 100644 --- a/target/linux/generic/patches-3.8/655-increase_skb_pad.patch +++ b/target/linux/generic/patches-3.8/655-increase_skb_pad.patch @@ -1,6 +1,6 @@ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1722,7 +1722,7 @@ static inline int pskb_network_may_pull( +@@ -1727,7 +1727,7 @@ static inline int pskb_network_may_pull( * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ #ifndef NET_SKB_PAD diff --git a/target/linux/generic/patches-3.8/721-phy_packets.patch b/target/linux/generic/patches-3.8/721-phy_packets.patch index 21e2291f6c..73ca2e007c 100644 --- a/target/linux/generic/patches-3.8/721-phy_packets.patch +++ b/target/linux/generic/patches-3.8/721-phy_packets.patch @@ -34,7 +34,7 @@ #define IF_GET_IFACE 0x0001 /* for querying only */ --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h -@@ -1752,6 +1752,10 @@ static inline int pskb_trim(struct sk_bu +@@ -1757,6 +1757,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -45,7 +45,7 @@ /** * pskb_trim_unique - remove end from a paged unique (not cloned) buffer * @skb: buffer to alter -@@ -1854,16 +1858,6 @@ static inline struct sk_buff *dev_alloc_ +@@ -1859,16 +1863,6 @@ static inline struct sk_buff *dev_alloc_ } @@ -79,7 +79,7 @@ help --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -2361,9 +2361,19 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -2360,9 +2360,19 @@ int dev_hard_start_xmit(struct sk_buff * if (!list_empty(&ptype_all)) dev_queue_xmit_nit(skb, dev); @@ -102,7 +102,7 @@ if (rc == NETDEV_TX_OK) txq_trans_update(txq); return rc; -@@ -2386,9 +2396,19 @@ gso: +@@ -2385,9 +2395,19 @@ gso: if (!list_empty(&ptype_all)) dev_queue_xmit_nit(nskb, dev); diff --git a/target/linux/generic/patches-3.8/902-debloat_proc.patch b/target/linux/generic/patches-3.8/902-debloat_proc.patch index 0ea0bebf53..a9226dc3e9 100644 --- a/target/linux/generic/patches-3.8/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.8/902-debloat_proc.patch @@ -173,7 +173,7 @@ goto err; --- a/net/core/dev.c +++ b/net/core/dev.c -@@ -4578,9 +4578,11 @@ static int __net_init dev_proc_net_init( +@@ -4584,9 +4584,11 @@ static int __net_init dev_proc_net_init( if (!proc_net_fops_create(net, "dev", S_IRUGO, &dev_seq_fops)) goto out; @@ -187,7 +187,7 @@ goto out_softnet; if (wext_proc_init(net)) -@@ -4589,9 +4591,11 @@ static int __net_init dev_proc_net_init( +@@ -4595,9 +4597,11 @@ static int __net_init dev_proc_net_init( out: return rc; out_ptype: @@ -201,7 +201,7 @@ out_dev: proc_net_remove(net, "dev"); goto out; -@@ -4601,8 +4605,10 @@ static void __net_exit dev_proc_net_exit +@@ -4607,8 +4611,10 @@ static void __net_exit dev_proc_net_exit { wext_proc_exit(net); diff --git a/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch index 482e2525df..ef3b9c2a07 100644 --- a/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch +++ b/target/linux/generic/patches-3.8/921-use_preinit_as_init.patch @@ -1,8 +1,6 @@ -Index: linux-3.8.3/init/main.c -=================================================================== ---- linux-3.8.3.orig/init/main.c 2013-04-02 21:43:30.000000000 +0200 -+++ linux-3.8.3/init/main.c 2013-04-02 21:44:26.362130897 +0200 -@@ -835,7 +835,8 @@ +--- a/init/main.c ++++ b/init/main.c +@@ -835,7 +835,8 @@ static int __ref kernel_init(void *unuse printk(KERN_WARNING "Failed to execute %s. Attempting " "defaults...\n", execute_command); } |