From: Vignesh Raghavendra <vigneshr@ti.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
William Breathitt Gray <wbg@kernel.org>,
Nishanth Menon <nm@ti.com>, Tero Kristo <kristo@kernel.org>,
Santosh Shilimkar <ssantosh@kernel.org>
Cc: Judith Mendez <jm@ti.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Siddharth Vadapalli <s-vadapalli@ti.com>
Subject: Re: linux-next: manual merge of the counter-next tree with the ti tree
Date: Mon, 1 Jul 2024 12:58:28 +0530 [thread overview]
Message-ID: <d595b624-ef18-4aac-ab2c-bd36a8c4de3d@ti.com> (raw)
In-Reply-To: <20240701163749.1cb88c8b@canb.auug.org.au>
Hi Will,
On 01/07/24 12:07, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the counter-next tree got a conflict in:
>
> arch/arm64/boot/dts/ti/k3-am62p-main.dtsi
>
> between commits:
>
> 3ad6579f106d ("arm64: dts: ti: am62p: Rename am62p-{}.dtsi to am62p-j722s-common-{}.dtsi")
> 77044cfb9346 ("arm64: dts: ti: k3-am62p-j722s: Move AM62P specific USB1 to am62p-main.dtsi")
> ed07d82f9e3e ("arm64: dts: ti: k3-am62p-j722s: Move SoC-specific node properties")
> 84935117f25f ("arm64: dts: ti: k3-am62p: Add gpio-ranges properties")
>
> from the ti tree and commit:
>
> 131eaf47c4c5 ("arm64: dts: ti: k3-am62p-main: Add eQEP nodes")
Could you please drop from your tree "arm64: dts: ti: .." patches, these need to go via TI SoC/arm64 tree.
In particular
7fb9d8854fcf(Judith Mendez)6 hours ago arm64: dts: ti: k3-am64x-sk: Enable eQEP
afdfe6439a6d(Judith Mendez)6 hours ago arm64: dts: ti: k3-am64-main: Add eQEP nodes
131eaf47c4c5(Judith Mendez)6 hours ago arm64: dts: ti: k3-am62p-main: Add eQEP nodes
ba5a251b1d53(Judith Mendez)6 hours ago arm64: dts: ti: k3-am62a-main: Add eQEP nodes
e2e1fce199b0(Judith Mendez)6 hours ago arm64: dts: ti: k3-am62-main: Add eQEP nodes
Thanks!
>
> from the counter-next tree.
>
> I don't know how to fix this up, so I just dropped the latter chanhd
> for now.
>
--
Regards
Vignesh
next prev parent reply other threads:[~2024-07-01 7:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-01 6:37 linux-next: manual merge of the counter-next tree with the ti tree Stephen Rothwell
2024-07-01 7:28 ` Vignesh Raghavendra [this message]
2024-07-01 10:08 ` William Breathitt Gray
2024-07-01 13:20 ` Raghavendra, Vignesh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=d595b624-ef18-4aac-ab2c-bd36a8c4de3d@ti.com \
--to=vigneshr@ti.com \
--cc=jm@ti.com \
--cc=kristo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=nm@ti.com \
--cc=s-vadapalli@ti.com \
--cc=sfr@canb.auug.org.au \
--cc=ssantosh@kernel.org \
--cc=wbg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox