Skip to contentSkip to conversation

linux-next: manual merge of the hwmon-staging tree with the i2c tree

DISCUSSION Stephen Rothwell 2 participants 3 messages Feb 19, 2023 – Feb 22, 2023 Linux-next tree

lore
Share & tools
lore
#0 lore raw

Hi all,

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.

Signature · 25 lines
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 <[email protected]>
  M:	Nick Hawkins <[email protected]>
  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
#1 lore raw

Hi all,

Quoted 39 lines · On Mon, 20 Feb 2023 09:07:24 +1100 Stephen Rothwell <[email protected]>…

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.

Signature · 2 lines
Cheers,
Stephen Rothwell
MAINTAINERS +2 -0
diff --cc MAINTAINERS
index a58c22a7adc8,98e16168d6e9..000000000000
@@@ -2232,15 -2280,16 +2232,18 @@@ ARM/HPE GXP ARCHITECTUR
  M:	Jean-Marie Verdun <[email protected]>
  M:	Nick Hawkins <[email protected]>
  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

MAINTAINERS

Quoted 10 lines
MAINTAINERS +1 -0
  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.

Signature · 2 lines
Cheers,
Stephen Rothwell
#2 lore raw
Quoted 46 lines · Stephen Rothwell

Hi all,

Quoted 43 lines · On Mon, 20 Feb 2023 09:07:24 +1100 Stephen Rothwell <[email protected]>…

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.

Signature · 2 lines
Cheers,
Stephen Rothwell
MAINTAINERS +2 -0
diff --cc MAINTAINERS
index a58c22a7adc8,98e16168d6e9..000000000000
@@@ -2232,15 -2280,16 +2232,18 @@@ ARM/HPE GXP ARCHITECTUR
   M:	Jean-Marie Verdun <[email protected]>
   M:	Nick Hawkins <[email protected]>
   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/
Quoted 9 lines
Quoted 6 lines

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.

I mentioned the potential conflict in my pull request, so Linus should be aware of it when he applies the i2c changes.

Guenter