summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2017-03-22 12:38:17 -0700
committerDavid S. Miller <davem@davemloft.net>2017-03-22 12:38:17 -0700
commit1b33c0d2a1885b64dbd9e4c4513b8051c4d984c9 (patch)
tree9ad04276164dcbdf7e0a7cd7e133c452de8a4497 /net
parentefad54a115c22c5eee5ac89a027d07e06fafb706 (diff)
parent2b396d302650f1ebb770ed758ddcf5a64328ffd5 (diff)
downloadlinux-1b33c0d2a1885b64dbd9e4c4513b8051c4d984c9.tar.bz2
Merge branch 'fjes-fixes'
YASUAKI ISHIMATSU says: ==================== fjes: Do not load fjes driver The fjes driver is used only by FUJITSU servers and almost of all servers in the world never use it. But currently if ACPI PNP0C02 is defined in the ACPI table, the following message is always shown: "FUJITSU Extended Socket Network Device Driver - version 1.2 - Copyright (c) 2015 FUJITSU LIMITED" The message makes users confused because there is no reason that the message is shown in other vendor servers. To avoid the confusion, the patch adds several checks. v3: - Rebase on latest net tree. - Add _STA method check to avoid loading fjes driver. v2: - Order local variable declarations from longest to shortest line ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
0 files changed, 0 insertions, 0 deletions