linux-kernel - linux-next: manual merge of the gpio-brgl tree with the arm-soc 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>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20240912174842.57a43921@canb.auug.org.au>
Date: Thu, 12 Sep 2024 17:48:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Bartosz Golaszewski <brgl@...ev.pl>, Olof Johansson <olof@...om.net>,
 Arnd Bergmann <arnd@...db.de>
Cc: ARM <linux-arm-kernel@...ts.infradead.org>, Andy Shevchenko
 <andriy.shevchenko@...ux.intel.com>, Bartosz Golaszewski
 <bartosz.golaszewski@...aro.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Nikita Shubin <nikita.shubin@...uefel.me>
Subject: linux-next: manual merge of the gpio-brgl tree with the arm-soc
 tree

Hi all,

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

  arch/arm/mach-ep93xx/vision_ep9307.c

between commit:

  3e0bae7f35c9 ("ARM: ep93xx: delete all boardfiles")

from the arm-soc tree and commits:

  4b2b0a2ce815 ("gpiolib: legacy: Kill GPIOF_INIT_* definitions")
  8c045ca534d0 ("gpiolib: legacy: Kill GPIOF_DIR_* definitions")

from the gpio-brgl tree.

I fixed it up (I removed the file) 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

Content of type "application/pgp-signature" skipped