Re: [Xen-devel] Merging xen/dom0/backend/blktap2 ..
On Thu, 2011-03-10 at 03:33 +0000, Daniel Stodden wrote:
> is an overall pita and I've had the pleasure several times now.
Merging it into what? xen/stable-2.6.32.x or some newer upstream version
It appears that xen/stable-2.6.32.x is up to date wrt
> There's a bunch of deltas at the very bottom which look to me like
> unrelated arch stuff which never made it anywhere else. Additional stuff
> which was obsoleted/deprecated (e.g. the pte zapping changes) but
> apparently never reverted. Plus some xen-related hunks nobody would
> dare to admit to ever have seen before (iirc we had such a thread a
> while ago).
> After a lengthy checkout/--patch orgy, the compound diff looks quite
> simple, in contrast.
> My hope is one could either either revert a whole lot in there (does
> this help reliably during merges? I guess it would). Or, maybe helpful
> in order order to further reduce noise, rebase that tree on some more
> solid root. Dropping quite a bit of garbage here and there. Then call
> that a new branch and phase out the old one.
> >From what I've tried so far, git seems to be reasonably smart about
> remerging such stuff again later. Then again, just reverting might help
> cleaning up elsewhere.
> Preferences? Are there better ways? Or rather just keep it the way it
> Xen-devel mailing list
Xen-devel mailing list