From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752535AbdDUE22 (ORCPT ); Fri, 21 Apr 2017 00:28:28 -0400 Received: from ozlabs.org ([103.22.144.67]:51373 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbdDUE20 (ORCPT ); Fri, 21 Apr 2017 00:28:26 -0400 Date: Fri, 21 Apr 2017 14:28:23 +1000 From: Stephen Rothwell To: Greg KH , Jonathan Corbet Cc: Linux-Next Mailing List , Linux Kernel Mailing List , Mauro Carvalho Chehab Subject: linux-next: manual merge of the usb tree with the jc_docs tree Message-ID: <20170421142823.16997ef9@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 usb tree got a conflict in: Documentation/media/v4l-drivers/philips.rst between commit: 9b06f754133c ("convert philips.txt to ReST and add to media docs") from the jc_docs tree and commit: 21470e32ca7f ("usb: fix some references for /proc/bus/usb") from the usb tree. I fixed it up (see below) 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 diff --cc Documentation/media/v4l-drivers/philips.rst index 620bcfea7af0,be8c80eff374..000000000000 --- a/Documentation/media/v4l-drivers/philips.rst +++ b/Documentation/media/v4l-drivers/philips.rst @@@ -145,8 -140,8 +145,8 @@@ dev_hin A camera is specified by its type (the number from the camera model, like PCA645, PCVC750VC, etc) and optionally the serial number (visible - in /proc/bus/usb/devices). A hint consists of a string with the following + in /sys/kernel/debug/usb/devices). A hint consists of a string with the following - format: + format:: [type[.serialnumber]:]node