From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <rostedt@goodmis•org>, Al Viro <viro@ZenIV•linux.org.uk>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
David Howells <dhowells@redhat•com>
Subject: linux-next: manual merge of the ftrace tree with the vfs tree
Date: Mon, 13 Apr 2015 17:15:59 +1000 [thread overview]
Message-ID: <20150413171559.7c414a1b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
Hi Steven,
Today's linux-next merge of the ftrace tree got a conflict in
kernel/trace/trace.c between commit aa1083274669 ("VFS: kernel/:
d_inode() annotations") from the vfs tree and various commits from the
ftrace from the ftrace tree.
I fixed it up (the latter removed a lot of the code modified by the
latter) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2015-04-13 7:15 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 7:15 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-08 1:49 linux-next: manual merge of the ftrace tree with the vfs tree Stephen Rothwell
2015-02-22 1:41 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150413171559.7c414a1b@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dhowells@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rostedt@goodmis$(echo .)org \
--cc=viro@ZenIV$(echo .)linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox