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>,
Rusty Russell <rusty@rustcorp•com.au>,
linux-next@vger•kernel.org, linux-kernel@vger•kernel.org
Subject: Re: linux-next: manual merge of the tip tree with the modules tree
Date: Sat, 20 Jun 2015 10:55:15 +0200 [thread overview]
Message-ID: <20150620085515.GM19282@twins.programming.kicks-ass.net> (raw)
In-Reply-To: <20150620183558.51a6296c@canb.auug.org.au>
On Sat, Jun 20, 2015 at 06:35:58PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the tip tree got a conflict in:
>
> include/linux/seqlock.h
>
> between commit:
>
> 7fc26327b756 ("seqlock: Introduce raw_read_seqcount_latch()")
>
> from the modules tree and commit:
>
> c4bfa3f5f906 ("seqcount: Introduce raw_write_seqcount_barrier()")
>
> from the tip tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Oh my that's unfortunate, those two patches just touching at the edge.
Resolution looks good.
Thanks.
prev parent reply other threads:[~2015-06-20 8:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-20 8:35 linux-next: manual merge of the tip tree with the modules tree Stephen Rothwell
2015-06-20 8:55 ` 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=20150620085515.GM19282@twins.programming.kicks-ass.net \
--to=peterz@infradead$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=rusty@rustcorp$(echo .)com.au \
--cc=sfr@canb$(echo .)auug.org.au \
--cc=tglx@linutronix$(echo .)de \
/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