Re: [PATCH net-next-2.6 1/5] genirq: Add IRQ affinity notifiers

[David Miller <davem@davemloft.net>]

From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 19 Jan 2011 22:19:04 +0100 (CET)

> B1;2401;0cOn Wed, 19 Jan 2011, Ben Hutchings wrote:
> 
>> When initiating I/O on a multiqueue and multi-IRQ device, we may want
>> to select a queue for which the response will be handled on the same
>> or a nearby CPU.  This requires a reverse-map of IRQ affinity.  Add a
>> notification mechanism to support this.
>> 
>> This is based closely on work by Thomas Gleixner <tglx@linutronix.de>.
>> 
>> Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
>> ---
>> Thomas, I hope this answers all your comments.  If you are happy with
>> this, can it go into net-next-2.6 so the rest of this series can get
>> into 2.6.39?
> 
> Looks good, but I prefer to take it via the tip/genirq branch as I
> have other changes pending to that code. I'll put this into a separate
> branch based on rc1 as a single commit so Dave can pull that branch
> into netdev. Dave ?

But if you do that what happens down the line when Linus pulls our trees
in?

If he takes your tip/genirq first, I have merge hassles to deal with.

If he takes the -rc1 relative version I end up with, you'll have the
merge hassles.