Messages in this thread | | | Date | Wed, 24 Jun 2015 10:50:38 +0200 (CEST) | From | Thomas Gleixner <> | Subject | Re: [GIT PULL] EDAC updates for 4.2 |
| |
On Wed, 24 Jun 2015, Ingo Molnar wrote:
> * Borislav Petkov <bp@suse.de> wrote: > > > > If it doesn't work or compile without the tip pile, then I'm not pulling it at > > > all, since that means that any problems are not bisectable. > > > > Ok, how would you prefer this solved - should I merge the relevant tip branches > > into it? > > So the broken commit is 1862c7c3483c. Given that only a handful of commits follow > it, I'd suggest the following resolution, to preserve half of your tree: > > git checkout -b tmp.tmp your/edac/tree > git reset --hard 1862c7c3483c^1 > git merge linus # where 'linus' is 407a2c720556e - your DEFERRED_ERROR_VECTOR dependency > git checkout -b tmp.tmp2 your/edac/tree > git rebase --onto tmp.tmp 1862c7c3483c^1 > > Then re-test and re-submit the result to Linus as -v2. > > Note that 407a2c720556e is very early in the v4.2 merge window, with only -tip > (and some VFS) bits in it, which I have tested and which is looking pretty robust. > > In the future we can do such dependencies in -tip as well, so that they don't > reach Linus - I didn't realize your tree had this dependency.
One of the solution I use for cross tree dependencies is:
- Apply the commits which create a dependency to a seperate branch
- Let the depending tree pull that branch
- Merge the branch into the proper tip/ branch
Thanks,
tglx
| |