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]

Message-Id: <20100723214233.7cb7de8d.sfr@canb.auug.org.au>
Date:	Fri, 23 Jul 2010 21:42:33 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Tejun Heo <tj@...nel.org>
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

Hi Tejun,

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.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped