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 --]
next prev parent reply other threads:[~2022-10-05 0:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-27 18:59 linux-next: manual merge of the kspp tree with the arm64 tree broonie
2022-09-27 19:28 ` Kees Cook
2022-10-05 0:22 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-04-26 0:34 Stephen Rothwell
2016-07-21 2:34 Stephen Rothwell
2016-07-18 2:59 Stephen Rothwell
2016-07-18 4:49 ` Kees Cook
2016-07-18 5:06 ` Stephen Rothwell
2016-07-18 5:14 ` Kees Cook
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221005112206.09278b2f@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=broonie@kernel$(echo .)org \
--cc=catalin.marinas@arm$(echo .)com \
--cc=keescook@chromium$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=samitolvanen@google$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox