linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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 20:48:09 +1000	[thread overview]
Message-ID: <20150601204809.5cf1ac2b@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1445 bytes --]

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/target/target_core_configfs.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 93af633991fd ("target: don't copy fabric ops") and
f0eb815f8a53 ("target: put struct target_fabric_configfs on a diet")
from the target-updates tree.

I fixed it up (the first of the target-updates tree patches is a subset
of the patch in Linus' tree - see the result below) and can carry the
fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/target/target_core_configfs.c
index e7b0430a0575,4ada522d7bc3..000000000000
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
@@@ -1034,10 -1587,10 +1587,10 @@@ static ssize_t target_core_dev_pr_store
  	u64 sa_res_key = 0;
  	u32 mapped_lun = 0, target_lun = 0;
  	int ret = -1, res_holder = 0, all_tg_pt = 0, arg, token;
- 	u16 port_rpti = 0, tpgt = 0;
- 	u8 type = 0, scope;
+ 	u16 tpgt = 0;
+ 	u8 type = 0;
  
 -	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
 +	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)
  		return 0;
  	if (dev->dev_reservation_flags & DRF_SPC2_RESERVATIONS)
  		return 0;

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

             reply	other threads:[~2015-06-01 10:48 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-01 10:48 Stephen Rothwell [this message]
2015-06-01 11:31 ` linux-next: manual merge of the target-updates tree with Linus' tree Nicholas A. Bellinger
  -- strict thread matches above, loose matches on Subject: below --
2015-06-01 11:19 Stephen Rothwell
2015-06-01 11:09 Stephen Rothwell
2015-06-01 11:05 Stephen Rothwell
2015-06-01 10:58 Stephen Rothwell
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=20150601204809.5cf1ac2b@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).