public inbox for linux-next@vger.kernel.org 
 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,
	Andy Grover <agrover@redhat•com>
Subject: linux-next: manual merge of the target-updates tree with Linus' tree
Date: Mon, 1 Jun 2015 21:09:43 +1000	[thread overview]
Message-ID: <20150601210943.33d57b7e@canb.auug.org.au> (raw)

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

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/target/target_core_transport.c between commit a3541703ebbf
("target: Use a PASSTHROUGH flag instead of transport_types") from
Linus' tree and commit 50c44f9b1587 ("target: Add support for fabric
IRQ completion") from the target-updates tree.

I fixed it up (see 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_transport.c
index 2b17bddeff0f,a98a23c475b2..000000000000
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
@@@ -1767,11 -1767,11 +1768,11 @@@ static int target_write_prot_action(str
  			break;
  
  		sectors = cmd->data_length >> ilog2(cmd->se_dev->dev_attrib.block_size);
- 		cmd->pi_err = sbc_dif_verify_write(cmd, cmd->t_task_lba,
- 						   sectors, 0, NULL, 0);
+ 		cmd->pi_err = sbc_dif_verify(cmd, cmd->t_task_lba,
+ 					     sectors, 0, cmd->t_prot_sg, 0);
  		if (unlikely(cmd->pi_err)) {
  			spin_lock_irq(&cmd->t_state_lock);
 -			cmd->transport_state &= ~CMD_T_BUSY|CMD_T_SENT;
 +			cmd->transport_state &= ~(CMD_T_BUSY|CMD_T_SENT);
  			spin_unlock_irq(&cmd->t_state_lock);
  			transport_generic_request_failure(cmd, cmd->pi_err);
  			return -1;
@@@ -1913,8 -1914,8 +1915,8 @@@ static bool transport_complete_task_att
  {
  	struct se_device *dev = cmd->se_dev;
  
 -	if (dev->transport->transport_type == TRANSPORT_PLUGIN_PHBA_PDEV)
 +	if (dev->transport->transport_flags & TRANSPORT_FLAG_PASSTHROUGH)
- 		return;
+ 		return true;
  
  	if (cmd->sam_task_attr == TCM_SIMPLE_TAG) {
  		atomic_dec_mb(&dev->simple_cmds);

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

next             reply	other threads:[~2015-06-01 11:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-01 11:09 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:05 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=20150601210943.33d57b7e@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=agrover@redhat$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=nab@linux-iscsi$(echo .)org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox