From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH 2/4] ARM: mach-s5p: get rid of all headers Date: Mon, 09 Jun 2014 14:11:10 +0200 Message-ID: <8986317.PJZ13jmgds@wuerfel> References: <1401888838-3126-1-git-send-email-linus.walleij@linaro.org> <4544212.mqY6dSouMv@wuerfel> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from mout.kundenserver.de ([212.227.126.130]:61844 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932586AbaFIMLX (ORCPT ); Mon, 9 Jun 2014 08:11:23 -0400 In-Reply-To: Sender: linux-gpio-owner@vger.kernel.org List-Id: linux-gpio@vger.kernel.org To: Linus Walleij Cc: "linux-arm-kernel@lists.infradead.org" , "linux-gpio@vger.kernel.org" , Alexandre Courbot On Monday 09 June 2014 13:36:33 Linus Walleij wrote: > On Wed, Jun 4, 2014 at 3:58 PM, Arnd Bergmann wrote: > > On Wednesday 04 June 2014 15:33:56 Linus Walleij wrote: > >> This renames all the local headers in the S5P platforms > >> to indicating a scope local to this platform, > >> and cuts the implicit inclusion of from > >> by removing the use of NEED_MACH_GPIO_H from all S5P variants. > >> > >> Signed-off-by: Linus Walleij > > > > Hmm, this patch will obviously clash with the removal of S5p64xx > > and s5pc100. > > So it is happening? I was actually expecting that to happen in > v3.14 or so and now I finally lost my patience I do expect it for 3.17. > > It shouldn't be hard to resolve the conflict when we > > merge both into arm-soc/next/cleanup, > > First come, first serve. I will send my pull request at the end > of the merge window I hope. If removal comes first, I'll rebase. > Ok, fine with me. Arnd