linux-kernel - linux-next: manual merge of the ftrace 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: <20150222124130.56c0ff7f@canb.auug.org.au>
Date:	Sun, 22 Feb 2015 12:41:30 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Steven Rostedt <rostedt@...dmis.org>,
	Al Viro <viro@...IV.linux.org.uk>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	David Howells <dhowells@...hat.com>
Subject: linux-next: manual merge of the ftrace tree with the vfs tree

Hi Steven,

Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/trace.c between commit 2c13b111e15c ("VFS: (Scripted)
Convert ->d_inode to fs_inode() in kernel/trace/") from the vfs tree
and commit eae473581cf9 ("tracing: Have mkdir and rmdir be part of
tracefs") from the ftrace tree.

I fixed it up (the letter removed the code modified by the former) 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