* linux-next: manual merge of the pinctrl-intel tree with the origin tree
@ 2026-11-19 17:29 Mark Brown
2026-11-19 17:48 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Mark Brown @ 2026-11-19 17:29 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Kees Cook, Kees Cook, Linux Kernel Mailing List, Linux Next Mailing List
[-- Attachment #1: Type: text/plain, Size: 2527 bytes --]
Hi all,
Today's linux-next merge of the pinctrl-intel tree got a conflict in:
drivers/pinctrl/intel/pinctrl-intel.c
between commit:
4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
from the origin tree and commit:
34925b925793b ("pinctrl: intel: define iterator variables inside for-loop")
from the pinctrl-intel 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 --cc drivers/pinctrl/intel/pinctrl-intel.c
index 51a86975909cf,833640fc40b09..0000000000000
--- a/drivers/pinctrl/intel/pinctrl-intel.c
+++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@@ -1437,10 -1434,10 +1434,10 @@@ static int intel_pinctrl_add_padgroups_
struct intel_community *community)
{
struct intel_padgroup *gpps;
+ unsigned int ngpps = community->ngpps;
unsigned int padown_num = 0;
- size_t i, ngpps = community->ngpps;
- gpps = devm_kcalloc(pctrl->dev, ngpps, sizeof(*gpps), GFP_KERNEL);
+ gpps = devm_kzalloc_objs(pctrl->dev, *gpps, ngpps);
if (!gpps)
return -ENOMEM;
@@@ -1484,7 -1480,8 +1480,8 @@@ static int intel_pinctrl_add_padgroups_
if (community->gpp_size > INTEL_PINCTRL_MAX_GPP_SIZE)
return -EINVAL;
+ ngpps = DIV_ROUND_UP(npins, community->gpp_size);
- gpps = devm_kcalloc(pctrl->dev, ngpps, sizeof(*gpps), GFP_KERNEL);
+ gpps = devm_kzalloc_objs(pctrl->dev, *gpps, ngpps);
if (!gpps)
return -ENOMEM;
@@@ -1514,9 -1511,8 +1511,8 @@@ static int intel_pinctrl_pm_init(struc
const struct intel_pinctrl_soc_data *soc = pctrl->soc;
struct intel_community_context *communities;
struct intel_pad_context *pads;
- int i;
- pads = devm_kcalloc(pctrl->dev, soc->npins, sizeof(*pads), GFP_KERNEL);
+ pads = devm_kzalloc_objs(pctrl->dev, *pads, soc->npins);
if (!pads)
return -ENOMEM;
@@@ -1580,9 -1576,9 +1576,9 @@@ int intel_pinctrl_probe(struct platform
{
struct device *dev = &pdev->dev;
struct intel_pinctrl *pctrl;
- int i, ret, irq;
+ int ret, irq;
- pctrl = devm_kzalloc(dev, sizeof(*pctrl), GFP_KERNEL);
+ pctrl = devm_kzalloc_obj(dev, *pctrl);
if (!pctrl)
return -ENOMEM;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: linux-next: manual merge of the pinctrl-intel tree with the origin tree
2026-11-19 17:29 linux-next: manual merge of the pinctrl-intel tree with the origin tree Mark Brown
@ 2026-11-19 17:48 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2026-11-19 17:48 UTC (permalink / raw)
To: Mark Brown
Cc: Kees Cook, Kees Cook, Linux Kernel Mailing List, Linux Next Mailing List
On Thu, Nov 19, 2026 at 05:29:46PM +0000, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the pinctrl-intel tree got a conflict in:
>
> drivers/pinctrl/intel/pinctrl-intel.c
>
> between commit:
>
> 4dd10fbbeb9c3 ("treewide: Convert devm_kmalloc() family to the devm_kmalloc_obj() family")
>
> from the origin tree and commit:
>
> 34925b925793b ("pinctrl: intel: define iterator variables inside for-loop")
>
> from the pinctrl-intel 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.
Thanks, it is correct resolution.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2026-11-19 17:48 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-11-19 17:29 linux-next: manual merge of the pinctrl-intel tree with the origin tree Mark Brown
2026-11-19 17:48 ` Andy Shevchenko
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®