From: Peter Zijlstra <peterz@infradead.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
"J. Bruce Fields" <bfields@fieldses.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Chuck Lever <chuck.lever@oracle.com>
Subject: Re: linux-next: manual merge of the tip tree with the nfsd tree
Date: Thu, 21 Nov 2019 09:35:23 +0100 [thread overview]
Message-ID: <20191121083523.GL4097@hirez.programming.kicks-ass.net> (raw)
In-Reply-To: <20191121142833.2c9ffd62@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 571 bytes --]
On Thu, Nov 21, 2019 at 02:28:33PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/trace/events/rpcrdma.h
>
> between commit:
>
> 832b2cb95543 ("svcrdma: Improve DMA mapping trace points")
>
> from the nfsd tree and commit:
>
> 60fdad00827c ("ftrace: Rework event_create_dir()")
>
> from the tip tree.
>
> I fixed it up (I just used the former) and can carry the fix as
Yes, that looks right. All I did was remove that stray ';' anyway, which
the nfs patch did too.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
prev parent reply other threads:[~2019-11-21 8:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-21 3:28 linux-next: manual merge of the tip tree with the nfsd tree Stephen Rothwell
2019-11-21 8:35 ` Peter Zijlstra [this message]
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=20191121083523.GL4097@hirez.programming.kicks-ass.net \
--to=peterz@infradead.org \
--cc=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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