From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Date: Fri, 15 Mar 2013 12:35:47 +0000 Subject: Re: [PATCH v4 00/88] PFC pinctrl functions for sh7372, sh73a0, r8a7740 and r8a7779 Message-Id: <1402196.7rHPxUqO47@avalon> List-Id: References: <1363215633-4264-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> In-Reply-To: <1363215633-4264-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-sh@vger.kernel.org Hi Simon, On Friday 15 March 2013 07:25:28 Simon Horman wrote: > On Thu, Mar 14, 2013 at 03:01:48PM +0100, Laurent Pinchart wrote: > > On Thursday 14 March 2013 14:55:00 Linus Walleij wrote: > > > On Thu, Mar 14, 2013 at 2:39 PM, Laurent Pinchart wrote: > > > > [Me] > > > > > > > >> I merged a patch like this only yesterday to my fixes branch. > > > >> > > > >> commit bf4d7be57ba9040347065f48a60f895a254f6e28 > > > >> Author: Sachin Kamat > > > >> Date: Wed Mar 13 17:13:46 2013 +0530 > > > >> pinctrl: generic: Fix compilation error > > > > > > > > Great, thank you. Is that patch present in a stable branch that Simon > > > > could merge ? > > > > > > Yes the fixes branch in the pinctrl tree. > > > > Thank you. Simon, it looks like we'll need another rebase :-/ Could you > > please merge that branch into your tree and give me the name of the > > resulting branch on which I'll rebase the PFC patches ? > > Sure, I have merged Linus's fixes branch into pinmux-base in the renesas > tree and pushed it to kernel.org. It should be there in a few minutes. > For reference the head commit is: > > commit 47f4e0c1c87f34bf1fc74b8935a37d229a147946 > Merge: a9324f6 bf4d7be > Author: Simon Horman > Date: Fri Mar 15 07:16:28 2013 +0100 > > Merge branch 'fixes' of > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into > pinmux-base Thank you. I've rebased my branches on top of that and pushed the result to git://linuxtv.org/pinchartl/fbdev.git -- Regards, Laurent Pinchart