linux-kernel - linux-next: manual merge of the fsnotify 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20100304154625.f152123e.sfr@canb.auug.org.au>
Date:	Thu, 4 Mar 2010 15:46:25 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Eric Paris <eparis@...hat.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 fsnotify tree with the vfs tree

Hi Eric,

Today's linux-next merge of the fsnotify tree got a conflict in
include/linux/fsnotify.h between commit
cccc6bba3f771ef29b33e4f79e70ebc3dba245b0 ("Lose the first argument of
audit_inode_child()") from the vfs tree and commits
a65c9effb4c7b86d032b5188ddbd0e2e583cb81b ("inotify: remove inotify in
kernel interface"), 76864b426a99a3d08aa53e554ddc748ac49ca633 ("Lose the
first argument of audit_inode_child()") and
7278f4df3bfbc7934fc590d8a5707d3a8ee3d866 ("fsnotify: use unsigned char *
for dentry->d_name.name") from the fsnotify tree.

This has come about partly because, when you rebased and linearized your
tree, you included inline the two patches from Al that he had put in a
separate branch for you to merge.  You should have just remerged Al's
for-fsnotify branch at the appropriate place in your tree.

I fixed it up (again) and can carry this for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped