* [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
@ 2024-12-03 17:26 Uwe Kleine-König
2024-12-09 7:13 ` William Breathitt Gray
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Uwe Kleine-König @ 2024-12-03 17:26 UTC (permalink / raw)
To: William Breathitt Gray, Linus Walleij, Bartosz Golaszewski; +Cc: linux-gpio
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@baylibre.com>
---
Hello,
this is based on current Linus Torvalds's master branch and depends on
the topmost commit there.
Best regards
Uwe
drivers/gpio/gpio-idio-16.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/gpio-idio-16.c b/drivers/gpio/gpio-idio-16.c
index 2c9512589297..0103be977c66 100644
--- a/drivers/gpio/gpio-idio-16.c
+++ b/drivers/gpio/gpio-idio-16.c
@@ -3,6 +3,9 @@
* GPIO library for the ACCES IDIO-16 family
* Copyright (C) 2022 William Breathitt Gray
*/
+
+#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
+
#include <linux/bits.h>
#include <linux/device.h>
#include <linux/err.h>
@@ -14,8 +17,6 @@
#include "gpio-idio-16.h"
-#define DEFAULT_SYMBOL_NAMESPACE "GPIO_IDIO_16"
-
#define IDIO_16_DAT_BASE 0x0
#define IDIO_16_OUT_BASE IDIO_16_DAT_BASE
#define IDIO_16_IN_BASE (IDIO_16_DAT_BASE + 1)
base-commit: ceb8bf2ceaa77fe222fe8fe32cb7789c9099ddf1
--
2.45.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
2024-12-03 17:26 [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace Uwe Kleine-König
@ 2024-12-09 7:13 ` William Breathitt Gray
2024-12-09 9:28 ` Bartosz Golaszewski
2024-12-10 10:39 ` Bartosz Golaszewski
2 siblings, 0 replies; 6+ messages in thread
From: William Breathitt Gray @ 2024-12-09 7:13 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: Linus Walleij, Bartosz Golaszewski, linux-gpio
[-- Attachment #1: Type: text/plain, Size: 414 bytes --]
On Tue, Dec 03, 2024 at 06:26:30PM +0100, Uwe Kleine-König 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@baylibre.com>
Acked-by: William Breathitt Gray <wbg@kernel.org>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
2024-12-03 17:26 [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace Uwe Kleine-König
2024-12-09 7:13 ` William Breathitt Gray
@ 2024-12-09 9:28 ` Bartosz Golaszewski
2024-12-10 10:14 ` Uwe Kleine-König
2024-12-10 10:39 ` Bartosz Golaszewski
2 siblings, 1 reply; 6+ messages in thread
From: Bartosz Golaszewski @ 2024-12-09 9:28 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: William Breathitt Gray, Linus Walleij, linux-gpio
On Tue, Dec 3, 2024 at 6:26 PM Uwe Kleine-König
<u.kleine-koenig@baylibre.com> 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@baylibre.com>
> ---
> 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.
Bart
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
2024-12-09 9:28 ` Bartosz Golaszewski
@ 2024-12-10 10:14 ` Uwe Kleine-König
2024-12-10 10:38 ` Bartosz Golaszewski
0 siblings, 1 reply; 6+ messages in thread
From: Uwe Kleine-König @ 2024-12-10 10:14 UTC (permalink / raw)
To: Bartosz Golaszewski; +Cc: William Breathitt Gray, Linus Walleij, linux-gpio
[-- Attachment #1: Type: text/plain, Size: 1298 bytes --]
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@baylibre.com> 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@baylibre.com>
> > ---
> > 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.
Best regards
Uwe
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
2024-12-10 10:14 ` Uwe Kleine-König
@ 2024-12-10 10:38 ` Bartosz Golaszewski
0 siblings, 0 replies; 6+ messages in thread
From: Bartosz Golaszewski @ 2024-12-10 10:38 UTC (permalink / raw)
To: Uwe Kleine-König; +Cc: William Breathitt Gray, Linus Walleij, linux-gpio
On Tue, Dec 10, 2024 at 11:15 AM Uwe Kleine-König
<u.kleine-koenig@baylibre.com> 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@baylibre.com> 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@baylibre.com>
> > > ---
> > > 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
2024-12-03 17:26 [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace Uwe Kleine-König
2024-12-09 7:13 ` William Breathitt Gray
2024-12-09 9:28 ` Bartosz Golaszewski
@ 2024-12-10 10:39 ` Bartosz Golaszewski
2 siblings, 0 replies; 6+ messages in thread
From: Bartosz Golaszewski @ 2024-12-10 10:39 UTC (permalink / raw)
To: William Breathitt Gray, Linus Walleij, Bartosz Golaszewski,
Uwe Kleine-König
Cc: Bartosz Golaszewski, linux-gpio
From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
On Tue, 03 Dec 2024 18:26:30 +0100, Uwe Kleine-König wrote:
> DEFAULT_SYMBOL_NAMESPACE must already be defined when <linux/export.h>
> is included. So move the define above the include block.
>
>
Applied, thanks!
[1/1] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace
commit: 9ac4b58fcef0f9fc03fa6e126a5f53c1c71ada8a
Best regards,
--
Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-12-10 10:39 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-03 17:26 [PATCH] gpio: idio-16: Actually make use of the GPIO_IDIO_16 symbol namespace Uwe Kleine-König
2024-12-09 7:13 ` William Breathitt Gray
2024-12-09 9:28 ` Bartosz Golaszewski
2024-12-10 10:14 ` Uwe Kleine-König
2024-12-10 10:38 ` Bartosz Golaszewski
2024-12-10 10:39 ` Bartosz Golaszewski
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox