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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20130816114050.5f4bf4b21f1bde305235ac42@canb.auug.org.au>
Date:	Fri, 16 Aug 2013 11:40:50 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Teigland <teigland@...hat.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Oleg Nesterov <oleg@...hat.com>
Subject: linux-next: manual merge of the dlm tree with Linus' tree

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@...b.auug.org.au

Content of type "application/pgp-signature" skipped