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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250317143431.00ba29bc@canb.auug.org.au>
Date: Mon, 17 Mar 2025 14:34:31 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Lee Jones <lee@...nel.org>, Arnd Bergmann <arnd@...db.de>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>, Hector Martin
 <marcan@...can.st>, Janne Grunau <j@...nau.net>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Nick Chan <towinchenmi@...il.com>, Sven Peter
 <sven@...npeter.dev>
Subject: linux-next: manual merge of the backlight tree with the
 arm-soc-fixes tree

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

Content of type "application/pgp-signature" skipped