* linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree
@ 2026-01-13 4:07 Stephen Rothwell
2026-01-13 6:44 ` Randy Dunlap
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2026-01-13 4:07 UTC (permalink / raw)
To: Greg KH, Andrew Morton
Cc: Greg Kroah-Hartman, Kuen-Han Tsai, Randy Dunlap,
Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2137 bytes --]
Hi all,
After merging the usb tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:
In file included from drivers/usb/gadget/function/f_ncm.c:27:
drivers/usb/gadget/function/f_ncm.c: In function 'ncm_opts_dev_addr_store':
drivers/usb/gadget/function/u_ether_configfs.h:243:31: error: implicit declaration of function 'hex_to_bin' [-Wimplicit-function-declaration]
243 | num = hex_to_bin(*p++) << 4; \
| ^~~~~~~~~~
drivers/usb/gadget/function/f_ncm.c:1600:1: note: in expansion of macro 'USB_ETHER_OPTS_ATTR_DEV_ADDR'
1600 | USB_ETHER_OPTS_ATTR_DEV_ADDR(ncm);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
Caused by commit
30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
from the mm-nonmm-unstable tree interacting with commits
e065c6a7e46c ("usb: gadget: u_ether: add gether_opts for config caching")
56a512a9b410 ("usb: gadget: f_ncm: align net_device lifecycle with bind/unbind")
from the USB tree.
I have applied the following merge resolution patch for today.
From: Stephen Rothwell <sfr@canb•auug.org.au>
Date: Tue, 13 Jan 2026 14:36:59 +1100
Subject: [PATCH] fix up for "usb: gadget: u_ether: add gether_opts for config
caching"
interacting with commit
30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
from the mm-nonmm-unstable tree.
Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
---
drivers/usb/gadget/function/u_ether_configfs.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
index 39d3a261496d..c2f8903d1400 100644
--- a/drivers/usb/gadget/function/u_ether_configfs.h
+++ b/drivers/usb/gadget/function/u_ether_configfs.h
@@ -18,6 +18,7 @@
#include <linux/mutex.h>
#include <linux/netdevice.h>
#include <linux/rtnetlink.h>
+#include <linux/hex.h>
#define USB_ETHERNET_CONFIGFS_ITEM(_f_) \
static void _f_##_attr_release(struct config_item *item) \
--
2.52.0
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree
2026-01-13 4:07 linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree Stephen Rothwell
@ 2026-01-13 6:44 ` Randy Dunlap
2026-01-13 6:53 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2026-01-13 6:44 UTC (permalink / raw)
To: Stephen Rothwell, Greg KH, Andrew Morton
Cc: Greg Kroah-Hartman, Kuen-Han Tsai, Linux Kernel Mailing List,
Linux Next Mailing List
Gi,
On 1/12/26 8:07 PM, Stephen Rothwell wrote:
> Hi all,
>
> After merging the usb tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
>
> In file included from drivers/usb/gadget/function/f_ncm.c:27:
> drivers/usb/gadget/function/f_ncm.c: In function 'ncm_opts_dev_addr_store':
> drivers/usb/gadget/function/u_ether_configfs.h:243:31: error: implicit declaration of function 'hex_to_bin' [-Wimplicit-function-declaration]
> 243 | num = hex_to_bin(*p++) << 4; \
> | ^~~~~~~~~~
> drivers/usb/gadget/function/f_ncm.c:1600:1: note: in expansion of macro 'USB_ETHER_OPTS_ATTR_DEV_ADDR'
> 1600 | USB_ETHER_OPTS_ATTR_DEV_ADDR(ncm);
> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Caused by commit
>
> 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
>
> from the mm-nonmm-unstable tree interacting with commits
>
> e065c6a7e46c ("usb: gadget: u_ether: add gether_opts for config caching")
> 56a512a9b410 ("usb: gadget: f_ncm: align net_device lifecycle with bind/unbind")
>
> from the USB tree.
>
> I have applied the following merge resolution patch for today.
>
> From: Stephen Rothwell <sfr@canb•auug.org.au>
> Date: Tue, 13 Jan 2026 14:36:59 +1100
> Subject: [PATCH] fix up for "usb: gadget: u_ether: add gether_opts for config
> caching"
>
> interacting with commit
>
> 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
>
> from the mm-nonmm-unstable tree.
>
> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> ---
> drivers/usb/gadget/function/u_ether_configfs.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
> index 39d3a261496d..c2f8903d1400 100644
> --- a/drivers/usb/gadget/function/u_ether_configfs.h
> +++ b/drivers/usb/gadget/function/u_ether_configfs.h
> @@ -18,6 +18,7 @@
> #include <linux/mutex.h>
> #include <linux/netdevice.h>
> #include <linux/rtnetlink.h>
> +#include <linux/hex.h>
LGTM. What is the procedure for this? (my first AFAIK)
I can send a patch to Greg or Kuen-Han could do that.
> #define USB_ETHERNET_CONFIGFS_ITEM(_f_) \
> static void _f_##_attr_release(struct config_item *item) \
Thanks.
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree
2026-01-13 6:44 ` Randy Dunlap
@ 2026-01-13 6:53 ` Greg KH
2026-01-13 7:01 ` Randy Dunlap
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2026-01-13 6:53 UTC (permalink / raw)
To: Randy Dunlap
Cc: Stephen Rothwell, Andrew Morton, Kuen-Han Tsai,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Jan 12, 2026 at 10:44:29PM -0800, Randy Dunlap wrote:
> Gi,
>
> On 1/12/26 8:07 PM, Stephen Rothwell wrote:
> > Hi all,
> >
> > After merging the usb tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> >
> > In file included from drivers/usb/gadget/function/f_ncm.c:27:
> > drivers/usb/gadget/function/f_ncm.c: In function 'ncm_opts_dev_addr_store':
> > drivers/usb/gadget/function/u_ether_configfs.h:243:31: error: implicit declaration of function 'hex_to_bin' [-Wimplicit-function-declaration]
> > 243 | num = hex_to_bin(*p++) << 4; \
> > | ^~~~~~~~~~
> > drivers/usb/gadget/function/f_ncm.c:1600:1: note: in expansion of macro 'USB_ETHER_OPTS_ATTR_DEV_ADDR'
> > 1600 | USB_ETHER_OPTS_ATTR_DEV_ADDR(ncm);
> > | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
> >
> > Caused by commit
> >
> > 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
> >
> > from the mm-nonmm-unstable tree interacting with commits
> >
> > e065c6a7e46c ("usb: gadget: u_ether: add gether_opts for config caching")
> > 56a512a9b410 ("usb: gadget: f_ncm: align net_device lifecycle with bind/unbind")
> >
> > from the USB tree.
> >
> > I have applied the following merge resolution patch for today.
> >
> > From: Stephen Rothwell <sfr@canb•auug.org.au>
> > Date: Tue, 13 Jan 2026 14:36:59 +1100
> > Subject: [PATCH] fix up for "usb: gadget: u_ether: add gether_opts for config
> > caching"
> >
> > interacting with commit
> >
> > 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
> >
> > from the mm-nonmm-unstable tree.
> >
> > Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
> > ---
> > drivers/usb/gadget/function/u_ether_configfs.h | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
> > index 39d3a261496d..c2f8903d1400 100644
> > --- a/drivers/usb/gadget/function/u_ether_configfs.h
> > +++ b/drivers/usb/gadget/function/u_ether_configfs.h
> > @@ -18,6 +18,7 @@
> > #include <linux/mutex.h>
> > #include <linux/netdevice.h>
> > #include <linux/rtnetlink.h>
> > +#include <linux/hex.h>
>
> LGTM. What is the procedure for this? (my first AFAIK)
I can take a patch for this now in my tree, as it would "just work" for
that, right?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree
2026-01-13 6:53 ` Greg KH
@ 2026-01-13 7:01 ` Randy Dunlap
2026-01-13 7:18 ` Randy Dunlap
0 siblings, 1 reply; 5+ messages in thread
From: Randy Dunlap @ 2026-01-13 7:01 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, Andrew Morton, Kuen-Han Tsai,
Linux Kernel Mailing List, Linux Next Mailing List
On 1/12/26 10:53 PM, Greg KH wrote:
> On Mon, Jan 12, 2026 at 10:44:29PM -0800, Randy Dunlap wrote:
>> Gi,
>>
>> On 1/12/26 8:07 PM, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> After merging the usb tree, today's linux-next build (arm
>>> multi_v7_defconfig) failed like this:
>>>
>>> In file included from drivers/usb/gadget/function/f_ncm.c:27:
>>> drivers/usb/gadget/function/f_ncm.c: In function 'ncm_opts_dev_addr_store':
>>> drivers/usb/gadget/function/u_ether_configfs.h:243:31: error: implicit declaration of function 'hex_to_bin' [-Wimplicit-function-declaration]
>>> 243 | num = hex_to_bin(*p++) << 4; \
>>> | ^~~~~~~~~~
>>> drivers/usb/gadget/function/f_ncm.c:1600:1: note: in expansion of macro 'USB_ETHER_OPTS_ATTR_DEV_ADDR'
>>> 1600 | USB_ETHER_OPTS_ATTR_DEV_ADDR(ncm);
>>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>
>>> Caused by commit
>>>
>>> 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
>>>
>>> from the mm-nonmm-unstable tree interacting with commits
>>>
>>> e065c6a7e46c ("usb: gadget: u_ether: add gether_opts for config caching")
>>> 56a512a9b410 ("usb: gadget: f_ncm: align net_device lifecycle with bind/unbind")
>>>
>>> from the USB tree.
>>>
>>> I have applied the following merge resolution patch for today.
>>>
>>> From: Stephen Rothwell <sfr@canb•auug.org.au>
>>> Date: Tue, 13 Jan 2026 14:36:59 +1100
>>> Subject: [PATCH] fix up for "usb: gadget: u_ether: add gether_opts for config
>>> caching"
>>>
>>> interacting with commit
>>>
>>> 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
>>>
>>> from the mm-nonmm-unstable tree.
>>>
>>> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>>> ---
>>> drivers/usb/gadget/function/u_ether_configfs.h | 1 +
>>> 1 file changed, 1 insertion(+)
>>>
>>> diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
>>> index 39d3a261496d..c2f8903d1400 100644
>>> --- a/drivers/usb/gadget/function/u_ether_configfs.h
>>> +++ b/drivers/usb/gadget/function/u_ether_configfs.h
>>> @@ -18,6 +18,7 @@
>>> #include <linux/mutex.h>
>>> #include <linux/netdevice.h>
>>> #include <linux/rtnetlink.h>
>>> +#include <linux/hex.h>
>>
>> LGTM. What is the procedure for this? (my first AFAIK)
>
> I can take a patch for this now in my tree, as it would "just work" for
> that, right?
Yes, it just needs that additional header file.
Thanks.
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree
2026-01-13 7:01 ` Randy Dunlap
@ 2026-01-13 7:18 ` Randy Dunlap
0 siblings, 0 replies; 5+ messages in thread
From: Randy Dunlap @ 2026-01-13 7:18 UTC (permalink / raw)
To: Greg KH
Cc: Stephen Rothwell, Andrew Morton, Kuen-Han Tsai,
Linux Kernel Mailing List, Linux Next Mailing List
On 1/12/26 11:01 PM, Randy Dunlap wrote:
>
>
> On 1/12/26 10:53 PM, Greg KH wrote:
>> On Mon, Jan 12, 2026 at 10:44:29PM -0800, Randy Dunlap wrote:
>>> Gi,
>>>
>>> On 1/12/26 8:07 PM, Stephen Rothwell wrote:
>>>> Hi all,
>>>>
>>>> After merging the usb tree, today's linux-next build (arm
>>>> multi_v7_defconfig) failed like this:
>>>>
>>>> In file included from drivers/usb/gadget/function/f_ncm.c:27:
>>>> drivers/usb/gadget/function/f_ncm.c: In function 'ncm_opts_dev_addr_store':
>>>> drivers/usb/gadget/function/u_ether_configfs.h:243:31: error: implicit declaration of function 'hex_to_bin' [-Wimplicit-function-declaration]
>>>> 243 | num = hex_to_bin(*p++) << 4; \
>>>> | ^~~~~~~~~~
>>>> drivers/usb/gadget/function/f_ncm.c:1600:1: note: in expansion of macro 'USB_ETHER_OPTS_ATTR_DEV_ADDR'
>>>> 1600 | USB_ETHER_OPTS_ATTR_DEV_ADDR(ncm);
>>>> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>>
>>>> Caused by commit
>>>>
>>>> 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
>>>>
>>>> from the mm-nonmm-unstable tree interacting with commits
>>>>
>>>> e065c6a7e46c ("usb: gadget: u_ether: add gether_opts for config caching")
>>>> 56a512a9b410 ("usb: gadget: f_ncm: align net_device lifecycle with bind/unbind")
>>>>
>>>> from the USB tree.
>>>>
>>>> I have applied the following merge resolution patch for today.
>>>>
>>>> From: Stephen Rothwell <sfr@canb•auug.org.au>
>>>> Date: Tue, 13 Jan 2026 14:36:59 +1100
>>>> Subject: [PATCH] fix up for "usb: gadget: u_ether: add gether_opts for config
>>>> caching"
>>>>
>>>> interacting with commit
>>>>
>>>> 30034bbf280f ("kernel.h: drop hex.h and update all hex.h users")
>>>>
>>>> from the mm-nonmm-unstable tree.
>>>>
>>>> Signed-off-by: Stephen Rothwell <sfr@canb•auug.org.au>
>>>> ---
>>>> drivers/usb/gadget/function/u_ether_configfs.h | 1 +
>>>> 1 file changed, 1 insertion(+)
>>>>
>>>> diff --git a/drivers/usb/gadget/function/u_ether_configfs.h b/drivers/usb/gadget/function/u_ether_configfs.h
>>>> index 39d3a261496d..c2f8903d1400 100644
>>>> --- a/drivers/usb/gadget/function/u_ether_configfs.h
>>>> +++ b/drivers/usb/gadget/function/u_ether_configfs.h
>>>> @@ -18,6 +18,7 @@
>>>> #include <linux/mutex.h>
>>>> #include <linux/netdevice.h>
>>>> #include <linux/rtnetlink.h>
>>>> +#include <linux/hex.h>
>>>
>>> LGTM. What is the procedure for this? (my first AFAIK)
>>
>> I can take a patch for this now in my tree, as it would "just work" for
>> that, right?
>
> Yes, it just needs that additional header file.
> Thanks.
I'm sending a patch, or you can just go with the patch that Stephen added.
--
~Randy
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2026-01-13 7:18 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-01-13 4:07 linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree Stephen Rothwell
2026-01-13 6:44 ` Randy Dunlap
2026-01-13 6:53 ` Greg KH
2026-01-13 7:01 ` Randy Dunlap
2026-01-13 7:18 ` Randy Dunlap
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox