From patchwork Wed Nov 1 03:36:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 10035879 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 46F92603B5 for ; Wed, 1 Nov 2017 03:45:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B15C286BE for ; Wed, 1 Nov 2017 03:45:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2EF2228777; Wed, 1 Nov 2017 03:45:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id EFD59286BE for ; Wed, 1 Nov 2017 03:45:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id D78EE6E687; Wed, 1 Nov 2017 03:45:04 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org X-Greylist: delayed 486 seconds by postgrey-1.35 at gabe; Wed, 01 Nov 2017 03:45:02 UTC Received: from ozlabs.org (ozlabs.org [103.22.144.67]) by gabe.freedesktop.org (Postfix) with ESMTPS id BCE6D6E1DA; Wed, 1 Nov 2017 03:45:02 +0000 (UTC) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3yRYmh4ZY7z9sNw; Wed, 1 Nov 2017 14:36:52 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1509507412; bh=J0QsyPYIj8uEr5VJWgspHTH6ZbYmojJAujmO/6r/OjE=; h=Date:From:To:Cc:Subject:From; b=V/+S9I3kbhv24txH54GQC4sa53lCS90pdWyh7mGBYpR9A+dxTgGz0qoBz+muUBtAX vinw+w3PKtscCE9RDFQ1r+Kc8MdhpPIO6geZuNNmZO4F1Kh/78k+0lpHa19e9IW/r0 Cm66ymE6wxH41PB/FowLZF+2G5nA4DHsFN1oK5mhXfy/rJVH3/aAA6jUW3J8x9ozlc Phl9Cd5fHRY16EusMuJkwCoxIrTuMqRmHF6mmnI1IJqaBDpt7PEX4x6MrOB74gHSTI jOhsDv9Y5q7o6so9OfR8xOcdpGoQbQAOaRPqiT5ffzoJowMVyWFvPkQVKOnOVQ6mAK 9swk9qd0qlzIw== Date: Wed, 1 Nov 2017 14:36:52 +1100 From: Stephen Rothwell To: Daniel Vetter , Intel Graphics , DRI , Dave Airlie Message-ID: <20171101143652.409620ca@canb.auug.org.au> MIME-Version: 1.0 Cc: Haneen Mohammed , Linux-Next Mailing List , Linux Kernel Mailing List Subject: [Intel-gfx] linux-next: manual merge of the drm-misc tree with the drm tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the drm-misc tree got a conflict in: include/drm/drmP.h between commit: e7646f84ad4f ("drm: Add new LEASE debug level") from the drm tree and commit: 02c9656b2f0d ("drm: Move debug macros out of drmP.h") from the drm-misc tree. I fixed it up (I used the drm-misc version of the file and added the below merge fix patch) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Wed, 1 Nov 2017 14:33:07 +1100 Subject: [PATCH] drm-misc: merge fix up for DEBUG printing macros move Signed-off-by: Stephen Rothwell --- include/drm/drm_print.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 7b9c86a6ca3e..edcea83a5050 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -171,6 +171,7 @@ static inline struct drm_printer drm_debug_printer(const char *prefix) #define DRM_UT_ATOMIC 0x10 #define DRM_UT_VBL 0x20 #define DRM_UT_STATE 0x40 +#define DRM_UT_LEASE 0x80 __printf(6, 7) void drm_dev_printk(const struct device *dev, const char *level, @@ -287,6 +288,9 @@ void drm_printk(const char *level, unsigned int category, #define DRM_DEBUG_VBL(fmt, ...) \ drm_printk(KERN_DEBUG, DRM_UT_VBL, fmt, ##__VA_ARGS__) +#define DRM_DEBUG_LEASE(fmt, ...) \ + drm_printk(KERN_DEBUG, DRM_UT_LEASE, fmt, ##__VA_ARGS__) + #define _DRM_DEV_DEFINE_DEBUG_RATELIMITED(dev, level, fmt, args...) \ ({ \ static DEFINE_RATELIMIT_STATE(_rs, \