Messages in this thread | | | Date | Wed, 21 Sep 2011 07:06:23 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the tty tree with the powerpc tree |
| |
On Wed, Sep 21, 2011 at 03:01:21PM +1000, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the tty tree got conflicts in > arch/powerpc/include/asm/udbg.h and arch/powerpc/kernel/udbg.c between > commit c26afe9e8591 ("powerpc/ps3: Add gelic udbg driver") from the > powerpc tree and commit dcd83aaff1c8 ("tty/powerpc: introduce the ePAPR > embedded hypervisor byte channel driver") from the tty tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Thanks, that looks fine to me.
greg k-h
| |