From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754973AbbI2B0Z (ORCPT ); Mon, 28 Sep 2015 21:26:25 -0400 Received: from ozlabs.org ([103.22.144.67]:34527 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754161AbbI2B0X (ORCPT ); Mon, 28 Sep 2015 21:26:23 -0400 Date: Tue, 29 Sep 2015 11:26:21 +1000 From: Stephen Rothwell To: Daniel Vetter , , Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?UTF-8?B?U3lyasOkbMOk?= Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree Message-ID: <20150929112621.520b7003@canb.auug.org.au> X-Mailer: Claws Mail 3.12.0 (GTK+ 2.24.28; 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 all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_audio.c between commit: b8abe859c9d6 ("drm/i915: Always call the adjusted mode 'adjusted_mode'") from the drm-intel tree and commit: 9e5a3b529e84 ("drm: Remove the 'mode' argument from drm_select_eld()") from the drm-misc tree. I fixed it up (I used the drm-misc tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: linux-next: manual merge of the drm-misc tree with the drm-intel tree Date: Tue, 29 Sep 2015 11:26:21 +1000 Message-ID: <20150929112621.520b7003@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: Received: from ozlabs.org ([103.22.144.67]:34527 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754161AbbI2B0X (ORCPT ); Mon, 28 Sep 2015 21:26:23 -0400 Sender: linux-next-owner@vger.kernel.org List-ID: To: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ville =?UTF-8?B?U3lyasOkbMOk?= Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: drivers/gpu/drm/i915/intel_audio.c between commit: b8abe859c9d6 ("drm/i915: Always call the adjusted mode 'adjusted_mode'") from the drm-intel tree and commit: 9e5a3b529e84 ("drm: Remove the 'mode' argument from drm_select_eld()") from the drm-misc tree. I fixed it up (I used the drm-misc tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au