From mboxrd@z Thu Jan 1 00:00:00 1970 From: catalin.marinas@arm.com (Catalin Marinas) Date: Mon, 8 Feb 2016 12:14:31 +0000 Subject: [PATCH v5sub2 0/8] arm64: implement virtual KASLR In-Reply-To: References: <1454332178-4414-1-git-send-email-ard.biesheuvel@linaro.org> <20160205173248.GJ6076@e104818-lin.cambridge.arm.com> Message-ID: <20160208121430.GL6076@e104818-lin.cambridge.arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Fri, Feb 05, 2016 at 12:42:30PM -0800, Kees Cook wrote: > On Fri, Feb 5, 2016 at 9:38 AM, Ard Biesheuvel > wrote: > > On 5 February 2016 at 18:32, Catalin Marinas wrote: > >> I'm still trying to get my head around how we merge those. Since I > >> assume akpm will push them during the merging window, part of your code > >> cannot be tested before. > > > > Actually, my original idea was for akpm to take them as a late merge > > after rebasing to -rc1, since they touch a variety of architectures, > > but I am not sure if that came across. > > > > You could always take the series through your tree instead, I guess? > > Traditionally akpm will de-duplicate patches he's carrying that appear > in another tree. I think it should be okay to carry them in both > places. (Though I'm CCing akpm just to see if I'm talking crazy.) For now, I'll merge this series in the arm64 tree and push it to next: http://lkml.kernel.org/r/1452007180-27411-1-git-send-email-ard.biesheuvel at linaro.org If there are any objections, I can drop the patches and do the BUILDTIME_EXTABLE_SORT disabling trick until they end up in mainline. -- Catalin