ooaklee · Mar 27, 2026 · Mar 27, 2026 · Mar 27, 2026 · Apr 6, 2026 · Apr 7, 2026
diff --git a/.github/scripts/check-sp11-integration.sh b/.github/scripts/check-sp11-integration.sh
@@ -3,14 +3,41 @@
 
 set -euo pipefail
 
-readonly SP11_BASE_COMMIT="87bcf07d1ed79960c0f2e769ada5b8b05fd35c48"
+readonly SP11_BASE_COMMIT="e57ec2987d4540fa89280d349f79c4d9bcd7cf27"
+# This exact checkpoint imports the rebased upstream while retaining the
+# original SP11 history. Its tree was reconstructed from the 32 merged SP11
+# commits plus the existing Denali EC-reset GPIO reservation. No held topic
+# is included. Only this immutable merge may bypass the linear-topic rule;
+# its complete SP11 delta remains covered by the integration checks above.
+readonly SP11_REFRESH_COMMIT="eea05165923210e93de26484b040f3f3b398b435"
+readonly SP11_PREVIOUS_BETA_COMMIT="bf631f9a13b3f6bd622645ba95165c8098932c95"
 readonly SP11_RANGE="${SP11_BASE_COMMIT}...HEAD"
 
 die() {
 	printf 'error: %s\n' "$*" >&2
 	exit 1
 }
 
+reviewed_private_defaults_warning() {
+	local commit="$1" output="$2" diagnostics patch_id blob_id
+
+	# The Denali producer patch mutates a private defaults copy before regmap
+	# initialization. CONST_STRUCT is inapplicable to that writable argument.
+	# Pin both the patch and exact resulting source. Stable patch IDs ignore
+	# whitespace, including meaningful whitespace inside string literals.
+	# Accept exactly this one diagnostic; other findings still fail closed.
+	diagnostics="$(grep -E '^(ERROR|WARNING|CHECK):' <<<"$output" || true)"
+	[[ "$diagnostics" == \
+		'WARNING:CONST_STRUCT: struct reg_default should normally be const' ]] ||
+		return 1
+	blob_id="$(git rev-parse --verify \
+		"${commit}:sound/soc/codecs/lpass-wsa-macro.c")" || return 1
+	[[ "$blob_id" == af26d75c4017cb672722bb9e742b7c7fa24ec57e ]] || return 1
+	patch_id="$(git diff --no-ext-diff "${commit}^" "$commit" -- |
+		git patch-id --stable)" || return 1
+	[[ "${patch_id%% *}" == 5a64ac327ac508b199b27da018f14ac2d61ad0f4 ]]
+}
+
 git rev-parse --is-inside-work-tree >/dev/null 2>&1 ||
 	die "run this check from the repository worktree"
 
@@ -151,6 +178,21 @@ if [[ -n "${review_base}" || -n "${review_head}" ]]; then
 	while IFS= read -r commit; do
 		commit_and_parents=()
 		read -r -a commit_and_parents <<<"$(git rev-list --parents -n 1 "${commit}")"
+		if [[ "${commit}" == "${SP11_REFRESH_COMMIT}" ]]; then
+			((${#commit_and_parents[@]} == 3)) ||
+				die "approved upstream refresh must have two parents"
+			[[ "${commit_and_parents[1]}" == "${SP11_PREVIOUS_BETA_COMMIT}" ]] ||
+				die "approved upstream refresh has the wrong beta parent"
+			[[ "${commit_and_parents[2]}" == "${SP11_BASE_COMMIT}" ]] ||
+				die "approved upstream refresh has the wrong upstream parent"
+			git merge-base --is-ancestor "${review_base}" \
+				"${commit_and_parents[1]}" ||
+				die "approved upstream refresh does not retain the review base"
+			review_count=$((review_count + 1))
+			printf 'Approved upstream refresh %s is checked as an integration delta.\n' \
+				"${commit}"
+			continue
+		fi
 		((${#commit_and_parents[@]} == 2)) ||
 			die "topic range must be linear; merge commit found: ${commit}"
 
@@ -168,9 +210,15 @@ if [[ -n "${review_base}" || -n "${review_head}" ]]; then
 		)"
 		printf '%s\n' "${commit_checkpatch_output}"
 		if grep -qE '^(ERROR|WARNING|CHECK):' <<<"${commit_checkpatch_output}"; then
-			die "per-commit source checkpatch findings in ${commit}"
+			reviewed_private_defaults_warning "$commit" \
+				"$commit_checkpatch_output" ||
+				die "per-commit source checkpatch findings in ${commit}"
+			printf 'Reviewed private-defaults warning retained for %s.\n' "$commit"
 		fi
-	done < <(git rev-list --reverse "${review_base}..${review_head}")
+	# Upstream was rebased; its imported history is not an SP11 topic series.
+	# Exclude only the pinned upstream ancestry, never arbitrary merge parents.
+	done < <(git rev-list --reverse "${review_base}..${review_head}" \
+		"^${SP11_BASE_COMMIT}")
 
 	((review_count > 0)) || die "pull request contains no topic commits"
 	printf 'Per-commit source checks passed for %d topic commits.\n' \

diff --git a/Documentation/ABI/testing/sysfs-bus-nvdimm b/Documentation/ABI/testing/sysfs-bus-nvdimm
@@ -48,7 +48,8 @@ What:		/sys/bus/nd/devices/nmemX/cxl/id
 Date:		November 2022
 KernelVersion:	6.2
 Contact:	Dave Jiang <dave.jiang@intel.com>
-Description:	(RO) Show the id (serial) of the device. This is CXL specific.
+Description:	(RO) Show the id (serial) of the device, formatted as an
+		unsigned 64-bit decimal value. This is CXL specific.
 
 What:		/sys/bus/nd/devices/nmemX/cxl/provider
 Date:		November 2022

diff --git a/Documentation/ABI/testing/sysfs-kernel-mm-damon b/Documentation/ABI/testing/sysfs-kernel-mm-damon
@@ -112,30 +112,30 @@ Description:	Writing a value to this file sets the update interval of the
 		DAMON context in microseconds as the value.  Reading this file
 		returns the value.
 
-What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intrvals_goal/access_bp
+What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intervals_goal/access_bp
 Date:		Feb 2025
 Contact:	SJ Park <sj@kernel.org>
 Description:	Writing a value to this file sets the monitoring intervals
 		auto-tuning target DAMON-observed access events ratio within
 		the given time interval (aggrs in same directory), in bp
 		(1/10,000).  Reading this file returns the value.
 
-What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intrvals_goal/aggrs
+What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intervals_goal/aggrs
 Date:		Feb 2025
 Contact:	SJ Park <sj@kernel.org>
 Description:	Writing a value to this file sets the time interval to achieve
 		the monitoring intervals auto-tuning target DAMON-observed
 		access events ratio (access_bp in same directory) within.
 		Reading this file returns the value.
 
-What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intrvals_goal/min_sample_us
+What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intervals_goal/min_sample_us
 Date:		Feb 2025
 Contact:	SJ Park <sj@kernel.org>
 Description:	Writing a value to this file sets the minimum value of
 		auto-tuned sampling interval in microseconds.  Reading this
 		file returns the value.
 
-What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intrvals_goal/max_sample_us
+What:		/sys/kernel/mm/damon/admin/kdamonds/<K>/contexts/<C>/monitoring_attrs/intervals/intervals_goal/max_sample_us
 Date:		Feb 2025
 Contact:	SJ Park <sj@kernel.org>
 Description:	Writing a value to this file sets the maximum value of

diff --git a/Documentation/admin-guide/blockdev/zoned_loop.rst b/Documentation/admin-guide/blockdev/zoned_loop.rst
@@ -30,11 +30,10 @@ indicates the position of the write pointer of the zone.
 
 When resetting a sequential zone, its backing file size is truncated to zero.
 Conversely, for a zone finish operation, the backing file is truncated to the
-zone size. With this, the maximum capacity of a zloop zoned block device created
-can be larger configured to be larger than the storage space available on the
-backing file system. Of course, for such configuration, writing more data than
-the storage space available on the backing file system will result in write
-errors.
+zone capacity. With this, a zloop zoned block device can be configured with a
+larger capacity than the storage space available on the backing file system. Of
+course, for such configuration, writing more data than the storage space
+available on the backing file system will result in write errors.
 
 The zoned loop block device driver implements a complete zone transition state
 machine. That is, zones can be empty, implicitly opened, explicitly opened,

diff --git a/Documentation/admin-guide/cgroup-v1/memory.rst b/Documentation/admin-guide/cgroup-v1/memory.rst
@@ -47,7 +47,6 @@ Features:
  - pages are linked to per-memcg LRU exclusively, and there is no global LRU.
  - optionally, memory+swap usage can be accounted and limited.
  - hierarchical accounting
- - soft limit
  - moving (recharging) account at moving a task is selectable.
  - usage threshold notifier
  - memory pressure notifier
@@ -76,10 +75,9 @@ Brief summary of control files.
  memory.memsw.failcnt		     show the number of memory+Swap hits limits
  memory.max_usage_in_bytes	     show max memory usage recorded
  memory.memsw.max_usage_in_bytes     show max memory+Swap usage recorded
- memory.soft_limit_in_bytes	     set/show soft limit of memory usage
-				     This knob is not available on CONFIG_PREEMPT_RT systems.
-                                     This knob is deprecated and shouldn't be
-                                     used.
+ memory.soft_limit_in_bytes	     This knob is deprecated and has no effect.
+                                     Writes are ignored and reads always
+                                     return the maximum value.
  memory.stat			     show various statistics
  memory.use_hierarchy		     set/show hierarchical account enabled
                                      This knob is deprecated and shouldn't be
@@ -340,9 +338,6 @@ memory.kmem.usage_in_bytes, or in a separate counter when it makes sense.
 The main "kmem" counter is fed into the main counter, so kmem charges will
 also be visible from the user counter.
 
-Currently no soft limit is implemented for kernel memory. It is future work
-to trigger slab reclaim when those limits are reached.
-
 2.7.1 Current Kernel Memory resources accounted
 -----------------------------------------------
 
@@ -710,42 +705,10 @@ For compatibility reasons writing 1 to memory.use_hierarchy will always pass::
 
 THIS IS DEPRECATED!
 
-Soft limits allow for greater sharing of memory. The idea behind soft limits
-is to allow control groups to use as much of the memory as needed, provided
-
-a. There is no memory contention
-b. They do not exceed their hard limit
-
-When the system detects memory contention or low memory, control groups
-are pushed back to their soft limits. If the soft limit of each control
-group is very high, they are pushed back as much as possible to make
-sure that one control group does not starve the others of memory.
-
-Please note that soft limits is a best-effort feature; it comes with
-no guarantees, but it does its best to make sure that when memory is
-heavily contended for, memory is allocated based on the soft limit
-hints/setup. Currently soft limit based reclaim is set up such that
-it gets invoked from balance_pgdat (kswapd).
-
-7.1 Interface
--------------
-
-Soft limits can be setup by using the following commands (in this example we
-assume a soft limit of 256 MiB)::
-
-	# echo 256M > memory.soft_limit_in_bytes
-
-If we want to change this to 1G, we can at any time use::
+Writing to memory.soft_limit_in_bytes has no effect and reading it will
+always return the maximum value.
 
-	# echo 1G > memory.soft_limit_in_bytes
-
-.. note::
-       Soft limits take effect over a long period of time, since they involve
-       reclaiming memory for balancing between memory cgroups
-
-.. note::
-       It is recommended to set the soft limit always below the hard limit,
-       otherwise the hard limit will take precedence.
+Use memory.low and memory.min in cgroup v2 instead.
 
 .. _cgroup-v1-memory-move-charges:
 

diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -1137,6 +1137,11 @@ properties:
           - const: qcom,x1e001de
           - const: qcom,x1e80100
 
+      - items:
+          - const: lenovo,hamoa-ideacentre-mini-01q8x10
+          - const: lenovo,ideacentre-mini-01q8x10
+          - const: qcom,x1e80100
+
       - items:
           - enum:
               - lenovo,thinkpad-t14s-lcd
@@ -1174,7 +1179,6 @@ properties:
               - hp,elitebook-6-g1q
               - hp,elitebook-ultra-g1q
               - hp,omnibook-x14
-              - lenovo,ideacentre-mini-01q8x10
               - lenovo,yoga-slim7x
               - microsoft,romulus13
               - microsoft,romulus15
@@ -1199,6 +1203,11 @@ properties:
           - const: microsoft,denali
           - const: qcom,x1e80100
 
+      - items:
+          - const: lenovo,purwa-ideacentre-mini-01q8x10
+          - const: lenovo,ideacentre-mini-01q8x10
+          - const: qcom,x1p42100
+
       - items:
           - const: microsoft,surface-pro-12in
           - const: qcom,x1p42100
@@ -1222,6 +1231,13 @@ properties:
           - const: qcom,x1p64100
           - const: qcom,x1e80100
 
+      - items:
+          - enum:
+              - lenovo,ideapad-slim5x-lcd
+              - lenovo,ideapad-slim5x-oled
+          - const: lenovo,ideapad-5
+          - const: qcom,x1p42100
+
       - items:
           - enum:
               - acer,swift-go14-01

diff --git a/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml b/Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml
@@ -117,7 +117,9 @@ allOf:
         compatible:
           not:
             contains:
-              const: fsl,imx91-isi
+              enum:
+                - fsl,imx8ulp-isi
+                - fsl,imx91-isi
     then:
       required:
         - fsl,blk-ctrl

diff --git a/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml b/Documentation/devicetree/bindings/sound/qcom,sm8250.yaml
@@ -29,6 +29,9 @@ properties:
               - qcom,sm8650-sndcard
               - qcom,sm8750-sndcard
           - const: qcom,sm8450-sndcard
+      - items:
+          - const: microsoft,denali-sndcard
+          - const: qcom,x1e80100-sndcard
       - enum:
           - dell,xps13-9345-sndcard
           - fairphone,fp4-sndcard

diff --git a/Documentation/devicetree/bindings/sound/qcom,wsa8840.yaml b/Documentation/devicetree/bindings/sound/qcom,wsa8840.yaml
@@ -40,8 +40,39 @@ properties:
     minItems: 6
     maxItems: 6
 
+  qcom,enable-cps:
+    type: boolean
+    description: Enable the dedicated CPS SoundWire source DAI on data port 6.
+
+  qcom,cps-offset1:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    maximum: 255
+    description: |
+      Slave-only SoundWire DP6 OffsetCtrl1 override for CPS. This does not
+      change the physical master-port schedule selected by qcom,port-mapping.
+
+  qcom,visense-channel-mask:
+    $ref: /schemas/types.yaml#/definitions/uint32
+    minimum: 1
+    maximum: 255
+    description: |
+      Native WSA data-port-5 channel-enable mask for the VISENSE protection
+      sidechain. If absent, the codec default is used.
+
+  qcom,speaker-load-ohms:
+    enum: [4, 8]
+    description: |
+      Nominal speaker load impedance in ohms. A 4-ohm load selects the
+      matching PA gain and PBR thresholds when the amplifier reports a 2S
+      VPHX supply. If absent, the existing 8-ohm defaults are retained.
+
   '#sound-dai-cells':
-    const: 0
+    enum: [0, 1]
+    description: |
+      Zero selects the legacy single speaker-playback DAI. With one cell,
+      DAI 0 is speaker playback, DAI 1 is the render-coupled VISENSE
+      protection-feedback sidechain, and DAI 2 is the dedicated CPS feedback
+      sidechain when qcom,enable-cps is present.
 
   vdd-1p8-supply: true
   vdd-io-supply: true
@@ -75,7 +106,7 @@ examples:
             pinctrl-names = "default";
             pinctrl-0 = <&spkr_2_sd_n_active>;
             powerdown-gpios = <&lpass_tlmm 18 GPIO_ACTIVE_LOW>;
-            #sound-dai-cells = <0>;
+            #sound-dai-cells = <1>;
             sound-name-prefix = "SpkrRight";
             vdd-1p8-supply = <&vreg_l15b_1p8>;
             vdd-io-supply = <&vreg_l3g_1p2>;

diff --git a/Documentation/devicetree/bindings/usb/parade,ps8830.yaml b/Documentation/devicetree/bindings/usb/parade,ps8830.yaml
@@ -66,12 +66,6 @@ properties:
           Sideband Use (SBU) AUX lines endpoint to the Type-C connector for the purpose of
           handling altmode muxing and orientation switching.
 
-  parade,disable-usb4:
-    type: boolean
-    description:
-      When present, the retimer rejects USB4 mode (returns -EOPNOTSUPP).
-      This forces the Type-C stack to fall back to USB3 + DP Alternate Mode.
-
 required:
   - compatible
   - reg

diff --git a/Documentation/filesystems/fscrypt.rst b/Documentation/filesystems/fscrypt.rst
@@ -1238,6 +1238,10 @@ astute users may notice some differences in behavior:
 
 - DAX (Direct Access) is not supported on encrypted files.
 
+- Encrypted files cannot be used directly as swap files.  To swap to
+  an encrypted file, set up a loopback device on top of it.
+  Alternatively, encrypted swap can use a dm-crypt device.
+
 - The maximum length of an encrypted symlink is 2 bytes shorter than
   the maximum length of an unencrypted symlink.  For example, on an
   EXT4 filesystem with a 4K block size, unencrypted symlinks can be up

diff --git a/Documentation/trace/hisi-ptt.rst b/Documentation/trace/hisi-ptt.rst
@@ -285,20 +285,20 @@ according to the format described previously (take 8DW as an example):
     [...perf headers and other information]
     . ... HISI PTT data: size 4194304 bytes
     .  00000000: 00 00 00 00                                 Prefix
-    .  00000004: 01 00 00 60                                 Header DW0
-    .  00000008: 0f 1e 00 01                                 Header DW1
-    .  0000000c: 04 00 00 00                                 Header DW2
-    .  00000010: 40 00 81 02                                 Header DW3
-    .  00000014: 33 c0 04 00                                 Time
+    .  00000004: 60 00 00 01                                 Header DW0
+    .  00000008: 01 00 1e 0f                                 Header DW1
+    .  0000000c: 00 00 00 04                                 Header DW2
+    .  00000010: 02 81 00 40                                 Header DW3
+    .  00000014: 00 04 c0 33                                 Time
     .  00000020: 00 00 00 00                                 Prefix
-    .  00000024: 01 00 00 60                                 Header DW0
-    .  00000028: 0f 1e 00 01                                 Header DW1
-    .  0000002c: 04 00 00 00                                 Header DW2
-    .  00000030: 40 00 81 02                                 Header DW3
-    .  00000034: 02 00 00 00                                 Time
+    .  00000024: 60 00 00 01                                 Header DW0
+    .  00000028: 01 00 1e 0f                                 Header DW1
+    .  0000002c: 00 00 00 04                                 Header DW2
+    .  00000030: 02 81 00 40                                 Header DW3
+    .  00000034: 00 00 00 02                                 Time
     .  00000040: 00 00 00 00                                 Prefix
-    .  00000044: 01 00 00 60                                 Header DW0
-    .  00000048: 0f 1e 00 01                                 Header DW1
-    .  0000004c: 04 00 00 00                                 Header DW2
-    .  00000050: 40 00 81 02                                 Header DW3
+    .  00000044: 60 00 00 01                                 Header DW0
+    .  00000048: 01 00 1e 0f                                 Header DW1
+    .  0000004c: 00 00 00 04                                 Header DW2
+    .  00000050: 02 81 00 40                                 Header DW3
     [...]