Subject: Re: linux-next: manual merge of the drm tree with the drm-misc-fixes
 tree
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Dave Airlie <airlied@linux.ie>,
        Daniel Vetter <daniel.vetter@ffwll.ch>,
        Intel Graphics <intel-gfx@lists.freedesktop.org>,
        DRI <dri-devel@lists.freedesktop.org>
Cc:     Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20211222145014.472328be@canb.auug.org.au>
From:   =?UTF-8?Q?Christian_K=c3=b6nig?= <christian.koenig@amd.com>
Message-ID: <c55af047-3207-fb42-19ee-71f2e18e60ac@amd.com>
Date:   Wed, 22 Dec 2021 08:31:18 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.14.0
In-Reply-To: <20211222145014.472328be@canb.auug.org.au>
Content-Type: text/plain; charset=windows-1252; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?Windows-1252?Q?i44nWEID2cJRZGnPR1cYwRJTUYvp2x/SgFqyaK9wxqCGgd7ueP5LJTkw?=
 =?Windows-1252?Q?W0x8nxrHhUBHXRmWFW/rRvIHig7rjZ2uMp/BHAZrqUqH+zk5CjkY0OyT?=
 =?Windows-1252?Q?dtxpOdKn0AkZ9Yb41Xtl5kjABKaxv6u1tIhhAWgAstibFcx0JdwQGn+e?=
 =?Windows-1252?Q?350RB0Rrh/2nCNPQx/slh1lCc+K2Zrr+y97R2Y25vEDwRzuSVh2oowtB?=
 =?Windows-1252?Q?y1uN02FpYFnvgnEQYA3/lHCa6gG5BFWuY9aZrJlq9NMXgUWan9/3YOiY?=
 =?Windows-1252?Q?+NJD/YWPvr3/uAqmCDGAPn/n2iw22FVpGemHm3fCUXiwHesbxYHX0tOx?=
 =?Windows-1252?Q?ReiEfUcU3C2DjUETvnhTK9MPk/jQHuPeNN3PY0K13pHSGeJqJOX98jWE?=
 =?Windows-1252?Q?FV7SOUGLcPb2+Jq37LnCfnzmDiPwSNYIBu7gXDQgZaKTb6d5lzddXtCP?=
 =?Windows-1252?Q?/sDRIlll0VhfmEVbtsopuIUv6UtGY0hzjGkuhUoKT1QkbAvoqfdE2PS0?=
 =?Windows-1252?Q?k4nvzZtgG6FL0wnJpsek203j7zYZK2W6crOBud34FtBZEaqU2X9DTrd8?=
 =?Windows-1252?Q?UwWF2nNmmLEZ4B1OWmbrEyHa+q799+qir9Sy+tEZGovHR2qANXF2a5pP?=
 =?Windows-1252?Q?hNzp7R2z2m1RX2Zxmjrz3ayYUgElwdegiy1bZIAcVEFScgd/71b6dEcQ?=
 =?Windows-1252?Q?p8Vsv9Tim24p2sboPtY/BSeKEXARKNCu02tss8DFrUrQQEKFBrFfXsiB?=
 =?Windows-1252?Q?hPGmu/fih9CpLjo/9K3cYxD0kvfOZUq85Vv6PLhN52ZRxWgESTwx0Cti?=
 =?Windows-1252?Q?RTQnI1Abrfl/2cYHjp1b2ovt5vcZq7qdobYlihUCkyr02gw82ST94Ep6?=
 =?Windows-1252?Q?M/vBYAs0OtaCtUw2dBfcK7b6XPHBhNVW8qaAecGHcsiLFrMSUbtiwJ6n?=
 =?Windows-1252?Q?ulHCSS+5I5judpU6UWCAEY2HWwUuoo1LNiIqDq5lp1q4gVGRT/nEnCGj?=
 =?Windows-1252?Q?eq6Ex8y0/2hkmR0MigERADP/Z2O1Bp6mqEQr+AWcZfp4ZAcBzXB+yjKH?=
 =?Windows-1252?Q?Ly+WPLC/lqwaPkau8/T6RCaTjRCCmEj6CfM2uMdZTp4Xbn6Cdtuh+0cz?=
 =?Windows-1252?Q?sDKl6mB9CbMxwU+5eGgLOZaCGnsty7FL6BQ8L/j2jOZ3fu31ezyh0GSv?=
 =?Windows-1252?Q?dP6QHwe9Qf6ngch0NImBHS/it6WLPm4Q2xEAAxoz7tl5gxCXn5uXQ02H?=
 =?Windows-1252?Q?mf806eLCAUwsB/qp0jBEkrLifmgqWqFn5q5c26KQe2BvDUN5J8eC5LMZ?=
 =?Windows-1252?Q?p5tWDKBHBGsnC6GEIOlbHyjyKCrVulv7Q1xxbHHRPOnwNreWtJNdptLG?=
 =?Windows-1252?Q?5IBuMyayyXj+Hl2rjxYhgp3z4ft8oYseYAZ1isSTS4WZXKsOxzNDh9C4?=
 =?Windows-1252?Q?Yc2RYSOdIgfaRxJCcGZp/KkwPOpOs1du/PRKlLocUHyLAciW5MX9bN6E?=
 =?Windows-1252?Q?wO3G/V+89wxa/k9R3iaNMihvQuMsMZiK+lafQvtoHCkhbgYkrI4zHOWL?=
 =?Windows-1252?Q?NVXyqdq1kAgyp9hyz4LkuDSP9+J88xyrU4EGja2Vrf9Gf+OsG1ZBFG6h?=
 =?Windows-1252?Q?XhM2b5B/AQRrPShaojeewPoPKdvTXf7QmmgET2z0tzulyZ+nfBrvdVDA?=
 =?Windows-1252?Q?40gHwMWQQWE=3D?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ab1080d6-8fb1-4e1c-843e-08d9c51d1022
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1201MB0192.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Dec 2021 07:31:26.6406
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: wBdorj70uowFiNDX0R00KXB/pCa6I2ybZaelFMWAll38UFZpsPf/0KLp/8BhOTUT
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4492
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Stephen,

Am 22.12.21 um 04:50 schrieb Stephen Rothwell:
> Hi all,
>
> Today's linux-next merge of the drm tree got a conflict in:
>
>    drivers/gpu/drm/nouveau/nouveau_fence.c
>
> between commit:
>
>    67f74302f45d ("drm/nouveau: wait for the exclusive fence after the shared ones v2")
>
> from the drm-misc-fixes tree and commit:
>
>    40298cb45071 ("drm/nouveau: use the new iterator in nouveau_fence_sync")
>
> from the drm tree.
>
> I fixed it up (I just used the latter version) 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.
>

That will cause a performance regression in linux-next for nouveau users.

The real fix is already queued up for merging into drm-next. So no 
immediately action item here.

Just keep it in the back of your mind in case any nouveau users starts 
to complain about the performance in linux-next.

Thanks,
Christian.