Changeset 36340

Timestamp:

2013-04-15T18:10:01+02:00 (5 years ago)

Author:

kaloz

Message:

[generic/3.9]: refresh against -rc7

Location:

trunk/target/linux/generic/patches-3.9

Files:

• 100-overlayfs.patch (modified) (1 diff)
• 259-regmap_dynamic.patch (modified) (1 diff)
• 440-block2mtd_init.patch (modified) (1 diff)
• 657-qdisc_reduce_truesize.patch (modified) (1 diff)
• 721-phy_packets.patch (modified) (1 diff)
• 950-vm_exports.patch (modified) (2 diffs)
• 995-mpcore_twd_calibrate_single_core.patch (modified) (2 diffs)

trunk/target/linux/generic/patches-3.9/100-overlayfs.patch

@@ -244 +244 @@
 --- 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/

trunk/target/linux/generic/patches-3.9/259-regmap_dynamic.patch

@@ -65 +65 @@
  #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;
  }

trunk/target/linux/generic/patches-3.9/440-block2mtd_init.patch

@@ -107 +107 @@
 --- 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;

trunk/target/linux/generic/patches-3.9/657-qdisc_reduce_truesize.patch

@@ -25 +25 @@
 --- 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)

trunk/target/linux/generic/patches-3.9/721-phy_packets.patch

@@ -46 +46 @@
   *     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_
  }
  

trunk/target/linux/generic/patches-3.9/950-vm_exports.patch

@@ -53 +53 @@
 --- 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));
@@ -63 +63 @@
 --- 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);

trunk/target/linux/generic/patches-3.9/995-mpcore_twd_calibrate_single_core.patch

@@ -1 +1 @@
 --- 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
@@ -10 +10 @@
         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);