From mboxrd@z Thu Jan 1 00:00:00 1970 From: Linus Walleij Subject: Re: [PATCH 2/2] pinctrl: samsung: Fix link error with CONFIG_PINCTRL_EXYNOS disabled Date: Thu, 25 Apr 2013 15:26:05 +0200 Message-ID: References: <1366060483-20342-1-git-send-email-tomasz.figa@gmail.com> <6940961.67Lk2axxPL@amdc1227> <2113989.KXXvDDhnMa@amdc1227> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Return-path: In-Reply-To: <2113989.KXXvDDhnMa@amdc1227> Sender: linux-samsung-soc-owner@vger.kernel.org To: Tomasz Figa Cc: Tomasz Figa , Mark Brown , linux-samsung-soc , "linux-arm-kernel@lists.infradead.org" , "devicetree-discuss@lists.ozlabs.org" , Kukjin Kim , Kwangwoo LEE , Peter Korsgaard , Darius Augulis , Maurus Cuelenaere , Russell King - ARM Linux , Rob Herring , Mark Rutland , Thomas Abraham , "linux-next@vger.kernel.org" List-Id: linux-next.vger.kernel.org On Wed, Apr 24, 2013 at 4:47 PM, Tomasz Figa wrote: > On Wednesday 24 of April 2013 16:27:09 Linus Walleij wrote: >> On Tue, Apr 23, 2013 at 2:09 PM, Tomasz Figa wrote: >> > On Tuesday 23 of April 2013 14:03:12 Linus Walleij wrote: >> >> This does not apply to my "devel" branch in the pinctrl tree. >> >> >> >> Could you rebase it on that branch? >> >> >> >> Or is the error not even in my tree? >> > >> > This one got sent incorrectly due to my mistake. Please try the correct >> > version: >> > >> > [PATCH RESEND 2/2] pinctrl: samsung: Fix link error with >> > CONFIG_PINCTRL_EXYNOS disabled >> >> This does not apply either. >> >> Can you please test against the "devel" branch in the pinctrl tree? > > Right, it does not apply. > > Well, actually it does with git am -3, but it is incorrect, since the problem > it intends to fix is not present in your tree, but rather is a merge error in > linux-next in a merge of Kgene's and your tree... Oh. Then you have to send the patch to Stephen Rothwell. Yours, Linus Walleij