Mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/ https://git.shady.money/linux/atom?h=v3.5 2012-05-24T00:08:40Z 2012-05-24T00:08:40Z Linus Torvalds torvalds@linux-foundation.org 2012-05-24T00:08:40Z urn:sha1:c80ddb526331a72c9e9d1480f85f6fd7c74e3d2d Pull md updates from NeilBrown: "It's been a busy cycle for md - lots of fun stuff here.. if you like this kind of thing :-) Main features: - RAID10 arrays can be reshaped - adding and removing devices and changing chunks (not 'far' array though) - allow RAID5 arrays to be reshaped with a backup file (not tested yet, but the priciple works fine for RAID10). - arrays can be reshaped while a bitmap is present - you no longer need to remove it first - SSSE3 support for RAID6 syndrome calculations and of course a number of minor fixes etc." * tag 'md-3.5' of git://neil.brown.name/md: (56 commits) md/bitmap: record the space available for the bitmap in the superblock. md/raid10: Remove extras after reshape to smaller number of devices. md/raid5: improve removal of extra devices after reshape. md: check the return of mddev_find() MD RAID1: Further conditionalize 'fullsync' DM RAID: Use md_error() in place of simply setting Faulty bit DM RAID: Record and handle missing devices DM RAID: Set recovery flags on resume md/raid5: Allow reshape while a bitmap is present. md/raid10: resize bitmap when required during reshape. md: allow array to be resized while bitmap is present. md/bitmap: make sure reshape request are reflected in superblock. md/bitmap: add bitmap_resize function to allow bitmap resizing. md/bitmap: use DIV_ROUND_UP instead of open-code md/bitmap: create a 'struct bitmap_counts' substructure of 'struct bitmap' md/bitmap: make bitmap bitops atomic. md/bitmap: make _page_attr bitops atomic. md/bitmap: merge bitmap_file_unmap and bitmap_file_put. md/bitmap: remove async freeing of bitmap file. md/bitmap: convert some spin_lock_irqsave to spin_lock_irq ... 2012-05-23T22:59:10Z Linus Torvalds torvalds@linux-foundation.org 2012-05-23T22:59:10Z urn:sha1:0bd3fbd4abeafa19ae0302d25194468b022d1a56 Pull crypto updates from Herbert Xu: - New cipher/hash driver for ARM ux500. - Code clean-up for aesni-intel. - Misc fixes. Fixed up conflicts in arch/arm/mach-ux500/devices-common.h, where quite frankly some of it made no sense at all (the pull brought in a declaration for the dbx500_add_platform_device_noirq() function, which neither exists nor is used anywhere). Also some trivial add-add context conflicts in the Kconfig file in drivers/{char/hw_random,crypto}/ * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: aesni-intel - move more common code to ablk_init_common crypto: aesni-intel - use crypto_[un]register_algs crypto: ux500 - Cleanup hardware identification crypto: ux500 - Update DMA handling for 3.4 mach-ux500: crypto - core support for CRYP/HASH module. crypto: ux500 - Add driver for HASH hardware crypto: ux500 - Add driver for CRYP hardware hwrng: Kconfig - modify default state for atmel-rng driver hwrng: omap - use devm_request_and_ioremap crypto: crypto4xx - move up err_request_irq label crypto, xor: Sanitize checksumming function selection output crypto: caam - add backward compatible string sec4.0 2012-05-22T03:54:04Z Jim Kukunas james.t.kukunas@linux.intel.com 2012-05-22T03:54:04Z urn:sha1:56a519913eeba2bdae4d7ee39e80fab442c3836c With CONFIG_PREEMPT=y, we need to disable preemption while benchmarking RAID5 xor checksumming to ensure we're actually measuring what we think we're measuring. Signed-off-by: Jim Kukunas <james.t.kukunas@linux.intel.com> Signed-off-by: NeilBrown <neilb@suse.de> 2012-05-22T03:54:03Z Jim Kukunas james.t.kukunas@linux.intel.com 2012-05-22T03:54:03Z urn:sha1:6a328475cccacb99a13b06978091da936dd51d89 In the existing do_xor_speed(), there is no guarantee that we actually run do_2() for a full jiffy. We get the current jiffy, then run do_2() until the next jiffy. Instead, let's get the current jiffy, then wait until the next jiffy to start our test. Signed-off-by: Jim Kukunas <james.t.kukunas@linux.intel.com> Signed-off-by: NeilBrown <neilb@suse.de> 2012-05-15T07:21:26Z Herbert Xu herbert@gondor.apana.org.au 2012-05-15T07:21:26Z urn:sha1:b29e2679d0da91c60d3ac190d9c3bd65ac2f68c5 Merge mainline to add prerequisite for ARM ux500 crypto support. 2012-04-24T03:15:17Z David S. Miller davem@davemloft.net 2012-04-24T03:14:36Z urn:sha1:f24001941c99776f41bd3f09c07d91205c2ad9d4 Fix merge between commit 3adadc08cc1e ("net ax25: Reorder ax25_exit to remove races") and commit 0ca7a4c87d27 ("net ax25: Simplify and cleanup the ax25 sysctl handling") The former moved around the sysctl register/unregister calls, the later simply removed them. With help from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net> 2012-04-20T18:14:58Z Linus Torvalds torvalds@linux-foundation.org 2012-04-20T18:14:58Z urn:sha1:277b5fb35b770792f89fbe50df03daddb3fa9521 Pull crypto fixes from Herbert Xu: - Locking fix for talitos driver - Fix 64-bit counter overflow in SHA-512 - Build fix for ixp4xx. * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: crypto: talitos - properly lock access to global talitos registers crypto: ixp4xx - include fix crypto: sha512 - Fix byte counter overflow in SHA-512 2012-04-12T23:41:23Z David S. Miller davem@davemloft.net 2012-04-12T23:41:23Z urn:sha1:011e3c63251be832d23df9f0697626ab7b354d02 2012-04-10T18:30:45Z David S. Miller davem@davemloft.net 2012-04-10T18:30:45Z urn:sha1:06eb4eafbdc0796d741d139a44f1253278da8611 2012-04-09T18:02:13Z Al Viro viro@zeniv.linux.org.uk 2012-04-09T00:31:22Z urn:sha1:f21a7c195cb20cf613147839c4a2bc1fca8c7bd8 Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>