Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753779AbeAOE5P (ORCPT + 1 other); Sun, 14 Jan 2018 23:57:15 -0500 Received: from ozlabs.org ([103.22.144.67]:54005 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752490AbeAOE5N (ORCPT ); Sun, 14 Jan 2018 23:57:13 -0500 Date: Mon, 15 Jan 2018 15:57:10 +1100 From: Stephen Rothwell To: Andrew Morton , Kees Cook Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Arnd Bergmann Subject: linux-next: manual merge of the akpm-current tree with the kspp tree Message-ID: <20180115155710.36e146ab@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 Return-Path: Hi Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: arch/cris/include/arch-v10/arch/bug.h between commit: c8133e59edb0 ("cris: Mark end of BUG() implementation as unreachable") from the kspp tree and commit: c5a1e183a75a ("bug.h: work around GCC PR82365 in BUG()") from the akpm-current tree. I fixed it up (I just used the akpm-current tree version) 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