diff --git a/include/kernel-version.mk b/include/kernel-version.mk index 41f100aeb5f09df3a1f121d476d7e1db5ef82b1f..f2e39c0a839a1ab2d066592f58fccaa2b1e28d33 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -35,8 +35,8 @@ endif ifeq ($(LINUX_VERSION),3.1.10) LINUX_KERNEL_MD5SUM:=3649bdaa50ffd9114cc16486ec54d83a endif -ifeq ($(LINUX_VERSION),3.2.9) - LINUX_KERNEL_MD5SUM:=f6c2ede7c6df0f62c8fbf7932ccf63b6 +ifeq ($(LINUX_VERSION),3.2.12) + LINUX_KERNEL_MD5SUM:=e3dd3772f0cf14d444a3fb474bd624fe endif # disable the md5sum check for unknown kernel versions diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index cd4a14d476a91180a739f30d976b7b81429fef37..30610f8c6f4d32d75bb5099c27512a5d8e1e1cb3 100644 --- a/target/linux/ar71xx/Makefile +++ b/target/linux/ar71xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves SUBTARGETS:=generic nand -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/au1000/Makefile b/target/linux/au1000/Makefile index 395afb8e9ac9c0ca80178c1a47d37148e983ac6c..0125d882486eb6ff518c2cd49e8ed9ee4f7dd936 100644 --- a/target/linux/au1000/Makefile +++ b/target/linux/au1000/Makefile @@ -13,7 +13,7 @@ FEATURES:=jffs2 usb pci SUBTARGETS=au1500 au1550 MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini yamonenv diff --git a/target/linux/brcm47xx/Makefile b/target/linux/brcm47xx/Makefile index 693489375b8373b75b3ad597dc1a9924c4a83729..dfa0cd7146e29769bf62f4a0dbb0a4b8b7a36499 100644 --- a/target/linux/brcm47xx/Makefile +++ b/target/linux/brcm47xx/Makefile @@ -11,7 +11,7 @@ BOARD:=brcm47xx BOARDNAME:=Broadcom BCM947xx/953xx FEATURES:=squashfs usb pcmcia -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-switch kmod-diag nvram diff --git a/target/linux/cns21xx/Makefile b/target/linux/cns21xx/Makefile index 3c7a1d33aab2f6ac7d20a5b99fc3def5171774b6..b519f3935f49e4da98d94e7f45af85bade30e7e9 100644 --- a/target/linux/cns21xx/Makefile +++ b/target/linux/cns21xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cavium Networks Econa CNS21xx FEATURES:=squashfs broken CFLAGS:=-Os -pipe -march=armv4 -mtune=fa526 -fno-caller-saves -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ep93xx/Makefile b/target/linux/ep93xx/Makefile index 4d8febc1e23673e4d27dfffe1ba2a988c4abf14f..6c5044ba368507a5169dec91653a820618e8768d 100644 --- a/target/linux/ep93xx/Makefile +++ b/target/linux/ep93xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs jffs2 ext4 targz usb CFLAGS:=-Os -pipe -march=armv4t -fno-caller-saves MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-3.2/440-block2mtd_init.patch b/target/linux/generic/patches-3.2/440-block2mtd_init.patch index 53979b267ac6977a7e1c3fa82ecc39c9bd7439ca..513fbcadbbdfb722813729f60d5a555af358bcff 100644 --- a/target/linux/generic/patches-3.2/440-block2mtd_init.patch +++ b/target/linux/generic/patches-3.2/440-block2mtd_init.patch @@ -106,8 +106,8 @@ { --- a/fs/partitions/check.c +++ b/fs/partitions/check.c -@@ -664,6 +664,7 @@ rescan: - kfree(state); +@@ -696,6 +696,7 @@ int invalidate_partitions(struct gendisk + return 0; } +EXPORT_SYMBOL(rescan_partitions); diff --git a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch index 9203e017424dc5f6d54f15b30e42eb86031f47f3..6b79e5463da808582c3d5e21935e40daee97d9db 100644 --- a/target/linux/generic/patches-3.2/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.2/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 -@@ -1107,7 +1107,7 @@ out: +@@ -1111,7 +1111,7 @@ out: return ret; } @@ -41,7 +41,7 @@ const struct in6_addr *daddr, unsigned int prefs, struct in6_addr *saddr) { -@@ -1232,7 +1232,6 @@ try_nextdev: +@@ -1236,7 +1236,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) -@@ -4814,6 +4813,9 @@ int __init addrconf_init(void) +@@ -4818,6 +4817,9 @@ int __init addrconf_init(void) ipv6_addr_label_rtnl_register(); @@ -59,7 +59,7 @@ return 0; errout: rtnl_af_unregister(&inet6_ops); -@@ -4832,6 +4834,9 @@ void addrconf_cleanup(void) +@@ -4836,6 +4838,9 @@ void addrconf_cleanup(void) struct net_device *dev; int i; diff --git a/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch b/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch index 06b05f8af96555f9cd4220165c685f6a2b97319a..91139854bb138b95eb22fed2d6172c653310e812 100644 --- a/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch +++ b/target/linux/generic/patches-3.2/644-bridge_optimize_netfilter_hooks.patch @@ -100,7 +100,7 @@ --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c -@@ -824,7 +824,7 @@ static void __br_multicast_send_query(st +@@ -827,7 +827,7 @@ static void __br_multicast_send_query(st if (port) { __skb_push(skb, sizeof(struct ethhdr)); skb->dev = port->dev; diff --git a/target/linux/malta/Makefile b/target/linux/malta/Makefile index 119338c5ade98c2141ac72aca4a6e13ee42169f8..47ade69782a899ba8cccd30e5358ef1f606f2274 100644 --- a/target/linux/malta/Makefile +++ b/target/linux/malta/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=le be INITRAMFS_EXTRA_FILES:= MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/mpc52xx/Makefile b/target/linux/mpc52xx/Makefile index 6d69e9983a55449962a17ad66e5f06e922462ae9..4c7cd5b986b62bf97048aebea6fd10853404c879 100644 --- a/target/linux/mpc52xx/Makefile +++ b/target/linux/mpc52xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Freescale MPC52xx CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=603e FEATURES:=targz ext4 -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap4/Makefile b/target/linux/omap4/Makefile index f806f9ac5fabd3b2dd3992310b772a7d25f6b5f9..1f3f88985167a03c439d97464ddbb6ab93007532 100644 --- a/target/linux/omap4/Makefile +++ b/target/linux/omap4/Makefile @@ -11,7 +11,7 @@ BOARD:=omap4 BOARDNAME:=TI OMAP4 FEATURES:=usb targz audio display -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 CFLAGS:=-Os -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=softfp MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 87d5d6b568174e991a1d6ba0cfd9497f5b09861c..cceee1d8d3272340740021f81a78baa50cc5b632 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=405 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index 629eab0361928e12ad2fc61011392a8a8ec8587b..35addf25da33a80a0dcdbfe96886378a71b2414a 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=440 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=3.2.11 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch index 225831a4b6edd2035129f77e178b5dd8317917eb..471e686d32416a5d1c6918097e7cbe25754b530c 100644 --- a/target/linux/ppc44x/patches/100-openwrt_flashmap.patch +++ b/target/linux/ppc44x/patches/100-openwrt_flashmap.patch @@ -25,7 +25,7 @@ label = "env"; --- a/arch/powerpc/boot/dts/canyonlands.dts +++ b/arch/powerpc/boot/dts/canyonlands.dts -@@ -217,24 +217,12 @@ +@@ -222,24 +222,12 @@ #address-cells = <1>; #size-cells = <1>; partition@0 { diff --git a/target/linux/ramips/Makefile b/target/linux/ramips/Makefile index 926d3848c0bf548ffecf166ae30881441da0fc1a..0bd0f7c82cf8ee5291591957e327855ecfc10d89 100644 --- a/target/linux/ramips/Makefile +++ b/target/linux/ramips/Makefile @@ -13,7 +13,7 @@ SUBTARGETS:=rt288x rt305x rt3883 CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -fno-caller-saves FEATURES:=squashfs -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES+=\ diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 14a11db6d0216a1a42a5ff1aa22803b75f1e2d4b..4f4ef7ff8cdc6c14141998c94cbfdff3e29080cd 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext4 audio MAINTAINER:=Florian Fainelli <florian@openwrt.org> -LINUX_VERSION:=3.2.9 +LINUX_VERSION:=3.2.12 include $(INCLUDE_DIR)/target.mk