From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751281AbdAYFIj (ORCPT ); Wed, 25 Jan 2017 00:08:39 -0500 Received: from ozlabs.org ([103.22.144.67]:51703 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbdAYFIi (ORCPT ); Wed, 25 Jan 2017 00:08:38 -0500 Date: Wed, 25 Jan 2017 16:08:35 +1100 From: Stephen Rothwell To: Andrew Morton , "Eric W. Biederman" Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Aleksa Sarai Subject: linux-next: manual merge of the akpm-current tree with the userns tree Message-ID: <20170125160835.1b94db55@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 all, Today's linux-next merge of the akpm-current tree got a conflict in: fs/proc/base.c between commit: 68eb94f16227 ("proc: Better ownership of files for non-dumpable tasks in user namespaces") from the userns tree and commit: d15d29b5352f ("procfs: change the owner of non-dumpable and writeable files") from the akpm-current tree. I *think* that the former supercedes the latter? I fixed it up (I just used 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