From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jean Delvare Subject: Re: [PATCH] i2c multiplexer driver for Proliant microserver N36L Date: Fri, 15 Jun 2012 11:22:56 +0200 Message-ID: <20120615112256.7c61fa18@endymion.delvare> References: <20111127225514.GO19115@trinity.fluff.org> <20111203162757.GA24302@ericsson.com> <20111203180819.2ddbcb3a@endymion.delvare> <20111206093906.21dccf8d@endymion.delvare> <20120613094739.360967aa@endymion.delvare> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20120613094739.360967aa-R0o5gVi9kd7kN2dkZ6Wm7A@public.gmane.org> Sender: linux-i2c-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Eddi De Pieri Cc: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Thomas Brandon , Andrew Armenia List-Id: linux-i2c@vger.kernel.org Hi Eddi, On Wed, 13 Jun 2012 09:47:39 +0200, Jean Delvare wrote: > On Wed, 13 Jun 2012 07:44:34 +0200, Eddi De Pieri wrote: > > It works for me too > > > > What about including this patch in the mainline? > > Yesterday I reviewed a patch set adding support for the auxiliary SMBus > controller on the SB600/SB700: > http://marc.info/?t=133886124500001&r=1&w=2 > http://marc.info/?t=133886124300004&r=1&w=2 > http://marc.info/?t=133886124300003&r=1&w=2 > > It touches the exact same area as touched by your patch, so they will > conflict. Best would be to rebase the SB800 multiport support patch on > top of the other patch set. This is done now, you can download my current patch stack at: http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c/ or http://khali.linux-fr.org/devel/linux-3/jdelvare-i2c.tar.gz Could you please rebase your patch on top of that and resubmit? Thanks. -- Jean Delvare