mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Mark Brown <broonie@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Chris Down <chris@chrisdown.name>,
	Christian Brauner <brauner@kernel.org>,
	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 fs-next tree with the mm-nonmm-unstable tree
Date: Tue, 17 Nov 2026 16:16:50 +0000	[thread overview]
Message-ID: <avx98jYYXsZAmkDN@sirena.org.uk> (raw)

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

Hi all,

Today's linux-next merge of the fs-next tree got a conflict in:

  fs/proc/kcore.c

between commit:

  6b20f3da3436e ("proc/kcore: allow disabling /proc/kcore at boot")

from the mm-nonmm-unstable tree and commit:

  79011a80f0646 ("proc: give kcore, kmsg, the kpage files and profile their own file_operations")

from the fs-next 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.

diff --cc fs/proc/kcore.c
index 4251a9ef868b6,ab7b74efe9754..0000000000000
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@@ -723,20 -722,9 +723,20 @@@ static void __init add_modules_range(vo
  }
  #endif
  
 +static int __init parse_kcore(char *str)
 +{
 +	return kstrtobool(str, &kcore_enabled);
 +}
 +early_param("kcore", parse_kcore);
 +
  static int __init proc_kcore_init(void)
  {
 +	if (!kcore_enabled) {
 +		pr_info("/proc/kcore disabled on command line\n");
 +		return 0;
 +	}
 +
- 	proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &kcore_proc_ops);
+ 	proc_root_kcore = proc_create_fops("kcore", S_IRUSR, NULL, &kcore_fops);
  	if (!proc_root_kcore) {
  		pr_err("couldn't create /proc/kcore\n");
  		return 0; /* Always returns 0. */

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply	other threads:[~2026-11-17 16:16 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-17 16:16 Mark Brown [this message]
  -- strict thread matches above, loose matches on Subject: below --
2026-11-17 16:17 Mark Brown
2026-04-06 13:13 Mark Brown
2026-04-06 16:25 ` Andrew Morton
2026-04-07  2:19   ` Joseph Qi
2026-04-07  3:39     ` Andrew Morton
2026-04-07 10:54     ` Mark Brown

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=avx98jYYXsZAmkDN@sirena.org.uk \
    --to=broonie@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=brauner@kernel.org \
    --cc=chris@chrisdown.name \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.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

all inboxes | Powered by JetHome®