Messages in this thread | | | Date | Thu, 14 Aug 2014 10:27:54 +1000 | From | Stephen Rothwell <> | Subject | linux-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] | |