Messages in this thread | | | Date | Tue, 22 Jul 2008 14:14:19 -0700 | From | Andrew Morton <> | Subject | Re: [patch 00/26] x64, x2apic/intr-remap: Interrupt-remapping and x2apic support |
| |
On Tue, 22 Jul 2008 14:00:47 -0700 Mike Travis <travis@sgi.com> wrote:
> Andrew Morton wrote: > > On Thu, 10 Jul 2008 21:53:20 +0200 > > Ingo Molnar <mingo@elte.hu> wrote: > > > >> For review and testing purposes i've created a new topic branch for > >> this: tip/x86/x2apic and have picked up your patches into it. > > > > This has today turned up in linux-next and I'm having to rework 2.6.27 > > patches to compensate for it. > > > > Which means that I now need to wait until this work goes into mainline > > before I can merge those patches or I need to undo those fixes, route > > around Suresh's changes and then force you to fix the resulting damage. > > > > What's the score here? Is this stuff going into 2.6.27? > > Hi Andrew, > > Jack is out at OLS this week, but yes I believe we're trying to push this > into 6.2.27 as that is what the distro's will be basing their distributions > on when the new system sees the light of day.
2.6.27 material shuld not be turning up in linux-next halfway through the merge window.
> Is there something I can do to help? Perhaps work on conflict resolutions?
It was a simple fix.
| |