diff for duplicates of <520A536C.3030600@arm.com> diff --git a/a/1.txt b/N1/1.txt index 4a98f5c..79a7916 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,29 +4,29 @@ On 13/08/13 14:00, Rafael J. Wysocki wrote: > On Monday, August 12, 2013 02:27:47 PM Sudeep KarkadaNagesha wrote: >> The following changes since commit >> d4e4ab86bcba5a72779c43dc1459f71fea3d89c8: ->> +>>=20 >> Linux 3.11-rc5 (2013-08-11 18:04:20 -0700) ->> +>>=20 >> are available in the git repository at: ->> +>>=20 >> git://linux-arm.org/linux-skn.git cpu_of_node ->> +>>=20 >> for you to fetch changes up to >> 9e9e26dde91f22635c87d0e45f3938b5ded96f0d: ->> ->> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes +>>=20 +>> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes=20 >> (2013-08-12 10:22:29 +0100) ->> ->> ---------------------------------------------------------------- +>>=20 +>> ----------------------------------------------------------------=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 @@ -35,44 +35,45 @@ On 13/08/13 14:00, Rafael J. Wysocki wrote: >> nodes cpufreq: pmac64-cpufreq: remove device tree parsing for cpu >> 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 ->> ++++++++++++++++++++++++---------------------------- +>>=20 +>> 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 +>> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++= ++ >> ->> +>>=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(-) ->> ->> +>>=20 +>>=20 >> PS: This patch series is reviewed and acknowledged @ ->> +>>=20 >> v1: https://lkml.org/lkml/2013/7/15/128 v2: >> https://lkml.org/lkml/2013/7/17/341 v3: >> https://lkml.org/lkml/2013/7/22/219 -> +>=20 > Pulled, thanks! -> +>=20 Hi Rob, Rafael, On 13/08/13 15:16, kbuild test robot wrote:> tree: @@ -81,16 +82,16 @@ bleeding-edge > 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 +>=20 > All error/warnings: -> +>=20 > warning: (MPC836x_RDK && MTD_NAND_FSL_ELBC && MTD_NAND_FSL_UPM) > selects FSL_LBC which has unmet direct dependencies (FSL_SOC) > 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 @@ -98,17 +99,17 @@ bleeding-edge > 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 > errors. make: *** [sub-make] Error 2 -> +>=20 There seems to be conflict in the new function "of_get_cpu_node" added. PowerPC also defines the same function name. Further microblaze and diff --git a/a/content_digest b/N1/content_digest index 04f6a17..5f88212 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,13 +7,13 @@ rob.herring@calxeda.com <rob.herring@calxeda.com> Benjamin Herrenschmidt <benh@kernel.crashing.org> " linuxppc-dev@lists.ozlabs.org\0" - "Cc\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>" - 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" + Olof Johansson <olof@lixom.net> + " linux-arm-kernel@lists.infradead.org <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "Adding PowerPC list\n" @@ -22,29 +22,29 @@ "> On Monday, August 12, 2013 02:27:47 PM Sudeep KarkadaNagesha wrote:\n" ">> The following changes since commit\n" ">> d4e4ab86bcba5a72779c43dc1459f71fea3d89c8:\n" - ">> \n" + ">>=20\n" ">> Linux 3.11-rc5 (2013-08-11 18:04:20 -0700)\n" - ">> \n" + ">>=20\n" ">> are available in the git repository at:\n" - ">> \n" + ">>=20\n" ">> git://linux-arm.org/linux-skn.git cpu_of_node\n" - ">> \n" + ">>=20\n" ">> for you to fetch changes up to\n" ">> 9e9e26dde91f22635c87d0e45f3938b5ded96f0d:\n" - ">> \n" - ">> cpufreq: pmac32-cpufreq: remove device tree parsing for cpu nodes \n" + ">>=20\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" + ">> ----------------------------------------------------------------=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" @@ -53,44 +53,45 @@ ">> nodes cpufreq: pmac64-cpufreq: remove device tree parsing for cpu\n" ">> 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" + ">>=20\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" + ">>=20\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" - ">> \n" + ">>=20\n" + ">>=20\n" ">> PS: This patch series is reviewed and acknowledged @\n" - ">> \n" + ">>=20\n" ">> v1: https://lkml.org/lkml/2013/7/15/128 v2:\n" ">> https://lkml.org/lkml/2013/7/17/341 v3:\n" ">> https://lkml.org/lkml/2013/7/22/219\n" - "> \n" + ">=20\n" "> Pulled, thanks!\n" - "> \n" + ">=20\n" "Hi Rob, Rafael,\n" "\n" "On 13/08/13 15:16, kbuild test robot wrote:> tree:\n" @@ -99,16 +100,16 @@ "> 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" - "> \n" + "> config: make ARCH=3Dpowerpc allmodconfig\n" + ">=20\n" "> All error/warnings:\n" - "> \n" + ">=20\n" "> warning: (MPC836x_RDK && MTD_NAND_FSL_ELBC && MTD_NAND_FSL_UPM)\n" "> selects FSL_LBC which has unmet direct dependencies (FSL_SOC)\n" "> 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" @@ -116,17 +117,17 @@ "> 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" "> errors. make: *** [sub-make] Error 2\n" - "> \n" + ">=20\n" "\n" "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" @@ -145,4 +146,4 @@ "Regards,\n" Sudeep -10bc06b1ed39c4026cae732118edf45d8f67186566420f9796cacce726dead1c +1af3ec6d20b56f561d3842af337fa66fe9bd0bc9a51e47584cf5335c51a28d21
diff --git a/a/content_digest b/N2/content_digest index 04f6a17..e21c149 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,19 +1,9 @@ "ref\05208E2D3.7060005@arm.com\0" "ref\03356439.a21MloFP7n@vostro.rjw.lan\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\0Tue, 13 Aug 2013 16:40:28 +0100\0" - "To\0Rafael J. Wysocki <rjw@sisk.pl>" - rob.herring@calxeda.com <rob.herring@calxeda.com> - Benjamin Herrenschmidt <benh@kernel.crashing.org> - " linuxppc-dev@lists.ozlabs.org\0" - "Cc\0Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>" - 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" "Adding PowerPC list\n" @@ -145,4 +135,4 @@ "Regards,\n" Sudeep -10bc06b1ed39c4026cae732118edf45d8f67186566420f9796cacce726dead1c +d055c5222695c2e93cc3ddab9fa73f69570443193660f8ee1dd40e47aa7c194e
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.