Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/powerpc/platforms/powernv/opal.c
Simple merge

diff --cc drivers/block/sunvdc.c
Simple merge

diff --cc drivers/gpu/drm/mediatek/mtk_drm_drv.c
Simple merge

diff --cc drivers/hwmon/hwmon.c
Simple merge

diff --cc drivers/i2c/i2c-core-base.c
index c24ccefb015ee2310dd41f4e5c967ff373b8e665,7c810893bfa332721d242f6c4a83f6217f22a6fc..6f6a89c1eff2d759deeb7a62d1bc71c2eb6581bf
--- 1/drivers/i2c/i2c-core-base.c
--- 2/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@@ -1310,15 -1308,6 +1310,15 @@@ new_device_store(struct device *dev, st
  }
  static DEVICE_ATTR_WO(new_device);
  
- static int __i2c_find_user_addr(struct device *dev, void *addrp)
++static int __i2c_find_user_addr(struct device *dev, const void *addrp)
 +{
 +      struct i2c_client *client = i2c_verify_client(dev);
-       unsigned short addr = *(unsigned short *)addrp;
++      unsigned short addr = *(const unsigned short *)addrp;
 +
 +      return client && client->flags & I2C_CLIENT_USER &&
 +             i2c_encode_flags_to_addr(client) == addr;
 +}
 +
  /*
   * And of course let the users delete the devices they instantiated, if
   * they got it wrong. This interface can only be used to delete devices

diff --cc drivers/leds/leds-turris-omnia.c
index 7d3b24c8ecae548640f6722f848dd7f2d9d43b8a,2de825ac08b3d7470f06ba4102b19897a8e68aa5..4fe1a9c0bc1ba3158ab4e3d077c6c65782eddb31
--- 1/drivers/leds/leds-turris-omnia.c
--- 2/drivers/leds/leds-turris-omnia.c
+++ b/drivers/leds/leds-turris-omnia.c
@@@ -435,34 -445,7 +435,34 @@@ static int omnia_mcu_get_features(cons
        if (err)
                return err;
  
 -      return le16_to_cpu(reply);
 +      return reply;
 +}
 +
- static int omnia_match_mcu_client(struct device *dev, void *data)
++static int omnia_match_mcu_client(struct device *dev, const void *data)
 +{
 +      struct i2c_client *client;
 +
 +      client = i2c_verify_client(dev);
 +      if (!client)
 +              return 0;
 +
 +      return client->addr == OMNIA_MCU_I2C_ADDR;
 +}
 +
 +static int omnia_find_mcu_and_get_features(struct device *dev)
 +{
 +      struct device *mcu_dev;
 +      int ret;
 +
 +      mcu_dev = device_find_child(dev->parent, NULL, omnia_match_mcu_client);
 +      if (!mcu_dev)
 +              return -ENODEV;
 +
 +      ret = omnia_mcu_get_features(i2c_verify_client(mcu_dev));
 +
 +      put_device(mcu_dev);
 +
 +      return ret;
  }
  
  static int omnia_leds_probe(struct i2c_client *client)

diff --cc drivers/media/pci/mgb4/mgb4_core.c
Simple merge

diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Simple merge

diff --cc drivers/of/unittest-data/tests-platform.dtsi
index cd310b26b50c811dbfe3526cf8994d18f9926aa8,2caaf1c10ee6f86dedfdc250bdebb655fe1ffe46..4171f43cf01cc7ded1a7ac2ad71afee1030248ef
--- 1/drivers/of/unittest-data/tests-platform.dtsi
--- 2/drivers/of/unittest-data/tests-platform.dtsi
+++ b/drivers/of/unittest-data/tests-platform.dtsi
@@@ -33,19 -33,11 +33,24 @@@
                                        reg = <0x100>;
                                };
                        };
+ 
+                       test-device@2 {
+                               compatible = "test,rust-device";
+                               reg = <0x2>;
+                       };
                };
 +
 +              platform-tests-2 {
 +                      // No #address-cells or #size-cells
 +                      node {
 +                              #address-cells = <1>;
 +                              #size-cells = <1>;
 +
 +                              test-device@100 {
 +                                      compatible = "test-sub-device";
 +                                      reg = <0x100 1>;
 +                              };
 +                      };
 +              };
        };
  };

diff --cc drivers/scsi/scsi_transport_iscsi.c
Simple merge

diff --cc include/linux/device/bus.h
Simple merge

diff --cc kernel/bpf/btf.c
Simple merge

diff --cc kernel/module/sysfs.c
index f99616499e2e054c9c6f62ecc51d4b2c06a5b7eb,254017b58b645d4afcf6876d29bcc2e2113a8dc4..b401ff4b02d2904d3b5fca93e10e188ddcbaf787
--- 1/kernel/module/sysfs.c
--- 2/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@@ -190,8 -196,8 +190,8 @@@ static int add_notes_attrs(struct modul
                        nattr->attr.mode = 0444;
                        nattr->size = info->sechdrs[i].sh_size;
                        nattr->private = (void *)info->sechdrs[i].sh_addr;
-                       nattr->read = sysfs_bin_attr_simple_read;
+                       nattr->read_new = sysfs_bin_attr_simple_read;
 -                      ++nattr;
 +                      *(gattr++) = nattr++;
                }
                ++loaded;
        }

diff --cc mm/slub.c
Simple merge

diff --cc net/mac80211/debugfs_netdev.c
Simple merge

diff --cc net/wireless/core.c
Simple merge

diff --cc rust/kernel/sync.rs
Simple merge