Skip to contentSkip to conversation

linux-next: manual merge of the char-misc tree with the char-misc.current tree

DISCUSSION Mark Brown 2 participants 2 messages Sep 18 Linux-next tree

lore
Share & tools
lore

Mark Brown

author maintainer
#0 lore raw

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

drivers/android/binder.c

between commits:

c4c02084d6687 ("binder: fix leaked fd fixups on TF_UPDATE_TXN supersede") 22c135635fdd9 ("binder: fix is_failure flag for superseded transaction cleanup")

from the char-misc.current tree and commit:

fd2bc059ed466 ("binder: rm -f binder.c")

from the char-misc 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.

(Deleted the file)

#1 lore raw
Quoted 17 lines · Mark Brown

Hi all,

Today's linux-next merge of the char-misc tree got a conflict in:

drivers/android/binder.c

between commits:

c4c02084d6687 ("binder: fix leaked fd fixups on TF_UPDATE_TXN supersede") 22c135635fdd9 ("binder: fix is_failure flag for superseded transaction cleanup")

from the char-misc.current tree and commit:

fd2bc059ed466 ("binder: rm -f binder.c")

from the char-misc tree.

Quoted 8 lines

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.

(Deleted the file)

that's the correct fix, thanks!

greg k-h