From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752186AbcKIEUC (ORCPT ); Tue, 8 Nov 2016 23:20:02 -0500 Received: from ozlabs.org ([103.22.144.67]:48101 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751226AbcKIEUA (ORCPT ); Tue, 8 Nov 2016 23:20:00 -0500 Date: Wed, 9 Nov 2016 15:19:15 +1100 From: Stephen Rothwell To: Andrew Morton Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jani Nikula , Mimi Zohar Subject: linux-next: manual merge of the akpm tree with the jc_docs tree Message-ID: <20161109151915.16d93e4b@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 tree got a conflict in: Documentation/admin-guide/kernel-parameters.rst between commit: e52347bd66f6 ("Documentation/admin-guide: split the kernel parameter list to a separate file") from the jc_docs tree and patch: "ima: define a canonical binary_runtime_measurements list format" from the akpm tree. I fixed it up (I moved the change to Documentation/admin-guide/kernel-parameters.txt) 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