diff mbox series

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

Message ID 20230731093724.1c75858d@canb.auug.org.au
State New
Headers
Series linux-next: manual merge of the s390 tree with the mm tree |

Commit Message

Stephen Rothwell July 30, 2023, 11:37 p.m. UTC 
  Hi all,

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

  arch/s390/Kconfig

between commits:

  e86a64d19d20 ("s390/kexec: refactor for kernel/Kconfig.kexec")
  54d5daef8143 ("kexec: rename ARCH_HAS_KEXEC_PURGATORY")

from the mm tree and commits:

  8cf57d7217c3 ("s390: add support for user-defined certificates")
  37002bc6b603 ("docs: move s390 under arch")
  b90a64caf844 ("s390/cert_store: select CRYPTO_LIB_SHA256")

from the s390 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.
diff mbox series

Patch

diff --cc arch/s390/Kconfig
index 42c98931de2c,18bf754e1fad..000000000000
--- a/arch/s390/Kconfig