Re: linux-next: manual merge of the dlm tree with Linus' tree

2013-08-17 Thread Stephen Rothwell
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 > >

Re: linux-next: manual merge of the dlm tree with Linus' tree

2013-08-16 Thread David Teigland
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 > c6ca7

linux-next: manual merge of the dlm tree with Linus' tree

2013-08-15 Thread Stephen Rothwell
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