aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-24 17:04:52 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-24 17:04:52 +0000
commite2a507a144a4627b3b286a24bc8528ec28ec9296 (patch)
treee9839ece130bfdf49bad36e24223d28e3899e6d4 /target/linux/generic
parent02fd59285158dac266e3850c74d5852be5f02f8e (diff)
downloadupstream-e2a507a144a4627b3b286a24bc8528ec28ec9296.tar.gz
upstream-e2a507a144a4627b3b286a24bc8528ec28ec9296.tar.bz2
upstream-e2a507a144a4627b3b286a24bc8528ec28ec9296.zip
kernel: refresh 3.8 patches
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35317 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-3.8/100-overlayfs.patch2
-rw-r--r--target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch8
-rw-r--r--target/linux/generic/patches-3.8/651-wireless_mesh_header.patch2
-rw-r--r--target/linux/generic/patches-3.8/721-phy_packets.patch4
-rw-r--r--target/linux/generic/patches-3.8/863-gpiommc.patch2
-rw-r--r--target/linux/generic/patches-3.8/930-crashlog.patch2
6 files changed, 10 insertions, 10 deletions
diff --git a/target/linux/generic/patches-3.8/100-overlayfs.patch b/target/linux/generic/patches-3.8/100-overlayfs.patch
index e190ee5060..f6c9a3c166 100644
--- a/target/linux/generic/patches-3.8/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.8/100-overlayfs.patch
@@ -3175,7 +3175,7 @@
int flags, const char *name,
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -5661,6 +5661,13 @@ F: drivers/scsi/osd/
+@@ -5667,6 +5667,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
diff --git a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
index a1563f44e7..b3746978d3 100644
--- a/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
+++ b/target/linux/generic/patches-3.8/643-bridge_remove_ipv6_dependency.patch
@@ -32,7 +32,7 @@
+obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_stubs.o
--- a/net/ipv6/addrconf.c
+++ b/net/ipv6/addrconf.c
-@@ -1246,7 +1246,7 @@ out:
+@@ -1243,7 +1243,7 @@ out:
return ret;
}
@@ -41,7 +41,7 @@
const struct in6_addr *daddr, unsigned int prefs,
struct in6_addr *saddr)
{
-@@ -1371,7 +1371,6 @@ try_nextdev:
+@@ -1368,7 +1368,6 @@ try_nextdev:
in6_ifa_put(hiscore->ifa);
return 0;
}
@@ -49,7 +49,7 @@
int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr,
unsigned char banned_flags)
-@@ -4949,6 +4948,9 @@ int __init addrconf_init(void)
+@@ -4946,6 +4945,9 @@ int __init addrconf_init(void)
ipv6_addr_label_rtnl_register();
@@ -59,7 +59,7 @@
return 0;
errout:
rtnl_af_unregister(&inet6_ops);
-@@ -4967,6 +4969,9 @@ void addrconf_cleanup(void)
+@@ -4964,6 +4966,9 @@ void addrconf_cleanup(void)
struct net_device *dev;
int i;
diff --git a/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch b/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch
index ff3f0979f0..c21b007777 100644
--- a/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch
+++ b/target/linux/generic/patches-3.8/651-wireless_mesh_header.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -134,7 +134,7 @@ static inline bool dev_xmit_complete(int
+@@ -137,7 +137,7 @@ static inline bool dev_xmit_complete(int
*/
#if defined(CONFIG_WLAN) || IS_ENABLED(CONFIG_AX25)
diff --git a/target/linux/generic/patches-3.8/721-phy_packets.patch b/target/linux/generic/patches-3.8/721-phy_packets.patch
index 1aa814857b..21e2291f6c 100644
--- a/target/linux/generic/patches-3.8/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.8/721-phy_packets.patch
@@ -1,6 +1,6 @@
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
-@@ -1090,6 +1090,11 @@ struct net_device {
+@@ -1093,6 +1093,11 @@ struct net_device {
const struct net_device_ops *netdev_ops;
const struct ethtool_ops *ethtool_ops;
@@ -12,7 +12,7 @@
/* Hardware header description */
const struct header_ops *header_ops;
-@@ -1146,6 +1151,9 @@ struct net_device {
+@@ -1149,6 +1154,9 @@ struct net_device {
void *ax25_ptr; /* AX.25 specific data */
struct wireless_dev *ieee80211_ptr; /* IEEE 802.11 specific data,
assign before registering */
diff --git a/target/linux/generic/patches-3.8/863-gpiommc.patch b/target/linux/generic/patches-3.8/863-gpiommc.patch
index aa66000044..5f724e0073 100644
--- a/target/linux/generic/patches-3.8/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.8/863-gpiommc.patch
@@ -830,7 +830,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3500,6 +3500,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -3507,6 +3507,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/
diff --git a/target/linux/generic/patches-3.8/930-crashlog.patch b/target/linux/generic/patches-3.8/930-crashlog.patch
index 453161c4c2..da0d8008e4 100644
--- a/target/linux/generic/patches-3.8/930-crashlog.patch
+++ b/target/linux/generic/patches-3.8/930-crashlog.patch
@@ -265,7 +265,7 @@
static struct memblock_region memblock_memory_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
static struct memblock_region memblock_reserved_init_regions[INIT_MEMBLOCK_REGIONS] __initdata_memblock;
-@@ -342,6 +343,8 @@ static void __init_memblock memblock_ins
+@@ -343,6 +344,8 @@ static void __init_memblock memblock_ins
memblock_set_region_node(rgn, nid);
type->cnt++;
type->total_size += size;