projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6fda73f
)
linux: refresh patches against 3.3
author
Gabor Juhos
<juhosg@openwrt.org>
Tue, 20 Mar 2012 15:55:07 +0000
(15:55 +0000)
committer
Gabor Juhos
<juhosg@openwrt.org>
Tue, 20 Mar 2012 15:55:07 +0000
(15:55 +0000)
SVN-Revision: 31047
target/linux/ar71xx/patches-3.3/613-MIPS-ath79-RB750GL-support.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/100-overlayfs_v12.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/440-block2mtd_init.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/644-bridge_optimize_netfilter_hooks.patch
patch
|
blob
|
history
target/linux/generic/patches-3.3/863-gpiommc.patch
patch
|
blob
|
history
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 70661251703e914ec2c8e686af3ce513b5e3bbe0..1326489d4a12ed54995b1d5f137b9be4a0145050 100644
(file)
--- 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
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
-@@ -5
1,6 +51
,7 @@ enum ath79_mach_type {
+@@ -5
2,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 */
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 1a64389cd9e53d43dc5a574e0d56688d0b68cae1..d0ef127e3a9044ee9a6d421fd34d199b4c94ee55 100644
(file)
--- 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
========================
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -49
28,6 +4928
,13 @@ F: drivers/scsi/osd/
+@@ -49
55,6 +4955
,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
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 8ca6605e649d2c9d74e230c5e0be6b91aacb72c3..07f21678d1563074377bb69f87229000e5a3d628 100644
(file)
--- 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
{
--- a/block/partition-generic.c
+++ b/block/partition-generic.c
-@@ -5
14,6 +514,7 @@ rescan:
- kfree(state);
+@@ -5
46,6 +546,7 @@ int invalidate_partitions(struct gendisk
+
return 0;
}
+EXPORT_SYMBOL(rescan_partitions);
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 af793ee83033eb62726facc3f6c4c2521d0d026a..d2fdd614c34383f12b278e9a576f4b42a0744ed1 100644
(file)
--- 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);
}
netif_receive_skb);
}
-@@ -19
4,7 +194
,7 @@ rx_handler_result_t br_handle_frame(stru
+@@ -19
9,7 +199
,7 @@ rx_handler_result_t br_handle_frame(stru
}
/* Deliver packet to local host only */
}
/* Deliver packet to local host only */
@@
-18,7
+18,7
@@
NULL, br_handle_local_finish)) {
return RX_HANDLER_CONSUMED; /* consumed by filter */
} else {
NULL, br_handle_local_finish)) {
return RX_HANDLER_CONSUMED; /* consumed by filter */
} else {
-@@ -2
19,7 +219
,7 @@ forward:
+@@ -2
24,7 +224
,7 @@ forward:
if (!compare_ether_addr(p->br->dev->dev_addr, dest))
skb->pkt_type = PACKET_HOST;
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
if (vlan_tx_tag_present(skb))
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
-@@ -49
2,12 +492
,25 @@ static inline bool br_multicast_is_route
+@@ -49
3,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 *);
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 8a37c8e3a86737ea6791535c27ce11abc4b04e01..32606711f5e551204146236fdbccb3ee0474a701 100644
(file)
--- 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
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -30
18,6 +3018
,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -30
45,6 +3045
,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/
S: Odd Fixes
F: drivers/tty/hvc/