Re: CVS commit: src/sys/arch/xen/i386

[Jed Davis <jdev%panix.com@localhost>]

YAMAMOTO Takashi <yamt%netbsd.org@localhost> writes:

> Log Message:
> xen_shm_unmap:
> - don't try to remove a request twice.
> - fix spl/splx mismatch.

These, however, were merge issues.

Ideally, one of {me, Thor, someone else} would would have suggested
that I update my working copy to HEAD, hand-resolve the conflicting
printf adjustments, and make a new diff from that, rather than the
merge's being attempted the other way.


-- 
(let ((C call-with-current-continuation)) (apply (lambda (x y) (x y)) (map
((lambda (r) ((C C) (lambda (s) (r (lambda l (apply (s s) l))))))  (lambda
(f) (lambda (l) (if (null? l) C (lambda (k) (display (car l)) ((f (cdr l))
(C k)))))))    '((#\J #\d #\D #\v #\s) (#\e #\space #\a #\i #\newline)))))