Re: linux-next: manual merge of the tip tree with the sound tree

2017-11-01 Thread Takashi Iwai
On Wed, 01 Nov 2017 07:53:59 +0100, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the tip tree got conflicts in: > > sound/oss/midibuf.c > sound/oss/soundcard.c > sound/oss/sys_timer.c > sound/oss/uart6850.c > > between commit: > > 727dede0ba8a ("sound: Retire O

linux-next: manual merge of the tip tree with the sound tree

2017-10-31 Thread Stephen Rothwell
Hi all, Today's linux-next merge of the tip tree got conflicts in: sound/oss/midibuf.c sound/oss/soundcard.c sound/oss/sys_timer.c sound/oss/uart6850.c between commit: 727dede0ba8a ("sound: Retire OSS") from the sound tree and commit: 1d27e3e2252b ("timer: Remove expires and data