| 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: Fri, 16 Jan 2009 10:44:17 +0100 From: Andreas Schwab <schwab@...e.de> To: Mike Travis <travis@....com> Cc: LKML <linux-kernel@...r.kernel.org> Subject: Re: crash: IP: [<ffffffff80478092>] __bitmap_intersects+0x48/0x73 [PATCH supplied] Mike Travis <travis@....com> writes: > Andreas Schwab wrote: >> Mike Travis <travis@....com> writes: >> >>> 23> git-remote update >>> Updating linus >>> Updating tip >> >> This only updates the remotes, but does not merge anything into your >> local branch. You need to run "git merge tip" to do that. >> >> Andreas. >> > > Ahh, that's the secret ingredient! > > In my particular instance it's: > > git merge tip/cpus4096 > > (Git has been quite a learning experience... ;-) I wonder if git pull wouldn't work as well. Andreas. -- Andreas Schwab, SuSE Labs, schwab@...e.de SuSE Linux Products GmbH, Maxfeldstraße 5, 90409 Nürnberg, Germany PGP key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different." -- 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