refresh patches to -rc3
authorImre Kaloz <kaloz@openwrt.org>
Sat, 11 Feb 2012 17:43:06 +0000 (17:43 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Sat, 11 Feb 2012 17:43:06 +0000 (17:43 +0000)
SVN-Revision: 30456

target/linux/generic/patches-3.3/100-overlayfs_v12.patch
target/linux/generic/patches-3.3/254-textsearch_kconfig_hacks.patch
target/linux/generic/patches-3.3/400-rootfs_split.patch
target/linux/generic/patches-3.3/510-jffs2_make_lzma_available.patch
target/linux/generic/patches-3.3/863-gpiommc.patch
target/linux/generic/patches-3.3/950-vm_exports.patch

index b7508e6639621e208600dd3566ef62db6cbc8e24..5eda87c8d643de3aed88149521bfc97f8cb85da6 100644 (file)
  ========================
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -4930,6 +4930,13 @@ F:      drivers/scsi/osd/
+@@ -4924,6 +4924,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/
  
index 07b5f76688d813cb1d9ed67041a41d592e5d35a1..1659fda937a1e591c8d8b61b765cff916d9cef35 100644 (file)
@@ -1,6 +1,6 @@
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -204,16 +204,16 @@ config BCH_CONST_T
+@@ -207,16 +207,16 @@ config BCH_CONST_T
  # Textsearch support is select'ed if needed
  #
  config TEXTSEARCH
index debe9304525243bbc90df30c2b7672a59b33811c..349185a30d3dd52f02bec9b1b717af2bfa871ca6 100644 (file)
        /*
         * If the driver is something smart, like UBI, it may need to maintain
         * its own reference counting. The below functions are only for driver.
-@@ -504,6 +508,7 @@ extern int mtd_device_parse_register(str
+@@ -502,6 +506,7 @@ extern int mtd_device_parse_register(str
                              int defnr_parts);
  #define mtd_device_register(master, parts, nr_parts)  \
        mtd_device_parse_register(master, NULL, NULL, parts, nr_parts)
index c51be071803303427da44b939cc0d44cc4e2805c..fa79ba313daff2286726a054e9b5aefced7a6da2 100644 (file)
 +#endif
 --- a/lib/Kconfig
 +++ b/lib/Kconfig
-@@ -115,6 +115,12 @@ config LZO_DECOMPRESS
+@@ -118,6 +118,12 @@ config LZO_DECOMPRESS
  
  source "lib/xz/Kconfig"
  
index 9a5f811a756a4bd64b5928c9496a7b14f37c0165..3052a3830207f2eb88c47f62a1f4a8fa0c734469 100644 (file)
 +be done automatically.
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -3025,6 +3025,11 @@ L:      linuxppc-dev@lists.ozlabs.org
+@@ -3019,6 +3019,11 @@ L:      linuxppc-dev@lists.ozlabs.org
  S:    Odd Fixes
  F:    drivers/tty/hvc/
  
index f0d9a64bf1091f437a992763f65f5b4e4d777058..5b5a17728a41624619522fe18585cf25d1ef7a77 100644 (file)
@@ -61,7 +61,7 @@
  {
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3861,6 +3861,7 @@ int can_nice(const struct task_struct *p
+@@ -3856,6 +3856,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }