From: "George Spelvin" <linux@horizon.com>
To: linux@horizon.com, peterz@infradead.org
Cc: bfields@fieldses.org, eric.dumazet@gmail.com,
jlayton@poochiereds.net, linux-kernel@vger.kernel.org,
linux-nfs@vger.kernel.org, riel@redhat.com, tglx@linutronix.de,
torvalds@linux-foundation.org
Subject: Re: [PATCH 1/2] <linux/hash.h>: Make hash_64(), hash_ptr() return 32 bits
Date: 2 May 2016 15:08:54 -0400 [thread overview]
Message-ID: <20160502190854.21326.qmail@ns.horizon.com> (raw)
In-Reply-To: <20160502132804.GF12845@twins.programming.kicks-ass.net>
Peter Zijlstra wrote:
> Is the subject stale or the above a mistake? Because hash_64() still
> very much seems to return u64.
Damn it no, it's a brown-paper-bag typo caused by a recent rebase.
It's meant to be u32, it was developed with u32, but the typo snuck
in during late testing and I didn't catch it.
I know Linus hates recent rebases, but I actually had a good
reason if you want to hear the saga...
I developed the patch while running v4.4.x. I'd been doing other hacking
on top of v4.5 that resulted in an unstable system, so I kept going back
to the "last known good" v4.4.x kernel to get work done.
Developing this patch, I backed out that buggy work and based it on my
4.5 tree, since Linus hates basing work on random kernels.
Most of it was compile testing, but just before submitting, I of course
had to boot it and test.
When I booted it, I discovered I couldn't load microcode. How the hell
did I cause that? Oh, I have CONFIG_MICROCODE turned off... huh? Oh,
v4.5 has bug where CONFIG_MICROCODE depende on CONFIG_BLK_DEV_INITRD
which I don't use, and the fix went in to v4.6-rc1.
Okay, fine, in the interest of getting a clean boot for testing, I'll
rebase to v4.6-rc6. See, I told you I had a reason!
Now, I actually have a fair pile of local patches for hacking projects in
progress (I'm running 4.6.0-rc6-0130), so rebasing my whole stack takes
me about an hour and a half, with several merge conflict resolutions.
Finally, I get my clean boot, and everything seems to be working
fine, and I'm ready to post.
But by this time it's late, I'm tired, and I didn't notice that I somehow
managed to screw that up! In hindsight, I think I remember the sequence
of edits that caused it (I deleted something by accident and cut & pasted
it back), but that's an even more obscure saga.
I will now go and fix it and boot test again, just to be sure.
Grump.
next prev parent reply other threads:[~2016-05-02 19:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <alpine.DEB.2.11.1605020908080.3692@nanos>
2016-05-02 10:20 ` [PATCH 1/2] <linux/hash.h>: Make hash_64(), hash_ptr() return 32 bits George Spelvin
2016-05-02 10:22 ` [PATCH 2/2] <linux/hash.h>: Fix hash_64()'s horrible collision problem George Spelvin
2016-05-02 20:08 ` Linus Torvalds
2016-05-02 13:28 ` [PATCH 1/2] <linux/hash.h>: Make hash_64(), hash_ptr() return 32 bits Peter Zijlstra
2016-05-02 19:08 ` George Spelvin [this message]
2016-05-02 16:24 ` Linus Torvalds
2016-05-02 20:26 ` George Spelvin
2016-05-02 21:19 ` Linus Torvalds
2016-05-02 21:41 ` Linus Torvalds
2016-05-03 1:59 ` George Spelvin
2016-05-03 3:01 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160502190854.21326.qmail@ns.horizon.com \
--to=linux@horizon.com \
--cc=bfields@fieldses.org \
--cc=eric.dumazet@gmail.com \
--cc=jlayton@poochiereds.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=riel@redhat.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox