linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Masahiro Yamada <yamada.masahiro@socionext.com>,
	Thierry Reding <treding@nvidia.com>,
	Brian Masney <masneyb@onstation.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the gpio tree
Date: Sat, 17 Aug 2019 00:30:50 +0200	[thread overview]
Message-ID: <CACRpkdbd=YDpXwozA_AUUmY-ut5yh9+ziiPHLj67fT-bs8Pq_A@mail.gmail.com> (raw)
In-Reply-To: <20190816165607.3b896463@canb.auug.org.au>

On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
>   include/linux/gpio/driver.h
>
> between commit:
>
>   fdd61a013a24 ("gpio: Add support for hierarchical IRQ domains")
>
> from the gpio tree and commit:
>
>   9091373ab7ea ("gpio: remove less important #ifdef around declarations")
>
> from the gpio-brgl tree.

OK Bartosz can you send me a pull request for your tree so we can
sync them up?

Yours,
Linus Walleij

  reply	other threads:[~2019-08-16 22:31 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-16  6:56 linux-next: manual merge of the gpio-brgl tree with the gpio tree Stephen Rothwell
2019-08-16 22:30 ` Linus Walleij [this message]
2019-08-19  6:30 Stephen Rothwell
2019-08-26  6:50 Stephen Rothwell
2019-11-08  3:27 Stephen Rothwell

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='CACRpkdbd=YDpXwozA_AUUmY-ut5yh9+ziiPHLj67fT-bs8Pq_A@mail.gmail.com' \
    --to=linus.walleij@linaro.org \
    --cc=brgl@bgdev.pl \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=masneyb@onstation.org \
    --cc=sfr@canb.auug.org.au \
    --cc=treding@nvidia.com \
    --cc=yamada.masahiro@socionext.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).