From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree Date: Mon, 14 Dec 2015 08:09:23 +0100 Message-ID: <566E6B23.8090306@vmware.com> References: <20151214121205.7323fbd7@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-2.vmware.com ([208.91.2.13]:37584 "EHLO smtp-outbound-2.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517AbbLNHJ2 (ORCPT ); Mon, 14 Dec 2015 02:09:28 -0500 In-Reply-To: <20151214121205.7323fbd7@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell , Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org On 12/14/2015 02:12 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > between commit: > > 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") > > from Linus' tree and commit: > > f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks") > > from the drm-misc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > FWIW, the fix looks correct to me. /Thomas From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752665AbbLNHJ3 (ORCPT ); Mon, 14 Dec 2015 02:09:29 -0500 Received: from smtp-outbound-2.vmware.com ([208.91.2.13]:37584 "EHLO smtp-outbound-2.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752517AbbLNHJ2 (ORCPT ); Mon, 14 Dec 2015 02:09:28 -0500 Subject: Re: linux-next: manual merge of the drm-misc tree with Linus' tree To: Stephen Rothwell , Daniel Vetter , , References: <20151214121205.7323fbd7@canb.auug.org.au> CC: , From: Thomas Hellstrom Message-ID: <566E6B23.8090306@vmware.com> Date: Mon, 14 Dec 2015 08:09:23 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <20151214121205.7323fbd7@canb.auug.org.au> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.113.170.11] X-ClientProxiedBy: EX13-CAS-013.vmware.com (10.113.191.65) To EX13-MBX-024.vmware.com (10.113.191.44) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 12/14/2015 02:12 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the drm-misc tree got conflicts in: > > drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c > drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c > drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c > > between commit: > > 8fbf9d92a7bc ("drm/vmwgfx: Implement the cursor_set2 callback v2") > > from Linus' tree and commit: > > f80de66eca65 ("drm/vmwgfx: Drop dummy save/restore hooks") > > from the drm-misc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required). > FWIW, the fix looks correct to me. /Thomas