From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the kbuild tree
Date: Wed, 22 Feb 2023 09:26:37 +1100 [thread overview]
Message-ID: <20230222092637.07b4b106@canb.auug.org.au> (raw)
In-Reply-To: <20230130095638.72fdea23@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 1532 bytes --]
Hi all,
On Mon, 30 Jan 2023 09:56:38 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Today's linux-next merge of the arm-soc tree got a conflict in:
>
> arch/arm/mach-s3c/Makefile
>
> between commit:
>
> 608d67522f28 ("kbuild: remove --include-dir MAKEFLAG from top Makefile")
>
> from the kbuild tree and commits:
>
> 61b7f8920b17 ("ARM: s3c: remove all s3c24xx support")
> 1ea35b355722 ("ARM: s3c: remove s3c24xx specific hacks")
>
> from the arm-soc 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/arm/mach-s3c/Makefile
> index deb44326b828,988c49672715..000000000000
> --- a/arch/arm/mach-s3c/Makefile
> +++ b/arch/arm/mach-s3c/Makefile
> @@@ -2,13 -2,7 +2,7 @@@
> #
> # Copyright 2009 Simtec Electronics
>
> - ifdef CONFIG_ARCH_S3C24XX
> - include $(srctree)/$(src)/Makefile.s3c24xx
> - endif
> -
> - ifdef CONFIG_ARCH_S3C64XX
> -include $(src)/Makefile.s3c64xx
> +include $(srctree)/$(src)/Makefile.s3c64xx
> - endif
>
> # Objects we always build independent of SoC choice
>
This is now a conflict between the kbuild 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:[~2023-02-21 22:26 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-29 22:56 linux-next: manual merge of the arm-soc tree with the kbuild tree Stephen Rothwell
2023-02-21 22:26 ` Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-17 21:16 Stephen Rothwell
2018-12-02 22:06 Stephen Rothwell
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=20230222092637.07b4b106@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=olof@lixom.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).