diff mbox series

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

Message ID 20230418134010.69844-1-broonie@kernel.org
State New
Headers
Series linux-next: manual merge of the tip tree with the s390 tree |

Commit Message

Mark Brown April 18, 2023, 1:40 p.m. UTC 
  Hi all,

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

  arch/s390/kernel/setup.c

between commit:

  944c78376a39b ("s390: use init_thread_union aka initial stack for the first process")

from the s390 tree and commit:

  9ea7e6b62c2bd ("init: Mark [arch_call_]rest_init() __noreturn")

from the tip tree.

I fixed it up (see below) 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.

+++ b/arch/s390/kernel/setup.c
diff mbox series

Patch

diff --cc arch/s390/kernel/setup.c
index 0903fe3566341,4259b6c505163..0000000000000
--- a/arch/s390/kernel/setup.c