From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752238AbaEWIcQ (ORCPT ); Fri, 23 May 2014 04:32:16 -0400 Received: from mail-ig0-f171.google.com ([209.85.213.171]:46085 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752208AbaEWIcO (ORCPT ); Fri, 23 May 2014 04:32:14 -0400 Date: Fri, 23 May 2014 09:32:08 +0100 From: Lee Jones To: Linus Walleij Cc: "linux-kernel@vger.kernel.org" , "linux-next@vger.kernel.org" , Samuel Ortiz Subject: Re: [GIT PULL] sound branch of STMPE cleanups Message-ID: <20140523083208.GM19747@lee--X1> References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > as seen in linux-next something is screwed up on the immutable > branch for STMPE cleanups, can you pull this instead, it is > the known tested good version with no compilation regressions. > > I have no hurry to get this into the GPIO tree anymore, I will push > additionall changes to the next merge window, simply. Nope, this branch is broken too. I don't think this is a merge error, I think it's programmer error (even the greats make mistakes =:-) ). Take a look at the patch: http://paste.ubuntu.com/7504677/ You remove all instances of irq_base except the one in stmpe_irq_init(). I'll fix this up for you and re-push/tag the branch. The references will be the same, so you just need to re-fetch and re-merge. I'll give you the node once it's ready. In the mean time, it might be worth you looking at your build system, as it seems to be overlooking drivers/mfd/stmpe.c. > The following changes since commit 89ca3b881987f5a4be4c5dbaa7f0df12bbdde2fd: > > Linux 3.15-rc4 (2014-05-04 18:14:42 -0700) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git > stmpe-for-lee > > for you to fetch changes up to decc1ca8b2e5ae947fd9679f8adbd056d3b47d30: > > mfd: stmpe: mask off unused blocks properly (2014-05-23 00:19:12 +0200) > > ---------------------------------------------------------------- > Linus Walleij (4): > mfd: stmpe: root out static GPIO and IRQ assignments > mfd: stmpe: add optional regulators > mfd: stmpe: probe properly from the device tree > mfd: stmpe: mask off unused blocks properly > > drivers/gpio/gpio-stmpe.c | 18 +++++------------- > drivers/mfd/Kconfig | 1 + > drivers/mfd/stmpe-i2c.c | 30 +++++++++++++++++++++++++++++- > drivers/mfd/stmpe.c | 30 ++++++++++++++++++++++++++++-- > drivers/mfd/stmpe.h | 2 +- > include/linux/mfd/stmpe.h | 19 +++++-------------- > 6 files changed, 69 insertions(+), 31 deletions(-) -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog