ifeq ($(LINUX_VERSION),2.6.31.14)
LINUX_KERNEL_MD5SUM:=3e7feb224197d8e174a90dd3759979fd
endif
-ifeq ($(LINUX_VERSION),2.6.32.25)
- LINUX_KERNEL_MD5SUM:=0d6ad4e7e387f56c5b5831beb97c0c1f
+ifeq ($(LINUX_VERSION),2.6.32.26)
+ LINUX_KERNEL_MD5SUM:=bdb37b8e48aaf33d9bd6e2af3ae2f1ea
endif
ifeq ($(LINUX_VERSION),2.6.33.7)
LINUX_KERNEL_MD5SUM:=2cea51deeaa0620a07d005ec3b148f06
ifeq ($(LINUX_VERSION),2.6.34.7)
LINUX_KERNEL_MD5SUM:=8964e26120e84844998a673464a980ea
endif
-ifeq ($(LINUX_VERSION),2.6.35.8)
- LINUX_KERNEL_MD5SUM:=10ccef307e81fb405b01457f312a8c66
+ifeq ($(LINUX_VERSION),2.6.35.9)
+ LINUX_KERNEL_MD5SUM:=18d339e9229560e73c4249dffdc3fd90
endif
-ifeq ($(LINUX_VERSION),2.6.36)
- LINUX_KERNEL_MD5SUM:=61f3739a73afb6914cb007f37fb09b62
+ifeq ($(LINUX_VERSION),2.6.36.1)
+ LINUX_KERNEL_MD5SUM:=0f1398ad1fcfc14f2420010bc8a03ca9
endif
# disable the md5sum check for unknown kernel versions
BOARD:=adm5120
BOARDNAME:=Infineon/ADMtek ADM5120
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
SUBTARGETS:=router_le router_be
INITRAMFS_EXTRA_FILES:=
BOARDNAME:=Infineon WildPass ADM8668
FEATURES:=squashfs
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-rt61-pci
BOARDNAME:=TI AR7
FEATURES:=squashfs jffs2 atm
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
SUBTARGETS:=generic nand
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs jffs2 targz
CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -funit-at-a-time
-LINUX_VERSION:=2.6.35.8
+LINUX_VERSION:=2.6.35.9
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
BOARDNAME:=Atheros AR231x/AR5312
FEATURES:=squashfs jffs2
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=jffs2 usb pci
SUBTARGETS=au1500 au1550
-LINUX_VERSION:=2.6.35.8
+LINUX_VERSION:=2.6.35.9
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini yamonenv
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
include $(INCLUDE_DIR)/target.mk
BOARD:=brcm63xx
BOARDNAME:=Broadcom BCM63xx
FEATURES:=squashfs jffs2 usb atm pci pcmcia
-LINUX_VERSION:=2.6.35.8
+LINUX_VERSION:=2.6.35.9
include $(INCLUDE_DIR)/target.mk
FEATURES:=targz pci ext4
CFLAGS:=-O2 -pipe -mtune=r5000 -funit-at-a-time
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs jffs2 ext4 targz usb
CFLAGS:=-Os -pipe -march=armv4t -funit-at-a-time
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
include $(INCLUDE_DIR)/target.mk
MAINTAINER:=Claudio Mignanti <c.mignanti@gmail.com>
BOARDNAME:=Axis ETRAX 100LX
FEATURES:=squashfs jffs2 usb
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
DEVICE_TYPE=
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -march=armv4 -mtune=arm9tdmi -funit-at-a-time
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
depends on EXT4_FS
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
-@@ -3989,6 +3989,58 @@ static int ext4_get_sb(struct file_syste
+@@ -3994,6 +3994,58 @@ static int ext4_get_sb(struct file_syste
return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);
}
static struct file_system_type ext4_fs_type = {
.owner = THIS_MODULE,
.name = "ext4",
-@@ -4018,11 +4070,15 @@ static int __init init_ext4_fs(void)
+@@ -4024,11 +4076,15 @@ static int __init init_ext4_fs(void)
err = init_inodecache();
if (err)
goto out1;
destroy_inodecache();
out1:
exit_ext4_xattr();
-@@ -4038,6 +4094,8 @@ out4:
+@@ -4044,6 +4100,8 @@ out4:
static void __exit exit_ext4_fs(void)
{
Allow the ext4 file system driver code to be used for ext2 or
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
-@@ -3989,7 +3989,7 @@ static int ext4_get_sb(struct file_syste
+@@ -3994,7 +3994,7 @@ static int ext4_get_sb(struct file_syste
return get_sb_bdev(fs_type, flags, dev_name, data, ext4_fill_super,mnt);
}
static struct file_system_type ext2_fs_type = {
.owner = THIS_MODULE,
.name = "ext2",
-@@ -4015,7 +4015,7 @@ static inline void register_as_ext2(void
+@@ -4020,7 +4020,7 @@ static inline void register_as_ext2(void
static inline void unregister_as_ext2(void) { }
#endif
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
-@@ -4010,6 +4010,7 @@ static inline void unregister_as_ext2(vo
+@@ -4015,6 +4015,7 @@ static inline void unregister_as_ext2(vo
{
unregister_filesystem(&ext2_fs_type);
}
#else
static inline void register_as_ext2(void) { }
static inline void unregister_as_ext2(void) { }
-@@ -4036,6 +4037,7 @@ static inline void unregister_as_ext3(vo
+@@ -4041,6 +4042,7 @@ static inline void unregister_as_ext3(vo
{
unregister_filesystem(&ext3_fs_type);
}
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -6224,6 +6224,7 @@ int can_nice(const struct task_struct *p
+@@ -6223,6 +6223,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
capable(CAP_SYS_NICE));
}
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -1172,6 +1172,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1181,6 +1181,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1287,6 +1288,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1296,6 +1297,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
/* The Mellanox Tavor device gives false positive parity errors
* Mark this device with a broken_parity_status, to allow
* PCI scanning code to "skip" this now blacklisted device.
-@@ -1904,7 +1905,9 @@ static void __devinit fixup_rev1_53c810(
+@@ -1924,7 +1925,9 @@ static void __devinit fixup_rev1_53c810(
}
}
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NCR, PCI_DEVICE_ID_NCR_53C810, fixup_rev1_53c810);
/* Enable 1k I/O space granularity on the Intel P64H2 */
static void __devinit quirk_p64h2_1k_io(struct pci_dev *dev)
{
-@@ -2560,6 +2563,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
+@@ -2580,6 +2583,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_I
DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x1518, quirk_i82576_sriov);
#endif /* CONFIG_PCI_IOV */
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -550,7 +549,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -562,7 +561,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
tx_ring_dma + size > DMA_BIT_MASK(30)) {
kfree(tx_ring);
goto out_err;
-@@ -2176,12 +2169,14 @@ static int __devinit b44_init_one(struct
+@@ -2174,12 +2167,14 @@ static int __devinit b44_init_one(struct
"Failed to powerup the bus\n");
goto err_out_free_dev;
}
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4269,6 +4269,7 @@ int can_nice(const struct task_struct *p
+@@ -4262,6 +4262,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -1173,6 +1173,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1182,6 +1182,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1288,6 +1289,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1297,6 +1298,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
-@@ -781,6 +781,27 @@ config NETFILTER_XT_MATCH_IPVS
+@@ -761,6 +761,27 @@ config NETFILTER_XT_MATCH_IPVS
If unsure, say N.
config NETFILTER_XT_MATCH_LENGTH
tristate '"length" match support'
depends on NETFILTER_ADVANCED
-@@ -966,26 +987,11 @@ config NETFILTER_XT_MATCH_STATE
+@@ -946,26 +967,11 @@ config NETFILTER_XT_MATCH_STATE
To compile it as a module, choose M here. If unsure, say N.
depends on NETFILTER_ADVANCED
help
H.323 is a VoIP signalling protocol from ITU-T. As one of the most
-@@ -557,7 +556,6 @@ config NETFILTER_XT_TARGET_SECMARK
+@@ -569,7 +568,6 @@ config NETFILTER_XT_TARGET_SECMARK
config NETFILTER_XT_TARGET_TCPMSS
tristate '"TCPMSS" target support'
* macro override instead of weak attribute alias, to workaround
--- a/kernel/sched.c
+++ b/kernel/sched.c
-@@ -4446,6 +4446,7 @@ int can_nice(const struct task_struct *p
+@@ -4439,6 +4439,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
* We enter with non-exclusive mmap_sem (to exclude vma changes,
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
-@@ -1177,6 +1177,7 @@ void unmap_kernel_range(unsigned long ad
+@@ -1186,6 +1186,7 @@ void unmap_kernel_range(unsigned long ad
vunmap_page_range(addr, end);
flush_tlb_kernel_range(addr, end);
}
int map_vm_area(struct vm_struct *area, pgprot_t prot, struct page ***pages)
{
-@@ -1292,6 +1293,7 @@ struct vm_struct *get_vm_area(unsigned l
+@@ -1301,6 +1302,7 @@ struct vm_struct *get_vm_area(unsigned l
return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-1, GFP_KERNEL, __builtin_return_address(0));
}
FEATURES:=squashfs jffs2 atm
SUBTARGETS:=danube ar9
-LINUX_VERSION:=2.6.35.8
+LINUX_VERSION:=2.6.35.9
CFLAGS=-Os -pipe -mips32r2 -mtune=mips32r2 -funit-at-a-time
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
SUBTARGETS=generic harddisk
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=targz usb jffs2
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.35.8
+LINUX_VERSION:=2.6.35.9
include $(INCLUDE_DIR)/target.mk
SUBTARGETS:=le be
INITRAMFS_EXTRA_FILES:=
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
include $(INCLUDE_DIR)/target.mk
MAINTAINER:=Michael Buesch <mb@bu3sch.de>
FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
define Target/Description
TI OMAP-24xx
FEATURES:=broken
SUBTARGETS=beagleboard gumstix
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
KERNELNAME:="uImage"
DEVICE_TYPE=developerboard
CFLAGS=-Os -pipe -march=armv5t -mtune=xscale -funit-at-a-time
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=405
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -funit-at-a-time -mcpu=440
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
BOARDNAME:=Mikrotik RouterBoard 532
FEATURES:=jffs2 pci targz
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += wpad-mini kmod-madwifi kmod-input-rb532
FEATURES:=squashfs jffs2 pci usb pcmcia
CFLAGS:=-Os -pipe -march=i486 -mtune=i486 -funit-at-a-time
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs jffs2 fpu
CFLAGS:=-Os -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -funit-at-a-time
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
include $(INCLUDE_DIR)/target.mk
CFLAGS:=-Os -pipe -march=sb1 -funit-at-a-time
MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=ext4 audio
LINUX_CONFIG:=$(CURDIR)/config/$(ARCH)
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz
SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.32.26
include $(INCLUDE_DIR)/target.mk
FEATURES:=jffs2 targz ubifs audio
SUBTARGETS:=qi_lb60 n516 n526 id800wt
-LINUX_VERSION:=2.6.36
+LINUX_VERSION:=2.6.36.1
DEVICE_TYPE=other
projects / openwrt / staging / jow.git / commitdiff