| 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: Thu, 28 Oct 2010 15:51:35 -0400 From: Mike Frysinger <vapier.adi@...il.com> To: Michal Marek <mmarek@...e.cz> Cc: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>, Michael Holzheu <holzheu@...ux.vnet.ibm.com>, tabbott@...lice.com, vda.linux@...glemail.com, hpa@...ux.intel.com, akpm@...ux-foundation.org, linux-kernel@...r.kernel.org, heiko.carstens@...ibm.com, schwidefsky@...ibm.com, Sam Ravnborg <sam@...nborg.org> Subject: Re: [PATCH] initramfs: Fix build break on symbol-prefixed archs On Thu, Oct 28, 2010 at 15:46, Mike Frysinger wrote: > On Thu, Oct 28, 2010 at 08:08, Michal Marek wrote: >> On 28.10.2010 01:58, Mike Frysinger wrote: >>> The previous commit works and >>>> the next will do as well if you submit the patch. >>> >>> if my change is going in after your bad commit, then you can squash it >>> with a simple `git commit --amend`. >> >> I know how to rewrite the branch, I just don't want to do it needlessly >> so that 'git pull' still works for people tracking the branch. > > keeping git bisect sane is not what i would classify as "needlessly" plus, there is no requirement that your current tree be what Linus pulls. add my patch to your branch-that-may-not-be-rebased, then create a new branch with those two squashed, and have Linus pull that. your main branch will pick up a merge commit, but who cares. -mike -- 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