From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754253AbbLGIG2 (ORCPT ); Mon, 7 Dec 2015 03:06:28 -0500 Received: from ozlabs.org ([103.22.144.67]:60022 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753549AbbLGIG0 (ORCPT ); Mon, 7 Dec 2015 03:06:26 -0500 Date: Mon, 7 Dec 2015 19:06:24 +1100 From: Stephen Rothwell To: Andrew Morton , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" , Juergen Gross Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20151207190624.6590824c@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.28; x86_64-pc-linux-gnu) 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: arch/x86/mm/pgtable.c between commit: d6ccc3ec9525 ("x86/paravirt: Remove paravirt ops pmd_update[_defer] and pte_update_defer") from the tip tree and commit: 275461f0db1f ("x86, thp: remove infrastructure for handling splitting PMDs") from the akpm-current tree. I fixed it up (I removed the function (pmdp_splitting_flush) removed by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/