Re: [Xen-devel] Merging xen/dom0/backend/blktap2 ..

[Daniel Stodden <daniel.stodden@xxxxxxxxxx>]

On Thu, 2011-03-10 at 05:39 -0500, Daniel Stodden wrote:
> On Thu, 2011-03-10 at 03:31 -0500, Ian Campbell wrote:
> > 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
> > based tree?
> 
> Newer upstream. Otherwise I wouldn't bother. It's certainly not a common
> operation, I was just suprised how much garbage is involved.

After looking at the series, I think reverting on that topic branch
might just risk more issues in trees which already pulled the current
branch, and gathering the right diffs from Jeremy's tree to avoid that
would probably take me longer than it's worth. More time than I can
afford.

Since Konrad already seems to do the same with blkback, I'd like to
propose a reset.

Please check out one of the following trees at
http://xenbits.xensource.com/gitweb/?p=people/dstodden/linux.git;a=summary
git://xenbits.xensource.com/people/dstodden/linux.git

blktap/next-2.6.38
blktap/next-2.6.37
blktap/next-2.6.36
blktap/next-2.6.33
blktap/next-2.6.32

I'd redo xen/dom0/backend/blktap2 and repost the diffs sent around last
week. I wouldn't mind keeping that branch in sync too, assuming it
helps.

Trees above start at v2.6.32, with the transition to
drivers/block/blktap, and moving on with Linus' tree from there on.
Versions chosen above are where forward ports were necessary,
respectively. Only fuzz left is mm/memory.c (export zap_page_range for
modules).

Does this sound acceptable?

Thanks,
Daniel

> > It appears that xen/stable-2.6.32.x is up to date wrt
> > xen/dom0/backend/blktap2...
> > 
> > Ian.
> > 
> > > 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
> > > is?
> > > 
> > > Thanks,
> > > Daniel
> > > 
> > >     Conflicts:
> > >         arch/x86/include/asm/io.h
> > >         arch/x86/include/asm/paravirt.h
> > >         arch/x86/include/asm/xen/page.h
> > >         arch/x86/kernel/cpu/mtrr/amd.c
> > >         arch/x86/kernel/cpu/mtrr/centaur.c
> > >         arch/x86/kernel/cpu/mtrr/cyrix.c
> > >         arch/x86/kernel/cpu/mtrr/generic.c
> > >         arch/x86/kernel/cpu/mtrr/main.c
> > >         arch/x86/kernel/process.c
> > >         arch/x86/mm/gup.c
> > >         arch/x86/xen/Kconfig
> > >         arch/x86/xen/Makefile
> > >         arch/x86/xen/enlighten.c
> > >         arch/x86/xen/mmu.c
> > >         arch/x86/xen/setup.c
> > >         arch/x86/xen/xen-ops.h
> > >         drivers/block/Kconfig
> > >         drivers/char/hvc_xen.c
> > >         drivers/xen/Kconfig
> > >         drivers/xen/Makefile
> > >         drivers/xen/biomerge.c
> > >         drivers/xen/blkback/Makefile
> > >         drivers/xen/blkback/blkback.c
> > >         drivers/xen/blkback/common.h
> > >         drivers/xen/blkback/vbd.c
> > >         drivers/xen/blkback/xenbus.c
> > >         drivers/xen/events.c
> > >         drivers/xen/xenbus/xenbus_probe.c
> > >         drivers/xen/xenbus/xenbus_probe.h
> > >         drivers/xen/xenbus/xenbus_probe_backend.c
> > >         drivers/xen/xenbus/xenbus_probe_frontend.c
> > >         include/linux/mm.h
> > >         include/xen/blkif.h
> > >         include/xen/events.h
> > >         include/xen/grant_table.h
> > >         include/xen/interface/memory.h
> > > 
> > > 
> > > 
> > > _______________________________________________
> > > Xen-devel mailing list
> > > Xen-devel@xxxxxxxxxxxxxxxxxxx
> > > http://lists.xensource.com/xen-devel
> > 
> > 
> 
> 



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel