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
Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes
2012-10-16 10:11:59 +10:00
IXP4xx: HW pseudo-random generator is available on IXP45x/46x only.
2012-11-22 03:35:39 +00:00
IPMI: Detect register spacing on PCI interfaces
2012-10-16 18:07:12 -07:00
8250: three way resolve of the 8250 diffs
2012-07-17 09:11:50 -07:00
TTY merge for 3.7-rc1
2012-10-01 12:26:52 -07:00
Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus
2012-10-11 18:41:29 +08:00
xilinx_hwicap: reset XHI_MAX_RETRIES
2012-04-19 19:09:18 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm
2012-04-05 17:34:30 -07:00
powerpc/BSR: cleanup the error path of bsr_init
2012-07-17 10:27:38 -07:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
ARM: footbridge: nw_gpio_lock is raw_spin_lock
2012-10-07 10:33:12 +02:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
printk(): add KERN_CONT where needed in hpet and vt code
2012-04-09 10:30:39 -07:00
char/misc: remove CONFIG_EXPERIMENTAL dependencies
2012-09-18 16:14:53 +01:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-03-29 18:12:23 -07:00
IPMI: Change link order
2012-10-16 18:07:12 -07:00
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
drivers/char/mmtimer.c: Remove useless kfree
2012-09-26 13:20:40 -07:00
mm: kill vma flag VM_RESERVED and mm->reserved_vm counter
2012-10-09 16:22:19 +09:00
Remove all #inclusions of asm/system.h
2012-03-28 18:30:03 +01:00
drivers/char: removes unnecessary semicolon
2012-09-26 13:20:39 -07:00
Merge branch 'late/fixes' into fixes
2012-10-07 07:22:32 -07:00
ppdev: ppdev_init: do not return zero in case of failure
2012-09-05 13:44:04 -07:00
random: mix in architectural randomness in extract_buf()
2012-07-27 22:37:20 -04:00
blockdev: remove bd_block_size_semaphore again
2012-11-29 10:52:19 -08:00
drivers/char: removes unnecessary semicolon
2012-09-26 13:20:39 -07:00
sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP
2012-10-25 12:05:50 -07:00
tile-srom.c driver: minor code cleanup
2012-04-02 12:14:10 -04:00
drivers/char/tlclk.c: fix error return code
2012-08-16 10:09:15 -07:00
TTY: tty_alloc_driver() returns error pointers
2012-08-16 12:07:23 -07:00
virtio: console: fix error handling in init() function
2012-09-28 15:05:13 +09:30
d3594ea2b3