All of lore.kernel.org
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Mika Westerberg <mika.westerberg@linux.intel.com>
Cc: Johan Hovold <johan@kernel.org>,
	Alexandre Courbot <gnurou@gmail.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Neil Armstrong <narmstrong@baylibre.com>,
	"linux-gpio@vger.kernel.org" <linux-gpio@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH v2 3/3] pinctrl / gpio: Introduce .set_config() callback for GPIO chips
Date: Thu, 26 Jan 2017 15:29:55 +0100	[thread overview]
Message-ID: <CACRpkda1MVNimpSaCvgjTzTRGMWqtmQ8DwPExzJYeKZCN5Jj_Q@mail.gmail.com> (raw)
In-Reply-To: <20170125100944.GR17297@lahna.fi.intel.com>

On Wed, Jan 25, 2017 at 11:09 AM, Mika Westerberg
<mika.westerberg@linux.intel.com> wrote:
> On Tue, Jan 24, 2017 at 04:22:20PM +0200, Mika Westerberg wrote:
>> On Tue, Jan 24, 2017 at 02:45:04PM +0100, Johan Hovold wrote:
>> > Good, that's the one I knew about. But I also got another conflict
>> > against pinctrl when applying on top of f9dd6f6cc63c ("Add linux-next
>> > specific files for 20170123"):
>> >
>> > Applying: pinctrl / gpio: Introduce .set_config() callback for GPIO chips
>> > error: patch failed: drivers/pinctrl/pinctrl-amd.c:756
>> > error: drivers/pinctrl/pinctrl-amd.c: patch does not apply
>> > error: patch failed: drivers/staging/greybus/gpio.c:474
>> > error: drivers/staging/greybus/gpio.c: patch does not apply
>> > Patch failed at 0001 pinctrl / gpio: Introduce .set_config() callback for GPIO chips
>>
>> I tried today's linux-next 766074e7818 ("Add linux-next specific files
>> for 20170124") but only saw that GPIO conflict.
>>
>> In any case I'm going to rebase my series on top of linux-gpio.git/devel
>> and submit it as v3.
>
> That said, it seems this v2 series applies cleanly to
> linux-gpio.git/devel. There will be trivial conflict with the staging
> tree because of 7f2e9de736e7 ("staging: greybus: fix checkpatch unsigned
> warnings") but that's it.

We'll see. If there are internal conflicts in GPIO and pin control
I will get it in my face and deal with it when trying to create for-next
branches.

The conflict with staging is business as usual in linux-next.

Yours,
Linus Walleij

  reply	other threads:[~2017-01-26 14:29 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-23 12:34 [PATCH v2 0/3] pinctrl / gpio: Allow GPIO chips to use generic pinconfig Mika Westerberg
2017-01-23 12:34 ` [PATCH v2 1/3] pinctrl: Widen the generic pinconf argument from 16 to 24 bits Mika Westerberg
2017-01-23 12:34 ` [PATCH v2 2/3] pinctrl: Allow configuration of pins from gpiolib based drivers Mika Westerberg
2017-01-23 12:34 ` [PATCH v2 3/3] pinctrl / gpio: Introduce .set_config() callback for GPIO chips Mika Westerberg
2017-01-23 17:11   ` Johan Hovold
2017-01-24 11:11     ` Mika Westerberg
2017-01-24 12:53       ` Linus Walleij
2017-01-24 12:57         ` Mika Westerberg
2017-01-24 13:45           ` Johan Hovold
2017-01-24 14:22             ` Mika Westerberg
2017-01-25 10:09               ` Mika Westerberg
2017-01-26 14:29                 ` Linus Walleij [this message]
2017-01-23 14:24 ` [PATCH v2 0/3] pinctrl / gpio: Allow GPIO chips to use generic pinconfig Andy Shevchenko
2017-01-26 14:25 ` Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CACRpkda1MVNimpSaCvgjTzTRGMWqtmQ8DwPExzJYeKZCN5Jj_Q@mail.gmail.com \
    --to=linus.walleij@linaro.org \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=gnurou@gmail.com \
    --cc=johan@kernel.org \
    --cc=linux-gpio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mika.westerberg@linux.intel.com \
    --cc=narmstrong@baylibre.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.