Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S264596AbUFEIiL (ORCPT ); Sat, 5 Jun 2004 04:38:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S265813AbUFEIiL (ORCPT ); Sat, 5 Jun 2004 04:38:11 -0400 Received: from holly.csn.ul.ie ([136.201.105.4]:21188 "EHLO holly.csn.ul.ie") by vger.kernel.org with ESMTP id S264596AbUFEIiH (ORCPT ); Sat, 5 Jun 2004 04:38:07 -0400 Date: Sat, 5 Jun 2004 09:38:06 +0100 (IST) From: Dave Airlie X-X-Sender: airlied@skynet To: torvalds@osdl.org, Andrew Morton Cc: linux-kernel@vger.kernel.org Subject: [bk pull] drm tree update and bugfix.. Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1591 Lines: 46 Hi Linus, There is an issue with the last merge and AGP in certain situations, this merge fixes that, adds some missing macros and adds a new feature to the r200 drm, Please do a bk pull bk://drm.bkbits.net/drm-2.6 This will include the latest DRM changes and will update the following files: drivers/char/drm/drm_agpsupport.h | 2 -- drivers/char/drm/r128_state.c | 8 ++++---- drivers/char/drm/radeon.h | 4 +++- drivers/char/drm/radeon_drm.h | 3 ++- drivers/char/drm/radeon_drv.h | 1 + drivers/char/drm/radeon_mem.c | 4 ++-- drivers/char/drm/radeon_state.c | 2 ++ 7 files changed, 14 insertions(+), 10 deletions(-) through these ChangeSets: (04/06/06 1.1608.1.13) Remove check that is needed only for 2.4 kernel fixes bug reports on lk. Signed-off-by: Colin Leroy Signed-off-by: Dave Airlie (04/06/01 1.1608.1.12) add R200_EMIT_RB3D_BLENDCOLOR state packet to support GL_EXT_blend_color, GL_EXT_blend_func_separate and GL_EXT_blend_equation_separate on r200 from Roland Scheidegger Signed-off-by: Dave Airlie (04/06/01 1.1608.1.11) fix missing DRM_ERR()s - Eric Anholt Signed-off-by: Dave Airlie - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/