From: David S. Miller Date: Wed, 22 Mar 2017 19:38:17 +0000 (-0700) Subject: Merge branch 'fjes-fixes' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b33c0d2a1885b64dbd9e4c4513b8051c4d984c9;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git 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 --- 1b33c0d2a1885b64dbd9e4c4513b8051c4d984c9