linux-kernel - Re: linux-next: build failure after merge of the drm

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <8de22d252014aa52e631eb1bcf8e85d50e96c29e.camel@linux.intel.com>
Date: Thu, 04 Jul 2024 09:02:21 +0200
From: Thomas Hellström <thomas.hellstrom@...ux.intel.com>
To: Michal Wajdeczko <michal.wajdeczko@...el.com>, Stephen Rothwell
	 <sfr@...b.auug.org.au>, Dave Airlie <airlied@...hat.com>, Rodrigo Vivi
	 <rodrigo.vivi@...el.com>
Cc: Mark Brown <broonie@...nel.org>, DRI <dri-devel@...ts.freedesktop.org>, 
	Piotr Piórkowski
	 <piotr.piorkowski@...el.com>, 
	buildfailureaftermergeofthedrmtree@...ena.org.uk, Linux Kernel Mailing List
	 <linux-kernel@...r.kernel.org>, Linux Next Mailing List
	 <linux-next@...r.kernel.org>
Subject: Re: linux-next: build failure after merge of the drm

Hi

On Wed, 2024-07-03 at 13:46 +0200, Michal Wajdeczko wrote:
> + Rodrigo for help
> 
> On 03.07.2024 04:36, Stephen Rothwell wrote:
> > Hi all,
> > 
> > On Fri, 28 Jun 2024 18:03:39 +0100 Mark Brown <broonie@...nel.org>
> > wrote:
> > > 
> > > After merging the drm tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c: In
> > > function 'pf_get_threshold':
> > > /tmp/next/build/drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c:1788:2
> > > 7: error: unused variable 'xe' [-Werror=unused-variable]
> > >  1788 |         struct xe_device *xe = gt_to_xe(gt);
> > >       |                           ^~
> > > cc1: all warnings being treated as errors
> > > 
> > > Caused by commit
> > > 
> > >   629df234bfe73d ("drm/xe/pf: Introduce functions to configure VF
> > > thresholds")
> > > 
> > > I have used the tree from 20240627 instead.
> > 
> > I am still seeing that build failure.
> > 

I see that git for an unknown reason introduces this line as an
automatic resolve merging drm-next into the drm-tip build. Later there
was a manual fixup for this after merging another branch into drm-tip
but that's too late.

So I've added a manual fixup to drm-rerere to remove this line just
after the merge that somehow introduces it.

/Thomas