From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752495AbcLGHCs (ORCPT ); Wed, 7 Dec 2016 02:02:48 -0500 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:37108 "EHLO out2-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbcLGHCr (ORCPT ); Wed, 7 Dec 2016 02:02:47 -0500 X-ME-Sender: X-Sasl-enc: vwp9wSBgsoW901WjznCCHBlj/181Ns4pRM1b7E/SiJMc 1481094166 Date: Wed, 7 Dec 2016 08:02:55 +0100 From: Greg KH To: Stephen Rothwell Cc: David Miller , Networking , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarod Wilson Subject: Re: linux-next: manual merge of the staging tree with the net-next tree Message-ID: <20161207070255.GB9824@kroah.com> References: <20161207150447.160b7735@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20161207150447.160b7735@canb.auug.org.au> User-Agent: Mutt/1.7.2 (2016-11-26) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Dec 07, 2016 at 03:04:47PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the staging tree got a conflict in: > > drivers/staging/slicoss/slicoss.c > > between commit: > > a52ad514fdf3 ("net: deprecate eth_change_mtu, remove usage") > > from the net-next tree and commit: > > 0af72df267f2 ("staging: slicoss: remove the staging driver") > > from the staging tree. > > I fixed it up (I just removed the file) 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, we did coordinate this :) greg k-h