[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix
|
From: |
Su Hang |
|
Subject: |
Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix |
|
Date: |
Fri, 16 Mar 2018 15:13:47 +0800 (GMT+08:00) |
Thanks for your reply!
I'm glad to understand where problem lies.
Su Hang
> -----Original Messages-----
> From: "Fam Zheng" <address@hidden>
> Sent Time: 2018-03-16 15:08:19 (Friday)
> To: "Su Hang" <address@hidden>
> Cc: address@hidden, address@hidden, address@hidden
> Subject: Re: [Qemu-devel] [PATCH v2] scripts/checkpatch.pl: Bug fix
>
> On Fri, 03/16 14:31, Su Hang wrote:
> > Because I generate my first patch on master, it should work.
>
> Nope. "git am" doesn't know to resolve the conflict automatically despite it
> being straightforward, unfortunately:
>
> http://patchew.org/QEMU/address@hidden/
>
> Fam