From: Mark Brown <broonie@kernel•org>
To: Michal Simek <michal.simek@amd•com>
Cc: Michal Simek <monstr@monstr•eu>, Arnd Bergmann <arnd@arndb•de>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Michael Walle <mwalle@kernel•org>, Nishanth Menon <nm@ti•com>
Subject: Re: linux-next: manual merge of the xilinx tree with the ti tree
Date: Mon, 19 Jan 2026 15:21:44 +0000 [thread overview]
Message-ID: <c9d3063a-a652-4db9-8e62-3be34ccb27ef@sirena.org.uk> (raw)
In-Reply-To: <723362a0-579a-4ed4-ad90-dc5eea4ae902@amd.com>
[-- Attachment #1: Type: text/plain, Size: 329 bytes --]
On Mon, Jan 19, 2026 at 04:17:46PM +0100, Michal Simek wrote:
> I have sent merge request to Arnd today. My 2 patches are in Linux-next for
> a while that's why it is new change coming from that second tree.
The merge order is fixed so it's just a question of which tree was
already merged which shows as the conflicting tree.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2026-01-19 15:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-19 15:14 linux-next: manual merge of the xilinx tree with the ti tree Mark Brown
2026-01-19 15:17 ` Michal Simek
2026-01-19 15:21 ` Mark Brown [this message]
2026-01-20 12:23 ` Nishanth Menon
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=c9d3063a-a652-4db9-8e62-3be34ccb27ef@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=michal.simek@amd$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=mwalle@kernel$(echo .)org \
--cc=nm@ti$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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