From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>,
Russell King <linux@armlinux.org.uk>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>
Cc: Krzysztof Kozlowski <krzk@kernel.org>,
Ard Biesheuvel <ardb@kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Sam Protsenko <semen.protsenko@linaro.org>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the samsung-krzk tree with the arm tree
Date: Tue, 21 Dec 2021 08:58:38 +0100 [thread overview]
Message-ID: <bc65c2d7-7bfa-4ad5-aaff-8875370010b7@canonical.com> (raw)
In-Reply-To: <20211221095314.432527ff@canb.auug.org.au>
On 20/12/2021 23:53, Stephen Rothwell wrote:
> Hi all,
>
> On Mon, 20 Dec 2021 09:40:12 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> Today's linux-next merge of the samsung-krzk tree got a conflict in:
>>
>> arch/arm/Kconfig
>>
>> between commit:
>>
>> 54f481a2308e ("ARM: remove old-style irq entry")
>>
>> from the arm tree and commit:
>>
>> 3ac5f9db26bb ("ARM: samsung: Remove HAVE_S3C2410_I2C and use direct dependencies")
>>
>> from the samsung-krzk 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/Kconfig
>> index 15bc7fba0761,391f07c17096..000000000000
>> --- a/arch/arm/Kconfig
>> +++ b/arch/arm/Kconfig
>> @@@ -471,7 -478,7 +471,6 @@@ config ARCH_S3C24X
>> select CLKSRC_SAMSUNG_PWM
>> select GPIO_SAMSUNG
>> select GPIOLIB
>> - select HAVE_S3C2410_I2C if I2C
>> - select GENERIC_IRQ_MULTI_HANDLER
>> select NEED_MACH_IO_H
>> select S3C2410_WATCHDOG
>> select SAMSUNG_ATAGS
>
> This is now a conflict between the arm and arm-soc trees.
>
Thanks for letting us know.
Best regards,
Krzysztof
next prev parent reply other threads:[~2021-12-21 7:58 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-19 22:40 linux-next: manual merge of the samsung-krzk tree with the arm tree Stephen Rothwell
2021-12-20 22:53 ` Stephen Rothwell
2021-12-21 7:58 ` Krzysztof Kozlowski [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-06-20 23:33 Stephen Rothwell
2019-06-27 23:16 ` Stephen Rothwell
2019-07-09 0:12 ` 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=bc65c2d7-7bfa-4ad5-aaff-8875370010b7@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=krzk@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=olof@lixom.net \
--cc=semen.protsenko@linaro.org \
--cc=sfr@canb.auug.org.au \
/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