From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>,
Jeremy Fitzhardinge <jeremy@goop.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Xen Devel <Xen-devel@lists.xensource.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>, Tao Chen <boby.chen@huawei.com>,
David Vrabel <david.vrabel@citrix.com>
Subject: linux-next: manual merge of the target-updates tree with the xen-tip tree
Date: Fri, 10 Apr 2015 18:48:54 +1000 [thread overview]
Message-ID: <20150410184854.0b262379@canb.auug.org.au> (raw)
[-- 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 --]
reply other threads:[~2015-04-10 8:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150410184854.0b262379@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=Xen-devel@lists.xensource.com \
--cc=boby.chen@huawei.com \
--cc=david.vrabel@citrix.com \
--cc=hch@lst.de \
--cc=jeremy@goop.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nab@linux-iscsi.org \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®