From b6ad11fd57d5fd204a34a2091d534ca1a7d23869 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Aug 2024 18:06:48 +1000
Subject: [PATCH] make_summ: update for fs-next tree

---
 make_summ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/make_summ b/make_summ
index d7fb6ee..62efc85 100755
--- a/make_summ
+++ b/make_summ
@@ -2,6 +2,6 @@
 
 tr '\r' '\n' <merge.log |
 	grep -E -a '^(\[|  )|(git (cherry|rm|reset|checkout|quiltimport|merge --abort|rebase))|Merging|Applying|CONFLICT|Revert|Created commit|dropping' |
-	grep -E -a -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[master [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
+	grep -E -a -v 'reset HEAD\^|^Created commit [0-9a-f]*: Merge (branch|commit)|mark the corrected paths|HEAD is now at|^\[(master|fs-next) [0-9a-f]*\] (Merge( remote(-tracking)?)? branch|[0-9]*/)|^hint:|-Revert' >summ
 
 exit 0
-- 
2.39.5