On Fri, Jul 19, 2013 at 11:17:44AM -0700, Andrew Morton wrote: > On Fri, 19 Jul 2013 14:00:35 -0400 Johannes Weiner <hannes@xxxxxxxxxxx> wrote: > > > > >A git tree which contains the memory management portion of this tree is > > > >maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git > > > >by Michal Hocko. It contains the patches which are between the > > > >"#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series > > > >file, http://www.ozlabs.org/~akpm/mmotm/series. > > > > > > > > > > > >A full copy of the full kernel tree with the linux-next and mmotm patches > > > >already applied is available through git within an hour of the mmotm > > > >release. Individual mmotm releases are tagged. The master branch always > > > >points to the latest release, so it's constantly rebasing. > > > > > > > >http://git.cmpxchg.org/?p=linux-mmotm.git;a=summary > > > > > > > >To develop on top of mmotm git: > > > > > > > > $ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git > > > > $ git remote update mmotm > > > > $ git checkout -b topic mmotm/master > > > > <make changes, commit> > > > > $ git send-email mmotm/master.. [...] > > > > > > > >To rebase a branch with older patches to a new mmotm release: > > > > > > > > $ git remote update mmotm > > > > $ git rebase --onto mmotm/master <topic base> topic > > > > Andrew, that workflow is actually meant for > > http://git.cmpxchg.org/?p=linux-mmotm.git;a=summary, not Michal's tree > > (i.e. the git remote add mmotm <michal's tree> does not make much > > sense). Michal's tree is append-only, so all this precision-rebasing > > is unnecessary. > > Gee, I haven't looked at that text in a while... > > Could you guys please check it, propose any fixes we should make? > > > > README for mm-of-the-moment: > > http://www.ozlabs.org/~akpm/mmotm/ > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully > more than once a week. > > You will need quilt to apply these patches to the latest Linus release (3.x > or 3.x-rcY). The series file is in broken-out.tar.gz and is duplicated in > http://ozlabs.org/~akpm/mmotm/series > > The file broken-out.tar.gz contains two datestamp files: .DATE and > .DATE-yyyy-mm-dd-hh-mm-ss. Both contain the string yyyy-mm-dd-hh-mm-ss, > followed by the base kernel version against which this patch series is to > be applied. > > This tree is partially included in linux-next. To see which patches are > included in linux-next, consult the `series' file. Only the patches > within the #NEXT_PATCHES_START/#NEXT_PATCHES_END markers are included in > linux-next. > > A git tree which contains the memory management portion of this tree is ^^^ on top of the latest Linus release maybe? > maintained at git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git > by Michal Hocko. It contains the patches which are between the > "#NEXT_PATCHES_START mm" and "#NEXT_PATCHES_END" markers, from the series > file, http://www.ozlabs.org/~akpm/mmotm/series. > > A full copy of the full kernel tree with the linux-next and mmotm patches > already applied is available through git within an hour of the mmotm > release. Individual mmotm releases are tagged. The master branch always > points to the latest release, so it's constantly rebasing. > > http://git.cmpxchg.org/?p=linux-mmotm.git;a=summary > > To develop on top of mmotm git: > > $ git remote add mmotm git://git.kernel.org/pub/scm/linux/kernel/git/mhocko/mm.git git://git.cmpxchg.org/linux-mmotm.git > $ git remote update mmotm > $ git checkout -b topic mmotm/master > <make changes, commit> > $ git send-email mmotm/master.. [...] > > To rebase a branch with older patches to a new mmotm release: > > $ git remote update mmotm > $ git rebase --onto mmotm/master <topic base> topic Michal started his mm.git to have a stable memory management development base, yet here is a long section on how to work with the much more awkward mmotm.git. So I wonder if this whole section on how to develop against mmotm.git should be removed and only a reference to where it could be found left in. However, I have actually no idea what people use as an mm development base these days... I know I base smaller things on the latest mmotm.git and send it out fairly quickly before even having to deal with rebasing and tracking changes in there. Long term stuff I just base on the latest Linus release (suboptimal, I know). Michal? -- To unsubscribe from this list: send the line "unsubscribe linux-next" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
