From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 26 Oct 2017 09:59:43 +0000 (+0200)
Subject: SCSI: Avoid ABI change in 4.13.6
X-Git-Tag: archive/raspbian/4.15.4-1+rpi1~1^2^2^2~8
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=efc4765201d2750723f2b6b9fc7973890a1c2cda;p=linux.git

SCSI: Avoid ABI change in 4.13.6

Hide the new bitfield from genksyms, as it's using what used to be a
padding bit.


Gbp-Pq: Topic debian
Gbp-Pq: Name scsi-avoid-abi-change-in-4.13.6.patch
---

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index 6ff1bab2367..47b51b404f3 100644
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -182,7 +182,10 @@ struct scsi_device {
 	unsigned no_dif:1;	/* T10 PI (DIF) should be disabled */
 	unsigned broken_fua:1;		/* Don't set FUA bit */
 	unsigned lun_in_cdb:1;		/* Store LUN bits in CDB[1] */
+#ifndef __GENKSYMS__
 	unsigned unmap_limit_for_ws:1;	/* Use the UNMAP limit for WRITE SAME */
+	/* 19 unused bits */
+#endif
 
 	atomic_t disk_events_disable_depth; /* disable depth for disk events */