Merge branch 'i2c/for-current' into i2c/for-5.11

diff --cc MAINTAINERS
index b2b505f,6f47415..1d097b9
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -11163,10 -11157,9 +11157,10 @@@ F: Documentation/devicetree/bindings/in
  F:    drivers/input/touchscreen/melfas_mip4.c
  
  MELLANOX BLUEFIELD I2C DRIVER
- M:    Khalil Blaiech <kblaiech@mellanox.com>
+ M:    Khalil Blaiech <kblaiech@nvidia.com>
  L:    linux-i2c@vger.kernel.org
  S:    Supported
 +F:    Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml
  F:    drivers/i2c/busses/i2c-mlxbf.c
  
  MELLANOX ETHERNET DRIVER (mlx4_en)

diff --cc drivers/i2c/busses/i2c-imx.c
Simple merge