From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
David Howells <dhowells@redhat.com>
Subject: linux-next: manual merge of the vfs tree with the vfs-fixes tree
Date: Mon, 14 Jan 2019 11:02:04 +1100 [thread overview]
Message-ID: <20190114110204.5eb36d04@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 539 bytes --]
Hi all,
Today's linux-next merge of the vfs tree got a conflict in:
kernel/cgroup/cgroup-v1.c
between commit:
61aa329d0762 ("cgroup: saner refcounting for cgroup_root")
from the vfs-fixes tree and commit:
b3678086951a ("kernfs, sysfs, cgroup, intel_rdt: Support fs_context")
from the vfs tree.
I couldn't figure out how to fix this up, so I effectively reverted the
vfs-fixes tree change. Al, can you either do the merge yourself, or
provide me with a merge fix, please.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2019-01-14 0:02 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-14 0:02 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-06-22 23:12 linux-next: manual merge of the vfs tree with the vfs-fixes tree Stephen Rothwell
2025-06-22 23:29 ` Al Viro
2019-01-13 23:27 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=20190114110204.5eb36d04@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=dhowells@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=viro@ZenIV.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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