| 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: Wed, 13 Jun 2012 17:20:46 -0600 From: Bjorn Helgaas <bhelgaas@...gle.com> To: Stephen Rothwell <sfr@...b.auug.org.au> Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org, Yinghai Lu <yinghai@...nel.org>, "David S. Miller" <davem@...emloft.net>, sparclinux@...r.kernel.org Subject: Re: linux-next: build failure after merge of the final tree (pci tree related) On Tue, Jun 12, 2012 at 6:50 PM, Stephen Rothwell <sfr@...b.auug.org.au> wrote: > Hi Bjorn, > > On Tue, 12 Jun 2012 09:31:49 -0600 Bjorn Helgaas <bhelgaas@...gle.com> wrote: >> >> Thanks, I folded this typo fix into the relevant patch. I'll rebase >> "next" today. Sorry for the trouble. > > I am not sure what you have done, but now you have a set of duplicated > commits in your tree including both versions of the one that caused the > build failure. This is because of my inept git usage. I think my "next" branch ended up with the right bits in it, but the history looked strange because I fixed the typo in the Yinghai branch, but had a second branch that depended on the original unfixed branch. I rebuilt my "next" branch again and I think it's more straightforward. And I learned a tiny bit more about git, so thanks for pointing this out. Bjorn -- 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