summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-21 18:39:47 +0000
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-06-21 18:39:47 +0000
commitb40c3fc29bf64f6419f87e79f9a7409c97622ad6 (patch)
tree66592a1642ea006439fd65d407279ce74b65ac05
parent7954e2cc55815d6797b5ad4f0d4376e4a5500896 (diff)
kernel: refresh patches for kernel 3.0-rc4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27247 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/config-3.01
-rw-r--r--target/linux/generic/patches-3.0/100-overlayfs_v10.patch2
-rw-r--r--target/linux/generic/patches-3.0/720-phy_adm6996.patch2
-rw-r--r--target/linux/generic/patches-3.0/722-phy_mvswitch.patch2
-rw-r--r--target/linux/generic/patches-3.0/723-phy_ip175c.patch2
-rw-r--r--target/linux/generic/patches-3.0/724-phy_ar8216.patch2
-rw-r--r--target/linux/generic/patches-3.0/725-phy_rtl8306.patch2
-rw-r--r--target/linux/generic/patches-3.0/726-phy_rtl8366.patch2
-rw-r--r--target/linux/generic/patches-3.0/863-gpiommc.patch2
-rw-r--r--target/linux/generic/patches-3.0/920-unable_to_open_console.patch2
-rw-r--r--target/linux/generic/patches-3.0/921-use_preinit_as_init.patch2
-rw-r--r--target/linux/generic/patches-3.0/930-crashlog.patch2
-rw-r--r--target/linux/generic/patches-3.0/950-vm_exports.patch4
-rw-r--r--target/linux/generic/patches-3.0/999-drop_sublevel.patch2
14 files changed, 15 insertions, 14 deletions
diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index 4be7b23f21..8af35e72c4 100644
--- a/target/linux/generic/config-3.0
+++ b/target/linux/generic/config-3.0
@@ -526,6 +526,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
# CONFIG_DECNET is not set
CONFIG_DECOMPRESS_LZMA_NEEDED=y
CONFIG_DEFAULT_DEADLINE=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
diff --git a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
index 32a628f8b2..fd6aae32a8 100644
--- a/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
+++ b/target/linux/generic/patches-3.0/100-overlayfs_v10.patch
@@ -3057,7 +3057,7 @@
+the future.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -4713,6 +4713,13 @@ F: drivers/scsi/osd/
+@@ -4717,6 +4717,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_*
F: fs/exofs/
diff --git a/target/linux/generic/patches-3.0/720-phy_adm6996.patch b/target/linux/generic/patches-3.0/720-phy_adm6996.patch
index 5e1c0763ea..9e8e56678b 100644
--- a/target/linux/generic/patches-3.0/720-phy_adm6996.patch
+++ b/target/linux/generic/patches-3.0/720-phy_adm6996.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -97,6 +97,13 @@ config MICREL_PHY
+@@ -98,6 +98,13 @@ config MICREL_PHY
---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs.
diff --git a/target/linux/generic/patches-3.0/722-phy_mvswitch.patch b/target/linux/generic/patches-3.0/722-phy_mvswitch.patch
index 5a7b96aadd..2025b229a4 100644
--- a/target/linux/generic/patches-3.0/722-phy_mvswitch.patch
+++ b/target/linux/generic/patches-3.0/722-phy_mvswitch.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -104,6 +104,9 @@ config ADM6996_PHY
+@@ -105,6 +105,9 @@ config ADM6996_PHY
Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited.
diff --git a/target/linux/generic/patches-3.0/723-phy_ip175c.patch b/target/linux/generic/patches-3.0/723-phy_ip175c.patch
index 22a56ed4dc..9e13e579dd 100644
--- a/target/linux/generic/patches-3.0/723-phy_ip175c.patch
+++ b/target/linux/generic/patches-3.0/723-phy_ip175c.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -107,6 +107,10 @@ config ADM6996_PHY
+@@ -108,6 +108,10 @@ config ADM6996_PHY
config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches"
diff --git a/target/linux/generic/patches-3.0/724-phy_ar8216.patch b/target/linux/generic/patches-3.0/724-phy_ar8216.patch
index c375a97292..a718e370f1 100644
--- a/target/linux/generic/patches-3.0/724-phy_ar8216.patch
+++ b/target/linux/generic/patches-3.0/724-phy_ar8216.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -111,6 +111,10 @@ config IP17XX_PHY
+@@ -112,6 +112,10 @@ config IP17XX_PHY
tristate "Driver for IC+ IP17xx switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-3.0/725-phy_rtl8306.patch b/target/linux/generic/patches-3.0/725-phy_rtl8306.patch
index e97b84d48c..a6d188f2ce 100644
--- a/target/linux/generic/patches-3.0/725-phy_rtl8306.patch
+++ b/target/linux/generic/patches-3.0/725-phy_rtl8306.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -115,6 +115,10 @@ config AR8216_PHY
+@@ -116,6 +116,10 @@ config AR8216_PHY
tristate "Driver for Atheros AR8216 switches"
select SWCONFIG
diff --git a/target/linux/generic/patches-3.0/726-phy_rtl8366.patch b/target/linux/generic/patches-3.0/726-phy_rtl8366.patch
index 34ac10ed39..badc0a4e62 100644
--- a/target/linux/generic/patches-3.0/726-phy_rtl8366.patch
+++ b/target/linux/generic/patches-3.0/726-phy_rtl8366.patch
@@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
-@@ -157,4 +157,29 @@ config MDIO_OCTEON
+@@ -158,4 +158,29 @@ config MDIO_OCTEON
If in doubt, say Y.
diff --git a/target/linux/generic/patches-3.0/863-gpiommc.patch b/target/linux/generic/patches-3.0/863-gpiommc.patch
index f91cf1a220..cf44041cce 100644
--- a/target/linux/generic/patches-3.0/863-gpiommc.patch
+++ b/target/linux/generic/patches-3.0/863-gpiommc.patch
@@ -829,7 +829,7 @@
+be done automatically.
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -2903,6 +2903,11 @@ L: linuxppc-dev@lists.ozlabs.org
+@@ -2901,6 +2901,11 @@ L: linuxppc-dev@lists.ozlabs.org
S: Odd Fixes
F: drivers/tty/hvc/
diff --git a/target/linux/generic/patches-3.0/920-unable_to_open_console.patch b/target/linux/generic/patches-3.0/920-unable_to_open_console.patch
index aefd8af173..f52cb1e11a 100644
--- a/target/linux/generic/patches-3.0/920-unable_to_open_console.patch
+++ b/target/linux/generic/patches-3.0/920-unable_to_open_console.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -805,7 +805,7 @@ static int __init kernel_init(void * unu
+@@ -806,7 +806,7 @@ static int __init kernel_init(void * unu
/* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
diff --git a/target/linux/generic/patches-3.0/921-use_preinit_as_init.patch b/target/linux/generic/patches-3.0/921-use_preinit_as_init.patch
index a0a40e7fb1..cccaa7eeca 100644
--- a/target/linux/generic/patches-3.0/921-use_preinit_as_init.patch
+++ b/target/linux/generic/patches-3.0/921-use_preinit_as_init.patch
@@ -1,6 +1,6 @@
--- a/init/main.c
+++ b/init/main.c
-@@ -767,10 +767,7 @@ static noinline int init_post(void)
+@@ -768,10 +768,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
diff --git a/target/linux/generic/patches-3.0/930-crashlog.patch b/target/linux/generic/patches-3.0/930-crashlog.patch
index 504fd8ebc8..ecca186db5 100644
--- a/target/linux/generic/patches-3.0/930-crashlog.patch
+++ b/target/linux/generic/patches-3.0/930-crashlog.patch
@@ -15,7 +15,7 @@
+#endif
--- a/init/Kconfig
+++ b/init/Kconfig
-@@ -871,6 +871,10 @@ config RELAY
+@@ -879,6 +879,10 @@ config RELAY
If unsure, say N.
diff --git a/target/linux/generic/patches-3.0/950-vm_exports.patch b/target/linux/generic/patches-3.0/950-vm_exports.patch
index 129ae8d16a..4693c53f9b 100644
--- a/target/linux/generic/patches-3.0/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.0/950-vm_exports.patch
@@ -70,7 +70,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -1393,6 +1393,7 @@ unsigned long zap_page_range(struct vm_a
+@@ -1395,6 +1395,7 @@ unsigned long zap_page_range(struct vm_a
tlb_finish_mmu(&tlb, address, end);
return end;
}
@@ -78,7 +78,7 @@
/**
* zap_vma_ptes - remove ptes mapping the vma
-@@ -2819,6 +2820,7 @@ int vmtruncate_range(struct inode *inode
+@@ -2821,6 +2822,7 @@ int vmtruncate_range(struct inode *inode
return 0;
}
diff --git a/target/linux/generic/patches-3.0/999-drop_sublevel.patch b/target/linux/generic/patches-3.0/999-drop_sublevel.patch
index dd4bfe1ceb..e2fde683a7 100644
--- a/target/linux/generic/patches-3.0/999-drop_sublevel.patch
+++ b/target/linux/generic/patches-3.0/999-drop_sublevel.patch
@@ -4,6 +4,6 @@
VERSION = 3
PATCHLEVEL = 0
-SUBLEVEL = 0
- EXTRAVERSION = -rc3
+ EXTRAVERSION = -rc4
NAME = Sneaky Weasel