fix up the duplicate lock_down patch issue

diff --git a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch b/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch
deleted file mode 100644 (file)
index 18ab633..0000000
--- a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6314481a8b7a4564d9a91e0e6e60a9cccb48951a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Jan 2019 23:03:25 -0500
-Subject: locking/lockdep: Add debug_locks check in __lock_downgrade()
-
-From: Waiman Long <longman@redhat.com>
-
-[ Upstream commit 513e1073d52e55b8024b4f238a48de7587c64ccf ]
-
-Tetsuo Handa had reported he saw an incorrect "downgrading a read lock"
-warning right after a previous lockdep warning. It is likely that the
-previous warning turned off lock debugging causing the lockdep to have
-inconsistency states leading to the lock downgrade warning.
-
-Fix that by add a check for debug_locks at the beginning of
-__lock_downgrade().
-
-Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
-Reported-by: syzbot+53383ae265fb161ef488@syzkaller.appspotmail.com
-Signed-off-by: Waiman Long <longman@redhat.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Will Deacon <will.deacon@arm.com>
-Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/locking/lockdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 565005a3b8f05..5c370c68466c6 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -3650,6 +3650,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
-       unsigned int depth;
-       int i;
- 
-+      if (unlikely(!debug_locks))
-+              return 0;
-+
-       depth = curr->lockdep_depth;
-       /*
-        * This function is about (re)setting the class of a held lock,
--- 
-2.20.1
-

diff --git a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091 b/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091
index 0631731daf5dd3d4645cfad0e4c3fb237a91a4a2..2ae81e9ea4863b488a497fef2cc97f1ecf57f155 100644 (file)
--- a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091
+++ b/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091
@@ -29,15 +29,14 @@ Cc: Will Deacon <will.deacon@arm.com>
 Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- kernel/locking/lockdep.c | 3 +++
+ kernel/locking/lockdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 5c370c68466c6..bc29eae549d36 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -3691,6 +3691,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
+@@ -3688,6 +3688,9 @@ static int __lock_downgrade(struct lockd
        unsigned int depth;
        int i;
  
@@ -47,6 +46,3 @@ index 5c370c68466c6..bc29eae549d36 100644
        depth = curr->lockdep_depth;
        /*
         * This function is about (re)setting the class of a held lock,
--- 
-2.20.1
-

diff --git a/queue-4.14/series b/queue-4.14/series
index 9760f8671f5c97eef9738cf2f7f08caa8bbd4396..5c798f4709a7a640b0be6a55cc229d2a85784f26 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -18,7 +18,6 @@ objtool-clobber-user-cflags-variable.patch
 tpm-fix-tpm-1.2-shutdown-sequence-to-prevent-future-.patch
 pinctrl-sprd-use-define-directive-for-sprd_pinconf_p.patch
 power-supply-sysfs-ratelimit-property-read-error-mes.patch
-locking-lockdep-add-debug_locks-check-in-__lock_down.patch
 locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091
 irqchip-gic-v3-its-fix-lpi-release-for-multi-msi-dev.patch
 f2fs-check-all-the-data-segments-against-all-node-on.patch

diff --git a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch b/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch
deleted file mode 100644 (file)
index 52ff81c..0000000
--- a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 625182f17e4aee5244398822487dc6dee83a548e Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 9 Jan 2019 23:03:25 -0500
-Subject: locking/lockdep: Add debug_locks check in __lock_downgrade()
-
-From: Waiman Long <longman@redhat.com>
-
-[ Upstream commit 513e1073d52e55b8024b4f238a48de7587c64ccf ]
-
-Tetsuo Handa had reported he saw an incorrect "downgrading a read lock"
-warning right after a previous lockdep warning. It is likely that the
-previous warning turned off lock debugging causing the lockdep to have
-inconsistency states leading to the lock downgrade warning.
-
-Fix that by add a check for debug_locks at the beginning of
-__lock_downgrade().
-
-Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
-Reported-by: syzbot+53383ae265fb161ef488@syzkaller.appspotmail.com
-Signed-off-by: Waiman Long <longman@redhat.com>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Cc: Andrew Morton <akpm@linux-foundation.org>
-Cc: Linus Torvalds <torvalds@linux-foundation.org>
-Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
-Cc: Peter Zijlstra <peterz@infradead.org>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Will Deacon <will.deacon@arm.com>
-Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com
-Signed-off-by: Ingo Molnar <mingo@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- kernel/locking/lockdep.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index e810e8cb17e18..68ba411a90075 100644
---- a/kernel/locking/lockdep.c
-+++ b/kernel/locking/lockdep.c
-@@ -3567,6 +3567,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name,
-       unsigned int depth;
-       int i;
- 
-+      if (unlikely(!debug_locks))
-+              return 0;
-+
-       depth = curr->lockdep_depth;
-       /*
-        * This function is about (re)setting the class of a held lock,
--- 
-2.20.1
-

diff --git a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969 b/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969
index 7570c8b1e39f55235bacd101eb4f7797503a859d..39e6471d066b6d78efb8dd33445c67bb9c579ac6 100644 (file)
--- a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969
+++ b/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969
@@ -29,15 +29,14 @@ Cc: Will Deacon <will.deacon@arm.com>
 Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com
 Signed-off-by: Ingo Molnar <mingo@kernel.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- kernel/locking/lockdep.c | 3 +++
+ kernel/locking/lockdep.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
-index 68ba411a90075..1c8e5d186ad64 100644
 --- a/kernel/locking/lockdep.c
 +++ b/kernel/locking/lockdep.c
-@@ -3608,6 +3608,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip)
+@@ -3605,6 +3605,9 @@ static int __lock_downgrade(struct lockd
        unsigned int depth;
        int i;
  
@@ -47,6 +46,3 @@ index 68ba411a90075..1c8e5d186ad64 100644
        depth = curr->lockdep_depth;
        /*
         * This function is about (re)setting the class of a held lock,
--- 
-2.20.1
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 4f816cf078d40c674193557954f93671f6eb74dc..e5a8c7f367dda1b46af9b2c8ff03ff332d3f4276 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -33,7 +33,6 @@ objtool-clobber-user-cflags-variable.patch
 tpm-fix-tpm-1.2-shutdown-sequence-to-prevent-future-.patch
 pinctrl-sprd-use-define-directive-for-sprd_pinconf_p.patch
 power-supply-sysfs-ratelimit-property-read-error-mes.patch
-locking-lockdep-add-debug_locks-check-in-__lock_down.patch
 locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969
 scsi-qla2xxx-turn-off-iocb-timeout-timer-on-iocb-com.patch
 scsi-qla2xxx-remove-all-rports-if-fabric-scan-retry-.patch