netdev - linux-next: manual merge of the scsi tree with the net-next tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:	Tue, 2 Jun 2015 17:31:27 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	James Bottomley <James.Bottomley@...senPartnership.com>,
	David Miller <davem@...emloft.net>, <netdev@...r.kernel.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bart Van Assche <bart.vanassche@...disk.com>
Subject: linux-next: manual merge of the scsi tree with the net-next tree

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@...b.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>

Content of type "application/pgp-signature" skipped