On Thu, Apr 20, 2023 at 03:45:17PM +0000, Jonas Karlman wrote:
> Hi Kever,
> On 2023-04-20 13:10, Jonas Karlman wrote:
> > Hi Kever,
> > On 2023-04-20 12:19, Kever Yang wrote:
> >> Hi Tom,
> >>
> >> I got error report like below log when apply many of this patchset with 
> >> "git-pw patch apply 1770392",
> >>
> >> did you met this kind of issue and do you know why?
> > 
> > There are some interdependence in different incoming rockchip series,
> > I have seen similar issue due to conflicts applying rk patches locally.
> 
> Look like this patch was conflicting with [1]. This patch also include a
> change how the mmc->clock is used. I have not been able to reproduce the
> issue described in [1] with this series.
> 
> Will send a rebased v3 of just this patch, remaining patches in this
> series apply cleanly on top of your master branch after the conflict in
> this patch is resolved.

In general, I've found using "b4 am" with "git am" to be better than
patchwork directly, for the case where a full new series has been re-spun
and re-posted, and I also don't want to just make a patchwork bundle for
what I'm applying.

-- 
Tom

Attachment: signature.asc
Description: PGP signature

Reply via email to