From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1033533AbdDUAUY (ORCPT ); Thu, 20 Apr 2017 20:20:24 -0400 Received: from ozlabs.org ([103.22.144.67]:54919 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1031504AbdDUAUV (ORCPT ); Thu, 20 Apr 2017 20:20:21 -0400 Date: Fri, 21 Apr 2017 10:20:18 +1000 From: Stephen Rothwell To: Bjorn Helgaas , Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Nicolas Dichtel , Kishon Vijay Abraham I Subject: linux-next: manual merge of the pci tree with the kbuild tree Message-ID: <20170421102018.1d11b30f@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 pci 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: 58c89c8aa0e8 ("misc: Add host side PCI driver for PCI test function device") from the pci tree. I fixed it up (I just dropped the latter change to this 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