linux-kernel - Re: [git pull] vfs.git; pile 1

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:	Mon, 23 Jul 2012 16:49:37 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	Linus Torvalds <torvalds@...ux-foundation.org>,
	linux-kernel@...r.kernel.org, linux-fsdevel@...r.kernel.org,
	Trond Myklebust <Trond.Myklebust@...app.com>
Subject: Re: [git pull] vfs.git; pile 1

Hi Al,

On Mon, 23 Jul 2012 07:09:09 +0100 Al Viro <viro@...IV.linux.org.uk> wrote:
>
> On Sun, Jul 22, 2012 at 09:20:30PM +0100, Al Viro wrote:
> > Result: for-linus-2 + v3.5 and for-linus + v3.5 give identical trees,
> > and for-linus-2 merges clean with nfs/nfs-for-3.6.  Would you be OK
> > with pulling that one?  Again, my apologies to everyone involved ;-/
> > 
> > If you are OK with pulling that one, the summary is unchanged, location is
> > git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git for-linus-2
> 
> BTW, Stephen, could you confirm that vfs.git#for-linus-2 has no conflicts
> with the rest of trees in linux-next?  I've checked the lack of conflicts
> with nfs.git and you haven't mentioned any other conflicts, so I hope
> that this will do, but I haven't tried pulling and merging the rest of
> the stuff in -next; not with the link I'm behind right now... ;-/

I found not other conlicts with the vfs tree today.  Not that some
conflicts are necessarily a problem.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped