kernel: update linux 3.8 to 3.8.6
Signed-off-by: Gabor Juhos <juhosg@openwrt.org> SVN-Revision: 36215
This commit is contained in:
@@ -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 ),
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user