All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership.com>,
	David Miller <davem@davemloft.net>, <netdev@vger.kernel.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bart Van Assche <bart.vanassche@sandisk.com>
Subject: linux-next: manual merge of the scsi tree with the net-next tree
Date: Tue, 2 Jun 2015 17:31:27 +1000	[thread overview]
Message-ID: <20150602173127.3b65697f@canb.auug.org.au> (raw)

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

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/target/target_core_user.c between commit 5538d294dd66
("treewide: Add missing vmalloc.h inclusion") from the net-next tree
and commit 7ad09a15e76b ("target: Minimize SCSI header #include
directives") from the scsi 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_user.c
index edc955558250,21b438ec4700..000000000000
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@@ -19,13 -19,13 +19,14 @@@
  #include <linux/spinlock.h>
  #include <linux/module.h>
  #include <linux/idr.h>
+ #include <linux/kernel.h>
  #include <linux/timer.h>
  #include <linux/parser.h>
 +#include <linux/vmalloc.h>
- #include <scsi/scsi.h>
- #include <scsi/scsi_host.h>
  #include <linux/uio_driver.h>
  #include <net/genetlink.h>
+ #include <scsi/scsi_common.h>
+ #include <scsi/scsi_proto.h>
  #include <target/target_core_base.h>
  #include <target/target_core_fabric.h>
  #include <target/target_core_backend.h>

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

WARNING: multiple messages have this Message-ID (diff)
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: James Bottomley <James.Bottomley@HansenPartnership.com>,
	David Miller <davem@davemloft.net>,
	netdev@vger.kernel.org
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Bart Van Assche <bart.vanassche@sandisk.com>
Subject: linux-next: manual merge of the scsi tree with the net-next tree
Date: Tue, 2 Jun 2015 17:31:27 +1000	[thread overview]
Message-ID: <20150602173127.3b65697f@canb.auug.org.au> (raw)

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

Hi James,

Today's linux-next merge of the scsi tree got a conflict in
drivers/target/target_core_user.c between commit 5538d294dd66
("treewide: Add missing vmalloc.h inclusion") from the net-next tree
and commit 7ad09a15e76b ("target: Minimize SCSI header #include
directives") from the scsi 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_user.c
index edc955558250,21b438ec4700..000000000000
--- a/drivers/target/target_core_user.c
+++ b/drivers/target/target_core_user.c
@@@ -19,13 -19,13 +19,14 @@@
  #include <linux/spinlock.h>
  #include <linux/module.h>
  #include <linux/idr.h>
+ #include <linux/kernel.h>
  #include <linux/timer.h>
  #include <linux/parser.h>
 +#include <linux/vmalloc.h>
- #include <scsi/scsi.h>
- #include <scsi/scsi_host.h>
  #include <linux/uio_driver.h>
  #include <net/genetlink.h>
+ #include <scsi/scsi_common.h>
+ #include <scsi/scsi_proto.h>
  #include <target/target_core_base.h>
  #include <target/target_core_fabric.h>
  #include <target/target_core_backend.h>

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

             reply	other threads:[~2015-06-02  7:31 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-02  7:31 Stephen Rothwell [this message]
2015-06-02  7:31 ` linux-next: manual merge of the scsi tree with the net-next tree Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2018-05-25  1:38 Mark Brown
2018-06-08  3:11 ` Stephen Rothwell
2014-07-23  6:40 Stephen Rothwell
2014-07-23  6:40 ` Stephen Rothwell
2014-07-23 15:54 ` Karen Xie

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=20150602173127.3b65697f@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=bart.vanassche@sandisk.com \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=netdev@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.