kernel: refresh patches for kernel 3.0-rc4

SVN-Revision: 27247
owl
Hauke Mehrtens 2011-06-21 18:39:47 +00:00
parent 9bdf6abb9d
commit 1c0d5f5ae2
14 changed files with 15 additions and 14 deletions

View File

@ -526,6 +526,7 @@ CONFIG_DEBUG_INFO_REDUCED=y
# CONFIG_DECNET is not set # CONFIG_DECNET is not set
CONFIG_DECOMPRESS_LZMA_NEEDED=y CONFIG_DECOMPRESS_LZMA_NEEDED=y
CONFIG_DEFAULT_DEADLINE=y CONFIG_DEFAULT_DEADLINE=y
CONFIG_DEFAULT_HOSTNAME="(none)"
CONFIG_DEFAULT_IOSCHED="deadline" CONFIG_DEFAULT_IOSCHED="deadline"
CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4 CONFIG_DEFAULT_MESSAGE_LOGLEVEL=4
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

View File

@ -3057,7 +3057,7 @@
+the future. +the future.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/MAINTAINERS +++ b/MAINTAINERS
@@ -4713,6 +4713,13 @@ F: drivers/scsi/osd/ @@ -4717,6 +4717,13 @@ F: drivers/scsi/osd/
F: include/scsi/osd_* F: include/scsi/osd_*
F: fs/exofs/ F: fs/exofs/

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig
@@ -97,6 +97,13 @@ config MICREL_PHY @@ -98,6 +98,13 @@ config MICREL_PHY
---help--- ---help---
Supports the KSZ9021, VSC8201, KS8001 PHYs. Supports the KSZ9021, VSC8201, KS8001 PHYs.

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/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. Currently supports the ADM6996FC and ADM6996M switches.
Support for FC is very limited. Support for FC is very limited.

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/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 config MVSWITCH_PHY
tristate "Driver for Marvell 88E6060 switches" tristate "Driver for Marvell 88E6060 switches"

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/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" tristate "Driver for IC+ IP17xx switches"
select SWCONFIG select SWCONFIG

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/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" tristate "Driver for Atheros AR8216 switches"
select SWCONFIG select SWCONFIG

View File

@ -1,6 +1,6 @@
--- a/drivers/net/phy/Kconfig --- a/drivers/net/phy/Kconfig
+++ b/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. If in doubt, say Y.

View File

@ -829,7 +829,7 @@
+be done automatically. +be done automatically.
--- a/MAINTAINERS --- a/MAINTAINERS
+++ b/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 S: Odd Fixes
F: drivers/tty/hvc/ F: drivers/tty/hvc/

View File

@ -1,6 +1,6 @@
--- a/init/main.c --- a/init/main.c
+++ b/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 */ /* Open the /dev/console on the rootfs, this should never fail */
if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) if (sys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)

View File

@ -1,6 +1,6 @@
--- a/init/main.c --- a/init/main.c
+++ b/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 " printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command); "defaults...\n", execute_command);
} }

View File

@ -15,7 +15,7 @@
+#endif +#endif
--- a/init/Kconfig --- a/init/Kconfig
+++ b/init/Kconfig +++ b/init/Kconfig
@@ -871,6 +871,10 @@ config RELAY @@ -879,6 +879,10 @@ config RELAY
If unsure, say N. If unsure, say N.

View File

@ -70,7 +70,7 @@
--- a/mm/memory.c --- a/mm/memory.c
+++ b/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); tlb_finish_mmu(&tlb, address, end);
return end; return end;
} }
@ -78,7 +78,7 @@
/** /**
* zap_vma_ptes - remove ptes mapping the vma * 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; return 0;
} }

View File

@ -4,6 +4,6 @@
VERSION = 3 VERSION = 3
PATCHLEVEL = 0 PATCHLEVEL = 0
-SUBLEVEL = 0 -SUBLEVEL = 0
EXTRAVERSION = -rc3 EXTRAVERSION = -rc4
NAME = Sneaky Weasel NAME = Sneaky Weasel