[andrex@alumni.utexas.net: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linux-so
forwarded 377707 devel@openvz.org tags 377707 + upstream thanks Hi I have got the following bugreport and it seems that the patch provided do not apply cleanly against the Debian kernel. Can you help me with this? Regards, // Ola ----- Forwarded message from Andrew Schulman <andrex@alumni.utexas.net> ----- Envelope-to: ola@opalsys.net Delivery-date: Mon, 10 Jul 2006 21:52:54 +0200 Subject: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linux-source-2.6.16 Reply-To: Andrew Schulman <andrex@alumni.utexas.net>, 377707@bugs.debian.org Resent-From: Andrew Schulman <andrex@alumni.utexas.net> Resent-To: debian-bugs-dist@lists.debian.org Resent-CC: Ola Lundqvist <opal@debian.org> Resent-Date: Mon, 10 Jul 2006 19:48:54 UTC Resent-Message-ID: <handler.377707.B.115255997716772@bugs.debian.org> X-Debian-PR-Message: report 377707 X-Debian-PR-Package: kernel-patch-openvz X-Debian-PR-Keywords: From: Andrew Schulman <andrex@alumni.utexas.net> To: Debian Bug Tracking System <submit@bugs.debian.org> X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Level: X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE, RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02 Resent-Sender: Debian BTS <debbugs@bugs.debian.org> Resent-Date: Mon, 10 Jul 2006 12:49:06 -0700 X-Spam-Score: 1.0 (+) X-Spamcheck-provider: Checked for spam by opalsys.net, postmaster@opalsys.net Package: kernel-patch-openvz Version: 026test015-1 Severity: important The supplied patch doesn't apply cleanly to Debian kernel source: # cd /usr/src # rm -rf linux-source-2.6.16 # tar -jxf linux-source-2.6.16.tar.bz2 # cd linux-source-2.6.16 # make-kpkg --added-patches openvz configure exec make -f /usr/share/kernel-package/ruleset/minimal.mk debian KPKG_SELECTED_PATCHES="openvz" ====== making target minimal_debian [new prereqs: ]====== This is kernel package version . test -d debian || mkdir debian test ! -e stamp-building || rm -f stamp-building test -f debian/control || sed -e 's/=V/2.6.16/g' \ -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ -e 's/=SA//g' -e 's/=L/ /g' \ -e 's/=I//g' \ -e 's/=CV/2.6/g' \ -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ /usr/share/kernel-package/Control > debian/control test -f debian/changelog || sed -e 's/=V/2.6.16/g' \ -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ /usr/share/kernel-package/changelog > debian/changelog install -p -m 755 /usr/share/kernel-package/rules debian/rules for file in ChangeLog Control Control.bin86 config templates.in rules; do \ cp -f /usr/share/kernel-package/$file ./debian/; \ done for dir in Config docs examples ruleset scripts pkg po; do \ cp -af /usr/share/kernel-package/$dir ./debian/; \ done test -d ./debian/stamps || mkdir debian/stamps exec debian/rules KPKG_SELECTED_PATCHES="openvz" configure ====== making target CONFIG-common [new prereqs: testdir]====== ====== making target debian/stamp-conf [new prereqs: ]====== # work around idiocy in recent kernel versions test ! -e scripts/package/builddeb || \ mv -f scripts/package/builddeb scripts/package/builddeb.dist test ! -e scripts/package/Makefile || \ (mv -f scripts/package/Makefile scripts/package/Makefile.dist && \ (echo "# Dummy file "; echo "help:") > scripts/package/Makefile) test -d debian || mkdir ./debian test ! -e stamp-building || rm -f stamp-building test ! -f ./debian || test -f stamp-debian || test -f debian/official || \ (rm -rf ./debian && mkdir ./debian) test ! -f applied_patches || rm -f applied_patches for patch in /usr/src/kernel-patches/all/apply/openvz ; do \ if test -x $patch; then \ if $patch; then \ echo "Patch $patch processed fine"; \ echo "$patch" >> applied_patches; \ else \ echo "Patch $patch failed."; \ echo "Hit return to Continue"; \ read ans; \ fi; \ fi; \ done START applying openvz patch (OpenVZ kernel patch for virtual server support) Testing whether "OpenVZ kernel patch for virtual server support" patch for 2.6.16 applies (dry run): 2 out of 2 hunks FAILED -- saving rejects to file Documentation/dvb/get_dvb_firmware.rej 1 out of 2 hunks FAILED -- saving rejects to file arch/alpha/kernel/setup.c.rej 3 out of 3 hunks FAILED -- saving rejects to file arch/alpha/kernel/smp.c.rej 2 out of 2 hunks FAILED -- saving rejects to file arch/alpha/lib/strncpy.S.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/speedstep-smi.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/dmi_scan.c.rej 3 out of 3 hunks FAILED -- saving rejects to file arch/i386/kernel/vm86.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/kernel/m32r_ksyms.c.rej 3 out of 3 hunks FAILED -- saving rejects to file arch/m32r/kernel/setup.c.rej 7 out of 7 hunks FAILED -- saving rejects to file arch/m32r/kernel/smpboot.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/lib/Makefile.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/kernel/branch.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/mm/c-r4k.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/pci_64.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/setup_64.c.rej 2 out of 3 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_32.c.rej 2 out of 2 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_64.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/platforms/powermac/setup.c.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/ia32/Makefile.rej 4 out of 8 hunks FAILED -- saving rejects to file arch/x86_64/kernel/entry.S.rej 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/kernel/pci-gart.c.rej 2 out of 6 hunks FAILED -- saving rejects to file arch/x86_64/kernel/process.c.rej 3 out of 7 hunks FAILED -- saving rejects to file arch/x86_64/kernel/traps.c.rej 3 out of 5 hunks FAILED -- saving rejects to file block/elevator.c.rej 2 out of 3 hunks FAILED -- saving rejects to file block/genhd.c.rej 1 out of 1 hunk FAILED -- saving rejects to file block/ll_rw_blk.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/cpu.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/firmware_class.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/node.c.rej 3 out of 5 hunks FAILED -- saving rejects to file drivers/block/cciss.c.rej 4 out of 4 hunks FAILED -- saving rejects to file drivers/block/ub.c.rej 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/agp/efficeon-agp.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/cs5535_gpio.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/ipmi/ipmi_bt_sm.c.rej 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/pcmcia/cm4000_cs.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/pcmcia/cm4040_cs.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/snsc.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/tipar.c.rej 19 out of 19 hunks FAILED -- saving rejects to file drivers/char/tlclk.c.rej 2 out of 44 hunks FAILED -- saving rejects to file drivers/char/tty_io.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/edac/Kconfig.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/i2c/busses/scx200_acb.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/i2c/chips/m41t00.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/ide/pci/alim15x3.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/ieee1394/ohci1394.c.rej 6 out of 8 hunks FAILED -- saving rejects to file drivers/ieee1394/sbp2.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/input/mouse/psmouse-base.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/macintosh/therm_adt746x.c.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/md/dm-snap.c.rej 3 out of 3 hunks FAILED -- saving rejects to file drivers/md/dm.c.rej 4 out of 5 hunks FAILED -- saving rejects to file drivers/md/kcopyd.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/md/raid10.c.rej 4 out of 5 hunks FAILED -- saving rejects to file drivers/media/dvb/dvb-usb/cxusb.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/saa7127.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/tuner-types.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/mtd/nand/Kconfig.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/e1000/e1000_main.c.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/irda/irda-usb.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.h.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/tg3.c.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/via-rhine.c.rej 2 out of 3 hunks FAILED -- saving rejects to file drivers/net/wireless/Kconfig.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/hostap/hostap_80211_tx.c.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/wireless/ipw2200.c.rej 6 out of 6 hunks FAILED -- saving rejects to file drivers/pci/pci-acpi.c.rej 3 out of 5 hunks FAILED -- saving rejects to file drivers/pci/quirks.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/pcmcia/ds.c.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-9xxx.c.rej 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-xxxx.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/libata-core.c.rej 4 out of 5 hunks FAILED -- saving rejects to file drivers/scsi/sata_mv.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc3.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc4.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/core/message.c.rej 3 out of 3 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-sched.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/console.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/option.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/storage/Kconfig.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/cfbimgblt.c.rej 1 out of 2 hunks FAILED -- saving rejects to file drivers/video/fbmem.c.rej 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/i810/i810_main.c.rej 2 out of 2 hunks FAILED -- saving rejects to file fs/9p/vfs_inode.c.rej 3 out of 4 hunks FAILED -- saving rejects to file fs/char_dev.c.rej 2 out of 2 hunks FAILED -- saving rejects to file fs/cifs/cifsencrypt.c.rej 1 out of 7 hunks FAILED -- saving rejects to file fs/compat.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/fuse/file.c.rej 8 out of 23 hunks FAILED -- saving rejects to file fs/locks.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs3proc.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs4proc.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfsproc.c.rej 3 out of 19 hunks FAILED -- saving rejects to file fs/open.c.rej 2 out of 3 hunks FAILED -- saving rejects to file fs/partitions/check.c.rej 4 out of 21 hunks FAILED -- saving rejects to file fs/proc/base.c.rej 2 out of 14 hunks FAILED -- saving rejects to file fs/proc/proc_misc.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/proc/vmcore.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/reiserfs/xattr_acl.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/smbfs/request.c.rej 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/dir.c.rej 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/file.c.rej 1 out of 2 hunks FAILED -- saving rejects to file fs/sysfs/inode.c.rej 1 out of 3 hunks FAILED -- saving rejects to file fs/sysfs/symlink.c.rej 1 out of 1 hunk FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_aops.c.rej 1 out of 2 hunks FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_iops.c.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-generic/pgtable.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/cpufeature.h.rej 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/i387.h.rej 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/pgtable.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-m32r/smp.h.rej 15 out of 16 hunks FAILED -- saving rejects to file include/asm-m32r/uaccess.h.rej 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/bitops.h.rej 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/byteorder.h.rej 4 out of 4 hunks FAILED -- saving rejects to file include/asm-mips/interrupt.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/pgtable.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/r4kcache.h.rej 2 out of 2 hunks FAILED -- saving rejects to file include/asm-powerpc/floppy.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/asm-x86_64/cpufeature.h.rej 2 out of 3 hunks FAILED -- saving rejects to file include/asm-x86_64/i387.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpu.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpumask.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/linux/fb.h.rej 2 out of 20 hunks FAILED -- saving rejects to file include/linux/fs.h.rej 1 out of 6 hunks FAILED -- saving rejects to file include/linux/mm.h.rej 1 out of 2 hunks FAILED -- saving rejects to file include/linux/page-flags.h.rej 1 out of 7 hunks FAILED -- saving rejects to file include/linux/proc_fs.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/linux/raid/raid1.h.rej 1 out of 2 hunks FAILED -- saving rejects to file include/linux/rtc.h.rej 1 out of 3 hunks FAILED -- saving rejects to file include/net/ip.h.rej 2 out of 2 hunks FAILED -- saving rejects to file include/net/sctp/sctp.h.rej 1 out of 1 hunk FAILED -- saving rejects to file include/net/sctp/structs.h.rej 1 out of 20 hunks FAILED -- saving rejects to file ipc/shm.c.rej 1 out of 11 hunks FAILED -- saving rejects to file ipc/util.c.rej 1 out of 1 hunk FAILED -- saving rejects to file kernel/auditsc.c.rej 1 out of 1 hunk FAILED -- saving rejects to file kernel/exec_domain.c.rej 1 out of 27 hunks FAILED -- saving rejects to file kernel/exit.c.rej 1 out of 29 hunks FAILED -- saving rejects to file kernel/fork.c.rej 3 out of 7 hunks FAILED -- saving rejects to file kernel/posix-cpu-timers.c.rej 5 out of 8 hunks FAILED -- saving rejects to file kernel/ptrace.c.rej 5 out of 117 hunks FAILED -- saving rejects to file kernel/sched.c.rej 2 out of 22 hunks FAILED -- saving rejects to file kernel/signal.c.rej 1 out of 23 hunks FAILED -- saving rejects to file kernel/sys.c.rej 3 out of 3 hunks FAILED -- saving rejects to file kernel/uid16.c.rej 1 out of 2 hunks FAILED -- saving rejects to file mm/mempolicy.c.rej 8 out of 17 hunks FAILED -- saving rejects to file mm/page_alloc.c.rej 5 out of 6 hunks FAILED -- saving rejects to file net/atm/clip.c.rej 2 out of 3 hunks FAILED -- saving rejects to file net/bridge/br_netfilter.c.rej 1 out of 34 hunks FAILED -- saving rejects to file net/core/dev.c.rej 1 out of 15 hunks FAILED -- saving rejects to file net/core/sock.c.rej 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/fib_trie.c.rej 3 out of 6 hunks FAILED -- saving rejects to file net/ipv4/ip_output.c.rej 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/arp_tables.c.rej 1 out of 38 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_core.c.rej 1 out of 10 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_netlink.c.rej 1 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_proto_sctp.c.rej 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_nat_snmp_basic.c.rej 1 out of 21 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_tables.c.rej 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c.rej 1 out of 24 hunks FAILED -- saving rejects to file net/ipv4/route.c.rej 1 out of 7 hunks FAILED -- saving rejects to file net/ipv4/tcp_output.c.rej 1 out of 13 hunks FAILED -- saving rejects to file net/ipv6/netfilter/ip6_tables.c.rej 1 out of 1 hunk FAILED -- saving rejects to file net/ipv6/xfrm6_policy.c.rej 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/nf_conntrack_netlink.c.rej 1 out of 2 hunks FAILED -- saving rejects to file net/netfilter/nf_conntrack_proto_sctp.c.rej 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/xt_sctp.c.rej 1 out of 1 hunk FAILED -- saving rejects to file net/sctp/inqueue.c.rej 10 out of 10 hunks FAILED -- saving rejects to file net/sctp/sm_statefuns.c.rej 3 out of 4 hunks FAILED -- saving rejects to file net/sctp/sm_statetable.c.rej 2 out of 2 hunks FAILED -- saving rejects to file net/sctp/ulpqueue.c.rej 1 out of 1 hunk FAILED -- saving rejects to file security/keys/keyring.c.rej 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/mls.c.rej 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/services.c.rej 3 out of 3 hunks FAILED -- saving rejects to file sound/isa/opti9xx/opti92x-ad1848.c.rej 1 out of 1 hunk FAILED -- saving rejects to file sound/oss/dmasound/tas_common.c.rej 1 out of 1 hunk FAILED -- saving rejects to file sound/pci/hda/patch_realtek.c.rej 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/daca.c.rej 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/tumbler.c.rej "OpenVZ kernel patch for virtual server support" patch for 2.6.16 does not apply cleanly Patch /usr/src/kernel-patches/all/apply/openvz failed. Hit return to Continue <snip> -- System Information: Debian Release: testing/unstable APT prefers testing APT policy: (990, 'testing'), (300, 'unstable'), (200, 'stable') Architecture: amd64 (x86_64) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.16 Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) Versions of packages kernel-patch-openvz depends on: ii bash 3.1-4 The GNU Bourne Again SHell ii grep-dctrl 2.9.0 Grep Debian package information - ii patch 2.5.9-4 Apply a diff file to an original kernel-patch-openvz recommends no packages. -- no debconf information ----- End forwarded message ----- -- --------------------- Ola Lundqvist --------------------------- / opal@debian.org Annebergsslingan 37 \ | opal@lysator.liu.se 654 65 KARLSTAD | | +46 (0)54-10 14 30 +46 (0)70-332 1551 | | http://www.opal.dhs.org UIN/icq: 4912500 | \ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 / ------------------------------------------------------------ ---
Re: [andrex@alumni.utexas.net: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linu
Where can we get the differences from "vanilla" 2.6.16 to Debian's 2.6.16? Ola Lundqvist wrote: > forwarded 377707 devel@openvz.org > tags 377707 + upstream > thanks > > Hi > > I have got the following bugreport and it seems that the patch provided do not > apply cleanly against the Debian kernel. Can you help me with this? > > Regards, > > // Ola > > ----- Forwarded message from Andrew Schulman <andrex@alumni.utexas.net> ----- > > Envelope-to: ola@opalsys.net > Delivery-date: Mon, 10 Jul 2006 21:52:54 +0200 > Subject: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linux-source-2.6.16 > Reply-To: Andrew Schulman <andrex@alumni.utexas.net>, > 377707@bugs.debian.org > Resent-From: Andrew Schulman <andrex@alumni.utexas.net> > Resent-To: debian-bugs-dist@lists.debian.org > Resent-CC: Ola Lundqvist <opal@debian.org> > Resent-Date: Mon, 10 Jul 2006 19:48:54 UTC > Resent-Message-ID: <handler.377707.B.115255997716772@bugs.debian.org> > X-Debian-PR-Message: report 377707 > X-Debian-PR-Package: kernel-patch-openvz > X-Debian-PR-Keywords: > From: Andrew Schulman <andrex@alumni.utexas.net> > To: Debian Bug Tracking System <submit@bugs.debian.org> > X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 > (1.212-2003-09-23-exp) on spohr.debian.org > X-Spam-Level: > X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE, > RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02 > Resent-Sender: Debian BTS <debbugs@bugs.debian.org> > Resent-Date: Mon, 10 Jul 2006 12:49:06 -0700 > X-Spam-Score: 1.0 (+) > X-Spamcheck-provider: Checked for spam by opalsys.net, postmaster@opalsys.net > > Package: kernel-patch-openvz > Version: 026test015-1 > Severity: important > > The supplied patch doesn't apply cleanly to Debian kernel source: > > # cd /usr/src > # rm -rf linux-source-2.6.16 > # tar -jxf linux-source-2.6.16.tar.bz2 > # cd linux-source-2.6.16 > # make-kpkg --added-patches openvz configure > exec make -f /usr/share/kernel-package/ruleset/minimal.mk debian KPKG_SELECTED_PATCHES="openvz" > ====== making target minimal_debian [new prereqs: ]====== > This is kernel package version . > test -d debian || mkdir debian > test ! -e stamp-building || rm -f stamp-building > test -f debian/control || sed -e 's/=V/2.6.16/g' \ > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > -e 's/=SA//g' -e 's/=L/ /g' \ > -e 's/=I//g' \ > -e 's/=CV/2.6/g' \ > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > /usr/share/kernel-package/Control > debian/control > test -f debian/changelog || sed -e 's/=V/2.6.16/g' \ > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ > /usr/share/kernel-package/changelog > debian/changelog > install -p -m 755 /usr/share/kernel-package/rules debian/rules > for file in ChangeLog Control Control.bin86 config templates.in rules; do \ > cp -f /usr/share/kernel-package/$file ./debian/; \ > done > for dir in Config docs examples ruleset scripts pkg po; do \ > cp -af /usr/share/kernel-package/$dir ./debian/; \ > done > test -d ./debian/stamps || mkdir debian/stamps > exec debian/rules KPKG_SELECTED_PATCHES="openvz" configure > > ====== making target CONFIG-common [new prereqs: testdir]====== > > ====== making target debian/stamp-conf [new prereqs: ]====== > # work around idiocy in recent kernel versions > test ! -e scripts/package/builddeb || \ > mv -f scripts/package/builddeb scripts/package/builddeb.dist > test ! -e scripts/package/Makefile || \ > (mv -f scripts/package/Makefile scripts/package/Makefile.dist && \ > (echo "# Dummy file "; echo "help:") > scripts/package/Makefile) > test -d debian || mkdir ./debian > test ! -e stamp-building || rm -f stamp-building > test ! -f ./debian || test -f stamp-debian || test -f debian/official || \ > (rm -rf ./debian && mkdir ./debian) > test ! -f applied_patches || rm -f applied_patches > for patch in /usr/src/kernel-patches/all/apply/openvz ; do \ > if test -x $patch; then \ > if $patch; then \ > echo "Patch $patch processed fine"; \ > echo "$patch" >> applied_patches; \ > else \ > echo "Patch $patch failed."; \ > echo "Hit return to Continue"; \ > read ans; \ > fi; \ > fi; \ > done > START applying openvz patch (OpenVZ kernel patch for virtual server support) > Testing whether "OpenVZ kernel patch for virtual server support" patch for 2.6.16 applies (dry run): > 2 out of 2 hunks FAILED -- saving rejects to file Documentation/dvb/get_dvb_firmware.rej > 1 out of 2 hunks FAILED -- saving rejects to file arch/alpha/kernel/setup.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file arch/alpha/kernel/smp.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file arch/alpha/lib/strncpy.S.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/speedstep-smi.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/dmi_scan.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file arch/i386/kernel/vm86.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/kernel/m32r_ksyms.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file arch/m32r/kernel/setup.c.rej > 7 out of 7 hunks FAILED -- saving rejects to file arch/m32r/kernel/smpboot.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/lib/Makefile.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/kernel/branch.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/mm/c-r4k.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/pci_64.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/setup_64.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_32.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_64.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/platforms/powermac/setup.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/ia32/Makefile.rej > 4 out of 8 hunks FAILED -- saving rejects to file arch/x86_64/kernel/entry.S.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/kernel/pci-gart.c.rej > 2 out of 6 hunks FAILED -- saving rejects to file arch/x86_64/kernel/process.c.rej > 3 out of 7 hunks FAILED -- saving rejects to file arch/x86_64/kernel/traps.c.rej > 3 out of 5 hunks FAILED -- saving rejects to file block/elevator.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file block/genhd.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file block/ll_rw_blk.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/cpu.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/firmware_class.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/node.c.rej > 3 out of 5 hunks FAILED -- saving rejects to file drivers/block/cciss.c.rej > 4 out of 4 hunks FAILED -- saving rejects to file drivers/block/ub.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/agp/efficeon-agp.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/cs5535_gpio.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/ipmi/ipmi_bt_sm.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/pcmcia/cm4000_cs.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/pcmcia/cm4040_cs.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/snsc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/tipar.c.rej > 19 out of 19 hunks FAILED -- saving rejects to file drivers/char/tlclk.c.rej > 2 out of 44 hunks FAILED -- saving rejects to file drivers/char/tty_io.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/edac/Kconfig.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/i2c/busses/scx200_acb.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/i2c/chips/m41t00.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ide/pci/alim15x3.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ieee1394/ohci1394.c.rej > 6 out of 8 hunks FAILED -- saving rejects to file drivers/ieee1394/sbp2.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/input/mouse/psmouse-base.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/macintosh/therm_adt746x.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/md/dm-snap.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file drivers/md/dm.c.rej > 4 out of 5 hunks FAILED -- saving rejects to file drivers/md/kcopyd.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/md/raid10.c.rej > 4 out of 5 hunks FAILED -- saving rejects to file drivers/media/dvb/dvb-usb/cxusb.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/saa7127.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/tuner-types.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/mtd/nand/Kconfig.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/e1000/e1000_main.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/irda/irda-usb.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/tg3.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/via-rhine.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file drivers/net/wireless/Kconfig.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/hostap/hostap_80211_tx.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/wireless/ipw2200.c.rej > 6 out of 6 hunks FAILED -- saving rejects to file drivers/pci/pci-acpi.c.rej > 3 out of 5 hunks FAILED -- saving rejects to file drivers/pci/quirks.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/pcmcia/ds.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-9xxx.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-xxxx.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/libata-core.c.rej > 4 out of 5 hunks FAILED -- saving rejects to file drivers/scsi/sata_mv.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc3.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc4.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/core/message.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-sched.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/console.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/option.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/storage/Kconfig.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/cfbimgblt.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file drivers/video/fbmem.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/i810/i810_main.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file fs/9p/vfs_inode.c.rej > 3 out of 4 hunks FAILED -- saving rejects to file fs/char_dev.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file fs/cifs/cifsencrypt.c.rej > 1 out of 7 hunks FAILED -- saving rejects to file fs/compat.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/fuse/file.c.rej > 8 out of 23 hunks FAILED -- saving rejects to file fs/locks.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs3proc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs4proc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfsproc.c.rej > 3 out of 19 hunks FAILED -- saving rejects to file fs/open.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file fs/partitions/check.c.rej > 4 out of 21 hunks FAILED -- saving rejects to file fs/proc/base.c.rej > 2 out of 14 hunks FAILED -- saving rejects to file fs/proc/proc_misc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/proc/vmcore.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/reiserfs/xattr_acl.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/smbfs/request.c.rej > 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/dir.c.rej > 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/file.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file fs/sysfs/inode.c.rej > 1 out of 3 hunks FAILED -- saving rejects to file fs/sysfs/symlink.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_aops.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_iops.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-generic/pgtable.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/cpufeature.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/i387.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/pgtable.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-m32r/smp.h.rej > 15 out of 16 hunks FAILED -- saving rejects to file include/asm-m32r/uaccess.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/bitops.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/byteorder.h.rej > 4 out of 4 hunks FAILED -- saving rejects to file include/asm-mips/interrupt.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/pgtable.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/r4kcache.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-powerpc/floppy.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-x86_64/cpufeature.h.rej > 2 out of 3 hunks FAILED -- saving rejects to file include/asm-x86_64/i387.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpu.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpumask.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/fb.h.rej > 2 out of 20 hunks FAILED -- saving rejects to file include/linux/fs.h.rej > 1 out of 6 hunks FAILED -- saving rejects to file include/linux/mm.h.rej > 1 out of 2 hunks FAILED -- saving rejects to file include/linux/page-flags.h.rej > 1 out of 7 hunks FAILED -- saving rejects to file include/linux/proc_fs.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/raid/raid1.h.rej > 1 out of 2 hunks FAILED -- saving rejects to file include/linux/rtc.h.rej > 1 out of 3 hunks FAILED -- saving rejects to file include/net/ip.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/net/sctp/sctp.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/net/sctp/structs.h.rej > 1 out of 20 hunks FAILED -- saving rejects to file ipc/shm.c.rej > 1 out of 11 hunks FAILED -- saving rejects to file ipc/util.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file kernel/auditsc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file kernel/exec_domain.c.rej > 1 out of 27 hunks FAILED -- saving rejects to file kernel/exit.c.rej > 1 out of 29 hunks FAILED -- saving rejects to file kernel/fork.c.rej > 3 out of 7 hunks FAILED -- saving rejects to file kernel/posix-cpu-timers.c.rej > 5 out of 8 hunks FAILED -- saving rejects to file kernel/ptrace.c.rej > 5 out of 117 hunks FAILED -- saving rejects to file kernel/sched.c.rej > 2 out of 22 hunks FAILED -- saving rejects to file kernel/signal.c.rej > 1 out of 23 hunks FAILED -- saving rejects to file kernel/sys.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file kernel/uid16.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file mm/mempolicy.c.rej > 8 out of 17 hunks FAILED -- saving rejects to file mm/page_alloc.c.rej > 5 out of 6 hunks FAILED -- saving rejects to file net/atm/clip.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file net/bridge/br_netfilter.c.rej > 1 out of 34 hunks FAILED -- saving rejects to file net/core/dev.c.rej > 1 out of 15 hunks FAILED -- saving rejects to file net/core/sock.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/fib_trie.c.rej > 3 out of 6 hunks FAILED -- saving rejects to file net/ipv4/ip_output.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/arp_tables.c.rej > 1 out of 38 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_core.c.rej > 1 out of 10 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_netlink.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_proto_sctp.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_nat_snmp_basic.c.rej > 1 out of 21 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_tables.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c.rej > 1 out of 24 hunks FAILED -- saving rejects to file net/ipv4/route.c.rej > 1 out of 7 hunks FAILED -- saving rejects to file net/ipv4/tcp_output.c.rej > 1 out of 13 hunks FAILED -- saving rejects to file net/ipv6/netfilter/ip6_tables.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv6/xfrm6_policy.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/nf_conntrack_netlink.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file net/netfilter/nf_conntrack_proto_sctp.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/xt_sctp.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/sctp/inqueue.c.rej > 10 out of 10 hunks FAILED -- saving rejects to file net/sctp/sm_statefuns.c.rej > 3 out of 4 hunks FAILED -- saving rejects to file net/sctp/sm_statetable.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file net/sctp/ulpqueue.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file security/keys/keyring.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/mls.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/services.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file sound/isa/opti9xx/opti92x-ad1848.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/oss/dmasound/tas_common.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/pci/hda/patch_realtek.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/daca.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/tumbler.c.rej > "OpenVZ kernel patch for virtual server support" patch for 2.6.16 does not apply cleanly > Patch /usr/src/kernel-patches/all/apply/openvz failed. > Hit return to Continue > <snip> > > -- System Information: > Debian Release: testing/unstable > APT prefers testing > APT policy: (990, 'testing'), (300, 'unstable'), (200, 'stable') > Architecture: amd64 (x86_64) > Shell: /bin/sh linked to /bin/bash > Kernel: Linux 2.6.16 > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) > > Versions of packages kernel-patch-openvz depends on: > ii bash 3.1-4 The GNU Bourne Again SHell > ii grep-dctrl 2.9.0 Grep Debian package information - > ii patch 2.5.9-4 Apply a diff file to an original > > kernel-patch-openvz recommends no packages. > > -- no debconf information > > > > ----- End forwarded message ----- > >
Hi On Fri, Jul 14, 2006 at 12:56:15AM +0400, Kir Kolyshkin wrote: > Where can we get the differences from "vanilla" 2.6.16 to Debian's 2.6.16? ftp://ftp.se.debian.org/debian/pool/main/l/linux-2.6.16 The best way is to install the linux-source-2.6.16_2.6.16-16_all.deb pacakge, unpack the /usr/src/linux-2.6.16.tar.bz2 file, and diff the tree against the vanilla kernel. However I think the following file in that directory give the same output: linux-2.6.16_2.6.16-16.diff.gz Regards, // Ola > Ola Lundqvist wrote: > > forwarded 377707 devel@openvz.org > > tags 377707 + upstream > > thanks > > > > Hi > > > > I have got the following bugreport and it seems that the patch provided do not > > apply cleanly against the Debian kernel. Can you help me with this? > > > > Regards, > > > > // Ola > > > > ----- Forwarded message from Andrew Schulman <andrex@alumni.utexas.net> ----- > > > > Envelope-to: ola@opalsys.net > > Delivery-date: Mon, 10 Jul 2006 21:52:54 +0200 > > Subject: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linux-source-2.6.16 > > Reply-To: Andrew Schulman <andrex@alumni.utexas.net>, > > 377707@bugs.debian.org > > Resent-From: Andrew Schulman <andrex@alumni.utexas.net> > > Resent-To: debian-bugs-dist@lists.debian.org > > Resent-CC: Ola Lundqvist <opal@debian.org> > > Resent-Date: Mon, 10 Jul 2006 19:48:54 UTC > > Resent-Message-ID: <handler.377707.B.115255997716772@bugs.debian.org> > > X-Debian-PR-Message: report 377707 > > X-Debian-PR-Package: kernel-patch-openvz > > X-Debian-PR-Keywords: > > From: Andrew Schulman <andrex@alumni.utexas.net> > > To: Debian Bug Tracking System <submit@bugs.debian.org> > > X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 > > (1.212-2003-09-23-exp) on spohr.debian.org > > X-Spam-Level: > > X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE, > > RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02 > > Resent-Sender: Debian BTS <debbugs@bugs.debian.org> > > Resent-Date: Mon, 10 Jul 2006 12:49:06 -0700 > > X-Spam-Score: 1.0 (+) > > X-Spamcheck-provider: Checked for spam by opalsys.net, postmaster@opalsys.net > > > > Package: kernel-patch-openvz > > Version: 026test015-1 > > Severity: important > > > > The supplied patch doesn't apply cleanly to Debian kernel source: > > > > # cd /usr/src > > # rm -rf linux-source-2.6.16 > > # tar -jxf linux-source-2.6.16.tar.bz2 > > # cd linux-source-2.6.16 > > # make-kpkg --added-patches openvz configure > > exec make -f /usr/share/kernel-package/ruleset/minimal.mk debian KPKG_SELECTED_PATCHES="openvz" > > ====== making target minimal_debian [new prereqs: ]====== > > This is kernel package version . > > test -d debian || mkdir debian > > test ! -e stamp-building || rm -f stamp-building > > test -f debian/control || sed -e 's/=V/2.6.16/g' \ > > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > > -e 's/=SA//g' -e 's/=L/ /g' \ > > -e 's/=I//g' \ > > -e 's/=CV/2.6/g' \ > > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ > > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > > /usr/share/kernel-package/Control > debian/control > > test -f debian/changelog || sed -e 's/=V/2.6.16/g' \ > > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ > > /usr/share/kernel-package/changelog > debian/changelog > > install -p -m 755 /usr/share/kernel-package/rules debian/rules > > for file in ChangeLog Control Control.bin86 config templates.in rules; do \ > > cp -f /usr/share/kernel-package/$file ./debian/; \ > > done > > for dir in Config docs examples ruleset scripts pkg po; do \ > > cp -af /usr/share/kernel-package/$dir ./debian/; \ > > done > > test -d ./debian/stamps || mkdir debian/stamps > > exec debian/rules KPKG_SELECTED_PATCHES="openvz" configure > > > > ====== making target CONFIG-common [new prereqs: testdir]====== > > > > ====== making target debian/stamp-conf [new prereqs: ]====== > > # work around idiocy in recent kernel versions > > test ! -e scripts/package/builddeb || \ > > mv -f scripts/package/builddeb scripts/package/builddeb.dist > > test ! -e scripts/package/Makefile || \ > > (mv -f scripts/package/Makefile scripts/package/Makefile.dist && \ > > (echo "# Dummy file "; echo "help:") > scripts/package/Makefile) > > test -d debian || mkdir ./debian > > test ! -e stamp-building || rm -f stamp-building > > test ! -f ./debian || test -f stamp-debian || test -f debian/official || \ > > (rm -rf ./debian && mkdir ./debian) > > test ! -f applied_patches || rm -f applied_patches > > for patch in /usr/src/kernel-patches/all/apply/openvz ; do \ > > if test -x $patch; then \ > > if $patch; then \ > > echo "Patch $patch processed fine"; \ > > echo "$patch" >> applied_patches; \ > > else \ > > echo "Patch $patch failed."; \ > > echo "Hit return to Continue"; \ > > read ans; \ > > fi; \ > > fi; \ > > done > > START applying openvz patch (OpenVZ kernel patch for virtual server support) > > Testing whether "OpenVZ kernel patch for virtual server support" patch for 2.6.16 applies (dry run): > > 2 out of 2 hunks FAILED -- saving rejects to file Documentation/dvb/get_dvb_firmware.rej > > 1 out of 2 hunks FAILED -- saving rejects to file arch/alpha/kernel/setup.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file arch/alpha/kernel/smp.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file arch/alpha/lib/strncpy.S.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/speedstep-smi.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/dmi_scan.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file arch/i386/kernel/vm86.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/kernel/m32r_ksyms.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file arch/m32r/kernel/setup.c.rej > > 7 out of 7 hunks FAILED -- saving rejects to file arch/m32r/kernel/smpboot.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/lib/Makefile.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/kernel/branch.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/mm/c-r4k.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/pci_64.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/setup_64.c.rej > > 2 out of 3 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_32.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_64.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/platforms/powermac/setup.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/ia32/Makefile.rej > > 4 out of 8 hunks FAILED -- saving rejects to file arch/x86_64/kernel/entry.S.rej > > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/kernel/pci-gart.c.rej > > 2 out of 6 hunks FAILED -- saving rejects to file arch/x86_64/kernel/process.c.rej > > 3 out of 7 hunks FAILED -- saving rejects to file arch/x86_64/kernel/traps.c.rej > > 3 out of 5 hunks FAILED -- saving rejects to file block/elevator.c.rej > > 2 out of 3 hunks FAILED -- saving rejects to file block/genhd.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file block/ll_rw_blk.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/cpu.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/firmware_class.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/node.c.rej > > 3 out of 5 hunks FAILED -- saving rejects to file drivers/block/cciss.c.rej > > 4 out of 4 hunks FAILED -- saving rejects to file drivers/block/ub.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/agp/efficeon-agp.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/cs5535_gpio.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/ipmi/ipmi_bt_sm.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/pcmcia/cm4000_cs.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/pcmcia/cm4040_cs.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/snsc.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/tipar.c.rej > > 19 out of 19 hunks FAILED -- saving rejects to file drivers/char/tlclk.c.rej > > 2 out of 44 hunks FAILED -- saving rejects to file drivers/char/tty_io.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/edac/Kconfig.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/i2c/busses/scx200_acb.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/i2c/chips/m41t00.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ide/pci/alim15x3.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ieee1394/ohci1394.c.rej > > 6 out of 8 hunks FAILED -- saving rejects to file drivers/ieee1394/sbp2.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/input/mouse/psmouse-base.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/macintosh/therm_adt746x.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/md/dm-snap.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file drivers/md/dm.c.rej > > 4 out of 5 hunks FAILED -- saving rejects to file drivers/md/kcopyd.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/md/raid10.c.rej > > 4 out of 5 hunks FAILED -- saving rejects to file drivers/media/dvb/dvb-usb/cxusb.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/saa7127.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/tuner-types.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/mtd/nand/Kconfig.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/e1000/e1000_main.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/irda/irda-usb.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/tg3.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/via-rhine.c.rej > > 2 out of 3 hunks FAILED -- saving rejects to file drivers/net/wireless/Kconfig.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/hostap/hostap_80211_tx.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/wireless/ipw2200.c.rej > > 6 out of 6 hunks FAILED -- saving rejects to file drivers/pci/pci-acpi.c.rej > > 3 out of 5 hunks FAILED -- saving rejects to file drivers/pci/quirks.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/pcmcia/ds.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-9xxx.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-xxxx.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/libata-core.c.rej > > 4 out of 5 hunks FAILED -- saving rejects to file drivers/scsi/sata_mv.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc3.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc4.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/core/message.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-sched.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/console.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/option.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/storage/Kconfig.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/cfbimgblt.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file drivers/video/fbmem.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/i810/i810_main.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file fs/9p/vfs_inode.c.rej > > 3 out of 4 hunks FAILED -- saving rejects to file fs/char_dev.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file fs/cifs/cifsencrypt.c.rej > > 1 out of 7 hunks FAILED -- saving rejects to file fs/compat.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/fuse/file.c.rej > > 8 out of 23 hunks FAILED -- saving rejects to file fs/locks.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs3proc.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs4proc.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfsproc.c.rej > > 3 out of 19 hunks FAILED -- saving rejects to file fs/open.c.rej > > 2 out of 3 hunks FAILED -- saving rejects to file fs/partitions/check.c.rej > > 4 out of 21 hunks FAILED -- saving rejects to file fs/proc/base.c.rej > > 2 out of 14 hunks FAILED -- saving rejects to file fs/proc/proc_misc.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/proc/vmcore.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/reiserfs/xattr_acl.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/smbfs/request.c.rej > > 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/dir.c.rej > > 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/file.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file fs/sysfs/inode.c.rej > > 1 out of 3 hunks FAILED -- saving rejects to file fs/sysfs/symlink.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_aops.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_iops.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-generic/pgtable.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/cpufeature.h.rej > > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/i387.h.rej > > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/pgtable.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-m32r/smp.h.rej > > 15 out of 16 hunks FAILED -- saving rejects to file include/asm-m32r/uaccess.h.rej > > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/bitops.h.rej > > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/byteorder.h.rej > > 4 out of 4 hunks FAILED -- saving rejects to file include/asm-mips/interrupt.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/pgtable.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/r4kcache.h.rej > > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-powerpc/floppy.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-x86_64/cpufeature.h.rej > > 2 out of 3 hunks FAILED -- saving rejects to file include/asm-x86_64/i387.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpu.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpumask.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/fb.h.rej > > 2 out of 20 hunks FAILED -- saving rejects to file include/linux/fs.h.rej > > 1 out of 6 hunks FAILED -- saving rejects to file include/linux/mm.h.rej > > 1 out of 2 hunks FAILED -- saving rejects to file include/linux/page-flags.h.rej > > 1 out of 7 hunks FAILED -- saving rejects to file include/linux/proc_fs.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/raid/raid1.h.rej > > 1 out of 2 hunks FAILED -- saving rejects to file include/linux/rtc.h.rej > > 1 out of 3 hunks FAILED -- saving rejects to file include/net/ip.h.rej > > 2 out of 2 hunks FAILED -- saving rejects to file include/net/sctp/sctp.h.rej > > 1 out of 1 hunk FAILED -- saving rejects to file include/net/sctp/structs.h.rej > > 1 out of 20 hunks FAILED -- saving rejects to file ipc/shm.c.rej > > 1 out of 11 hunks FAILED -- saving rejects to file ipc/util.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file kernel/auditsc.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file kernel/exec_domain.c.rej > > 1 out of 27 hunks FAILED -- saving rejects to file kernel/exit.c.rej > > 1 out of 29 hunks FAILED -- saving rejects to file kernel/fork.c.rej > > 3 out of 7 hunks FAILED -- saving rejects to file kernel/posix-cpu-timers.c.rej > > 5 out of 8 hunks FAILED -- saving rejects to file kernel/ptrace.c.rej > > 5 out of 117 hunks FAILED -- saving rejects to file kernel/sched.c.rej > > 2 out of 22 hunks FAILED -- saving rejects to file kernel/signal.c.rej > > 1 out of 23 hunks FAILED -- saving rejects to file kernel/sys.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file kernel/uid16.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file mm/mempolicy.c.rej > > 8 out of 17 hunks FAILED -- saving rejects to file mm/page_alloc.c.rej > > 5 out of 6 hunks FAILED -- saving rejects to file net/atm/clip.c.rej > > 2 out of 3 hunks FAILED -- saving rejects to file net/bridge/br_netfilter.c.rej > > 1 out of 34 hunks FAILED -- saving rejects to file net/core/dev.c.rej > > 1 out of 15 hunks FAILED -- saving rejects to file net/core/sock.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/fib_trie.c.rej > > 3 out of 6 hunks FAILED -- saving rejects to file net/ipv4/ip_output.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/arp_tables.c.rej > > 1 out of 38 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_core.c.rej > > 1 out of 10 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_netlink.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_proto_sctp.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_nat_snmp_basic.c.rej > > 1 out of 21 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_tables.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c.rej > > 1 out of 24 hunks FAILED -- saving rejects to file net/ipv4/route.c.rej > > 1 out of 7 hunks FAILED -- saving rejects to file net/ipv4/tcp_output.c.rej > > 1 out of 13 hunks FAILED -- saving rejects to file net/ipv6/netfilter/ip6_tables.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv6/xfrm6_policy.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/nf_conntrack_netlink.c.rej > > 1 out of 2 hunks FAILED -- saving rejects to file net/netfilter/nf_conntrack_proto_sctp.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/xt_sctp.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file net/sctp/inqueue.c.rej > > 10 out of 10 hunks FAILED -- saving rejects to file net/sctp/sm_statefuns.c.rej > > 3 out of 4 hunks FAILED -- saving rejects to file net/sctp/sm_statetable.c.rej > > 2 out of 2 hunks FAILED -- saving rejects to file net/sctp/ulpqueue.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file security/keys/keyring.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/mls.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/services.c.rej > > 3 out of 3 hunks FAILED -- saving rejects to file sound/isa/opti9xx/opti92x-ad1848.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file sound/oss/dmasound/tas_common.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file sound/pci/hda/patch_realtek.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/daca.c.rej > > 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/tumbler.c.rej > > "OpenVZ kernel patch for virtual server support" patch for 2.6.16 does not apply cleanly > > Patch /usr/src/kernel-patches/all/apply/openvz failed. > > Hit return to Continue > > <snip> > > > > -- System Information: > > Debian Release: testing/unstable > > APT prefers testing > > APT policy: (990, 'testing'), (300, 'unstable'), (200, 'stable') > > Architecture: amd64 (x86_64) > > Shell: /bin/sh linked to /bin/bash > > Kernel: Linux 2.6.16 > > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) > > > > Versions of packages kernel-patch-openvz depends on: > > ii bash 3.1-4 The GNU Bourne Again SHell > > ii grep-dctrl 2.9.0 Grep Debian package information - > > ii patch 2.5.9-4 Apply a diff file to an original > > > > kernel-patch-openvz recommends no packages. > > > > -- no debconf information > > > > > > > > ----- End forwarded message ----- > > > > > > -- --------------------- Ola Lundqvist --------------------------- / opal@debian.org Annebergsslingan 37 \ | opal@lysator.liu.se 654 65 KARLSTAD | | +46 (0)54-10 14 30 +46 (0)70-332 1551 | | http://www.opal.dhs.org UIN/icq: 4912500 | \ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 / ------------------------------------------------------------ ---
Re: [andrex@alumni.utexas.net: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian lin
It's not quite clear from the logs, but the answer probably is: OVZ kernel patches should be applied on _mainstream_ 2.6.16 kernel (not 2.6.16.x, nor debian 2.6.16). real debian 2.6.16 + OVZ patches will be provided a bit later. Thanks, Kirill > forwarded 377707 devel@openvz.org > tags 377707 + upstream > thanks > > Hi > > I have got the following bugreport and it seems that the patch provided do not > apply cleanly against the Debian kernel. Can you help me with this? > > Regards, > > // Ola > > ----- Forwarded message from Andrew Schulman <andrex@alumni.utexas.net> ----- > > Envelope-to: ola@opalsys.net > Delivery-date: Mon, 10 Jul 2006 21:52:54 +0200 > Subject: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian linux-source-2.6.16 > Reply-To: Andrew Schulman <andrex@alumni.utexas.net>, > 377707@bugs.debian.org > Resent-From: Andrew Schulman <andrex@alumni.utexas.net> > Resent-To: debian-bugs-dist@lists.debian.org > Resent-CC: Ola Lundqvist <opal@debian.org> > Resent-Date: Mon, 10 Jul 2006 19:48:54 UTC > Resent-Message-ID: <handler.377707.B.115255997716772@bugs.debian.org> > X-Debian-PR-Message: report 377707 > X-Debian-PR-Package: kernel-patch-openvz > X-Debian-PR-Keywords: > From: Andrew Schulman <andrex@alumni.utexas.net> > To: Debian Bug Tracking System <submit@bugs.debian.org> > X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 > (1.212-2003-09-23-exp) on spohr.debian.org > X-Spam-Level: > X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE, > RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02 > Resent-Sender: Debian BTS <debbugs@bugs.debian.org> > Resent-Date: Mon, 10 Jul 2006 12:49:06 -0700 > X-Spam-Score: 1.0 (+) > X-Spamcheck-provider: Checked for spam by opalsys.net, postmaster@opalsys.net > > Package: kernel-patch-openvz > Version: 026test015-1 > Severity: important > > The supplied patch doesn't apply cleanly to Debian kernel source: > > # cd /usr/src > # rm -rf linux-source-2.6.16 > # tar -jxf linux-source-2.6.16.tar.bz2 > # cd linux-source-2.6.16 > # make-kpkg --added-patches openvz configure > exec make -f /usr/share/kernel-package/ruleset/minimal.mk debian KPKG_SELECTED_PATCHES="openvz" > ====== making target minimal_debian [new prereqs: ]====== > This is kernel package version . > test -d debian || mkdir debian > test ! -e stamp-building || rm -f stamp-building > test -f debian/control || sed -e 's/=V/2.6.16/g' \ > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > -e 's/=SA//g' -e 's/=L/ /g' \ > -e 's/=I//g' \ > -e 's/=CV/2.6/g' \ > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > /usr/share/kernel-package/Control > debian/control > test -f debian/changelog || sed -e 's/=V/2.6.16/g' \ > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' \ > /usr/share/kernel-package/changelog > debian/changelog > install -p -m 755 /usr/share/kernel-package/rules debian/rules > for file in ChangeLog Control Control.bin86 config templates.in rules; do \ > cp -f /usr/share/kernel-package/$file ./debian/; \ > done > for dir in Config docs examples ruleset scripts pkg po; do \ > cp -af /usr/share/kernel-package/$dir ./debian/; \ > done > test -d ./debian/stamps || mkdir debian/stamps > exec debian/rules KPKG_SELECTED_PATCHES="openvz" configure > > ====== making target CONFIG-common [new prereqs: testdir]====== > > ====== making target debian/stamp-conf [new prereqs: ]====== > # work around idiocy in recent kernel versions > test ! -e scripts/package/builddeb || \ > mv -f scripts/package/builddeb scripts/package/builddeb.dist > test ! -e scripts/package/Makefile || \ > (mv -f scripts/package/Makefile scripts/package/Makefile.dist && \ > (echo "# Dummy file "; echo "help:") > scripts/package/Makefile) > test -d debian || mkdir ./debian > test ! -e stamp-building || rm -f stamp-building > test ! -f ./debian || test -f stamp-debian || test -f debian/official || \ > (rm -rf ./debian && mkdir ./debian) > test ! -f applied_patches || rm -f applied_patches > for patch in /usr/src/kernel-patches/all/apply/openvz ; do \ > if test -x $patch; then \ > if $patch; then \ > echo "Patch $patch processed fine"; \ > echo "$patch" >> applied_patches; \ > else \ > echo "Patch $patch failed."; \ > echo "Hit return to Continue"; \ > read ans; \ > fi; \ > fi; \ > done > START applying openvz patch (OpenVZ kernel patch for virtual server support) > Testing whether "OpenVZ kernel patch for virtual server support" patch for 2.6.16 applies (dry run): > 2 out of 2 hunks FAILED -- saving rejects to file Documentation/dvb/get_dvb_firmware.rej > 1 out of 2 hunks FAILED -- saving rejects to file arch/alpha/kernel/setup.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file arch/alpha/kernel/smp.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file arch/alpha/lib/strncpy.S.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/cpu/cpufreq/speedstep-smi.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/dmi_scan.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file arch/i386/kernel/vm86.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/kernel/m32r_ksyms.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file arch/m32r/kernel/setup.c.rej > 7 out of 7 hunks FAILED -- saving rejects to file arch/m32r/kernel/smpboot.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/lib/Makefile.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/kernel/branch.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/mips/mm/c-r4k.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/pci_64.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/kernel/setup_64.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_32.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file arch/powerpc/kernel/signal_64.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/powerpc/platforms/powermac/setup.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/ia32/Makefile.rej > 4 out of 8 hunks FAILED -- saving rejects to file arch/x86_64/kernel/entry.S.rej > 1 out of 1 hunk FAILED -- saving rejects to file arch/x86_64/kernel/pci-gart.c.rej > 2 out of 6 hunks FAILED -- saving rejects to file arch/x86_64/kernel/process.c.rej > 3 out of 7 hunks FAILED -- saving rejects to file arch/x86_64/kernel/traps.c.rej > 3 out of 5 hunks FAILED -- saving rejects to file block/elevator.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file block/genhd.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file block/ll_rw_blk.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/cpu.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/firmware_class.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/base/node.c.rej > 3 out of 5 hunks FAILED -- saving rejects to file drivers/block/cciss.c.rej > 4 out of 4 hunks FAILED -- saving rejects to file drivers/block/ub.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/agp/efficeon-agp.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/cs5535_gpio.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/ipmi/ipmi_bt_sm.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file drivers/char/pcmcia/cm4000_cs.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/pcmcia/cm4040_cs.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/snsc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/char/tipar.c.rej > 19 out of 19 hunks FAILED -- saving rejects to file drivers/char/tlclk.c.rej > 2 out of 44 hunks FAILED -- saving rejects to file drivers/char/tty_io.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/edac/Kconfig.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/i2c/busses/scx200_acb.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/i2c/chips/m41t00.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ide/pci/alim15x3.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/ieee1394/ohci1394.c.rej > 6 out of 8 hunks FAILED -- saving rejects to file drivers/ieee1394/sbp2.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/input/mouse/psmouse-base.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/macintosh/therm_adt746x.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/md/dm-snap.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file drivers/md/dm.c.rej > 4 out of 5 hunks FAILED -- saving rejects to file drivers/md/kcopyd.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/md/raid10.c.rej > 4 out of 5 hunks FAILED -- saving rejects to file drivers/media/dvb/dvb-usb/cxusb.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/saa7127.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/media/video/tuner-types.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/mtd/nand/Kconfig.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/e1000/e1000_main.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/irda/irda-usb.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/tg3.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/via-rhine.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file drivers/net/wireless/Kconfig.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/net/wireless/hostap/hostap_80211_tx.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/net/wireless/ipw2200.c.rej > 6 out of 6 hunks FAILED -- saving rejects to file drivers/pci/pci-acpi.c.rej > 3 out of 5 hunks FAILED -- saving rejects to file drivers/pci/quirks.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/pcmcia/ds.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-9xxx.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file drivers/scsi/3w-xxxx.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/scsi/libata-core.c.rej > 4 out of 5 hunks FAILED -- saving rejects to file drivers/scsi/sata_mv.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc3.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc4.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/core/message.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file drivers/usb/host/ehci-sched.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/console.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/serial/option.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/usb/storage/Kconfig.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/cfbimgblt.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file drivers/video/fbmem.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file drivers/video/i810/i810_main.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file fs/9p/vfs_inode.c.rej > 3 out of 4 hunks FAILED -- saving rejects to file fs/char_dev.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file fs/cifs/cifsencrypt.c.rej > 1 out of 7 hunks FAILED -- saving rejects to file fs/compat.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/fuse/file.c.rej > 8 out of 23 hunks FAILED -- saving rejects to file fs/locks.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs3proc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs4proc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfsproc.c.rej > 3 out of 19 hunks FAILED -- saving rejects to file fs/open.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file fs/partitions/check.c.rej > 4 out of 21 hunks FAILED -- saving rejects to file fs/proc/base.c.rej > 2 out of 14 hunks FAILED -- saving rejects to file fs/proc/proc_misc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/proc/vmcore.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/reiserfs/xattr_acl.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/smbfs/request.c.rej > 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/dir.c.rej > 1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/file.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file fs/sysfs/inode.c.rej > 1 out of 3 hunks FAILED -- saving rejects to file fs/sysfs/symlink.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_aops.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file fs/xfs/linux-2.6/xfs_iops.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-generic/pgtable.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-i386/cpufeature.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/i387.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-i386/pgtable.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-m32r/smp.h.rej > 15 out of 16 hunks FAILED -- saving rejects to file include/asm-m32r/uaccess.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/bitops.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-mips/byteorder.h.rej > 4 out of 4 hunks FAILED -- saving rejects to file include/asm-mips/interrupt.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/pgtable.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-mips/r4kcache.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/asm-powerpc/floppy.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/asm-x86_64/cpufeature.h.rej > 2 out of 3 hunks FAILED -- saving rejects to file include/asm-x86_64/i387.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpu.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpumask.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/fb.h.rej > 2 out of 20 hunks FAILED -- saving rejects to file include/linux/fs.h.rej > 1 out of 6 hunks FAILED -- saving rejects to file include/linux/mm.h.rej > 1 out of 2 hunks FAILED -- saving rejects to file include/linux/page-flags.h.rej > 1 out of 7 hunks FAILED -- saving rejects to file include/linux/proc_fs.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/linux/raid/raid1.h.rej > 1 out of 2 hunks FAILED -- saving rejects to file include/linux/rtc.h.rej > 1 out of 3 hunks FAILED -- saving rejects to file include/net/ip.h.rej > 2 out of 2 hunks FAILED -- saving rejects to file include/net/sctp/sctp.h.rej > 1 out of 1 hunk FAILED -- saving rejects to file include/net/sctp/structs.h.rej > 1 out of 20 hunks FAILED -- saving rejects to file ipc/shm.c.rej > 1 out of 11 hunks FAILED -- saving rejects to file ipc/util.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file kernel/auditsc.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file kernel/exec_domain.c.rej > 1 out of 27 hunks FAILED -- saving rejects to file kernel/exit.c.rej > 1 out of 29 hunks FAILED -- saving rejects to file kernel/fork.c.rej > 3 out of 7 hunks FAILED -- saving rejects to file kernel/posix-cpu-timers.c.rej > 5 out of 8 hunks FAILED -- saving rejects to file kernel/ptrace.c.rej > 5 out of 117 hunks FAILED -- saving rejects to file kernel/sched.c.rej > 2 out of 22 hunks FAILED -- saving rejects to file kernel/signal.c.rej > 1 out of 23 hunks FAILED -- saving rejects to file kernel/sys.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file kernel/uid16.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file mm/mempolicy.c.rej > 8 out of 17 hunks FAILED -- saving rejects to file mm/page_alloc.c.rej > 5 out of 6 hunks FAILED -- saving rejects to file net/atm/clip.c.rej > 2 out of 3 hunks FAILED -- saving rejects to file net/bridge/br_netfilter.c.rej > 1 out of 34 hunks FAILED -- saving rejects to file net/core/dev.c.rej > 1 out of 15 hunks FAILED -- saving rejects to file net/core/sock.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/fib_trie.c.rej > 3 out of 6 hunks FAILED -- saving rejects to file net/ipv4/ip_output.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/arp_tables.c.rej > 1 out of 38 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_core.c.rej > 1 out of 10 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_netlink.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_conntrack_proto_sctp.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_nat_snmp_basic.c.rej > 1 out of 21 hunks FAILED -- saving rejects to file net/ipv4/netfilter/ip_tables.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c.rej > 1 out of 24 hunks FAILED -- saving rejects to file net/ipv4/route.c.rej > 1 out of 7 hunks FAILED -- saving rejects to file net/ipv4/tcp_output.c.rej > 1 out of 13 hunks FAILED -- saving rejects to file net/ipv6/netfilter/ip6_tables.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/ipv6/xfrm6_policy.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/nf_conntrack_netlink.c.rej > 1 out of 2 hunks FAILED -- saving rejects to file net/netfilter/nf_conntrack_proto_sctp.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/netfilter/xt_sctp.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file net/sctp/inqueue.c.rej > 10 out of 10 hunks FAILED -- saving rejects to file net/sctp/sm_statefuns.c.rej > 3 out of 4 hunks FAILED -- saving rejects to file net/sctp/sm_statetable.c.rej > 2 out of 2 hunks FAILED -- saving rejects to file net/sctp/ulpqueue.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file security/keys/keyring.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/mls.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file security/selinux/ss/services.c.rej > 3 out of 3 hunks FAILED -- saving rejects to file sound/isa/opti9xx/opti92x-ad1848.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/oss/dmasound/tas_common.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/pci/hda/patch_realtek.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/daca.c.rej > 1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/tumbler.c.rej > "OpenVZ kernel patch for virtual server support" patch for 2.6.16 does not apply cleanly > Patch /usr/src/kernel-patches/all/apply/openvz failed. > Hit return to Continue > <snip> > > -- System Information: > Debian Release: testing/unstable > APT prefers testing > APT policy: (990, 'testing'), (300, 'unstable'), (200, 'stable') > Architecture: amd64 (x86_64) > Shell: /bin/sh linked to /bin/bash > Kernel: Linux 2.6.16 > Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) > > Versions of packages kernel-patch-openvz depends on: > ii bash 3.1-4 The GNU Bourne Again SHell > ii grep-dctrl 2.9.0 Grep Debian package information - > ii patch 2.5.9-4 Apply a diff file to an original > > kernel-patch-openvz recommends no packages. > > -- no debconf information > > > > ----- End forwarded message ----- >
Hi On Fri, Jul 14, 2006 at 01:45:53PM +0400, Kirill Korotaev wrote: > It's not quite clear from the logs, but the answer probably is: > OVZ kernel patches should be applied on _mainstream_ 2.6.16 kernel (not > 2.6.16.x, nor debian 2.6.16). > > real debian 2.6.16 + OVZ patches will be provided a bit later. Ok, thanks. // Ola > Thanks, > Kirill > > >forwarded 377707 devel@openvz.org > >tags 377707 + upstream > >thanks > > > >Hi > > > >I have got the following bugreport and it seems that the patch provided do > >not > >apply cleanly against the Debian kernel. Can you help me with this? > > > >Regards, > > > >// Ola > > > >----- Forwarded message from Andrew Schulman <andrex@alumni.utexas.net> > >----- > > > >Envelope-to: ola@opalsys.net > >Delivery-date: Mon, 10 Jul 2006 21:52:54 +0200 > >Subject: Bug#377707: kernel-patch-openvz: doesn't apply cleanly to Debian > >linux-source-2.6.16 > >Reply-To: Andrew Schulman <andrex@alumni.utexas.net>, > > 377707@bugs.debian.org > >Resent-From: Andrew Schulman <andrex@alumni.utexas.net> > >Resent-To: debian-bugs-dist@lists.debian.org > >Resent-CC: Ola Lundqvist <opal@debian.org> > >Resent-Date: Mon, 10 Jul 2006 19:48:54 UTC > >Resent-Message-ID: <handler.377707.B.115255997716772@bugs.debian.org> > >X-Debian-PR-Message: report 377707 > >X-Debian-PR-Package: kernel-patch-openvz > >X-Debian-PR-Keywords: > >From: Andrew Schulman <andrex@alumni.utexas.net> > >To: Debian Bug Tracking System <submit@bugs.debian.org> > >X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2005_01_02 > > (1.212-2003-09-23-exp) on spohr.debian.org > >X-Spam-Level: > >X-Spam-Status: No, hits=-7.0 required=4.0 tests=BAYES_00,HAS_PACKAGE, > > RCVD_IN_SORBS autolearn=no version=2.60-bugs.debian.org_2005_01_02 > >Resent-Sender: Debian BTS <debbugs@bugs.debian.org> > >Resent-Date: Mon, 10 Jul 2006 12:49:06 -0700 > >X-Spam-Score: 1.0 (+) > >X-Spamcheck-provider: Checked for spam by opalsys.net, > >postmaster@opalsys.net > > > >Package: kernel-patch-openvz > >Version: 026test015-1 > >Severity: important > > > >The supplied patch doesn't apply cleanly to Debian kernel source: > > > ># cd /usr/src > ># rm -rf linux-source-2.6.16 > ># tar -jxf linux-source-2.6.16.tar.bz2 > ># cd linux-source-2.6.16 > ># make-kpkg --added-patches openvz configure > >exec make -f /usr/share/kernel-package/ruleset/minimal.mk debian > >KPKG_SELECTED_PATCHES="openvz" ====== making target minimal_debian [new > >prereqs: ]====== > >This is kernel package version . > >test -d debian || mkdir debian > >test ! -e stamp-building || rm -f stamp-building > >test -f debian/control || sed -e 's/=V/2.6.16/g' \ > > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' > > \ > > -e 's/=SA//g' -e 's/=L/ /g' \ > > -e 's/=I//g' \ > > -e 's/=CV/2.6/g' \ > > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' > > \ > > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > > /usr/share/kernel-package/Control > debian/control > >test -f debian/changelog || sed -e 's/=V/2.6.16/g' \ > > -e 's/=D/2.6.16-10.00.Custom/g' -e 's/=A/amd64/g' \ > > -e 's/=ST/linux/g' -e 's/=B/x86_64/g' \ > > -e 's/=M/Andrew Schulman <andrex@alumni.utexas.net>/g' > > \ > > /usr/share/kernel-package/changelog > debian/changelog > >install -p -m 755 /usr/share/kernel-package/rules debian/rules > >for file in ChangeLog Control Control.bin86 config templates.in rules; > >do \ > > cp -f /usr/share/kernel-package/$file ./debian/; > > \ > > done > >for dir in Config docs examples ruleset scripts pkg po; do > >\ > > cp -af /usr/share/kernel-package/$dir ./debian/; > > \ > > done > >test -d ./debian/stamps || mkdir debian/stamps > >exec debian/rules KPKG_SELECTED_PATCHES="openvz" configure > > > >====== making target CONFIG-common [new prereqs: testdir]====== > > > >====== making target debian/stamp-conf [new prereqs: ]====== > ># work around idiocy in recent kernel versions > >test ! -e scripts/package/builddeb || \ > > mv -f scripts/package/builddeb scripts/package/builddeb.dist > >test ! -e scripts/package/Makefile || \ > > (mv -f scripts/package/Makefile scripts/package/Makefile.dist > > && \ > > (echo "# Dummy file "; echo "help:") > > > scripts/package/Makefile) > >test -d debian || mkdir ./debian > >test ! -e stamp-building || rm -f stamp-building > >test ! -f ./debian || test -f stamp-debian || test -f debian/official || \ > > (rm -rf ./debian && mkdir ./debian) > >test ! -f applied_patches || rm -f applied_patches > >for patch in /usr/src/kernel-patches/all/apply/openvz ; do \ > > if test -x $patch; then \ > > if $patch; then \ > > echo "Patch $patch processed fine"; \ > > echo "$patch" >> applied_patches; \ > > else \ > > echo "Patch $patch failed."; \ > > echo "Hit return to Continue"; \ > > read ans; \ > > fi; \ > > fi; \ > > done > >START applying openvz patch (OpenVZ kernel patch for virtual server > >support) > >Testing whether "OpenVZ kernel patch for virtual server support" patch for > >2.6.16 applies (dry run): > >2 out of 2 hunks FAILED -- saving rejects to file > >Documentation/dvb/get_dvb_firmware.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >arch/alpha/kernel/setup.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file > >arch/alpha/kernel/smp.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >arch/alpha/lib/strncpy.S.rej > >1 out of 1 hunk FAILED -- saving rejects to file arch/i386/kernel/apm.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/i386/kernel/cpu/cpufreq/speedstep-smi.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/i386/kernel/dmi_scan.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file > >arch/i386/kernel/vm86.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/m32r/kernel/m32r_ksyms.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file > >arch/m32r/kernel/setup.c.rej > >7 out of 7 hunks FAILED -- saving rejects to file > >arch/m32r/kernel/smpboot.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file arch/m32r/lib/Makefile.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/mips/kernel/branch.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file arch/mips/mm/c-r4k.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/powerpc/kernel/pci_64.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/powerpc/kernel/setup_64.c.rej > >2 out of 3 hunks FAILED -- saving rejects to file > >arch/powerpc/kernel/signal_32.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >arch/powerpc/kernel/signal_64.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/powerpc/platforms/powermac/setup.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/x86_64/ia32/Makefile.rej > >4 out of 8 hunks FAILED -- saving rejects to file > >arch/x86_64/kernel/entry.S.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >arch/x86_64/kernel/pci-gart.c.rej > >2 out of 6 hunks FAILED -- saving rejects to file > >arch/x86_64/kernel/process.c.rej > >3 out of 7 hunks FAILED -- saving rejects to file > >arch/x86_64/kernel/traps.c.rej > >3 out of 5 hunks FAILED -- saving rejects to file block/elevator.c.rej > >2 out of 3 hunks FAILED -- saving rejects to file block/genhd.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file block/ll_rw_blk.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/base/cpu.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/base/firmware_class.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/base/node.c.rej > >3 out of 5 hunks FAILED -- saving rejects to file drivers/block/cciss.c.rej > >4 out of 4 hunks FAILED -- saving rejects to file drivers/block/ub.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >drivers/char/agp/efficeon-agp.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/char/cs5535_gpio.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/char/ipmi/ipmi_bt_sm.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >drivers/char/pcmcia/cm4000_cs.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/char/pcmcia/cm4040_cs.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/char/snsc.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/char/tipar.c.rej > >19 out of 19 hunks FAILED -- saving rejects to file > >drivers/char/tlclk.c.rej > >2 out of 44 hunks FAILED -- saving rejects to file > >drivers/char/tty_io.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/edac/Kconfig.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >drivers/i2c/busses/scx200_acb.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/i2c/chips/m41t00.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/ide/pci/alim15x3.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/ieee1394/ohci1394.c.rej > >6 out of 8 hunks FAILED -- saving rejects to file > >drivers/ieee1394/sbp2.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/input/mouse/psmouse-base.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/macintosh/therm_adt746x.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file drivers/md/dm-snap.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file drivers/md/dm.c.rej > >4 out of 5 hunks FAILED -- saving rejects to file drivers/md/kcopyd.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/md/raid10.c.rej > >4 out of 5 hunks FAILED -- saving rejects to file > >drivers/media/dvb/dvb-usb/cxusb.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/media/video/saa7127.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/media/video/tuner-types.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/mtd/nand/Kconfig.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/net/e1000/e1000_main.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >drivers/net/irda/irda-usb.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/net/sky2.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/net/tg3.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >drivers/net/via-rhine.c.rej > >2 out of 3 hunks FAILED -- saving rejects to file > >drivers/net/wireless/Kconfig.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/net/wireless/hostap/hostap_80211_tx.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >drivers/net/wireless/ipw2200.c.rej > >6 out of 6 hunks FAILED -- saving rejects to file > >drivers/pci/pci-acpi.c.rej > >3 out of 5 hunks FAILED -- saving rejects to file drivers/pci/quirks.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/pcmcia/ds.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >drivers/scsi/3w-9xxx.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >drivers/scsi/3w-xxxx.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/scsi/libata-core.c.rej > >4 out of 5 hunks FAILED -- saving rejects to file > >drivers/scsi/sata_mv.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc3.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file drivers/sn/ioc4.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/usb/core/message.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file > >drivers/usb/host/ehci-sched.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/usb/serial/console.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/usb/serial/option.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/usb/storage/Kconfig.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/video/cfbimgblt.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file drivers/video/fbmem.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >drivers/video/i810/i810_main.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file fs/9p/vfs_inode.c.rej > >3 out of 4 hunks FAILED -- saving rejects to file fs/char_dev.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file fs/cifs/cifsencrypt.c.rej > >1 out of 7 hunks FAILED -- saving rejects to file fs/compat.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file fs/fuse/file.c.rej > >8 out of 23 hunks FAILED -- saving rejects to file fs/locks.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs3proc.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfs4proc.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file fs/nfsd/nfsproc.c.rej > >3 out of 19 hunks FAILED -- saving rejects to file fs/open.c.rej > >2 out of 3 hunks FAILED -- saving rejects to file fs/partitions/check.c.rej > >4 out of 21 hunks FAILED -- saving rejects to file fs/proc/base.c.rej > >2 out of 14 hunks FAILED -- saving rejects to file fs/proc/proc_misc.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file fs/proc/vmcore.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >fs/reiserfs/xattr_acl.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file fs/smbfs/request.c.rej > >1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/dir.c.rej > >1 out of 4 hunks FAILED -- saving rejects to file fs/sysfs/file.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file fs/sysfs/inode.c.rej > >1 out of 3 hunks FAILED -- saving rejects to file fs/sysfs/symlink.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >fs/xfs/linux-2.6/xfs_aops.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >fs/xfs/linux-2.6/xfs_iops.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/asm-generic/pgtable.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/asm-i386/cpufeature.h.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >include/asm-i386/i387.h.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >include/asm-i386/pgtable.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file include/asm-m32r/smp.h.rej > >15 out of 16 hunks FAILED -- saving rejects to file > >include/asm-m32r/uaccess.h.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >include/asm-mips/bitops.h.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >include/asm-mips/byteorder.h.rej > >4 out of 4 hunks FAILED -- saving rejects to file > >include/asm-mips/interrupt.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/asm-mips/pgtable.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/asm-mips/r4kcache.h.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >include/asm-powerpc/floppy.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/asm-x86_64/cpufeature.h.rej > >2 out of 3 hunks FAILED -- saving rejects to file > >include/asm-x86_64/i387.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file include/linux/cpu.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/linux/cpumask.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file include/linux/fb.h.rej > >2 out of 20 hunks FAILED -- saving rejects to file include/linux/fs.h.rej > >1 out of 6 hunks FAILED -- saving rejects to file include/linux/mm.h.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >include/linux/page-flags.h.rej > >1 out of 7 hunks FAILED -- saving rejects to file > >include/linux/proc_fs.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/linux/raid/raid1.h.rej > >1 out of 2 hunks FAILED -- saving rejects to file include/linux/rtc.h.rej > >1 out of 3 hunks FAILED -- saving rejects to file include/net/ip.h.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >include/net/sctp/sctp.h.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >include/net/sctp/structs.h.rej > >1 out of 20 hunks FAILED -- saving rejects to file ipc/shm.c.rej > >1 out of 11 hunks FAILED -- saving rejects to file ipc/util.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file kernel/auditsc.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file kernel/exec_domain.c.rej > >1 out of 27 hunks FAILED -- saving rejects to file kernel/exit.c.rej > >1 out of 29 hunks FAILED -- saving rejects to file kernel/fork.c.rej > >3 out of 7 hunks FAILED -- saving rejects to file > >kernel/posix-cpu-timers.c.rej > >5 out of 8 hunks FAILED -- saving rejects to file kernel/ptrace.c.rej > >5 out of 117 hunks FAILED -- saving rejects to file kernel/sched.c.rej > >2 out of 22 hunks FAILED -- saving rejects to file kernel/signal.c.rej > >1 out of 23 hunks FAILED -- saving rejects to file kernel/sys.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file kernel/uid16.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file mm/mempolicy.c.rej > >8 out of 17 hunks FAILED -- saving rejects to file mm/page_alloc.c.rej > >5 out of 6 hunks FAILED -- saving rejects to file net/atm/clip.c.rej > >2 out of 3 hunks FAILED -- saving rejects to file > >net/bridge/br_netfilter.c.rej > >1 out of 34 hunks FAILED -- saving rejects to file net/core/dev.c.rej > >1 out of 15 hunks FAILED -- saving rejects to file net/core/sock.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file net/ipv4/fib_trie.c.rej > >3 out of 6 hunks FAILED -- saving rejects to file net/ipv4/ip_output.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >net/ipv4/netfilter/arp_tables.c.rej > >1 out of 38 hunks FAILED -- saving rejects to file > >net/ipv4/netfilter/ip_conntrack_core.c.rej > >1 out of 10 hunks FAILED -- saving rejects to file > >net/ipv4/netfilter/ip_conntrack_netlink.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >net/ipv4/netfilter/ip_conntrack_proto_sctp.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file > >net/ipv4/netfilter/ip_nat_snmp_basic.c.rej > >1 out of 21 hunks FAILED -- saving rejects to file > >net/ipv4/netfilter/ip_tables.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c.rej > >1 out of 24 hunks FAILED -- saving rejects to file net/ipv4/route.c.rej > >1 out of 7 hunks FAILED -- saving rejects to file net/ipv4/tcp_output.c.rej > >1 out of 13 hunks FAILED -- saving rejects to file > >net/ipv6/netfilter/ip6_tables.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >net/ipv6/xfrm6_policy.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >net/netfilter/nf_conntrack_netlink.c.rej > >1 out of 2 hunks FAILED -- saving rejects to file > >net/netfilter/nf_conntrack_proto_sctp.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >net/netfilter/xt_sctp.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file net/sctp/inqueue.c.rej > >10 out of 10 hunks FAILED -- saving rejects to file > >net/sctp/sm_statefuns.c.rej > >3 out of 4 hunks FAILED -- saving rejects to file > >net/sctp/sm_statetable.c.rej > >2 out of 2 hunks FAILED -- saving rejects to file net/sctp/ulpqueue.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >security/keys/keyring.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >security/selinux/ss/mls.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >security/selinux/ss/services.c.rej > >3 out of 3 hunks FAILED -- saving rejects to file > >sound/isa/opti9xx/opti92x-ad1848.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >sound/oss/dmasound/tas_common.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file > >sound/pci/hda/patch_realtek.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/daca.c.rej > >1 out of 1 hunk FAILED -- saving rejects to file sound/ppc/tumbler.c.rej > >"OpenVZ kernel patch for virtual server support" patch for 2.6.16 does not > >apply cleanly > >Patch /usr/src/kernel-patches/all/apply/openvz failed. > >Hit return to Continue > ><snip> > > > >-- System Information: > >Debian Release: testing/unstable > > APT prefers testing > > APT policy: (990, 'testing'), (300, 'unstable'), (200, 'stable') > >Architecture: amd64 (x86_64) > >Shell: /bin/sh linked to /bin/bash > >Kernel: Linux 2.6.16 > >Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968) > > > >Versions of packages kernel-patch-openvz depends on: > >ii bash 3.1-4 The GNU Bourne Again SHell > >ii grep-dctrl 2.9.0 Grep Debian package > >information - ii patch 2.5.9-4 Apply a diff > >file to an original > > > >kernel-patch-openvz recommends no packages. > > > >-- no debconf information > > > > > > > >----- End forwarded message ----- > > > > -- --- Ola Lundqvist systemkonsult --- M Sc in IT Engineering ---- / ola@opalsys.net Annebergsslingan 37 \ | opal@debian.org 654 65 KARLSTAD | | http://www.opal.dhs.org Mobile: +46 (0)70-332 1551 | \ gpg/f.p.: 7090 A92B 18FE 7994 0C36 4FE4 18A1 B1CF 0FE5 3DD9 / ------------------------------------------------------------ ---