Re: [Qemu-devel] [PATCH v6 0/3] linux-headers: arch fixups

[Peter Maydell]

On 14 May 2018 at 14:07, Michael S. Tsirkin <address@hidden> wrote:
> It turns out that we have unistd.h and kvm headers for some
> architectures but not others.  We are thus unable to use e.g. usefaultfd
> on these systems unless system headers have been updated.
>
> Fix up update-linux-headers.sh to make sure we auto-updates
> all architectures which have linux-headers/
> (unfortunately this still does not mean "all linux systems").
>
> Tested on x86 only.
>
> Pls consider merging this through the ARM tree.
>
> Changes from v5:
>     rebase to master

Still doesn't apply:

e104462:xenial:qemu$ patches apply -s
id:address@hidden
Applying: update-linux-headers.sh: unistd.h, kvm consistency
error: sha1 information is lacking or useless (scripts/update-linux-headers.sh).
error: could not build fake ancestor
Patch failed at 0001 update-linux-headers.sh: unistd.h, kvm consistency
Use 'git am --show-current-patch' to see the failed patch
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".
e104462:xenial:qemu$ patch --dry-run -p1 <.git/rebase-apply/patch
checking file scripts/update-linux-headers.sh
Hunk #1 succeeded at 83 (offset -1 lines).
Hunk #2 FAILED at 94.
Hunk #3 FAILED at 124.
2 out of 3 hunks FAILED

The copy of this script in master has code relating to kvm_para.h,
and whatever you've based this patchset on apparently does not,
hence the conflicts.

thanks
-- PMM