You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		12 years ago
..
agp	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel into drm-fixes	12 years ago
hw_random	IXP4xx: HW pseudo-random generator is available on IXP45x/46x only.	12 years ago
ipmi	IPMI: Detect register spacing on PCI interfaces	12 years ago
mwave	8250: three way resolve of the 8250 diffs	13 years ago
pcmcia	TTY merge for 3.7-rc1	13 years ago
tpm	Merge branch 'tpmdd-next-v3.6' of git://github.com/shpedoikal/linux into for-linus	13 years ago
xilinx_hwicap	xilinx_hwicap: reset XHI_MAX_RETRIES	13 years ago
Kconfig	char/misc: remove CONFIG_EXPERIMENTAL dependencies	13 years ago
Makefile	IPMI: Change link order	12 years ago
apm-emulation.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm	13 years ago
applicom.c	drivers/char/applicom.c: fix information leak to userland	14 years ago
applicom.h	…
bfin-otp.c	…
bsr.c	powerpc/BSR: cleanup the error path of bsr_init	13 years ago
ds1302.c	Remove all #inclusions of asm/system.h	13 years ago
ds1620.c	ARM: footbridge: nw_gpio_lock is raw_spin_lock	13 years ago
dsp56k.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	15 years ago
dtlk.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	15 years ago
efirtc.c	Remove all #inclusions of asm/system.h	13 years ago
generic_nvram.c	drivers: fix up various ->llseek() implementations	14 years ago
genrtc.c	Remove all #inclusions of asm/system.h	13 years ago
hangcheck-timer.c	…
hpet.c	printk(): add KERN_CONT where needed in hpet and vt code	13 years ago
i8k.c	module_param: make bool parameters really bool (drivers & misc)	13 years ago
lp.c	Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
mbcs.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	13 years ago
mbcs.h	Fix common misspellings	14 years ago
mem.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	13 years ago
misc.c	switch device_get_devnode() and ->devnode() to umode_t *	13 years ago
mmtimer.c	drivers/char/mmtimer.c: Remove useless kfree	13 years ago
msm_smd_pkt.c	drivers/char/msm_smd_pkt.c: don't use IS_ERR()	14 years ago
mspec.c	mm: kill vma flag VM_RESERVED and mm->reserved_vm counter	13 years ago
nsc_gpio.c	…
nvram.c	Remove all #inclusions of asm/system.h	13 years ago
nwbutton.c	drivers/char: removes unnecessary semicolon	13 years ago
nwbutton.h	…
nwflash.c	Merge branch 'late/fixes' into fixes	13 years ago
pc8736x_gpio.c	…
ppdev.c	ppdev: ppdev_init: do not return zero in case of failure	13 years ago
ps3flash.c	drivers/char: Add module.h to those who were using it implicitly	13 years ago
random.c	random: mix in architectural randomness in extract_buf()	13 years ago
raw.c	blockdev: remove bd_block_size_semaphore again	12 years ago
rtc.c	drivers/char: removes unnecessary semicolon	13 years ago
scx200_gpio.c	…
snsc.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	15 years ago
snsc.h	headers: kobject.h redux	14 years ago
snsc_event.c	…
sonypi.c	sonypi: suspend/resume callbacks should be conditionally compiled on CONFIG_PM_SLEEP	12 years ago
tb0219.c	…
tile-srom.c	tile-srom.c driver: minor code cleanup	13 years ago
tlclk.c	drivers/char/tlclk.c: fix error return code	13 years ago
toshiba.c	Merge branch 'llseek' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bkl	15 years ago
ttyprintk.c	TTY: tty_alloc_driver() returns error pointers	13 years ago
uv_mmtimer.c	BKL: remove extraneous #include <smp_lock.h>	14 years ago
virtio_console.c	virtio: console: fix error handling in init() function	13 years ago