diff for duplicates of <1345582058-2291-5-git-send-email-linux@prisktech.co.nz> diff --git a/a/1.txt b/N1/1.txt index 1b371f3..d7f6118 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ Add devicetree support for vt8500-ehci. Convert vt8500-uhci to a generic non-pci platform-uhci with device tree support. -Signed-off-by: Tony Prisk <linux@prisktech.co.nz> +Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> --- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-vt8500.c | 25 ++++-- @@ -82,7 +82,7 @@ index c1eda73..0e1637b 100644 + irq = platform_get_irq(pdev, 0); + + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); - if (ret = 0) { + if (ret == 0) { platform_set_drvdata(pdev, hcd); return ret; @@ -162,6 +167,11 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev) @@ -133,10 +133,10 @@ index 0000000..35ca094 +/* + * Generic UHCI HCD (Host Controller Driver) for Platform Devices + * -+ * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz> ++ * Copyright (c) 2011 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org> + * + * This file is based on uhci-grlib.c -+ * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu ++ * (C) Copyright 2004-2007 Alan Stern, stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org + */ + +#include <linux/of.h> diff --git a/a/content_digest b/N1/content_digest index 43af119..4cfefa7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,15 +1,32 @@ "ref\01345582058-2291-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "ref\01345582058-2291-1-git-send-email-linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org\0" + "From\0Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\0" "Subject\0[PATCHv3 4/9] usb: vt8500: Add devicetree support for vt8500-ehci and -uhci.\0" - "Date\0Tue, 21 Aug 2012 20:47:33 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 22 Aug 2012 08:47:33 +1200\0" + "To\0vt8500-wm8505-linux-kernel-/JYPxA39Uh6Zox4op4iWzw@public.gmane.org\0" + "Cc\0Alessandro Zummo <a.zummo-BfzFCNDTiLLj+vYz1yj4TQ@public.gmane.org>" + linux-fbdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + Linus Walleij <linus.walleij-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> + Florian Tobias Schandinat <FlorianSchandinat-Mmb7MZpHnFY@public.gmane.org> + Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> + devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org + linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> + linux-serial-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + rtc-linux-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> + Mike Turquette <mturquette-l0cyMroinI0@public.gmane.org> + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + " Alan Cox <alan-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>\0" "\00:1\0" "b\0" "Add devicetree support for vt8500-ehci.\n" "Convert vt8500-uhci to a generic non-pci platform-uhci with\n" "device tree support.\n" "\n" - "Signed-off-by: Tony Prisk <linux@prisktech.co.nz>\n" + "Signed-off-by: Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "---\n" " drivers/usb/host/Kconfig | 4 +-\n" " drivers/usb/host/ehci-vt8500.c | 25 ++++--\n" @@ -89,7 +106,7 @@ "+\tirq = platform_get_irq(pdev, 0);\n" "+\n" "+\tret = usb_add_hcd(hcd, irq, IRQF_SHARED);\n" - " \tif (ret = 0) {\n" + " \tif (ret == 0) {\n" " \t\tplatform_set_drvdata(pdev, hcd);\n" " \t\treturn ret;\n" "@@ -162,6 +167,11 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)\n" @@ -140,10 +157,10 @@ "+/*\n" "+ * Generic UHCI HCD (Host Controller Driver) for Platform Devices\n" "+ *\n" - "+ * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz>\n" + "+ * Copyright (c) 2011 Tony Prisk <linux-ci5G2KO2hbZ+pU9mqzGVBQ@public.gmane.org>\n" "+ *\n" "+ * This file is based on uhci-grlib.c\n" - "+ * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu\n" + "+ * (C) Copyright 2004-2007 Alan Stern, stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org\n" "+ */\n" "+\n" "+#include <linux/of.h>\n" @@ -309,4 +326,4 @@ "-- \n" 1.7.9.5 -e5cfbde7a0a7882f7790df43f453a479ac4bffc191660b08e0757fb43579f45e +6ee3927fed6c5600d40c362725cf25b18b91078c4b3fa5e99e62ce4f83f651ae
diff --git a/a/1.txt b/N2/1.txt index 1b371f3..29408d6 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -82,7 +82,7 @@ index c1eda73..0e1637b 100644 + irq = platform_get_irq(pdev, 0); + + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); - if (ret = 0) { + if (ret == 0) { platform_set_drvdata(pdev, hcd); return ret; @@ -162,6 +167,11 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev) @@ -136,7 +136,7 @@ index 0000000..35ca094 + * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz> + * + * This file is based on uhci-grlib.c -+ * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu ++ * (C) Copyright 2004-2007 Alan Stern, stern at rowland.harvard.edu + */ + +#include <linux/of.h> diff --git a/a/content_digest b/N2/content_digest index 43af119..eb98eba 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,7 +1,7 @@ "ref\01345582058-2291-1-git-send-email-linux@prisktech.co.nz\0" - "From\0Tony Prisk <linux@prisktech.co.nz>\0" + "From\0linux@prisktech.co.nz (Tony Prisk)\0" "Subject\0[PATCHv3 4/9] usb: vt8500: Add devicetree support for vt8500-ehci and -uhci.\0" - "Date\0Tue, 21 Aug 2012 20:47:33 +0000\0" + "Date\0Wed, 22 Aug 2012 08:47:33 +1200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -89,7 +89,7 @@ "+\tirq = platform_get_irq(pdev, 0);\n" "+\n" "+\tret = usb_add_hcd(hcd, irq, IRQF_SHARED);\n" - " \tif (ret = 0) {\n" + " \tif (ret == 0) {\n" " \t\tplatform_set_drvdata(pdev, hcd);\n" " \t\treturn ret;\n" "@@ -162,6 +167,11 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)\n" @@ -143,7 +143,7 @@ "+ * Copyright (c) 2011 Tony Prisk <linux@prisktech.co.nz>\n" "+ *\n" "+ * This file is based on uhci-grlib.c\n" - "+ * (C) Copyright 2004-2007 Alan Stern, stern@rowland.harvard.edu\n" + "+ * (C) Copyright 2004-2007 Alan Stern, stern at rowland.harvard.edu\n" "+ */\n" "+\n" "+#include <linux/of.h>\n" @@ -309,4 +309,4 @@ "-- \n" 1.7.9.5 -e5cfbde7a0a7882f7790df43f453a479ac4bffc191660b08e0757fb43579f45e +1a2624d633250517f66da91c169586443b380f782409587f65e756aa44bcb375
diff --git a/a/1.txt b/N3/1.txt index 1b371f3..051797c 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -82,7 +82,7 @@ index c1eda73..0e1637b 100644 + irq = platform_get_irq(pdev, 0); + + ret = usb_add_hcd(hcd, irq, IRQF_SHARED); - if (ret = 0) { + if (ret == 0) { platform_set_drvdata(pdev, hcd); return ret; @@ -162,6 +167,11 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev) diff --git a/a/content_digest b/N3/content_digest index 43af119..2271df8 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -1,8 +1,28 @@ "ref\01345582058-2291-1-git-send-email-linux@prisktech.co.nz\0" "From\0Tony Prisk <linux@prisktech.co.nz>\0" "Subject\0[PATCHv3 4/9] usb: vt8500: Add devicetree support for vt8500-ehci and -uhci.\0" - "Date\0Tue, 21 Aug 2012 20:47:33 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 22 Aug 2012 08:47:33 +1200\0" + "To\0vt8500-wm8505-linux-kernel@googlegroup.com\0" + "Cc\0Tony Prisk <linux@prisktech.co.nz>" + Russell King <linux@arm.linux.org.uk> + Alessandro Zummo <a.zummo@towertech.it> + Alan Cox <alan@linux.intel.com> + Greg Kroah-Hartman <gregkh@linuxfoundation.org> + Florian Tobias Schandinat <FlorianSchandinat@gmx.de> + Arnd Bergmann <arnd@arndb.de> + Grant Likely <grant.likely@secretlab.ca> + Rob Herring <rob.herring@calxeda.com> + Rob Landley <rob@landley.net> + Linus Walleij <linus.walleij@stericsson.com> + Mike Turquette <mturquette@ti.com> + Stephen Warren <swarren@nvidia.com> + linux-arm-kernel@lists.infradead.org + linux-kernel@vger.kernel.org + linux-fbdev@vger.kernel.org + linux-usb@vger.kernel.org + linux-serial@vger.kernel.org + rtc-linux@googlegroups.com + " devicetree-discuss@lists.ozlabs.org\0" "\00:1\0" "b\0" "Add devicetree support for vt8500-ehci.\n" @@ -89,7 +109,7 @@ "+\tirq = platform_get_irq(pdev, 0);\n" "+\n" "+\tret = usb_add_hcd(hcd, irq, IRQF_SHARED);\n" - " \tif (ret = 0) {\n" + " \tif (ret == 0) {\n" " \t\tplatform_set_drvdata(pdev, hcd);\n" " \t\treturn ret;\n" "@@ -162,6 +167,11 @@ static int vt8500_ehci_drv_remove(struct platform_device *pdev)\n" @@ -309,4 +329,4 @@ "-- \n" 1.7.9.5 -e5cfbde7a0a7882f7790df43f453a479ac4bffc191660b08e0757fb43579f45e +06819302ad0b3facdff66ad67a2df43e086a23fd20b6c9c8b9179069eb0b1f29
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.