From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Bartosz Golaszewski <brgl@bgdev.pl>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree
Date: Fri, 10 May 2024 08:33:37 +0200 [thread overview]
Message-ID: <CACMJSev6EDeLdQ0e7A7f6AMhh08FznA67x5ONG+vSseC5QLt6A@mail.gmail.com> (raw)
In-Reply-To: <20240510153212.246fbf31@canb.auug.org.au>
On Fri, 10 May 2024 at 07:32, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> Hi all,
>
> Today's linux-next merge of the gpio-brgl tree got a conflict in:
>
> drivers/gpio/gpiolib.h
>
> between commit:
>
> 7765ffed533d ("gpiolib: use a single SRCU struct for all GPIO descriptors")
>
> from the gpio-brgl-fixes tree and commit:
>
> 8a7a61032587 ("gpiolib: Get rid of never false gpio_is_valid() calls")
>
> from the gpio-brgl tree.
>
> I fixed it up (see below) 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
>
> diff --cc drivers/gpio/gpiolib.h
> index 8e0e211ebf08,7f94580efdbc..000000000000
> --- a/drivers/gpio/gpiolib.h
> +++ b/drivers/gpio/gpiolib.h
> @@@ -62,8 -61,7 +62,8 @@@ struct gpio_device
> struct module *owner;
> struct gpio_chip __rcu *chip;
> struct gpio_desc *descs;
> + struct srcu_struct desc_srcu;
> - int base;
> + unsigned int base;
> u16 ngpio;
> bool can_sleep;
> const char *label;
Thanks! I will send the fixes upstream today and then pull v6.9 into
my tree before the merge window PR to fix this conflict.
Bart
next prev parent reply other threads:[~2024-05-10 6:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-10 5:32 linux-next: manual merge of the gpio-brgl tree with the gpio-brgl-fixes tree Stephen Rothwell
2024-05-10 6:33 ` Bartosz Golaszewski [this message]
2024-05-10 7:08 ` Stephen Rothwell
2024-05-10 7:10 ` Stephen Rothwell
2024-05-10 15:08 ` Andy Shevchenko
-- strict thread matches above, loose matches on Subject: below --
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=CACMJSev6EDeLdQ0e7A7f6AMhh08FznA67x5ONG+vSseC5QLt6A@mail.gmail.com \
--to=bartosz.golaszewski@linaro.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=brgl@bgdev.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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).