Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1171200
| From | Borislav Petkov <bp@suse.de> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [GIT PULL] EDAC updates for 4.2 |
| Date | 2015-06-24 11:00 +0200 |
| Message-ID | <pEOHg-4WG-1@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> <pEOHg-4WG-3@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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.
--
--
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 | Next in thread | Find similar | Unroll 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