Re: linux-next: manual merge of the ieee1394 tree with the origin tree

[Mark Brown]

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: signature.asc
Description: PGP signature