* linux-next: manual merge of the arm-soc tree with the mm tree
@ 2023-04-05 0:19 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2023-04-05 0:19 UTC (permalink / raw)
To: Olof Johansson, Arnd Bergmann, Andrew Morton
Cc: ARM, Kirill A. Shutemov, Linux Kernel Mailing List,
Linux Next Mailing List, Neil Armstrong
[-- Attachment #1: Type: text/plain, Size: 738 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/configs/oxnas_v6_defconfig
between commit:
78f42d6994c1 ("mm, treewide: redefine MAX_ORDER sanely")
from the mm tree and commit:
fc746270c2a5 ("ARM: configs: remove oxnas_v6_defconfig")
from the arm-soc tree.
I fixed it up (I removed the file) 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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2023-04-05 0:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-04-05 0:19 linux-next: manual merge of the arm-soc tree with the mm tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox