From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Bartosz Golaszewski <brgl@bgdev•pl>
Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree
Date: Fri, 14 Mar 2025 16:06:41 +1100 [thread overview]
Message-ID: <20250314160641.75afdc79@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 842 bytes --]
Hi all,
Today's linux-next merge of the gpio-brgl tree got a conflict in:
drivers/gpio/gpiolib.c
between commit:
0102fbf52b93 ("gpiolib: don't check the retval of get_direction() when registering a chip")
from the gpio-brgl-fixes tree and commit:
9becde08f1bc ("gpiolib: don't use gpiochip_get_direction() when registering a chip")
from the gpio-brgl tree.
I fixed it up (I used the latter as the conflict was just in a comment)
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:[~2025-03-14 5:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-14 5:06 Stephen Rothwell [this message]
2025-03-14 9:57 ` linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree Bartosz Golaszewski
-- strict thread matches above, loose matches on Subject: below --
2026-03-30 19:58 Mark Brown
2025-03-03 5:57 Stephen Rothwell
2025-03-03 8:33 ` Bartosz Golaszewski
2024-05-10 5:32 Stephen Rothwell
2024-05-10 6:33 ` Bartosz Golaszewski
2024-05-10 7:08 ` Stephen Rothwell
2024-05-10 7:10 ` Stephen Rothwell
2024-05-10 15:08 ` Andy Shevchenko
2023-10-19 5:06 Stephen Rothwell
2023-10-19 8:41 ` Bartosz Golaszewski
2021-01-20 2:51 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=20250314160641.75afdc79@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=bartosz.golaszewski@linaro$(echo .)org \
--cc=brgl@bgdev$(echo .)pl \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
/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