Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Minor overlapping changes in the btusb and ixgbe drivers. Signed-off-by: David S. Miller <davem@davemloft.net>
2019-09-15 14:17:27 +02:00
parent a3d3c74da4 1609d7604b
commit aa2eaa8c27
159 changed files with 1670 additions and 1375 deletions
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -631,6 +631,9 @@ config SBITMAP
 config PARMAN
 	tristate "parman" if COMPILE_TEST

+config OBJAGG
+	tristate "objagg" if COMPILE_TEST
+
 config STRING_SELFTEST
 	tristate "Test string functions"

@@ -653,6 +656,3 @@ config GENERIC_LIB_CMPDI2

 config GENERIC_LIB_UCMPDI2
 	bool
-
-config OBJAGG
-	tristate "objagg" if COMPILE_TEST