From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752069AbdC1D7r (ORCPT ); Mon, 27 Mar 2017 23:59:47 -0400 Received: from ozlabs.org ([103.22.144.67]:53371 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751288AbdC1D7p (ORCPT ); Mon, 27 Mar 2017 23:59:45 -0400 Date: Tue, 28 Mar 2017 14:57:23 +1100 From: Stephen Rothwell To: "Michael S. Tsirkin" , Masahiro Yamada Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Dichtel Subject: linux-next: manual merge of the vhost tree with the kbuild tree Message-ID: <20170328145723.6345493c@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 Michael, Today's linux-next merge of the vhost tree got a conflict in: include/uapi/linux/Kbuild between commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the kbuild tree and commit: 80363894995b ("virtio_mmio: expose header to userspace") from the vhost tree. I fixed it up (the former supercedes the latter, so I used the former) 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