From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Steven Rostedt <rostedt@goodmis•org>,
Masami Hiramatsu <mhiramat@kernel•org>,
Al Viro <viro@zeniv•linux.org.uk>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the ftrace tree with the vfs tree
Date: Mon, 8 Jan 2024 12:49:22 +1100 [thread overview]
Message-ID: <20240108124922.37bd7fe3@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 805 bytes --]
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in:
fs/tracefs/inode.c
between commit:
da549bdd15c2 ("dentry: switch the lists of children to hlist")
from the vfs tree and commit:
8186fff7ab64 ("tracefs/eventfs: Use root and instance inodes as default ownership")
from the ftrace tree.
I fixed it up (the latter removed the code modified by the former, so
I just did that) and can carry the fix as necessary. This is now fixed
as far as linux-next is concerned, but any non trivial conflicts should
be mentioned to your upstream maintainer when your tree is submitted for
merging. You may also want to consider cooperating with the maintainer
of the conflicting tree to minimise any particularly complex conflicts.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-01-08 1:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-08 1:49 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-04-13 7:15 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=20240108124922.37bd7fe3@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mhiramat@kernel$(echo .)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