Linux Kernel https://git.stealer.net/cgit.cgi/user/sven/linux.git/atom?h=v3.2 2011-11-12T01:40:02Z 2011-11-12T01:40:02Z Linus Torvalds torvalds@linux-foundation.org 2011-11-12T01:40:02Z urn:sha1:42a0ddcd484d0470d4c1b114ffb6be1d35f8ac6b * git://github.com/herbertx/crypto: crypto: algapi - Fix build problem with NET disabled crypto: user - Fix rwsem leak in crypto_user 2011-11-10T22:57:06Z Herbert Xu herbert@gondor.apana.org.au 2011-11-03T12:46:07Z urn:sha1:3acc84739dd5d746840f881ad4d60bd2a428f1dd The report functions use NLA_PUT so we need to ensure that NET is enabled. Reported-by: Luis Henriques <henrix@camandro.org> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2011-11-07T03:44:47Z Linus Torvalds torvalds@linux-foundation.org 2011-11-07T03:44:47Z urn:sha1:32aaeffbd4a7457bf2f7448b33b5946ff2a960eb * 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits) Revert "tracing: Include module.h in define_trace.h" irq: don't put module.h into irq.h for tracking irqgen modules. bluetooth: macroize two small inlines to avoid module.h ip_vs.h: fix implicit use of module_get/module_put from module.h nf_conntrack.h: fix up fallout from implicit moduleparam.h presence include: replace linux/module.h with "struct module" wherever possible include: convert various register fcns to macros to avoid include chaining crypto.h: remove unused crypto_tfm_alg_modname() inline uwb.h: fix implicit use of asm/page.h for PAGE_SIZE pm_runtime.h: explicitly requires notifier.h linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h miscdevice.h: fix up implicit use of lists and types stop_machine.h: fix implicit use of smp.h for smp_processor_id of: fix implicit use of errno.h in include/linux/of.h of_platform.h: delete needless include <linux/module.h> acpi: remove module.h include from platform/aclinux.h miscdevice.h: delete unnecessary inclusion of module.h device_cgroup.h: delete needless include <linux/module.h> net: sch_generic remove redundant use of <linux/module.h> net: inet_timewait_sock doesnt need <linux/module.h> ... Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in - drivers/media/dvb/frontends/dibx000_common.c - drivers/media/video/{mt9m111.c,ov6650.c} - drivers/mfd/ab3550-core.c - include/linux/dmaengine.h 2011-11-01T22:15:16Z Jonathan Corbet corbet@lwn.net 2011-11-01T22:15:16Z urn:sha1:fb223c32b4d3ee593c8dce07e983680d06abe387 The list_empty case in crypto_alg_match() will return without calling up_read() on crypto_alg_sem. We could do the "goto out" routine, but the function will clearly do the right thing with that test simply removed. Signed-off-by: Jonathan Corbet <corbet@lwn.net> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2011-11-01T16:24:41Z Linus Torvalds torvalds@linux-foundation.org 2011-11-01T16:24:41Z urn:sha1:dc47d3810cdcb4f32bfa31d50f26af97aced0638 * git://github.com/herbertx/crypto: (48 commits) crypto: user - Depend on NET instead of selecting it crypto: user - Add dependency on NET crypto: talitos - handle descriptor not found in error path crypto: user - Initialise match in crypto_alg_match crypto: testmgr - add twofish tests crypto: testmgr - add blowfish test-vectors crypto: Make hifn_795x build depend on !ARCH_DMA_ADDR_T_64BIT crypto: twofish-x86_64-3way - fix ctr blocksize to 1 crypto: blowfish-x86_64 - fix ctr blocksize to 1 crypto: whirlpool - count rounds from 0 crypto: Add userspace report for compress type algorithms crypto: Add userspace report for cipher type algorithms crypto: Add userspace report for rng type algorithms crypto: Add userspace report for pcompress type algorithms crypto: Add userspace report for nivaead type algorithms crypto: Add userspace report for aead type algorithms crypto: Add userspace report for givcipher type algorithms crypto: Add userspace report for ablkcipher type algorithms crypto: Add userspace report for blkcipher type algorithms crypto: Add userspace report for ahash type algorithms ... 2011-11-01T01:12:43Z Herbert Xu herbert@gondor.apana.org.au 2011-11-01T01:12:43Z urn:sha1:5db017aa2809c49ca0a43b0f3ed1267e6be60883 Selecting NET causes all sorts of issues, including a dependency loop involving bluetooth. This patch makes it a dependency instead. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2011-10-31T23:31:11Z Paul Gortmaker paul.gortmaker@windriver.com 2011-05-27T18:41:48Z urn:sha1:4bb33cc8901898af80d5d4a9917067aa0839922a Part of the include cleanups means that the implicit inclusion of module.h via device.h is going away. So fix things up in advance. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> 2011-10-26T15:15:10Z Herbert Xu herbert@gondor.apana.org.au 2011-10-26T15:15:10Z urn:sha1:ea8bdfcff17599e5d80f93e2ae194fbbab7f8d5e Since the configuration interface relies on netlink we need to select NET. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2011-10-21T12:37:10Z Herbert Xu herbert@gondor.apana.org.au 2011-10-21T12:37:10Z urn:sha1:e6ea64ece7f4c14294b2fce5403b1e71eab87f1e We need to default match to 0 as otherwise it may lead to a false positive. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> 2011-10-21T12:28:58Z Jussi Kivilinna jussi.kivilinna@mbnet.fi 2011-10-10T20:03:12Z urn:sha1:573da6208a7e2b2d8666b8b02f5054d3a4e12998 Add tests for parallel twofish-x86_64-3way code paths. Signed-off-by: Jussi Kivilinna <jussi.kivilinna@mbnet.fi> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>