Received: by 2002:a05:7412:b995:b0:f9:9502:5bb8 with SMTP id it21csp7969601rdb; Thu, 4 Jan 2024 13:53:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IF7VS3CfJUnvzYpW83fOUq0W2TratAs0KAWWp2dFIy5y5+UCmSKhnHFJ78fA8uDJVj2UidU X-Received: by 2002:a81:5b03:0:b0:5ef:7f8d:bfcb with SMTP id p3-20020a815b03000000b005ef7f8dbfcbmr1332957ywb.19.1704405201681; Thu, 04 Jan 2024 13:53:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704405201; cv=none; d=google.com; s=arc-20160816; b=pi05q8xOt/SIG0JqTdCedwp4PdqKg7lLBn06xwY+T1sGroWsmI5H1Z4aT3qC9+wbEL ppRaJ30NK/q/pB57H1Ld+GZp0x9qfjpbaIIlPZET25FFuQAM30+yAC6ONQF9XMT/dD5y wENLFwCOqIYWmPKjiwdmuDtVrnSuvV9XW8wd8YFIOmYIQFTebx2SQP0FpIXVW2E9gHRf 9MuUZW+5h3cDJ2Y4k1borlOLGgP5qNm/Vo4UNhTqrRGKVhWn/Qi8zpUOnIzY8D/cNRWB MG9C9VxfkYb4ZSfEHMvn65NMoAcR8eSE0XZdGWLq1gza0dTtTdFHP7AlvwA9Ow9NQO2O 3OcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=pDXgYGPQvMZ+WSbHvTdIkjk/z+GYCZlcPmuxoW3COew=; fh=eBMAdv6b1fRPdsgBGR0hPNmjlVVD8R4JUAExIYA9jUM=; b=Ad1YJnc50Tz9UqWamTG4jX+AHJUnb+foW/bKcYOzyG4GfaXQ+N9UDxURIRz0k4uoq9 aOZlf3JLnWo5gercqacwKpk+I0dGtyTlmak3ME3Vh0oBE5aDkPAuGUkNrd24cFFNkG7A BWTp5xU9isZbdRE09XAbTUU6RnXFOosUj5O/RsG/d78ouEuEP7W0w9lEIWpmi0LpH4kB KgytOO48550hMClgRoqFjLwVtGEii3CjpuYIBL88yssGzaNC0We4DbJs8wK9YwxEGJht mdGa8rkA4TkbKPZDY5PnUlc/+VEgeFbQz0xN1Lma7VobzaNJj8g6epJgjQNZeg23/kWp PA2g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=jT76Tn6G; spf=pass (google.com: domain of linux-kernel+bounces-17259-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17259-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id v7-20020a0ce1c7000000b0067f91ebcd11si374346qvl.520.2024.01.04.13.53.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Jan 2024 13:53:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-17259-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=jT76Tn6G; spf=pass (google.com: domain of linux-kernel+bounces-17259-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-17259-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 62D531C2254E for ; Thu, 4 Jan 2024 21:53:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 62CB42CCD1; Thu, 4 Jan 2024 21:53:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="jT76Tn6G" X-Original-To: linux-kernel@vger.kernel.org Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 115CE2CCB0; Thu, 4 Jan 2024 21:53:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1704405187; bh=pDXgYGPQvMZ+WSbHvTdIkjk/z+GYCZlcPmuxoW3COew=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=jT76Tn6G76UklbwJfFclIVdBoPxbX5iQC+1FnGJNnfErZJZaPARbTEP+g5szJmlsZ VlwUYUZKmYK2/vFfNJhGrRAs8H7O/4ecNqpt6D/R/dVWEIjTIPa6GuF0Uh9E8SOaX9 iXBCAHsyUzp0Pe8/b2IEKSZUI6XsrvmrNcse6ntG+FcDc2lMFLdh12XT/uvYu2GN3W Bu+jXP23GL3skyJFXjW3SeznScjw/mJ0GW40FSPbeuPNOgUqnPwEwV4l0He0XfGNsI vvrA492/R7NsDMpZ4Gby7dEvCp2oKfuDK1PqFxf0lLWm1ycxo3vie6xrEwStM7Ch1d qGL3ONBbKRouA== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4T5gLq53Y0z4x1x; Fri, 5 Jan 2024 08:53:07 +1100 (AEDT) Date: Fri, 5 Jan 2024 08:53:06 +1100 From: Stephen Rothwell To: Dan Williams Cc: Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: duplicate patches in the cxl-fixes tree Message-ID: <20240105085306.60979082@canb.auug.org.au> In-Reply-To: <20240102023218.3cd3e4ea@canb.auug.org.au> References: <20240102023218.3cd3e4ea@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/5kw+qjFC7gX84eadh50uSB2"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/5kw+qjFC7gX84eadh50uSB2 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi Dan, On Tue, 2 Jan 2024 02:32:18 +1100 Stephen Rothwell w= rote: > > A large number of commits in the cxl-fixes tree are also in Linus > Torvalds' tree as different commits (but the same patches). >=20 > A bad rebase onto v6.7-rc6 has been done. I cannot use this tree as > it is. Can this be fixed up, please? $ git rebase --onto v6.7-rc6 251c56533a2c should do it --=20 Cheers, Stephen Rothwell --Sig_/5kw+qjFC7gX84eadh50uSB2 Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmWXKMIACgkQAVBC80lX 0Gx1GggAoNcTsf/OdSyde3sH9bRzCFS5pYwAsnpfJU+AZRVjI6bL5cKlMH6WJImR yHV/JO/+Qpmynv7emjlkHDusJ1MuClMTkL+B74GftWi6I7h5dkgZFyA3rrW/zsZp g4UjvinB1mdBrKCyvayg1/1wJP4adYvOgf+oLIG8aHcUhS3ZkFRGNivOydbG43ZU tn58iSLoN4cAa/VdvrDqqUxY2POML0GEo3iZd6V6g/NEJ75og388g3JIQOxhEVbX NGS2dTcFu9Ezw6zAdqrdHKU6mlYkG9ImCYYDmvbezJLaV4D11pG/i0CcEnS8Cqdj jfWGvYqgHTi0lFvy56FMnkEERe42zA== =Jc26 -----END PGP SIGNATURE----- --Sig_/5kw+qjFC7gX84eadh50uSB2--