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