Re: [GIT PULL] EDAC updates for 4.2

From	Thomas Gleixner <tglx@linutronix.de>
Newsgroups	linux.kernel
Subject	Re: [GIT PULL] EDAC updates for 4.2
Date	2015-06-24 11:00 +0200
Message-ID	<pEOHg-4WG-3@gated-at.bofh.it> (permalink)
References	<pE63w-7OF-17@gated-at.bofh.it> <pEFkC-8ie-7@gated-at.bofh.it> <pENBw-3q6-11@gated-at.bofh.it> <pEOef-4ou-25@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

Re: [GIT PULL] EDAC updates for 4.2 Borislav Petkov <bp@suse.de> - 2015-06-24 09:50 +0200
  Re: [GIT PULL] EDAC updates for 4.2 Ingo Molnar <mingo@kernel.org> - 2015-06-24 10:30 +0200
    Re: [GIT PULL] EDAC updates for 4.2 Borislav Petkov <bp@suse.de> - 2015-06-24 11:00 +0200
    Re: [GIT PULL] EDAC updates for 4.2 Thomas Gleixner <tglx@linutronix.de> - 2015-06-24 11:00 +0200

csiph-web