From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752217AbcG0GXy (ORCPT ); Wed, 27 Jul 2016 02:23:54 -0400 Received: from ozlabs.org ([103.22.144.67]:46619 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751452AbcG0GXp (ORCPT ); Wed, 27 Jul 2016 02:23:45 -0400 Date: Wed, 27 Jul 2016 16:23:43 +1000 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Kees Cook Subject: linux-next: manual merge of the akpm-current tree with the kspp tree Message-ID: <20160727162343.4e103919@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 Andrew, Today's linux-next merge of the akpm-current tree got a conflict in: Makefile between commit: 228d96c603cf ("kbuild: Abort build on bad stack protector flag") from the kspp tree and commit: f273155b8dc7 ("kbuild: abort build on bad stack protector flag") from the akpm-current tree. I fixed it up (I just arbitrarily used the version from the kspp tree) 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