From: Ben Crocker <bcrocker(a)redhat.com>
Merge branch 'os-build' into '0114-Makefile'
# Conflicts:
# redhat/Makefile
diff a/.gitlab-ci.yml b/.gitlab-ci.yml
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,169 @@
-# CI definitions for ark-patches and internal are maintained in a single file
-# outside the main repository because the two branches are regularly merged
-# together in release branches. Rather than trying to keep the two branches in
-# sync or have merge conflicts each time we merge the two branches, the
-# definition is stored externally and included in each branch.
-#
-# To update any CI jobs, please submit any merge requests to
-#
https://gitlab.com/cki-project/kernel-ark-ci/.
-include:
- - remote:
'https://gitlab.com/cki-project/kernel-ark-ci/raw/master/gitlab-ci.yml'
+# This CI will only work for project members. CI for public contributors
+# runs via a webhook on the merge requests. There's nothing you have to do if
+# you want your changes tested -- created pipeline will be automatically
+# linked in the merge request and appropriate labels will be added to it.
+# Changes to this file will NOT be reflected in the webhook testing.
+
+stages:
+ - test
+ - build
+ - deploy
+
+workflow:
+ rules:
+ - if: $CI_MERGE_REQUEST_ID
+ - if: '$CI_PIPELINE_SOURCE == "schedule"'
+
+trigger_pipeline:
+ stage: test
+ variables:
+ # The following ones are required by CKI pipeline definition
+ git_url: ${CI_MERGE_REQUEST_PROJECT_URL}
+ branch: ${CI_MERGE_REQUEST_TARGET_BRANCH_NAME}
+ commit_hash: ${CI_COMMIT_SHA}
+ mr_id: ${CI_MERGE_REQUEST_IID}
+ mr_url: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}
+ title: ${CI_COMMIT_TITLE}
+ name: kernel-ark-${CI_MERGE_REQUEST_ID}
+
+ # We only need srpm so skip the rest of the stages
+ kernel_type: upstream
+ make_target: rpm
+ builder_image:
registry.gitlab.com/cki-project/containers/builder-rawhide
+ builder_image_tag: latest
+ srpm_make_target: dist-srpm
+ skip_build: 'true'
+ skip_publish: 'true'
+ skip_test: 'true'
+
+ trigger:
+ project: redhat/red-hat-ci-tools/kernel/cki-runs/trusted-pipelines
+ branch: kernel-ark
+ strategy: depend
+
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "schedule"'
+ when: never
+ - when: on_success
+
+# scheduled job
+merge_upstream:
+ image:
registry.gitlab.com/cki-project/containers/builder-fedora
+ variables:
+ GIT_DEPTH: "0"
+ GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
+ before_script:
+ - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
+ - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
+ - git config user.name "Fedora Kernel Team"
+ - git config user.email "kernel-team(a)fedoraproject.org"
+ - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
+ # Need SSH since the clone is set up without write access.
+ - eval $(ssh-agent -s)
+ - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+ - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
+ - chmod 644 ~/.ssh/known_hosts
+ - git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
+ - gpg2 --import "$TORVALDS_GPG_KEY"
+ script:
+ - git checkout --track origin/master && git describe
+ - git checkout --track origin/os-build && git describe
+ - export PROJECT_ID="$CI_PROJECT_ID"
+ - make dist-merge-upstream-push || exit 1
+ retry: 2
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE ==
"false"'
+
+# scheduled job
+rawhide_release:
+ image:
registry.gitlab.com/cki-project/containers/builder-fedora
+ variables:
+ GIT_DEPTH: "0"
+ GIT_CLONE_PATH: $CI_BUILDS_DIR/$CI_CONCURRENT_ID/kernel-ark
+ before_script:
+ - echo "fastestmirror=true" >> /etc/dnf/dnf.conf
+ - dnf -y install python3-gitlab git openssh-clients dnf-utils gnupg2
+ - git config user.name "Fedora Kernel Team"
+ - git config user.email "kernel-team(a)fedoraproject.org"
+ - echo "$PYTHON_GITLAB_CONFIG" >> ~/.python-gitlab.cfg
+ # Need SSH since the clone is set up without write access.
+ - eval $(ssh-agent -s)
+ - echo "$PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+ - mkdir -p ~/.ssh
+ - chmod 700 ~/.ssh
+ - echo "$GITLAB_KNOWN_HOSTS" >> ~/.ssh/known_hosts
+ - chmod 644 ~/.ssh/known_hosts
+ - git remote add gitlab git@gitlab.com:cki-project/kernel-ark.git
+ - gpg2 --import "$TORVALDS_GPG_KEY"
+ script:
+ - git checkout --track origin/master && git describe
+ - git checkout --track origin/ark-latest && git describe
+ - git checkout --track origin/os-build && git describe
+ - export PROJECT_ID="$CI_PROJECT_ID"
+ - redhat/scripts/ci/ark-create-release.sh "master"
"$CI_PROJECT_ID" || exit_code=$?
+ - if [ $exit_code -eq 3 ]; then echo "Tag exists, halting" && exit
0; fi;
+ - if [ $exit_code -ne 0 ]; then echo "Unable to create release tag"
&& exit 1; fi;
+ - git push gitlab os-build
+ - >
+ for branch in $(git branch | grep configs/"$(date +%F)"); do
+ git push \
+ -o merge_request.create \
+ -o merge_request.target=os-build \
+ -o merge_request.remove_source_branch \
+ gitlab "$branch"
+ done;
+ - git push gitlab "$(git describe)"
+ - git push gitlab ark/*
+ - git push -f gitlab ark-latest
+ retry: 2
+ rules:
+ - if: '$CI_PIPELINE_SOURCE == "schedule" && $RAWHIDE_RELEASE ==
"true"'
+
+test_docs:
+ stage: test
+ image:
registry.gitlab.com/cki-project/containers/python
+ before_script:
+ - python3 -m venv ~/docs-venv
+ - source ~/docs-venv/bin/activate
+ - pip install sphinx
+ - cd redhat/docs/
+ script: make SPHINXOPTS="-W" html
+ rules:
+ - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "os-build"'
+ changes:
+ - redhat/docs/**/*
+
+
+docs:
+ stage: build
+ image:
registry.gitlab.com/cki-project/containers/python
+ before_script:
+ - python3 -m venv ~/docs-venv
+ - source ~/docs-venv/bin/activate
+ - pip install sphinx
+ - cd redhat/docs/
+ script: make SPHINXOPTS="-W" html
+ artifacts:
+ paths:
+ - redhat/docs/_build/html/
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "os-build"'
+ changes:
+ - redhat/docs/**/*
+
+pages:
+ stage: deploy
+ image:
registry.gitlab.com/cki-project/containers/python
+ dependencies:
+ - docs
+ script:
+ - mv redhat/docs/_build/html/ public/
+ artifacts:
+ paths:
+ - public
+ rules:
+ - if: '$CI_COMMIT_BRANCH == "os-build"'
+ changes:
+ - redhat/docs/**/*
diff a/.mailmap b/.mailmap
--- a/.mailmap
+++ b/.mailmap
@@ -9,9 +9,6 @@
#
# Please keep this list dictionary sorted.
#
-# This comment is parsed by git-shortlog:
-# repo-abbrev: /pub/scm/linux/kernel/git/
-#
Aaron Durbin <adurbin(a)google.com>
Adam Oldham <oldhamca(a)gmail.com>
Adam Radford <aradford(a)gmail.com>
@@ -55,6 +52,8 @@ Bart Van Assche <bvanassche(a)acm.org>
<bart.vanassche(a)wdc.com>
Ben Gardner <bgardner(a)wabtec.com>
Ben M Cahill <ben.m.cahill(a)intel.com>
Björn Steinbrink <B.Steinbrink(a)gmx.de>
+Björn Töpel <bjorn(a)kernel.org> <bjorn.topel(a)gmail.com>
+Björn Töpel <bjorn(a)kernel.org> <bjorn.topel(a)intel.com>
Boris Brezillon <bbrezillon(a)kernel.org> <b.brezillon.dev(a)gmail.com>
Boris Brezillon <bbrezillon(a)kernel.org> <b.brezillon(a)overkiz.com>
Boris Brezillon <bbrezillon(a)kernel.org> <boris.brezillon(a)bootlin.com>
diff a/CREDITS b/CREDITS
--- a/CREDITS
+++ b/CREDITS
@@ -710,6 +710,10 @@ S: Las Cuevas 2385 - Bo Guemes
S: Las Heras, Mendoza CP 5539
S: Argentina
+N: Jay Cliburn
+E: jcliburn(a)gmail.com
+D: ATLX Ethernet drivers
+
N: Steven P. Cole
E: scole(a)lanl.gov
E: elenstev(a)mesatop.com
@@ -1284,6 +1288,10 @@ D: Major kbuild rework during the 2.5 cycle
D: ISDN Maintainer
S: USA
+N: Gerrit Renker
+E: gerrit(a)erg.abdn.ac.uk
+D: DCCP protocol support.
+
N: Philip Gladstone
E: philip(a)gladstonefamily.net
D: Kernel / timekeeping stuff
@@ -2138,6 +2146,10 @@ E: seasons(a)falcon.sch.bme.hu
E: seasons(a)makosteszta.sote.hu
D: Original author of software suspend
+N: Alexey Kuznetsov
+E: kuznet(a)ms2.inr.ac.ru
+D: Author and maintainer of large parts of the networking stack
+
N: Jaroslav Kysela
E: perex(a)perex.cz
W:
https://www.perex.cz
@@ -2696,6 +2708,10 @@ N: Wolfgang Muees
E: wolfgang(a)iksw-muees.de
D: Auerswald USB driver
+N: Shrijeet Mukherjee
+E: shrijeet(a)gmail.com
+D: Network routing domains (VRF).
+
N: Paul Mundt
E: paul.mundt(a)gmail.com
D: SuperH maintainer
@@ -4110,6 +4126,10 @@ S: B-1206 Jingmao Guojigongyu
S: 16 Baliqiao Nanjie, Beijing 101100
S: People's Repulic of China
+N: Aviad Yehezkel
+E: aviadye(a)nvidia.com
+D: Kernel TLS implementation and offload support.
+
N: Victor Yodaiken
E: yodaiken(a)fsmlabs.com
D: RTLinux (RealTime Linux)
@@ -4167,6 +4187,10 @@ S: 1507 145th Place SE #B5
S: Bellevue, Washington 98007
S: USA
+N: Wensong Zhang
+E: wensong(a)linux-vs.org
+D: IP virtual server (IPVS).
+
N: Haojian Zhuang
E: haojian.zhuang(a)gmail.com
D: MMP support
diff a/Documentation/ABI/testing/sysfs-class-devlink
b/Documentation/ABI/testing/sysfs-class-devlink
--- a/Documentation/ABI/testing/sysfs-class-devlink
+++ b/Documentation/ABI/testing/sysfs-class-devlink
@@ -5,8 +5,8 @@ Description:
Provide a place in sysfs for the device link objects in the
kernel at any given time. The name of a device link directory,
denoted as ... above, is of the form <supplier>--<consumer>
- where <supplier> is the supplier device name and <consumer> is
- the consumer device name.
+ where <supplier> is the supplier bus:device name and <consumer>
+ is the consumer bus:device name.
What: /sys/class/devlink/.../auto_remove_on
Date: May 2020
diff a/Documentation/ABI/testing/sysfs-devices-consumer
b/Documentation/ABI/testing/sysfs-devices-consumer
--- a/Documentation/ABI/testing/sysfs-devices-consumer
+++ b/Documentation/ABI/testing/sysfs-devices-consumer
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <saravanak(a)google.com>
Description:
The /sys/devices/.../consumer:<consumer> are symlinks to device
links where this device is the supplier. <consumer> denotes the
- name of the consumer in that device link. There can be zero or
- more of these symlinks for a given device.
+ name of the consumer in that device link and is of the form
+ bus:device name. There can be zero or more of these symlinks
+ for a given device.
diff a/Documentation/ABI/testing/sysfs-devices-supplier
b/Documentation/ABI/testing/sysfs-devices-supplier
--- a/Documentation/ABI/testing/sysfs-devices-supplier
+++ b/Documentation/ABI/testing/sysfs-devices-supplier
@@ -4,5 +4,6 @@ Contact: Saravana Kannan <saravanak(a)google.com>
Description:
The /sys/devices/.../supplier:<supplier> are symlinks to device
links where this device is the consumer. <supplier> denotes the
- name of the supplier in that device link. There can be zero or
- more of these symlinks for a given device.
+ name of the supplier in that device link and is of the form
+ bus:device name. There can be zero or more of these symlinks
+ for a given device.
diff a/Documentation/ABI/testing/sysfs-driver-ufs
b/Documentation/ABI/testing/sysfs-driver-ufs
--- a/Documentation/ABI/testing/sysfs-driver-ufs
+++ b/Documentation/ABI/testing/sysfs-driver-ufs
@@ -916,21 +916,25 @@ Date: September 2014
Contact: Subhash Jadavani <subhashj(a)codeaurora.org>
Description: This entry could be used to set or show the UFS device
runtime power management level. The current driver
- implementation supports 6 levels with next target states:
+ implementation supports 7 levels with next target states:
== ====================================================
- 0 an UFS device will stay active, an UIC link will
+ 0 UFS device will stay active, UIC link will
stay active
- 1 an UFS device will stay active, an UIC link will
+ 1 UFS device will stay active, UIC link will
hibernate
- 2 an UFS device will moved to sleep, an UIC link will
+ 2 UFS device will be moved to sleep, UIC link will
stay active
- 3 an UFS device will moved to sleep, an UIC link will
+ 3 UFS device will be moved to sleep, UIC link will
hibernate
- 4 an UFS device will be powered off, an UIC link will
+ 4 UFS device will be powered off, UIC link will
hibernate
- 5 an UFS device will be powered off, an UIC link will
+ 5 UFS device will be powered off, UIC link will
be powered off
+ 6 UFS device will be moved to deep sleep, UIC link
+ will be powered off. Note, deep sleep might not be
+ supported in which case this value will not be
+ accepted
== ====================================================
What: /sys/bus/platform/drivers/ufshcd/*/rpm_target_dev_state
@@ -954,21 +958,25 @@ Date: September 2014
Contact: Subhash Jadavani <subhashj(a)codeaurora.org>
Description: This entry could be used to set or show the UFS device
system power management level. The current driver
- implementation supports 6 levels with next target states:
+ implementation supports 7 levels with next target states:
== ====================================================
- 0 an UFS device will stay active, an UIC link will
+ 0 UFS device will stay active, UIC link will
stay active
- 1 an UFS device will stay active, an UIC link will
+ 1 UFS device will stay active, UIC link will
hibernate
- 2 an UFS device will moved to sleep, an UIC link will
+ 2 UFS device will be moved to sleep, UIC link will
stay active
- 3 an UFS device will moved to sleep, an UIC link will
+ 3 UFS device will be moved to sleep, UIC link will
hibernate
- 4 an UFS device will be powered off, an UIC link will
+ 4 UFS device will be powered off, UIC link will
hibernate
- 5 an UFS device will be powered off, an UIC link will
+ 5 UFS device will be powered off, UIC link will
be powered off
+ 6 UFS device will be moved to deep sleep, UIC link
+ will be powered off. Note, deep sleep might not be
+ supported in which case this value will not be
+ accepted
== ====================================================
What: /sys/bus/platform/drivers/ufshcd/*/spm_target_dev_state
diff a/Documentation/admin-guide/device-mapper/dm-integrity.rst
b/Documentation/admin-guide/device-mapper/dm-integrity.rst
--- a/Documentation/admin-guide/device-mapper/dm-integrity.rst
+++ b/Documentation/admin-guide/device-mapper/dm-integrity.rst
@@ -177,14 +177,20 @@ bitmap_flush_interval:number
The bitmap flush interval in milliseconds. The metadata buffers
are synchronized when this interval expires.
+allow_discards
+ Allow block discard requests (a.k.a. TRIM) for the integrity device.
+ Discards are only allowed to devices using internal hash.
+
fix_padding
Use a smaller padding of the tag area that is more
space-efficient. If this option is not present, large padding is
used - that is for compatibility with older kernels.
-allow_discards
- Allow block discard requests (a.k.a. TRIM) for the integrity device.
- Discards are only allowed to devices using internal hash.
+legacy_recalculate
+ Allow recalculating of volumes with HMAC keys. This is disabled by
+ default for security reasons - an attacker could modify the volume,
+ set recalc_sector to zero, and the kernel would not detect the
+ modification.
The journal mode (D/J), buffer_sectors, journal_watermark, commit_time and
allow_discards can be changed when reloading the target (load an inactive
diff a/Documentation/admin-guide/kernel-parameters.txt
b/Documentation/admin-guide/kernel-parameters.txt
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -5980,6 +5980,10 @@
This option is obsoleted by the "nopv" option, which
has equivalent effect for XEN platform.
+ xen_no_vector_callback
+ [KNL,X86,XEN] Disable the vector callback for Xen
+ event channel interrupts.
+
xen_scrub_pages= [XEN]
Boolean option to control scrubbing pages before giving them back
to Xen, for use by other domains. Can be also changed at runtime
diff a/Documentation/asm-annotations.rst b/Documentation/asm-annotations.rst
--- a/Documentation/asm-annotations.rst
+++ b/Documentation/asm-annotations.rst
@@ -100,6 +100,11 @@ Instruction Macros
~~~~~~~~~~~~~~~~~~
This section covers ``SYM_FUNC_*`` and ``SYM_CODE_*`` enumerated above.
+``objtool`` requires that all code must be contained in an ELF symbol. Symbol
+names that have a ``.L`` prefix do not emit symbol table entries. ``.L``
+prefixed symbols can be used within a code region, but should be avoided for
+denoting a range of code via ``SYM_*_START/END`` annotations.
+
* ``SYM_FUNC_START`` and ``SYM_FUNC_START_LOCAL`` are supposed to be **the
most frequent markings**. They are used for functions with standard calling
conventions -- global and local. Like in C, they both align the functions to
diff a/Documentation/dev-tools/kasan.rst b/Documentation/dev-tools/kasan.rst
--- a/Documentation/dev-tools/kasan.rst
+++ b/Documentation/dev-tools/kasan.rst
@@ -160,29 +160,14 @@ intended for use in production as a security mitigation. Therefore
it supports
boot parameters that allow to disable KASAN competely or otherwise control
particular KASAN features.
-The things that can be controlled are:
+- ``kasan=off`` or ``=on`` controls whether KASAN is enabled (default: ``on``).
-1. Whether KASAN is enabled at all.
-2. Whether KASAN collects and saves alloc/free stacks.
-3. Whether KASAN panics on a detected bug or not.
+- ``kasan.stacktrace=off`` or ``=on`` disables or enables alloc and free stack
+ traces collection (default: ``on`` for ``CONFIG_DEBUG_KERNEL=y``, otherwise
+ ``off``).
-The ``kasan.mode`` boot parameter allows to choose one of three main modes:
-
-- ``kasan.mode=off`` - KASAN is disabled, no tag checks are performed
-- ``kasan.mode=prod`` - only essential production features are enabled
-- ``kasan.mode=full`` - all KASAN features are enabled
-
-The chosen mode provides default control values for the features mentioned
-above. However it's also possible to override the default values by providing:
-
-- ``kasan.stacktrace=off`` or ``=on`` - enable alloc/free stack collection
- (default: ``on`` for ``mode=full``,
- otherwise ``off``)
-- ``kasan.fault=report`` or ``=panic`` - only print KASAN report or also panic
- (default: ``report``)
-
-If ``kasan.mode`` parameter is not provided, it defaults to ``full`` when
-``CONFIG_DEBUG_KERNEL`` is enabled, and to ``prod`` otherwise.
+- ``kasan.fault=report`` or ``=panic`` controls whether to only print a KASAN
+ report or also panic the kernel (default: ``report``).
For developers
~~~~~~~~~~~~~~
diff a/Documentation/dev-tools/kunit/usage.rst b/Documentation/dev-tools/kunit/usage.rst
--- a/Documentation/dev-tools/kunit/usage.rst
+++ b/Documentation/dev-tools/kunit/usage.rst
@@ -522,6 +522,63 @@ There's more boilerplate involved, but it can:
* E.g. if we wanted to also test ``sha256sum``, we could add a ``sha256``
field and reuse ``cases``.
+* be converted to a "parameterized test", see below.
+
+Parameterized Testing
+~~~~~~~~~~~~~~~~~~~~~
+
+The table-driven testing pattern is common enough that KUnit has special
+support for it.
+
+Reusing the same ``cases`` array from above, we can write the test as a
+"parameterized test" with the following.
+
+.. code-block:: c
+
+ // This is copy-pasted from above.
+ struct sha1_test_case {
+ const char *str;
+ const char *sha1;
+ };
+ struct sha1_test_case cases[] = {
+ {
+ .str = "hello world",
+ .sha1 = "2aae6c35c94fcfb415dbe95f408b9ce91ee846ed",
+ },
+ {
+ .str = "hello world!",
+ .sha1 = "430ce34d020724ed75a196dfc2ad67c77772d169",
+ },
+ };
+
+ // Need a helper function to generate a name for each test case.
+ static void case_to_desc(const struct sha1_test_case *t, char *desc)
+ {
+ strcpy(desc, t->str);
+ }
+ // Creates `sha1_gen_params()` to iterate over `cases`.
+ KUNIT_ARRAY_PARAM(sha1, cases, case_to_desc);
+
+ // Looks no different from a normal test.
+ static void sha1_test(struct kunit *test)
+ {
+ // This function can just contain the body of the for-loop.
+ // The former `cases[i]` is accessible under test->param_value.
+ char out[40];
+ struct sha1_test_case *test_param = (struct sha1_test_case *)(test->param_value);
+
+ sha1sum(test_param->str, out);
+ KUNIT_EXPECT_STREQ_MSG(test, (char *)out, test_param->sha1,
+ "sha1sum(%s)", test_param->str);
+ }
+
+ // Instead of KUNIT_CASE, we use KUNIT_CASE_PARAM and pass in the
+ // function declared by KUNIT_ARRAY_PARAM.
+ static struct kunit_case sha1_test_cases[] = {
+ KUNIT_CASE_PARAM(sha1_test, sha1_gen_params),
+ {}
+ };
+
.. _kunit-on-non-uml:
KUnit on non-UML architectures
diff a/Documentation/devicetree/bindings/arm/cpus.yaml
b/Documentation/devicetree/bindings/arm/cpus.yaml
--- a/Documentation/devicetree/bindings/arm/cpus.yaml
+++ b/Documentation/devicetree/bindings/arm/cpus.yaml
@@ -232,7 +232,6 @@ properties:
by this cpu (see ./idle-states.yaml).
capacity-dmips-mhz:
- $ref: '/schemas/types.yaml#/definitions/uint32'
description:
u32 value representing CPU capacity (see ./cpu-capacity.txt) in
DMIPS/MHz, relative to highest capacity-dmips-mhz
diff a/Documentation/devicetree/bindings/display/bridge/sii902x.txt
b/Documentation/devicetree/bindings/display/bridge/sii902x.txt
--- a/Documentation/devicetree/bindings/display/bridge/sii902x.txt
+++ b/Documentation/devicetree/bindings/display/bridge/sii902x.txt
@@ -40,7 +40,7 @@ Optional properties:
documents on how to describe the way the sii902x device is
connected to the rest of the audio system:
Documentation/devicetree/bindings/sound/simple-card.yaml
- Documentation/devicetree/bindings/sound/audio-graph-card.txt
+ Documentation/devicetree/bindings/sound/audio-graph-card.yaml
Note: In case of the audio-graph-card binding the used port
index should be 3.
diff a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
--- a/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
+++ b/Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt
@@ -23,7 +23,7 @@ connected to.
For a description of the display interface sink function blocks, see
Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt and
-Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt.
+Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.yaml.
Required properties (all function blocks):
- compatible: "mediatek,<chip>-disp-<function>", one of
@@ -61,7 +61,7 @@ Required properties (DMA function blocks):
"mediatek,<chip>-disp-wdma"
the supported chips are mt2701, mt8167 and mt8173.
- larb: Should contain a phandle pointing to the local arbiter device as defined
- in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.txt
+ in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml
- iommus: Should point to the respective IOMMU block with master port as
argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt
for details.
diff a/Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
b/Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
--- a/Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
+++ b/Documentation/devicetree/bindings/extcon/wlf,arizona.yaml
@@ -85,7 +85,6 @@ properties:
wlf,micd-timeout-ms:
description:
Timeout for microphone detection, specified in milliseconds.
- $ref: "/schemas/types.yaml#/definitions/uint32"
wlf,micd-force-micbias:
description:
diff a/Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
b/Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
--- a/Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
+++ b/Documentation/devicetree/bindings/hwmon/adi,ltc2947.yaml
@@ -49,7 +49,6 @@ properties:
description:
This property controls the Accumulation Dead band which allows to set the
level of current below which no accumulation takes place.
- $ref: /schemas/types.yaml#/definitions/uint32
maximum: 255
default: 0
diff a/Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
b/Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
--- a/Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
+++ b/Documentation/devicetree/bindings/hwmon/baikal,bt1-pvt.yaml
@@ -73,11 +73,9 @@ properties:
description: |
Temperature sensor trimming factor. It can be used to manually adjust the
temperature measurements within 7.130 degrees Celsius.
- maxItems: 1
- items:
- default: 0
- minimum: 0
- maximum: 7130
+ default: 0
+ minimum: 0
+ maximum: 7130
additionalProperties: false
diff a/Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
b/Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
--- a/Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
+++ b/Documentation/devicetree/bindings/hwmon/ti,tmp513.yaml
@@ -52,7 +52,6 @@ properties:
ti,bus-range-microvolt:
description: |
This is the operating range of the bus voltage in microvolt
- $ref: /schemas/types.yaml#/definitions/uint32
enum: [16000000, 32000000]
default: 32000000
diff a/Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
b/Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
--- a/Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
+++ b/Documentation/devicetree/bindings/i2c/i2c-gpio.yaml
@@ -39,11 +39,9 @@ properties:
i2c-gpio,delay-us:
description: delay between GPIO operations (may depend on each platform)
- $ref: /schemas/types.yaml#/definitions/uint32
i2c-gpio,timeout-ms:
description: timeout to get data
- $ref: /schemas/types.yaml#/definitions/uint32
# Deprecated properties, do not use in new device tree sources:
gpios:
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/859