linux-kernel - Re: [PATCH v2 00/14] ARM: dts: imx6ull-colibri: device tree improvements

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <6a5a4a58092135ce70c404edfaf2570c926878dd.camel@toradex.com>
Date:   Fri, 6 May 2022 13:44:12 +0000
From:   Marcel Ziswiler <marcel.ziswiler@...adex.com>
To:     "shawnguo@...nel.org" <shawnguo@...nel.org>
CC:     "linux-imx@....com" <linux-imx@....com>,
        "devicetree@...r.kernel.org" <devicetree@...r.kernel.org>,
        "soc@...nel.org" <soc@...nel.org>,
        "frowand.list@...il.com" <frowand.list@...il.com>,
        "l.stach@...gutronix.de" <l.stach@...gutronix.de>,
        Denys Drozdov <denys.drozdov@...adex.com>,
        "alexander.stein@...tq-group.com" <alexander.stein@...tq-group.com>,
        "olof@...om.net" <olof@...om.net>,
        "matthias.schiffer@...group.com" <matthias.schiffer@...group.com>,
        "marex@...x.de" <marex@...x.de>,
        "linux@...linux.org.uk" <linux@...linux.org.uk>,
        "tharvey@...eworks.com" <tharvey@...eworks.com>,
        "leoyang.li@....com" <leoyang.li@....com>,
        "arnd@...db.de" <arnd@...db.de>,
        "krzk+dt@...nel.org" <krzk+dt@...nel.org>,
        "s.hauer@...gutronix.de" <s.hauer@...gutronix.de>,
        "kernel@...gutronix.de" <kernel@...gutronix.de>,
        "robh+dt@...nel.org" <robh+dt@...nel.org>,
        "linux-arm-kernel@...ts.infradead.org" 
        <linux-arm-kernel@...ts.infradead.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
        "festevam@...il.com" <festevam@...il.com>,
        Max Krummenacher <max.krummenacher@...adex.com>
Subject: Re: [PATCH v2 00/14] ARM: dts: imx6ull-colibri: device tree
 improvements

Hi Shawn

On Thu, 2022-05-05 at 10:47 +0800, Shawn Guo wrote:

[snip]

> The dts series doesn't apply to my branch.
> 
> Applying: ARM: dts: imx6ull-colibri: use pull-down for adc pins
> Applying: ARM: dts: imx6ull-colibri: change touch i2c parameters
> Applying: ARM: dts: imx6ull-colibri: add phy-supply to fec
> Applying: ARM: dts: imx6ull-colibri: add touchscreen device nodes
> Applying: ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling
> error: patch failed: arch/arm/boot/dts/imx6ull-colibri.dtsi:35
> error: arch/arm/boot/dts/imx6ull-colibri.dtsi: patch does not apply
> Patch failed at 0005 ARM: dts: imx6ull-colibri: update usdhc1 pixmux and signaling
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> Applying: ARM: dts: imx6ull-colibri: update device trees to support overlays
> Applying: ARM: dts: imx6ull-colibri: add gpio-line-names
> Applying: ARM: dts: imx6ull-colibri: add support for toradex iris carrier boards
> Applying: ARM: dts: imx6ull-colibri: add support for toradex aster carrier boards
> Applying: ARM: dts: imx6ull-colibri: fix nand bch geometry
> Applying: ARM: dts: imx6ull-colibri: add/update some comments
> error: patch failed: arch/arm/boot/dts/imx6ull-colibri.dtsi:251
> error: arch/arm/boot/dts/imx6ull-colibri.dtsi: patch does not apply
> Patch failed at 0011 ARM: dts: imx6ull-colibri: add/update some comments
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
> 
> Applying: ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi
> Applying: ARM: dts: imx6ull-colibri: improve pinctrl node names
> error: patch failed: arch/arm/boot/dts/imx6ull-colibri.dtsi:292
> error: arch/arm/boot/dts/imx6ull-colibri.dtsi: patch does not apply
> Patch failed at 0013 ARM: dts: imx6ull-colibri: improve pinctrl node names
> hint: Use 'git am --show-current-patch' to see the failed patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> 
> Shawn

I just now sent a v3 re-based on your imx/dt. I hope that applies now. Thanks!

Cheers

Marcel