Message ID | alpine.DEB.2.00.1107092031400.15984@utopia.booyaka.com |
---|---|
State | New |
Headers | show |
* Paul Walmsley <paul@pwsan.com> [110709 19:32]: > Hello Tony, > > The following changes since commit ecba3287b4121dcf3ca7607fe71c205913edec06: > > Merge branch 'cleanup-part-2' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap/cleanup (2011-07-08 15:01:45 +0000) > > are available in the git repository at: > > git://git.pwsan.com/linux-2.6 prcm-cleanup-3.1 I've merged this into linux-omap master for testing and also merged it into cleanup-part-3 along Russell's timer cleanup patch. Paul, please use the mainline tags or linux-omap static branches instead of the arm-soc branches. In this case there's only the extra merge commit there, so not a problem. Now it just makes it a bit harder for me to do pull requests and diffs to other branches. In general, we want to keep the dependencies between branches and other trees to minimum. Regards, Tony
Hi Tony, On Mon, 11 Jul 2011, Tony Lindgren wrote: > Paul, please use the mainline tags or linux-omap static branches > instead of the arm-soc branches. In this case there's only the extra > merge commit there, so not a problem. Now it just makes it a bit > harder for me to do pull requests and diffs to other branches. > > In general, we want to keep the dependencies between branches and > other trees to minimum. Sorry about that. It was a misunderstanding on my part. Would you like me to rebase the prcm-fixes-3.1 and prcm-devel-3.1 branches on a different branch/commit? - Paul
* Paul Walmsley <paul@pwsan.com> [110712 23:33]: > Hi Tony, > > On Mon, 11 Jul 2011, Tony Lindgren wrote: > > > Paul, please use the mainline tags or linux-omap static branches > > instead of the arm-soc branches. In this case there's only the extra > > merge commit there, so not a problem. Now it just makes it a bit > > harder for me to do pull requests and diffs to other branches. > > > > In general, we want to keep the dependencies between branches and > > other trees to minimum. > > Sorry about that. It was a misunderstanding on my part. No problem, we should probably document that in the wiki page.. > Would you like me to rebase the prcm-fixes-3.1 and prcm-devel-3.1 branches > on a different branch/commit? No need to, they're already all pulled in and in arm-soc waiting for the merge window. Regards, Tony