From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751016AbbJBEVJ (ORCPT ); Fri, 2 Oct 2015 00:21:09 -0400 Received: from ozlabs.org ([103.22.144.67]:53537 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750709AbbJBEVH (ORCPT ); Fri, 2 Oct 2015 00:21:07 -0400 Date: Fri, 2 Oct 2015 14:21:03 +1000 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, Kees Cook Subject: linux-next: manual merge of the akpm-current tree with the tip tree Message-ID: <20151002142103.6f3d64a8@canb.auug.org.au> X-Mailer: Claws Mail 3.12.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 conflicts in: Documentation/filesystems/proc.txt fs/proc/array.c fs/proc/base.c between commit: b2f73922d119 ("fs/proc, core/debug: Don't expose absolute kernel addresses via wchan") from the tip tree and commit: f01df89b6372 ("fs/proc: don't expose absolute kernel addresses via wchan") 7adc347341f1 ("fs-proc-dont-expose-absolute-kernel-addresses-via-wchan-fix") from the akpm-current tree. I fixed it up (the tip tree version seemed newer, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au