From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Alexey Dobriyan <adobriyan@gmail.com>,
Himanshu Madhani <himanshu.madhani@oracle.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Sasha Levin <sashal@kernel.org>,
linux-scsi@vger.kernel.org
Subject: [PATCH AUTOSEL 4.14 12/16] scsi: qla2xxx: Fix broken #endif placement
Date: Thu, 25 Mar 2021 07:27:47 -0400 [thread overview]
Message-ID: <20210325112751.1928421-12-sashal@kernel.org> (raw)
In-Reply-To: <20210325112751.1928421-1-sashal@kernel.org>
From: Alexey Dobriyan <adobriyan@gmail.com>
[ Upstream commit 5999b9e5b1f8a2f5417b755130919b3ac96f5550 ]
Only half of the file is under include guard because terminating #endif
is placed too early.
Link: https://lore.kernel.org/r/YE4snvoW1SuwcXAn@localhost.localdomain
Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/scsi/qla2xxx/qla_target.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 511a31b359c7..f51293540a61 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -124,7 +124,6 @@
(min(1270, ((ql) > 0) ? (QLA_TGT_DATASEGS_PER_CMD_24XX + \
QLA_TGT_DATASEGS_PER_CONT_24XX*((ql) - 1)) : 0))
#endif
-#endif
#define GET_TARGET_ID(ha, iocb) ((HAS_EXTENDED_IDS(ha)) \
? le16_to_cpu((iocb)->u.isp2x.target.extended) \
@@ -257,6 +256,7 @@ struct ctio_to_2xxx {
#ifndef CTIO_RET_TYPE
#define CTIO_RET_TYPE 0x17 /* CTIO return entry */
#define ATIO_TYPE7 0x06 /* Accept target I/O entry for 24xx */
+#endif
struct fcp_hdr {
uint8_t r_ctl;
--
2.30.1
next prev parent reply other threads:[~2021-03-25 11:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-25 11:27 [PATCH AUTOSEL 4.14 01/16] ext4: fix bh ref count on error paths Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 02/16] rpc: fix NULL dereference on kmalloc failure Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 03/16] ASoC: rt5640: Fix dac- and adc- vol-tlv values being off by a factor of 10 Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 04/16] ASoC: rt5651: " Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 05/16] ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 06/16] ASoC: es8316: Simplify adc_pga_gain_tlv table Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 07/16] ASoC: cs42l42: Fix mixer volume control Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 08/16] ASoC: cs42l42: Always wait at least 3ms after reset Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 09/16] powerpc: Force inlining of cpu_has_feature() to avoid build failure Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 10/16] vhost: Fix vhost_vq_reset() Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 11/16] scsi: st: Fix a use after free in st_open() Sasha Levin
2021-03-25 11:27 ` Sasha Levin [this message]
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 13/16] staging: comedi: cb_pcidas: fix request_irq() warn Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 14/16] staging: comedi: cb_pcidas64: " Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 15/16] ASoC: rt5659: Update MCLK rate in set_sysclk() Sasha Levin
2021-03-25 11:27 ` Sasha Levin
2021-03-25 11:27 ` [PATCH AUTOSEL 4.14 16/16] ext4: do not iput inode under running transaction in ext4_rename() Sasha Levin
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=20210325112751.1928421-12-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=adobriyan@gmail.com \
--cc=himanshu.madhani@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=stable@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.