From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753255AbdC0XiS (ORCPT ); Mon, 27 Mar 2017 19:38:18 -0400 Received: from ozlabs.org ([103.22.144.67]:55139 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753074AbdC0XiJ (ORCPT ); Mon, 27 Mar 2017 19:38:09 -0400 Date: Tue, 28 Mar 2017 10:37:49 +1100 From: Stephen Rothwell To: Martin Schwidefsky , Heiko Carstens , Masahiro Yamada Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Dichtel Subject: linux-next: manual merge of the s390 tree with the kbuild tree Message-ID: <20170328103749.2cfe8828@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 s390 tree got a conflict in: arch/s390/include/uapi/asm/Kbuild between commit: 65017bab8a9e ("uapi: export all headers under uapi directories") from the kbuild tree and commit: 916cda1aa1b4 ("s390: add a system call for guarded storage") from the s390 tree. I fixed it up (the form should supercede 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