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: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: duplicate patches in the tip tree
Date: Tue, 11 Mar 2025 15:08:47 +1100 [thread overview]
Message-ID: <20250311150847.5a63db36@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 2118 bytes --]
Hi all,
The following commits are also in the mm tree as different commits
(but the same patches):
0b3bc3354eb9 ("arm64: vdso: Switch to generic storage implementation")
127b0e05c166 ("vdso: Rename included Makefile")
30533a55ec8e ("parisc: Remove unused symbol vdso_data")
31e9fa2ba9ad ("arm: vdso: Switch to generic storage implementation")
365841e1557a ("vdso: Add generic architecture-specific data storage")
3ef32d90cdaa ("x86/vdso: Fix latent bug in vclock_pages calculation")
46fe55b204bf ("riscv: vdso: Switch to generic storage implementation")
51d6ca373f45 ("vdso: Add generic random data storage")
5b47aba85810 ("vdso: Introduce vdso/align.h")
69896119dc9d ("MIPS: vdso: Switch to generic storage implementation")
9729dceab17b ("x86/vdso/vdso2c: Remove page handling")
998a8a260819 ("vdso: Remove remnants of architecture-specific random state storage")
ac1a42f4e4e2 ("vdso: Remove remnants of architecture-specific time storage")
d2862bb9d9ca ("LoongArch: vDSO: Switch to generic storage implementation")
dafde29605eb ("x86/vdso: Switch to generic storage implementation")
df7fcbefa710 ("vdso: Add generic time data storage")
These are causing the following conflicts:
CONFLICT (content): Merge conflict in arch/arm64/include/asm/vdso/compat_gettim
ofday.h
CONFLICT (content): Merge conflict in arch/arm64/include/asm/vdso/vsyscall.h
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/vdso/gettimeofday.h
CONFLICT (content): Merge conflict in arch/s390/kernel/time.c
CONFLICT (content): Merge conflict in arch/x86/include/asm/vdso/gettimeofday.h
CONFLICT (content): Merge conflict in include/asm-generic/vdso/vsyscall.h
CONFLICT (content): Merge conflict in include/vdso/datapage.h
CONFLICT (content): Merge conflict in include/vdso/helpers.h
CONFLICT (content): Merge conflict in kernel/time/namespace.c
CONFLICT (content): Merge conflict in kernel/time/vsyscall.c
CONFLICT (add/add): Merge conflict in lib/vdso/datastore.c
CONFLICT (content): Merge conflict in lib/vdso/gettimeofday.c
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-03-11 4:08 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-11 4:08 Stephen Rothwell [this message]
2025-03-11 9:02 ` linux-next: duplicate patches in the tip tree Andrew Morton
2025-03-11 11:43 ` Stephen Rothwell
2025-03-11 12:56 ` Thomas Gleixner
2025-03-25 21:47 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2025-03-20 9:46 Stephen Rothwell
2025-03-20 11:13 ` Mark Brown
2024-12-09 2:29 Stephen Rothwell
2024-12-09 11:08 ` Peter Zijlstra
2024-12-09 19:45 ` Andrew Morton
2024-12-09 20:21 ` Suren Baghdasaryan
2024-12-09 22:53 ` Thomas Gleixner
2024-11-18 21:02 Stephen Rothwell
2024-03-03 22:21 Stephen Rothwell
2024-03-04 9:21 ` Ingo Molnar
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=20250311150847.5a63db36@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=hpa@zytor$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@redhat$(echo .)com \
--cc=peterz@infradead$(echo .)org \
--cc=tglx@linutronix$(echo .)de \
/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