Linux-Next Archive on
 help / color / Atom feed
From: Linus Walleij <>
To: Stephen Rothwell <>
Cc: Bartosz Golaszewski <>,
	Linux Next Mailing List <>,
	Linux Kernel Mailing List <>,
	Masahiro Yamada <>,
	Thierry Reding <>,
	Brian Masney <>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the gpio tree
Date: Sat, 17 Aug 2019 00:30:50 +0200
Message-ID: <> (raw)
In-Reply-To: <>

On Fri, Aug 16, 2019 at 8:56 AM Stephen Rothwell <> 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?

Linus Walleij

  reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-16  6:56 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 publically 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:

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

  git send-email \
    --in-reply-to='' \ \ \ \ \ \ \ \ \

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Linux-Next Archive on

Archives are clonable:
	git clone --mirror linux-next/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-next linux-next/ \
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:

AGPL code for this site: git clone