From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752777AbdLCXFb (ORCPT ); Sun, 3 Dec 2017 18:05:31 -0500 Received: from ozlabs.org ([103.22.144.67]:56679 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752074AbdLCXFa (ORCPT ); Sun, 3 Dec 2017 18:05:30 -0500 Date: Mon, 4 Dec 2017 10:05:27 +1100 From: Stephen Rothwell To: Al Viro Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Colin Ian King , "David S. Miller" Subject: linux-next: manual merge of the vfs tree with Linus' tree Message-ID: <20171204100527.1366a333@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 Al, Today's linux-next merge of the vfs tree got a conflict in: drivers/net/ethernet/via/via-rhine.c between commit: a7e4fbbfdf79 ("net: via: via-rhine: use %p to format void * address instead of %x") from Linus' tree and commit: 68fef306c2a5 ("via: trivial sparse annotations") from the vfs tree. I fixed it up (I used the version of the netdev_info line change from Linus' tree) 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