From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>,
ARM <linux-arm-kernel@lists.infradead.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nikita Shubin <nikita.shubin@maquefel.me>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the arm-soc tree
Date: Thu, 19 Sep 2024 10:15:24 +1000 [thread overview]
Message-ID: <20240919101524.55472e9d@canb.auug.org.au> (raw)
In-Reply-To: <20240912174842.57a43921@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1014 bytes --]
Hi all,
On Thu, 12 Sep 2024 17:48:42 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> arch/arm/mach-ep93xx/vision_ep9307.c
>
> between commit:
>
> 3e0bae7f35c9 ("ARM: ep93xx: delete all boardfiles")
>
> from the arm-soc tree and commits:
>
> 4b2b0a2ce815 ("gpiolib: legacy: Kill GPIOF_INIT_* definitions")
> 8c045ca534d0 ("gpiolib: legacy: Kill GPIOF_DIR_* definitions")
>
> from the gpio-brgl 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.
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 --]
next prev parent reply other threads:[~2024-09-19 0:15 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-09-12 7:48 linux-next: manual merge of the gpio-brgl tree with the arm-soc tree Stephen Rothwell
2024-09-12 12:10 ` Arnd Bergmann
2024-09-13 9:46 ` Andy Shevchenko
2024-09-19 0:15 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-30 4:19 Stephen Rothwell
2023-05-30 9:28 ` Arnd Bergmann
2023-05-30 9:35 ` Bartosz Golaszewski
2023-05-30 9:49 ` Linus Walleij
2021-01-28 6:03 Stephen Rothwell
2021-02-09 10:01 ` Geert Uytterhoeven
2021-02-09 11:35 ` Arnd Bergmann
2021-02-10 5:33 ` nobuhiro1.iwamatsu
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=20240919101524.55472e9d@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=bartosz.golaszewski@linaro.org \
--cc=brgl@bgdev.pl \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nikita.shubin@maquefel.me \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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