[Devel] Re: openvz: pull request (sync with 2.6.24-ovz005)

[Kir Kolyshkin]

Tim Gardner wrote:
> Alexey Dobriyan wrote:
>   
>> Ping!
>>
>> I see that Tim already applied mmap/EINVAL patch. During merge it's possible to remove
>> debian/binary-custom.d/openvz/patchset/0050-ubuntu-make-mmap-POSIX-conform.patch
>> it will be replaces by 0074-...
>>
>> Or I can redo and start from 0051.
>>
>>
>> Ben, please pull from
>>
>> 	git://git.openvz.org/pub/ubuntu-hardy-openvz openvz
>>
>> to sync Ubuntu's repo with 2.6.24-ovz005 version.
>>
>> The main fixes are for
>> * crash when /vz is on NFS mount
>> * restoration of some /proc/net files inside VE for netstat(1) et al
>> * crash when looking up >= 2k bytes long filenames
>> * restoration of mmap( , 0, ...) semantics to return -EINVAL.
>>
>> Bug: 231400
>> Bug: 230432
>>
>>  debian/binary-custom.d/openvz/patchset/0050-CPT-Add-support-for-netdevice-hardware-addresses.patch   |  223 +
>>  debian/binary-custom.d/openvz/patchset/0051-CPT-enhance-support-of-veth-device.patch                 |  244 +
>>  debian/binary-custom.d/openvz/patchset/0052-CPT-add-support-for-network-statistics.patch             |  369 ++
>>  debian/binary-custom.d/openvz/patchset/0053-UBC-don-t-do-preventive-dentries-uncharge.patch          |  100 
>>  debian/binary-custom.d/openvz/patchset/0054-IPV6-make-proc-net-if_inet6-visible-in-VE.patch          |   54 
>>  debian/binary-custom.d/openvz/patchset/0055-IPv6-make-proc-net-ipv6_route-visible-in-VE.patch        |   70 
>>  debian/binary-custom.d/openvz/patchset/0056-Add-per-VE-proc-net-udp-udp6-udplite-udplite6.patch      |  208 +
>>  debian/binary-custom.d/openvz/patchset/0057-Add-per-VE-proc-net-tcp6.patch                           |  119 
>>  debian/binary-custom.d/openvz/patchset/0058-Add-per-VE-proc-net-raw6.patch                           |   70 
>>  debian/binary-custom.d/openvz/patchset/0059-UBC-fix-preempt_enable-placement-in-dcache-accoun.patch  |   34 
>>  debian/binary-custom.d/openvz/patchset/0060-UBC-fix-use-after-free-in-dcache-accounting.patch        |   47 
>>  debian/binary-custom.d/openvz/patchset/0061-ms-don-t-clear-afinfo-seq_fops-during-netns-stop.patch   |   40 
>>  debian/binary-custom.d/openvz/patchset/0062-CPT-get-lo-stats-from-correct-place-during-restore.patch |   26 
>>  debian/binary-custom.d/openvz/patchset/0063-CPT-fix-epoll-checkpointing.patch                        |  112 
>>  debian/binary-custom.d/openvz/patchset/0064-CPT-fix-non-existent-RCU-locking-during-resume.patch     |  170 +
>>  debian/binary-custom.d/openvz/patchset/0065-NETFILTER-fix-iptables-build-against-openvz-kernel.patch |   48 
>>  debian/binary-custom.d/openvz/patchset/0066-Fix-dcache-accounting-interaction-with-SLUB.patch        |   88 
>>  debian/binary-custom.d/openvz/patchset/0067-Leave-irq-state-alone-during-call_console_drivers.patch  |   31 
>>  debian/binary-custom.d/openvz/patchset/0068-Expand-VE0-cpu-stats.patch                               |   32 
>>  debian/binary-custom.d/openvz/patchset/0069-Backport-SLUB-Do-not-upset-lockdep.patch                 |   74 
>>  debian/binary-custom.d/openvz/patchset/0070-NETFILTER-remove-mismerge-in-mark_source_chains.patch    |   30 
>>  debian/binary-custom.d/openvz/patchset/0071-FAIRSCHED-move-to-kernel-fairsched.c.patch               | 1338 ++++++++++
>>  debian/binary-custom.d/openvz/patchset/0072-CPT-fix-shmat-2-ted-segments.patch                       |  463 +++
>>  debian/binary-custom.d/openvz/patchset/0073-Linux-2.6.24-ovz005.patch                                |   16 
>>  debian/binary-custom.d/openvz/patchset/0074-mmap-0-einval.patch                                      |   34 
>>  25 files changed, 4040 insertions(+)
>>
>>     
>
> Some problems with the patchset:
>
> patching file arch/ia64/kernel/sys_ia64.c
> Reversed (or previously applied) patch detected!  Assume -R? [n] n
> Apply anyway? [n] n
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file
> arch/ia64/kernel/sys_ia64.c.rej
> patching file mm/mmap.c
> Reversed (or previously applied) patch detected!  Assume -R? [n] n
> Apply anyway? [n] n
> Skipping patch.
> 1 out of 1 hunk ignored -- saving rejects to file mm/mmap.c.rej
> make: ***
> [/home/rtg/hardy/kern/ubuntu-hardy/debian/stamps/stamp-custom-prepare-openvz]
> Error 1
>
> You can test the prepare phase of the build without having to do all of
> the other flavours by using:
>
> fakeroot debian/rules custom-prepare-openvz
>
> rtg
>   
Tim,

I guess this is what Alexey meant by his message above. AFAICS he asked 
you to remove the patch named 
debian/binary-custom.d/openvz/patchset/0050-ubuntu-make-mmap-POSIX-conform.patch 
as he already has it in his tree.