linux-next: manual merge of the tip tree with the btrfs tree

linux-next: manual merge of the tip tree with the btrfs tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1764 bytes --]

Hi all,

FIXME: Add owner of second tree to To:
       Add author(s)/SOB of conflicting commits.

Today's linux-next merge of the tip tree got a conflict in:

  tools/objtool/check.c

between commit:

  7e786ec9bdaa ("btrfs: print assertion failure report and stack trace from the same line")

from the btrfs tree and commit:

  6245ce4ab670 ("objtool: Move noreturn function list to separate file")

from the tip tree.

I fixed it up (I used the letter version of this file and applied the
following patch) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging.  You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 9 Jun 2023 12:02:56 +1000
Subject: [PATCH] fix up for "objtool: Move noreturn function list to separate file"

interacting with "btrfs: print assertion failure report and stack trace from the same line"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 tools/objtool/noreturns.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/objtool/noreturns.h b/tools/objtool/noreturns.h
index 1514e84d5cc4..e45c7cb1d5bc 100644
--- a/tools/objtool/noreturns.h
+++ b/tools/objtool/noreturns.h
@@ -14,7 +14,6 @@ NORETURN(__stack_chk_fail)
 NORETURN(__ubsan_handle_builtin_unreachable)
 NORETURN(arch_call_rest_init)
 NORETURN(arch_cpu_idle_dead)
-NORETURN(btrfs_assertfail)
 NORETURN(cpu_bringup_and_idle)
 NORETURN(cpu_startup_entry)
 NORETURN(do_exit)
-- 
2.39.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]