netdev - linux-next: manual merge of the staging tree with the net-next 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: <20231023144720.231873f1@canb.auug.org.au>
Date: Mon, 23 Oct 2023 14:47:20 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>, David Miller <davem@...emloft.net>, Jakub
 Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>
Cc: Networking <netdev@...r.kernel.org>, Benjamin Poirier
 <benjamin.poirier@...il.com>, Greg Kroah-Hartman
 <gregkh@...uxfoundation.org>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, Przemek Kitszel
 <przemyslaw.kitszel@...el.com>
Subject: linux-next: manual merge of the staging tree with the net-next tree

Hi all,

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

  drivers/staging/qlge/qlge_devlink.c

between commit:

  3465915e9985 ("staging: qlge: devlink health: use retained error fmsg API")

from the net-next tree and commit:

  875be090928d ("staging: qlge: Retire the driver")

from the staging tree.

I fixed it up (I just deleted 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