linux-next: manual merge of the backlight tree with the arm-soc-fixes tree

linux-next: manual merge of the backlight tree with the arm-soc-fixes tree

[Stephen Rothwell]

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

Hi all,

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

  MAINTAINERS

between commit:

  4fa911d2d4cf ("MAINTAINERS: Add apple-spi driver & binding files")

from the arm-soc-fixes tree and commit:

  d1ebaf003a06 ("MAINTAINERS: Add entries for Apple DWI backlight controller")

from the backlight 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 55e367614f61,a576324807f5..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2266,7 -2254,7 +2267,8 @@@ F:	drivers/nvmem/apple-efuses.
  F:	drivers/pinctrl/pinctrl-apple-gpio.c
  F:	drivers/pwm/pwm-apple.c
  F:	drivers/soc/apple/*
 +F:	drivers/spi/spi-apple.c
+ F:	drivers/video/backlight/apple_dwi_bl.c
  F:	drivers/watchdog/apple_wdt.c
  F:	include/dt-bindings/interrupt-controller/apple-aic.h
  F:	include/dt-bindings/pinctrl/apple.h

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