From: Stephen Rothwell <sfr@canb.auug.org.au>
To: "Nicholas A. Bellinger" <nab@linux-iscsi.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Christoph Hellwig <hch@lst.de>
Subject: linux-next: manual merge of the target-updates tree with Linus' tree
Date: Mon, 1 Jun 2015 21:05:40 +1000 [thread overview]
Message-ID: <20150601210540.6ed03c8a@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 659 bytes --]
Hi Nicholas,
Today's linux-next merge of the target-updates tree got a conflict in
drivers/target/target_core_pr.c between commit d588cf8f618d (target:
Fix se_tpg_tfo->tf_subsys regression + remove tf_subsystem"") from
Linus' tree and commits c6eec4d58f5d ("target: remove tf_subsystem
pointers") and 293f3c05b01a ("target: Convert
se_node_acl->device_list[] to RCU hlist") from the target-updates tree.
I fixed it up (again, the first of the target-updates trees patches is
a subset of the one in Linus' tree) 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 --]
next reply other threads:[~2015-06-01 11:05 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 11:05 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-06-01 11:19 linux-next: manual merge of the target-updates tree with Linus' tree Stephen Rothwell
2015-06-01 11:09 Stephen Rothwell
2015-06-01 10:58 Stephen Rothwell
2015-06-01 10:48 Stephen Rothwell
2015-06-01 11:31 ` Nicholas A. Bellinger
2015-02-03 4:59 Stephen Rothwell
2015-02-02 6:35 Stephen Rothwell
2013-12-23 3:25 Stephen Rothwell
2013-11-08 6:01 Stephen Rothwell
2012-12-03 1:04 Stephen Rothwell
2012-09-17 3:28 Stephen Rothwell
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=20150601210540.6ed03c8a@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nab@linux-iscsi.org \
/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;
as well as URLs for NNTP newsgroup(s).