From: Tejun Heo <tj@kernel.org>
Date: Tue, 30 Jul 2024 19:30:11 +0000 (-1000)
Subject: Merge tag 'v6.11-rc1' into for-6.12
X-Git-Tag: v6.12-rc1~111^2~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8faf11cd192214e231626c3ee973a35d8fc33f2;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'v6.11-rc1' into for-6.12

Linux 6.11-rc1
---

c8faf11cd192214e231626c3ee973a35d8fc33f2
diff --cc MAINTAINERS
index 9e3ee22f015e7,42decde383206..8d93e2d8ce998
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -19936,19 -20296,14 +20296,27 @@@ F:	include/linux/wait.
  F:	include/uapi/linux/sched.h
  F:	kernel/sched/
  
 +SCHEDULER - SCHED_EXT
 +R:	Tejun Heo <tj@kernel.org>
 +R:	David Vernet <void@manifault.com>
 +L:	linux-kernel@vger.kernel.org
 +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 <gustavograzs@gmail.com>
+ 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 <john.g.garry@oracle.com>
  R:	Jason Yan <yanaijie@huawei.com>