Hi, CI is always testing against https://cgit.freedesktop.org/drm-tip Br Jani > -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@xxxxxxxxxxxxxxxxxxxxx> On Behalf Of Christian > Brauner > Sent: Wednesday, October 25, 2023 11:39 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Subject: Re: ✗ Fi.CI.BUILD: failure for file, i915: fix file reference for > mmap_singleton()y > > On Wed, Oct 25, 2023 at 08:16:23PM -0000, Patchwork wrote: > > == Series Details == > > > > Series: file, i915: fix file reference for mmap_singleton() > > URL : https://patchwork.freedesktop.org/series/125570/ > > State : failure > > > > == Summary == > > > > Error: patch > > https://patchwork.freedesktop.org/api/1.0/series/125570/revisions/1/mb > > ox/ not applied > > Applying: file, i915: fix file reference for mmap_singleton() Using > > index info to reconstruct a base tree... > > M drivers/gpu/drm/i915/gem/i915_gem_mman.c > > M fs/file.c > > M include/linux/fs.h > > Falling back to patching base and 3-way merge... > > Auto-merging include/linux/fs.h > > CONFLICT (content): Merge conflict in include/linux/fs.h Auto-merging > > fs/file.c CONFLICT (content): Merge conflict in fs/file.c Auto-merging > > drivers/gpu/drm/i915/gem/i915_gem_mman.c > > CONFLICT (content): Merge conflict in > > drivers/gpu/drm/i915/gem/i915_gem_mman.c > > error: Failed to merge in the changes. > > hint: Use 'git am --show-current-patch=diff' to see the failed patch > > Patch failed at 0001 file, i915: fix file reference for > > mmap_singleton() When you have resolved this problem, run "git am -- > continue". > > If you prefer to skip this patch, run "git am --skip" instead. > > To restore the original branch and stop patching, run "git am --abort". > > Build failed, no error log produced > > I'm not sure what tree you're testing on but please test on whatever is in > vfs.misc, I guess which has that patch. > git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
