From: Andrew Morton <akpm@linux-foundation.org>

Fix rejects with mainline

Cc: FUJITA Tomonori <tomof@acm.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/infiniband/ulp/srp/Kconfig |    4 ----
 1 file changed, 4 deletions(-)

diff -puN drivers/infiniband/ulp/srp/Kconfig~git-scsi-target-fixup drivers/infiniband/ulp/srp/Kconfig
--- a/drivers/infiniband/ulp/srp/Kconfig~git-scsi-target-fixup
+++ a/drivers/infiniband/ulp/srp/Kconfig
@@ -1,11 +1,7 @@
 config INFINIBAND_SRP
 	tristate "InfiniBand SCSI RDMA Protocol"
-<<<<<<< HEAD/drivers/infiniband/ulp/srp/Kconfig
-	depends on SCSI
-=======
 	depends on INFINIBAND && SCSI
 	select SCSI_SRP_ATTRS
->>>>>>> /drivers/infiniband/ulp/srp/Kconfig
 	---help---
 	  Support for the SCSI RDMA Protocol over InfiniBand.  This
 	  allows you to access storage devices that speak SRP over
_