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=-5.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_RED 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 08869C433ED for ; Wed, 28 Apr 2021 18:14:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4C4461400 for ; Wed, 28 Apr 2021 18:14:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243602AbhD1SP3 (ORCPT ); Wed, 28 Apr 2021 14:15:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243447AbhD1SP2 (ORCPT ); Wed, 28 Apr 2021 14:15:28 -0400 Received: from mail-ot1-x32f.google.com (mail-ot1-x32f.google.com [IPv6:2607:f8b0:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7046C061573 for ; Wed, 28 Apr 2021 11:14:42 -0700 (PDT) Received: by mail-ot1-x32f.google.com with SMTP id z25-20020a9d65d90000b02902a560806ca7so486878oth.11 for ; Wed, 28 Apr 2021 11:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lRZo4tjbQkODypjbD5IbSY7MNhOk04d/kV8UYGlt1QI=; b=Rh2Uy9oDFm5EBMMlX5tL/ldVgHDZJGjFlBPv4AZ5gqrBe2bvOlRcrf0kv4KuNhcKbB VA9D9rfuD/VUU0KCBQuMkjph6NSOR3Lr2ZL9q+L9K58HSbsnuID1A3b3+UbtYwhkBxPZ tEv11MQd3M6D87nXhTBq11NTpCj0Hhk4/kHfo= 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=lRZo4tjbQkODypjbD5IbSY7MNhOk04d/kV8UYGlt1QI=; b=OsM2qd8iJ2EcJyYLEXaCHKGEiv/GrsF/4lCSTx0JL+Tl7BgVVE58R5Xz47vQRLF5Gz 7pPsk4EkL5gmsZJz4Nq2FeRzvXKZ1bR1zo7GcMnHX2lnw/xArvG1ksRxdw/Hn/Qy3HUi VdoMt1RnOviHv27UwyQUYfPk+n93p5PY5fQOE+FXkXg0om2t6K7nmR83XlDQS/EA7Z+S CYjxIqVDxbZ1FWqTDRFhyy2gHjQ7scjUUogZBuxmB3LmToUVPXOGpAez7hxy/N50zsNq zKlJVw444M98b553SikKnZjkIMgEXuqTFmyB2u1okfEs6EEBzTXCOwWes0AIFYG25qeV xYIA== X-Gm-Message-State: AOAM530lMJLJT2HXl9q2KwLvihYEopkfmIiYX4rkV4gFgNCuPj92kavl vsmJEwtRyoKGbCj0tTnMTh2rPdiJ7tGBysmqbYVca860Uh0= X-Google-Smtp-Source: ABdhPJzzjgjH88cyHmwoGyK2rHu9q5UGZGkY5dVGMsZTRqHr3GgmcBCSxPnhoq6A/5JPNueu4u3jDlfWM8pC7Hg0uxQ= X-Received: by 2002:a05:6830:2103:: with SMTP id i3mr24767663otc.303.1619633682393; Wed, 28 Apr 2021 11:14:42 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Daniel Vetter Date: Wed, 28 Apr 2021 20:14:31 +0200 Message-ID: Subject: Re: [git pull] drm for 5.13-rc1 To: Linus Torvalds Cc: Dave Airlie , dri-devel , LKML Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Apr 28, 2021 at 7:07 PM Linus Torvalds wrote: > On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie wrote: > > > > There aren't a massive amount of conflicts, only with vmwgfx when I > > did a test merge into your master yesterday, I think you should be > > able to handle them yourself, but let me know if you want me to push a > > merged tree somewhere (or if I missed something). > > The conflict was easy enough to resolve, but was unusual in that my > tree had vmwgfx fixes that weren't in the development tree (ie that > commit 2ef4fb92363c: "drm/vmwgfx: Make sure bo's are unpinned before > putting them back"). > > Usually when I merge stuff, I can see that the fixes that were pushed > to my tree are also in the development branch. Not so this time. Maybe we're overdoing it a bit, but we're trying to not backmerge all the time for no reason at all. Only when someone requests it due to more more patches for the dev tree that need both stuff from -fixes and -next. Also keeps you entertained during the merge window :-) Plus I think it keeps us more honest with really just pushing minimal bugfixes to -fixes to keep conflicts reasonable and all that. But if it's a bit overdone I guess we can backmerge a bit more often. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch 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=-3.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_RED 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 93E95C433B4 for ; Wed, 28 Apr 2021 18:14:48 +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 4FBAE61400 for ; Wed, 28 Apr 2021 18:14:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FBAE61400 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 E14D16E091; Wed, 28 Apr 2021 18:14:44 +0000 (UTC) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by gabe.freedesktop.org (Postfix) with ESMTPS id 5EB3F6E091 for ; Wed, 28 Apr 2021 18:14:43 +0000 (UTC) Received: by mail-ot1-x336.google.com with SMTP id c8-20020a9d78480000b0290289e9d1b7bcso45118931otm.4 for ; Wed, 28 Apr 2021 11:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=lRZo4tjbQkODypjbD5IbSY7MNhOk04d/kV8UYGlt1QI=; b=Rh2Uy9oDFm5EBMMlX5tL/ldVgHDZJGjFlBPv4AZ5gqrBe2bvOlRcrf0kv4KuNhcKbB VA9D9rfuD/VUU0KCBQuMkjph6NSOR3Lr2ZL9q+L9K58HSbsnuID1A3b3+UbtYwhkBxPZ tEv11MQd3M6D87nXhTBq11NTpCj0Hhk4/kHfo= 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=lRZo4tjbQkODypjbD5IbSY7MNhOk04d/kV8UYGlt1QI=; b=WWB0RJk5YMP0s4S/v79989FqNREXIf5R0M5YOthFveY8evAdlnS8w6LhQvgMgmVyIp XNwmB7bZKVD/luiD6cs3ZGZVGKwZISm17GXzSgXY8D+1E38Urg8LjvwzWXWJBcQ4vTmb 4M4oC3yzYcBr5ErIoEN4TEWrr0ZlWHkydUFJNCxGUpCVNq4gthC6SJGGt4I4nohbeBem NGLAQvPxcKEGos1kIuWH1wEFJP/YTbgcj2yMGxOUbYA85fcOGiEAddYYu+xyamMYVa3c 6nKtqszknctE8nm+FymOADxDWVTXGxMvCz8Xrhf4D8mhZfVKggnheGq0NZpUzoFhF+c8 e9Lg== X-Gm-Message-State: AOAM530IdRTshSvjLFNoZ+7WYXjpoMxVis838K/s1vbYNrO3CdNHwIEu zU3NnZO682gWHS/ssJdBmznpthXXS1i9zNmF7Hu3RA== X-Google-Smtp-Source: ABdhPJzzjgjH88cyHmwoGyK2rHu9q5UGZGkY5dVGMsZTRqHr3GgmcBCSxPnhoq6A/5JPNueu4u3jDlfWM8pC7Hg0uxQ= X-Received: by 2002:a05:6830:2103:: with SMTP id i3mr24767663otc.303.1619633682393; Wed, 28 Apr 2021 11:14:42 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Daniel Vetter Date: Wed, 28 Apr 2021 20:14:31 +0200 Message-ID: Subject: Re: [git pull] drm for 5.13-rc1 To: Linus Torvalds 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: LKML , dri-devel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Apr 28, 2021 at 7:07 PM Linus Torvalds wrote: > On Tue, Apr 27, 2021 at 8:32 PM Dave Airlie wrote: > > > > There aren't a massive amount of conflicts, only with vmwgfx when I > > did a test merge into your master yesterday, I think you should be > > able to handle them yourself, but let me know if you want me to push a > > merged tree somewhere (or if I missed something). > > The conflict was easy enough to resolve, but was unusual in that my > tree had vmwgfx fixes that weren't in the development tree (ie that > commit 2ef4fb92363c: "drm/vmwgfx: Make sure bo's are unpinned before > putting them back"). > > Usually when I merge stuff, I can see that the fixes that were pushed > to my tree are also in the development branch. Not so this time. Maybe we're overdoing it a bit, but we're trying to not backmerge all the time for no reason at all. Only when someone requests it due to more more patches for the dev tree that need both stuff from -fixes and -next. Also keeps you entertained during the merge window :-) Plus I think it keeps us more honest with really just pushing minimal bugfixes to -fixes to keep conflicts reasonable and all that. But if it's a bit overdone I guess we can backmerge a bit more often. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel