From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751653AbbLVApG (ORCPT ); Mon, 21 Dec 2015 19:45:06 -0500 Received: from ozlabs.org ([103.22.144.67]:48403 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750985AbbLVApE (ORCPT ); Mon, 21 Dec 2015 19:45:04 -0500 Date: Tue, 22 Dec 2015 11:45:02 +1100 From: Stephen Rothwell To: Dave Airlie , Shawn Guo Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Sean Cross , Lucas Stach , Thierry Reding Subject: linux-next: manual merge of the drm tree with the imx-mxs tree Message-ID: <20151222114502.6adbfdd9@canb.auug.org.au> X-Mailer: Claws Mail 3.13.0 (GTK+ 2.24.29; x86_64-pc-linux-gnu) 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 Dave, Today's linux-next merge of the drm tree got a conflict in: Documentation/devicetree/bindings/vendor-prefixes.txt between commit: 453bb38ce504 ("devicetree: bindings: Add vendor prefix for Kosagi") from the imx-mxs tree and commit: f42fb5539ab5 ("devicetree: add vendor prefix for Kyocera Corporation") from the drm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt index e4cd78a4c652,b123731b2dca..000000000000 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@@ -123,7 -124,7 +124,8 @@@ jedec JEDEC Solid State Technology Asso karo Ka-Ro electronics GmbH keymile Keymile GmbH kinetic Kinetic Technologies +kosagi Sutajio Ko-Usagi PTE Ltd. + kyo Kyocera Corporation lacie LaCie lantiq Lantiq Semiconductor lenovo Lenovo Group Ltd.