From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "J. Bruce Fields" <bfields@fieldses•org>,
Trond Myklebust <trondmy@gmail•com>
Cc: Chuck Lever <chuck.lever@oracle•com>,
"J. Bruce Fields" <bfields@redhat•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Trond Myklebust <trond.myklebust@hammerspace•com>
Subject: linux-next: manual merge of the nfsd tree with the nfs tree
Date: Mon, 25 Oct 2021 10:59:51 +1100 [thread overview]
Message-ID: <20211025105951.109598aa@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1601 bytes --]
Hi all,
Today's linux-next merge of the nfsd tree got a conflict in:
include/trace/events/sunrpc.h
between commit:
b4776a341ec0 ("SUNRPC: Tracepoints should display tk_pid and cl_clid as a fixed-size field")
from the nfs tree and commit:
35940a58f9f1 ("SUNRPC: Capture value of xdr_buf::page_base")
from the nfsd 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.
--
Cheers,
Stephen Rothwell
diff --cc include/trace/events/sunrpc.h
index dc922e664820,9ea59959a2fe..000000000000
--- a/include/trace/events/sunrpc.h
+++ b/include/trace/events/sunrpc.h
@@@ -80,11 -80,12 +82,14 @@@ DECLARE_EVENT_CLASS(rpc_xdr_buf_class
__entry->msg_len = xdr->len;
),
- TP_printk("task:%u@%u head=[%p,%zu] page=%u(%u) tail=[%p,%zu] len=%u",
+ TP_printk(SUNRPC_TRACE_TASK_SPECIFIER
+ " head=[%p,%zu] page=%u tail=[%p,%zu] len=%u",
++ " head=[%p,%zu] page=%u(%u) tail=[%p,%zu] len=%u",
__entry->task_id, __entry->client_id,
- __entry->head_base, __entry->head_len, __entry->page_len,
- __entry->tail_base, __entry->tail_len, __entry->msg_len
+ __entry->head_base, __entry->head_len,
+ __entry->page_len, __entry->page_base,
+ __entry->tail_base, __entry->tail_len,
+ __entry->msg_len
)
);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-10-24 23:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-24 23:59 Stephen Rothwell [this message]
2021-10-25 0:10 ` linux-next: manual merge of the nfsd tree with the nfs tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-03-20 22:11 Stephen Rothwell
2025-03-21 13:32 ` Chuck Lever
2025-03-21 13:37 ` Trond Myklebust
2025-03-21 13:40 ` Chuck Lever
2015-02-10 0:55 Stephen Rothwell
2015-02-10 15:34 ` J. Bruce Fields
2009-08-10 0:58 Stephen Rothwell
2009-08-10 16:05 ` J. Bruce Fields
2009-08-10 18:08 ` Trond Myklebust
2009-08-10 18:17 ` J. Bruce Fields
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=20211025105951.109598aa@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bfields@fieldses$(echo .)org \
--cc=bfields@redhat$(echo .)com \
--cc=chuck.lever@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=trond.myklebust@hammerspace$(echo .)com \
--cc=trondmy@gmail$(echo .)com \
/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