Messages in this thread | | | Date | Mon, 17 Sep 2012 04:20:21 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the staging tree with the tty tree |
| |
On Mon, Sep 17, 2012 at 05:37:06PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in > drivers/staging/ipack/devices/ipoctal.c between commit 734cc1783816 > ("TTY: use tty_port_register_device") from the tty tree and commit > d04600679ba0 ("Staging: ipack/devices/ipoctal: simplify ipoctal_write_tty > ()") from the staging tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Looks good to me, thanks for this.
greg k-h
| |