login
Header Space

 
 

Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: upstream build failure: v4l/dvb)

Score:
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Stephen Rothwell <sfr@...>
Cc: LKML <linux-kernel@...>, <linux-next@...>, Andrew Morton <akpm@...>, Linus <torvalds@...>
Date: Wednesday, April 30, 2008 - 3:12 pm

On Wed, 30 Apr 2008 13:49:50 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:


We've found some bugs that may explain what you've got. Anyway, most of they
are fixed. I'm preparing a pull request for Linus later today.


The same patch were on both Linus and my tree. -git sometimes don't like
this ;) 

Anyway, I've already dropped those patches that were already applied from my
tree. You should get a clean merge tomorrow.

Cheers,
Mauro
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
linux-next: upstream build failure: v4l/dvb, Stephen Rothwell, (Tue Apr 29, 9:41 pm)
Re: linux-next: upstream build failure: v4l/dvb, Mauro Carvalho Chehab, (Tue Apr 29, 10:00 pm)
linux-next: v4l-dvb merge conflicts (Re: linux-next: upstrea..., Stephen Rothwell, (Tue Apr 29, 11:49 pm)
Re: linux-next: v4l-dvb merge conflicts (Re: linux-next: ups..., Mauro Carvalho Chehab, (Wed Apr 30, 3:12 pm)
speck-geostationary