Messages in this thread | | | Date | Mon, 23 Apr 2012 09:40:38 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the tty tree with the tty.current tree |
| |
On Thu, Apr 19, 2012 at 02:59:51PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got a conflict in > drivers/tty/serial/pch_uart.c between commit af6d17cdc8c8 ("pch_uart: Fix > dma channel unallocated issue") from the tty.current tree and commit > 44db113212d8 ("pch_uart: Delete unused structure member") from the tty > tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Thanks for this, it should now be resolved in my tree.
greg k-h
| |