diff for duplicates of <520B42C8.7050102@arm.com> diff --git a/a/1.txt b/N1/1.txt index d02b641..198c203 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,19 +16,19 @@ On 13/08/13 19:37, Michal Simek wrote: >>>> for you to fetch changes up to >>>> 9e9e26dde91f22635c87d0e45f3938b5ded96f0d: >>>> ->>>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes +>>>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes=20 >>>> (2013-08-12 10:22:29 +0100) >>>> ->>>> ---------------------------------------------------------------- +>>>> ----------------------------------------------------------------=20 >>>> Sudeep KarkadaNagesha (16): of: add support for retrieving cpu node >>>> for a given logical cpu index ARM: DT/kernel: define ARM specific >>>> arch_match_cpu_phys_id driver/core: cpu: initialize of_node in >>>> cpu's device struture of/device: add helper to get cpu device node >>>> from logical cpu index ARM: topology: remove hwid/MPIDR dependency >>>> from cpu_capacity ARM: mvebu: remove device tree parsing for cpu ->>>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes ->>>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes ->>>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes +>>>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes=20 +>>>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes=20 +>>>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes=20 >>>> cpufreq: highbank-cpufreq: remove device tree parsing for cpu >>>> nodes cpufreq: spear-cpufreq: remove device tree parsing for cpu >>>> nodes cpufreq: kirkwood-cpufreq: remove device tree parsing for cpu @@ -38,31 +38,32 @@ On 13/08/13 19:37, Michal Simek wrote: >>>> nodes cpufreq: pmac32-cpufreq: remove device tree parsing for cpu >>>> nodes >>>> ->>>> arch/arm/kernel/devtree.c | 5 +++++ ->>>> arch/arm/kernel/topology.c | 61 ->>>> +++++++++++++++++++------------------------------------------ ->>>> arch/arm/mach-imx/mach-imx6q.c | 3 +-- ->>>> arch/arm/mach-mvebu/platsmp.c | 52 ->>>> ++++++++++++++++++++++++---------------------------- +>>>> arch/arm/kernel/devtree.c | 5 +++++=20 +>>>> arch/arm/kernel/topology.c | 61=20 +>>>> +++++++++++++++++++------------------------------------------=20 +>>>> arch/arm/mach-imx/mach-imx6q.c | 3 +--=20 +>>>> arch/arm/mach-mvebu/platsmp.c | 52=20 +>>>> ++++++++++++++++++++++++----------------------------=20 >>>> drivers/base/cpu.c | 2 ++ drivers/bus/arm-cci.c ->>>> | 28 +++++++--------------------- ->>>> drivers/cpufreq/arm_big_little_dt.c | 40 ->>>> ++++++++++++++-------------------------- ->>>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++------------------- ->>>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------ ->>>> drivers/cpufreq/imx6q-cpufreq.c | 4 +--- ->>>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++--- ->>>> drivers/cpufreq/maple-cpufreq.c | 23 +++-------------------- ->>>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++-- ->>>> drivers/cpufreq/pmac64-cpufreq.c | 47 ->>>> +++++++++++------------------------------------ +>>>> | 28 +++++++---------------------=20 +>>>> drivers/cpufreq/arm_big_little_dt.c | 40=20 +>>>> ++++++++++++++--------------------------=20 +>>>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++-------------------=20 +>>>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------=20 +>>>> drivers/cpufreq/imx6q-cpufreq.c | 4 +---=20 +>>>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++---=20 +>>>> drivers/cpufreq/maple-cpufreq.c | 23 +++--------------------=20 +>>>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++--=20 +>>>> drivers/cpufreq/pmac64-cpufreq.c | 47=20 +>>>> +++++++++++------------------------------------=20 >>>> drivers/cpufreq/spear-cpufreq.c | 4 ++-- drivers/of/base.c ->>>> | 73 ->>>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +>>>> | 73=20 +>>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++++ >>>> >>>> >> include/linux/cpu.h | 1 + ->>>> include/linux/of.h | 6 ++++++ +>>>> include/linux/of.h | 6 ++++++=20 >>>> include/linux/of_device.h | 15 +++++++++++++++ 19 files >>>> changed, 202 insertions(+), 216 deletions(-) >>>> @@ -83,7 +84,7 @@ On 13/08/13 19:37, Michal Simek wrote: >>> head: 0d4bcb5dc7d3040c0ce7572ea30ab9e5d9455bfa commit: >>> 7939ff8d991de2c0b15064e76ee549a6df5ae67f [151/204] of: add >>> support for retrieving cpu node for a given logical cpu index ->>> config: make ARCH=powerpc allmodconfig +>>> config: make ARCH=3Dpowerpc allmodconfig >>> >>> All error/warnings: >>> @@ -92,7 +93,7 @@ On 13/08/13 19:37, Michal Simek wrote: >>> warning: (MPC836x_RDK && MTD_NAND_FSL_ELBC && MTD_NAND_FSL_UPM) >>> selects FSL_LBC which has unmet direct dependencies (FSL_SOC) >>> In file included from arch/powerpc/include/asm/kvm_para.h:26:0, from ->>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, +>>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20 >>> from include/linux/kvm_host.h:30, from >>> arch/powerpc/kernel/asm-offsets.c:53: >>> include/linux/of.h:269:28: error: conflicting types for @@ -100,12 +101,12 @@ On 13/08/13 19:37, Michal Simek wrote: >>> extern struct device_node *of_get_cpu_node(int cpu); ^ In file >>> included from include/linux/of.h:139:0, from >>> arch/powerpc/include/asm/kvm_para.h:26, from ->>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, +>>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20 >>> from include/linux/kvm_host.h:30, from ->>> arch/powerpc/kernel/asm-offsets.c:53: +>>> arch/powerpc/kernel/asm-offsets.c:53:=20 >>> arch/powerpc/include/asm/prom.h:47:21: note: previous declaration >>> of 'of_get_cpu_node' was here ->>> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); +>>> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);=20 >>> ^ make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1 make[2]: >>> Target `__build' not remade because of errors. make[1]: *** >>> [prepare0] Error 2 make[1]: Target `prepare' not remade because of @@ -115,7 +116,7 @@ On 13/08/13 19:37, Michal Simek wrote: >> There seems to be conflict in the new function "of_get_cpu_node" added. >> PowerPC also defines the same function name. Further microblaze and >> openrisc declares it(can be removed) but doesn't define it. -> +>=20 > Feel free to remove it for Microblaze. > There was probably any reason why it was there. > Or maybe no reason and it was just there because Microblaze diff --git a/a/content_digest b/N1/content_digest index 131ac10..b02b6ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -6,17 +6,16 @@ "Subject\0Re: [GIT PULL] DT/core: cpu_ofnode updates for v3.12\0" "Date\0Wed, 14 Aug 2013 09:41:44 +0100\0" "To\0monstr@monstr.eu <monstr@monstr.eu>\0" - "Cc\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>" - Rafael J. Wysocki <rjw@sisk.pl> - rob.herring@calxeda.com <rob.herring@calxeda.com> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> - Viresh Kumar <viresh.kumar@linaro.org> - Olof Johansson <olof@lixom.net> + "Cc\0devicetree@vger.kernel.org <devicetree@vger.kernel.org>" linux-pm@vger.kernel.org <linux-pm@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> + Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com> + Viresh Kumar <viresh.kumar@linaro.org> linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + rob.herring@calxeda.com <rob.herring@calxeda.com> + Rafael J. Wysocki <rjw@sisk.pl> + Olof Johansson <olof@lixom.net> + linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "On 13/08/13 19:37, Michal Simek wrote:\n" @@ -37,19 +36,19 @@ ">>>> for you to fetch changes up to\n" ">>>> 9e9e26dde91f22635c87d0e45f3938b5ded96f0d:\n" ">>>>\n" - ">>>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes \n" + ">>>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes=20\n" ">>>> (2013-08-12 10:22:29 +0100)\n" ">>>>\n" - ">>>> ---------------------------------------------------------------- \n" + ">>>> ----------------------------------------------------------------=20\n" ">>>> Sudeep KarkadaNagesha (16): of: add support for retrieving cpu node\n" ">>>> for a given logical cpu index ARM: DT/kernel: define ARM specific\n" ">>>> arch_match_cpu_phys_id driver/core: cpu: initialize of_node in\n" ">>>> cpu's device struture of/device: add helper to get cpu device node\n" ">>>> from logical cpu index ARM: topology: remove hwid/MPIDR dependency\n" ">>>> from cpu_capacity ARM: mvebu: remove device tree parsing for cpu\n" - ">>>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes \n" - ">>>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes \n" - ">>>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes \n" + ">>>> nodes drivers/bus: arm-cci: avoid parsing DT for cpu device nodes=20\n" + ">>>> cpufreq: imx6q-cpufreq: remove device tree parsing for cpu nodes=20\n" + ">>>> cpufreq: cpufreq-cpu0: remove device tree parsing for cpu nodes=20\n" ">>>> cpufreq: highbank-cpufreq: remove device tree parsing for cpu\n" ">>>> nodes cpufreq: spear-cpufreq: remove device tree parsing for cpu\n" ">>>> nodes cpufreq: kirkwood-cpufreq: remove device tree parsing for cpu\n" @@ -59,31 +58,32 @@ ">>>> nodes cpufreq: pmac32-cpufreq: remove device tree parsing for cpu\n" ">>>> nodes\n" ">>>>\n" - ">>>> arch/arm/kernel/devtree.c | 5 +++++ \n" - ">>>> arch/arm/kernel/topology.c | 61 \n" - ">>>> +++++++++++++++++++------------------------------------------ \n" - ">>>> arch/arm/mach-imx/mach-imx6q.c | 3 +-- \n" - ">>>> arch/arm/mach-mvebu/platsmp.c | 52 \n" - ">>>> ++++++++++++++++++++++++---------------------------- \n" + ">>>> arch/arm/kernel/devtree.c | 5 +++++=20\n" + ">>>> arch/arm/kernel/topology.c | 61=20\n" + ">>>> +++++++++++++++++++------------------------------------------=20\n" + ">>>> arch/arm/mach-imx/mach-imx6q.c | 3 +--=20\n" + ">>>> arch/arm/mach-mvebu/platsmp.c | 52=20\n" + ">>>> ++++++++++++++++++++++++----------------------------=20\n" ">>>> drivers/base/cpu.c | 2 ++ drivers/bus/arm-cci.c\n" - ">>>> | 28 +++++++--------------------- \n" - ">>>> drivers/cpufreq/arm_big_little_dt.c | 40 \n" - ">>>> ++++++++++++++-------------------------- \n" - ">>>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++------------------- \n" - ">>>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------ \n" - ">>>> drivers/cpufreq/imx6q-cpufreq.c | 4 +--- \n" - ">>>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++--- \n" - ">>>> drivers/cpufreq/maple-cpufreq.c | 23 +++-------------------- \n" - ">>>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++-- \n" - ">>>> drivers/cpufreq/pmac64-cpufreq.c | 47 \n" - ">>>> +++++++++++------------------------------------ \n" + ">>>> | 28 +++++++---------------------=20\n" + ">>>> drivers/cpufreq/arm_big_little_dt.c | 40=20\n" + ">>>> ++++++++++++++--------------------------=20\n" + ">>>> drivers/cpufreq/cpufreq-cpu0.c | 23 ++++-------------------=20\n" + ">>>> drivers/cpufreq/highbank-cpufreq.c | 18 ++++++------------=20\n" + ">>>> drivers/cpufreq/imx6q-cpufreq.c | 4 +---=20\n" + ">>>> drivers/cpufreq/kirkwood-cpufreq.c | 8 +++++---=20\n" + ">>>> drivers/cpufreq/maple-cpufreq.c | 23 +++--------------------=20\n" + ">>>> drivers/cpufreq/pmac32-cpufreq.c | 5 +++--=20\n" + ">>>> drivers/cpufreq/pmac64-cpufreq.c | 47=20\n" + ">>>> +++++++++++------------------------------------=20\n" ">>>> drivers/cpufreq/spear-cpufreq.c | 4 ++-- drivers/of/base.c\n" - ">>>> | 73 \n" - ">>>> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n" + ">>>> | 73=20\n" + ">>>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++=\n" + "+++\n" ">>>>\n" ">>>>\n" ">> include/linux/cpu.h | 1 +\n" - ">>>> include/linux/of.h | 6 ++++++ \n" + ">>>> include/linux/of.h | 6 ++++++=20\n" ">>>> include/linux/of_device.h | 15 +++++++++++++++ 19 files\n" ">>>> changed, 202 insertions(+), 216 deletions(-)\n" ">>>>\n" @@ -104,7 +104,7 @@ ">>> head: 0d4bcb5dc7d3040c0ce7572ea30ab9e5d9455bfa commit:\n" ">>> 7939ff8d991de2c0b15064e76ee549a6df5ae67f [151/204] of: add\n" ">>> support for retrieving cpu node for a given logical cpu index\n" - ">>> config: make ARCH=powerpc allmodconfig\n" + ">>> config: make ARCH=3Dpowerpc allmodconfig\n" ">>>\n" ">>> All error/warnings:\n" ">>>\n" @@ -113,7 +113,7 @@ ">>> warning: (MPC836x_RDK && MTD_NAND_FSL_ELBC && MTD_NAND_FSL_UPM)\n" ">>> selects FSL_LBC which has unmet direct dependencies (FSL_SOC)\n" ">>> In file included from arch/powerpc/include/asm/kvm_para.h:26:0, from\n" - ">>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, \n" + ">>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20\n" ">>> from include/linux/kvm_host.h:30, from\n" ">>> arch/powerpc/kernel/asm-offsets.c:53:\n" ">>> include/linux/of.h:269:28: error: conflicting types for\n" @@ -121,12 +121,12 @@ ">>> extern struct device_node *of_get_cpu_node(int cpu); ^ In file\n" ">>> included from include/linux/of.h:139:0, from\n" ">>> arch/powerpc/include/asm/kvm_para.h:26, from\n" - ">>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4, \n" + ">>> include/uapi/linux/kvm_para.h:26, from include/linux/kvm_para.h:4,=20\n" ">>> from include/linux/kvm_host.h:30, from\n" - ">>> arch/powerpc/kernel/asm-offsets.c:53: \n" + ">>> arch/powerpc/kernel/asm-offsets.c:53:=20\n" ">>> arch/powerpc/include/asm/prom.h:47:21: note: previous declaration\n" ">>> of 'of_get_cpu_node' was here\n" - ">>> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); \n" + ">>> struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);=20\n" ">>> ^ make[2]: *** [arch/powerpc/kernel/asm-offsets.s] Error 1 make[2]:\n" ">>> Target `__build' not remade because of errors. make[1]: ***\n" ">>> [prepare0] Error 2 make[1]: Target `prepare' not remade because of\n" @@ -136,7 +136,7 @@ ">> There seems to be conflict in the new function \"of_get_cpu_node\" added.\n" ">> PowerPC also defines the same function name. Further microblaze and\n" ">> openrisc declares it(can be removed) but doesn't define it.\n" - "> \n" + ">=20\n" "> Feel free to remove it for Microblaze.\n" "> There was probably any reason why it was there.\n" "> Or maybe no reason and it was just there because Microblaze\n" @@ -148,4 +148,4 @@ "Regards,\n" Sudeep -c13118aba64b73b3bd84b06125167a54dff80ebde9a653c66b8ec6e97a2704e7 +28d91dac1b1a6b15dc416ea796eebecc85246d4ad4a0692d507fcba21730c409
diff --git a/a/content_digest b/N2/content_digest index 131ac10..92afa79 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,21 +2,10 @@ "ref\03356439.a21MloFP7n@vostro.rjw.lan\0" "ref\0520A536C.3030600@arm.com\0" "ref\0520A7CEE.40003@monstr.eu\0" - "From\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>\0" - "Subject\0Re: [GIT PULL] DT/core: cpu_ofnode updates for v3.12\0" + "From\0Sudeep.KarkadaNagesha@arm.com (Sudeep KarkadaNagesha)\0" + "Subject\0[GIT PULL] DT/core: cpu_ofnode updates for v3.12\0" "Date\0Wed, 14 Aug 2013 09:41:44 +0100\0" - "To\0monstr@monstr.eu <monstr@monstr.eu>\0" - "Cc\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>" - Rafael J. Wysocki <rjw@sisk.pl> - rob.herring@calxeda.com <rob.herring@calxeda.com> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - linuxppc-dev@lists.ozlabs.org <linuxppc-dev@lists.ozlabs.org> - Viresh Kumar <viresh.kumar@linaro.org> - Olof Johansson <olof@lixom.net> - linux-pm@vger.kernel.org <linux-pm@vger.kernel.org> - linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org> - linux-kernel@vger.kernel.org <linux-kernel@vger.kernel.org> - " devicetree@vger.kernel.org <devicetree@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 13/08/13 19:37, Michal Simek wrote:\n" @@ -148,4 +137,4 @@ "Regards,\n" Sudeep -c13118aba64b73b3bd84b06125167a54dff80ebde9a653c66b8ec6e97a2704e7 +857ccf4e7c95b6b38b41e70061f25f50004ed6d33ca4ee080bf6c926a1d3db7b
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.