linux-kernel - Re: linux-next: manual merge of the workqueues tree with the 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] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 23 Jul 2010 13:45:16 +0200
From:	Tejun Heo <tj@...nel.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>,
	Steve French <smfrench@...il.com>, linux-cifs@...r.kernel.org
Subject: Re: linux-next: manual merge of the workqueues tree with the Linus'
 tree

Hello,

On 07/23/2010 01:42 PM, Stephen Rothwell wrote:
> On Fri, 23 Jul 2010 13:34:55 +0200 Tejun Heo <tj@...nel.org> wrote:
>>
>> I was thinking about sending pull request w/ a note describing how to
>> resolve the conflict.  Would pulling in master before requesting pull
>> be better?
> 
> Either would work.  Linus is fine with doing merge fixups and, after all,
> I figured it out. :-)
> 
> A description always helps, of course.

Yeah, sorry about causng headaches in linux-next.  I'll test merge w/
mainline and let you know non-trivial conflicts for future commits.

Thank you.

-- 
tejun
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/