From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev•pl>, Jonathan Corbet <corbet@lwn•net>
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Rob Herring (Arm)" <robh@kernel•org>,
Xose Vazquez Perez <xose.vazquez@gmail•com>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with Linus' tree and the jc_docs tree
Date: Wed, 30 Jul 2025 09:12:52 +1000 [thread overview]
Message-ID: <20250730091252.42ef36a4@canb.auug.org.au> (raw)
In-Reply-To: <20250718190551.6f250af5@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1704 bytes --]
Hi all,
On Fri, 18 Jul 2025 19:05:51 +1000 Stephen Rothwell <sfr@canb•auug.org.au> wrote:
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> edb471108cf1 ("MAINTAINERS: remove bouncing address for Nandor Han")
>
> from Linus' tree, commit:
>
> 739ca710a777 ("MAINTAINERS: replace git protocol for github")
>
> from the jc_docs tree and commits:
>
> ae455b249449 ("dt-bindings: gpio: Convert qca,ar7100-gpio to DT schema")
> f03a7f20b23c ("dt-bindings: gpio: Create a trivial GPIO schema")
>
> from the gpio-brgl 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 --cc MAINTAINERS
> index caf590460070,971ee194ee83..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -3871,8 -3814,8 +3870,8 @@@ ATHEROS 71XX/9XXX GPIO DRIVE
> M: Alban Bedel <albeu@free•fr>
> S: Maintained
> W: https://github.com/AlbanBedel/linux
> -T: git git://github.com/AlbanBedel/linux
> +T: git https://github.com/AlbanBedel/linux.git
> - F: Documentation/devicetree/bindings/gpio/gpio-ath79.txt
> + F: Documentation/devicetree/bindings/gpio/qca,ar7100-gpio.yaml
> F: drivers/gpio/gpio-ath79.c
>
> ATHEROS 71XX/9XXX USB PHY DRIVER
This is now a conflict between the jc_docs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2025-07-29 23:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-18 9:05 linux-next: manual merge of the gpio-brgl tree with Linus' tree and the jc_docs tree Stephen Rothwell
2025-07-29 23:12 ` 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=20250730091252.42ef36a4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bartosz.golaszewski@linaro$(echo .)org \
--cc=brgl@bgdev$(echo .)pl \
--cc=corbet@lwn$(echo .)net \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=robh@kernel$(echo .)org \
--cc=xose.vazquez@gmail$(echo .)com \
/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