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

Date:	Mon, 1 Jun 2015 12:05:39 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Al Viro <viro@...IV.linux.org.uk>,
	Richard Weinberger <richard@....at>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the vfs tree with the uml tree

Hi Al,

Today's linux-next merge of the vfs tree got a conflict in
fs/hppfs/hppfs.c between commit f74a14e870c8 ("um: Remove hppfs") from
the uml tree and commits 680baacbca69 ("new ->follow_link() and
->put_link() calling conventions"), 6e77137b363b ("don't pass nameidata
to ->follow_link()") and 5f2c4179e129 ("switch ->put_link() from dentry
to inode") from the vfs tree.

I fixed it up (I just removed the file) and can carry the fix as
necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped