Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft

677d1bb0 · Linus Torvalds <[email protected]> · 2014-05-22 04:28:21 +09:00

Pull iscsi_ibft fix from Konrad Rzeszutek Wilk:
 "Fix iBFT regression on Broadcom NICs introduced in 3.2"

* tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
  iscsi_ibft: Fix finding Broadcom specific ibft sign

Commit: 677d1bb0cbcfc43d10e95ab0c28b9045a1de7b5b
Parents: f6ce579d · 629c27aa

Merge commit. Changes below are compared with the first parent: f6ce579d.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/firmware/iscsi_ibft.c	modified	+1	−0	View file

drivers/firmware/iscsi_ibft.c

View file

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 3ee852c..071c2c9 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -756,6 +756,7 @@ static const struct {
 	 */
 	{ ACPI_SIG_IBFT },
 	{ "iBFT" },
+	{ "BIFT" },	/* Broadcom iSCSI Offload */
 };
 
 static void __init acpi_find_ibft_region(void)