linux-next: build failure after merge of the i2c tree
in [Kernel]
|
Prev: [PATCH 3/6 v3]cifs Fix warnings variables set but not used
Next: USB: serial: ftdi: correct merge conflict with CONTEC id
From: Stephen Rothwell on 20 Jun 2010 22:10 Hi Jean, After merging the i2c tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: drivers/i2c/i2c-core.c: In function 'i2c_detect': drivers/i2c/i2c-core.c:1460: error: 'adap' undeclared (first use in this function) Caused by commit b741e61eb906816f78acbf361797fd408abdc715 ("i2c: Fix probability check"). The typo in this patch is probably why the later patch that I dropped would not apply ... I have used the i2c tree form next-20100618 for today. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/
From: Jean Delvare on 21 Jun 2010 02:00 On Mon, 21 Jun 2010 12:03:31 +1000, Stephen Rothwell wrote: > Hi Jean, > > After merging the i2c tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > drivers/i2c/i2c-core.c: In function 'i2c_detect': > drivers/i2c/i2c-core.c:1460: error: 'adap' undeclared (first use in this function) Oops, sorry, forgot to refresh the patch before pushing it. This is fixed now. > Caused by commit b741e61eb906816f78acbf361797fd408abdc715 ("i2c: Fix > probability check"). The typo in this patch is probably why the later > patch that I dropped would not apply ... You are correct. > I have used the i2c tree form next-20100618 for today. -- Jean Delvare -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Stephen Rothwell on 21 Jun 2010 03:20
Hi Jean, On Mon, 21 Jun 2010 07:57:33 +0200 Jean Delvare <khali(a)linux-fr.org> wrote: > > Oops, sorry, forgot to refresh the patch before pushing it. This is > fixed now. OK, thanks. -- Cheers, Stephen Rothwell sfr(a)canb.auug.org.au http://www.canb.auug.org.au/~sfr/ |