From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>, Catalin Marinas <catalin.marinas@arm.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Scott Wood <oss@buserror.net>, Will Deacon <will.deacon@arm.com>,
Aleksey Makarov <aleksey.makarov@linaro.org>
Subject: linux-next: manual merge of the tty tree with the arm64 tree
Date: Fri, 30 Sep 2016 13:38:22 +1000 [thread overview]
Message-ID: <20160930133822.0bf16c41@canb.auug.org.au> (raw)
Hi Greg,
Today's linux-next merge of the tty tree got conflicts in:
arch/arm64/Kconfig
between commit:
1d8f51d41fc7 ("arm/arm64: arch_timer: Use archdata to indicate vdso suitability")
from the arm64 tree and commit:
888125a71298 ("ARM64: ACPI: enable ACPI_SPCR_TABLE")
from the tty 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 arch/arm64/Kconfig
index 17c14a1d9112,11a2d36b27ef..000000000000
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@@ -4,7 -4,7 +4,8 @@@ config ARM6
select ACPI_GENERIC_GSI if ACPI
select ACPI_REDUCED_HARDWARE_ONLY if ACPI
select ACPI_MCFG if ACPI
+ select ACPI_SPCR_TABLE if ACPI
+ select ARCH_CLOCKSOURCE_DATA
select ARCH_HAS_DEVMEM_IS_ALLOWED
select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI
select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
next reply other threads:[~2016-09-30 3:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-30 3:38 Stephen Rothwell [this message]
2016-09-30 5:44 ` linux-next: manual merge of the tty tree with the arm64 tree Greg KH
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=20160930133822.0bf16c41@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=aleksey.makarov@linaro.org \
--cc=catalin.marinas@arm.com \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=oss@buserror.net \
--cc=will.deacon@arm.com \
/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