diff for duplicates of <1371241083.2996.7@snotra> diff --git a/a/1.txt b/N1/1.txt index 6ccc137..edc956e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,54 +1,54 @@ On 06/14/2013 04:05:34 AM, Rojhalat Ibrahim wrote: -> Commit 50d8f87d2b3 (powerpc/fsl-pci Make PCIe hotplug work with =20 +> Commit 50d8f87d2b3 (powerpc/fsl-pci Make PCIe hotplug work with > Freescale -> PCIe controllers) does not handle non-PCIe controllers properly, =20 +> PCIe controllers) does not handle non-PCIe controllers properly, > which causes > a panic during boot for certain configurations. -> This patch fixes the issue by calling setup_indirect_pci for all =20 +> This patch fixes the issue by calling setup_indirect_pci for all > device types. -> fsl_indirect_read_config is now only used for booke/86xx PCIe =20 +> fsl_indirect_read_config is now only used for booke/86xx PCIe > controllers. ->=20 +> > Reported-by: Michael Guntsche <mike@it-loops.com> > Cc: Scott Wood <scottwood@freescale.com> > Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de> > --- > v2: Make it more consistent. ->=20 +> > arch/powerpc/sysdev/fsl_pci.c | 20 +++++++------------- > 1 file changed, 7 insertions(+), 13 deletions(-) ->=20 -> diff --git a/arch/powerpc/sysdev/fsl_pci.c =20 +> +> diff --git a/arch/powerpc/sysdev/fsl_pci.c > b/arch/powerpc/sysdev/fsl_pci.c > index 028ac1f..5682c8a 100644 > --- a/arch/powerpc/sysdev/fsl_pci.c > +++ b/arch/powerpc/sysdev/fsl_pci.c -> @@ -97,20 +97,12 @@ static int fsl_indirect_read_config(struct =20 +> @@ -97,20 +97,12 @@ static int fsl_indirect_read_config(struct > pci_bus *bus, > unsigned int devfn, > return indirect_read_config(bus, devfn, offset, len, val); > } ->=20 -> -static struct pci_ops fsl_indirect_pci_ops =3D -> +static struct pci_ops fsl_indirect_pcie_ops =3D +> +> -static struct pci_ops fsl_indirect_pci_ops = +> +static struct pci_ops fsl_indirect_pcie_ops = > { -> .read =3D fsl_indirect_read_config, -> .write =3D indirect_write_config, +> .read = fsl_indirect_read_config, +> .write = indirect_write_config, > }; On 83xx: cc1: warnings being treated as errors -/home/scott/fsl/git/linux/upstream/arch/powerpc/sysdev/fsl_pci.c:100:23: =20 +/home/scott/fsl/git/linux/upstream/arch/powerpc/sysdev/fsl_pci.c:100:23: error: 'fsl_indirect_pcie_ops' defined but not used make[2]: *** [arch/powerpc/sysdev/fsl_pci.o] Error 1 make[2]: *** Waiting for unfinished jobs.... -I can fix this when applying, but this makes me wonder how you tested =20 -it, given that the whole point is to fix 83xx... Did you fix this and =20 +I can fix this when applying, but this makes me wonder how you tested +it, given that the whole point is to fix 83xx... Did you fix this and then accidentally sent a stale version? -Also, please be careful that the patch doesn't get line wrapped -- I =20 -had to manually unwrap a couple places. Use git send-email if you =20 +Also, please be careful that the patch doesn't get line wrapped -- I +had to manually unwrap a couple places. Use git send-email if you can't get KMail to cooperate. --Scott= +-Scott diff --git a/a/content_digest b/N1/content_digest index b9d5084..0b6567e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,64 +3,64 @@ "Subject\0Re: [PATCH v2] powerpc/pci: Fix setup of Freescale PCI / PCIe controllers\0" "Date\0Fri, 14 Jun 2013 15:18:03 -0500\0" "To\0Rojhalat Ibrahim <imr@rtschenk.de>\0" - "Cc\0linuxppc-dev@lists.ozlabs.org" - linux-kernel@vger.kernel.org - " Michael Guntsche <michael.guntsche@it-loops.com>\0" + "Cc\0Michael Guntsche <michael.guntsche@it-loops.com>" + <linuxppc-dev@lists.ozlabs.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 06/14/2013 04:05:34 AM, Rojhalat Ibrahim wrote:\n" - "> Commit 50d8f87d2b3 (powerpc/fsl-pci Make PCIe hotplug work with =20\n" + "> Commit 50d8f87d2b3 (powerpc/fsl-pci Make PCIe hotplug work with \n" "> Freescale\n" - "> PCIe controllers) does not handle non-PCIe controllers properly, =20\n" + "> PCIe controllers) does not handle non-PCIe controllers properly, \n" "> which causes\n" "> a panic during boot for certain configurations.\n" - "> This patch fixes the issue by calling setup_indirect_pci for all =20\n" + "> This patch fixes the issue by calling setup_indirect_pci for all \n" "> device types.\n" - "> fsl_indirect_read_config is now only used for booke/86xx PCIe =20\n" + "> fsl_indirect_read_config is now only used for booke/86xx PCIe \n" "> controllers.\n" - ">=20\n" + "> \n" "> Reported-by: Michael Guntsche <mike@it-loops.com>\n" "> Cc: Scott Wood <scottwood@freescale.com>\n" "> Signed-off-by: Rojhalat Ibrahim <imr@rtschenk.de>\n" "> ---\n" "> v2: Make it more consistent.\n" - ">=20\n" + "> \n" "> arch/powerpc/sysdev/fsl_pci.c | 20 +++++++-------------\n" "> 1 file changed, 7 insertions(+), 13 deletions(-)\n" - ">=20\n" - "> diff --git a/arch/powerpc/sysdev/fsl_pci.c =20\n" + "> \n" + "> diff --git a/arch/powerpc/sysdev/fsl_pci.c \n" "> b/arch/powerpc/sysdev/fsl_pci.c\n" "> index 028ac1f..5682c8a 100644\n" "> --- a/arch/powerpc/sysdev/fsl_pci.c\n" "> +++ b/arch/powerpc/sysdev/fsl_pci.c\n" - "> @@ -97,20 +97,12 @@ static int fsl_indirect_read_config(struct =20\n" + "> @@ -97,20 +97,12 @@ static int fsl_indirect_read_config(struct \n" "> pci_bus *bus,\n" "> unsigned int devfn,\n" "> \treturn indirect_read_config(bus, devfn, offset, len, val);\n" "> }\n" - ">=20\n" - "> -static struct pci_ops fsl_indirect_pci_ops =3D\n" - "> +static struct pci_ops fsl_indirect_pcie_ops =3D\n" + "> \n" + "> -static struct pci_ops fsl_indirect_pci_ops =\n" + "> +static struct pci_ops fsl_indirect_pcie_ops =\n" "> {\n" - "> \t.read =3D fsl_indirect_read_config,\n" - "> \t.write =3D indirect_write_config,\n" + "> \t.read = fsl_indirect_read_config,\n" + "> \t.write = indirect_write_config,\n" "> };\n" "\n" "On 83xx:\n" "cc1: warnings being treated as errors\n" - "/home/scott/fsl/git/linux/upstream/arch/powerpc/sysdev/fsl_pci.c:100:23: =20\n" + "/home/scott/fsl/git/linux/upstream/arch/powerpc/sysdev/fsl_pci.c:100:23: \n" "error: 'fsl_indirect_pcie_ops' defined but not used\n" "make[2]: *** [arch/powerpc/sysdev/fsl_pci.o] Error 1\n" "make[2]: *** Waiting for unfinished jobs....\n" "\n" - "I can fix this when applying, but this makes me wonder how you tested =20\n" - "it, given that the whole point is to fix 83xx... Did you fix this and =20\n" + "I can fix this when applying, but this makes me wonder how you tested \n" + "it, given that the whole point is to fix 83xx... Did you fix this and \n" "then accidentally sent a stale version?\n" "\n" - "Also, please be careful that the patch doesn't get line wrapped -- I =20\n" - "had to manually unwrap a couple places. Use git send-email if you =20\n" + "Also, please be careful that the patch doesn't get line wrapped -- I \n" + "had to manually unwrap a couple places. Use git send-email if you \n" "can't get KMail to cooperate.\n" "\n" - -Scott= + -Scott -61ce1f807430ee27ddd07a80b35e2dccd1973c6f5198de9d1a66fee7909fa03b +f865a2fb1e9b59c35f1bc3694b210bbe4fa1c61a6405e67c100e0c6a72f1eebd
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.