Subject: linux-next: manual merge of the char-misc tree with the sched-ext tree

From: Mark Brown <[email-masked]>
Date: Fri, 21 Jun 2024 18:47:33 +0100

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

  MAINTAINERS

between commit:

  f0e1a0643a59b ("sched_ext: Implement BPF extensible scheduler class")

from the sched-ext tree and commit:

  4c4daafc996a8 ("MAINTAINERS: Add ScioSense ENS160")

from the char-misc tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

diff --cc Documentation/devicetree/bindings/vendor-prefixes.yaml
index 56ad56d7733e9,044e2001f4e3a..0000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.yaml
+++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml
@@@ -1264,8 -1254,8 +1264,10 @@@ patternProperties
      description: Smart Battery System
    "^schindler,.*":
      description: Schindler
 +  "^schneider,.*":
 +    description: Schneider Electric
+   "^sciosense,.*":
+     description: ScioSense B.V.
    "^seagate,.*":
      description: Seagate Technology PLC
    "^seeed,.*":
diff --cc MAINTAINERS
index c3a397c60b693,24d372f7653ed..0000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -20032,19 -19947,14 +20043,27 @@@ F:	include/linux/wait.
  F:	include/uapi/linux/sched.h
  F:	kernel/sched/
  
 +SCHEDULER - SCHED_EXT
 +R:	Tejun Heo <[email-masked]>
 +R:	David Vernet <[email-masked]>
 +L:	[email-masked]
 +S:	Maintained
 +W:	https://github.com/sched-ext/scx
 +T:	git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git
 +F:	include/linux/sched/ext.h
 +F:	kernel/sched/ext.h
 +F:	kernel/sched/ext.c
 +F:	tools/sched_ext/
 +F:	tools/testing/selftests/sched_ext
 +
+ SCIOSENSE ENS160 MULTI-GAS SENSOR DRIVER
+ M:	Gustavo Silva <[email-masked]>
+ S:	Maintained
+ F:	drivers/iio/chemical/ens160_core.c
+ F:	drivers/iio/chemical/ens160_i2c.c
+ F:	drivers/iio/chemical/ens160_spi.c
+ F:	drivers/iio/chemical/ens160.h
+ 
  SCSI LIBSAS SUBSYSTEM
  R:	John Garry <[email-masked]>
  R:	Jason Yan <[email-masked]>