From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Miller <davem@davemloft•net>,
Jakub Kicinski <kuba@kernel•org>, Paolo Abeni <pabeni@redhat•com>,
Chuck Lever <chuck.lever@oracle•com>
Cc: Networking <netdev@vger•kernel.org>,
Justin Stitt <justinstitt@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
"Steven Rostedt (Google)" <rostedt@goodmis•org>
Subject: linux-next: manual merge of the net-next tree with the nfsd-fixes tree
Date: Fri, 12 Apr 2024 11:01:28 +1000 [thread overview]
Message-ID: <20240412110128.0fd442ec@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 821 bytes --]
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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
reply other threads:[~2024-04-12 1:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240412110128.0fd442ec@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=chuck.lever@oracle$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=justinstitt@google$(echo .)com \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=pabeni@redhat$(echo .)com \
--cc=rostedt@goodmis$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox