On Fri, Dec 16, 2022 at 05:38:06PM +0100, Krzysztof Kozlowski wrote: > Possible conflicts > ================== > 1. CONFLICT (content), choose this patchset: > Documentation/devicetree/bindings/clock/qcom,gcc.yaml > > 2. CONFLICT (modify/delete) - files not present in robh/linux.git: > Documentation/devicetree/bindings/net/bluetooth/bluetooth-controller.yaml > Documentation/devicetree/bindings/power/reset/restart-handler.yaml > Documentation/devicetree/bindings/media/allwinner,sun6i-a31-isp.yaml > Documentation/devicetree/bindings/media/i2c/ovti,ov5645.yaml > Documentation/devicetree/bindings/media/i2c/st,st-vgxy61.yaml > Documentation/devicetree/bindings/input/touchscreen/himax,hx83112b.yaml > Documentation/devicetree/bindings/mips/cpus.yaml > Documentation/devicetree/bindings/gpu/host1x/nvidia,tegra234-nvdec.yaml > Documentation/devicetree/bindings/clock/qcom,dispcc-sc8280xp.yaml > > Changes since v2 > ================ > 1. trailling => trailing. > 2. Add tags. > 3. Rebase on Linus' tree, mid-merge window: v6.1-12782-g71a7507afbc3 > 4. Drop change to power/reset/restart-handler.yaml because it is not yet there. > > Changes since v1 > ================ > 1. "common parts" -> "Common Properties". > 2. Capitalize titles in other patches doing manual fixups. > 3. Drop change of quotes in common DMA bindings. > 4. Drop also "schema" from titles in few files. > 5. Add tags. > > Merging > ======= > Intention is to regenerate the commits with commands at the end of merge > window. This should go then via Rob's tree. > > Description > =========== > The Devicetree bindings document does not have to say in the title that it is a > "Devicetree binding" or "schema', but instead just describe the hardware. We > have several of such patterns, so when people copy existing bindings into new > ones, they make similar mistake. > > Goal is to get rid of cases: > git grep -h 'title: .*[bB]inding' Documentation/devicetree/bindings/ > git grep -h 'title: .*[sS]chema' Documentation/devicetree/bindings/ > > Clean this stuff with: > 1. Automated find+sed commands. > > Krzysztof Kozlowski (9): > dt-bindings: drop redundant part of title of shared bindings > dt-bindings: memory-controllers: ti,gpmc-child: drop redundant part of > title > dt-bindings: clock: st,stm32mp1-rcc: add proper title > dt-bindings: drop redundant part of title (end) > dt-bindings: drop redundant part of title (end, part two) > dt-bindings: drop redundant part of title (end, part three) > dt-bindings: drop redundant part of title (beginning) > dt-bindings: clock: drop redundant part of title > dt-bindings: drop redundant part of title (manual) Series applied. Rob
