From: Gabor Juhos <juhosg@openwrt.org>
Date: Tue, 20 Mar 2012 15:55:07 +0000 (+0000)
Subject: linux: refresh patches against 3.3
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff5b7ef713aa0a2725b2feed7d48fff23b712c0a;p=openwrt%2Fstaging%2Fyousong.git

linux: refresh patches against 3.3

SVN-Revision: 31047
---

diff --git a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-RB750GL-support.patch b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-RB750GL-support.patch
index 7066125170..1326489d4a 100644
--- a/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-RB750GL-support.patch
+++ b/target/linux/ar71xx/patches-3.3/613-MIPS-ath79-RB750GL-support.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ath79/machtypes.h
 +++ b/arch/mips/ath79/machtypes.h
-@@ -51,6 +51,7 @@ enum ath79_mach_type {
+@@ -52,6 +52,7 @@ enum ath79_mach_type {
  	ATH79_MACH_RB_493,		/* Mikrotik RouterBOARD 493/493AH */
  	ATH79_MACH_RB_493G,		/* Mikrotik RouterBOARD 493G */
  	ATH79_MACH_RB_750,		/* MikroTik RouterBOARD 750 */
diff --git a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
index 1a64389cd9..d0ef127e3a 100644
--- a/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
+++ b/target/linux/generic/patches-3.3/100-overlayfs_v12.patch
@@ -244,7 +244,7 @@
  ========================
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4928,6 +4928,13 @@ F:	drivers/scsi/osd/
+@@ -4955,6 +4955,13 @@ F:	drivers/scsi/osd/
  F:	include/scsi/osd_*
  F:	fs/exofs/
  
diff --git a/target/linux/generic/patches-3.3/440-block2mtd_init.patch b/target/linux/generic/patches-3.3/440-block2mtd_init.patch
index 8ca6605e64..07f21678d1 100644
--- a/target/linux/generic/patches-3.3/440-block2mtd_init.patch
+++ b/target/linux/generic/patches-3.3/440-block2mtd_init.patch
@@ -106,8 +106,8 @@
  {
 --- a/block/partition-generic.c
 +++ b/block/partition-generic.c
-@@ -514,6 +514,7 @@ rescan:
- 	kfree(state);
+@@ -546,6 +546,7 @@ int invalidate_partitions(struct gendisk
+ 
  	return 0;
  }
 +EXPORT_SYMBOL(rescan_partitions);
diff --git a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
index af793ee830..d2fdd614c3 100644
--- a/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
+++ b/target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
@@ -9,7 +9,7 @@
  		       netif_receive_skb);
  }
  
-@@ -194,7 +194,7 @@ rx_handler_result_t br_handle_frame(stru
+@@ -199,7 +199,7 @@ rx_handler_result_t br_handle_frame(stru
  		}
  
  		/* Deliver packet to local host only */
@@ -18,7 +18,7 @@
  			    NULL, br_handle_local_finish)) {
  			return RX_HANDLER_CONSUMED; /* consumed by filter */
  		} else {
-@@ -219,7 +219,7 @@ forward:
+@@ -224,7 +224,7 @@ forward:
  		if (!compare_ether_addr(p->br->dev->dev_addr, dest))
  			skb->pkt_type = PACKET_HOST;
  
@@ -43,7 +43,7 @@
  	if (vlan_tx_tag_present(skb))
 --- a/net/bridge/br_private.h
 +++ b/net/bridge/br_private.h
-@@ -492,12 +492,25 @@ static inline bool br_multicast_is_route
+@@ -493,12 +493,25 @@ static inline bool br_multicast_is_route
  extern int br_netfilter_init(void);
  extern void br_netfilter_fini(void);
  extern void br_netfilter_rtable_init(struct net_bridge *);
diff --git a/target/linux/generic/patches-3.3/863-gpiommc.patch b/target/linux/generic/patches-3.3/863-gpiommc.patch
index 8a37c8e3a8..32606711f5 100644
--- a/target/linux/generic/patches-3.3/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.3/863-gpiommc.patch
@@ -830,7 +830,7 @@
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3018,6 +3018,11 @@ L:	linuxppc-dev@lists.ozlabs.org
+@@ -3045,6 +3045,11 @@ L:	linuxppc-dev@lists.ozlabs.org
  S:	Odd Fixes
  F:	drivers/tty/hvc/