linux-next: manual merge of the target-merge tree with the scsi tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the target-merge tree with the scsi tree
Date	2015-11-13 02:10 +0100
Message-ID	<qub2h-888-7@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

Hi Nicholas,

Today's linux-next merge of the target-merge tree got conflicts in
several files.  It looks like a newer version of all the commits in the
target-merge tree has been applied to the scsi tree, so I just dropped
the target-merge tree for today.  You might like to tidy it up with
respect to the current scsi tree.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the target-merge tree with the scsi  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-13 02:10 +0100
  Re: linux-next: manual merge of the target-merge tree with the scsi  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-11-16 03:10 +0100
    Re: linux-next: manual merge of the target-merge tree with the scsi  tree "Nicholas A. Bellinger" <nab@linux-iscsi.org> - 2015-11-16 07:00 +0100

csiph-web