linux-kernel - Re: linux-next: Tree for August 19

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]

Date:	Mon, 24 Aug 2009 17:30:46 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Joel Becker <Joel.Becker@...cle.com>
Cc:	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for August 19

Hi Joel,

[Sorry for being a bit slow]

On Wed, 19 Aug 2009 02:35:28 -0700 Joel Becker <Joel.Becker@...cle.com> wrote:
>
> On Wed, Aug 19, 2009 at 07:02:33PM +1000, Stephen Rothwell wrote:
> > Merging configfs/linux-next
> > CONFLICT (content): Merge conflict in fs/configfs/dir.c
> 
> 	Silly question.  The last time I had a conflict in next, you
> emailed me the details.  How do I go about finding them on my own
> (without doing the complete merge you do)?

Not a silly question, really.  I have no idea if you can generate those
merge resolution diffs without actually doing the merge.

Thanks for fixing up the configfs tree.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped