From: Alain Volmat <avolmat@me.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Mark Brown <broonie@kernel.org>, Wolfram Sang <wsa@the-dreams.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Wolfram Sang <wsa@kernel.org>
Subject: Re: linux-next: manual merge of the spi tree with the i2c tree
Date: Thu, 16 Feb 2023 20:48:02 +0100 [thread overview]
Message-ID: <Y+6IcubsNszRK/59@imac101> (raw)
In-Reply-To: <20230216113035.3050871a@canb.auug.org.au>
Hi,
sorry for the mistake. I should have made a serie with those
2 patches in order to avoid this conflict. Sorry about that.
I know now for a next case.
Cheers
Alain
On Thu, Feb 16, 2023 at 11:30:35AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the spi tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> b3de755d6041 ("dt-bindings: i2c: i2c-st: convert to DT schema")
>
> from the i2c tree and commit:
>
> 7ec844a2c753 ("spi: spi-st-ssc: convert to DT schema")
>
> from the spi 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.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc MAINTAINERS
> index 71e92d3c51c6,daa33e7bb457..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2791,7 -2925,8 +2791,8 @@@ M: Patrice Chotard <patrice.chotard@fos
> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
> S: Maintained
> W: http://www.stlinux.com
> + F: Documentation/devicetree/bindings/spi/st,ssc-spi.yaml
> -F: Documentation/devicetree/bindings/i2c/i2c-st.txt
> +F: Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml
> F: arch/arm/boot/dts/sti*
> F: arch/arm/mach-sti/
> F: drivers/ata/ahci_st.c
next prev parent reply other threads:[~2023-02-16 19:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-16 0:30 linux-next: manual merge of the spi tree with the i2c tree Stephen Rothwell
2023-02-16 19:48 ` Alain Volmat [this message]
2023-02-17 0:12 ` Mark Brown
2023-02-21 9:11 ` Geert Uytterhoeven
2023-02-21 16:57 ` Alain Volmat
2023-02-21 17:04 ` Mark Brown
2023-02-23 0:58 ` 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=Y+6IcubsNszRK/59@imac101 \
--to=avolmat@me.com \
--cc=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=wsa@kernel.org \
--cc=wsa@the-dreams.de \
/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