From: Mark Brown <broonie@kernel.org>
To: Lee Jones <lee@kernel.org>
Cc: Kees Cook <kees@kernel.org>, Kees Cook <kees+treewide@kernel.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 mfd tree with the origin tree
Date: Mon, 16 Nov 2026 19:25:38 +0000 [thread overview]
Message-ID: <avtYstt11GO7g85R@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 2648 bytes --]
Hi all,
Today's linux-next merge of the mfd tree got a conflict in:
drivers/mfd/nct6694.c
between commit:
4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
from the origin tree and commit:
962b44ae8126d ("mfd: nct6694: Allocate USB DMA buffers with kzalloc_obj()")
from the mfd tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --combined drivers/mfd/nct6694.c
index dabd83b9d455c,40a29f8e0ff61..0000000000000
--- a/drivers/mfd/nct6694.c
+++ b/drivers/mfd/nct6694.c
@@@ -201,6 -201,7 +201,7 @@@ static void usb_int_callback(struct ur
break;
case -ECONNRESET:
case -ENOENT:
+ case -EPIPE:
case -ESHUTDOWN:
return;
default:
@@@ -280,21 -281,25 +281,25 @@@ static int nct6694_usb_probe(struct usb
struct nct6694 *nct6694;
int ret;
- nct6694 = devm_kzalloc(dev, sizeof(*nct6694), GFP_KERNEL);
+ nct6694 = devm_kzalloc_obj(dev, *nct6694);
if (!nct6694)
return -ENOMEM;
- nct6694->usb_msg = devm_kzalloc_obj(dev, union nct6694_usb_msg);
+ nct6694->usb_msg = kzalloc_obj(*nct6694->usb_msg);
if (!nct6694->usb_msg)
return -ENOMEM;
- nct6694->int_buffer = devm_kzalloc_obj(dev, *nct6694->int_buffer);
- if (!nct6694->int_buffer)
- return -ENOMEM;
+ nct6694->int_buffer = kzalloc_obj(*nct6694->int_buffer);
+ if (!nct6694->int_buffer) {
+ ret = -ENOMEM;
+ goto err_usb_msg;
+ }
nct6694->int_in_urb = usb_alloc_urb(0, GFP_KERNEL);
- if (!nct6694->int_in_urb)
- return -ENOMEM;
+ if (!nct6694->int_in_urb) {
+ ret = -ENOMEM;
+ goto err_int_buffer;
+ }
nct6694->domain = irq_domain_create_simple(NULL, NCT6694_NR_IRQS, 0,
&nct6694_irq_domain_ops,
@@@ -352,6 -357,10 +357,10 @@@ err_ida
irq_domain_remove(nct6694->domain);
err_urb:
usb_free_urb(nct6694->int_in_urb);
+ err_int_buffer:
+ kfree(nct6694->int_buffer);
+ err_usb_msg:
+ kfree(nct6694->usb_msg);
return ret;
}
@@@ -367,6 -376,8 +376,8 @@@ static void nct6694_usb_disconnect(stru
ida_destroy(&nct6694->gpio_ida);
irq_domain_remove(nct6694->domain);
usb_free_urb(nct6694->int_in_urb);
+ kfree(nct6694->int_buffer);
+ kfree(nct6694->usb_msg);
}
static const struct usb_device_id nct6694_ids[] = {
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2026-11-16 19:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 19:25 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-16 19:25 linux-next: manual merge of the mfd tree with the origin tree Mark Brown
2026-11-09 14:14 Mark Brown
2026-11-09 14:14 Mark Brown
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=avtYstt11GO7g85R@sirena.org.uk \
--to=broonie@kernel.org \
--cc=kees+treewide@kernel.org \
--cc=kees@kernel.org \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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