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 [thread overview]
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 --]
next reply other threads:[~2019-11-08 3:27 UTC|newest]
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 linux-next: manual merge of the gpio-brgl tree with the gpio tree 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 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=20191108142702.2e5ddcbb@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=brgl@bgdev$(echo .)pl \
--cc=drew@pdp7$(echo .)com \
--cc=linus.walleij@linaro$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=warthog618@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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