From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751570AbdEBWOc (ORCPT ); Tue, 2 May 2017 18:14:32 -0400 Received: from ozlabs.org ([103.22.144.67]:43761 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751270AbdEBWO3 (ORCPT ); Tue, 2 May 2017 18:14:29 -0400 Date: Wed, 3 May 2017 08:14:25 +1000 From: Stephen Rothwell To: Masahiro Yamada Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Hans-Christian Noren Egtvedt , =?UTF-8?B?SMOldmFyZA==?= Skinnemoen , Nicolas Ferre , Nicolas Dichtel Subject: linux-next: manual merge of the kbuild tree with Linus' tree Message-ID: <20170503081425.3b4199b5@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 Masahiro, Today's linux-next merge of the kbuild tree got a conflict in: arch/avr32/include/uapi/asm/Kbuild between commit: 26202873bb51 ("avr32: remove support for AVR32 architecture") from Linus' tree and commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the kbuild tree. I fixed it up (I 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