Re: linux-next: manual merge of the v4l-dvb tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Mauro,

On Tue, 14 Oct 2008 18:28:46 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the v4l-dvb tree got a lot of conflicts
> against Linus' tree.  It looks like it has been rebased and has
> cherry-picked a lot of commits from Linus' tree.  However it got into
> this state, it needs a major fixup.
> 
> I have dropped it for today.

And continue to do so.  Please clean it up.

(Just as a reminder, I fetch your "stable" branch.)

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgptcDup1aYNa.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux