From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756473AbeAIFCs (ORCPT + 1 other); Tue, 9 Jan 2018 00:02:48 -0500 Received: from ozlabs.org ([103.22.144.67]:54605 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464AbeAIFCr (ORCPT ); Tue, 9 Jan 2018 00:02:47 -0500 Date: Tue, 9 Jan 2018 16:02:44 +1100 From: Stephen Rothwell To: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Andy Shevchenko , Andi Kleen , "Darren Hart (VMware)" Subject: linux-next: manual merge of the akpm tree with the tip tree Message-ID: <20180109160244.1f3811eb@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 tree got a conflict in: arch/x86/platform/intel-mid/device_libs/platform_bt.c between commit: 9d0513d82f1a ("x86/platform/intel-mid: Revert "Make 'bt_sfi_data' const"") from the tip tree and patch: "arch/x86/platform/intel-mid/device_libs/platform_bt.c: fix const confusion" from the akpm tree. I fixed it up (I dropped the akpm tree patch) 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