summaryrefslogtreecommitdiff
path: root/target/linux/generic
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-20 15:55:07 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-03-20 15:55:07 +0000
commit3a64a2209c815b3835d185c3e4b64d49fdb3dd5c (patch)
tree563783f74f719cc2df7eda26751d2672187fd2d1 /target/linux/generic
parent08c781ae46007809f09674e45e1fdbaa0353e597 (diff)
linux: refresh patches against 3.3
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31047 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.3/100-overlayfs_v12.patch2
-rw-r--r--target/linux/generic/patches-3.3/440-block2mtd_init.patch4
-rw-r--r--target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch6
-rw-r--r--target/linux/generic/patches-3.3/863-gpiommc.patch2
4 files changed, 7 insertions, 7 deletions
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/