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

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Catalin Marinas <catalin.marinas@arm.com>
Cc: broonie@kernel.org, Kees Cook <keescook@chromium.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Mark Rutland <mark.rutland@arm.com>,
	Sami Tolvanen <samitolvanen@google.com>
Subject: Re: linux-next: manual merge of the kspp tree with the arm64 tree
Date: Wed, 5 Oct 2022 11:22:06 +1100	[thread overview]
Message-ID: <20221005112206.09278b2f@canb.auug.org.au> (raw)
In-Reply-To: <20220927185911.512737-1-broonie@kernel.org>

[-- Attachment #1: Type: text/plain, Size: 1640 bytes --]

Hi all,

On Tue, 27 Sep 2022 19:59:11 +0100 broonie@kernel.org wrote:
> 
> Today's linux-next merge of the kspp tree got a conflict in:
> 
>   arch/arm64/kernel/alternative.c
> 
> between commit:
> 
>   b723edf3a12a2 ("arm64: alternatives: make alt_region const")
> 
> from the arm64 tree and commit:
> 
>   5f20997c194e8 ("arm64: Drop unneeded __nocfi attributes")
> 
> 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.
> 
> diff --cc arch/arm64/kernel/alternative.c
> index 64045e3ef03a9,d2c66507398d7..0000000000000
> --- a/arch/arm64/kernel/alternative.c
> +++ b/arch/arm64/kernel/alternative.c
> @@@ -139,9 -133,8 +139,9 @@@ static void clean_dcache_range_nopatch(
>   	} while (cur += d_size, cur < end);
>   }
>   
> - static void __nocfi __apply_alternatives(const struct alt_region *region,
> - 					 bool is_module,
> - 					 unsigned long *feature_mask)
>  -static void __apply_alternatives(struct alt_region *region, bool is_module,
> ++static void __apply_alternatives(const struct alt_region *region,
> ++				 bool is_module,
> + 				 unsigned long *feature_mask)
>   {
>   	struct alt_instr *alt;
>   	__le32 *origptr, *updptr;

This is now a conflict between the arm64 tree and Linus' tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]