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 OSS")
>
> from the sound tree and commit:
>
> 1d27e3e2252b ("timer: Remove expires and data arguments from DEFINE_TIMER")
>
> from the tip tree.
>
> I fixed it up (I just deleted the files) and can carry the fix as
> necessary. This is now fixed as far as linux-next is concerned, but any
> non trivial conflicts should be mentioned to your upstream maintainer
> when your tree is submitted for merging. You may also want to consider
> cooperating with the maintainer of the conflicting tree to minimise any
> particularly complex conflicts.
Thanks, just removing the whole changes is correct.
Takashi
