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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A31C8C54FB9 for ; Thu, 16 Nov 2023 08:11:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230182AbjKPILy (ORCPT ); Thu, 16 Nov 2023 03:11:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229984AbjKPILx (ORCPT ); Thu, 16 Nov 2023 03:11:53 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC3B9101 for ; Thu, 16 Nov 2023 00:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700122307; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QdxgmAIHvXZQQ6jHVUpXaSiCgu9Ax2tLuylEkXqKU7s=; b=IXDpZYJk7nxH56ih+QpI4NE8752jr5OOnBYsK5fj588zePFlrCzCad/WW05zTh4ApRTiyj AZh0TEV5EUOFIYP066uBUWdl7Ge5auafV8fnLdbOVBQEyFXNyE0Goab4wOiQSkx4UZXpL+ 8NB2wQ4wzKLrw1jHOC0mNTbUZ7phABw= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-695-IWDhg59TMFebuS8jB9nYZw-1; Thu, 16 Nov 2023 03:11:46 -0500 X-MC-Unique: IWDhg59TMFebuS8jB9nYZw-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-40839252e81so2886085e9.3 for ; Thu, 16 Nov 2023 00:11:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700122305; x=1700727105; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QdxgmAIHvXZQQ6jHVUpXaSiCgu9Ax2tLuylEkXqKU7s=; b=Y8o/DbS1wTP33gosb2K24H5+GitLRlzWrM68DbrPAhS2Z/Fe/B6sVhbh2airJNIsv4 FXDqaCzZeEHAZKYqMR/0BNeJ0rgQtjyDA7f/SnCGZ2Ib0g7xtm+0M2/dRhiiPCWCPbid 4o1eB4rP7CyGJfekY8PtDfqLtueG/oAudNEZqHT1ALzyhnznMTG45xC/uifn9y4BSXrY Ny3AMEV3ToTQC9ai89fTWiFs42GjFs7aa8C6OSlOMLaaf+ViMCeOMz/MA7Lfvpm8Y4vb +lXuK22952NEzG01fDG8TdqnpbmlCFRjNGLJloPfM7VE9MKLjRd/tIeyzg9dGdnxe7Zj iriQ== X-Gm-Message-State: AOJu0YzCDyxlPeLNAJGYjlX6QprvBXhlrn8W8ql+nzG17lBTY1Ot0R+D lbIdCAWjowCpDImKTtmL99mkoHgC6ye6hbk/yOfiZ2NXL+cA3VL9wkd1M4vlgTHCC8GUpjg3rw+ 1BNXW0F6MADj1UpQP1jbDUw== X-Received: by 2002:a05:600c:c14:b0:409:51c2:1192 with SMTP id fm20-20020a05600c0c1400b0040951c21192mr11997532wmb.38.1700122304999; Thu, 16 Nov 2023 00:11:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IGFArIjVMDUnueoI1XD+Bo6xsKtSuttRwG0IUwtvvb5tgUEIqUlUQnkr13VMXQfIq5mmPwWJw== X-Received: by 2002:a05:600c:c14:b0:409:51c2:1192 with SMTP id fm20-20020a05600c0c1400b0040951c21192mr11997506wmb.38.1700122304611; Thu, 16 Nov 2023 00:11:44 -0800 (PST) Received: from localhost ([2a01:e0a:b25:f902::ff]) by smtp.gmail.com with ESMTPSA id o22-20020a05600c4fd600b004064741f855sm2504399wmq.47.2023.11.16.00.11.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Nov 2023 00:11:44 -0800 (PST) Date: Thu, 16 Nov 2023 09:11:43 +0100 From: Maxime Ripard To: Luben Tuikov Cc: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: Signed-off-by missing for commit in the drm-misc tree Message-ID: <73cg637ax5cahqocscx5cjvtqkwlt4ves6cxgprbwqllasxq6v@gk6vzsqfc46j> References: <20231114075501.61321c29@canb.auug.org.au> <19740d41-dd5a-47e4-b3e8-539b45bbd3e5@gmail.com> <3c306310-04b3-4658-a197-4b2d22a88274@gmail.com> <20231114134506.2ba0de1f@canb.auug.org.au> <530b6100-4f4e-4b3d-8fea-5b316e989633@gmail.com> <20231114140855.0b259b2d@canb.auug.org.au> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="7hqxyzpgktklwnyb" Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-next@vger.kernel.org --7hqxyzpgktklwnyb Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Nov 14, 2023 at 06:46:21PM -0500, Luben Tuikov wrote: > On 2023-11-13 22:08, Stephen Rothwell wrote: > > BTW, cherry picking commits does not avoid conflicts - in fact it can > > cause conflicts if there are further changes to the files affected by > > the cherry picked commit in either the tree/branch the commit was > > cheery picked from or the destination tree/branch (I have to deal with > > these all the time when merging the drm trees in linux-next). Much > > better is to cross merge the branches so that the patch only appears > > once or have a shared branches that are merged by any other branch that > > needs the changes. > >=20 > > I understand that things are not done like this in the drm trees :-( >=20 > Hi Stephen, >=20 > Thank you for the clarification--understood. I'll be more careful in the = future. > Thanks again! :-) In this case, the best thing to do would indeed have been to ask the drm-misc maintainers to merge drm-misc-fixes into drm-misc-next. We're doing that all the time, but we're not ubiquitous so you need to ask us :) Also, dim should have caught that when you pushed the branch. Did you use it? Maxime --7hqxyzpgktklwnyb Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYKAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCZVXOvwAKCRDj7w1vZxhR xSpoAP9R6u/FDuWma6CxU5HZBYqMkt5dLAFaBh09JkKgEgODsQEA+ff+2mfWZWks JIa2770u4xDDPwvd4rX6nTK1ILbicQk= =OXab -----END PGP SIGNATURE----- --7hqxyzpgktklwnyb--