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_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 A136BC4708F for ; Wed, 2 Jun 2021 18:40:43 +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 6A1B5610C9 for ; Wed, 2 Jun 2021 18:40:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6A1B5610C9 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 E25146ECED; Wed, 2 Jun 2021 18:40:42 +0000 (UTC) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 50BFD6ECED for ; Wed, 2 Jun 2021 18:40:42 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id t4-20020a1c77040000b029019d22d84ebdso4360502wmi.3 for ; Wed, 02 Jun 2021 11:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=XCbkv2ZeII/q7rgZZjd/TMzqZkv1dniRLCwHb/ruWrM=; b=LFIg+N5X1BpgOwrSynApuVQQ8MUlyc70PHTHE0G/VC8tc2+KFIoU3EeMYLkm09GfyU J7vnz9g35akOJni8TX/+bf/TJND0lb+AtxzjWJ07IjjZ1pMLOfOXa4XCC7FtsFmfIuKb uW04jHBAY/OzdiNwfSBkP2Wr7U+S2mfM+y+ws= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=XCbkv2ZeII/q7rgZZjd/TMzqZkv1dniRLCwHb/ruWrM=; b=c4LOZdhGdkOOVA5VWXwridpyfVMXxqYteul6lwW5GJkxWJ826ktismPrm1CyH9CbEN d6RZuqPd2enLx5wkNgVu3LB2O50LaIAfENO+1LaTngFtgdZsdk+ojRyVAcvel1HJYPwQ o/bDprCbl2CeSyzbhUy+6y/MBak3u5GLD2wgdhv4e8xdD2JAhaLYrn5jXJYegqoVDCPJ BauQLLzYoXC53N79x3/RVT2gVmE/4mzZaM1zC0uzuXWUoBqmbsfsC8f2yCDRz80uObEV 88kmekpJfWMkzo58dJlTrATnQ5gPFMVwhovHGxVdHRYt6UnKvAJGd+u0tRDehbm2SO/8 WUOQ== X-Gm-Message-State: AOAM530oQpgDnPZWcWuiVUx2dAWkZmP0WdHNbZcCZraRRiIh2sVTdITw 3S6iLHjJAKSycrjwGRkXuFN2ag== X-Google-Smtp-Source: ABdhPJyzL8BuRJ9j+Q0W3Op82rXamCB1aKUpBz0VNJ+19h0qzvS8Xs/52XLazljik2mhjBqGkiK/FA== X-Received: by 2002:a7b:cbc2:: with SMTP id n2mr33387026wmi.69.1622659241081; Wed, 02 Jun 2021 11:40:41 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q11sm523267wmq.1.2021.06.02.11.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 11:40:40 -0700 (PDT) Date: Wed, 2 Jun 2021 20:40:38 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Subject: Re: [Intel-gfx] Merging TTM branches through the Intel tree? Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ 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: Thomas =?iso-8859-1?Q?Hellstr=F6m?= , Thomas =?iso-8859-1?Q?Hellstr=F6m_=28Intel=29?= , Intel Graphics Development , DRI Development , Matthew Auld Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Wed, Jun 02, 2021 at 11:48:41AM +0200, Christian König wrote: > Am 02.06.21 um 11:16 schrieb Thomas Hellström (Intel): > > > > On 6/2/21 10:32 AM, Christian König wrote: > > > Uff I'm just waiting for feedback from Philip to merge a large patch > > > set for TTM through drm-misc-next. > > > > > > I'm pretty sure we will run into merge conflicts if you try to push > > > your changes through the Intel tree. > > > > > > Christian. > > > > OK, so what would be the best approach here?, Adding the TTM patches to > > drm-misc-next when your set has landed? > > I think I will send out out my set to Matthew once more for review, then > push the common TTM stuff to drm-misc-next as much as possible. > > Then you should be able to land your stuff to drm-misc-next and rebase on > the end result. > > Just need to note to David that drm-misc-next should be merged to drm-next > before the Intel patches depending on that stuff land as well. Other option (because the backmerges tend to be slow) is a topic branch, and we just eat/resolve the conflicts in both drm-misc-next and drm-intel-gt-next in the merge commit. If it's not too bad (I haven't looked at what exactly we need for the i915 side from ttm in detail). But also often figuring out the topic branch logistics takes longer than just merging to drm-misc-next as the patches get ready. -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_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 DC9F0C47083 for ; Wed, 2 Jun 2021 18:40:45 +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 AAF90610C9 for ; Wed, 2 Jun 2021 18:40:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAF90610C9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch 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 0901E6EDBB; Wed, 2 Jun 2021 18:40:44 +0000 (UTC) Received: from mail-wm1-x32a.google.com (mail-wm1-x32a.google.com [IPv6:2a00:1450:4864:20::32a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6043A6ED0B for ; Wed, 2 Jun 2021 18:40:42 +0000 (UTC) Received: by mail-wm1-x32a.google.com with SMTP id n17-20020a7bc5d10000b0290169edfadac9so4375683wmk.1 for ; Wed, 02 Jun 2021 11:40:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=XCbkv2ZeII/q7rgZZjd/TMzqZkv1dniRLCwHb/ruWrM=; b=LFIg+N5X1BpgOwrSynApuVQQ8MUlyc70PHTHE0G/VC8tc2+KFIoU3EeMYLkm09GfyU J7vnz9g35akOJni8TX/+bf/TJND0lb+AtxzjWJ07IjjZ1pMLOfOXa4XCC7FtsFmfIuKb uW04jHBAY/OzdiNwfSBkP2Wr7U+S2mfM+y+ws= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=XCbkv2ZeII/q7rgZZjd/TMzqZkv1dniRLCwHb/ruWrM=; b=XkUTTvAX6YlKztFXgUa0VHobUHFriR3722InvaDw0BypZCx3CCatEhgEEcxd/Cd2SV Rbi90Ct7O4S33UpwlLTKwFN0ALwXM3BQCfNFY97MzfxIWwwwQoj0OQNknaTb5Faa6ADC ZC1Vw65nwrY512ZDQdaSVsZ+uocdxv3DpJYfaYfHDkMAlxOQxD6mkcf8BSlheUqOj34O pV1V4Zxu1SW0Q8Gw8bXub1Kza+fsizPDu1InLwmtnnJQxbSDvSA7GQMk/Km3h/j0rDdV 8OF1fCFtuvFGv35ncf/zmGDSRwx5Yltrq69GeSl02HHWdiITrDzPCLJOU1sxu4gsXU2C Te8A== X-Gm-Message-State: AOAM531OHVHONT+SCPY2yPC2MIIRDO1pfqdrnYtrKsSfCoV5yPWA6yuC ijQZqI3uZ9mDb4aozZcnde8iyg== X-Google-Smtp-Source: ABdhPJyzL8BuRJ9j+Q0W3Op82rXamCB1aKUpBz0VNJ+19h0qzvS8Xs/52XLazljik2mhjBqGkiK/FA== X-Received: by 2002:a7b:cbc2:: with SMTP id n2mr33387026wmi.69.1622659241081; Wed, 02 Jun 2021 11:40:41 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id q11sm523267wmq.1.2021.06.02.11.40.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jun 2021 11:40:40 -0700 (PDT) Date: Wed, 2 Jun 2021 20:40:38 +0200 From: Daniel Vetter To: Christian =?iso-8859-1?Q?K=F6nig?= Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Operating-System: Linux phenom 5.10.32scarlett+ Subject: Re: [Intel-gfx] Merging TTM branches through the Intel 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: Thomas =?iso-8859-1?Q?Hellstr=F6m?= , Intel Graphics Development , DRI Development , Matthew Auld Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Wed, Jun 02, 2021 at 11:48:41AM +0200, Christian K=F6nig wrote: > Am 02.06.21 um 11:16 schrieb Thomas Hellstr=F6m (Intel): > > = > > On 6/2/21 10:32 AM, Christian K=F6nig wrote: > > > Uff I'm just waiting for feedback from Philip to merge a large patch > > > set for TTM through drm-misc-next. > > > = > > > I'm pretty sure we will run into merge conflicts if you try to push > > > your changes through the Intel tree. > > > = > > > Christian. > > = > > OK, so what would be the best approach here?, Adding the TTM patches to > > drm-misc-next when your set has landed? > = > I think I will send out out my set to Matthew once more for review, then > push the common TTM stuff to drm-misc-next as much as possible. > = > Then you should be able to land your stuff to drm-misc-next and rebase on > the end result. > = > Just need to note to David that drm-misc-next should be merged to drm-next > before the Intel patches depending on that stuff land as well. Other option (because the backmerges tend to be slow) is a topic branch, and we just eat/resolve the conflicts in both drm-misc-next and drm-intel-gt-next in the merge commit. If it's not too bad (I haven't looked at what exactly we need for the i915 side from ttm in detail). But also often figuring out the topic branch logistics takes longer than just merging to drm-misc-next as the patches get ready. -Daniel -- = Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx