From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.6 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C3537C433DF for ; Wed, 17 Jun 2020 19:09:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9F7802075E for ; Wed, 17 Jun 2020 19:09:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XRBe8Rr7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726912AbgFQTJ6 (ORCPT ); Wed, 17 Jun 2020 15:09:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46290 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726496AbgFQTJ5 (ORCPT ); Wed, 17 Jun 2020 15:09:57 -0400 Received: from mail-vk1-xa33.google.com (mail-vk1-xa33.google.com [IPv6:2607:f8b0:4864:20::a33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ADFF5C06174E; Wed, 17 Jun 2020 12:09:56 -0700 (PDT) Received: by mail-vk1-xa33.google.com with SMTP id i1so840668vkp.8; Wed, 17 Jun 2020 12:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eD4bw0lGQCfL/fgr6hV02m8eAYxz9GB1Zd0qbxDAQJ4=; b=XRBe8Rr7OkveXmecDtX/Xwx/BpU5lBwhhcVbrpoalnm1bZ7zPj/mDE+sO9H1fjKm8S 0WK8Do11W4GOm/hBgpzdfMZkg1HQDYaNifUIEMvH0faExmBNgq9NVV5Vp3yaYGOig8j6 jvk4u1TeWqnEfqYKYEDLa09ph/KY4QVwdS33iJ0FUQZVnPEKW7vK1LLrwALdWnXjojAx 4AdUKLFEhhGVjdUxP7Snk/1AGy3g36NJSZK698jDayOsui7sEmAyQ3Z28PN54+hO0JK0 m6kr8SBA105mxFS2VHnpdRD5nkwMcWCliyVXfhjOY0hltcf+TkKCke2/dgGoamf7fbcb AXpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eD4bw0lGQCfL/fgr6hV02m8eAYxz9GB1Zd0qbxDAQJ4=; b=uXV9pG5S0raJ3R3QTzc190n+CS0wWvFRIlbUQY988JUNzBssDQNLc81NmT4fO6ARPI 6XLw4PvEhXJz2QjmmfuIXJ+mm57LifzHkBzI/91J2Md+viPryAtRbUbnRfz8pdDecFqP kCdWAhIlRAsv8/nfHp0DVkVosLSb5LRC5OJo7uiqRt2pEros/AD8MEnKStgqsfBiChyz Iw0w2tDDByUzcDH7h0u3qbVObS/7Uhjk6Lsu1ynP6YAwtJmIRNJRk7US2e7KzNwDUHzD YPAOZXfVjyzAyj5B1Z+qrCzo7IClZv7LmYEb3XTC/O4Yn903zqS15SfaBcbg7NdPv8K5 wMdA== X-Gm-Message-State: AOAM531Z4/IEQsOse2158oZHn/f14dQb1PS8nFnGVK8zA2KxtMIBMNBq vSzsw7lNTcqTF+rBsnl0RN7Z4YgeQbURw/qP+NIe8g== X-Google-Smtp-Source: ABdhPJwtoKeRVXvgQWYI0FGFEFUVIAQMF4l4PZuS7D/IV4AQqwOs6rxLY7l/5BGZ9tRfwoRr4V6z3VuB3DyHbXX5n8I= X-Received: by 2002:a1f:ee81:: with SMTP id m123mr762899vkh.51.1592420995496; Wed, 17 Jun 2020 12:09:55 -0700 (PDT) MIME-Version: 1.0 References: <20200617105929.534edd34@canb.auug.org.au> <20200617170307.3c87be5a@canb.auug.org.au> In-Reply-To: <20200617170307.3c87be5a@canb.auug.org.au> From: Emil Velikov Date: Wed, 17 Jun 2020 20:06:11 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell Cc: Thomas Zimmermann , Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Alex Deucher , Felix Kuehling , Emil Velikov Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Stephen, On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell wrote: > > Hi Thomas, > > On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann wrote: > > > > We recently dropped the _unlock() suffix from drm_gem_object_put(). This > > patch should be ok. > > Yes, but what it shows is that the drm-misc tree is still based on > v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get > conflicts against :-) > Being the culprit here - thanks for the patience and report. I believe that both AMD and drm-misc teams are aware of this lovely situation I've put them in. As you mentioned drm-misc is a bit special and doing the usual backmerge will be fun. If you have any tips on how to minimise such issues, I'd gladly utilise them. Thanks again, -Emil From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42CB0C433E2 for ; Wed, 17 Jun 2020 19:10:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 193FC2088E for ; Wed, 17 Jun 2020 19:10:00 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XRBe8Rr7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 193FC2088E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 077E56E156; Wed, 17 Jun 2020 19:09:58 +0000 (UTC) Received: from mail-vk1-xa2a.google.com (mail-vk1-xa2a.google.com [IPv6:2607:f8b0:4864:20::a2a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4CFAE6E143; Wed, 17 Jun 2020 19:09:56 +0000 (UTC) Received: by mail-vk1-xa2a.google.com with SMTP id e1so845583vkd.1; Wed, 17 Jun 2020 12:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eD4bw0lGQCfL/fgr6hV02m8eAYxz9GB1Zd0qbxDAQJ4=; b=XRBe8Rr7OkveXmecDtX/Xwx/BpU5lBwhhcVbrpoalnm1bZ7zPj/mDE+sO9H1fjKm8S 0WK8Do11W4GOm/hBgpzdfMZkg1HQDYaNifUIEMvH0faExmBNgq9NVV5Vp3yaYGOig8j6 jvk4u1TeWqnEfqYKYEDLa09ph/KY4QVwdS33iJ0FUQZVnPEKW7vK1LLrwALdWnXjojAx 4AdUKLFEhhGVjdUxP7Snk/1AGy3g36NJSZK698jDayOsui7sEmAyQ3Z28PN54+hO0JK0 m6kr8SBA105mxFS2VHnpdRD5nkwMcWCliyVXfhjOY0hltcf+TkKCke2/dgGoamf7fbcb AXpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eD4bw0lGQCfL/fgr6hV02m8eAYxz9GB1Zd0qbxDAQJ4=; b=MEuWj/Dc+H+zOPRBrgdv37ZgHeWeE/8L+lLZzjFQ7eZ3Li41wXfnWqy33KPGrllpGF qFfznuU+qnu3RH8gh7qPYqInuYEzurOXcsiGKsYcWlu02pJdmHSW9vev8I8VHigfWaL9 8C2LWSVIfkVPHypPxMtRzDdpdsnqJDNLIZfLT+1JvaQIf2CzVbiz6/FArbxbOhJxLHqx uoLVwWflzfmEQGy8fpG4bzvtghAGD4zuHwXDpjCh3OvtxmDn+ViJss0ndDaXrpWURoIV +sxeiXf6/OHB0ePIk58VSdkI/IGcp4ZY/sNMSbyCc1tPn/+IryWxSoD9RiP8tAXJtBAk vZZg== X-Gm-Message-State: AOAM533O/mYx7vEiyXDAwbZ0hNEzqjJawg/c2IRYhfp0R4wxHw0ZNDR8 RcKuiTdW8iBgBPSpCZU3twosA3hKVjR1FopDV+s= X-Google-Smtp-Source: ABdhPJwtoKeRVXvgQWYI0FGFEFUVIAQMF4l4PZuS7D/IV4AQqwOs6rxLY7l/5BGZ9tRfwoRr4V6z3VuB3DyHbXX5n8I= X-Received: by 2002:a1f:ee81:: with SMTP id m123mr762899vkh.51.1592420995496; Wed, 17 Jun 2020 12:09:55 -0700 (PDT) MIME-Version: 1.0 References: <20200617105929.534edd34@canb.auug.org.au> <20200617170307.3c87be5a@canb.auug.org.au> In-Reply-To: <20200617170307.3c87be5a@canb.auug.org.au> From: Emil Velikov Date: Wed, 17 Jun 2020 20:06:11 +0100 Message-ID: Subject: Re: linux-next: build failure after merge of the drm-misc tree To: Stephen Rothwell X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Alex Deucher , Felix Kuehling , Emil Velikov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Stephen, On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell wrote: > > Hi Thomas, > > On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann wrote: > > > > We recently dropped the _unlock() suffix from drm_gem_object_put(). This > > patch should be ok. > > Yes, but what it shows is that the drm-misc tree is still based on > v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get > conflicts against :-) > Being the culprit here - thanks for the patience and report. I believe that both AMD and drm-misc teams are aware of this lovely situation I've put them in. As you mentioned drm-misc is a bit special and doing the usual backmerge will be fun. If you have any tips on how to minimise such issues, I'd gladly utilise them. Thanks again, -Emil _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-0.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 343FFC433DF for ; Wed, 17 Jun 2020 19:09:58 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 05B142075E for ; Wed, 17 Jun 2020 19:09:57 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XRBe8Rr7" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 05B142075E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8DF716E143; Wed, 17 Jun 2020 19:09:57 +0000 (UTC) Received: from mail-vk1-xa2a.google.com (mail-vk1-xa2a.google.com [IPv6:2607:f8b0:4864:20::a2a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4CFAE6E143; Wed, 17 Jun 2020 19:09:56 +0000 (UTC) Received: by mail-vk1-xa2a.google.com with SMTP id e1so845583vkd.1; Wed, 17 Jun 2020 12:09:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eD4bw0lGQCfL/fgr6hV02m8eAYxz9GB1Zd0qbxDAQJ4=; b=XRBe8Rr7OkveXmecDtX/Xwx/BpU5lBwhhcVbrpoalnm1bZ7zPj/mDE+sO9H1fjKm8S 0WK8Do11W4GOm/hBgpzdfMZkg1HQDYaNifUIEMvH0faExmBNgq9NVV5Vp3yaYGOig8j6 jvk4u1TeWqnEfqYKYEDLa09ph/KY4QVwdS33iJ0FUQZVnPEKW7vK1LLrwALdWnXjojAx 4AdUKLFEhhGVjdUxP7Snk/1AGy3g36NJSZK698jDayOsui7sEmAyQ3Z28PN54+hO0JK0 m6kr8SBA105mxFS2VHnpdRD5nkwMcWCliyVXfhjOY0hltcf+TkKCke2/dgGoamf7fbcb AXpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eD4bw0lGQCfL/fgr6hV02m8eAYxz9GB1Zd0qbxDAQJ4=; b=MEuWj/Dc+H+zOPRBrgdv37ZgHeWeE/8L+lLZzjFQ7eZ3Li41wXfnWqy33KPGrllpGF qFfznuU+qnu3RH8gh7qPYqInuYEzurOXcsiGKsYcWlu02pJdmHSW9vev8I8VHigfWaL9 8C2LWSVIfkVPHypPxMtRzDdpdsnqJDNLIZfLT+1JvaQIf2CzVbiz6/FArbxbOhJxLHqx uoLVwWflzfmEQGy8fpG4bzvtghAGD4zuHwXDpjCh3OvtxmDn+ViJss0ndDaXrpWURoIV +sxeiXf6/OHB0ePIk58VSdkI/IGcp4ZY/sNMSbyCc1tPn/+IryWxSoD9RiP8tAXJtBAk vZZg== X-Gm-Message-State: AOAM533O/mYx7vEiyXDAwbZ0hNEzqjJawg/c2IRYhfp0R4wxHw0ZNDR8 RcKuiTdW8iBgBPSpCZU3twosA3hKVjR1FopDV+s= X-Google-Smtp-Source: ABdhPJwtoKeRVXvgQWYI0FGFEFUVIAQMF4l4PZuS7D/IV4AQqwOs6rxLY7l/5BGZ9tRfwoRr4V6z3VuB3DyHbXX5n8I= X-Received: by 2002:a1f:ee81:: with SMTP id m123mr762899vkh.51.1592420995496; Wed, 17 Jun 2020 12:09:55 -0700 (PDT) MIME-Version: 1.0 References: <20200617105929.534edd34@canb.auug.org.au> <20200617170307.3c87be5a@canb.auug.org.au> In-Reply-To: <20200617170307.3c87be5a@canb.auug.org.au> From: Emil Velikov Date: Wed, 17 Jun 2020 20:06:11 +0100 Message-ID: To: Stephen Rothwell Subject: Re: [Intel-gfx] linux-next: build failure after merge of the drm-misc tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Daniel Vetter , Intel Graphics , Linux Kernel Mailing List , DRI , Linux Next Mailing List , Thomas Zimmermann , Alex Deucher , Felix Kuehling , Emil Velikov Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Hi Stephen, On Wed, 17 Jun 2020 at 08:03, Stephen Rothwell wrote: > > Hi Thomas, > > On Wed, 17 Jun 2020 08:33:24 +0200 Thomas Zimmermann wrote: > > > > We recently dropped the _unlock() suffix from drm_gem_object_put(). This > > patch should be ok. > > Yes, but what it shows is that the drm-misc tree is still based on > v5.7-rc1 and v5.8-rc1 has about 16000 more commits for you to get > conflicts against :-) > Being the culprit here - thanks for the patience and report. I believe that both AMD and drm-misc teams are aware of this lovely situation I've put them in. As you mentioned drm-misc is a bit special and doing the usual backmerge will be fun. If you have any tips on how to minimise such issues, I'd gladly utilise them. Thanks again, -Emil _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx