From: David S. Miller Date: Tue, 12 Feb 2019 04:39:56 +0000 (-0800) Subject: Merge branch 'devinfo-tweaks' X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5ed9d4f2e74595a0a2034a8c010adcdcc1d63b61;p=android-x86%2Fkernel.git Merge branch 'devinfo-tweaks' Jakub Kicinski says: ==================== devlink: minor tweaks to reported device info This series contains two minor touch ups for devlink code. First || is corrected to && in the ethtool compat code. Next patch decreases the stack allocation size. On the nfp side after further discussions with the manufacturing team we decided to realign the serial number contents slightly and rename one of the other fields from "vendor" to "mfr", short for "manufacture". v2: - add patch 3 - move board maker as a generic attribute. ==================== Signed-off-by: David S. Miller --- 5ed9d4f2e74595a0a2034a8c010adcdcc1d63b61