From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753580AbcKHFaU (ORCPT ); Tue, 8 Nov 2016 00:30:20 -0500 Received: from ozlabs.org ([103.22.144.67]:58103 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752419AbcKHFaQ (ORCPT ); Tue, 8 Nov 2016 00:30:16 -0500 Date: Tue, 8 Nov 2016 16:30:13 +1100 From: Stephen Rothwell To: Greg KH , Jonathan Corbet Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Mauro Carvalho Chehab , Jiri Slaby Subject: linux-next: manual merge of the tty tree with the jc_docs tree Message-ID: <20161108163013.24d165f3@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 Greg, Today's linux-next merge of the tty tree got a conflict in: Documentation/VGA-softcursor.txt between commits: 27641b953c54 ("Documentation/VGA-softcursor.txt: convert to ReST markup") 9d85025b0418 ("docs-rst: create an user's manual book") from the jc_docs tree and commit: b9c8b7fc252c ("vgacon: remove prehistoric macros") from the tty tree. I fixed it up (I deleted it - since 9d85025b0418 moved it - but that means it may need fixing up in its new location to match any relevant changes in b9c8b7fc252c) 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