linux-kernel - Re: 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-prev] [day] [month] [year] [list]

Message-ID: <20130817102734.GA12640@rothwell.emu.id.au>
Date:	Sat, 17 Aug 2013 20:27:34 +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: Re: linux-next: manual merge of the dlm tree with Linus' tree

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

Download attachment "signature.asc" of type "application/pgp-signature" (837 bytes)