| Message ID | 1480575357-25056-1-git-send-email-zhangchen.fnst@cn.fujitsu.com |
|---|---|
| State | New |
| Headers | show |
On 12/01/2016 12:55 AM, Zhang Chen wrote: > Say it in another way to make it easier to understand. > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > Signed-off-by: Eric Blake <eblake@redhat.com> I guess that's because I suggested the replacement text to use, even though I didn't write the patch. At any rate, since this is doc-only, it's safe for inclusion in 2.8, if the maintainer wants to send a last-minute pull request (but if it misses the release, that's okay too) > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > docs/colo-proxy.txt | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt > index 76767cb..c4941de 100644 > --- a/docs/colo-proxy.txt > +++ b/docs/colo-proxy.txt > @@ -158,7 +158,9 @@ secondary. > > == Usage == > > -Here, we use demo ip and port discribe more clearly. > +Here is an example using demonstration IP and port addresses to more > +clearly describe the usage. > + > Primary(ip:3.3.3.3): > -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown > -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66 >
On 12/01/2016 10:57 PM, Eric Blake wrote: > On 12/01/2016 12:55 AM, Zhang Chen wrote: >> Say it in another way to make it easier to understand. >> >> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >> Signed-off-by: Eric Blake <eblake@redhat.com> > I guess that's because I suggested the replacement text to use, even > though I didn't write the patch. Yes, In that case, should I change the signed-off-by to acked-by or remove it? Thanks Zhang Chen > At any rate, since this is doc-only, it's safe for inclusion in 2.8, if > the maintainer wants to send a last-minute pull request (but if it > misses the release, that's okay too) > >> Signed-off-by: Stefan Weil <sw@weilnetz.de> >> --- >> docs/colo-proxy.txt | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt >> index 76767cb..c4941de 100644 >> --- a/docs/colo-proxy.txt >> +++ b/docs/colo-proxy.txt >> @@ -158,7 +158,9 @@ secondary. >> >> == Usage == >> >> -Here, we use demo ip and port discribe more clearly. >> +Here is an example using demonstration IP and port addresses to more >> +clearly describe the usage. >> + >> Primary(ip:3.3.3.3): >> -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown >> -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66 >>
On 12/01/2016 08:59 PM, Zhang Chen wrote: > > > On 12/01/2016 10:57 PM, Eric Blake wrote: >> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>> Say it in another way to make it easier to understand. >>> >>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>> Signed-off-by: Eric Blake <eblake@redhat.com> >> I guess that's because I suggested the replacement text to use, even >> though I didn't write the patch. > > Yes, In that case, should I change the signed-off-by to acked-by or > remove it? I'm okay if you want to leave it as-is.
On 02/12/2016 03:59, Zhang Chen wrote: > > > On 12/01/2016 10:57 PM, Eric Blake wrote: >> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>> Say it in another way to make it easier to understand. >>> >>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>> Signed-off-by: Eric Blake <eblake@redhat.com> >> I guess that's because I suggested the replacement text to use, even >> though I didn't write the patch. > > Yes, In that case, should I change the signed-off-by to acked-by or > remove it? You can use "Suggested-by:" https://www.kernel.org/doc/Documentation/SubmittingPatches Laurent
On 12/02/2016 03:57 PM, Laurent Vivier wrote: > > On 02/12/2016 03:59, Zhang Chen wrote: >> >> On 12/01/2016 10:57 PM, Eric Blake wrote: >>> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>>> Say it in another way to make it easier to understand. >>>> >>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>> Signed-off-by: Eric Blake <eblake@redhat.com> >>> I guess that's because I suggested the replacement text to use, even >>> though I didn't write the patch. >> Yes, In that case, should I change the signed-off-by to acked-by or >> remove it? > You can use "Suggested-by:" > > https://www.kernel.org/doc/Documentation/SubmittingPatches > > Laurent > Should I fix it? or can you pick up this directly for 2.8? Thanks Zhang Chen >
Le 07/12/2016 à 09:58, Zhang Chen a écrit : > > > On 12/02/2016 03:57 PM, Laurent Vivier wrote: >> >> On 02/12/2016 03:59, Zhang Chen wrote: >>> >>> On 12/01/2016 10:57 PM, Eric Blake wrote: >>>> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>>>> Say it in another way to make it easier to understand. >>>>> >>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>>> Signed-off-by: Eric Blake <eblake@redhat.com> >>>> I guess that's because I suggested the replacement text to use, even >>>> though I didn't write the patch. >>> Yes, In that case, should I change the signed-off-by to acked-by or >>> remove it? >> You can use "Suggested-by:" >> >> https://www.kernel.org/doc/Documentation/SubmittingPatches >> >> Laurent >> > > Should I fix it? or can you pick up this directly for 2.8? I don't think it is needed. Perhaps Stefan H can take it directly in his staging tree? Thanks, Laurent
On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote: > Le 07/12/2016 à 09:58, Zhang Chen a écrit : > > > > > > On 12/02/2016 03:57 PM, Laurent Vivier wrote: > >> > >> On 02/12/2016 03:59, Zhang Chen wrote: > >>> > >>> On 12/01/2016 10:57 PM, Eric Blake wrote: > >>>> On 12/01/2016 12:55 AM, Zhang Chen wrote: > >>>>> Say it in another way to make it easier to understand. > >>>>> > >>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > >>>>> Signed-off-by: Eric Blake <eblake@redhat.com> > >>>> I guess that's because I suggested the replacement text to use, even > >>>> though I didn't write the patch. > >>> Yes, In that case, should I change the signed-off-by to acked-by or > >>> remove it? > >> You can use "Suggested-by:" > >> > >> https://www.kernel.org/doc/Documentation/SubmittingPatches > >> > >> Laurent > >> > > > > Should I fix it? or can you pick up this directly for 2.8? > > I don't think it is needed. > Perhaps Stefan H can take it directly in his staging tree? Too late for that now. This should be merged through Jason Wang (net maintainer) like any other colo-proxy patch. Stefan
On 12/07/2016 09:30 PM, Stefan Hajnoczi wrote: > On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote: >> Le 07/12/2016 à 09:58, Zhang Chen a écrit : >>> >>> On 12/02/2016 03:57 PM, Laurent Vivier wrote: >>>> On 02/12/2016 03:59, Zhang Chen wrote: >>>>> On 12/01/2016 10:57 PM, Eric Blake wrote: >>>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>>>>>> Say it in another way to make it easier to understand. >>>>>>> >>>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>>>>> Signed-off-by: Eric Blake <eblake@redhat.com> >>>>>> I guess that's because I suggested the replacement text to use, even >>>>>> though I didn't write the patch. >>>>> Yes, In that case, should I change the signed-off-by to acked-by or >>>>> remove it? >>>> You can use "Suggested-by:" >>>> >>>> https://www.kernel.org/doc/Documentation/SubmittingPatches >>>> >>>> Laurent >>>> >>> Should I fix it? or can you pick up this directly for 2.8? >> I don't think it is needed. >> Perhaps Stefan H can take it directly in his staging tree? > Too late for that now. This should be merged through Jason Wang (net > maintainer) like any other colo-proxy patch. > OK~ I change the subject to "for-2.9" and cc Jason. Thanks Zhang Chen
Hi~~ Jason. Can you pick up this patch? Thanks Zhang Chen On 12/08/2016 09:32 AM, Zhang Chen wrote: > > > On 12/07/2016 09:30 PM, Stefan Hajnoczi wrote: >> On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote: >>> Le 07/12/2016 à 09:58, Zhang Chen a écrit : >>>> >>>> On 12/02/2016 03:57 PM, Laurent Vivier wrote: >>>>> On 02/12/2016 03:59, Zhang Chen wrote: >>>>>> On 12/01/2016 10:57 PM, Eric Blake wrote: >>>>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>>>>>>> Say it in another way to make it easier to understand. >>>>>>>> >>>>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>>>>>> Signed-off-by: Eric Blake <eblake@redhat.com> >>>>>>> I guess that's because I suggested the replacement text to use, >>>>>>> even >>>>>>> though I didn't write the patch. >>>>>> Yes, In that case, should I change the signed-off-by to acked-by or >>>>>> remove it? >>>>> You can use "Suggested-by:" >>>>> >>>>> https://www.kernel.org/doc/Documentation/SubmittingPatches >>>>> >>>>> Laurent >>>>> >>>> Should I fix it? or can you pick up this directly for 2.8? >>> I don't think it is needed. >>> Perhaps Stefan H can take it directly in his staging tree? >> Too late for that now. This should be merged through Jason Wang (net >> maintainer) like any other colo-proxy patch. >> > > OK~ I change the subject to "for-2.9" and cc Jason. > > Thanks > Zhang Chen > >
Ping.... On 12/26/2016 03:26 PM, Zhang Chen wrote: > Hi~~ Jason. > > Can you pick up this patch? > > Thanks > > Zhang Chen > > > On 12/08/2016 09:32 AM, Zhang Chen wrote: >> >> >> On 12/07/2016 09:30 PM, Stefan Hajnoczi wrote: >>> On Wed, Dec 07, 2016 at 10:01:49AM +0100, Laurent Vivier wrote: >>>> Le 07/12/2016 à 09:58, Zhang Chen a écrit : >>>>> >>>>> On 12/02/2016 03:57 PM, Laurent Vivier wrote: >>>>>> On 02/12/2016 03:59, Zhang Chen wrote: >>>>>>> On 12/01/2016 10:57 PM, Eric Blake wrote: >>>>>>>> On 12/01/2016 12:55 AM, Zhang Chen wrote: >>>>>>>>> Say it in another way to make it easier to understand. >>>>>>>>> >>>>>>>>> Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> >>>>>>>>> Signed-off-by: Eric Blake <eblake@redhat.com> >>>>>>>> I guess that's because I suggested the replacement text to use, >>>>>>>> even >>>>>>>> though I didn't write the patch. >>>>>>> Yes, In that case, should I change the signed-off-by to acked-by or >>>>>>> remove it? >>>>>> You can use "Suggested-by:" >>>>>> >>>>>> https://www.kernel.org/doc/Documentation/SubmittingPatches >>>>>> >>>>>> Laurent >>>>>> >>>>> Should I fix it? or can you pick up this directly for 2.8? >>>> I don't think it is needed. >>>> Perhaps Stefan H can take it directly in his staging tree? >>> Too late for that now. This should be merged through Jason Wang (net >>> maintainer) like any other colo-proxy patch. >>> >> >> OK~ I change the subject to "for-2.9" and cc Jason. >> >> Thanks >> Zhang Chen >> >> >
On 2017年01月06日 11:33, Zhang Chen wrote:
> Ping....
Applied to -net. Thanks
diff --git a/docs/colo-proxy.txt b/docs/colo-proxy.txt index 76767cb..c4941de 100644 --- a/docs/colo-proxy.txt +++ b/docs/colo-proxy.txt @@ -158,7 +158,9 @@ secondary. == Usage == -Here, we use demo ip and port discribe more clearly. +Here is an example using demonstration IP and port addresses to more +clearly describe the usage. + Primary(ip:3.3.3.3): -netdev tap,id=hn0,vhost=off,script=/etc/qemu-ifup,downscript=/etc/qemu-ifdown -device e1000,id=e0,netdev=hn0,mac=52:a4:00:12:78:66