[generic/3.9]: refresh against -rc7

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36340 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic/patches-3.9/100-overlayfs.patch b/target/linux/generic/patches-3.9/100-overlayfs.patch
index ae1f2f3..386e877 100644 (file)
--- a/target/linux/generic/patches-3.9/100-overlayfs.patch
+++ b/target/linux/generic/patches-3.9/100-overlayfs.patch
@@ -243,7 +243,7 @@
          will be called when part or all of the page is to be removed
 --- a/MAINTAINERS
 +++ b/MAINTAINERS
-@@ -5911,6 +5911,13 @@ F:      drivers/scsi/osd/
+@@ -5917,6 +5917,13 @@ F:      drivers/scsi/osd/
  F:    include/scsi/osd_*
  F:    fs/exofs/
  

diff --git a/target/linux/generic/patches-3.9/259-regmap_dynamic.patch b/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
index 451a5e2..191e5ea 100644 (file)
--- a/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
+++ b/target/linux/generic/patches-3.9/259-regmap_dynamic.patch
@@ -64,7 +64,7 @@
  #include <linux/mutex.h>
  #include <linux/err.h>
  #include <linux/rbtree.h>
-@@ -1778,3 +1779,5 @@ static int __init regmap_initcall(void)
+@@ -1779,3 +1780,5 @@ static int __init regmap_initcall(void)
        return 0;
  }
  postcore_initcall(regmap_initcall);

diff --git a/target/linux/generic/patches-3.9/440-block2mtd_init.patch b/target/linux/generic/patches-3.9/440-block2mtd_init.patch
index ff0f623..7ea827d 100644 (file)
--- a/target/linux/generic/patches-3.9/440-block2mtd_init.patch
+++ b/target/linux/generic/patches-3.9/440-block2mtd_init.patch
@@ -106,7 +106,7 @@
  {
 --- a/block/partition-generic.c
 +++ b/block/partition-generic.c
-@@ -549,6 +549,7 @@ int invalidate_partitions(struct gendisk
+@@ -548,6 +548,7 @@ int invalidate_partitions(struct gendisk
  
        return 0;
  }

diff --git a/target/linux/generic/patches-3.9/657-qdisc_reduce_truesize.patch b/target/linux/generic/patches-3.9/657-qdisc_reduce_truesize.patch
index e27d0a0..93ff7ba 100644 (file)
--- a/target/linux/generic/patches-3.9/657-qdisc_reduce_truesize.patch
+++ b/target/linux/generic/patches-3.9/657-qdisc_reduce_truesize.patch
@@ -24,7 +24,7 @@ commont qdiscs.
        }
 --- a/net/sched/sch_fifo.c
 +++ b/net/sched/sch_fifo.c
-@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff 
+@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff
  
  static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch)
  {

diff --git a/target/linux/generic/patches-3.9/721-phy_packets.patch b/target/linux/generic/patches-3.9/721-phy_packets.patch
index 470f54f..65f5ffd 100644 (file)
--- a/target/linux/generic/patches-3.9/721-phy_packets.patch
+++ b/target/linux/generic/patches-3.9/721-phy_packets.patch
@@ -45,7 +45,7 @@
  /**
   *    pskb_trim_unique - remove end from a paged unique (not cloned) buffer
   *    @skb: buffer to alter
-@@ -1892,16 +1896,6 @@ static inline struct sk_buff *dev_alloc_
+@@ -1910,16 +1914,6 @@ static inline struct sk_buff *dev_alloc_
  }
  
  

diff --git a/target/linux/generic/patches-3.9/950-vm_exports.patch b/target/linux/generic/patches-3.9/950-vm_exports.patch
index 4432184..ab1e0a6 100644 (file)
--- a/target/linux/generic/patches-3.9/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.9/950-vm_exports.patch
@@ -52,7 +52,7 @@
   * When we die, we re-parent all our children, and try to:
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3671,6 +3671,7 @@ int can_nice(const struct task_struct *p
+@@ -3673,6 +3673,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }
@@ -62,7 +62,7 @@
  
 --- a/mm/memory.c
 +++ b/mm/memory.c
-@@ -1412,6 +1412,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1413,6 +1413,7 @@ void zap_page_range(struct vm_area_struc
        mmu_notifier_invalidate_range_end(mm, start, end);
        tlb_finish_mmu(&tlb, start, end);
  }

diff --git a/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch b/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch
index 447aaca..7041116 100644 (file)
--- a/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch
+++ b/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch
@@ -1,6 +1,6 @@
 --- a/arch/arm/kernel/smp_twd.c
 +++ b/arch/arm/kernel/smp_twd.c
-@@ -186,7 +186,7 @@ core_initcall(twd_cpufreq_init);
+@@ -188,7 +188,7 @@ core_initcall(twd_cpufreq_init);
  
  #endif
  
@@ -9,7 +9,7 @@
  {
        unsigned long count;
        u64 waitjiffies;
-@@ -223,8 +223,11 @@ static void __cpuinit twd_calibrate_rate
+@@ -225,8 +225,11 @@ static void __cpuinit twd_calibrate_rate
                printk("%lu.%02luMHz.\n", twd_timer_rate / 1000000,
                        (twd_timer_rate / 10000) % 100);
        }