lkml.org 
[lkml]   [2022]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the kspp tree with the arm64 tree
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
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2022-10-05 02:22    [W:0.062 / U:1.344 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site