* linux-next: manual merge of the dlm tree with Linus' tree
@ 2013-08-16 1:40 Stephen Rothwell
2013-08-16 15:04 ` David Teigland
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2013-08-16 1:40 UTC (permalink / raw)
To: David Teigland; +Cc: linux-next, linux-kernel, Oleg Nesterov
[-- Attachment #1: Type: text/plain, Size: 498 bytes --]
Hi David,
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).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the dlm tree with Linus' tree
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
0 siblings, 1 reply; 3+ messages in thread
From: David Teigland @ 2013-08-16 15:04 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Oleg Nesterov
On Fri, Aug 16, 2013 at 11:40:50AM +1000, Stephen Rothwell wrote:
> Hi David,
>
> 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?
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the dlm tree with Linus' tree
2013-08-16 15:04 ` David Teigland
@ 2013-08-17 10:27 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2013-08-17 10:27 UTC (permalink / raw)
To: David Teigland; +Cc: linux-next, linux-kernel, Oleg Nesterov
[-- 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-08-17 10:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 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).