From: Stephen Rothwell <sfr@canb•auug.org.au>
To: David Teigland <teigland@redhat•com>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Oleg Nesterov <oleg@redhat•com>
Subject: Re: linux-next: manual merge of the dlm tree with Linus' tree
Date: Sat, 17 Aug 2013 20:27:34 +1000 [thread overview]
Message-ID: <20130817102734.GA12640@rothwell.emu.id.au> (raw)
In-Reply-To: <20130816150441.GA20568@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 903 bytes --]
Hi David,
On Fri, Aug 16, 2013 at 11:04:41AM -0400, David Teigland wrote:
> On Fri, Aug 16, 2013 at 11:40:50AM +1000, Stephen Rothwell wrote:
> >
> > Today's linux-next merge of the dlm tree got a conflict in fs/dlm/user.c
> > between commit 201d3dfa4da1 ("dlm: kill the unnecessary and wrong
> > device_close()->recalc_sigpending()") from Linus' tree and commit
> > c6ca7bc91d51 ("dlm: remove signal blocking") from the dlm tree.
> >
> > I fixed it up (the latter is a superset of the former, so I just used it)
> > and can carry the fix as necessary (no action is required).
>
> Thanks, what's the procedure to get the right thing merged in the end?
> Apply Oleg's patch to my tree followed by my own?
Just leave it alone, Linus will do what I did when he merges the dlm
tree during the next merge window (or whenever he is asked to merge it).
--
Cheers,
Stephen Rothwell
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
prev parent reply other threads:[~2013-08-17 10:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-16 1:40 linux-next: manual merge of the dlm tree with Linus' tree Stephen Rothwell
2013-08-16 15:04 ` David Teigland
2013-08-17 10:27 ` Stephen Rothwell [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=20130817102734.GA12640@rothwell.emu.id.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=oleg@redhat$(echo .)com \
--cc=teigland@redhat$(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