From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Suzuki K. Poulose" <Suzuki.Poulose@arm•com>
Cc: Abhilash Kesavan <kesavan.abhilash@gmail•com>,
Olof Johansson <olof@lixom•net>, Arnd Bergmann <arnd@arndb•de>,
linux-arm-kernel <linux-arm-kernel@lists•infradead.org>,
Will Deacon <Will.Deacon@arm•com>,
"linux-next@vger•kernel.org" <linux-next@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
Geert Uytterhoeven <geert+renesas@glider•be>
Subject: Re: linux-next: manual merge of the arm-soc tree with the arm-perf tree
Date: Tue, 24 Mar 2015 08:16:10 +1100 [thread overview]
Message-ID: <20150324081610.52b1e92d@canb.auug.org.au> (raw)
In-Reply-To: <55102DAF.7050206@arm.com>
[-- Attachment #1: Type: text/plain, Size: 1940 bytes --]
Hi all,
On Mon, 23 Mar 2015 15:13:51 +0000 "Suzuki K. Poulose" <Suzuki.Poulose@arm•com> wrote:
>
> On 23/03/15 14:41, Abhilash Kesavan wrote:
> >
> > On Mon, Mar 23, 2015 at 6:03 AM, Stephen Rothwell <sfr@canb•auug.org.au> wrote:
> >>
> >> Today's linux-next merge of the arm-soc tree got a conflict in
> >> drivers/bus/Kconfig between commit c9966c98697a ("arm-cci: Split the
> >> code for PMU vs driver support") from the arm-perf tree and commit
> >> 13fbf3c8d0f7 ("drivers: bus: Sort Kconfig entries alphabetically") from
> >> the arm-soc tree.
> >>
> >> I fixed it up (see below) and can carry the fix as necessary (no action
> >> is required).
> >
> > Not sure if this has been reported elsewhere, but I am seeing core
> > boot-up failures on the exynos5420 with next-20150323 due to this.
> > Your conflict fix is missing the ARM_CCI symbol because of which the
> > CCI does not get enabled.
> >
> > Suzuki, can you confirm ?
>
> Yes, you are right. We need the config ARM_CCI even now, which enables
> the building of the arm-cci.c.
>
> Stephen,
>
> We need the following fix on the linux-next.
Oops, sorry about that. I have fixed up the merge resolution for today
so that file starts like this:
#
# Bus Devices
#
menu "Bus devices"
config ARM_CCI
bool
config ARM_CCI400_COMMON
bool
select ARM_CCI
config ARM_CCI400_PMU
bool "ARM CCI400 PMU support"
default y
depends on ARM || ARM64
depends on HW_PERF_EVENTS
select ARM_CCI400_COMMON
help
Support for PMU events monitoring on the ARM CCI cache coherent
interconnect.
If unsure, say Y
config ARM_CCI400_PORT_CTRL
bool
depends on ARM && OF && CPU_V7
select ARM_CCI400_COMMON
help
Low level power management driver for CCI400 cache coherent
interconnect for ARM platforms.
config ARM_CCN
.
.
.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2015-03-23 21:16 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-23 0:33 linux-next: manual merge of the arm-soc tree with the arm-perf tree Stephen Rothwell
2015-03-23 14:41 ` Abhilash Kesavan
2015-03-23 15:13 ` Suzuki K. Poulose
2015-03-23 21:16 ` Stephen Rothwell [this message]
2015-03-24 14:59 ` Suzuki K. Poulose
-- strict thread matches above, loose matches on Subject: below --
2024-01-02 23:03 Stephen Rothwell
2024-01-03 17:30 ` Will Deacon
2024-01-03 17:38 ` Arnd Bergmann
2014-02-21 0:58 Stephen Rothwell
2014-02-21 1:02 ` Olof Johansson
2014-02-21 11:09 ` Will Deacon
2014-02-22 0:46 ` Olof Johansson
2014-02-21 1:02 ` Stephen Boyd
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=20150324081610.52b1e92d@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Suzuki.Poulose@arm$(echo .)com \
--cc=Will.Deacon@arm$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=geert+renesas@glider$(echo .)be \
--cc=kesavan.abhilash@gmail$(echo .)com \
--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 \
/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