From: Ingo Molnar <mingo@elte.hu>
To: Borislav Petkov <borislav.petkov@amd.com>
Cc: Andreas Herrmann <andreas.herrmann3@amd.com>,
"H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>,
Sachin Sant <sachinp@in.ibm.com>,
Stephen Rothwell <sfr@canb.auug.org.au>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@redhat.com>
Subject: Re: Boot failure on x86_64 (OOPS set_cpu_sibling_map() )
Date: Tue, 4 Aug 2009 16:47:41 +0200 [thread overview]
Message-ID: <20090804144741.GL7746@elte.hu> (raw)
In-Reply-To: <20090804143150.GC1870@aftab>
* Borislav Petkov <borislav.petkov@amd.com> wrote:
> On Tue, Aug 04, 2009 at 03:50:29PM +0200, Ingo Molnar wrote:
> > > > Mind preparing a separate branch for it (.31-rc5 based) and send me
> > > > a pull request so that we can share the commit between the EDAC tree
> > > > and the x86 tree?
> > >
> > > Well, Andreas says the patches need a little polishing and he'll
> > > be sending updated versions soon so you can pick them up. And
> > > since the EDAC MCE stuff might still change before .32 merge
> > > window opens, let's synchronize our pull requests instead. In the
> > > meantime, I'll be rediffing the EDAC stuff against -tip for
> > > linux-next.
> >
> > Would you rebase just due to this commit?
>
> No, I wanted to keep the opportunity to be able to rebase the
> whole series until the very last minute before the merge window,
> should anything need to be changed...
Note that's the wrong workflow. We dont rebase Git trees really just
because 'something needs to be changed' - we make sure all commits
make sense, we fix bugs and append new changes to the end. That
results in a far better end result than a constant rebasing
workflow. See various mails from Linus on lkml about this topic. (i
have no handy URL for this now - maybe someone else has)
> > No need for that, feel free to carry it until Andreas sends an
> > updated version. Then i can put it into a separate .31-rc5 based
> > topic that you can pull into the EDAC tree.
>
> ... and this is basically what I had in mind: After you pull them
> in, I'll rebase my branch against yours for linux-next. I see that
> Stephen pulls edac before -tip in linux-next so I'll ask him
> nicely to reorder those. This approach makes most sense anyways
> since edac relies on a bunch of x86 facilities (topology bits,
> rd/wrmsr_on_cpus, mcheck etc) and it is only natural that it goes
> second in linux-next, right?
>
> Then the pull requests will go out in the same order during the
> merge window and we should be fine.
ok. I'll wait for Andreas's next version of the patch. Feel free to
carry the interim version - just please dont crash the x86 bootup
;-)
Ingo
next prev parent reply other threads:[~2009-08-04 14:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-30 8:21 linux-next: Tree for July 30 Stephen Rothwell
2009-07-30 11:25 ` Boot failure on x86_64 (OOPS set_cpu_sibling_map() ) Sachin Sant
2009-07-30 13:56 ` Borislav Petkov
2009-07-31 10:41 ` Sachin Sant
2009-08-03 9:31 ` Ingo Molnar
2009-08-03 10:14 ` Borislav Petkov
2009-08-03 12:07 ` Ingo Molnar
2009-08-03 12:50 ` Borislav Petkov
2009-08-04 13:50 ` Ingo Molnar
2009-08-04 14:31 ` Borislav Petkov
2009-08-04 14:47 ` Ingo Molnar [this message]
2009-08-04 15:00 ` Borislav Petkov
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=20090804144741.GL7746@elte.hu \
--to=mingo@elte.hu \
--cc=andreas.herrmann3@amd.com \
--cc=borislav.petkov@amd.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=sachinp@in.ibm.com \
--cc=sfr@canb.auug.org.au \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).