t rid of paravirt op adjust_exception_frame")
interacting with commit
11a7ffb01703 ("x86/traps: Simplify pagefault tracing logic")
from the tip tree.
I am not sure how to fix up this, so I have just applied the following
patch for today. A better solution would be appreciated.
From:
may also want to consider 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 c76f5ff4d0d7,148527c4e48a..
--- a/arch/x86/xen/enlighten_pv.c
+++ b/arch/x86/xen/enlighten
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/include/asm/traps.h
index b4f322d6c95f,935709829a4e..
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.
inux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer 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 confl
er 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
diff --cc arch/x86/entry/entry_64.S
index ca0b250eefc4,67fefaf21312..
--- a/a
ng. 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 drivers/xen/events/events_base.c
index 2e567d8433b3,813f1e86a599..
--- a/drivers/xen/events/events_base.c
Hi all,
On Wed, 21 Jun 2017 15:32:39 +0200 Marek Szyprowski
wrote:
>
> On 2017-06-20 15:16, Christoph Hellwig wrote:
> > On Tue, Jun 20, 2017 at 11:04:00PM +1000, Stephen Rothwell wrote:
> >> git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-ne
,
* posted to the relevant mailing list,
* reviewed by you (or another maintainer of your subsystem tree),
* successfully unit tested, and
* destined for the current or next Linux merge window.
Basically, this should be just what you would send to Linus (or ask him
to fetch). It
Hi all,
The current top commit of the xen-tip tree
9e925824eccd ("xen: avoid type warning in xchg_xen_ulong")
has no Signed-off-by for its committer.
--
Cheers,
Stephen Rothwell
___
Xen-devel mailing list
Xen-devel@lists.xen
Hi Juergen,
On Wed, 26 Apr 2017 07:47:49 +0200 Juergen Gross wrote:
>
> On 26/04/17 07:03, Stephen Rothwell wrote:
> > Hi all,
> >
> > David's citrix.com email address is bouncing. Is there a new one I should
> > use for the xen-tip tree contact, or should
Hi all,
David's citrix.com email address is bouncing. Is there a new one I should
use for the xen-tip tree contact, or should I just remove him?
--
Cheers,
Stephen Rothwell
___
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.or
Hi all,
On Wed, 12 Apr 2017 14:30:21 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
> arch/x86/xen/enlighten.c
>
> between commit:
>
> 687d77a5f7b2 ("x86/xen: Update e820 table handling to the new cor
ts should be mentioned to your upstream maintainer 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.
From: Stephen Rothwell
Date: Wed, 12 Apr 2017 14:27:23 +1000
Subject: [
ng. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
From: Stephen Rothwell
Date: Wed, 12 Apr 2017 14:17:58 +1000
Subject: [PATCH] x86/xen: merge fix up for arch/x86/xen/mmu.c code movement
Signed-off-by: Stephen Ro
Hi Juergen,
On Wed, 29 Mar 2017 11:54:57 +0200 Juergen Gross wrote:
>
> Stephen, I have rewound the linux-next branch of xen-tip to its previous
> position. You can re-enable xen-tip.
Thanks, it should be all good tomorrow.
--
Cheers,
Stephen
Hi all,
On Wed, 29 Mar 2017 14:36:18 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the xen-tip tree got a conflict in:
>
> arch/x86/xen/mmu.c
>
> between commits:
>
> 69218e47994d ("x86: Remap GDT tables in the fixmap section&qu
a6a7050109 ("x86: Convert the rest of the code to support p4d_t")
from the tip tree and commit:
48a09cbf855e ("x86/xen: split off mmu_pv.c")
from the xen-tip tree.
I dropped the xen-tip tree for today, please get together and sort
thes
7d3f7d ("x86/xen/gdt: Use X86_FEATURE_XENPV instead of globals for the
GDT fixup")
from the tip tree and commits:
75cd32d6093e ("x86/xen: split off enlighten_pv.c")
from the xen-tip tree.
I dropped the xen-tip tree for today (see other conflict reports),
please get together an
inimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc include/linux/cpuhotplug.h
index a8ffc405f915,5f603166831c..
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@@ -36,20 -20,11 +36,22 @@@ enum cpuhp_state
Hi Boris,
On Mon, 25 Jul 2016 18:25:00 -0400 Boris Ostrovsky
wrote:
>
> > Jeremy Fitzhardinge
>
> Jeremy is no longer involved with Xen. However,
>
> Juergen Gross
>
> is also Linux Xen/x86 maintainer.
I have replaced Jeremy with Juergen.
-
may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/xen/smp.c
index 09d5cc062dbe,0b4d04c8ab4d..
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@@ -486,7 -495
ider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/x86/xen/enlighten.c
index dc96f939af88,85ef4c0442e0..
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@@ -1803,49 -18
have added them as contacts for the xen-tip tree. The complete list is
now:
Jeremy Fitzhardinge
Konrad Rzeszutek Wilk
Stefano Stabellini
Xen Devel
Please let me know if you need further changes.
--
Cheers,
Stephen Rothwell
___
Xen-devel mail
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/block/xen-blkfront.c
index ab382c7997b8,ca0536eb7037..
--- a/drivers/block/xen-blkfront.c
+++ b/dri
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm/xen/enlighten.c
index d822e2313950,2f4c3aa540eb..
--- a/arch/arm/xen/enlighten.c
+++ b/arch/arm/xen/enlighten.c
@@@ -334,8 -414,12 +397,8 @@@ static
ith the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/acpi/scan.c
index 405056b95b05,cfc73fecaba4..
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@@ -1925,8 -1961,19 +1970,21 @@@ static int
entioned to your upstream maintainer 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.
From: Stephen Rothwell
Date: Mon, 2 May 2016 14:47:32 +1000
Subject: [PATCH] xen: efi
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/firmware/efi/arm-runtime.c
index 17ccf0a8787a,ac609b9f0b99..
--- a/drivers/firmware/efi/arm-runtime.c
+++ b
consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc arch/arm64/kernel/setup.c
index 65f515949baa,7cf992fe6684..
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@
clock support for arm/arm64.
> - - Add grant copy ioctl to gntdev device.
So the version I have of this in linux-next has not been updated since
Dec 2 and is based on v4.4-rc1. The version above is based on
v4.4-rc6 and has extra commits ... Did someone forget to update the
xen-tip/linux-nex
t;)
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/x86/xen/p2m.c
index 660b3cfef234,4ea676a49b6b..
--- a/arch/x86/xen/p2m.c
+++ b/arch/x8
ode for Xen PMU")
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/x86/xen/Makefile
index 4b6e29ac0968,071fab5c720e..
--- a/arch/x86/
tialization code for Xen PMU")
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc arch/x86/xen/enlighten.c
index d9cfa452da9d,a1c2e46206a9..00
Hi Dave,
On Mon, 01 Jun 2015 15:59:31 -0700 (PDT) David Miller
wrote:
>
> From: Stephen Rothwell
> Date: Fri, 29 May 2015 19:18:47 +1000
>
> > Nothing in asm/io.h uses anything from vmalloc.h, so remove the include
> > and fix up the build problems in an allmodc
Hi Takashi,
On Fri, 29 May 2015 14:43:14 +0200 Takashi Iwai wrote:
>
> For the sound bits,
> Acked-by: Takashi Iwai
Thanks, noted.
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp1PQXudZGcP.pgp
Description: OpenPGP digital
est.
Good idea. the allnoconfigs produced this further patch. I will
squash it into the original. The defconfigs built ok.
From: Stephen Rothwell
Date: Fri, 29 May 2015 22:01:41 +1000
Subject: [PATCH] x86: more fixes for removing vmalloc.h fron asm/io.h
Signed-off-by: Stephen Rothwell
---
arch
Cc: Kristen Carlson Accardi
Cc: Viresh Kumar
Cc: Vinod Koul
Cc: "K. Y. Srinivasan"
Cc: Haiyang Zhang
Cc: Hiral Patel
Cc: Suma Ramars
Cc: Brian Uchino
Cc: "James E.J. Bottomley"
Cc: Jaroslav Kysela
Cc: Takashi Iwai
Cc: Andrew Morton
Suggested-by: David Miller
Signed-
Hi all,
On Mon, 13 Apr 2015 16:36:58 +0800 Bob Liu wrote:
>
> On 04/13/2015 04:09 PM, Stephen Rothwell wrote:
> >
> > After merging the xen-tip tree, today's linux-next build (x86_64
> > allmodconfig)
> > failed like this:
> >
> > drivers/c
us.h:206:5: note: declared here
int xenbus_grant_ring(struct xenbus_device *dev, void *vaddr,
^
Caused by commit 1b1586eeeb8c ("xenbus_client: Extend interface to
support multi-page ring").
I have used the xen-tip tree from next-20150410 for today.
--
Cheers,
Stephen Rothwell
s")
from the xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc drivers/xen/Kconfig
index a31cd29b68a8,afc39ca5cc4f..
--- a/drivers/xen/Kconfig
map_pages() stub") from the akpm-current tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
diff --cc include/linux/mm.h
index 9269af7349fe,b5e28731a293..
--- a/include/li
Hi Linus,
On Mon, 22 Dec 2014 20:09:50 -0800 Linus Torvalds
wrote:
>
> On Mon, Dec 22, 2014 at 6:26 PM, Stephen Rothwell
> wrote:
> > Hi Linus,
> >
> > I have been carrying this merge fix patch for some time that is now
> > needed in your tree:
>
> N
Hi Linus,
I have been carrying this merge fix patch for some time that is now
needed in your tree:
From: Stephen Rothwell
Date: Mon, 8 Dec 2014 18:46:59 +1100
Subject: [PATCH] arm: introduce is_device_dma_coherent merge fix
The merge of the (linux-next) xen-tip tree got a conflict in
arch/arm
mmu mapping ops into arch_setup_dma_ops") from the arm-soc tree and
commit 3d5391ac6f5e ("arm: introduce is_device_dma_coherent") from the
xen-tip tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
I also neede this merge fix patch:
From: Stephen Rothwell
D
44 matches
Mail list logo
