From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>
Cc: Mark Brown <broonie@kernel•org>,
ARM <linux-arm-kernel@lists•infradead.org>,
Jonathan Cameron <Jonathan.Cameron@huawei•com>,
Linus Walleij <linus.walleij@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: Re: linux-next: manual merge of the spi tree with the arm-soc tree
Date: Wed, 23 Mar 2022 09:03:37 +1100 [thread overview]
Message-ID: <20220323090337.58419e7f@canb.auug.org.au> (raw)
In-Reply-To: <20220301143136.7489cab5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 948 bytes --]
Hi all,
On Tue, 1 Mar 2022 14:31:36 +1100 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the spi tree got a conflict in:
>
> arch/arm/mach-pxa/stargate2.c
>
> between commit:
>
> 28f74201e37c ("ARM: pxa: remove Intel Imote2 and Stargate 2 boards")
>
> from the arm-soc tree and commit:
>
> 31455bbda208 ("spi: pxa2xx_spi: Convert to use GPIO descriptors")
>
> from the spi tree.
>
> I fixed it up (I just 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.
This is now a conflict between the arm-soc tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2022-03-22 22:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-01 3:31 linux-next: manual merge of the spi tree with the arm-soc tree Stephen Rothwell
2022-03-22 22:03 ` Stephen Rothwell [this message]
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=20220323090337.58419e7f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Jonathan.Cameron@huawei$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=broonie@kernel$(echo .)org \
--cc=linus.walleij@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