From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: Guenter Roeck <linux@roeck-us.net>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Nick Hawkins <nick.hawkins@hpe.com>,
Wolfram Sang <wsa@kernel.org>
Subject: Re: linux-next: manual merge of the hwmon-staging tree with the i2c tree
Date: Thu, 23 Feb 2023 10:30:18 +1100 [thread overview]
Message-ID: <20230223103018.08088e0c@canb.auug.org.au> (raw)
In-Reply-To: <20230220090724.6c3d6f87@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1897 bytes --]
Hi all,
On Mon, 20 Feb 2023 09:07:24 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the hwmon-staging tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> e8444bb9fd77 ("MAINTAINERS: Add HPE GXP I2C Support")
>
> from the i2c tree and commit:
>
> d5f80ff774d1 ("MAINTAINERS: add gxp fan controller and documents")
>
> from the hwmon-staging 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 a58c22a7adc8,98e16168d6e9..000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@@ -2232,15 -2280,16 +2232,18 @@@ ARM/HPE GXP ARCHITECTUR
> M: Jean-Marie Verdun <verdun@hpe.com>
> M: Nick Hawkins <nick.hawkins@hpe.com>
> S: Maintained
> + F: Documentation/hwmon/gxp-fan-ctrl.rst
> F: Documentation/devicetree/bindings/arm/hpe,gxp.yaml
> + F: Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml
> +F: Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml
> F: Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml
> F: Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml
> F: arch/arm/boot/dts/hpe-bmc*
> F: arch/arm/boot/dts/hpe-gxp*
> F: arch/arm/mach-hpe/
> F: drivers/clocksource/timer-gxp.c
> + F: drivers/hwmon/gxp-fan-ctrl.c
> +F: drivers/i2c/busses/i2c-gxp.c
> F: drivers/spi/spi-gxp.c
> F: drivers/watchdog/gxp-wdt.c
>
This is now a conflict between the i2c 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:[~2023-02-22 23:30 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-19 22:07 linux-next: manual merge of the hwmon-staging tree with the i2c tree Stephen Rothwell
2023-02-22 23:30 ` Stephen Rothwell [this message]
2023-02-22 23:43 ` Guenter Roeck
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=20230223103018.08088e0c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=nick.hawkins@hpe.com \
--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