Re: linux-next: manual merge of the kspp tree with the mm tree

[Hongbo Li <lihongbo22@huawei.com>]

On 2024/8/29 13:31, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>    include/linux/string_choices.h
> 
> between commit:
> 
>    533f2ca2a8a2 ("lib/string_choices: add str_true_false()/str_false_true() helper")
> 
> from the mm-nonmm-unstable branch of the mm tree and commits:
> 
>    a98ae7f045b2 ("lib/string_choices: Add str_up_down() helper")
>    f5c1ca3a15fd ("string_choices: Add wrapper for str_down_up()")
> 
May be there is the order trouble. In the linux-next, 
str_up_down/str_up_down have been added. And 
str_true_false()/str_false_true() helper are based on the newest linux-next.

Thanks,
Hongbo

> from the kspp 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.
>