From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Tejun Heo <tj@kernel.org>
Cc: Christian Brauner <christian.brauner@ubuntu.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: linux-next: manual merge of the workqueues tree with Linus' tree
Date: Thu, 15 Jul 2021 11:22:49 +1000 [thread overview]
Message-ID: <20210715112249.3893674b@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1391 bytes --]
Hi all,
Today's linux-next merge of the workqueues tree got a conflict in:
include/linux/fs_context.h
between commit:
d1d488d81370 ("fs: add vfs_parse_fs_param_source() helper")
from Linus' tree and commit:
7f5ba4806d3c ("cgroup1: fix leaked context root causing sporadic NULL deref in LTP")
from the workqueues tree.
I fixed it up (see below) 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
diff --cc include/linux/fs_context.h
index e2bc16300c82,5b44b0195a28..000000000000
--- a/include/linux/fs_context.h
+++ b/include/linux/fs_context.h
@@@ -139,8 -139,7 +139,9 @@@ extern int vfs_parse_fs_string(struct f
extern int generic_parse_monolithic(struct fs_context *fc, void *data);
extern int vfs_get_tree(struct fs_context *fc);
extern void put_fs_context(struct fs_context *fc);
+extern int vfs_parse_fs_param_source(struct fs_context *fc,
+ struct fs_parameter *param);
+ extern void fc_drop_locked(struct fs_context *fc);
/*
* sget() wrappers to be called from the ->get_tree() op.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-07-15 1:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-15 1:22 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-06-26 4:11 linux-next: manual merge of the workqueues tree with Linus' tree Stephen Rothwell
2014-01-13 4:09 Stephen Rothwell
2013-03-19 2:19 Stephen Rothwell
2013-03-19 21:12 ` Tejun Heo
2013-03-19 22:05 ` Stephen Rothwell
2013-03-19 22:13 ` Tejun Heo
2013-03-19 22:20 ` Stephen Rothwell
2013-03-14 4:29 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=20210715112249.3893674b@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=christian.brauner@ubuntu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--cc=tj@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).