diff for duplicates of <20171209170458.GD27604@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 44d5ce3..066188e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Fri, Dec 08, 2017 at 05:10:49AM +0000, Ben Hutchings wrote: > On Thu, 2017-12-07 at 14:07 +0100, Greg Kroah-Hartman wrote: -> > 4.4-stable review patch. If anyone has any objections, please let me +> > 4.4-stable review patch.��If anyone has any objections, please let me > > know. > > > > ------------------ @@ -11,17 +11,17 @@ On Fri, Dec 08, 2017 at 05:10:49AM +0000, Ben Hutchings wrote: > > [ Upstream commit e2e004acc7cbe3c531e752a270a74e95cde3ea48 ] > [...] > > @@ -1950,9 +1942,10 @@ abort_transaction_no_dev_fatal: -> > xenbus_transaction_end(xbt, 1); -> > destroy_ring: -> > xennet_disconnect_backend(info); +> > � xenbus_transaction_end(xbt, 1); +> > � destroy_ring: +> > � xennet_disconnect_backend(info); > > - kfree(info->queues); > > - info->queues = NULL; > > + xennet_destroy_queues(info); -> > out: +> > � out: > > + unregister_netdev(info->netdev); > > + xennet_free_netdev(info->netdev); -> > return err; -> > } +> > � return err; +> > �} > > This last bit of cleanup looks wrong. It was subsequently changed > upstream by: diff --git a/a/content_digest b/N1/content_digest index 95f2892..21bc970 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -15,7 +15,7 @@ "b\0" "On Fri, Dec 08, 2017 at 05:10:49AM +0000, Ben Hutchings wrote:\n" "> On Thu, 2017-12-07 at 14:07 +0100, Greg Kroah-Hartman wrote:\n" - "> > 4.4-stable review patch.\302\240\302\240If anyone has any objections, please let me\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\n" "> > know.\n" "> > \n" "> > ------------------\n" @@ -26,17 +26,17 @@ "> > [ Upstream commit e2e004acc7cbe3c531e752a270a74e95cde3ea48 ]\n" "> [...]\n" "> > @@ -1950,9 +1942,10 @@ abort_transaction_no_dev_fatal:\n" - "> > \302\240\txenbus_transaction_end(xbt, 1);\n" - "> > \302\240 destroy_ring:\n" - "> > \302\240\txennet_disconnect_backend(info);\n" + "> > \303\257\302\277\302\275\txenbus_transaction_end(xbt, 1);\n" + "> > \303\257\302\277\302\275 destroy_ring:\n" + "> > \303\257\302\277\302\275\txennet_disconnect_backend(info);\n" "> > -\tkfree(info->queues);\n" "> > -\tinfo->queues = NULL;\n" "> > +\txennet_destroy_queues(info);\n" - "> > \302\240 out:\n" + "> > \303\257\302\277\302\275 out:\n" "> > +\tunregister_netdev(info->netdev);\n" "> > +\txennet_free_netdev(info->netdev);\n" - "> > \302\240\treturn err;\n" - "> > \302\240}\n" + "> > \303\257\302\277\302\275\treturn err;\n" + "> > \303\257\302\277\302\275}\n" "> \n" "> This last bit of cleanup looks wrong. It was subsequently changed\n" "> upstream by:\n" @@ -52,4 +52,4 @@ "\n" greg k-h -6179c3d3fdff52eeeeee49d1fabc54e12b2ebf9b35a2f0e2f8d256b35ab71ad8 +3e03c1892ae37878029bed3ce34aa1be3671aa61fc63faa8037e78fab67238f4
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.