Changeset 36127

Timestamp:

2013-03-25T14:53:48+01:00 (5 years ago)

Author:

kaloz

Message:

[generic/3.9]: refresh patches against -rc4

Location:

trunk/target/linux/generic/patches-3.9

Files:

• 060-hso_devices.patch (modified) (1 diff)
• 100-overlayfs.patch (modified) (1 diff)
• 102-ehci_hcd_ignore_oc.patch (modified) (1 diff)
• 203-kallsyms_uncompressed.patch (modified) (1 diff)
• 450-mtd_plat_nand_chip_fixup.patch (modified) (1 diff)
• 640-bridge_no_eap_forward.patch (modified) (1 diff)
• 644-bridge_optimize_netfilter_hooks.patch (modified) (1 diff)
• 655-increase_skb_pad.patch (modified) (1 diff)
• 721-phy_packets.patch (modified) (2 diffs)
• 930-crashlog.patch (modified) (1 diff)

trunk/target/linux/generic/patches-3.9/060-hso_devices.patch

@@ -16 +16 @@
 --- a/drivers/usb/storage/unusual_devs.h
 +++ b/drivers/usb/storage/unusual_devs.h
-@@ -1237,6 +1237,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
+@@ -1252,6 +1252,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0
                 USB_SC_DEVICE, USB_PR_DEVICE, NULL,
                 0 ),

trunk/target/linux/generic/patches-3.9/100-overlayfs.patch

@@ -244 +244 @@
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -5872,6 +5872,13 @@ F:       drivers/scsi/osd/
+@@ -5905,6 +5905,13 @@ F:       drivers/scsi/osd/
  F:     include/scsi/osd_*
  F:     fs/exofs/

trunk/target/linux/generic/patches-3.9/102-ehci_hcd_ignore_oc.patch

@@ -21 +21 @@
 --- 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),

trunk/target/linux/generic/patches-3.9/203-kallsyms_uncompressed.patch

@@ -52 +52 @@
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1263,6 +1263,17 @@ config KALLSYMS_ALL
+@@ -1259,6 +1259,17 @@ config KALLSYMS_ALL
  
            Say N unless you really need all symbols.

trunk/target/linux/generic/patches-3.9/450-mtd_plat_nand_chip_fixup.patch

@@ -6 +6 @@
 --- 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;

trunk/target/linux/generic/patches-3.9/640-bridge_no_eap_forward.patch

@@ -13 +13 @@
                 skb2 = skb;
         else if (is_multicast_ether_addr(dest)) {
-                mdst = br_mdb_get(br, skb);
+                mdst = br_mdb_get(br, skb, vid);

trunk/target/linux/generic/patches-3.9/644-bridge_optimize_netfilter_hooks.patch

@@ -59 +59 @@
 --- a/net/bridge/br_multicast.c
 +++ b/net/bridge/br_multicast.c
-@@ -781,7 +781,7 @@ static void __br_multicast_send_query(st
+@@ -782,7 +782,7 @@ static void __br_multicast_send_query(st
         if (port) {
                 __skb_push(skb, sizeof(struct ethhdr));

trunk/target/linux/generic/patches-3.9/655-increase_skb_pad.patch

@@ -1 +1 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1751,7 +1751,7 @@ static inline int pskb_network_may_pull(
+@@ -1756,7 +1756,7 @@ static inline int pskb_network_may_pull(
   * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8)
   */

trunk/target/linux/generic/patches-3.9/721-phy_packets.patch

@@ -35 +35 @@
 --- a/include/linux/skbuff.h
 +++ b/include/linux/skbuff.h
-@@ -1781,6 +1781,10 @@ static inline int pskb_trim(struct sk_bu
+@@ -1786,6 +1786,10 @@ static inline int pskb_trim(struct sk_bu
         return (len < skb->len) ? __pskb_trim(skb, len) : 0;
  }
@@ -46 +46 @@
   *     pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *     @skb: buffer to alter
-@@ -1887,16 +1891,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1892,16 +1896,6 @@ static inline struct sk_buff *dev_alloc_
  }
  

trunk/target/linux/generic/patches-3.9/930-crashlog.patch

@@ -21 +21 @@
 --- a/init/Kconfig
 +++ b/init/Kconfig
-@@ -1145,6 +1145,10 @@ config RELAY
+@@ -1141,6 +1141,10 @@ config RELAY
  
           If unsure, say N.