[ANNOUNCE] 4.4.6-rt12

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

7 files changed, 13 insertions, 13 deletions

diff --git a/patches/0003-KVM-Use-simple-waitqueue-for-vcpu-wq.patch b/patches/0003-KVM-Use-simple-waitqueue-for-vcpu-wq.patch
index 09a82350cab45..5833fd67b6497 100644
--- a/patches/0003-KVM-Use-simple-waitqueue-for-vcpu-wq.patch
+++ b/patches/0003-KVM-Use-simple-waitqueue-for-vcpu-wq.patch
@@ -367,7 +367,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  	kvm_async_pf_vcpu_init(vcpu);
  
  	vcpu->pre_pcpu = -1;
-@@ -1999,7 +1998,7 @@ static int kvm_vcpu_check_block(struct k
+@@ -2002,7 +2001,7 @@ static int kvm_vcpu_check_block(struct k
  void kvm_vcpu_block(struct kvm_vcpu *vcpu)
  {
  	ktime_t start, cur;
@@ -376,7 +376,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  	bool waited = false;
  	u64 block_ns;
  
-@@ -2024,7 +2023,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcp
+@@ -2027,7 +2026,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcp
  	kvm_arch_vcpu_blocking(vcpu);
  
  	for (;;) {
@@ -385,7 +385,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  
  		if (kvm_vcpu_check_block(vcpu) < 0)
  			break;
-@@ -2033,7 +2032,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcp
+@@ -2036,7 +2035,7 @@ void kvm_vcpu_block(struct kvm_vcpu *vcp
  		schedule();
  	}
  
@@ -394,7 +394,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  	cur = ktime_get();
  
  	kvm_arch_vcpu_unblocking(vcpu);
-@@ -2065,11 +2064,11 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu
+@@ -2068,11 +2067,11 @@ void kvm_vcpu_kick(struct kvm_vcpu *vcpu
  {
  	int me;
  	int cpu = vcpu->cpu;
@@ -409,7 +409,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  		++vcpu->stat.halt_wakeup;
  	}
  
-@@ -2170,7 +2169,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *m
+@@ -2173,7 +2172,7 @@ void kvm_vcpu_on_spin(struct kvm_vcpu *m
  				continue;
  			if (vcpu == me)
  				continue;
diff --git a/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch b/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch
index 6b61c0dfd6464..5fa0de70046dc 100644
--- a/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch
+++ b/patches/fs-dcache-use-cpu-chill-in-trylock-loops.patch
@@ -46,7 +46,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  #include <linux/slab.h>
  #include <linux/init.h>
  #include <linux/hash.h>
-@@ -589,7 +590,7 @@ static struct dentry *dentry_kill(struct
+@@ -578,7 +579,7 @@ static struct dentry *dentry_kill(struct
  
  failed:
  	spin_unlock(&dentry->d_lock);
@@ -55,7 +55,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  	return dentry; /* try again with same dentry */
  }
  
-@@ -2398,7 +2399,7 @@ void d_delete(struct dentry * dentry)
+@@ -2388,7 +2389,7 @@ void d_delete(struct dentry * dentry)
  	if (dentry->d_lockref.count == 1) {
  		if (!spin_trylock(&inode->i_lock)) {
  			spin_unlock(&dentry->d_lock);
diff --git a/patches/ftrace-migrate-disable-tracing.patch b/patches/ftrace-migrate-disable-tracing.patch
index 1c037d6d795a6..b43658e499673 100644
--- a/patches/ftrace-migrate-disable-tracing.patch
+++ b/patches/ftrace-migrate-disable-tracing.patch
@@ -48,7 +48,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
 --- a/kernel/trace/trace_events.c
 +++ b/kernel/trace/trace_events.c
-@@ -186,6 +186,8 @@ static int trace_define_common_fields(vo
+@@ -188,6 +188,8 @@ static int trace_define_common_fields(vo
  	__common_field(unsigned char, flags);
  	__common_field(unsigned char, preempt_count);
  	__common_field(int, pid);
diff --git a/patches/localversion.patch b/patches/localversion.patch
index 487209c1e1991..8a0480968fdc2 100644
--- a/patches/localversion.patch
+++ b/patches/localversion.patch
@@ -1,4 +1,4 @@
-Subject: v4.4.4-rt11
+Subject: v4.4.6-rt12
 From: Thomas Gleixner <tglx@linutronix.de>
 Date: Fri, 08 Jul 2011 20:25:16 +0200
 
@@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 --- /dev/null
 +++ b/localversion-rt
 @@ -0,0 +1 @@
-+-rt11
++-rt12
diff --git a/patches/mips-disable-highmem-on-rt.patch b/patches/mips-disable-highmem-on-rt.patch
index fd7d32e663797..f456b2566a591 100644
--- a/patches/mips-disable-highmem-on-rt.patch
+++ b/patches/mips-disable-highmem-on-rt.patch
@@ -11,7 +11,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -2409,7 +2409,7 @@ config CPU_R4400_WORKAROUNDS
+@@ -2410,7 +2410,7 @@ config CPU_R4400_WORKAROUNDS
  #
  config HIGHMEM
  	bool "High Memory Support"
diff --git a/patches/net-wireless-warn-nort.patch b/patches/net-wireless-warn-nort.patch
index 05d0332697017..688a8e0fbff4b 100644
--- a/patches/net-wireless-warn-nort.patch
+++ b/patches/net-wireless-warn-nort.patch
@@ -12,7 +12,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 
 --- a/net/mac80211/rx.c
 +++ b/net/mac80211/rx.c
-@@ -3554,7 +3554,7 @@ void ieee80211_rx_napi(struct ieee80211_
+@@ -3573,7 +3573,7 @@ void ieee80211_rx_napi(struct ieee80211_
  	struct ieee80211_supported_band *sband;
  	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
  
diff --git a/patches/x86-kvm-require-const-tsc-for-rt.patch b/patches/x86-kvm-require-const-tsc-for-rt.patch
index 0df27e3f7e2a7..5fa84b0893b12 100644
--- a/patches/x86-kvm-require-const-tsc-for-rt.patch
+++ b/patches/x86-kvm-require-const-tsc-for-rt.patch
@@ -14,7 +14,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -5789,6 +5789,13 @@ int kvm_arch_init(void *opaque)
+@@ -5788,6 +5788,13 @@ int kvm_arch_init(void *opaque)
  		goto out;
  	}