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

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

Message-ID: <20240412110128.0fd442ec@canb.auug.org.au>
Date: Fri, 12 Apr 2024 11:01:28 +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>, Chuck Lever <chuck.lever@...cle.com>
Cc: Networking <netdev@...r.kernel.org>, Justin Stitt
 <justinstitt@...gle.com>, Linux Kernel Mailing List
 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
 <linux-next@...r.kernel.org>, "Steven Rostedt (Google)"
 <rostedt@...dmis.org>
Subject: linux-next: manual merge of the net-next tree with the nfsd-fixes
 tree

Hi all,

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

  include/trace/events/rpcgss.h

between commit:

  a4833e3abae1 ("SUNRPC: Fix rpcgss_context trace event acceptor field")

from the nfsd-fixes tree and commit:

  386f4a737964 ("trace: events: cleanup deprecated strncpy uses")

from the net-next tree.

I fixed it up (I just used the former version (which replaced the strncpy
with __assign_str) 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