kernel: refresh patches for kernel 3.0-rc4

SVN-Revision: 27247

diff --git a/target/linux/generic/config-3.0 b/target/linux/generic/config-3.0
index 4be7b23f215d406eee861020a89cf869776ca09a..8af35e72c4bdb2288c9f64391c6bbbcbc17c2308 100644 (file)
--- 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 32a628f8b2e590bf85af13bbdd7afcdd1279f2f1..fd6aae32a8f56aace2fd9b530225a25f53776e95 100644 (file)
--- 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 5e1c0763ea6a38c710c277a84e860e4b8ddf7151..9e8e56678bb3e9b36cf3982b2270de21e5e578bc 100644 (file)
--- 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 5a7b96aadde4187d6a58036167b74e92d5884b11..2025b229a4c4eccc85d9c69af4a8936c3592c325 100644 (file)
--- 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 22a56ed4dccdf498c8e87caa19a39d5088cb1702..9e13e579dd39142f0c9a037a5f30fca8c8268ab7 100644 (file)
--- 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 c375a97292ee4c0f2dcf1a5773410e29d8d8f101..a718e370f10800e70bbdf8339576e8bda2ddcbec 100644 (file)
--- 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 e97b84d48cf7e9affaab44b690293be7cf5c53ed..a6d188f2ce77c3866d3787941638058822137b6e 100644 (file)
--- 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 34ac10ed399c8824634fea0c7eb7be0858da1d6d..badc0a4e62cdfe1a4f62784be145c793c4e1378d 100644 (file)
--- 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 f91cf1a22053c5522ce5a18c0ce37dc72468fa42..cf44041cce2923f85a36ef846ab2ffd3e4d00a38 100644 (file)
--- 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 aefd8af1737658fdbda7f9936ab0bf1a0a8a9f49..f52cb1e11a653bca3e30d015b5ad769122238b09 100644 (file)
--- 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 a0a40e7fb1acc5fcf841732f6101e873ae29b19a..cccaa7eecabb4fa8a2d5dd2f4efc0493688be4eb 100644 (file)
--- 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 504fd8ebc8a3f8f8685c29d627d610428308ef96..ecca186db5b5e4d42d00c2b6d72fd2950e14a573 100644 (file)
--- 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 129ae8d16a8ddf8a1500b863cb4000db46e590ca..4693c53f9b39bc9d564a6a879ba65ae6cc078087 100644 (file)
--- 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 dd4bfe1cebe13c9cbb2890fce118680a0b80b5ed..e2fde683a7cf28fa8afe36c33bfe7efbdc9e95b9 100644 (file)
--- 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