Re: [PATCH 0/3] CXL updates for v6.19

Robert Richter
2025-11-13T11:01:03Z

On 12.11.25 14:45:28, Dave Jiang wrote:
>
>
> On 11/12/25 1:51 PM, Robert Richter wrote:
> > Sending optional and rather independent patches from v5 of the CXL
> > address translation series [1] separately in this series. The patches
> > could be applied together with early pick up candidates from the
> > address translation series (namely patch #1 to #4 or #5).
> >
> > [1] https://patchwork.kernel.org/project/cxl/cover/20251112203143.1269944-1-rrichter@amd.com/
> >
> > Robert Richter (3):
> > cxl: Simplify cxl_rd_ops allocation and handling
> > cxl/acpi: Group xor arithmetric setup code in a single block
> > cxl/region: Remove local variable @inc in cxl_port_setup_targets()
> >
> > drivers/cxl/acpi.c | 15 ++++-----------
> > drivers/cxl/core/region.c | 25 +++++++------------------
> > drivers/cxl/cxl.h | 2 +-
> > 3 files changed, 12 insertions(+), 30 deletions(-)
> >
>
> Hi Robert, I'm having issues applying to 6.18-rc4.
>
> Applying: cxl: Simplify cxl_rd_ops allocation and handling
> Patch failed at 0001 cxl: Simplify cxl_rd_ops allocation and handling
> error: patch failed: drivers/cxl/core/region.c:2958
> error: drivers/cxl/core/region.c: patch does not apply

You need to apply it on cxl/next. There are conflicts otherwise.

Additionally, patch 3/3 (@inc variable change) of this series also
depends on patch 02/11 of v5 (store root decoder in in struct
cxl_region). If you chose to pickup some patches from v5 first on top
of cxl/next, then all this 3 patches should apply cleanly.

Since 02/11 is one of the first patches and it sounded to me some of
them will be applied as well, I would prefer that order to avoid
rebasing and resubmitting a v6 for that. Let me know if you want to
handle this differently.

> hint: Use 'git am --show-current-patch=diff' to see the failed patch
> hint: When you have resolved this problem, run "git am --continue".
> hint: If you prefer to skip this patch, run "git am --skip" instead.
> hint: To restore the original branch and stop patching, run "git am --abort".
> hint: Disable this message with "git config set advice.mergeConflict false"
>
> Also:
> ---
> ✓ [PATCH 1/3] cxl: Simplify cxl_rd_ops allocation and handling
> + Link: https://patch.msgid.link/20251112205105.1271726-2-rrichter@amd.com
> + Signed-off-by: Dave Jiang <dave.jiang@intel.com>
> ● checkpatch.pl: 118: WARNING: 'existance' may be misspelled - perhaps 'existence'?

Will send an update and also update the sob-chain.

Thanks,

-Robert