From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Philipp Zabel <p.zabel@pengutronix•de>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
ARM <linux-arm-kernel@lists•infradead.org>
Cc: "Linux Kernel Mailing List" <linux-kernel@vger•kernel.org>,
"Linux Next Mailing List" <linux-next@vger•kernel.org>,
"Rafał Miłecki" <rafal@milecki•pl>
Subject: linux-next: manual merge of the reset tree with the arm-soc tree
Date: Mon, 25 Jan 2021 08:28:37 +1100 [thread overview]
Message-ID: <20210125082837.49db69eb@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1571 bytes --]
Hi all,
Today's linux-next merge of the reset tree got a conflict in:
drivers/reset/Kconfig
between commit:
89d4f98ae90d ("ARM: remove zte zx platform")
from the arm-soc tree and commit:
def26913b66f ("reset: simple: add BCM4908 MISC PCIe reset controller support")
from the reset 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.
--
Cheers,
Stephen Rothwell
diff --cc drivers/reset/Kconfig
index 8dd99ca2192c,752bef7e564f..000000000000
--- a/drivers/reset/Kconfig
+++ b/drivers/reset/Kconfig
@@@ -173,7 -173,7 +173,7 @@@ config RESET_SCM
config RESET_SIMPLE
bool "Simple Reset Controller Driver" if COMPILE_TEST
- default ARCH_AGILEX || ARCH_ASPEED || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC
- default ARCH_AGILEX || ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARCH_ZX || ARC
++ default ARCH_AGILEX || ARCH_ASPEED || ARCH_BCM4908 || ARCH_BITMAIN || ARCH_REALTEK || ARCH_STM32 || ARCH_STRATIX10 || ARCH_SUNXI || ARC
help
This enables a simple reset controller driver for reset lines that
that can be asserted and deasserted by toggling bits in a contiguous,
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-01-24 21:29 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 21:28 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2018-12-02 22:26 linux-next: manual merge of the reset tree with the arm-soc tree 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=20210125082837.49db69eb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=olof@lixom$(echo .)net \
--cc=p.zabel@pengutronix$(echo .)de \
--cc=rafal@milecki$(echo .)pl \
/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