diff for duplicates of <20171209170616.GF27604@kroah.com> diff --git a/a/1.txt b/N1/1.txt index 302a841..99e566e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ On Fri, Dec 08, 2017 at 03:56:40AM +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 know. +> > 4.4-stable review patch.��If anyone has any objections, please let me know. > > > > ------------------ > > @@ -20,21 +20,21 @@ On Fri, Dec 08, 2017 at 03:56:40AM +0000, Ben Hutchings wrote: > > Signed-off-by: Sasha Levin <alexander.levin@verizon.com> > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > --- -> > tools/usb/usbip/Makefile.am | 3 ++- -> > 1 file changed, 2 insertions(+), 1 deletion(-) +> > �tools/usb/usbip/Makefile.am |����3 ++- +> > �1 file changed, 2 insertions(+), 1 deletion(-) > > > > --- a/tools/usb/usbip/Makefile.am > > +++ b/tools/usb/usbip/Makefile.am > > @@ -1,6 +1,7 @@ -> > SUBDIRS := libsrc src -> > includedir = @includedir@/usbip -> > include_HEADERS := $(addprefix libsrc/, \ -> > - usbip_common.h vhci_driver.h usbip_host_driver.h) -> > + usbip_common.h vhci_driver.h usbip_host_driver.h \ -> > + list.h sysfs_utils.h usbip_host_common.h) +> > �SUBDIRS := libsrc src +> > �includedir = @includedir@/usbip +> > �include_HEADERS := $(addprefix libsrc/, \ +> > - �����usbip_common.h vhci_driver.h usbip_host_driver.h) +> > + �����usbip_common.h vhci_driver.h usbip_host_driver.h \ +> > + �����list.h sysfs_utils.h usbip_host_common.h) > > usbip_host_common.h was added in 4.7 (by the second commit listed -> above), so for 4.4 and 3.18 it should not be added to this list. +> above), so�for 4.4 and 3.18 it should not be added to this list. Thanks, now dropped from those trees. diff --git a/a/content_digest b/N1/content_digest index ec555ef..daaae11 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,7 +14,7 @@ "b\0" "On Fri, Dec 08, 2017 at 03:56:40AM +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 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" @@ -34,21 +34,21 @@ "> > Signed-off-by: Sasha Levin <alexander.levin@verizon.com>\n" "> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>\n" "> > ---\n" - "> > \302\240tools/usb/usbip/Makefile.am |\302\240\302\240\302\240\302\2403 ++-\n" - "> > \302\2401 file changed, 2 insertions(+), 1 deletion(-)\n" + "> > \303\257\302\277\302\275tools/usb/usbip/Makefile.am |\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, 2 insertions(+), 1 deletion(-)\n" "> > \n" "> > --- a/tools/usb/usbip/Makefile.am\n" "> > +++ b/tools/usb/usbip/Makefile.am\n" "> > @@ -1,6 +1,7 @@\n" - "> > \302\240SUBDIRS := libsrc src\n" - "> > \302\240includedir = @includedir@/usbip\n" - "> > \302\240include_HEADERS := $(addprefix libsrc/, \\\n" - "> > -\t\t\302\240\302\240\302\240\302\240\302\240usbip_common.h vhci_driver.h usbip_host_driver.h)\n" - "> > +\t\t\302\240\302\240\302\240\302\240\302\240usbip_common.h vhci_driver.h usbip_host_driver.h \\\n" - "> > +\t\t\302\240\302\240\302\240\302\240\302\240list.h sysfs_utils.h usbip_host_common.h)\n" + "> > \303\257\302\277\302\275SUBDIRS := libsrc src\n" + "> > \303\257\302\277\302\275includedir = @includedir@/usbip\n" + "> > \303\257\302\277\302\275include_HEADERS := $(addprefix libsrc/, \\\n" + "> > -\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275usbip_common.h vhci_driver.h usbip_host_driver.h)\n" + "> > +\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275usbip_common.h vhci_driver.h usbip_host_driver.h \\\n" + "> > +\t\t\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275\303\257\302\277\302\275list.h sysfs_utils.h usbip_host_common.h)\n" "> \n" "> usbip_host_common.h was added in 4.7 (by the second commit listed\n" - "> above), so\302\240for 4.4 and 3.18 it should not be added to this list.\n" + "> above), so\303\257\302\277\302\275for 4.4 and 3.18 it should not be added to this list.\n" "\n" "Thanks, now dropped from those trees.\n" "\n" @@ -56,4 +56,4 @@ "\n" greg k-h -0d99f4ce169767a744b70693e1f72ffa52915686a90cb56f7900291e7e151845 +3a3fd7a0665434370641323b1975ca68d9ea528f927c1b664ba65a197ee3d4a5
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.