search for: mismerge

Author: Darren Moffat <darrenm at opensolaris.org> Repository: /hg/zfs-crypto/zfs-crypto-gate Latest revision: ec659b717bdb149af4dc7a2ac1bc1c152d859b02 Total changesets: 1 Log message: Fix mismerge for libcryptoutil & libpkcs11 Files: update: usr/src/lib/libcryptoutil/common/cryptoutil.h update: usr/src/lib/libcryptoutil/common/mapfile-vers update: usr/src/lib/libcryptoutil/common/passutils.c update: usr/src/lib/pkcs11/libpkcs11/common/mapfile-vers update: usr/src/lib/pkcs11/libpkcs...

What happened to the hot data tracking feature in btrfs? There are a lot of old patches from aug 2010, but it looks like the feature has been completly removed from the current version of btrfs. Is this feature still on the roadmap?

One of my test domUs is a opensuse 10.3 PV domain, and it has a /boot/grub/menu.lst file. pygrub is used as bootloader. With xVM 3.1.4, the arrow keys can be used in the pygrub screen. With xVM 3.3-unstable, the arrow keys don''t work for me any more. What I''ve found out so far is that: - gnome-terminal, xterm or dtterm are running with "vt100 application key

...'d be a new variant of MEMDISK, built with some different code that's UEFI-specific or a completely different sub-project. efi/syslinux.ld and core/x86_64/syslinux.ld are no-brainers. core/syslinux.ld and core/i386/syslinux.ld get messy. For a cleaner look at how it appears it's been mismerged, consider "gitk c6bebc44.. -- core/{,i386/,x86_64/}syslinux.ld" then start at 8e5e9b0a and 6fa86596. 51529126 08ece8fc b7549a33 3b772bb6 275a269d affected core/syslinux.ld while it appears nothing really affected core/i386/syslinux.ld. -- -Gene

...k the arch-specific scripts could be left there, waiting for a working implementation of memdisk for UEFI. > > efi/syslinux.ld and core/x86_64/syslinux.ld are no-brainers. > > core/syslinux.ld and core/i386/syslinux.ld get messy. For a cleaner > look at how it appears it's been mismerged, consider "gitk c6bebc44.. > -- core/{,i386/,x86_64/}syslinux.ld" then start at 8e5e9b0a and > 6fa86596. 51529126 08ece8fc b7549a33 3b772bb6 275a269d affected > core/syslinux.ld while it appears nothing really affected > core/i386/syslinux.ld. I also noted the commit 9057b5...

From: Sylvain Gault <sylvain.gault at gmail.com> These patches basically remove unused linker scripts and port a change that was made to an unused script. Those are to be applied on top of the gcc 5 bug fixes as they would conflict otherwise. Sylvain Gault (4): diag/mbr: fix dependency to linker script Remove unused linker scripts core: Make symbols defined in linker script HIDDEN

...roll into the clean-up-asm-(i386|x86_64)-bugs_h patches, and cleanup-identify_cpu-fix.patch should go after/roll into clean-up-identify_cpu patch. paravirt-flush-on-kunmap_atomic.patch Flush pending lazy mmu operations on kunmap_atomic too. paravirt-fix-paravirt_lazy.patch Fix up an apparent mismerge: remove the #defines for PARAVIRT_LAZY_* and add _LAZY_FLUSH to the enum. i386-sysenter-arch-pages-fix.patch i386-acpi-remove-earlyquirk-warning.patch i386-mcheck-p4-grotesque-and-needless-warning-fix.patch i386-pgd-clone-under-lock-fix.patch paravirt-kmap_atomic_pte-tidy.patch vmi-supports-compa...

...roll into the clean-up-asm-(i386|x86_64)-bugs_h patches, and cleanup-identify_cpu-fix.patch should go after/roll into clean-up-identify_cpu patch. paravirt-flush-on-kunmap_atomic.patch Flush pending lazy mmu operations on kunmap_atomic too. paravirt-fix-paravirt_lazy.patch Fix up an apparent mismerge: remove the #defines for PARAVIRT_LAZY_* and add _LAZY_FLUSH to the enum. i386-sysenter-arch-pages-fix.patch i386-acpi-remove-earlyquirk-warning.patch i386-mcheck-p4-grotesque-and-needless-warning-fix.patch i386-pgd-clone-under-lock-fix.patch paravirt-kmap_atomic_pte-tidy.patch vmi-supports-compa...