From: Chuck Lever <chuck.lever@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Bruce Fields <bfields@fieldses.org>
Cc: Anna Schumaker <Anna.Schumaker@Netapp.com>,
Trond Myklebust <trondmy@gmail.com>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the nfsd tree with the nfs-anna tree
Date: Fri, 29 May 2020 15:27:06 -0400 [thread overview]
Message-ID: <1AC5DB12-0E72-4AB6-B3B5-F1C40EC36F26@oracle.com> (raw)
In-Reply-To: <20200529105917.50dfc40f@canb.auug.org.au>
> On May 28, 2020, at 8:59 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the nfsd tree got a conflict in:
>
> include/trace/events/sunrpc.h
>
> between commit:
>
> 2baebf955125 ("SUNRPC: Split the xdr_buf event class")
>
> from the nfs-anna tree and commit:
>
> 998024dee197 ("SUNRPC: Add more svcsock tracepoints")
>
> from the nfsd tree.
Alternately, I can provide a v4 nfsd-5.8 series for Bruce that
includes 2baebf955125 ("SUNRPC: Split the xdr_buf event class")
so that these merge conflicts are avoided.
> 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 include/trace/events/sunrpc.h
> index 73193c79fcaa,852413cbb7d9..000000000000
> --- a/include/trace/events/sunrpc.h
> +++ b/include/trace/events/sunrpc.h
> @@@ -14,9 -14,41 +14,42 @@@
> #include <linux/net.h>
> #include <linux/tracepoint.h>
>
> + TRACE_DEFINE_ENUM(SOCK_STREAM);
> + TRACE_DEFINE_ENUM(SOCK_DGRAM);
> + TRACE_DEFINE_ENUM(SOCK_RAW);
> + TRACE_DEFINE_ENUM(SOCK_RDM);
> + TRACE_DEFINE_ENUM(SOCK_SEQPACKET);
> + TRACE_DEFINE_ENUM(SOCK_DCCP);
> + TRACE_DEFINE_ENUM(SOCK_PACKET);
> +
> + #define show_socket_type(type) \
> + __print_symbolic(type, \
> + { SOCK_STREAM, "STREAM" }, \
> + { SOCK_DGRAM, "DGRAM" }, \
> + { SOCK_RAW, "RAW" }, \
> + { SOCK_RDM, "RDM" }, \
> + { SOCK_SEQPACKET, "SEQPACKET" }, \
> + { SOCK_DCCP, "DCCP" }, \
> + { SOCK_PACKET, "PACKET" })
> +
> + /* This list is known to be incomplete, add new enums as needed. */
> + TRACE_DEFINE_ENUM(AF_UNSPEC);
> + TRACE_DEFINE_ENUM(AF_UNIX);
> + TRACE_DEFINE_ENUM(AF_LOCAL);
> + TRACE_DEFINE_ENUM(AF_INET);
> + TRACE_DEFINE_ENUM(AF_INET6);
> +
> + #define rpc_show_address_family(family) \
> + __print_symbolic(family, \
> + { AF_UNSPEC, "AF_UNSPEC" }, \
> + { AF_UNIX, "AF_UNIX" }, \
> + { AF_LOCAL, "AF_LOCAL" }, \
> + { AF_INET, "AF_INET" }, \
> + { AF_INET6, "AF_INET6" })
> +
> -DECLARE_EVENT_CLASS(xdr_buf_class,
> +DECLARE_EVENT_CLASS(rpc_xdr_buf_class,
> TP_PROTO(
> + const struct rpc_task *task,
> const struct xdr_buf *xdr
> ),
>
--
Chuck Lever
next prev parent reply other threads:[~2020-05-29 19:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 0:59 linux-next: manual merge of the nfsd tree with the nfs-anna tree Stephen Rothwell
2020-05-29 19:27 ` Chuck Lever [this message]
2020-05-29 1:05 Stephen Rothwell
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=1AC5DB12-0E72-4AB6-B3B5-F1C40EC36F26@oracle.com \
--to=chuck.lever@oracle.com \
--cc=Anna.Schumaker@Netapp.com \
--cc=bfields@fieldses.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=trondmy@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).