Re: [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Dec 10, 2024 at 11:15 AM Uwe Kleine-König
<u.kleine-koenig@xxxxxxxxxxxx> wrote:
>
> Hello Bartosz,
>
> On Mon, Dec 09, 2024 at 10:28:14AM +0100, Bartosz Golaszewski wrote:
> > On Tue, Dec 3, 2024 at 6:26 PM Uwe Kleine-König
> > <u.kleine-koenig@xxxxxxxxxxxx> wrote:
> > >
> > > DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h>
> > > is included. So move the define above the include block.
> > >
> > > Fixes: b9b1fc1ae119 ("gpio: idio-16: Introduce the ACCES IDIO-16 GPIO library module")
> > > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@xxxxxxxxxxxx>
> > > ---
> > > Hello,
> > >
> > > this is based on current Linus Torvalds's master branch and depends on
> > > the topmost commit there.
> >
> > Can you rebase it on top of the gpio/for-current branch? It doesn't
> > apply to my tree in its current form.
>
> Your tree is based on v6.13-rc1. If you keep it that way and you apply
> my patch that you ask me to rebase there, it will conflict when it's
> pulled into Linus's tree as ceb8bf2ceaa7 in his tree touches that file,
> too
>
> So if I fix the merge conflict now to make my patch applicable to your
> tree, you or one of the Linuses has to do the reverse resolution again
> at a later point in time. Is that really what you want?
>
> An easy way out is to backmerge v6.13-rc2 into your tree (or rebase on
> -rc2) and only then apply my patch.
>

Ah, I didn't get that from the commit message. Let's do it this way.

Bart





[Index of Archives]     [Linux SPI]     [Linux Kernel]     [Linux ARM (vger)]     [Linux ARM MSM]     [Linux Omap]     [Linux Arm]     [Linux Tegra]     [Fedora ARM]     [Linux for Samsung SOC]     [eCos]     [Linux Fastboot]     [Gcc Help]     [Git]     [DCCP]     [IETF Announce]     [Security]     [Linux MIPS]     [Yosemite Campsites]

  Powered by Linux