Messages in this thread | | | Date | Fri, 16 Mar 2012 08:29:03 -0700 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the char-misc tree with the powerpc tree |
| |
On Fri, Mar 16, 2012 at 04:52:07PM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the char-misc tree got a conflict in > drivers/char/viotape.c between commit ba7a4822b48f ("powerpc: Remove some > of the legacy iSeries specific device drivers") from the powerpc tree and > commit 5fb15db4376f ("char: Fix typo in viotape.c") from the char-misc > tree. > > The former removed this file, so I did that.
Sounds good to me, thanks.
greg k-h
| |