From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752046AbcKITQq (ORCPT ); Wed, 9 Nov 2016 14:16:46 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:48208 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750980AbcKITQp (ORCPT ); Wed, 9 Nov 2016 14:16:45 -0500 Subject: Re: linux-next: manual merge of the akpm tree with the jc_docs tree From: Mimi Zohar To: Stephen Rothwell Cc: Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jani Nikula Date: Wed, 09 Nov 2016 14:16:32 -0500 In-Reply-To: <20161109151915.16d93e4b@canb.auug.org.au> References: <20161109151915.16d93e4b@canb.auug.org.au> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.12.11 (3.12.11-1.fc21) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16110919-0032-0000-0000-000001803FEB X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16110919-0033-0000-0000-000010B111FD Message-Id: <1478718992.31015.3.camel@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-11-09_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1611090354 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2016-11-09 at 15:19 +1100, Stephen Rothwell wrote: > 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. Thank you for fixing and carrying the change. Mimi