diff mbox series

[5.11,025/152] scsi: qla2xxx: Fix broken #endif placement

Message ID	20210405085035.064655477@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Himanshu Madhani <himanshu.madhani@oracle.com>, Alexey Dobriyan <adobriyan@gmail.com>, "Martin K. Petersen" <martin.petersen@oracle.com>, Sasha Levin <sashal@kernel.org> Subject: [PATCH 5.11 025/152] scsi: qla2xxx: Fix broken #endif placement Date: Mon, 5 Apr 2021 10:52:54 +0200 Message-Id: <20210405085035.064655477@linuxfoundation.org> In-Reply-To: <20210405085034.233917714@linuxfoundation.org> References: <20210405085034.233917714@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.11,004/152] ext4: fix bh ref count on error paths [5.11,006/152] rpc: fix NULL dereference on kmalloc failure [5.11,008/152] ASoC: rt1015: fix i2c communication error [5.11,010/152] ASoC: rt5651: Fix dac- and adc- vol-tlv values being off by a factor of 10 [5.11,011/152] ASoC: sgtl5000: set DAP_AVC_CTRL register to correct default value on probe [5.11,013/152] ASoC: soc-core: Prevent warning if no DMI table is present [5.11,014/152] ASoC: cs42l42: Fix Bitclock polarity inversion [5.11,017/152] ASoC: cs42l42: Always wait at least 3ms after reset [5.11,019/152] ASoC: mediatek: mt8192: fix tdm out data is valid on rising edge [5.11,020/152] kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing [5.11,022/152] io_uring: fix ->flags races by linked timeouts [5.11,025/152] scsi: qla2xxx: Fix broken #endif placement [5.11,026/152] staging: comedi: cb_pcidas: fix request_irq() warn [5.11,033/152] nvmet-tcp: fix kmap leak when data digest in use [5.11,034/152] io_uring: imply MSG_NOSIGNAL for send[msg]()/recv[msg]() calls [5.11,035/152] Revert "PM: ACPI: reboot: Use S5 for reboot" [5.11,036/152] nouveau: Skip unvailable ttm page entries [5.11,038/152] ext4: do not iput inode under running transaction in ext4_rename() [5.11,039/152] io_uring: call req_set_fail_links() on short send[msg]()/recv[msg]() with MSG_WAITALL [5.11,043/152] mptcp: init mptcp request socket earlier [5.11,044/152] mptcp: add a missing retransmission timer scheduling [5.11,045/152] flow_dissector: fix TTL and TOS dissection on IPv4 fragments [5.11,046/152] mptcp: fix DATA_FIN processing for orphaned sockets [5.11,048/152] can: dev: move driver related infrastructure into separate subdir [5.11,050/152] mptcp: fix race in release_cb [5.11,052/152] mptcp: fix bit MPTCP_PUSH_PENDING tests [5.11,054/152] brcmfmac: clear EAP/association status bits on linkdown events [5.11,056/152] rtw88: coex: 8821c: correct antenna switch function [5.11,057/152] netdevsim: dev: Initialize FIB module after debugfs [5.11,059/152] ath10k: hold RCU lock when calling ieee80211_find_sta_by_ifaddr() [5.11,061/152] appletalk: Fix skb allocation size in loopback case [5.11,062/152] net: ipa: remove two unused register definitions [5.11,063/152] net: ipa: use a separate pointer for adjusted GSI memory [5.11,064/152] net: ipa: fix register write command validation [5.11,067/152] bpf: Remove MTU check in __bpf_skb_max_len [5.11,068/152] ACPI: tables: x86: Reserve memory occupied by ACPI tables [5.11,069/152] ACPI: processor: Fix CPU0 wakeup in acpi_idle_play_dead() [5.11,072/152] ALSA: hda: Re-add dropped snd_poewr_change_state() calls [5.11,074/152] ALSA: hda/realtek: fix a determine_headset_type issue for a Dell AIO [5.11,077/152] xtensa: fix uaccess-related livelock in do_page_fault [5.11,080/152] KVM: SVM: ensure that EFER.SVME is set when running nested guest or on nested vmexit [5.11,081/152] PM: runtime: Fix race getting/putting suppliers at probe [5.11,082/152] PM: runtime: Fix ordering in pm_runtime_get_suppliers() [5.11,083/152] tracing: Fix stack trace event size [5.11,088/152] drm/amdkfd: dqm fence memory corruption [5.11,091/152] drm/amdgpu: fix offset calculation in amdgpu_vm_bo_clear_mappings() [5.11,093/152] drm/amdgpu: check alignment on CPU page for bo map [5.11,094/152] reiserfs: update reiserfs_xattrs_initialized() condition [5.11,097/152] drm/tegra: sor: Grab runtime PM reference across reset [5.11,099/152] pinctrl: microchip-sgpio: Fix wrong register offset for IRQ trigger [5.11,101/152] pinctrl: qcom: sc7280: Fix SDC_QDSD_PINGROUP and UFS_RESET offsets [5.11,102/152] pinctrl: qcom: sc7280: Fix SDC1_RCLK configurations [5.11,104/152] pinctrl: qcom: fix unintentional string concatenation [5.11,105/152] KVM: x86/mmu: change TDP MMU yield function returns to match cond_resched [5.11,108/152] KVM: x86/mmu: Ensure forward progress when yielding in TDP MMU iter [5.11,110/152] KVM: x86/mmu: Add lockdep when setting a TDP MMU SPTE [5.11,112/152] KVM: x86/mmu: Protect TDP MMU page table memory with RCU [5.11,115/152] KVM: x86/mmu: Dont redundantly clear TDP MMU pt memory [5.11,117/152] KVM: x86/mmu: Factor out functions to add/remove TDP MMU pages [5.11,119/152] KVM: x86: compile out TDP MMU on 32-bit systems [5.11,121/152] extcon: Add stubs for extcon_register_notifier_all() functions [5.11,123/152] firmware: stratix10-svc: reset COMMAND_RECONFIG_FLAG_PARTIAL to 0 [5.11,124/152] powerpc/pseries/mobility: use struct for shared state [5.11,126/152] usb: dwc3: pci: Enable dis_uX_susphy_quirk for Intel Merrifield [5.11,128/152] powerpc/mm/book3s64: Use the correct storage key value when calling H_PROTECT [5.11,131/152] USB: quirks: ignore remote wake-up on Fibocom L850-GL LTE modem [5.11,132/152] usb: musb: Fix suspend with devices connected for a64 [5.11,134/152] cdc-acm: fix BREAK rx code path adding necessary calls [5.11,136/152] USB: cdc-acm: downgrade message to debug [5.11,139/152] usb: gadget: udc: amd5536udc_pci fix null-ptr-dereference [5.11,140/152] usb: dwc2: Fix HPRT0.PrtSusp bit setting for HiKey 960 board. [5.11,141/152] usb: dwc2: Prevent core suspend when port connection flag is 0 [5.11,142/152] usb: dwc3: qcom: skip interconnect init for ACPI probe [5.11,146/152] staging: rtl8192e: Change state information from u16 to u8 [5.11,147/152] driver core: clear deferred probe reason on probe retry [5.11,149/152] riscv: evaluate put_user() arg before enabling user access [5.11,151/152] Revert "kernel: freezer should treat PF_IO_WORKER like PF_KTHREAD for freezing" [5.11,152/152] Revert "net: bonding: fix error return code of bond_neigh_init()"

Commit Message

Greg KH April 5, 2021, 8:52 a.m. UTC

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 mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_target.h b/drivers/scsi/qla2xxx/qla_target.h
index 10e5e6c8087d..01620f3eab39 100644
--- a/drivers/scsi/qla2xxx/qla_target.h
+++ b/drivers/scsi/qla2xxx/qla_target.h
@@ -116,7 +116,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)	\
@@ -244,6 +243,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;