Re: [Xen-devel] [PATCH v1][RFC] drivers/xen, balloon driver numasupport in kernel

[Dario Faggioli]

On mar, 2013-08-13 at 09:18 -0400, Konrad Rzeszutek Wilk wrote:
> On Tue, Aug 13, 2013 at 8:53 AM, David Vrabel <david.vrabel@xxxxxxxxxx> wrote:
> > On 12/08/13 21:26, Dario Faggioli wrote:
> >>
> >> Mmm... Is that the case? I tried to apply it there and I have one failed
> >> hunk (#12). Anyway, could you please rebase it on the tip of some
> >> relevant git tree?
> >>
> >> Linus' tree would be fine, I guess:
> >>
> >> http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git
> >
> > This is the one I use for most of my development work.  I wouldn't use a
> > subsystem specific tree unless there were specific conflicts to resolve
> > before hand.
> 
> Which we do:
> 
> commit cd9151e26d31048b2b5e00fd02e110e07d2200c9
> Author: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
> Date:   Sun Aug 4 15:39:40 2013 +0100
>     xen/balloon: set a mapping for ballooned out pages
> 
Ok... So, working on Linus' tree on a daily basis, but at lease try to
rebase the changes on top of .../xen/tip.git sounds like a sane enough
workflow to me. :-)

Yechen, would you be fine with something like that?

How familiar are you with concepts like branches, merging and rebasing
in the context of git?

Allow me to give some (pseudo random) pointers:

http://git-scm.com/documentation
http://git-scm.com/book/en/Git-Branching-Basic-Branching-and-Merging
http://git-scm.com/book/en/Git-Branching-Rebasing
http://gitref.org/branching/
http://stackoverflow.com/questions/315911/git-for-beginners-the-definitive-practical-guide
http://sixrevisions.com/resources/git-tutorials-beginners/
http://www.sbf5.com/~cduan/technical/git/
  http://www.sbf5.com/~cduan/technical/git/git-2.shtml
  http://www.sbf5.com/~cduan/technical/git/git-3.shtml
  http://www.sbf5.com/~cduan/technical/git/git-5.shtml

Regards,
Dario

-- 
<<This happens because I choose it to happen!>> (Raistlin Majere)
-----------------------------------------------------------------
Dario Faggioli, Ph.D, http://about.me/dario.faggioli
Senior Software Engineer, Citrix Systems R&D Ltd., Cambridge (UK)

Attachment: signature.asc
Description: This is a digitally signed message part