diff options
23 files changed, 28 insertions, 28 deletions
diff --git a/include/kernel-version.mk b/include/kernel-version.mk index b7707d332..3055a9f0f 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,8 +8,8 @@ endif ifeq ($(LINUX_VERSION),2.6.31.14) LINUX_KERNEL_MD5SUM:=3e7feb224197d8e174a90dd3759979fd endif -ifeq ($(LINUX_VERSION),2.6.32.27) - LINUX_KERNEL_MD5SUM:=c8df8bed01a3b7e4ce13563e74181d71 +ifeq ($(LINUX_VERSION),2.6.32.29) + LINUX_KERNEL_MD5SUM:=0eea644c2cef06b4ec170228866b9685 endif ifeq ($(LINUX_VERSION),2.6.34.7) LINUX_KERNEL_MD5SUM:=8964e26120e84844998a673464a980ea diff --git a/target/linux/adm5120/Makefile b/target/linux/adm5120/Makefile index 70ffa02e2..1fc4081c7 100644 --- a/target/linux/adm5120/Makefile +++ b/target/linux/adm5120/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk BOARD:=adm5120 BOARDNAME:=Infineon/ADMtek ADM5120 -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 SUBTARGETS:=router_le router_be INITRAMFS_EXTRA_FILES:= diff --git a/target/linux/ar7/Makefile b/target/linux/ar7/Makefile index 55e4a7499..c2fe93ec6 100644 --- a/target/linux/ar7/Makefile +++ b/target/linux/ar7/Makefile @@ -11,7 +11,7 @@ BOARD:=ar7 BOARDNAME:=TI AR7 FEATURES:=squashfs jffs2 atm -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ar71xx/Makefile b/target/linux/ar71xx/Makefile index aebc5cab4..b05ad6de3 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 -funit-at-a-time SUBTARGETS:=generic nand -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 46adcf375..42f49902e 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs jffs2 -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/cobalt/Makefile b/target/linux/cobalt/Makefile index 76cc057fd..35167e182 100644 --- a/target/linux/cobalt/Makefile +++ b/target/linux/cobalt/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Cobalt Microservers FEATURES:=targz pci ext4 CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/etrax/Makefile b/target/linux/etrax/Makefile index 1be18a6a6..cfe49536b 100644 --- a/target/linux/etrax/Makefile +++ b/target/linux/etrax/Makefile @@ -11,7 +11,7 @@ BOARD:=etrax MAINTAINER:=Claudio Mignanti <c.mignanti@gmail.com> BOARDNAME:=Axis ETRAX 100LX FEATURES:=squashfs jffs2 usb -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/gemini/Makefile b/target/linux/gemini/Makefile index f460110af..29517b3b7 100644 --- a/target/linux/gemini/Makefile +++ b/target/linux/gemini/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch index dba3b32d8..9880ff014 100644 --- a/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch +++ b/target/linux/generic/patches-2.6.32/040-arm-update-mach-types.patch @@ -55,7 +55,7 @@ vesper MACH_VESPER VESPER 2256 str9 MACH_STR9 STR9 2257 omap3_wl_ff MACH_OMAP3_WL_FF OMAP3_WL_FF 2258 -@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG +@@ -2256,7 +2257,7 @@ oratisalog MACH_ORATISALOG ORATISALOG oratismadi MACH_ORATISMADI ORATISMADI 2269 oratisot16 MACH_ORATISOT16 ORATISOT16 2270 oratisdesk MACH_ORATISDESK ORATISDESK 2271 @@ -100,7 +100,7 @@ htc_excalibur_s620 MACH_HTC_EXCALIBUR_S620 HTC_EXCALIBUR_S620 2391 htc_opal MACH_HTC_OPAL HTC_OPAL 2392 touchbook MACH_TOUCHBOOK TOUCHBOOK 2393 -@@ -2445,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 +@@ -2445,7 +2446,7 @@ siogentoo1 MACH_SIOGENTOO1 SIOGENTOO1 siogentoo2 MACH_SIOGENTOO2 SIOGENTOO2 2459 sm3k MACH_SM3K SM3K 2460 acer_tempo_f900 MACH_ACER_TEMPO_F900 ACER_TEMPO_F900 2461 diff --git a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch index 8a6cf3e82..3b46e2566 100644 --- a/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch +++ b/target/linux/generic/patches-2.6.32/150-netfilter_imq.patch @@ -958,7 +958,7 @@ dev_queue_xmit_nit(skb, dev); if (netif_needs_gso(dev, skb)) { -@@ -1789,8 +1796,7 @@ u16 skb_tx_hash(const struct net_device +@@ -1797,8 +1804,7 @@ u16 skb_tx_hash(const struct net_device } EXPORT_SYMBOL(skb_tx_hash); @@ -968,7 +968,7 @@ { const struct net_device_ops *ops = dev->netdev_ops; u16 queue_index = 0; -@@ -1803,6 +1809,7 @@ static struct netdev_queue *dev_pick_tx( +@@ -1811,6 +1817,7 @@ static struct netdev_queue *dev_pick_tx( skb_set_queue_mapping(skb, queue_index); return netdev_get_tx_queue(dev, queue_index); } diff --git a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch index cd4d0f775..b9091c7b2 100644 --- a/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch +++ b/target/linux/generic/patches-2.6.32/930-kmsg_dump_backport.patch @@ -81,7 +81,7 @@ #include <asm/uaccess.h> -@@ -1405,3 +1406,121 @@ bool printk_timed_ratelimit(unsigned lon +@@ -1407,3 +1408,121 @@ bool printk_timed_ratelimit(unsigned lon } EXPORT_SYMBOL(printk_timed_ratelimit); #endif diff --git a/target/linux/generic/patches-2.6.32/931-crashlog.patch b/target/linux/generic/patches-2.6.32/931-crashlog.patch index 0c06700ae..c07ae1763 100644 --- a/target/linux/generic/patches-2.6.32/931-crashlog.patch +++ b/target/linux/generic/patches-2.6.32/931-crashlog.patch @@ -15,7 +15,7 @@ +#endif --- a/init/Kconfig +++ b/init/Kconfig -@@ -710,6 +710,9 @@ config NET_NS +@@ -688,6 +688,9 @@ config NET_NS Allow user space to create what appear to be multiple instances of the network stack. diff --git a/target/linux/generic/patches-2.6.32/980-vm_exports.patch b/target/linux/generic/patches-2.6.32/980-vm_exports.patch index d0d98b2e4..0dfa07f91 100644 --- a/target/linux/generic/patches-2.6.32/980-vm_exports.patch +++ b/target/linux/generic/patches-2.6.32/980-vm_exports.patch @@ -40,7 +40,7 @@ { --- a/kernel/exit.c +++ b/kernel/exit.c -@@ -507,6 +507,7 @@ struct files_struct *get_files_struct(st +@@ -514,6 +514,7 @@ struct files_struct *get_files_struct(st return files; } @@ -48,7 +48,7 @@ void put_files_struct(struct files_struct *files) { -@@ -526,6 +527,7 @@ void put_files_struct(struct files_struc +@@ -533,6 +534,7 @@ void put_files_struct(struct files_struc free_fdtable(fdt); } } @@ -68,7 +68,7 @@ * macro override instead of weak attribute alias, to workaround --- a/kernel/sched.c +++ b/kernel/sched.c -@@ -6223,6 +6223,7 @@ int can_nice(const struct task_struct *p +@@ -6362,6 +6362,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } diff --git a/target/linux/iop32x/Makefile b/target/linux/iop32x/Makefile index 9da59438c..727a12985 100644 --- a/target/linux/iop32x/Makefile +++ b/target/linux/iop32x/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Intel IOP32x FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ixp4xx/Makefile b/target/linux/ixp4xx/Makefile index 06856e5cb..46d8d9fcf 100644 --- a/target/linux/ixp4xx/Makefile +++ b/target/linux/ixp4xx/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> SUBTARGETS=generic harddisk -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap35xx/Makefile b/target/linux/omap35xx/Makefile index 97312bef4..cf91ae854 100644 --- a/target/linux/omap35xx/Makefile +++ b/target/linux/omap35xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP35xx FEATURES:=broken SUBTARGETS=beagleboard gumstix -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 KERNELNAME:="uImage" DEVICE_TYPE=developerboard diff --git a/target/linux/ppc40x/Makefile b/target/linux/ppc40x/Makefile index 94c9f1d82..8cd4cb270 100644 --- a/target/linux/ppc40x/Makefile +++ b/target/linux/ppc40x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/ppc44x/Makefile b/target/linux/ppc44x/Makefile index a2eb87c2d..771bf14b2 100644 --- a/target/linux/ppc44x/Makefile +++ b/target/linux/ppc44x/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440 MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/pxa/Makefile b/target/linux/pxa/Makefile index 08463377f..577053ec1 100644 --- a/target/linux/pxa/Makefile +++ b/target/linux/pxa/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Marvell/Intel PXA2xx FEATURES:=squashfs MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/rb532/Makefile b/target/linux/rb532/Makefile index a1c720cbf..59e7d7b9b 100644 --- a/target/linux/rb532/Makefile +++ b/target/linux/rb532/Makefile @@ -11,7 +11,7 @@ BOARD:=rb532 BOARDNAME:=Mikrotik RouterBoard 532 FEATURES:=jffs2 pci targz -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532 diff --git a/target/linux/rdc/Makefile b/target/linux/rdc/Makefile index 1ffd119fe..cd0179f3d 100644 --- a/target/linux/rdc/Makefile +++ b/target/linux/rdc/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=RDC 321x FEATURES:=squashfs jffs2 pci usb pcmcia CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -funit-at-a-time -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sibyte/Makefile b/target/linux/sibyte/Makefile index a63bd4da9..9de993ebd 100644 --- a/target/linux/sibyte/Makefile +++ b/target/linux/sibyte/Makefile @@ -13,7 +13,7 @@ FEATURES:=fpu CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time MAINTAINER:=Imre Kaloz <kaloz@openwrt.org> -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index c51405aa5..034389d3f 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=x86 FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos -LINUX_VERSION:=2.6.32.27 +LINUX_VERSION:=2.6.32.29 include $(INCLUDE_DIR)/target.mk |