Hi Simon, > I applied this by hand, resolving the conflict in r8a7796.dtsi. Thanks for doing this Simon. > The result is below. Wolfram, please check it. I am afraid there is something missing, though... > arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 5 +---- > arch/arm64/boot/dts/renesas/r8a7796.dtsi | 4 ---- > arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 5 +---- See the broken pattern in the diffstat? > diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a7796.dtsi > index 2a04635bc9ae..03319d008ba1 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7796.dtsi > +++ b/arch/arm64/boot/dts/renesas/r8a7796.dtsi > @@ -2,10 +2,6 @@ > * Device Tree Source for the r8a7796 SoC > * > * Copyright (C) 2016-2017 Renesas Electronics Corp. > - * > - * This file is licensed under the terms of the GNU General Public License > - * version 2. This program is licensed "as is" without any warranty of any > - * kind, whether express or implied. > */ The actual SPDX identifier like this > +// SPDX-License-Identifier: GPL-2.0 got accidently dropped. Kind regards, Wolfram
Attachment:
signature.asc
Description: PGP signature
