netdev - linux-next: manual merge of the net-next tree with the origin 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 for Android: free password hash cracker in your pocket

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

Message-ID: <Z09iwtgMaBZ8d4QY@sirena.org.uk>
Date: Tue, 3 Dec 2024 19:57:54 +0000
From: Mark Brown <broonie@...nel.org>
To: David Miller <davem@...emloft.net>, Jakub Kicinski <kuba@...nel.org>,
	Paolo Abeni <pabeni@...hat.com>,
	Networking <netdev@...r.kernel.org>
Cc: Linus Torvalds <torvalds@...ux-foundation.org>,
	Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
	Linux Next Mailing List <linux-next@...r.kernel.org>,
	Uwe Kleine-König <u.kleine-koenig@...libre.com>
Subject: linux-next: manual merge of the net-next tree with the origin tree

Hi all,

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

   drivers/ptp/ptp_dte.c
   drivers/ptp/ptp_ines.c

between commit:

  e70140ba0d2b1 ("Get rid of 'remove_new' relic from platform driver struct")

from the origin tree and commit:

  b32913a5609a3 ("ptp: Switch back to struct platform_driver::remove()")

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.

(no diff, used Linus' version)

Download attachment "signature.asc" of type "application/pgp-signature" (489 bytes)