From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C45D36CDF8 for ; Thu, 21 May 2026 09:07:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779354459; cv=none; b=huYXSo5OhvnKUnrlpcaYtLCpZ7lg2ZNI+vjj/KrCVpr8jESsIebttmcg1A4FLL3uLEHZPtkgc36hN56D7bfP6WeVTveGFaAjXRsKUHZd+jXKcp74OO2KY3Emt+jO4DDr3l+5RC/YlHGHfb0YArBCQpc7J+jfnjVdcbncR1YeneA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779354459; c=relaxed/simple; bh=jd9af6vclJSjfFDvUK/7zA3hzswpcoD89VKA8WUB/2Q=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=lKd6/ewpQL1EPdZc5EgO6Dd+GlXkh9lr3XmaBqZQjG1QDFcvL9gdzJAisL5Fms+GrFXFoWhwG7J26mDVnmM4knPrjIka2g/WZFZdw5fAhTkjl7qH0ymJE/mlykJ9H/s3LpAIS3FosNQlBdJdNDK6u4vPPkgP6KBCySrbyVOafQ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch; spf=none smtp.mailfrom=ffwll.ch; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b=J5vUKeP4; arc=none smtp.client-ip=209.85.128.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=ffwll.ch Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ffwll.ch header.i=@ffwll.ch header.b="J5vUKeP4" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-490229aa522so24479015e9.3 for ; Thu, 21 May 2026 02:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; t=1779354456; x=1779959256; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:from:to:cc :subject:date:message-id:reply-to; bh=EWcZf8xQyNgHL46GgzNOnTpRTb6xpQnkpgYkPgYwfTU=; b=J5vUKeP4ijXrLCMUnfemHYGp1cLhX+jWtV+2/C4FODe80/cw3bd918uR/CoWNrpolu EKeHPYI1VFxWn/kZHFgCeSkYy8q7OXNa5a3ttHM0R11g+vcuagygLmftoO+wgWPTi+E/ FGfBjWiuaO265jBHNNsZr14/2UbXoFpV0lCV8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779354456; x=1779959256; h=in-reply-to:content-disposition:mime-version:references :mail-followup-to:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=EWcZf8xQyNgHL46GgzNOnTpRTb6xpQnkpgYkPgYwfTU=; b=B3IPecg5CwbOUGKM2UdI7djLzM3BnPGAcMzeshQqXZi7RLIC9rzlVlLpjf+HxsIBuy UWM92NasoGEfVz+Efuo7YGROp1PwfEKt49xHUYp41Bo1L81jqT6IflpLj0H4ScUnTn72 U2KcKwfYSyjRCUZLK3BCUinxbziUixFcB1/VVvGjpBT3/HStMUoB8lJ8cJsdZ+tt2ARA QEcn/w82IqJ61NzUaBZxVSLIrJ/Ue9rda6NF6clw1JaWYkNDJiMpB73maTYqgEH5Ytvw ugq6L/7uCFy7AMCOiKR32RBDIgN+Np7/9Pwb3ql8irpm4gHNQ89mpJLrpz/EuPJ/yId1 aCeA== X-Forwarded-Encrypted: i=1; AFNElJ/W+eluHnYik3qd5HimA6NJVFVatFT9RJvg213ilzfs+5q93PSojb0okJxU43nlQb76J3W1dT8PfL9yuZs=@vger.kernel.org X-Gm-Message-State: AOJu0YzZXUw/9WdA293H9yP2La3Ucuvu2QIyu3eo1jS9gSpvb6/BVpRO Jt65VVxfIQoljcWWCoFkZjGl0r1rjzGgoOFoTWkhEhdGryjVvUM2z9rkuhmJgMd3kHk= X-Gm-Gg: Acq92OHA8XmVi+brcdRFfHm+g+NB2mySJF2kthJCceKAZfWzhGYEr7DR+jbE28XQyoQ 2nuxDlTOBFdmaFHz5WDnO2NR3L16W10N71NUiSoFNJj9Pq0QzHbSc3DCg7P/K02s/4n4ZdM9mhL X/ngXyGE5K2rfmLKwrZG0r9XSBkFu1ZBfJaHiszUKIxc9G0WV010Pk1aX1/VuMM8KcZairww7ll tdg+KoCSN55M9kOAD4pRormi/ILORmi3KMNq7ZbXaQTcpa+F0TTbqFsXraTYRbKMG0/iyblf+1W GZb5FICq6Tdv1idc4CTyhfVlD/bkuzKl8qv680lTaC6BpXkR3e6Vqe+Mth0BcQw0Y62CFN6enGi 2WMLsdqDc6mtSGB09aulryukbuzB3eI56Wwr2noZDyG3zBVJvS4hrBUNmyRKG6fIDSN67EKGn2D /d8B6+QM3PkJi3AA5VbxlFIm66NRt+l8rzLe+tjL5dNb5l5g== X-Received: by 2002:a05:600c:3b9d:b0:490:3b8b:6ba2 with SMTP id 5b1f17b1804b1-4903b8b6e29mr19074285e9.8.1779354455523; Thu, 21 May 2026 02:07:35 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:5485:d4b2:c087:b497]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eaa7d9daasm1532388f8f.11.2026.05.21.02.07.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 May 2026 02:07:34 -0700 (PDT) Date: Thu, 21 May 2026 11:07:32 +0200 From: Simona Vetter To: Boris Brezillon Cc: Mark Brown , Steven Price , Liviu Dudau , Dmitry Osipenko , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Akash Goel , Chia-I Wu , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark Subject: Re: [PATCH v4] drm/gem: Make the GEM LRU lock part of drm_device Message-ID: Mail-Followup-To: Boris Brezillon , Mark Brown , Steven Price , Liviu Dudau , Dmitry Osipenko , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Akash Goel , Chia-I Wu , Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Rob Clark References: <20260518-panthor-shrinker-fixes-v4-1-1920234470d5@collabora.com> <20260518165225.145175b1@fedora> <20260519135153.42c3f4a0@fedora> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260519135153.42c3f4a0@fedora> X-Operating-System: Linux phenom 6.19.10+deb14-amd64 On Tue, May 19, 2026 at 01:51:53PM +0200, Boris Brezillon wrote: > On Tue, 19 May 2026 12:37:16 +0100 > Mark Brown wrote: > > > On Mon, May 18, 2026 at 04:52:25PM +0200, Boris Brezillon wrote: > > > +Mark for the silent conflict resolution needed to reconcile > > > drm-misc-fixes and drm-next/drm-misc-next. > > > > This doesn't appear to be a drm-misc thing, I was seeing issues on the > > DRM tree. The patch does seem to ahve resolved things though. Please > > consider topic branches! > > I'm just following the dim guide for resolution of conflicts between > drm trees[1], so that's probably something to discuss with the > DRM/DRM-misc maintainers. As for the suggestion to use topic branches, > I've never heard of it being used for -fixes vs -next conflict > resolution, every time I've gone through this process it was for > xxx-next vs yyy-next conflict (xxx and yyy being different subsystem > trees). > > Maxime, Thomas, Maarteen, Sima and/or Dave, any suggestion/opinion? Yeah, in general we do substantially fewer topic branches than other subsystems. That's fallout from the committer model, which just want a branch to push their patches and be done with it all - they're not full maintainers, we don't magically have more of those. And sometimes that results in more of a mess than necessary. We try to keep the mess in check by doing backmerges as needed, ideally before applying a patch. It's not super well documented since when/how to backmerge is part of the section for maintainers: https://drm.pages.freedesktop.org/maintainer-tools/maintainer/maintainer-drm-misc.html The assumption is that committers will ask maintainers for help if they're trying to push a patch that results in tons of conflicts when applying (since development should happen on top of linux-next or drm-tip). Could probably improve that a bit. But also, often it's only clear after applying that a fixup is needed, and then it's pushed already. And with committers there's no undoing pushed patches. So it's just part of the deal with having lots of committers imo that history is a bit more a mess at times. Cheers, Sima > [1]https://drm.pages.freedesktop.org/maintainer-tools/committer/conflict-resolution.html -- Simona Vetter Software Engineer http://blog.ffwll.ch