On Mon, May 23, 2011 at 12:27:35PM -0700, Linus Torvalds wrote: > On Mon, May 23, 2011 at 12:05 PM, Greg KH <gregkh@xxxxxxx> wrote: > > > > Some api cleanups, and driver updates, nothing really major. You will > > get two conflicts when you merge this to your tree (one in the tty > > Makefile and one in the bluetooth driver), but they should be "obvious" > > as to what to do. > > I went a bit beyond "obvious", and actually fixed in the merge what > looked to be some missed things: > > - the hci_uart_tty_receive "Return value" comment was stale > > - it really looked to me like the 'stat.byte_rx' increment should use > the new 'received' count that we return. > > So anybody who cares should probably check the end result. It looks correct to me, thanks for catching this and doing the merge. greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-serial" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
