public inbox for linux-next@vger.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>
Cc: "Jeff Xu" <jeffxu@chromium.org>,
	"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>,
	"Linux Next Mailing List" <linux-next@vger.kernel.org>,
	"Nam Cao" <namcao@linutronix.de>,
	"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>
Subject: linux-next: manual merge of the tip tree with the mm tree
Date: Fri, 7 Mar 2025 15:14:26 +1100	[thread overview]
Message-ID: <20250307151426.5f3c0c39@canb.auug.org.au> (raw)

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

Hi all,

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

  arch/arm64/kernel/vdso.c

between commit:

  6742f72d084b ("mseal sysmap: enable arm64")

from the mm tree and commit:

  0b3bc3354eb9 ("arm64: vdso: Switch to generic storage implementation")

from the tip tree.

I didn't fix it up - couldn't figure it out, so just reverted the former
for today as it was simpler.

It looks like VM_SEALED_SYSMAP needs to be added to
vdso_install_vvar_mapping(), but that is generic across all the
architectures using GENERIC_VDSO_DATA_STORE.

and we have the same between commit

  035f34159d61 ("mseal sysmap: enable x86-64")

from the mm tre and commit

  dafde29605eb ("x86/vdso: Switch to generic storage implementation")

So I have reverted 035f34159d61 as well.

-- 
Cheers,
Stephen Rothwell

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

             reply	other threads:[~2025-03-07  4:14 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-03-07  4:14 Stephen Rothwell [this message]
2025-03-07  7:20 ` linux-next: manual merge of the tip tree with the mm tree Thomas Weißschuh
2025-03-07  7:58 ` Andrew Morton
2025-03-07 21:54   ` Jeff Xu
  -- strict thread matches above, loose matches on Subject: below --
2025-02-24  3:42 Stephen Rothwell
2025-02-24  5:50 ` Anshuman Khandual
2025-03-26  1:05 ` Stephen Rothwell
2025-01-10  2:47 Stephen Rothwell
2024-12-09  2:24 Stephen Rothwell
2025-01-06  3:09 ` Stephen Rothwell
2025-01-06 20:21   ` Suren Baghdasaryan
2025-01-06 21:14     ` Stephen Rothwell
2025-01-06 21:15       ` Suren Baghdasaryan
2024-09-11  5:16 Stephen Rothwell
2024-09-05  5:35 Stephen Rothwell
2024-09-10 23:23 ` Stephen Rothwell
2024-06-12  1:27 Stephen Rothwell
2024-07-16 23:27 ` Stephen Rothwell
2024-04-05  0:51 Stephen Rothwell
2024-04-07 23:50 ` Stephen Rothwell
2023-03-21 23:33 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=20250307151426.5f3c0c39@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=jeffxu@chromium.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namcao@linutronix.de \
    --cc=peterz@infradead.org \
    --cc=tglx@linutronix.de \
    --cc=thomas.weissschuh@linutronix.de \
    /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