From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro•org>
Cc: ARM <linux-arm-kernel@lists•infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the arm-soc tree with the samsung-krzk-fixes tree
Date: Fri, 22 Apr 2022 09:07:10 +1000 [thread overview]
Message-ID: <20220422090710.5d947170@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 758 bytes --]
Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in:
arch/arm/Kconfig
between commit:
436ce66003d5 ("ARM: s3c: mark as deprecated and schedule removal")
from the samsung-krzk-fixes tree and commit:
b59e8a5fd321 ("[TO BE REBASED] ARM: omap1: enable multiplatform")
from the arm-soc tree.
I fixed it up (I just used the latter) 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 --]
next reply other threads:[~2022-04-21 23:07 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-21 23:07 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-04-19 23:42 linux-next: manual merge of the arm-soc tree with the samsung-krzk-fixes tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220422090710.5d947170@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=krzysztof.kozlowski@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox