From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: problem importing the akpm-current tree
Date: Thu, 14 Aug 2014 10:27:54 +1000 [thread overview]
Message-ID: <20140814102754.29ecc247@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 850 bytes --]
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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next reply other threads:[~2014-08-14 0:28 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-14 0:27 Stephen Rothwell [this message]
2014-08-14 0:35 ` linux-next: problem importing the akpm-current tree Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140814102754.29ecc247@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).