Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230110094246.1497d12e@canb.auug.org.au>
In-Reply-To: <20230110094246.1497d12e@canb.auug.org.au>
From:   Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
Date:   Tue, 10 Jan 2023 18:18:55 +0100
Message-ID: <CACMJSescGSdZ4imkNkOEUzfkkwuy=ydHLC3gxwzBywO1bmcZMw@mail.gmail.com>
Subject: Re: linux-next: manual merge of the davinci tree with the arm-soc tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>
Cc:     Bartosz Golaszewski <brgl@bgdev.pl>,
        Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
        ARM <linux-arm-kernel@lists.infradead.org>,
        Jilin Yuan <yuanjilin@cdjrlc.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Mon, 9 Jan 2023 at 23:42, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the davinci tree got a conflict in:
>
>   arch/arm/mach-davinci/board-dm365-evm.c
>
> between commit:
>
>   fef6ca600ba7 ("ARM: davinci: remove unused board support")
>
> from the arm-soc tree and commit:
>
>   84bde55c050b ("ARM: davinci: fix repeated words in comments")
>
> from the davinci tree.
>
> I fixed it up (I removed the file) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging.  You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell

I backed out this patch, thanks!

Bart