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

From: Stephen Rothwell
Date: Thu Aug 15 2013 - 21:41:08 EST

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).

Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgp00000.pgp
Description: PGP signature