Hi Ian:
Sorry to bother again.
I've learnt git a bit, but still quite confused.
I've done the operation below, which in my understanding, I've merged
irq-fairness branch into master. But the code is not complete, I need merge
more, as your said, such as Konrad's 2.6.38 branch. Well, I have no idea what kinds
of branch I need, and how to find them, do the branches exist in "git branch -r" or
some place else?
$ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
$ cd linux-2.6
linux-2.6$ git remote add ianc git://xenbits.xen.org/people/ianc/linux-2.6.git
linux-2.6$ git fetch ianc
linux-2.6$ git merge ianc/irq-fairness
Git is not easy to learn, espescially on understaning kernel source management.
many thanks.
> Subject: RE: [GIT/PATCH 0/5] Re: [Xen-devel] unfair servicing of DomU vbd requests
> From: Ian.Campbell@xxxxxxxxxxxxx
> To: tinnycloud@xxxxxxxxxxx
> CC: xen-devel@xxxxxxxxxxxxxxxxxxx; james.harper@xxxxxxxxxxxxxxxx
> Date: Fri, 4 Mar 2011 10:06:03 +0000
>
> On Fri, 2011-03-04 at 09:59 +0000, MaoXiaoyun wrote:
> >
> > Thanks Ian.
> >
> > I've just pull the code.
> > But could the kernel be used as dom0, since I can't find blkback in
> > driver/xen which is needed, right?
>
> > And what is the usage of this branch?
>
> It is a topic branch intended for a maintainer to pull into their tree.
> It is not a standalone tree which you can just use -- that is why I
> described below how to pull it into an existing base.
>
> You will find that the majority of git branches are topic branches which
> do not standalone. If you intend
to be pulling peoples development
> branches then I strongly recommend you google up some git documentation
> and learn all about branches and merging etc.
>
> Ian.
>
> >
> >
> > > Subject: RE: [GIT/PATCH 0/5] Re: [Xen-devel] unfair servicing of
> > DomU vbd requests
> > > From: Ian.Campbell@xxxxxxxxxxxxx
> > > To: tinnycloud@xxxxxxxxxxx
> > > CC: xen-devel@xxxxxxxxxxxxxxxxxxx; james.harper@xxxxxxxxxxxxxxxx
> > > Date: Fri, 4 Mar 2011 07:21:29 +0000
> > >
> > > On Fri, 2011-03-04 at 07:12 +0000, MaoXiaoyun wrote:
> > > > I've tried to clone, but confront this error, did I do right?
> > >
> > > Your command will try and clone my default branch, which I'm not
> > sure I
> > > have configured (I don't really want one since no branch is
> > particularly
> >
> special in my tree).
> > >
> > > I would recommend that instead of completely cloning a fresh tree
> > for
> > > each tree you are interested in that you just add a new remote to
> > your
> > > existing tree, which could be a clone of e..g xen.git or Linus'
> > tree.
> > >
> > > e.g:
> > >
> > > Once:
> > > $ git clone
> > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
> > > $ cd linux-2.6
> > >
> > > Then for each new tree you are interested in:
> > > linux-2.6$ git remote add ianc
> > git://xenbits.xen.org/people/ianc/linux-2.6.git
> > > linux-2.6$ git fetch ianc
> > > [...pulls in updates from ianc...]
> > > linux-2.6$ git log ianc/irq-fairness
> > >
> > > etc. See "git remote --help"
for more info.
> > >
> > > Since my irq-fairness branch likely doesn't stand alone you will
> > > probably need to merge it into your current 2.6.38 based head
> > (something
> > > like Konrad's 2.6.38 branch for example). e.g.
> > >
> > > linux-2.6$ git merge ianc/irq-fairness
> > >
> > > Alternatively (and better) you can pull a single remote branch and
> > merge
> > > it into your current head. e.g.
> > > linux-2.6$ git pull git://xenbits.xen.org/people/ianc/linux-2.6.git
> > irq-fairness
> > >
> > > Compared with the git merge approach this creates a more informative
> > > automated merge commit log.
> > >
> > > The arguments to git pull are taken literally from the pull request:
> > > > > > The following changes since commit
> > c5ae
07bb307b658c8458f29ca77d237aec0f9327:
> > > > > > Ian Campbell (1):
> > > > > > xen: events: remove dom0 specific xen_create_msi_irq
> > > > > >
> > > > > > are available in the git repository at:
> > > > > >
> > > > > > git://xenbits.xen.org/people/ianc/linux-2.6.git irq-fairness
> > >
> > > Ian.
> > >
> > >
>
>
|
