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

Date:	Tue, 18 Aug 2009 17:17:02 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Felix Blyakher <felixb@....com>
Cc:	David Chinner <david@...morbit.com>, xfs-masters@....sgi.com,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Eric Sandeen <sandeen@...deen.net>,
	Christoph Hellwig <hch@...radead.org>
Subject: Re: linux-next: manual merge of the xfs tree with Linus' tree

Hi Felix,

On Tue, 18 Aug 2009 01:49:52 -0500 Felix Blyakher <felixb@....com> wrote:
>
> Thanks for the fix, but there is no need to carrying it separately
> from the xfs master tree. I merged the bc990f5 commit back into the
> the master tree, and fixed all conflicts (there was another one in
> fs/xfs/xfs_iget.c). I planned to do it anyway for 2.6.32.

Thanks.

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

Content of type "application/pgp-signature" skipped