Linux-Next Archive on lore.kernel.org
 help / color / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev.pl>,
	Linus Walleij <linus.walleij@linaro.org>
Cc: Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Drew Fustini <drew@pdp7.com>, Kent Gibson <warthog618@gmail.com>
Subject: linux-next: manual merge of the gpio-brgl tree with the gpio tree
Date: Fri, 8 Nov 2019 14:27:02 +1100
Message-ID: <20191108142702.2e5ddcbb@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

Hi all,

Today's linux-next merge of the gpio-brgl tree got conflicts in:

  drivers/gpio/gpiolib.c
  include/uapi/linux/gpio.h

between commit:

  8c550e94b883 ("gpio: expose pull-up/pull-down line flags to userspace")

from the gpio tree and commit:

  6d8251b35add ("gpio: expose pull-up/pull-down line flags to userspace")

from the gpio-brgl tree.

I fixed it up (I just used the latter versions) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

             reply index

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-08  3:27 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2019-08-26  6:50 Stephen Rothwell
2019-08-19  6:30 Stephen Rothwell
2019-08-16  6:56 Stephen Rothwell
2019-08-16 22:30 ` Linus Walleij

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:
  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=20191108142702.2e5ddcbb@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=brgl@bgdev.pl \
    --cc=drew@pdp7.com \
    --cc=linus.walleij@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=warthog618@gmail.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

Linux-Next Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-next/0 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/ https://lore.kernel.org/linux-next \
		linux-next@vger.kernel.org
	public-inbox-index linux-next

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-next


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git