| 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
| ||
|
Date: Tue, 24 Jun 2008 20:38:07 +0200 From: Bernhard Walle <bwalle@...e.de> To: akataria@...are.com Cc: Ingo Molnar <mingo@...e.hu>, LKML <linux-kernel@...r.kernel.org> Subject: Re: merge conflicts with tip/master * Alok Kataria <akataria@...are.com> [2008-06-24 10:18]: > > While working with tip/master...after following the steps in the readme > @ http://people.redhat.com/mingo/tip.git/readme.txt > > I usually do any changes and manage them using "quilt". > Once the changes are pushed upstream, i do a "quilt pop" > and generally try a "git pull" to check for any new changes, along with > the change that was just pushed. You might also try guilt [1], which is a mix between st-git and quilt. Just a hint, it does not solve your problem. :) Bernhard [1] http://www.kernel.org/pub/linux/kernel/people/jsipek/guilt/ -- Bernhard Walle, SUSE LINUX Products GmbH, Architecture Development -- 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