From: Will Deacon <will.deacon@arm.com>
To: Jon Hunter <jonathanh@nvidia.com>
Cc: alex.popov@linux.com, Yury Norov <ynorov@caviumnetworks.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Mark Rutland <mark.rutland@arm.com>,
Rob Herring <robh@kernel.org>,
Kefeng Wang <wangkefeng.wang@huawei.com>,
AKASHI Takahiro <takahiro.akashi@linaro.org>,
Jon Masters <jcm@redhat.com>,
David Daney <david.daney@cavium.com>,
Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>,
Andrew Morton <akpm@linux-foundation.org>,
Dmitry Vyukov <dvyukov@google.com>,
Nicolai Stange <nicstange@gmail.com>,
James Morse <james.morse@arm.com>,
Andrey Ryabinin <aryabinin@virtuozzo.com>,
Andrey Konovalov <andreyknvl@google.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
syzkaller <syzkaller@googlegroups.com>
Subject: Re: [PATCH 1/2] arm64: setup: introduce kaslr_offset()
Date: Tue, 3 Jan 2017 11:32:59 +0000 [thread overview]
Message-ID: <20170103113259.GF6986@arm.com> (raw)
In-Reply-To: <db9266fb-5c6e-5dfb-2aac-4165c6b2b337@nvidia.com>
On Tue, Jan 03, 2017 at 11:18:15AM +0000, Jon Hunter wrote:
> On 22/12/16 12:51, Alexander Popov wrote:
> > On 22.12.2016 09:18, Yury Norov wrote:
> >> On Sun, Dec 11, 2016 at 03:50:55AM +0300, Alexander Popov wrote:
> >>> Introduce kaslr_offset() similarly to x86_64 for fixing kcov.
> >
> > [...]
> >
> >> Hi Alexander,
> >>
> >> I found today's linux-next master broken:
> >
> > [...]
> >
> >> It looks like you declare kaslr_offset() twice - in this patch, and in 7ede8665f
> >> (arm64: setup: introduce kaslr_offset()).
> >
> > Hello Yury,
> >
> > There was a race during applying this patch. So currently linux-next has 2 versions of it.
> >
> > The first one is 1a339a14b1f2c7a0dfdd6db79eee1e55d3cec357, which is original.
> > The second one is 7ede8665f27cde7da69e8b2fbeaa1ed0664879c5, updated by Will Deacon and
> > applied to the mainline.
> >
> > I'm sorry for that. The first one should be definitely dropped.
>
> Looks like this is still broken in today's -next.
I think this is coming in via akpm's tree, so there's nothing we can do
about it from the arm64 side :/
Andrew -- please can you drop 1a339a14b1f2 ("arm64: setup: introduce
kaslr_offset()") from your -next branch? It's superceded by
7ede8665f27c ("arm64: setup: introduce kaslr_offset()"), which landed
in mainline for -rc1, so you'll need to pick that up if you want your
branch to build on its own.
Thanks,
Will
next prev parent reply other threads:[~2017-01-03 11:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-11 0:50 [PATCH 0/2] Make kcov work properly with KASLR enabled Alexander Popov
2016-12-11 0:50 ` [PATCH 1/2] arm64: setup: introduce kaslr_offset() Alexander Popov
2016-12-12 11:29 ` Will Deacon
2016-12-13 22:07 ` Alexander Popov
2016-12-22 6:18 ` Yury Norov
2016-12-22 12:51 ` Alexander Popov
2017-01-03 11:18 ` Jon Hunter
2017-01-03 11:32 ` Will Deacon [this message]
2016-12-11 0:50 ` [PATCH 2/2] kcov: make kcov work properly with KASLR enabled Alexander Popov
2016-12-11 9:32 ` Dmitry Vyukov
2016-12-11 21:37 ` Alexander Popov
2016-12-12 6:58 ` Dmitry Vyukov
2017-01-26 11:53 ` Quentin Casasnovas
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=20170103113259.GF6986@arm.com \
--to=will.deacon@arm.com \
--cc=akpm@linux-foundation.org \
--cc=alex.popov@linux.com \
--cc=andreyknvl@google.com \
--cc=ard.biesheuvel@linaro.org \
--cc=aryabinin@virtuozzo.com \
--cc=catalin.marinas@arm.com \
--cc=david.daney@cavium.com \
--cc=dvyukov@google.com \
--cc=gkulkarni@caviumnetworks.com \
--cc=james.morse@arm.com \
--cc=jcm@redhat.com \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=nicstange@gmail.com \
--cc=robh@kernel.org \
--cc=syzkaller@googlegroups.com \
--cc=takahiro.akashi@linaro.org \
--cc=wangkefeng.wang@huawei.com \
--cc=ynorov@caviumnetworks.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;
as well as URLs for NNTP newsgroup(s).