linux-kernel - linux-next: manual merge of the moduleh tree with the vfs 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]

Message-Id: <20120319164226.47a03eac5ab3ff9365714208@canb.auug.org.au>
Date:	Mon, 19 Mar 2012 16:42:26 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Paul Gortmaker <paul.gortmaker@...driver.com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Al Viro <viro@...IV.linux.org.uk>
Subject: linux-next: manual merge of the moduleh tree with the vfs tree

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in fs/inode.c
between commit 8bf58c2aaafb ("trim includes in inode.c") from the vfs
tree and commit 630d9c47274a ("fs: reduce the use of module.h wherever
possible") from the moduleh tree.

The former makes the latter patch unneeded (it also replaces module.h
with export.h).
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Content of type "application/pgp-signature" skipped