From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755982AbdKJEdT (ORCPT ); Thu, 9 Nov 2017 23:33:19 -0500 Received: from ozlabs.org ([103.22.144.67]:39111 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755930AbdKJEdQ (ORCPT ); Thu, 9 Nov 2017 23:33:16 -0500 Date: Fri, 10 Nov 2017 15:33:13 +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 , Sasha Levin , Frederic Weisbecker Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20171110153313.5bf67d2e@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: kernel/softirq.c between commit: f71b74bca637 ("irq/softirqs: Use lockdep to assert IRQs are disabled/enabled") from the tip tree and commit: 275f9389fa4e ("kmemcheck: rip it out") from the akpm-current tree. I fixed it up (the latter removed code modified by 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