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: <20100805130459.f62468cd.sfr@canb.auug.org.au>
Date:	Thu, 5 Aug 2010 13:04:59 +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 21:42:33 +1000 Stephen Rothwell <sfr@...b.auug.org.au> 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.

Linus has merged the cifs tree, so you could fix these conflicts in your
tree by merging the cifs tree that Linus' merged (rather than merging
against all of Linus' tree).   That would be commit
cb76d5e25008b76fb8e348c861d32659430ac3fa ("cifs: fsc should not default
to "on"") in Linus' tree.

Or you could leave it all to Linus if you want to.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped