From: Mark Brown <broonie@kernel.org>
To: Takashi Sakamoto <o-takashi@sakamocchi.jp>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the ieee1394 tree with the origin tree
Date: Tue, 20 Oct 2026 10:56:33 +0100 [thread overview]
Message-ID: <atc60bmnIKiYCUHf@sirena.co.uk> (raw)
In-Reply-To: <20261020014456.GA335452@sakamocchi.jp>
[-- Attachment #1: Type: text/plain, Size: 552 bytes --]
On Tue, Oct 20, 2026 at 10:44:56AM +0900, Takashi Sakamoto wrote:
> I believe that linux-next will merge the v7.3 tag and merges all or
> required branches onto it within a few days, at which point the conflict
> should disappear. However, I'm not entirely familiar with how you maintain
> the tree.
Yes, I always start from whatever Linus' tree is and then merge further
changes on top of it. If things are fine with Linus' tree I guess the
issue will go away today, though I don't explicitly track that for
things git can sort out automatically.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
prev parent reply other threads:[~2026-10-20 9:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-19 16:10 Mark Brown
2026-10-20 1:44 ` Takashi Sakamoto
2026-10-20 9:56 ` Mark Brown [this message]
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=atc60bmnIKiYCUHf@sirena.co.uk \
--to=broonie@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=o-takashi@sakamocchi.jp \
/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
all inboxes | Powered by JetHome®