History

Merge tag 'char-misc-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull Char/Misc/IIO driver updates from Greg KH: "Here is the "big" set of char/misc/iio and other smaller driver subsystem updates for 6.14-rc1. Loads of different things in here this development cycle, highlights are: - ntsync "driver" to handle Windows locking types enabling Wine to work much better on many workloads (i.e. games). The driver framework was in 6.13, but now it's enabled and fully working properly. Should make many SteamOS users happy. Even comes with tests! - Large IIO driver updates and bugfixes - FPGA driver updates - Coresight driver updates - MHI driver updates - PPS driver updatesa - const bin_attribute reworking for many drivers - binder driver updates - smaller driver updates and fixes All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (311 commits) ntsync: Fix reference leaks in the remaining create ioctls. spmi: hisi-spmi-controller: Drop duplicated OF node assignment in spmi_controller_probe() spmi: Set fwnode for spmi devices ntsync: fix a file reference leak in drivers/misc/ntsync.c scripts/tags.sh: Don't tag usages of DECLARE_BITMAP dt-bindings: interconnect: qcom,msm8998-bwmon: Add SM8750 CPU BWMONs dt-bindings: interconnect: OSM L3: Document sm8650 OSM L3 compatible dt-bindings: interconnect: qcom-bwmon: Document QCS615 bwmon compatibles interconnect: sm8750: Add missing const to static qcom_icc_desc memstick: core: fix kernel-doc notation intel_th: core: fix kernel-doc warnings binder: log transaction code on failure iio: dac: ad3552r-hs: clear reset status flag iio: dac: ad3552r-common: fix ad3541/2r ranges iio: chemical: bme680: Fix uninitialized variable in __bme680_read_raw() misc: fastrpc: Fix copy buffer page size misc: fastrpc: Fix registered buffer page address misc: fastrpc: Deregister device nodes properly in error scenarios nvmem: core: improve range check for nvmem_cell_write() nvmem: qcom-spmi-sdam: Set size in struct nvmem_config ...

Linus Torvalds committed 1 year ago

Commit 13845bd2 parents 125ca74 970b975300 files · +12432 −4540Browse files

Showing the changes to scripts (2 of 300 files). Show all

Unified · Split

2 files
  1. scripts/spdxcheck.py +6 −0
  2. scripts/tags.sh +3 −1
scripts/spdxcheck.py+6−0
@@ -214,9 +214,15 @@ class id_parser(object): · 213 unmodified lines
214214 # Remove trailing xml comment closure
215215 if line.strip().endswith('-->'):
216216 expr = expr.rstrip('-->').strip()
217+ # Remove trailing Jinja2 comment closure
218+ if line.strip().endswith('#}'):
219+ expr = expr.rstrip('#}').strip()
217220 # Special case for SH magic boot code files
218221 if line.startswith('LIST \"'):
219222 expr = expr.rstrip('\"').strip()
223+ # Remove j2 comment closure
224+ if line.startswith('{#'):
225+ expr = expr.rstrip('#}').strip()
220226 self.parse(expr)
221227 self.spdx_valid += 1
222228 #
scripts/tags.sh+3−1
@@ -188,6 +188,7 @@ regex_c=( · 187 unmodified lines
188188 '/^PCI_OP_WRITE([[:space:]]*\(\w*\).*[1-4])/pci_bus_write_config_\1/'
189189 '/\<DEFINE_\(RT_MUTEX\|MUTEX\|SEMAPHORE\|SPINLOCK\)([[:space:]]*\([[:alnum:]_]*\)/\2/v/'
190190 '/\<DEFINE_\(RAW_SPINLOCK\|RWLOCK\|SEQLOCK\)([[:space:]]*\([[:alnum:]_]*\)/\2/v/'
191+ '/\<DEFINE_TIMER(\([^,)]*\),/\1/'
191192 '/\<DECLARE_\(RWSEM\|COMPLETION\)([[:space:]]*\([[:alnum:]_]\+\)/\2/v/'
192193 '/\<DECLARE_BITMAP([[:space:]]*\([[:alnum:]_]\+\)/\1/v/'
193194 '/\(^\|\s\)\(\|L\|H\)LIST_HEAD([[:space:]]*\([[:alnum:]_]*\)/\3/v/'
@@ -267,7 +268,8 @@ exuberant() · 73 unmodified lines
267268 # identifiers to ignore by ctags
268269 local ign=(
269270 ACPI_EXPORT_SYMBOL
270− DEFINE_{TRACE,MUTEX}
271+ DECLARE_BITMAP
272+ DEFINE_{TRACE,MUTEX,TIMER}
271273 EXPORT_SYMBOL EXPORT_SYMBOL_GPL
272274 EXPORT_TRACEPOINT_SYMBOL EXPORT_TRACEPOINT_SYMBOL_GPL
273275 ____cacheline_aligned ____cacheline_aligned_in_smp