Re: linux-next: manual merge of the ttydev tree with the usb.current tree

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

 



Hi Greg,

On Mon, 27 Apr 2009 21:58:28 -0700 Greg KH <greg@xxxxxxxxx> wrote:
>
> It's all in Linus's tree, and has been for a few days now.  Are you
> still getting merge errors?

Oops, wrong target :-)

Yes, I am still getting merge conflicts, but they are obviously Alan's
problem, now.

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

Attachment: pgp6YIicNirCG.pgp
Description: PGP signature


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

  Powered by Linux