From: Greg KH <greg@kroah•com>
To: Randy Dunlap <rdunlap@infradead•org>
Cc: Stephen Rothwell <sfr@canb•auug.org.au>,
Andrew Morton <akpm@linux-foundation•org>,
Kuen-Han Tsai <khtsai@google•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 usb tree with the nn-nonmm-unstable tree
Date: Tue, 13 Jan 2026 07:53:31 +0100 [thread overview]
Message-ID: <2026011356-hemstitch-rundown-ca92@gregkh> (raw)
In-Reply-To: <3ad768b3-6c66-4e23-9bfb-145887313b78@infradead.org>
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
next prev parent reply other threads:[~2026-01-13 6:53 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2026-01-13 7:01 ` Randy Dunlap
2026-01-13 7:18 ` Randy Dunlap
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=2026011356-hemstitch-rundown-ca92@gregkh \
--to=greg@kroah$(echo .)com \
--cc=akpm@linux-foundation$(echo .)org \
--cc=khtsai@google$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rdunlap@infradead$(echo .)org \
--cc=sfr@canb$(echo .)auug.org.au \
/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