From: Borislav Petkov <bp@suse.de>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-edac <linux-edac@vger.kernel.org>, x86-ml <x86@kernel.org>,
lkml <linux-kernel@vger.kernel.org>
Subject: Re: [GIT PULL] EDAC updates for 4.2
Date: Wed, 24 Jun 2015 10:54:25 +0200 [thread overview]
Message-ID: <20150624085425.GC32642@pd.tnic> (raw)
In-Reply-To: <alpine.DEB.2.11.1506241048260.4037@nanos>
On Wed, Jun 24, 2015 at 10:50:38AM +0200, Thomas Gleixner wrote:
> 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
Yeah, in hindsight, we probably should've simply routed all the changes
to amd_mce_inj (the error injection module which depends on the tip
changes) straight through tip/x86/ras and wouldn't have any issues. Oh
well, I'll know that now for the future.
So I'll wait out to hear what Linus prefers and do that.
Thanks guys.
--
Regards/Gruss,
Boris.
ECO tip #101: Trim your mails when you reply.
--
prev parent reply other threads:[~2015-06-24 8:54 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-22 9:11 [GIT PULL] EDAC updates for 4.2 Borislav Petkov
2015-06-23 22:49 ` Linus Torvalds
2015-06-24 7:40 ` Borislav Petkov
2015-06-24 8:23 ` Ingo Molnar
2015-06-24 8:50 ` Thomas Gleixner
2015-06-24 8:54 ` Borislav Petkov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150624085425.GC32642@pd.tnic \
--to=bp@suse.de \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox