Re: linux-next: manual merge of the rr_cpumask tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Mike,

On Mon, 15 Dec 2008 22:02:25 -0800 Mike Travis <travis@xxxxxxx> wrote:
>
> Yes, I did finally figure that out.  Thanks for rebasing the part that Ingo needed
> so maybe the rest can be pushed.  There was a problem when the 'for-ingo' tree was
> merged as there were mixed up API calls in io_apic.c, but I fixed them in the first
> x86 only patch.  I wasn't sure of what else to do.

You could have fixed them up as part of the actual merge commit.  If each
tree was correct on it own, then the merge is the place for such
resolutions.

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgpQq3FSJdKcd.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux