[ANNOUNCE] 4.8.2-rt2v4.8.2-rt2-patches

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

4 files changed, 2 insertions, 51 deletions

diff --git a/patches/Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch b/patches/Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch
deleted file mode 100644
index 0f0bd690a77b..000000000000
--- a/patches/Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Linus Torvalds <torvalds@linux-foundation.org>
-Date: Mon, 3 Oct 2016 21:03:48 -0700
-Subject: [PATCH] Using BUG_ON() as an assert() is _never_ acceptable
-
-Upstream commit 21f54ddae449f4bdd9f1498124901d67202243d9
-
-That just generally kills the machine, and makes debugging only much
-harder, since the traces may long be gone.
-
-Debugging by assert() is a disease.  Don't do it.  If you can continue,
-you're much better off doing so with a live machine where you have a
-much higher chance that the report actually makes it to the system logs,
-rather than result in a machine that is just completely dead.
-
-The only valid situation for BUG_ON() is when continuing is not an
-option, because there is massive corruption.  But if you are just
-verifying that something is true, you warn about your broken assumptions
-(preferably just once), and limp on.
-
-Fixes: 22f2ac51b6d6 ("mm: workingset: fix crash in shadow node shrinker caused by replace_page_cache_page()")
-Cc: Johannes Weiner <hannes@cmpxchg.org>
-Cc: Miklos Szeredi <miklos@szeredi.hu>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
----
- include/linux/swap.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- a/include/linux/swap.h
-+++ b/include/linux/swap.h
-@@ -257,7 +257,7 @@ static inline void workingset_node_pages
- 
- static inline void workingset_node_pages_dec(struct radix_tree_node *node)
- {
--	VM_BUG_ON(!workingset_node_pages(node));
-+	VM_WARN_ON_ONCE(!workingset_node_pages(node));
- 	node->count--;
- }
- 
-@@ -273,7 +273,7 @@ static inline void workingset_node_shado
- 
- static inline void workingset_node_shadows_dec(struct radix_tree_node *node)
- {
--	VM_BUG_ON(!workingset_node_shadows(node));
-+	VM_WARN_ON_ONCE(!workingset_node_shadows(node));
- 	node->count -= 1U << RADIX_TREE_COUNT_SHIFT;
- }
- 
diff --git a/patches/localversion.patch b/patches/localversion.patch
index a02382e6df70..279489a1d145 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 @@
-+-rt1
++-rt2
diff --git a/patches/series b/patches/series
index 6e769c6a538d..b9a9e83cf5e9 100644
--- a/patches/series
+++ b/patches/series
@@ -1,7 +1,6 @@
 ###########################################################
 # DELTA against a known Linus release
 ###########################################################
-Using-BUG_ON-as-an-assert-is-_never_-acceptable.patch
 mm-filemap-don-t-plant-shadow-entries-without-radix-.patch
 mm-filemap-fix-mapping-nrpages-double-accounting-in-.patch
 
diff --git a/patches/timekeeping-split-jiffies-lock.patch b/patches/timekeeping-split-jiffies-lock.patch
index ec12aae229a5..d7dbc04ebe03 100644
--- a/patches/timekeeping-split-jiffies-lock.patch
+++ b/patches/timekeeping-split-jiffies-lock.patch
@@ -129,7 +129,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  	if (rcu_needs_cpu(basemono, &next_rcu) ||
 --- a/kernel/time/timekeeping.c
 +++ b/kernel/time/timekeeping.c
-@@ -2325,8 +2325,10 @@ EXPORT_SYMBOL(hardpps);
+@@ -2328,8 +2328,10 @@ EXPORT_SYMBOL(hardpps);
   */
  void xtime_update(unsigned long ticks)
  {