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

Message-Id: <20100118105556.230beb08.sfr@canb.auug.org.au>
Date:	Mon, 18 Jan 2010 10:55:56 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	OGAWA Hirofumi <hirofumi@...l.parknet.co.jp>,
	Steven Whitehouse <swhiteho@...hat.com>
Subject: linux-next: manual merge of the vfs tree with the gfs2 tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/gfs2/ops_inode.c between commit
83c77e8b3457f2ee5dad028dc54cf3ce540104b2 ("GFS2: Fix refcnt leak on
gfs2_follow_link() error path") from the gfs2 tree and commit
261a144ac2b3867c7be70f08925e446430df6937 ("Switch gfs2 to nd_set_link()")
from the vfs tree.

I can't figure out if the gfs2 tree fix is required any more, so I just
used the vfs tree version.

Al, if that gfs2 patch is standalone, you should probably send it to the
gfs2 guys.

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

Content of type "application/pgp-signature" skipped