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

[Takashi Sakamoto]

Hi Mark,

Thank you for reporting the merge conflict.

The ieee1394 tree has now been rebased onto v7.3 tag to include a fix from
this PR[1]. This may have introduced a conflict in the linux-next tree.

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.

Please let me know if you encounter any further issues related to ieee1394
tree.

[1] [GIT PULL] firewire fixes for v7.3-final
https://lore.kernel.org/lkml/20261018103634.GA346762@xxxxxxxxxxxxx/


Thanks

Takashi Sakamoto

On Mon, Oct 19, 2026 at 05:10:56PM +0100, Mark Brown wrote:
> Hi all,
> 
> Today's linux-next merge of the ieee1394 tree got a conflict in:
> 
>   drivers/firewire/core-transaction.c
> 
> between commit:
> 
>   7f9f2d6abc40f ("firewire: core: fix race condition in split transaction handling")
> 
> from the origin tree and commit:
> 
>   0f7228de31f1c ("firewire: core: expand close_transaction() into its callers and remove it")
> 
> from the ieee1394 tree.
> 
> I fixed it up (see below) 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.