*/
> +#define SHARPSL_BATCHK_TIME(secs_to_jiffies(15))/*
> 15 sec */
It might be nice to keep the alignment of the comments here.
--
Cheers,
Stephen Rothwell
pgpz6JJON14HH.pgp
Description: OpenPGP digital signature
] = secs_to_jiffies(3),
You have changed this last timeout from 30 seconds to 3 (presumably
just a copy and paste error).
--
Cheers,
Stephen Rothwell
pgpjdTo0xAe39.pgp
Description: OpenPGP digital signature
nt physical
address")
acpi_os_ioremap is not exported to modules.
I have used the xen-tip tree from next-20240910 (as the next-20240911
version had a different build failure).
--
Cheers,
Stephen Rothwell
pgpcmtlNNOn5i.pgp
Description: OpenPGP digital signature
different physical
address")
I have used the xen-tip tree from next-20240910 for today.
--
Cheers,
Stephen Rothwell
pgp4l69opUXsN.pgp
Description: OpenPGP digital signature
n callback prototype
warning")
in Linus' tree.
--
Cheers,
Stephen Rothwell
pgpc2c_W2f3Rw.pgp
Description: OpenPGP digital signature
en: mark xen_pv_play_dead() as __noreturn")
These are commits
859761e770f8 ("drivers/xen/hypervisor: Expose Xen SIF flags to userspace")
076cbf5d2163 ("x86/xen: don't let xen_pv_play_dead() return")
1aff0d2658e5 ("x86/xen: mark xen_pv_play_dead(
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/xen/enlighten_pv.c
index af1f6e886225,ca85d1409917..
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten_pv.c
@@@ -30,8 -
Hi all,
Commit
b12d41716e32 ("arm/xen: Fix some refcount leaks")
is missing a Signed-off-by from its committer.
--
Cheers,
Stephen Rothwell
pgpnhKMjvoP_g.pgp
Description: OpenPGP digital signature
intainer 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.
--
Cheers,
Stephen Rothwell
pgp67gREXyyA4.pgp
Description: OpenPGP digital signature
duced by commit
97c79d816979 ("x86/xen: switch initial pvops IRQ functions to dummy ones")
--
Cheers,
Stephen Rothwell
pgpOM20nlrfvM.pgp
Description: OpenPGP digital signature
flicts.
There may be more required, though.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/xen/irq.c
index 4fe387e520af,ae8537583102..
--- a/arch/x86/xen/irq.c
+++ b/arch/x86/xen/irq.c
@@@ -94,16 -40,14 +40,16 @@@ static void xen_halt(void
xen_safe_halt();
}
e: power: don't try to use non-existing RTC for storing
data")
I used the xen-tip tree from next-20210914 for today.
--
Cheers,
Stephen Rothwell
pgpgjUYGOSCAo.pgp
Description: OpenPGP digital signature
nd the subject
--
Cheers,
Stephen Rothwell
pgptSryZIkbXm.pgp
Description: OpenPGP digital signature
___
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
our 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.
--
Cheers,
Stephen Rothwell
diff --cc mm/memory_hotplug.c
index 1f678568ce5c,d2c44146473f..b96a3121b5e9
--- a/mm/memory_hotplug.c
Hi all,
Commits
28df69acbd27 ("xen-scsiback: mark expected switch fall-through")
7bb17e0ca4a5 ("xen: mark expected switch fall-through")
are missing a Signed-off-by from their committer.
--
Cheers,
Stephen Rothwell
pgp5QIMhd188Y.pgp
Description: OpenP
Hi all,
Commit
786e1048e7f4 ("pvcalls-front: fix potential null dereference")
has a malformed Fixes tag:
Fixes: 9f51c05dc41a ("pvcalls-front: Avoid get_free_pages(GFP_KERNEL)
under spinlock")
It should not be split over 2 lines.
--
Cheers,
Stephen Rothwell
Hi all,
On Mon, 30 Jul 2018 15:12:13 +1000 Stephen Rothwell
wrote:
>
> After merging the xen-tip tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> drivers/xen/gntdev-dmabuf.c:360:12: error: initialization from incompatible
> pointer typ
Hi all,
On Mon, 30 Jul 2018 19:02:10 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the akpm-current tree got a conflict in:
>
> drivers/xen/gntdev.c
>
> between commit:
>
> 1d3145675538 ("xen/gntdev: Make private routines/structures acces
may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/xen/gntdev.c
index c866a62f766d,55b4f0e3f4d6..
--- a/drivers/xen/gntdev.c
+++ b/drivers/xen/gntdev.c
@
ttach,
^
Caused by commit
a240d6e42e28 ("xen/gntdev: Implement dma-buf export functionality")
interacting with commit
a19741e5e5a9 ("dma_buf: remove device parameter from attach callback v2")
from the drm tree.
I have added the following merge fix patch:
From: Stephe
to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/xen/pvcalls-front.c
index 753d9cb437d0,ca5b77309c7d..
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-fr
21 matches
Mail list logo