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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4d49a148-a87d-4f10-a3b1-b908d7201a0d@huawei.com>
Date: Thu, 29 Aug 2024 16:12:34 +0800
From: Hongbo Li <lihongbo22@...wei.com>
To: Stephen Rothwell <sfr@...b.auug.org.au>, Kees Cook <kees@...nel.org>,
	Andrew Morton <akpm@...ux-foundation.org>
CC: Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Linux Next
 Mailing List <linux-next@...r.kernel.org>, Michal Wajdeczko
	<michal.wajdeczko@...el.com>
Subject: Re: linux-next: manual merge of the kspp tree with the mm tree



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.
>