From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1754075AbdKAHOS (ORCPT <rfc822;w@1wt.eu>);
        Wed, 1 Nov 2017 03:14:18 -0400
Received: from mx2.suse.de ([195.135.220.15]:32850 "EHLO mx2.suse.de"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750925AbdKAHOR (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 1 Nov 2017 03:14:17 -0400
Date: Wed, 01 Nov 2017 08:14:14 +0100
Message-ID: <s5hr2ticvy1.wl-tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
        "H. Peter Anvin" <hpa@zytor.com>,
        Peter Zijlstra <peterz@infradead.org>, Takashi Iwai <tiwai@suse.de>,
        Linux-Next Mailing List <linux-next@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Kees Cook <keescook@chromium.org>
Subject: Re: linux-next: manual merge of the tip tree with the sound tree
In-Reply-To: <20171101175359.4074a6af@canb.auug.org.au>
References: <20171101175359.4074a6af@canb.auug.org.au>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3
 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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