From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Greg KH <greg@kroah•com>, Andrew Morton <akpm@linux-foundation•org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Kuen-Han Tsai <khtsai@google•com>,
Randy Dunlap <rdunlap@infradead•org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree
Date: Tue, 13 Jan 2026 15:07:52 +1100 [thread overview]
Message-ID: <20260113150752.2e2238f2@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2026-01-13 4:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-13 4:07 Stephen Rothwell [this message]
2026-01-13 6:44 ` linux-next: manual merge of the usb tree with the nn-nonmm-unstable tree Randy Dunlap
2026-01-13 6:53 ` Greg KH
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=20260113150752.2e2238f2@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=akpm@linux-foundation$(echo .)org \
--cc=greg@kroah$(echo .)com \
--cc=gregkh@linuxfoundation$(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 \
/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