Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp2010989rdb; Tue, 20 Feb 2024 14:17:12 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXs8G9M0rTzUQxeMz6Q/cJRp/oOBXr8iC4DsuE95tVXDmR+PVvHchFpgwAAnk3ylGDRi5IW9KcPOKRIQmlwfvF4Bnp5gpjEjfDBGo5zZw== X-Google-Smtp-Source: AGHT+IHd8T4Q0diuh276E8f+U6mboCL0FJ5CUiT+qq3YL2GNphA2hxOTQXUEM6r9JHl9lOxNdjQ+ X-Received: by 2002:a05:620a:2099:b0:787:1f7d:ff8e with SMTP id e25-20020a05620a209900b007871f7dff8emr18113326qka.11.1708467432098; Tue, 20 Feb 2024 14:17:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708467432; cv=pass; d=google.com; s=arc-20160816; b=rrNJ4EmXzMVG5yAkISpB0g7qqioXc3dlQ7d2ZpdB/pQnSvB28SEMlWE4r/7aOx/K0P CF3xEo0qohvswiRMY9UTQTp6rX/IOhKZIZ1lvqvteBpN/eAVcy8B4LBO1jmmct4IpoyD la3VgW8FS1UrflxhzQdxsUM6JzuHB7e5r5b1YFgTIEuNeCvQ58cI9anvaxeaTwlo7Ds9 6dKZyPvogFoOhUeOEPVT/IogYiYw9JzJ26NsiQbe3j1akuWBfNDDYUK0y0afCOmBtYNH LbZKhQL5ZlkS2V6t03xFY8wFq3n2/3XEIALF4XPAzeiYBLD9tneN+ilfOP9W8FHU5oV3 wL9w== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=MSV4s90BpjRSKLoKbRaEbAIXDqzjjF4XClQSmwPKAR8=; fh=Wtis69x603kn5S4YioYBR2b3W7Os9PGDW2PPYMrkhk8=; b=IoZ+vTSXwbVf4/AwKzdETpM1b4rJR0YaDJvsPqPt/0QdwoFWuXGnEtA/7xR4y0jvQP iC4qz8aKB/J6MVTVfzWIm8WMWhFSQ/IQ36enbbFOzpkKylwqhFtloI74REjqgcdF5OwF 2ObkCEJjqOd/7a+S8yuto6S7obxhx7EDAuKK+vQzu+sJHp7mXUjFfe0ElRafd7XYTeYG VB8f6iBMmllwcf/V9pvTPmwTCpunVamCYDTZwKHa1DrVajL5j4rAKSWujaiGQ0DDsacO BNBSZtpmgLtWRRB1NYUvZjGDH8S/bPteqyNY4tu9Xt1Erlj/an+59gMNhy9NB3KSgrPi xUhg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=VXpgYBhe; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-73756-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73756-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. [147.75.199.223]) by mx.google.com with ESMTPS id f20-20020a05620a409400b0078770f97d87si4545050qko.621.2024.02.20.14.17.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 14:17:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73756-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=VXpgYBhe; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-73756-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73756-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 5D8931C214F0 for ; Tue, 20 Feb 2024 22:17:11 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8EFD5152E12; Tue, 20 Feb 2024 22:17:06 +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="VXpgYBhe" 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 65BD967C72; Tue, 20 Feb 2024 22:17:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708467425; cv=none; b=uAXzXMbmXNGpzoohucBvc0Wwl6zFgtIqfhCPn/O+HOanoxaxbdi5ysgQiE/EbZ5yVZaV//n7jjFBB05xTinVtBeTkGMsG7Nv1ds8PIIfsT0wOCEQD2H3L9f1cmr87KQbviyeFqgIhfpUKWR98UebkmFk7PTPKalROoE8E4TNGRY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708467425; c=relaxed/simple; bh=YkjJomkwAbyilvCZ+dd7xJ2p1jNCwzNzJDmAAUwoVU4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=ADmkmiC8N5ITqnCFhN4N8UU+Hrui0/1VcioIQ0aDECcmxNYspy3Os7d/LesFiV5lv7oK/3A/WHOCAa6YalFoZOnRW83gvuP1zfX6lcDaikbe9p8Uj0uW8DZyWWKo0jhUOwBVwPRDrSh5DrxQSnUhKc6V+XZC+lzb+bgw7hHyK9M= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=VXpgYBhe; arc=none smtp.client-ip=150.107.74.76 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=1708467418; bh=MSV4s90BpjRSKLoKbRaEbAIXDqzjjF4XClQSmwPKAR8=; h=Date:From:To:Cc:Subject:From; b=VXpgYBhex2o2FnruV5bneTXRDInXqsX0RLCJuVpDR9YO67fmd7AKV90HiL/og5cKU FCo4HACr4asFYWJVplLipquo1iAClskjE3fRx/NxUB5M4nnJxvOKSn8XnXQRXqZMFh vDVWzsyUK3MP2a0uLNWiwWS63N6g8tb/7cjud11rm5XvxyLYoL6CjxEp6UHxsy+O/c izSGW3+GjjkY+3f0h/E7dZTZKv5NsU3FRSKpDP/c2HcgRaOLeOIc8vg6OwOZ7ib7X7 9JJRvJAtzXrRB1pD7ikpLd0pdLFRXNqcziqFpkWp5FK/d1KNlBnsHOvEM98tKrh6tI K3oCDWEcEYbag== 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 4TfYfd74Bsz4wcC; Wed, 21 Feb 2024 09:16:57 +1100 (AEDT) Date: Wed, 21 Feb 2024 09:16:55 +1100 From: Stephen Rothwell To: Daniel Vetter , Linus Torvalds Cc: Intel Graphics , DRI , Christian =?UTF-8?B?S8O2bmln?= , Linux Kernel Mailing List , Linux Next Mailing List , Matthew Auld Subject: linux-next: manual merge of the drm-misc-fixes tree with Linus' tree Message-ID: <20240221091655.2937adbd@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_/F8R60ml85Z6nr7dU8JqHvdy"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/F8R60ml85Z6nr7dU8JqHvdy Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the drm-misc-fixes tree got a conflict in: drivers/gpu/drm/tests/drm_buddy_test.c between commit: fca7526b7d89 ("drm/tests/drm_buddy: fix build failure on 32-bit targets") from Linus' tree and commit: 335126937753 ("drm/tests/drm_buddy: fix 32b build") from the drm-misc-fixes tree. I fixed it up (I just used the version from Linus' tree) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. --=20 Cheers, Stephen Rothwell --Sig_/F8R60ml85Z6nr7dU8JqHvdy Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXVJNcACgkQAVBC80lX 0Gysqwf/ef0qLJRLq8wnSElTxLDdQIYFArrCQI+ln5O8MTFlwqGAjuoxb1t8o0Zr E9WcMGK5hNHzyhTt5cshF0sjU3MlV9FkPosxitExE6qOT8IwlIsBykFP/7KgjX+Q GPp/vqWBGLbm2R4w0LvwTGWfKZFZ3Ht84bsND4w1CMr69TW3ors5sMBDcT7MIYQZ 7V8rr4dScDRI3m7Dyv4za7dRBBnd4DxWzIZ5Mt3YEMVYiKVh34JJMW5fqQfF+UAf BzX1IY90r9EPyiHB6kD66KYAILOPQ3o0j4V10d0LE0UuViowWfNJqPtgqJeTRCiy ik3IwvL2ymLi9/rwVfUu6thvlobtEA== =VuOE -----END PGP SIGNATURE----- --Sig_/F8R60ml85Z6nr7dU8JqHvdy--