Skip to contentSkip to conversation

perf-tools-update-expected-diff-for-lib-list_sortc.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Nov 6, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: perf tools: update expected diff for lib/list_sort.c
has been removed from the -mm tree. Its filename was
perf-tools-update-expected-diff-for-lib-list_sortc.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kuan-Wei Chiu <[email protected]>
Subject: perf tools: update expected diff for lib/list_sort.c
Date: Sat, 12 Oct 2024 12:28:28 +0800

Since there are no longer any header include differences between lib/list_sort.c and tools/lib/list_sort.c, update the expected diff in check-header_ignore_hunks accordingly.

Cc Adrian Hunter <[email protected]>
Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Ching-Chun (Jim) Huang <[email protected]>
Cc Ian Rogers <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc "Liang, Kan" <[email protected]>
Cc Mark Rutland <[email protected]>
Cc Peter Zijlstra <[email protected]>

---

 tools/perf/check-header_ignore_hunks/lib/list_sort.c |   11 +---------
 1 file changed, 2 insertions(+), 9 deletions(-)
tools/perf/check-header_ignore_hunks/lib/list_sort.c renamed from tools/perf/check-header_ignore_hunks/lib/list_sort.c~perf-tools-update-expected-diff-for-lib-list_sortc +2 -9
@@ -1,11 +1,4 @@
-@@ -1,5 +1,6 @@
- // SPDX-License-Identifier: GPL-2.0
- #include <linux/kernel.h>
-+#include <linux/bug.h>
- #include <linux/compiler.h>
- #include <linux/export.h>
- #include <linux/string.h>
-@@ -52,6 +53,7 @@
+@@ -50,6 +50,7 @@
  			struct list_head *a, struct list_head *b)
  {
  	struct list_head *tail = head;
@@ -13,7 +6,7 @@
  
  	for (;;) {
  		/* if equal, take 'a' -- important for sort stability */
-@@ -77,6 +79,15 @@
+@@ -75,6 +76,15 @@
  	/* Finish linking remainder of list b on to tail */
  	tail->next = b;
  	do {

_

Patches currently in -mm which might be from [email protected] are