* linux-next: manual merge of the target-updates tree with the xen-tip tree
@ 2015-04-10 8:48 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2015-04-10 8:48 UTC (permalink / raw)
To: Nicholas A. Bellinger, Jeremy Fitzhardinge, Konrad Rzeszutek Wilk,
Stefano Stabellini, Xen Devel
Cc: linux-next, linux-kernel, Christoph Hellwig, Tao Chen,
David Vrabel
[-- Attachment #1: Type: text/plain, Size: 549 bytes --]
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in
drivers/xen/xen-scsiback.c between commit 785748788baf ("xen-scsiback:
define a pr_fmt macro with xen-pvscsi") from the xen-tip tree and
commit b4dd93cb4409 ("target: simplify the target template registration
API") from the target-updates tree.
I fixed it up (the latter removed some of the code modified by the
former) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2015-04-10 8:49 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-04-10 8:48 linux-next: manual merge of the target-updates tree with the xen-tip tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox