Date: Wed, 12 Aug 2015 14:41:16 +0100
From: Will Deacon <will.deacon@arm.com>
To: Andrey Ryabinin <ryabinin.a.a@gmail.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>, "x86@kernel.org" <x86@kernel.org>,
        Ingo Molnar <mingo@redhat.com>, Thomas Gleixner <tglx@linutronix.de>,
        Catalin Marinas <Catalin.Marinas@arm.com>, Yury <yury.norov@gmail.com>,
        Arnd Bergmann <arnd@arndb.de>,
        "linux-mm@kvack.org" <linux-mm@kvack.org>,
        Linus Walleij <linus.walleij@linaro.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Alexey Klimov <klimov.linux@gmail.com>,
        Alexander Potapenko <glider@google.com>,
        "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>,
        David Keitel <dkeitel@codeaurora.org>,
        Dmitry Vyukov <dvyukov@google.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        "linux-arm-kernel@lists.infradead.org" 
	<linux-arm-kernel@lists.infradead.org>
Subject: Re: [PATCH v5 2/6] x86/kasan, mm: introduce generic
 kasan_populate_zero_shadow()
Message-ID: <20150812134116.GB23540@arm.com>
References: <1439259499-13913-1-git-send-email-ryabinin.a.a@gmail.com>
 <1439259499-13913-3-git-send-email-ryabinin.a.a@gmail.com>
 <20150811154117.GH23307@e104818-lin.cambridge.arm.com>
 <55CA21E8.2060704@gmail.com>
 <20150811164010.GJ23307@e104818-lin.cambridge.arm.com>
 <CAPAsAGwDNpRBLAvyCSpR9ZO9tAmHx-XYjVDZPECeQkU0WOw5jg@mail.gmail.com>
 <20150812093701.GH22485@arm.com>
 <CAPAsAGwnhnqJCh=sc97-=qrYHNQnDSjVR-xGertoMiNWHDbhrw@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAPAsAGwnhnqJCh=sc97-=qrYHNQnDSjVR-xGertoMiNWHDbhrw@mail.gmail.com>
User-Agent: Mutt/1.5.23 (2014-03-12)
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1148
Lines: 27

On Wed, Aug 12, 2015 at 01:19:03PM +0100, Andrey Ryabinin wrote:
> 2015-08-12 12:37 GMT+03:00 Will Deacon <will.deacon@arm.com>:
> > On Wed, Aug 12, 2015 at 10:30:37AM +0100, Andrey Ryabinin wrote:
> >> 2015-08-11 19:40 GMT+03:00 Catalin Marinas <catalin.marinas@arm.com>:
> >> >
> >> > Not sure how you plan to merge it though since there are x86
> >> > dependencies. I could send the whole series via tip or the mm tree (and
> >> > I guess it's pretty late for 4.3).
> >>
> >> Via mm tree, I guess.
> >> If this is too late for 4.3, then I'll update changelog and send v6
> >> after 4.3-rc1 release.
> >
> > That's probably the best bet, as I suspect we'll get some non-trivial
> > conflicts with the arm64 tree at this stage.
> >
> Or, if x86 maintainers are agree to take first 2 patches in 4.3,
> the rest of the series could go into arm64 tree later.

Yup, that would be even better for us!

Will
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/