From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andy Shevchenko Subject: Re: linux-next: manual merge of the akpm tree with the tip tree Date: Tue, 09 Jan 2018 12:36:52 +0200 Message-ID: <1515494212.7000.811.camel@linux.intel.com> References: <20180109160244.1f3811eb@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20180109160244.1f3811eb@canb.auug.org.au> Sender: linux-kernel-owner@vger.kernel.org To: Stephen Rothwell , Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Andi Kleen , "Darren Hart (VMware)" List-Id: linux-next.vger.kernel.org On Tue, 2018-01-09 at 16:02 +1100, Stephen Rothwell wrote: > 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) Yes, that is exactly what needs to be done. Thanks! Andrew, can you drop that patch from your quilt? > 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. > -- Andy Shevchenko Intel Finland Oy