Am 04.03.2015 um 16:37 schrieb Michael S. Tsirkin: > On Wed, Mar 04, 2015 at 02:16:15PM +0000, Eric Auger wrote: >> virtio_ring.h now includes virtio_types.h. update-linux-headers.sh >> now exports this latter. >> >> Signed-off-by: Eric Auger <eric.au...@linaro.org> > > This is already included in my tree, but in a different place. > Pull request sent today, pls wait for it to be pulled, don't > apply this one.
The s390 tree also depends on the header update. So if my vote counts, I prefer to have that pull request sorted out sooner than later. Peter, welcome back :-) > > > >> --- >> scripts/update-linux-headers.sh | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/scripts/update-linux-headers.sh >> b/scripts/update-linux-headers.sh >> index c8e026d..bbe6185 100755 >> --- a/scripts/update-linux-headers.sh >> +++ b/scripts/update-linux-headers.sh >> @@ -62,7 +62,7 @@ done >> rm -rf "$output/linux-headers/linux" >> mkdir -p "$output/linux-headers/linux" >> for header in kvm.h kvm_para.h vfio.h vhost.h virtio_config.h virtio_ring.h >> \ >> - psci.h; do >> + virtio_types.h psci.h; do >> cp "$tmpdir/include/linux/$header" "$output/linux-headers/linux" >> done >> rm -rf "$output/linux-headers/asm-generic" >> -- >> 1.8.3.2 >
