| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <469E9E98.4000003@gentoo.org> Date: Wed, 18 Jul 2007 19:13:28 -0400 From: Daniel Drake <dsd@...too.org> To: Steve French <smfrench@...il.com> CC: LKML <linux-kernel@...r.kernel.org> Subject: Re: -mm breaks and merging maintainer git trees with mainline Steve French wrote: > What is the currently recommended procedure for merging a maintainer > tree with mainline in order to reorder all of the fixes in the > maintainer tree, after the changes in the linux-2.6. tree (to make the > eventual merge from Linus easier)? > > In this particular case, the > http://git.kernel.org/?p=linux/kernel/git/sfrench/cifs-2.6.git tree > has a few dozen changesets that are not in its parent yet (and the > cifs-2.6.git is at 2.6.22-rc5 level) > (http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git) but > mainline now has fixes which affect the same directory as the > maintainer tree maintains. I think you can do: git checkout origin git pull git checkout master git rebase origin In general, people seem to keep "from-linus" branches which they never modify. I guess they only ever pull linus into there, and then rebase their customised branch-of-choice (master, in your case) on top of that one in order to keep up-to-date. Daniel - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists