From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754287AbdKAGyE (ORCPT ); Wed, 1 Nov 2017 02:54:04 -0400 Received: from ozlabs.org ([103.22.144.67]:47091 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750904AbdKAGyD (ORCPT ); Wed, 1 Nov 2017 02:54:03 -0400 Date: Wed, 1 Nov 2017 17:53:59 +1100 From: Stephen Rothwell To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , Takashi Iwai Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Kees Cook Subject: linux-next: manual merge of the tip tree with the sound tree Message-ID: <20171101175359.4074a6af@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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. -- Cheers, Stephen Rothwell