ia64/xen-unstable

log

find changesets by author, revision, files, or words in the commit message
less more | rev 7218: (0) -3000 -1000 -240 +240 +1000 +3000 +10000 tip
age author revision description
2005-10-05 kaf24 7218:e6ecfb4f4a24 The attached patch places an updated TPM driver into the sparse directory.
2005-10-05 kaf24 7217:303d51d0d578 Restructure the makefiles used to drive builds of linux 2.6 kernels.
2005-10-05 kaf24 7216:aad1d3e231ff Move setting of configuration variables to Config.mk.
2005-10-05 emellor 7215:c60036fe7418 Removed the EventServer, replacing the events fired with simple logging
2005-10-05 emellor 7214:33cd9a7a903b imported patch /home/emellor/block_detach.patch
2005-10-05 emellor 7213:22449386d38d Explicitly close files on save and restore. Rename all local variables named id or slice so as not to clash with the builtins.
2005-10-04 emellor 7212:2c9e66555ff4 Explicitly close files.
2005-10-04 emellor 7211:00037ba13f0b Clean up domains if creation/restoration fails.
2005-10-04 emellor 7210:db651da37899 Fix typo.
2005-10-04 emellor 7209:bc325488f47f Merge the child-process handling of the save and restore functions into one
2005-10-04 emellor 7208:84c585a99a7b Removed unused xen_domain method, and unused imports. Comment those methods
2005-10-04 emellor 7207:81246a2923d2 Fix call to state_set inside preserve (was erroneously calling set_state).
2005-10-04 emellor 7206:b4c388a004c0 Fix xm restore broken by missing return statement.
2005-10-04 kaf24 7205:540d17fe32ce Clean up sched_op() hypercall interface. One particular
2005-10-04 kaf24 7204:ec84b119e4ed Allow EVTCHNOP_bind_{ipi,virq} to specify the vcpu to
2005-10-04 kaf24 7203:f13b4b730605 Rename VCPUOP_craete to VCPUOP_initialise. It is likely that
2005-10-04 kaf24 7202:34d251183985 Fix tools to pull public header files from standard
2005-10-04 jrb44 7201:e6303281ca6c Merge to restore reverted changes.
2005-10-04 jrb44 7200:b27d526d4033 Throw away bogus merge.
2005-10-04 jrb44 7199:abfc9808adb9 Merge.
2005-10-04 emellor 7198:4c4dbbda367e Catch xen.xend.XendProtocol.XendError as well as xen.xend.XendError.XendError.
2005-10-04 emellor 7197:5a3d5f9ef44e Merged.
2005-10-04 emellor 7196:f74f6df95ccd Merged.
2005-10-04 emellor 7195:07b7411e385f Merged.
2005-10-04 emellor 7194:3075c005e694 Merged.
2005-10-04 emellor 7193:ab729f38870a Merged.
2005-10-04 emellor 7192:ca6930f82682 Merged.
2005-10-04 emellor 7191:83452b6cdcdb Merged.
2005-10-04 emellor 7190:7b33b5e94cec Merged.
2005-10-04 emellor 7189:b7d11c9b6be4 Merged.
2005-10-04 emellor 7188:a746126c3bb1 Merged.
2005-10-04 emellor 7187:488f8aaa4022 Fix debugging statement that was referring to non-existent field.
2005-10-04 emellor 7186:6fda96e7f332 Added some DPRINTK statements, for debugging.
2005-10-03 emellor 7185:d79ab87e27b8 Cope with missing configuration information inside the configuration method.
2005-10-03 emellor 7184:fc97109eb28e Remove the reason code from the destroy action -- the reason is only of value
2005-10-03 emellor 7183:5db9a237f8ce Move the import for XendError, and use a bare import, not a from...import.
2005-10-04 emellor 7182:96cc6aa196b6 Merged.
2005-10-04 emellor 7181:9c6b39746b78 Fix localhost live migration. We were overvigorously wiping out the store
2005-10-04 emellor 7180:a6154af4fc43 Use the domain ID to refer to backends, not the UUID. This means that a new
2005-10-04 kaf24 7179:549325dfa161 Export some more symbols.
2005-10-04 emellor 7178:625c75a223fe Cope with missing configuration information inside the configuration method.
2005-10-04 emellor 7177:7f42935cb4b0 Move the import for XendError, and use a bare import, not a from...import.
2005-10-04 emellor 7176:0e1838de9db8 Move XendDomainInfo.{create,recreate,parseConfig} to the top level of the
2005-10-04 emellor 7175:c70829a6edac Remove the reason code from the destroy action -- the reason is only of value
2005-10-04 emellor 7174:600f3d2b78d6 Remove the reason code from the destroy action -- the reason is only of value
2005-10-04 emellor 7173:e6e5f22d19f8 Remove the reason parameter from XendDomain.destroy -- it is useless. Accept
2005-10-04 emellor 7172:cc9988317416 Added method XendDomain.privilegedDomain and use that inside DevController to
2005-10-03 jrb44 7171:716a0d177ffa Possible fix for the SEDF scheduler assertion problem.
2005-10-03 kaf24 7170:85f92475b943 Create new vcpu_op() hypercall. Replaces old boot_vcpu()
2005-10-03 kaf24 7169:dd87869f877c Allow adjustment of the size of TPM transfer buffers
2005-10-03 kaf24 7168:a9dce0ffc901 x86/64 was using the plain i386 version of the microcode
2005-10-03 kaf24 7167:bf6119a58655 Do not pickle vcpu state on save/restore. We can construct
2005-10-03 kaf24 7166:f22fba673196 Dynamically allocate mmu_update array in
2005-10-02 emellor 7165:bb03b43404bb The stopgap in changeset 7152:a73ab0ddf990 was broken -- revert the change to
2005-10-02 vh249 7164:5fbc42383481 remove useless ptep_establish_new function (called set_pte_at now)
2005-10-02 emellor 7163:d443f03f8be0 Merged.
2005-10-02 emellor 7162:70d5bfbf23d4 Move XendVnet from using DBMap etc to using xstransact. This is the last
2005-10-02 emellor 7161:a73ab0ddf990 Call refresh in the domain_lookup and domain_lookup_by_name methods. This
2005-10-02 emellor 7160:486f1c3e7805 Fix call to XendCheckpoint.restore, since that method no longer needs a
2005-09-30 kaf24 7159:9d047fb99e38 Also send xenbus notifications using evtchn as handle. It's
2005-09-30 kaf24 7158:78e1e94e4088 xencons must notify via evtchn. It can't use the irq as the
2005-09-30 emellor 7157:9918d8c3e116 Merge.
2005-09-30 emellor 7156:244f1aa98d30 Add the config file parsing for the on_{poweroff,reboot,crash} options, so that
2005-09-30 emellor 7155:468ad17f9970 Minor tidy.
2005-09-30 kaf24 7154:71466686d026 Fix earlier merge with Ewan's xenstore changes.
2005-09-30 emellor 7153:fe401301929e Change rebooting specification so that we can have domains crash and stay
2005-09-30 emellor 7152:034ada135379 Update comment/variable names to reflect the fact that the backend paths now
2005-09-30 emellor 7151:4a2c162d3e7c Within the store, split the persistent information regarding a VM from the
2005-09-30 emellor 7150:a39510ad5c59 Added cache-control headers to pages returned by HTTP server so that pages
2005-09-30 emellor 7149:345e517bab57 Remove the bizarre arrangement whereby EventChannel inherits from dict. Move
2005-09-30 emellor 7148:41b1f86628a0 Merge.
2005-09-30 emellor 7147:82e8a1d7230f Added DevController.configuration and configurations methods. These parse the
2005-09-30 kaf24 7146:b20219e27f92 Fix typos I introduced into tpmfront driver.
2005-10-08 djm 7145:0ba10f7fef51 Add support for fast mov_to_kr privops
2005-10-07 djm 7144:cbe6b4c4480f Reset hypercall_continuation flag (by Tristan Gingold)
2005-10-07 djm 7143:f81e637e7741 Fix incorrect re-enablement of interrupts (found by Tristan Gingold)
2005-10-03 djm 7142:98fb7e03a886 Some cleanup of reflection code
2005-09-29 djm 7141:c22741d000a5 Keep up with recent changes in xen-unstable
2005-09-29 djm 7140:61b3b357d827 Merge xen-unstable into xen-ia64-unstable
2005-09-29 kaf24 7139:d88e98fd4f7a Fix compiler warnings when shadow debugging is enabled.
2005-09-29 iap10 7138:7f732bba3ed4 Allow kernel built with privileged operation support (e.g. -xen/-xen0) to be used as a guest kernel on x86_64
2005-09-29 kaf24 7137:f529cd119470 More save/restore code in interrupts-enabled contest, where
2005-09-29 kaf24 7136:1abbb6448b4a Remove unused debug code.
2005-09-29 kaf24 7135:399436887a32 Move xenbus_suspend outside critical region with
2005-09-29 kaf24 7134:3c1a91c309b8 Update GDB server documentation for crashed guests.
2005-09-29 kaf24 7133:55722e822dec Avoid verbosity when connection xenbus -> xenstore.
2005-09-29 iap10 7132:b9e5573785bb Don't define vectors for IPIs we don't use in Xen
2005-09-29 kaf24 7131:65882bf339f6 Slight rejig avoids grant entry warning message on xm save.
2005-09-29 vh249 7130:f633c3d0315b full devices expect to be able to read the partition table during xlvbd_add
2005-09-29 kaf24 7129:8c23b56f3954 Define new notify_remote_via_irq() interface which is a
2005-09-29 kaf24 7128:559ad1abb3d5 Change semantics of bind_evtchn_to_xxx and
2005-09-29 kaf24 7127:805ee053e61f VIRQs and IPIs on VCPU#0 are automatically re-bound on save/restore.
2005-09-29 kaf24 7126:c317e0aca9f1 Reindent more xenlinux files. Remove defunct header file.
2005-09-29 kaf24 7125:e04b0805febb Set guest selectors to be null if it's not valid when switch to
2005-09-28 kaf24 7124:f069a06e650f Fix fixed-point long multiplication used in time delta
2005-09-28 kaf24 7123:5e5ae8340956 merge
2005-09-28 kaf24 7122:081b326162bc Fix gnttab setup, which I broke 2 changesets ago.
2005-09-28 kaf24 7121:f9a806ba838a This patch fixes a race between when the disable cpu is marked online
2005-09-28 kaf24 7120:c7f58e86446f Reindent grant-table kernel code and reserve first few
2005-09-28 kaf24 7119:1a82995a017c Fix netif save/restore.
2005-09-28 kaf24 7118:1643f6110469 Fixes for blkif save/restore. A 'dd if=/dev/sda1 of=/dev/null'
2005-09-28 emellor 7117:9e0b6fbab872 Merge.
2005-09-28 emellor 7116:33fc55a32dfb Remove unused domain_devtype_get.
2005-09-28 emellor 7115:23a3241f0ee7 Remove unused xend_domain_device.
2005-09-28 emellor 7114:5b296b8d05ab Change device IDs to be integers, as required now by DevController. Remove
2005-09-28 emellor 7113:da98f8956925 Nothing.
2005-09-28 emellor 7112:688ebed7d41b Minor tidy up.
2005-09-28 kaf24 7111:ce54669c70fc Remove broken assertion in 64-bit shadow pagetable code.
2005-09-28 emellor 7110:ca78d9668fdb Added new classmethod xstransact.ListRecursive, and use this inside
2005-09-28 emellor 7109:1d74fff611c8 Nothing.
2005-09-28 emellor 7108:07cc64b3bf86 Merged.
2005-09-28 emellor 7107:af12cff417fd Merged.
2005-09-28 emellor 7106:ea1373b5015d Merged.
2005-09-28 emellor 7105:3eda5c985d67 Merged.
2005-09-28 emellor 7104:193022cb9ccc Merge.
2005-09-28 emellor 7103:89974610d558 Fix returning of results broken by last change.
2005-09-28 kaf24 7102:7598dc3ed0cb Fix preemptible uses of smp_processor_id() in page fault
2005-09-28 jrb44 7101:eae0c4f0aafd Changed -xen x86-32 defconfig CONFIG_EXT2_FS=y
2005-09-28 jrb44 7100:0422243f5602 Changed -xen x86-32 defconfig CONFIG_SECURITY_CAPABILITIES=y
2005-09-28 kaf24 7099:b55a43d39a40 merge?
2005-09-28 yjiang5 7098:8204a2d6cd55 Initialize pointer array for set mapping.
2005-09-28 kaf24 7097:7e9ec4b2cc3c imported patch ../tmp/fix_free_monitor_pagetable.patch
2005-09-28 yjiang5 7096:5fb211049b3f Save immediate operand into mcip structure.
2005-09-28 kaf24 7095:b1327ae8f414 With this patch, we can enable VMXAssist to bring up APs of SMP VMX
2005-09-28 kaf24 7094:868b8c599dfb Currently the mmio_operands assumes writing to memory when operand 0 is
2005-09-28 emellor 7093:ea373837d474 Added logging of exceptions coming through callInfo, for better debugging.
2005-09-28 emellor 7092:b56364e269c7 Minor tidy.
2005-09-28 emellor 7091:50c2fe359c73 Improve HTML output.
2005-09-28 emellor 7090:d78d2fa50703 Added missing quote to HTML output.
2005-09-28 emellor 7089:a65cdee92c0f Added behaviour to read() to read directly from the transaction's path if no
2005-09-28 emellor 7088:1e288a9316fd Handle exceptions caused during processing of requests, to improve error
2005-09-27 emellor 7087:46046d5fb354 Remove unused import, mark unused variables.
2005-09-27 emellor 7086:8fe341229827 Remove unused imports, variables.
2005-09-27 emellor 7085:8d5760e8e3f1 Fix final misuse of prettyprint parameters.
2005-09-27 emellor 7084:6f49c06d5feb Remove unused imports, and unused progress parameters from domain_save, domain_restore. Rename one instance of id to domid.
2005-09-27 emellor 7083:679e93b5c6cd Added getDeviceSxprs, to support xm block-list.
2005-09-27 emellor 7082:41735ccc5ee3 Added sxprs, for xm block-list.
2005-09-27 emellor 7081:7c5d9879967d Added behaviour to list() to list the transaction's path if no arguments are
2005-09-27 kaf24 7080:a172340ae3f3 merge?
2005-09-27 kaf24 7079:a4ad6692193a This patch adds "wbinvd" instruction emulation for vm86 mode.
2005-09-27 emellor 7078:fa4cc3f53c64 This patch adds a quick check to 'xm restore' that checks the
2005-09-27 emellor 7077:c9d690c52afc This patch adds a quick check in "xm save" to make sure the path given
2005-09-27 emellor 7076:9575efe88e75 This patch cleans up some of the argument usage in PrettyPrint.py to
2005-09-27 emellor 7075:a8ed2f186c23 Remove DBMap etc from XendDomainInfo, moving the handling of the domain root
2005-09-27 emellor 7074:63f06da6c5b0 Remove the domain and VM paths from the store when destroying a domain. This
2005-09-27 emellor 7073:9ff1bea68d51 Merge.
2005-09-27 emellor 7072:f9296342d9b2 Detangle the restart/reboot/halt/save/restore code. There is now one point
2005-09-27 emellor 7071:299c2d5b5daf Use constant in XendDomainInfo rather than embedding a string literal.
2005-09-27 emellor 7070:b6e58e2daff8 Added missing import socket statement.
2005-09-26 kaf24 7069:70b6e60df750 Move non-transactional and non-idempotent code out of
2005-09-26 kaf24 7068:8c2aa0878927 xenstore fires @releaseDomain both when a domain shuts
2005-09-29 djm 7067:93e27f7ca8a8 Merge
2005-09-29 djm 7066:c0ac925e8f1d Newer compilers don't allow strings to cross newlines?
2005-09-29 djm 7065:8463ce38eda3 Minor code restructure in vcpu_translate (prep for more later)
2005-09-26 djm 7064:4e1031ce3bc2 Choose LINUX_ARCH based on XEN_TARGET_ARCH, not ARCH
2005-09-26 djm 7063:ef9591d03fdd Merge latest xen-unstable into xen-ia64-unstable
2005-09-26 kaf24 7062:811559fb02ab xenbus_transaction_end() returns negative error code.
2005-09-25 kaf24 7061:5ea81e640509 Fix so that 'make uninstall' won't fail if /etc/xen
2005-09-24 emellor 7060:909172f2aa54 Add helper method XendDomain.callInfo that stubs through into XendDomainInfo.
2005-09-24 emellor 7059:74b05ac4706f Nothing.
2005-09-24 emellor 7058:a2d613c125a5 Merge.
2005-09-24 emellor 7057:b5ab24152d56 Added default value for ssidref -- 0.
2005-09-24 emellor 7056:8874b5004ef4 Move ImageHandler registration into image.py from XendDomainInfo.py. Move
2005-09-24 kaf24 7055:83fe78bb876d Fix build for pedantic compilers.
2005-09-24 kaf24 7054:c89485e939cc Fix tpm split driver to follow changes in the xenbus API.
2005-09-23 kaf24 7053:b2928ee8ddcd Update User's Guide installation section to mention hotplug.
2005-09-23 kaf24 7052:7b97bc1d1c1d Add an install-time check for hotplug.
2005-09-23 kaf24 7051:46f92c4fde1d Fix debug build of Xen.
2005-09-23 emellor 7050:9f50bd7a478f Removed unused Blkctl.py. The functionality here has been taken over by the
2005-09-23 emellor 7049:ad0270abc9b9 Merged.
2005-09-23 emellor 7048:ab1c362ba0d1 Merge the duplicated code for create, destroy, migrate, sysrq, and shutdown
2005-09-23 emellor 7047:1f948a831fdc Neaten the configuration parsing code. Add a self parameter to
2005-09-23 emellor 7046:b2c9acd6fdfc Move ImageHandler.create call to initDomain, after the call to xc.domain_create.
2005-09-23 emellor 7045:5805b47583ba Remove unused XendDB.py.
2005-09-23 emellor 7044:0e2fdfe6b2bc Remove unused tempfile.py. Even if anyone were using it, they shouldn't be --
2005-09-23 emellor 7043:64e3cab7ab9e Fix call with missing parameters.
2005-09-23 kaf24 7042:7ff651a39cfc Restructure GNTTABOP_map_grant_ref.
2005-09-23 kaf24 7041:352151393395 Make PAE defs in xg_private.h usable in both 32- and
2005-09-23 emellor 7040:10d6bda59ea4 Add check for speed (takes 33 minutes on my laptop, OUCH!)
2005-09-23 Rusty Russell 7039:76af1a1df67c Make xenstored use tdb, transactions can soft-fail (EAGAIN)
2005-09-23 Rusty Russell 7038:6aef7d1062bb Add check for speed (takes 33 minutes on my laptop, OUCH!)
2005-09-23 kaf24 7037:8a757f283fb8 Add VGA acceleration support for cirrus logic device model
2005-09-23 kaf24 7036:94c6fc048d8e Clean up xc_vmx_build():
2005-09-22 kaf24 7035:43edce5b75d6 Remove file from sparse tree.
2005-09-23 djm 7034:eaedc6b4ec0f Doh! Cut-paste error of file copy in mkbuildtree-pre breaks build
2005-09-23 djm 7033:450b1224a6ac Remove drivers/acpi/motherboard.c from sparse tree to match
2005-09-23 djm 7032:60928c906666 More getting xenlinux/ia64 to build with drivers from -sparse
2005-09-23 djm 7031:109a27c1c004 Another step towards building xenlinux/ia64 from -sparse
2005-09-22 djm 7030:7ddfb9a44972 Default CONFIG_XEN_PRIVILEGED_GUEST to y for now
2005-09-22 djm 7029:ecd6b2163193 First step toward building drivers/xen for ia64 out of sparse
2005-09-22 djm 7028:b6ee1d1cdc93 Minor drivers/xen changes and includes to support xenlinux/ia64
2005-09-22 djm 7027:06d84bf87159 Merge latest xen-unstable into xen-ia64-unstable
2005-09-22 emellor 7026:2f83ff9f6bd2 Move variable initialisation out of import section. Remove obsolete save
2005-09-22 emellor 7025:40a0f049e344 Rename XendDomainInfo and DevController.getDomain to getDomid.
2005-09-22 emellor 7024:f5e33f4d0238 Move initDomain out of image.py and into XendDomainInfo. The only thing that
2005-09-22 emellor 7023:4be4126911dc Added diagnostic message when RuntimeError is raised inside XenStore.exists.
2005-09-22 emellor 7022:10759a44ce3b Merged.
2005-09-22 emellor 7021:eba5afe9aa37 A number of changes to get save-restore working again:
2005-09-22 kaf24 7020:28db21fb7545 Fixes a vtpm timeout problem for slow machines.
2005-09-22 kaf24 7019:932aa2b425e8 Netfront/back always use grant tables now. This cleans up a
2005-09-22 kaf24 7018:ecc77b1c8612 Remove defunct usb split driver code. It will get replaced with
2005-09-22 kaf24 7017:d7c794130ac5 Indentation cleanups in linux driver code.
2005-09-22 emellor 7016:4cff74aa6246 Merged?
2005-09-22 emellor 7015:7646b18d4b32 This patch adds a check in xend that prevents a user from trying to
2005-09-22 emellor 7014:0f71667deb52 VMX guest memory calculation in python code is corrupted by changeset
2005-09-22 emellor 7013:11cca45a9a79 this patch fixes the bug that when "cpu" is not set in config file,
2005-09-22 kaf24 7012:8dbcf407a680 A more comprehensive fix for mapping shared-ring grant
2005-09-22 kaf24 7011:52eb8504be71 This fixes the "make check" feature of xenstore to properly compile with
2005-09-21 jbulpin 7010:a32ee93b3b33 Trivial spelling mistake fix.
2005-09-21 kaf24 7009:76f4c7ea7602 This patch fixes a bug where raise_softirq(SCHEDULE_SOFTIRQ) is called
2005-09-21 kaf24 7008:f71bb61e0500 Fix mapping of shared ring pages into backend drivers.
2005-09-21 emellor 7007:55fc0ecc19c3 Merge.
2005-09-21 emellor 7006:9647be59212d Split the configuration file parsing and xc dominfo parsing aspects of
2005-09-21 emellor 7005:19572dec7d3c Disable debugging-level output.
2005-09-21 emellor 7004:a498dab0beef Match change to the memory/target value, as it is now in KiB, not bytes.
2005-09-21 emellor 7003:82bc05411d85 Remove unused DEBUG variable, and -d flag.
2005-09-21 emellor 7002:2eee9f6487ff Removed unused getLevel method, and don't use intermediate variable called
2005-09-21 emellor 7001:79f695037ab7 Added diagnostic messages to the RuntimeError exceptions when they occur inside
2005-09-21 emellor 7000:ba10ee566ab7 Lots of minor changes to please pylint, including matching the number of
2005-09-21 emellor 6999:1196da5782bf On one of pyxc_domain_getinfo's error paths, free the block allocated
2005-09-20 emellor 6998:a35c20d53947 Remove unused variables and imports.
2005-09-20 emellor 6997:3fbefefb54aa domain_setmaxmem takes an int, not a long, for the maxmem_kb parameter. The
2005-09-20 emellor 6996:6d13fd586338 Remove extraneous semicolon.
2005-09-20 emellor 6995:fdc01adc11e0 Move definition of xc, to avoid confusing pylint.
2005-09-20 emellor 6994:b54d922cb897 Remove unused import.
2005-09-20 emellor 6993:90bcdd41dbf7 Mark unused variables as such. Remove unused import.
2005-09-20 emellor 6992:26c6d506a97c Move definition of xc variable, to save confusing pylint.
2005-09-20 emellor 6991:1c95ad754ad4 Mark unused variable as such.
2005-09-20 emellor 6990:95e589a9b2f6 Added debugging message to exception on write.
2005-09-21 kaf24 6989:7a45b8ccef01 Some cleanup in tpm-related files.
2005-09-21 kaf24 6988:b8537442f3d6 Removes redundant/unnecessary __vmread/__vmwrite.
2005-09-21 kaf24 6987:21e7935b2025 Parse vcpus for VMX guest.
2005-09-21 kaf24 6986:492fe12a6db4 Fix .hgignore and add missing vtpm patch file.
2005-09-20 kaf24 6985:1bea937e53cc The vmx guest loading is broken from 6925 because of the new
2005-09-20 kaf24 6984:d3bc8314b6f5 Fix __save_flags() to not complain when smp_processor_id() is used
2005-09-20 cl349 6983:659ad553199e merge?
2005-09-20 cl349 6982:ee8226e15e9f Add support to build arch/ia64 xen kernels, also add pre/post link hooks in mkbuildtree.
2005-09-20 kaf24 6981:c174ac96a69d Fix xenconsole when console page is >= 4GB.
2005-09-20 kaf24 6980:9776d03bf108 Put_page on vmx_set_cr0 for multiple protected/real mode switch.
2005-09-20 cl349 6979:f8e7af29daa1 merge?
less more | rev 7218: (0) -3000 -1000 -240 +240 +1000 +3000 +10000 tip