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

Conflicts:
	drivers/net/ethernet/rocker/rocker.c

The rocker commit was two overlapping changes, one to rename
the ->vport member to ->pport, and another making the bitmask
expression use '1ULL' instead of plain '1'.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 21 insertions, 1 deletions

diff --git a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
index ab838d9e28b6..22da9c2ffa22 100644
--- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig
@@ -79,7 +79,7 @@ config I2C_AMD8111
 
 config I2C_HIX5HD2
         tristate "Hix5hd2 high-speed I2C driver"
-        depends on ARCH_HIX5HD2
+        depends on ARCH_HIX5HD2 || COMPILE_TEST
         help
           Say Y here to include support for high-speed I2C controller in the
           Hisilicon based hix5hd2 SoCs.
@@ -372,6 +372,16 @@ config I2C_BCM2835
           This support is also available as a module.  If so, the module
           will be called i2c-bcm2835.
 
+config I2C_BCM_IPROC
+        tristate "Broadcom iProc I2C controller"
+        depends on ARCH_BCM_IPROC || COMPILE_TEST
+        default ARCH_BCM_IPROC
+        help
+          If you say yes to this option, support will be included for the
+          Broadcom iProc I2C controller.
+
+          If you don't know what to do here, say N.
+
 config I2C_BCM_KONA
         tristate "BCM Kona I2C adapter"
         depends on ARCH_BCM_MOBILE
@@ -465,6 +475,16 @@ config I2C_DESIGNWARE_PCI
           This driver can also be built as a module.  If so, the module
           will be called i2c-designware-pci.
 
+config I2C_DESIGNWARE_BAYTRAIL
+        bool "Intel Baytrail I2C semaphore support"
+        depends on I2C_DESIGNWARE_PLATFORM && IOSF_MBI=y && ACPI
+        help
+          This driver enables managed host access to the PMIC I2C bus on select
+          Intel BayTrail platforms using the X-Powers AXP288 PMIC. It allows
+          the host to request uninterrupted access to the PMIC's I2C bus from
+          the platform firmware controlling it. You should say Y if running on
+          a BayTrail system using the AXP288.
+
 config I2C_EFM32
         tristate "EFM32 I2C controller"
         depends on ARCH_EFM32 || COMPILE_TEST