From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423233AbcFHJAg (ORCPT ); Wed, 8 Jun 2016 05:00:36 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:26319 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161659AbcFHJAc (ORCPT ); Wed, 8 Jun 2016 05:00:32 -0400 Subject: Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa To: Will Deacon References: <1465286898-13828-1-git-send-email-thunder.leizhen@huawei.com> <20160607135852.GA20477@arm.com> CC: Catalin Marinas , linux-arm-kernel , Ganapatrao Kulkarni , Robert Richter , "David Daney" , Rob Herring , "Frank Rowand" , Grant Likely , devicetree , linux-kernel , Zefan Li , Xinwei Hu , Tianhong Ding , Hanjun Guo From: "Leizhen (ThunderTown)" Message-ID: <5757DE57.10700@huawei.com> Date: Wed, 8 Jun 2016 16:59:03 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <20160607135852.GA20477@arm.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A0C0204.5757DE67.01B9,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 780193edc0577824ae6575a70fd3a754 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2016/6/7 21:58, Will Deacon wrote: > On Tue, Jun 07, 2016 at 04:08:04PM +0800, Zhen Lei wrote: >> v3 -> v4: >> 1. Packed three patches of Kefeng Wang, patch6-8. >> 2. Add 6 new patches(9-15) to enhance the numa on arm64. >> >> v2 -> v3: >> 1. Adjust patch2 and patch5 according to Matthias Brugger's advice, to make the >> patches looks more well. The final code have no change. >> >> v1 -> v2: >> 1. Base on https://lkml.org/lkml/2016/5/24/679 > > If you want bug fixes to land in 4.7, you'll need to base them on a > mainline kernel. I heared that David Daney's acpi numa patch series was accepted and put into next branch(Linux 4.8). Otherwise I will suggest him sending his patch6-7 to mainline first. So that, only a very small conflict will be exist. I also tested that: 1. git am David Daney's patch6-7, then git am all of my patches on a branch, named branch A. 2. git am David Daney's patch6-7 on another branch, named branch B. 3. when I git merge B into branch A, it's still conflict. So I guess git merge is based on source code, rather than patches. So at present, unless the maintainers are willing to resolve the conflict, otherwise I update my patches will not work. Fortunately, these patches are not particularly urgent. So I think I can wait until Linux 4.8 start, then send these patches again. But I'm not sure whether these patches can be merged into Linux 4.8, I really hope. > > Will > > . >