[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20110119.134812.123988295.davem@davemloft.net>
Date: Wed, 19 Jan 2011 13:48:12 -0800 (PST)
From: David Miller <davem@...emloft.net>
To: tglx@...utronix.de
Cc: bhutchings@...arflare.com, netdev@...r.kernel.org,
linux-net-drivers@...arflare.com, therbert@...gle.com
Subject: Re: [PATCH net-next-2.6 1/5] genirq: Add IRQ affinity notifiers
From: Thomas Gleixner <tglx@...utronix.de>
Date: Wed, 19 Jan 2011 22:39:04 +0100 (CET)
> On Wed, 19 Jan 2011, David Miller wrote:
>> From: Thomas Gleixner <tglx@...utronix.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@...utronix.de>.
>> >>
>> >> Signed-off-by: Ben Hutchings <bhutchings@...arflare.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.
>
> Nothing will happen and no hassels at all, because your tree and my
> tree have the exact same commit with the exact same sha1. You don't
> have further changes in your tree which touch genirq stuff and I don't
> have anything which touches net.
You said you had stuff before Ben's patches, and that's why you needed
to provide me with an -rc1 relative version of his commits.
If that's not the case, then yes it would work just fine.
Just give me the URL to pull from, thanks!
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists