[ANNOUNCE] v4.16.15-rt6v4.16.15-rt6-patches

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

4 files changed, 15 insertions, 46 deletions

diff --git a/patches/0001-iommu-amd-Take-into-account-that-alloc_dev_data-may-.patch b/patches/0001-iommu-amd-Take-into-account-that-alloc_dev_data-may-.patch
deleted file mode 100644
index 050625385284..000000000000
--- a/patches/0001-iommu-amd-Take-into-account-that-alloc_dev_data-may-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Date: Thu, 22 Mar 2018 16:22:33 +0100
-Subject: [PATCH 01/10] iommu/amd: Take into account that alloc_dev_data() may
- return NULL
-
-Upstream commit 39ffe39545cd5cb5b8cee9f0469165cf24dc62c2
-
-find_dev_data() does not check whether the return value alloc_dev_data()
-is NULL. This was okay once because the pointer was returned once as-is.
-Since commit df3f7a6e8e85 ("iommu/amd: Use is_attach_deferred
-call-back") the pointer may be used within find_dev_data() so a NULL
-check is required.
-
-Cc: Baoquan He <bhe@redhat.com>
-Fixes: df3f7a6e8e85 ("iommu/amd: Use is_attach_deferred call-back")
-Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
-Signed-off-by: Joerg Roedel <jroedel@suse.de>
----
- drivers/iommu/amd_iommu.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/iommu/amd_iommu.c
-+++ b/drivers/iommu/amd_iommu.c
-@@ -310,6 +310,8 @@ static struct iommu_dev_data *find_dev_d
- 
- 	if (dev_data == NULL) {
- 		dev_data = alloc_dev_data(devid);
-+		if (!dev_data)
-+			return NULL;
- 
- 		if (translation_pre_enabled(iommu))
- 			dev_data->defer_attach = true;
diff --git a/patches/0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch b/patches/0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch
index 07cee4492252..8345f242bf63 100644
--- a/patches/0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch
+++ b/patches/0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch
@@ -177,7 +177,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  	}
  }
  EXPORT_SYMBOL_GPL(event_triggers_post_call);
-@@ -909,7 +910,8 @@ void set_named_trigger_data(struct event
+@@ -911,7 +912,8 @@ void set_named_trigger_data(struct event
  }
  
  static void
@@ -187,7 +187,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	if (tracing_is_on())
  		return;
-@@ -918,7 +920,8 @@ traceon_trigger(struct event_trigger_dat
+@@ -920,7 +922,8 @@ traceon_trigger(struct event_trigger_dat
  }
  
  static void
@@ -197,7 +197,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	if (tracing_is_on())
  		return;
-@@ -933,7 +936,8 @@ traceon_count_trigger(struct event_trigg
+@@ -935,7 +938,8 @@ traceon_count_trigger(struct event_trigg
  }
  
  static void
@@ -207,7 +207,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	if (!tracing_is_on())
  		return;
-@@ -942,7 +946,8 @@ traceoff_trigger(struct event_trigger_da
+@@ -944,7 +948,8 @@ traceoff_trigger(struct event_trigger_da
  }
  
  static void
@@ -217,7 +217,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	if (!tracing_is_on())
  		return;
-@@ -1039,13 +1044,15 @@ static struct event_command trigger_trac
+@@ -1041,7 +1046,8 @@ static struct event_command trigger_trac
  
  #ifdef CONFIG_TRACER_SNAPSHOT
  static void
@@ -225,7 +225,9 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
 +snapshot_trigger(struct event_trigger_data *data, void *rec,
 +		 struct ring_buffer_event *event)
  {
- 	tracing_snapshot();
+ 	struct trace_event_file *file = data->private_data;
+ 
+@@ -1052,7 +1058,8 @@ snapshot_trigger(struct event_trigger_da
  }
  
  static void
@@ -235,7 +237,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	if (!data->count)
  		return;
-@@ -1053,7 +1060,7 @@ snapshot_count_trigger(struct event_trig
+@@ -1060,7 +1067,7 @@ snapshot_count_trigger(struct event_trig
  	if (data->count != -1)
  		(data->count)--;
  
@@ -244,7 +246,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  static int
-@@ -1141,13 +1148,15 @@ static __init int register_trigger_snaps
+@@ -1148,13 +1155,15 @@ static __init int register_trigger_snaps
  #endif
  
  static void
@@ -262,7 +264,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	if (!data->count)
  		return;
-@@ -1155,7 +1164,7 @@ stacktrace_count_trigger(struct event_tr
+@@ -1162,7 +1171,7 @@ stacktrace_count_trigger(struct event_tr
  	if (data->count != -1)
  		(data->count)--;
  
@@ -271,7 +273,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  }
  
  static int
-@@ -1217,7 +1226,8 @@ static __init void unregister_trigger_tr
+@@ -1224,7 +1233,8 @@ static __init void unregister_trigger_tr
  }
  
  static void
@@ -281,7 +283,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	struct enable_trigger_data *enable_data = data->private_data;
  
-@@ -1228,7 +1238,8 @@ event_enable_trigger(struct event_trigge
+@@ -1235,7 +1245,8 @@ event_enable_trigger(struct event_trigge
  }
  
  static void
@@ -291,7 +293,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
  {
  	struct enable_trigger_data *enable_data = data->private_data;
  
-@@ -1242,7 +1253,7 @@ event_enable_count_trigger(struct event_
+@@ -1249,7 +1260,7 @@ event_enable_count_trigger(struct event_
  	if (data->count != -1)
  		(data->count)--;
  
diff --git a/patches/localversion.patch b/patches/localversion.patch
index 72cdd2b3c760..4c1841b6475d 100644
--- a/patches/localversion.patch
+++ b/patches/localversion.patch
@@ -10,4 +10,4 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
 --- /dev/null
 +++ b/localversion-rt
 @@ -0,0 +1 @@
-+-rt5
++-rt6
diff --git a/patches/series b/patches/series
index 04b8a910b519..34925984b662 100644
--- a/patches/series
+++ b/patches/series
@@ -9,7 +9,6 @@
 0001-iommu-amd-Use-raw-locks-on-atomic-context-paths.patch
 0002-iommu-amd-Don-t-use-dev_data-in-irte_ga_set_affinity.patch
 0003-iommu-amd-Avoid-locking-get_irq_table-from-atomic-co.patch
-0001-iommu-amd-Take-into-account-that-alloc_dev_data-may-.patch
 0002-iommu-amd-Turn-dev_data_list-into-a-lock-less-list.patch
 0003-iommu-amd-Split-domain-id-out-of-amd_iommu_devtable_.patch
 0004-iommu-amd-Split-irq_lookup_table-out-of-the-amd_iomm.patch