lkml.org 
[lkml]   [2014]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: problem importing the akpm-current tree
Hi Andrew,

While importing mmotm 2014-08-13-14-29, I get the following:

$ git am --patch-format=mbox ../mmotm/broken-out/drivers-gpu-drm-nouveau-fix-build.patch
Applying: drivers/gpu/drm/nouveau: fix build
error: patch failed: drivers/gpu/drm/nouveau/core/include/nvif/unpack.h:1
error: drivers/gpu/drm/nouveau/core/include/nvif/unpack.h: patch does not apply
Patch failed at 0001 drivers/gpu/drm/nouveau: fix build

the problem is that the files altered by that patch are symlinks in the
git tree and the patch tries to turn them into real files with #includes
of the symlink target.

I skipped the patch and I guess your problem arose from applying a git
patch to a non git tree which created real files whose contents were
just the symlink target names.

--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2014-08-14 02:41    [W:0.030 / U:0.172 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site