From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755538AbcETHNa (ORCPT ); Fri, 20 May 2016 03:13:30 -0400 Received: from mx08-00178001.pphosted.com ([91.207.212.93]:33972 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753020AbcETHN3 (ORCPT ); Fri, 20 May 2016 03:13:29 -0400 Subject: Re: [GIT PULL] pin control bulk changes for the v4.7 cycle To: Linus Torvalds , Linus Walleij References: CC: "linux-kernel@vger.kernel.org" , Laxman Dewangan From: Patrice Chotard Message-ID: <573EB910.6040904@st.com> Date: Fri, 20 May 2016 09:13:20 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit X-Originating-IP: [10.48.1.66] X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-05-20_01:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Linus Sorry for that. I have submitted the fix last week but Linus W. was busy and didn't get time to merged it. Patrice On 05/19/2016 09:52 PM, Linus Torvalds wrote: > On Thu, May 19, 2016 at 4:20 AM, Linus Walleij wrote: >> This kernel cycle was quite calm when it comes to pin >> control and there is really just one major change, and that >> is the introduction of devm_pinctrl_register() managed >> resources. > WTF happened here? > > drivers/pinctrl/stm32/pinctrl-stm32.c: In function ‘stm32_pconf_dbg_show’: > drivers/pinctrl/stm32/pinctrl-stm32.c:797:17: warning: too many > arguments for format [-Wformat-extra-args] > seq_printf(s, "%d - %s -%s", alt, > ^ > > Hmm? > > That's not a merge error, that comes from your tree, commit > 3beed93c1617 ("pinctrl: stm32: Implement .pin_config_dbg_show()"). > > I fixed it up in the merge, but I shouldn't have needed to. > > Linus