From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759064AbcLAXbM (ORCPT ); Thu, 1 Dec 2016 18:31:12 -0500 Received: from ozlabs.org ([103.22.144.67]:42117 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758479AbcLAXbK (ORCPT ); Thu, 1 Dec 2016 18:31:10 -0500 Date: Fri, 2 Dec 2016 10:31:07 +1100 From: Stephen Rothwell To: Mauro Carvalho Chehab , Jonathan Corbet Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org Subject: linux-next: manual merge of the v4l-dvb tree with the jc_docs tree Message-ID: <20161202103107.01452535@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 Mauro, Today's linux-next merge of the v4l-dvb tree got conflicts in: Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-crop.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-full.svg Documentation/media/uapi/v4l/dev-subdev_files/subdev-image-processing-scaling-multi-source.svg between commit: 15a04d4e76bd ("docs-rst: auto-generate PDF image files") from the jc_docs tree and commit: 9e3d073009d2 ("[media] docs-rst: cleanup SVG files") from the v4l-dvb tree. I fixed it up (I have no idea, so I just deleted the files as the former did. Or were they moved?) 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