Hello, how can i get pv/pcifront-2.6.32 from Konrad. When i make "git clone git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git xen-pcifront/" i get a complete 2.6.34 Kernel Tree. And: root@Dev-Eis2:/usr/src/xen-pcifront# git tag -l root@Dev-Eis2:/usr/src/xen-pcifront# Regards, Stefan Kuhne _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On 14/08/10 10:25, Stefan Kuhne wrote:> Hello, > > how can i get pv/pcifront-2.6.32 from Konrad. > When i make "git clone > git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git > xen-pcifront/" i get a complete 2.6.34 Kernel Tree.git branch -a After you have identified the remote branch you want to clone (origin is the remote that you''re originally cloning from) git checkout --track origin/X In your case i suppose you want: git checkout --track origin/pv/pcifront-2.6.32 Then you can verify everything is alright doing a : git branch It should list a master branch and a pv/pcifront-2.6.32 branch that should be your current branch (the presence of the * indicate your current branch) -- Vincent _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Am 14.08.2010 13:11, schrieb Vincent Hanquez:> On 14/08/10 10:25, Stefan Kuhne wrote:Hello,>> how can i get pv/pcifront-2.6.32 from Konrad. >> When i make "git clone >> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git >> xen-pcifront/" i get a complete 2.6.34 Kernel Tree. > > git branch -a >could it be, that it is always a complete Kernel tree? I understand the summit papers so that there where plain patches for vanilla trees. Regards, Stefan Kuhne _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Sat, Aug 14, 2010 at 03:15:11PM +0200, Stefan Kuhne wrote:> Am 14.08.2010 13:11, schrieb Vincent Hanquez: > > On 14/08/10 10:25, Stefan Kuhne wrote: > > Hello, > > >> how can i get pv/pcifront-2.6.32 from Konrad. > >> When i make "git clone > >> git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen.git > >> xen-pcifront/" i get a complete 2.6.34 Kernel Tree. > > > > git branch -a > > > could it be, that it is always a complete Kernel tree? > I understand the summit papers so that there where plain patches for > vanilla trees. >Yes, it''s a full kernel tree including the patches. Different branches have different patches. You can use git to merge the patches from branch A to branch B. -- Pasi _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
Am 14.08.2010 16:16, schrieb Pasi Kärkkäinen: Hello Pasi,> You can use git to merge the patches from branch A to branch B. >but i need the plain patches for a vanilla tree and other patches. So this patches should come into an patchset. Do i have to make a diff beetwen Konrads tree and a vanilla one? Regards, Stefan Kuhne _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Sat, 2010-08-14 at 10:22 -0400, Stefan Kuhne wrote:> Am 14.08.2010 16:16, schrieb Pasi Kärkkäinen: > > Hello Pasi, > > > You can use git to merge the patches from branch A to branch B. > > > but i need the plain patches for a vanilla tree and other patches. > So this patches should come into an patchset. > > Do i have to make a diff beetwen Konrads tree and a vanilla one?Navigate to the branch you''re interested in, using git checkout as described above. You can use git log to view commits to that particular branch you''re on. With -p to see the patches inline, if that helps. Patches are listed in reverse order, use -<n> to seen the last n commits. I usually also use --oneline a lot. Use git format-patch to export patches. Briefly check out rev-parse for an overview on how to select particular revisions and ranges. Before you get more familiar with that, just using -<n> is probably more straightforward. Cheers, Daniel _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Sat, Aug 14, 2010 at 04:22:03PM +0200, Stefan Kuhne wrote:> > You can use git to merge the patches from branch A to branch B. > > but i need the plain patches for a vanilla tree and other patches. > So this patches should come into an patchset. > > Do i have to make a diff beetwen Konrads tree and a vanilla one?git diff the last tag from the vanilla branch and his last tag, or his HEAD. You can also git fetch a vanilla tree into the same checkout, and then git diff the two branches. -- 2. That which causes joy or happiness. _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel
On Mon, Aug 16, 2010 at 01:55:27PM +0200, Josip Rodin wrote:> On Sat, Aug 14, 2010 at 04:22:03PM +0200, Stefan Kuhne wrote: > > > You can use git to merge the patches from branch A to branch B. > > > > but i need the plain patches for a vanilla tree and other patches. > > So this patches should come into an patchset. > > > > Do i have to make a diff beetwen Konrads tree and a vanilla one? > > git diff the last tag from the vanilla branch and his last tag, or his HEAD.Like this: git diff v2.6.32..origin/pv/pcifront-2.6.32 Thought the latest patches that I''ve been posting for review are in: devel/xen-pcifront-0.5 and they are based on top 2.6.35, so you would do: git diff v2.6.35..origin/devel/xen-pcifront-0.5 and you would get the one big mega patch for the driver. Thought don''t forget you also need the SWIOTLB/Xen-SWIOTLB stuff (which is now upstream in 2.6.36-rc0). To make folks life easier I did setup branches which have all of those patches in one location. They are: devel/merge.2.6.34 devel/merge.2.6.35 devel/merge.2.6.35-rc6.t2 pv/merge.2.6.32 pv/merge.2.6.33> > You can also git fetch a vanilla tree into the same checkout, and then > git diff the two branches.<nods> _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel