Linus Torvalds 7e0fb73c52 Merge branch 'hash' of git://ftp.sciencehorizons.net/linux ... Pull string hash improvements from George Spelvin: "This series does several related things: - Makes the dcache hash (fs/namei.c) useful for general kernel use. (Thanks to Bruce for noticing the zero-length corner case) - Converts the string hashes in <linux/sunrpc/svcauth.h> to use the above. - Avoids 64-bit multiplies in hash_64() on 32-bit platforms. Two 32-bit multiplies will do well enough. - Rids the world of the bad hash multipliers in hash_32. This finishes the job started in commit 689de1d6ca ("Minimal fix-up of bad hashing behavior of hash_64()") The vast majority of Linux architectures have hardware support for 32x32-bit multiply and so derive no benefit from "simplified" multipliers. The few processors that do not (68000, h8/300 and some models of Microblaze) have arch-specific implementations added. Those patches are last in the series. - Overhauls the dcache hash mixing. The patch in commit 0fed3ac866 ("namei: Improve hash mixing if CONFIG_DCACHE_WORD_ACCESS") was an off-the-cuff suggestion. Replaced with a much more careful design that's simultaneously faster and better. (My own invention, as there was noting suitable in the literature I could find. Comments welcome!) - Modify the hash_name() loop to skip the initial HASH_MIX(). This would let us salt the hash if we ever wanted to. - Sort out partial_name_hash(). The hash function is declared as using a long state, even though it's truncated to 32 bits at the end and the extra internal state contributes nothing to the result. And some callers do odd things: - fs/hfs/string.c only allocates 32 bits of state - fs/hfsplus/unicode.c uses it to hash 16-bit unicode symbols not bytes - Modify bytemask_from_count to handle inputs of 1..sizeof(long) rather than 0..sizeof(long)-1. This would simplify users other than full_name_hash" Special thanks to Bruce Fields for testing and finding bugs in v1. (I learned some humbling lessons about "obviously correct" code.) On the arch-specific front, the m68k assembly has been tested in a standalone test harness, I've been in contact with the Microblaze maintainers who mostly don't care, as the hardware multiplier is never omitted in real-world applications, and I haven't heard anything from the H8/300 world" * 'hash' of git://ftp.sciencehorizons.net/linux: h8300: Add <asm/hash.h> microblaze: Add <asm/hash.h> m68k: Add <asm/hash.h> <linux/hash.h>: Add support for architecture-specific functions fs/namei.c: Improve dcache hash function Eliminate bad hash multipliers from hash_32() and hash_64() Change hash_64() return value to 32 bits <linux/sunrpc/svcauth.h>: Define hash_str() in terms of hashlen_string() fs/namei.c: Add hashlen_string() function Pull out string hash to <linux/stringhash.h>		2016-05-28 16:15:25 -07:00
..
airspy	[media] airspy: fix bit set/clean mess on s->flags	2016-03-01 10:48:17 -03:00
as102
au0828	[media] media: au0828 fix au0828_v4l2_device_register() to not unlock and free	2016-05-09 13:20:42 -03:00
b2c2
cpia2
cx231xx	Merge branch 'i2c/for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux	2016-05-19 17:48:12 -07:00
dvb-usb	scripts/spelling.txt: add "fimware" misspelling	2016-05-19 19:12:14 -07:00
dvb-usb-v2	Merge branch 'hash' of git://ftp.sciencehorizons.net/linux	2016-05-28 16:15:25 -07:00
em28xx	[media] em28xx: add support for Hauppauge WinTV-dualHD DVB tuner	2016-05-09 14:25:39 -03:00
go7007	[media] v4l2-device.h: add v4l2_device_mask_ variants	2016-04-20 16:08:42 -03:00
gspca	[media] touptek: cast char types on %x printk	2016-03-10 13:37:45 -03:00
hackrf
hdpvr
msi2500
pvrusb2	[media] pvrusb2: fix smatch errors	2016-04-20 15:48:29 -03:00
pwc
s2255
siano
stk1160
stkwebcam
tm6000
ttusb-budget
ttusb-dec
usbtv
usbvision	[media] usbvision: revert commit 588afcc1	2016-04-20 15:58:54 -03:00
uvc	[media] UVC: Add support for R200 depth camera	2016-03-03 06:49:20 -03:00
zr364xx
Kconfig
Makefile