| Message ID | E0A769A898ADB6449596C41F51EF62C6A9DE90@SZXEMI506-MBX.china.huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Aug 01, 2016 at 10:36:43AM +0000, Xuquan (Euler) wrote: > Signed-off-by: Quan Xu <xuquan8@huawei.com> > Reviewed-by: Kevin Tian <kevin.tian@intel.com> Thank you both. Quan, I think there is something wrong with your email setup. When I tried to git am this patch, I got: fatal: corrupt patch at line 11 Patch failed at 0001 MAINTAINERS: update email The copy of the patch that failed is found in: /local/work/COMMITTER/xen.git/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Looking at the email it seems that it is encoded somehow. No need to resend though. This patch is simple enough that I've fixed it for you. And I changed the subject line to: MAINTAINERS: update Quan Xu's email address before pushing to staging. > --- > MAINTAINERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/MAINTAINERS b/MAINTAINERS > index 65c2447..97720a8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -415,7 +415,7 @@ F: xen/include/asm-x86/hvm/monitor.h > > VTPM > M: Daniel De Graaf <dgdegra@tycho.nsa.gov> > -M: Quan Xu <quan.xu@intel.com> > +M: Quan Xu <xuquan8@huawei.com> > S: Supported > F: extras/mini-os/tpm* > F: extras/mini-os/include/tpm* > -- > 1.7.12.4
Wei, thanks!! This email is sent out from outlook (the Linux can't send out email). the format may be not correct. Quan On Aug 01 2016 at 18:46:00pm, Wei Liu <wei.liu2@citrix.com> wrote: On Mon, Aug 01, 2016 at 10:36:43AM +0000, Xuquan (Euler) wrote: > Signed-off-by: Quan Xu <xuquan8@huawei.com> > Reviewed-by: Kevin Tian <kevin.tian@intel.com> Thank you both. Quan, I think there is something wrong with your email setup. When I tried to git am this patch, I got: fatal: corrupt patch at line 11 Patch failed at 0001 MAINTAINERS: update email The copy of the patch that failed is found in: /local/work/COMMITTER/xen.git/.git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". Looking at the email it seems that it is encoded somehow. No need to resend though. This patch is simple enough that I've fixed it for you. And I changed the subject line to: MAINTAINERS: update Quan Xu's email address before pushing to staging. > --- > MAINTAINERS | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/MAINTAINERS b/MAINTAINERS index 65c2447..97720a8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -415,7 +415,7 @@ F: xen/include/asm-x86/hvm/monitor.h > > VTPM > M: Daniel De Graaf <dgdegra@tycho.nsa.gov> > -M: Quan Xu <quan.xu@intel.com> > +M: Quan Xu <xuquan8@huawei.com> > S: Supported > F: extras/mini-os/tpm* > F: extras/mini-os/include/tpm* > -- > 1.7.12.4
On Mon, Aug 1, 2016 at 11:53 AM, Xuquan (Euler) <xuquan8@huawei.com> wrote: > Wei, thanks!! > This email is sent out from outlook (the Linux can't send out email). the format may be not correct. If you aren't able to use a tool like 'git send-email' to send out patches, then what most people do is to both paste the patch inline, and attach a copy of the patch. That way people can easily quote the patch when replying, but can also apply it easily when they want to do so. (One of the core developers, Jan Beulich, is in a similar situation, and this is what he does.) Thanks, -George
diff --git a/MAINTAINERS b/MAINTAINERS index 65c2447..97720a8 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -415,7 +415,7 @@ F: xen/include/asm-x86/hvm/monitor.h VTPM M: Daniel De Graaf <dgdegra@tycho.nsa.gov> -M: Quan Xu <quan.xu@intel.com> +M: Quan Xu <xuquan8@huawei.com> S: Supported F: extras/mini-os/tpm* F: extras/mini-os/include/tpm*