From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760088AbbIWDr0 (ORCPT ); Tue, 22 Sep 2015 23:47:26 -0400 Received: from ozlabs.org ([103.22.144.67]:53389 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752817AbbIWDrZ (ORCPT ); Tue, 22 Sep 2015 23:47:25 -0400 Date: Wed, 23 Sep 2015 13:47:21 +1000 From: Stephen Rothwell To: Andrew Morton , 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 akpm tree with the drm-misc tree Message-ID: <20150923134721.30bb5a6d@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 Andrew, Today's linux-next merge of the akpm tree got a conflict in: drivers/gpu/drm/drm_irq.c between commit: 4e32087d8341 ("drm: Use vblank timestamps to guesstimate how many vblanks were missed") from the drm-misc tree and patch: "Remove abs64()" from the akpm tree. I fixed it up (the former removed the instances of abs64 in thet file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell sfr@canb.auug.org.au