* linux-next: duplicate patches in the random tree
@ 2024-07-09 8:08 Stephen Rothwell
2024-07-09 13:12 ` Jason A. Donenfeld
2024-07-09 18:09 ` Shuah Khan
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-07-09 8:08 UTC (permalink / raw)
To: Theodore Ts'o, Jason A. Donenfeld, Shuah Khan
Cc: John Hubbard, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 642 bytes --]
Hi all,
The following commits are also in the kselftest-fixes tree as different
commits (but the same patches):
868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from Makefile")
7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target in Makefile")
14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings")
These are already causing an unnecessary conflict
:-( Maybe you could just merge the kselftest-fixes tree
(git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes),
but first make sure that it won't be rebased.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: duplicate patches in the random tree
2024-07-09 8:08 linux-next: duplicate patches in the random tree Stephen Rothwell
@ 2024-07-09 13:12 ` Jason A. Donenfeld
2024-07-09 18:09 ` Shuah Khan
1 sibling, 0 replies; 4+ messages in thread
From: Jason A. Donenfeld @ 2024-07-09 13:12 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Theodore Ts'o, Shuah Khan, John Hubbard,
Linux Kernel Mailing List, Linux Next Mailing List
Sorry. I did a merge instead now.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: duplicate patches in the random tree
2024-07-09 8:08 linux-next: duplicate patches in the random tree Stephen Rothwell
2024-07-09 13:12 ` Jason A. Donenfeld
@ 2024-07-09 18:09 ` Shuah Khan
1 sibling, 0 replies; 4+ messages in thread
From: Shuah Khan @ 2024-07-09 18:09 UTC (permalink / raw)
To: Stephen Rothwell, Theodore Ts'o, Jason A. Donenfeld,
Shuah Khan
Cc: John Hubbard, Linux Kernel Mailing List, Linux Next Mailing List,
Shuah Khan
On 7/9/24 02:08, Stephen Rothwell wrote:
> Hi all,
>
> The following commits are also in the kselftest-fixes tree as different
> commits (but the same patches):
>
> 868680ffba11 ("selftests/vDSO: remove duplicate compiler invocations from Makefile")
> 7bb79ef48b9d ("selftests/vDSO: remove partially duplicated "all:" target in Makefile")
> 14cd1a877fc6 ("selftests/vDSO: fix clang build errors and warnings")
>
> These are already causing an unnecessary conflict
> :-( Maybe you could just merge the kselftest-fixes tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes),
> but first make sure that it won't be rebased.
>
They are now in Linus's mainline. :)
thanks,
-- Shuah
^ permalink raw reply [flat|nested] 4+ messages in thread
* linux-next: duplicate patches in the random tree
@ 2024-05-19 22:13 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2024-05-19 22:13 UTC (permalink / raw)
To: Theodore Ts'o, Jason A. Donenfeld
Cc: Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 449 bytes --]
Hi all,
The following commits are also in Linus Torvalds' tree as different
commits (but the same patches):
1fc5311ffcc9 ("dt-bindings: rng: Add vmgenid support")
f5730cffbbaa ("virt: vmgenid: add support for devicetree bindings")
These are commits
a4aded1ff575 ("dt-bindings: rng: Add vmgenid support")
7b1bcd6b50a6 ("virt: vmgenid: add support for devicetree bindings")
in Linus' tree.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-07-09 18:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-07-09 8:08 linux-next: duplicate patches in the random tree Stephen Rothwell
2024-07-09 13:12 ` Jason A. Donenfeld
2024-07-09 18:09 ` Shuah Khan
-- strict thread matches above, loose matches on Subject: below --
2024-05-19 22:13 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox