diff for duplicates of <57678F8F.6060303@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 65acb54..988a3ca 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -85,4 +85,9 @@ And there only one confliction exist: + static bool numa_off; //choose this ++>>>>>>> acpi -> +> + +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 8d757be..135393a 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,25 @@ "ref\020160607135852.GA20477@arm.com\0" "ref\05757DE57.10700@huawei.com\0" "ref\020160614142220.GC14654@e104818-lin.cambridge.arm.com\0" - "From\0thunder.leizhen@huawei.com (Leizhen (ThunderTown))\0" - "Subject\0[PATCH v4 00/14] fix some type infos and bugs for arm64/of numa\0" + "ref\020160614142220.GC14654-M2fw3Uu6cmfZROr8t4l/smS4ubULX0JqMm0uRHvK7Nw@public.gmane.org\0" + "From\0Leizhen (ThunderTown) <thunder.leizhen-hv44wF8Li93QT0dZR+AlfA@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa\0" "Date\0Mon, 20 Jun 2016 14:39:11 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Catalin Marinas <catalin.marinas-5wv7dgnIgG8@public.gmane.org>\0" + "Cc\0Will Deacon <will.deacon-5wv7dgnIgG8@public.gmane.org>" + devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + Zefan Li <lizefan-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> + David Daney <david.daney-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> + Xinwei Hu <huxinwei-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> + Hanjun Guo <guohanjun-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> + linux-kernel <linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> + Robert Richter <rrichter-YGCgFSpz5w/QT0dZR+AlfA@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Tianhong Ding <dingtianhong-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> + Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> + Ganapatrao Kulkarni <gkulkarni-M3mlKVOIwJVv6pq1l3V1OdBPR1lH4CV8@public.gmane.org> + Frank Rowand <frowand.list-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> + " linux-arm-kernel <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org>\0" "\00:1\0" "b\0" "\n" @@ -95,6 +110,11 @@ "+ static bool numa_off;\t\t\t\t\t\t\t//choose this\n" "++>>>>>>> acpi\n" "\n" - > + "> \n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -52e3ffe591b77046ddd6629541ca945bcff779683103c082961f61962832c8b1 +bcec36c6a058bcf5c76b89680ab3a89c7118f42b406bb6151f526b7c17374ec5
diff --git a/a/content_digest b/N2/content_digest index 8d757be..b06f5c7 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,10 +2,24 @@ "ref\020160607135852.GA20477@arm.com\0" "ref\05757DE57.10700@huawei.com\0" "ref\020160614142220.GC14654@e104818-lin.cambridge.arm.com\0" - "From\0thunder.leizhen@huawei.com (Leizhen (ThunderTown))\0" - "Subject\0[PATCH v4 00/14] fix some type infos and bugs for arm64/of numa\0" + "From\0Leizhen (ThunderTown) <thunder.leizhen@huawei.com>\0" + "Subject\0Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa\0" "Date\0Mon, 20 Jun 2016 14:39:11 +0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Catalin Marinas <catalin.marinas@arm.com>\0" + "Cc\0Will Deacon <will.deacon@arm.com>" + devicetree <devicetree@vger.kernel.org> + Zefan Li <lizefan@huawei.com> + David Daney <david.daney@cavium.com> + Xinwei Hu <huxinwei@huawei.com> + Hanjun Guo <guohanjun@huawei.com> + linux-kernel <linux-kernel@vger.kernel.org> + Robert Richter <rrichter@cavium.com> + Rob Herring <robh+dt@kernel.org> + Tianhong Ding <dingtianhong@huawei.com> + Grant Likely <grant.likely@linaro.org> + Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com> + Frank Rowand <frowand.list@gmail.com> + " linux-arm-kernel <linux-arm-kernel@lists.infradead.org>\0" "\00:1\0" "b\0" "\n" @@ -97,4 +111,4 @@ "\n" > -52e3ffe591b77046ddd6629541ca945bcff779683103c082961f61962832c8b1 +38fedd795f366500322a10c789667fc885e2fc356e4566f4d8101c465892e55c
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.