From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932395AbcLGEFh (ORCPT ); Tue, 6 Dec 2016 23:05:37 -0500 Received: from ozlabs.org ([103.22.144.67]:52017 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932302AbcLGEEu (ORCPT ); Tue, 6 Dec 2016 23:04:50 -0500 Date: Wed, 7 Dec 2016 15:04:47 +1100 From: Stephen Rothwell To: Greg KH , David Miller , Networking Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jarod Wilson Subject: linux-next: manual merge of the staging tree with the net-next tree Message-ID: <20161207150447.160b7735@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 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. -- Cheers, Stephen Rothwell