[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <87msibcmeb.fsf@mpe.ellerman.id.au>
Date: Thu, 07 Nov 2024 22:29:32 +1100
From: Michael Ellerman <mpe@...erman.id.au>
To: Yang Li <yang.lee@...ux.alibaba.com>, npiggin@...il.com,
christophe.leroy@...roup.eu, naveen@...nel.org, maddy@...ux.ibm.com
Cc: linuxppc-dev@...ts.ozlabs.org, linux-kernel@...r.kernel.org, Yang Li
<yang.lee@...ux.alibaba.com>, Abaci Robot <abaci@...ux.alibaba.com>
Subject: Re: [PATCH -next] powerpc/machdep: Remove duplicated include in svm.c
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.
cheers
> diff --git a/arch/powerpc/platforms/pseries/svm.c b/arch/powerpc/platforms/pseries/svm.c
> index c5d0f92c7969..384c9dc1899a 100644
> --- a/arch/powerpc/platforms/pseries/svm.c
> +++ b/arch/powerpc/platforms/pseries/svm.c
> @@ -10,7 +10,6 @@
> #include <linux/memblock.h>
> #include <linux/mem_encrypt.h>
> #include <linux/cc_platform.h>
> -#include <linux/mem_encrypt.h>
> #include <asm/machdep.h>
> #include <asm/svm.h>
> #include <asm/swiotlb.h>
> --
> 2.32.0.3.g01195cf9f
Powered by blists - more mailing lists