On Tue, Apr 20, 2010 at 01:15:36AM +0100, Ben Dooks wrote: > On Sun, Apr 18, 2010 at 01:40:21PM +0200, Wolfram Sang wrote: > > On Sun, Apr 18, 2010 at 01:04:57PM +0200, Jean Delvare wrote: > > > Hi Wolfram, > > > > > > On Sun, 18 Apr 2010 12:21:10 +0200, Wolfram Sang wrote: > > > > The issue was truly solved by the second patch in this thread: > > > > > > > > http://thread.gmane.org/gmane.linux.drivers.i2c/5436 > > > > > > > > Accidently, the first one was picked up. So, this patch adds the > > > > remaining diff (and an additional newline). > > > > > > > > Signed-off-by: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> > > > > Cc: Luotao Fu <l.fu@xxxxxxxxxxxxxx> > > > > Cc: Kevin Wells <kevin.wells@xxxxxxx> > > > > Cc: Ben Dooks <ben-linux@xxxxxxxxx> > > > > Cc: Jean Delvare <khali@xxxxxxxxxxxx> > > > > --- > > > > > > > > Jean, can you pick this up, so it will be correct in 2.6.34? > > > > > > i2c-pnx is for an embedded platform -> this is for Ben. > > > > Would you mind picking it up if he has not done till, let's say, rc6? He did > > not comment to my pointers so far. Other stuff is pending, too (though not > > urgent). Maybe he is away/busy? > > Could you check my for-linus/i2c branch on git.fluff.org to see if > that fixes the problem for you, and if there is anything else that > needs fixing. Looks good to me. Kevin, are you fine, too? All other patches I carry can wait for the next merge window. Just, I'd really like to finally get rid of them then :) The branch is here: The following changes since commit 01bf0b64579ead8a82e7cfc32ae44bc667e7ad0f: Linus Torvalds (1): Linux 2.6.34-rc5 are available in the git repository at: git://git.pengutronix.de/git/wsa/linux-2.6.git for-i2c Uwe Kleine-König (2): i2c/pxa: remove unused macro MAINTAINERS: add i2c tree for embedded platforms Wolfram Sang (5): i2c/pxa: only define 'blue_murder'-function if DEBUG is #defined i2c/mpc: drop NO_IRQ i2c/cpm: drop NO_IRQ i2c/ibm-iic: drop NO_IRQ i2c/highlander: remover superflous variable MAINTAINERS | 1 + drivers/i2c/busses/i2c-cpm.c | 2 +- drivers/i2c/busses/i2c-highlander.c | 5 ++--- drivers/i2c/busses/i2c-ibm_iic.c | 14 +++++++------- drivers/i2c/busses/i2c-mpc.c | 6 +++--- drivers/i2c/busses/i2c-pxa.c | 26 ++++++++++++++------------ 6 files changed, 28 insertions(+), 26 deletions(-) Is a branch okay or do you prefer a series? Regards, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
