Linus Torvalds
d3594ea2b3
Merge branch 'block-dev' ...
Merge 'block-dev' branch.
I was going to just mark everything here for stable and leave it to the
3.8 merge window, but having decided on doing another -rc, I migth as
well merge it now.
This removes the bd_block_size_semaphore semaphore that was added in
this release to fix a race condition between block size changes and
block IO, and replaces it with atomicity guaratees in fs/buffer.c
instead, along with simplifying fs/block-dev.c.
This removes more lines than it adds, makes the code generally simpler,
and avoids the latency/rt issues that the block size semaphore
introduced for mount.
I'm not happy with the timing, but it wouldn't be much better doing this
during the merge window and then having some delayed back-port of it
into stable.
* block-dev:
blkdev_max_block: make private to fs/buffer.c
direct-io: don't read inode->i_blkbits multiple times
blockdev: remove bd_block_size_semaphore again
fs/buffer.c: make block-size be per-page and protected by the page lock
2012-12-03 10:53:25 -08:00
ACPI video: Ignore errors after _DOD evaluation.
2012-11-03 09:52:54 +08:00
SCSI fixes on 20121122
2012-11-22 09:14:54 -10:00
atm: forever loop loading ambassador firmware
2012-11-28 11:38:11 -05:00
PM / QoS: fix wrong error-checking condition
2012-11-23 20:55:06 +01:00
bcma: fix unregistration of cores
2012-10-15 14:45:51 -04:00
mtip32xx: Fix padding issue
2012-11-23 14:32:55 +01:00
Bluetooth: ath3k: Add support for VAIO VPCEH [0489:e027]
2012-11-09 16:45:37 +01:00
drivers: bus: ocp2scp: add pdata support
2012-11-07 09:35:53 -08:00
Merge branch 'block-dev'
2012-12-03 10:53:25 -08:00
clk: ux500: Register slimbus clock lookups for u8500
2012-11-12 10:20:23 -08:00
cpufreq / powernow-k8: Change maintainer's email address
2012-10-31 21:02:57 +01:00
IXP4xx crypto: MOD_AES{128,192,256} already include key size.
2012-11-22 03:36:15 +00:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2012-10-26 14:59:01 -07:00
EDAC: Change Boris' email address
2012-10-30 10:05:51 +01:00
extcon : register for cable interest by cable name
2012-10-23 16:32:18 +09:00
[SCSI] sd: Implement support for WRITE SAME
2012-11-13 22:45:42 -08:00
firmware/memmap: avoid type conflicts with the generic memmap_init()
2012-10-19 14:07:47 -07:00
gpio-mcp23s08: Build I2C support even when CONFIG_I2C=m
2012-11-17 22:22:24 +01:00
Merge branch 'drm-fixes-3.7' of git://people.freedesktop.org/~agd5f/linux
2012-11-28 16:51:10 +10:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
2012-11-16 07:58:20 -08:00
Drivers: hv: Cleanup error handling in vmbus_open()
2012-10-24 15:46:27 -07:00
hwmon: Fix chip feature table headers
2012-11-05 21:54:40 +01:00
Merge branch 'i2c-embedded/for-current' of git://git.pengutronix.de/git/wsa/linux
2012-11-23 11:59:26 -10:00
iio: Remove duplicates for light/ in Kconfig and Makefile
2012-10-19 19:44:06 +01:00
Merge branches 'cxgb4' and 'mlx4' into for-next
2012-10-23 09:03:49 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-11-22 21:45:34 -10:00
intel-iommu: Fix lookup in add device
2012-11-17 13:27:15 +01:00
irqchip: irq-bcm2835: Add terminating entry for of_device_id table
2012-11-06 07:37:10 -08:00
isdn: Make CONFIG_ISDN depend on CONFIG_NETDEVICES
2012-11-07 18:59:26 -05:00
ledtrig-cpu: kill useless mutex to fix sleep in atomic context
2012-11-11 12:09:43 -08:00
Single bugfix for raid1/raid10.
2012-12-02 16:24:31 -08:00
[media] rtl28xxu: 0ccd:00d7 TerraTec Cinergy T Stick+
2012-11-22 12:04:53 -02:00
mfd: twl4030: Fix chained irq handling on resume from suspend
2012-11-21 17:46:41 +01:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
mmc: sdhci-s3c: fix the card detection in runtime-pm
2012-11-07 15:40:52 -05:00
revert "Revert "mm: remove __GFP_NO_KSWAPD""
2012-11-30 08:51:17 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-12-02 16:39:00 -08:00
NFC: Fix pn533 target mode memory leak
2012-11-20 00:09:26 +01:00
of/platform: sparse fix
2012-10-17 15:53:03 -05:00
PCI/portdrv: Don't create hotplug slots unless port supports hotplug
2012-11-05 16:59:59 -07:00
Merge branch 'testing/driver-warnings' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc into fixes
2012-10-19 15:40:18 -07:00
pinctrl/samsung: don't allow enabling pinctrl-samsung standalone
2012-11-15 11:58:24 +01:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-10-13 11:27:59 +09:00
pwm: Changes for v3.7-rc1
2012-10-10 20:15:24 +09:00
rapidio: fix kernel-doc warnings
2012-11-16 14:33:04 -08:00
Merge remote-tracking branches 'regulator/fix/gpio', 'regulator/fix/put' and 'regulator/fix/supp-volt' into tmp
2012-11-15 11:16:02 +09:00
remoteproc: fix error path of ->find_vqs
2012-11-29 10:05:09 +02:00
drivers/rtc/rtc-tps65910.c: fix invalid pointer access on _remove()
2012-11-30 08:51:18 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-11-16 14:10:15 -08:00
[SCSI] sd: Implement support for WRITE SAME
2012-11-13 22:45:42 -08:00
sh: Fix up more fallout from pointless ARM __iomem churn.
2012-10-15 14:08:48 +09:00
spi: Some minor MXS fixes
2012-10-28 11:13:54 -07:00
Revert "Staging: Android alarm: IOCTL command encoding fix"
2012-11-13 13:04:43 -08:00
target: Fix handling of aborted commands
2012-11-17 13:35:44 -08:00
exynos4_tmu_driver_ids should be exynos_tmu_driver_ids.
2012-11-03 09:52:55 +08:00
tty vt: Fix a regression in command line edition
2012-11-21 16:45:32 -08:00
SCSI fixes on 20121122
2012-11-22 09:14:54 -10:00
vfio: Fix PCI INTx disable consistency
2012-10-10 09:10:32 -06:00
vhost: fix length for cross region descriptor
2012-11-28 11:27:01 -05:00
omapdss fixes for 3.7-rc
2012-11-23 12:01:02 -10:00
virtio: Don't access index after unregister.
2012-11-09 14:54:24 +10:30
Bug-fix:
2012-11-20 18:52:01 -10:00
IPMI: Change link order
2012-10-16 18:07:12 -07:00
d3594ea2b3