netdev - linux-next: manual merge of the net-next tree with the stm32 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: <20240418113403.06e5ceed@canb.auug.org.au>
Date: Thu, 18 Apr 2024 11:34:03 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
 Paolo Abeni <pabeni@...hat.com>, Alexandre Torgue <alexandre.torgue@...com>
Cc: Networking <netdev@...r.kernel.org>, Alexandre Torgue
 <alexandre.torgue@...s.st.com>, Gatien Chevallier
 <gatien.chevallier@...s.st.com>, "Kory Maincent (Dent Project)"
 <kory.maincent@...tlin.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>
Subject: linux-next: manual merge of the net-next tree with the stm32 tree

Hi all,

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

  drivers/of/property.c

between commit:

  6a15368c1c6d ("of: property: fw_devlink: Add support for "access-controller"")

from the stm32 tree and commit:

  93c0d8c0ac30 ("of: property: Add fw_devlink support for pse parent")

from the net-next 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 drivers/of/property.c
index dfdda94834d5,cc064151853e..000000000000
--- a/drivers/of/property.c
+++ b/drivers/of/property.c
@@@ -1252,7 -1252,7 +1252,8 @@@ DEFINE_SIMPLE_PROP(backlight, "backligh
  DEFINE_SIMPLE_PROP(panel, "panel", NULL)
  DEFINE_SIMPLE_PROP(msi_parent, "msi-parent", "#msi-cells")
  DEFINE_SIMPLE_PROP(post_init_providers, "post-init-providers", NULL)
 +DEFINE_SIMPLE_PROP(access_controllers, "access-controllers", "#access-controller-cells")
+ DEFINE_SIMPLE_PROP(pses, "pses", "#pse-cells")
  DEFINE_SUFFIX_PROP(regulators, "-supply", NULL)
  DEFINE_SUFFIX_PROP(gpio, "-gpio", "#gpio-cells")
  

Content of type "application/pgp-signature" skipped