* Upcoming merge conflict between akpm-current/current and s390 trees
@ 2021-10-26 14:05 Vasily Gorbik
2021-10-26 22:03 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Vasily Gorbik @ 2021-10-26 14:05 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Alexander Gordeev, Heiko Carstens, Mike Rapoport, linux-next
Hi Stephen,
updating s390 tree for linux-next today I hit a merge conflict with
akpm-current/current. Please find conflict resolution below.
Thank you
diff --cc arch/s390/kernel/setup.c
index 27454962c119,e738a45057ac..40405f2304f1
--- a/arch/s390/kernel/setup.c
+++ b/arch/s390/kernel/setup.c
@@@ -880,14 -878,12 +879,12 @@@ static void __init setup_randomness(voi
{
struct sysinfo_3_2_2 *vmms;
- vmms = (struct sysinfo_3_2_2 *) memblock_phys_alloc(PAGE_SIZE,
- PAGE_SIZE);
+ vmms = memblock_alloc(PAGE_SIZE, PAGE_SIZE);
if (!vmms)
panic("Failed to allocate memory for sysinfo structure\n");
-
if (stsi(vmms, 3, 2, 2) == 0 && vmms->count)
add_device_randomness(&vmms->vm, sizeof(vmms->vm[0]) * vmms->count);
- memblock_phys_free((unsigned long)vmms, PAGE_SIZE);
- memblock_free_ptr(vmms, PAGE_SIZE);
++ memblock_free(vmms, PAGE_SIZE);
}
/*
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: Upcoming merge conflict between akpm-current/current and s390 trees
2021-10-26 14:05 Upcoming merge conflict between akpm-current/current and s390 trees Vasily Gorbik
@ 2021-10-26 22:03 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2021-10-26 22:03 UTC (permalink / raw)
To: Vasily Gorbik
Cc: Alexander Gordeev, Heiko Carstens, Mike Rapoport, linux-next
[-- Attachment #1: Type: text/plain, Size: 312 bytes --]
Hi Vasily,
On Tue, 26 Oct 2021 16:05:55 +0200 Vasily Gorbik <gor@linux.ibm.com> wrote:
>
> updating s390 tree for linux-next today I hit a merge conflict with
> akpm-current/current. Please find conflict resolution below.
Thanks for the heads up and merge resolution.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-10-26 22:04 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-26 14:05 Upcoming merge conflict between akpm-current/current and s390 trees Vasily Gorbik
2021-10-26 22:03 ` Stephen Rothwell
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).