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: <ed3a5d53-af06-498f-a8fe-0fe1e3a293bc@csgroup.eu>
Date: Thu, 7 Nov 2024 12:33:12 +0100
From: Christophe Leroy <christophe.leroy@...roup.eu>
To: Michael Ellerman <mpe@...erman.id.au>,
 Yang Li <yang.lee@...ux.alibaba.com>, npiggin@...il.com, naveen@...nel.org,
 maddy@...ux.ibm.com
Cc: linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
 Abaci Robot <abaci@...ux.alibaba.com>
Subject: Re: [PATCH -next] powerpc/machdep: Remove duplicated include in svm.c



Le 07/11/2024 à 12:29, Michael Ellerman a écrit :
> Yang Li <yang.lee@...ux.alibaba.com> writes:
>> The header files linux/mem_encrypt.h is included twice in svm.c,
>> so one inclusion of each can be removed.
>>
>> Reported-by: Abaci Robot <abaci@...ux.alibaba.com>
>> Closes: https://bugzilla.openanolis.cn/show_bug.cgi?id=11750
>> Signed-off-by: Yang Li <yang.lee@...ux.alibaba.com>
>> ---
>>   arch/powerpc/platforms/pseries/svm.c | 1 -
>>   1 file changed, 1 deletion(-)
> 
> The two includes only appear in linux-next, and they both come from
> different trees. They are required in each tree to avoid breaking the
> build.
> 
> So no one can merge this patch until the two trees are merged into mainline.

But can't those two trees coordinate the patches so that the include 
goes at the same place avoiding duplication at merge ?

Christophe

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ