diff for duplicates of <20170210211549.GA23722@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 732cfee..41019aa 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Thu, Feb 09, 2017 at 07:37:35PM +0000, Ben Hutchings wrote: > On Fri, 2017-01-13 at 12:38 +0100, Greg Kroah-Hartman wrote: -> > 4.4-stable review patch. If anyone has any objections, please let me know. +> > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > ------------------ > > @@ -13,7 +13,7 @@ On Thu, Feb 09, 2017 at 07:37:35PM +0000, Ben Hutchings wrote: > > for encapsulation headers. Because of this the largest allowed TSO > > packet is reduced. > > -> > For older releases, hard code a fixed reduced value. For next release, +> > For older releases, hard code a fixed reduced value.��For next release, > > there is a better solution which uses result of host offload > > negotiation. > > @@ -21,28 +21,28 @@ On Thu, Feb 09, 2017 at 07:37:35PM +0000, Ben Hutchings wrote: > > Signed-off-by: David S. Miller <davem@davemloft.net> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > --- -> > drivers/net/hyperv/netvsc_drv.c | 3 +++ -> > 1 file changed, 3 insertions(+) +> > �drivers/net/hyperv/netvsc_drv.c |����3 +++ +> > �1 file changed, 3 insertions(+) > > > > --- a/drivers/net/hyperv/netvsc_drv.c > > +++ b/drivers/net/hyperv/netvsc_drv.c > > @@ -40,6 +40,8 @@ -> > -> > #include "hyperv_net.h" -> > +> > � +> > �#include "hyperv_net.h" +> > � > > +/* Restrict GSO size to account for NVGRE */ > > +#define NETVSC_GSO_MAX_SIZE 62768 -> > -> > #define RING_SIZE_MIN 64 -> > static int ring_size = 128; +> > � +> > �#define RING_SIZE_MIN 64 +> > �static int ring_size = 128; > > @@ -852,6 +854,7 @@ static int netvsc_set_channels(struct ne -> > } -> > goto recover; -> > } +> > � } +> > � goto recover; +> > � } > > + netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE); -> > -> > out: -> > netvsc_open(net); +> > � +> > � out: +> > � netvsc_open(net); > > > > This has been wrongly backported. Please apply the patch below. diff --git a/a/content_digest b/N1/content_digest index 5b9ab43..ea740d2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -13,7 +13,7 @@ "b\0" "On Thu, Feb 09, 2017 at 07:37:35PM +0000, Ben Hutchings wrote:\n" "> On Fri, 2017-01-13 at 12:38 +0100, Greg Kroah-Hartman wrote:\n" - "> > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me know.\n" + "> > 4.4-stable review patch.\303\257\302\277\302\275\303\257\302\277\302\275If anyone has any objections, please let me know.\n" "> > \n" "> > ------------------\n" "> > \n" @@ -26,7 +26,7 @@ "> > for encapsulation headers. Because of this the largest allowed TSO\n" "> > packet is reduced.\n" "> > \n" - "> > For older releases, hard code a fixed reduced value.\302\240\302\240For next release,\n" + "> > For older releases, hard code a fixed reduced value.\303\257\302\277\302\275\303\257\302\277\302\275For next release,\n" "> > there is a better solution which uses result of host offload\n" "> > negotiation.\n" "> > \n" @@ -34,28 +34,28 @@ "> > Signed-off-by: David S. Miller <davem@davemloft.net>\n" "> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "> > ---\n" - "> > \302\240drivers/net/hyperv/netvsc_drv.c |\302\240\302\240\302\240\302\2403 +++\n" - "> > \302\2401 file changed, 3 insertions(+)\n" + "> > \303\257\302\277\302\275drivers/net/hyperv/netvsc_drv.c |\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\2753 +++\n" + "> > \303\257\302\277\302\2751 file changed, 3 insertions(+)\n" "> > \n" "> > --- a/drivers/net/hyperv/netvsc_drv.c\n" "> > +++ b/drivers/net/hyperv/netvsc_drv.c\n" "> > @@ -40,6 +40,8 @@\n" - "> > \302\240\n" - "> > \302\240#include \"hyperv_net.h\"\n" - "> > \302\240\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275#include \"hyperv_net.h\"\n" + "> > \303\257\302\277\302\275\n" "> > +/* Restrict GSO size to account for NVGRE */\n" "> > +#define NETVSC_GSO_MAX_SIZE\t62768\n" - "> > \302\240\n" - "> > \302\240#define RING_SIZE_MIN 64\n" - "> > \302\240static int ring_size = 128;\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275#define RING_SIZE_MIN 64\n" + "> > \303\257\302\277\302\275static int ring_size = 128;\n" "> > @@ -852,6 +854,7 @@ static int netvsc_set_channels(struct ne\n" - "> > \302\240\t\t}\n" - "> > \302\240\t\tgoto recover;\n" - "> > \302\240\t}\n" + "> > \303\257\302\277\302\275\t\t}\n" + "> > \303\257\302\277\302\275\t\tgoto recover;\n" + "> > \303\257\302\277\302\275\t}\n" "> > +\tnetif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);\n" - "> > \302\240\n" - "> > \302\240 out:\n" - "> > \302\240\tnetvsc_open(net);\n" + "> > \303\257\302\277\302\275\n" + "> > \303\257\302\277\302\275 out:\n" + "> > \303\257\302\277\302\275\tnetvsc_open(net);\n" "> > \n" "> \n" "> This has been wrongly backported. Please apply the patch below.\n" @@ -66,4 +66,4 @@ "\n" greg k-h -fed02ec22ba669d619f3ad08c9b7834e8f6a98076be90c1b2e4f4017993ffcc3 +d2ef7de2fd5a040f3b62f459a4f445e8f958b7e50424cef490d495a7200c2d67
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.