summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zimmermann <tzimmermann@suse.de>2024-03-25 21:11:58 +0100
committerThomas Zimmermann <tzimmermann@suse.de>2024-03-25 21:11:58 +0100
commit7721bd14a45b6ad4b7a4476bcd0943ae15a2ad24 (patch)
tree0bc19a96fc5628d1ccc7bde0d8df05c3dbac0a0f
parent195281b6c70865ae9c7399c81b3502528032fb8b (diff)
parente8e0304f463e699870225c1bce86f3270a9dbe22 (diff)
Merge drm/drm-fixes into drm-misc-fixesHEADmain
Backmerging to get drm-misc-fixes to the state of v6.9-rc1. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
-rw-r--r--Documentation/dev-tools/checkpatch.rst4
-rw-r--r--scripts/const_structs.checkpatch2
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/dev-tools/checkpatch.rst b/Documentation/dev-tools/checkpatch.rst
index c3389c6..1279689 100644
--- a/Documentation/dev-tools/checkpatch.rst
+++ b/Documentation/dev-tools/checkpatch.rst
@@ -168,7 +168,7 @@ Available options:
- --fix
- This is an EXPERIMENTAL feature. If correctable errors exists, a file
+ This is an EXPERIMENTAL feature. If correctable errors exist, a file
<inputfile>.EXPERIMENTAL-checkpatch-fixes is created which has the
automatically fixable errors corrected.
@@ -181,7 +181,7 @@ Available options:
- --ignore-perl-version
- Override checking of perl version. Runtime errors maybe encountered after
+ Override checking of perl version. Runtime errors may be encountered after
enabling this flag if the perl version does not meet the minimum specified.
- --codespell
diff --git a/scripts/const_structs.checkpatch b/scripts/const_structs.checkpatch
index 188412a..fa96cfd 100644
--- a/scripts/const_structs.checkpatch
+++ b/scripts/const_structs.checkpatch
@@ -2,11 +2,13 @@ acpi_dock_ops
address_space_operations
backlight_ops
block_device_operations
+bus_type
clk_ops
comedi_lrange
component_ops
dentry_operations
dev_pm_ops
+device_type
dma_map_ops
driver_info
drm_connector_funcs