linux-next: manual merge of the gpio-brgl tree with the mfd tree

linux-next: manual merge of the gpio-brgl tree with the mfd tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]

Hi all,

Today's linux-next merge of the gpio-brgl tree got a conflict in:

  MAINTAINERS

between commit:

  8c13787893fde ("mfd: Add core driver for Nuvoton NCT6694")

from the mfd tree and commits:

  51dad33ede636 ("mfd: Add core driver for Nuvoton NCT6694")
  611a995e8ae1a ("gpio: Add Nuvoton NCT6694 GPIO support")
  197e779d29d87 ("hwmon: Add Nuvoton NCT6694 HWMON support")
  c5cf27dbaeb6e ("i2c: Add Nuvoton NCT6694 I2C support")
  8a204684d0ffd ("can: Add Nuvoton NCT6694 CANFD support")
  d463bb1405836 ("rtc: Add Nuvoton NCT6694 RTC support")
  f9d737a7d84ff ("watchdog: Add Nuvoton NCT6694 WDT support")

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 55288f2ffb6b3,681fbc8258052..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the gpio-brgl tree with the mfd tree

[Lee Jones]

On Mon, 22 Sep 2025, Mark Brown wrote:

> Hi all,
> 
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
> 
>   MAINTAINERS
> 
> between commit:
> 
>   8c13787893fde ("mfd: Add core driver for Nuvoton NCT6694")
> 
> from the mfd tree and commits:
> 
>   51dad33ede636 ("mfd: Add core driver for Nuvoton NCT6694")
>   611a995e8ae1a ("gpio: Add Nuvoton NCT6694 GPIO support")
>   197e779d29d87 ("hwmon: Add Nuvoton NCT6694 HWMON support")
>   c5cf27dbaeb6e ("i2c: Add Nuvoton NCT6694 I2C support")
>   8a204684d0ffd ("can: Add Nuvoton NCT6694 CANFD support")
>   d463bb1405836 ("rtc: Add Nuvoton NCT6694 RTC support")
>   f9d737a7d84ff ("watchdog: Add Nuvoton NCT6694 WDT support")
> 
> 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 55288f2ffb6b3,681fbc8258052..0000000000000
> --- a/MAINTAINERS
> +++ b/MAINTAINERS

Missing diff?

-- 
Lee Jones [李琼斯]

Re: linux-next: manual merge of the gpio-brgl tree with the mfd tree

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 264 bytes --]

On Thu, Sep 25, 2025 at 11:38:46AM +0100, Lee Jones wrote:
> On Mon, 22 Sep 2025, Mark Brown wrote:

> > diff --cc MAINTAINERS
> > index 55288f2ffb6b3,681fbc8258052..0000000000000
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS

> Missing diff?

No changes from HEAD.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: manual merge of the gpio-brgl tree with the mfd tree

[Lee Jones]

On Thu, 25 Sep 2025, Mark Brown wrote:

> On Thu, Sep 25, 2025 at 11:38:46AM +0100, Lee Jones wrote:
> > On Mon, 22 Sep 2025, Mark Brown wrote:
> 
> > > diff --cc MAINTAINERS
> > > index 55288f2ffb6b3,681fbc8258052..0000000000000
> > > --- a/MAINTAINERS
> > > +++ b/MAINTAINERS
> 
> > Missing diff?
> 
> No changes from HEAD.

*thumbs up*

-- 
Lee Jones [李琼斯]