Re: [PATCH v8 next 00/10] arm_mpam: Introduce Narrow-PARTID feature

[Zeng Heng]

Hi Shaopeng,

On 2026/4/28 12:20, Shaopeng Tan (Fujitsu) wrote:
> Hello Zeng Heng,
>
>
> I hope this email finds you well.
>
> > As indicated in the patch series tags, this patch set applies to the
> > linux-next repository, specifically the master branch at:
> > https://kernel.googlesource.com/pub/scm/linux/kernel/git/next/linux-next.git
>
> This patch series could not be applied correctly to the master branch.


Thank you very much for your reply.

I checked the patch and found that patch 2 has the following context
conflict, which is not a logical conflict:

~~~
diff a/drivers/resctrl/mpam_resctrl.c b/drivers/resctrl/mpam_resctrl.c 
(rejected hunks)
@@ -223,7 +223,7 @@ int resctrl_arch_set_cdp_enabled(enum 
resctrl_res_level rid, bool enable)
 		mpam_resctrl_controls[RDT_RESOURCE_MBA].resctrl_res.alloc_capable = 
false;

 	if (enable) {
-		if (mpam_partid_max < 1)
+		if (mpam_intpartid_max < 1)
 			return -EINVAL;

 		partid_d = resctrl_get_config_index(RESCTRL_RESERVED_CLOSID, CDP_DATA);

~~~

This conflict is caused by the following commit:

~~~
commit f758340da529ccb12531c3f83d5992e912f6c8d5
Author: Zeng Heng <zengheng4@xxxxxxxxxx>
Date:   Mon Apr 13 17:00:41 2026 +0800

    arm_mpam: resctrl: Fix MBA CDP alloc_capable handling on unmount

~~~

This is merely a context conflict. Please feel free to resolve it
locally for now, or I will fix this patch conflict in the next version
as soon as possible.

Apart from this, the remaining patches apply cleanly against the latest
linux-next or linux mainline tree.


> > Keep me in the mail list for follow-up responses if you want my feedback
> > in time. I was accidentally dropped from the mail list in a previous
> > thread (see
> > https://lore.kernel.org/all/TY4PR01MB16930EB1ACB3A3356A92169BC8B232@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/).
>
> I've confirmed that your email address was correctly in the recipient field, and the email was sent successfully on my end.
> Also, it seems that I sometimes don't receive your emails.
> I'm not entirely sure why this is happening, as my email settings appear to be configured correctly.

From the lore archive records, it exactly appears that my email address
was indeed not included in the recipient list. Please double-check:
https://lore.kernel.org/all/TY4PR01MB16930EB1ACB3A3356A92169BC8B232@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/

I believe this was simply a typo. And Looking forward to hearing from
you.


Best regards,
Zeng Heng