Messages in this thread | | | Subject | Re: [PATCH v4 00/14] fix some type infos and bugs for arm64/of numa | From | "Leizhen (ThunderTown)" <> | Date | Wed, 8 Jun 2016 16:59:03 +0800 |
| |
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 > > . >
| |