From: Lee Jones <lee@kernel.org>
To: Mark Brown <broonie@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: Re: linux-next: manual merge of the mfd tree with the origin tree
Date: Tue, 17 Nov 2026 11:24:34 +0000 [thread overview]
Message-ID: <20261117112434.GA84168@joneslee-macbookpro.roam.internal> (raw)
In-Reply-To: <56691895-b885-4c63-a929-c4cfdd7a2dde@sirena.org.uk>
On Tue, 17 Nov 2026, Mark Brown wrote:
> On Tue, Nov 17, 2026 at 10:47:22AM +0000, Lee Jones wrote:
> > Kees, et al.,
> >
> > > 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")
> >
> > Is there a branch / tag that I can pull this in from?
>
> It's been in mainline since -rc2.
Okay, I'll rebase. Thanks.
--
Lee Jones
next prev parent reply other threads:[~2026-11-17 11:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 19:25 Mark Brown
2026-11-17 10:47 ` Lee Jones
2026-11-17 11:18 ` Mark Brown
2026-11-17 11:24 ` Lee Jones [this message]
-- strict thread matches above, loose matches on Subject: below --
2026-11-16 19:25 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=20261117112434.GA84168@joneslee-macbookpro.roam.internal \
--to=lee@kernel.org \
--cc=broonie@kernel.org \
--cc=kees+treewide@kernel.org \
--cc=kees@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
all inboxes | Powered by JetHome®