diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-19 19:12:17 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-19 19:12:17 +0200 |
| commit | 14e931a264498fbd4baef07ee0644e347252393b (patch) | |
| tree | c202cd976f478fed3d7d786521ab3e32abdc0f9e /drivers/ptp | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | block: fix buffer overflow when printing partition UUIDs (diff) | |
| download | linux-14e931a264498fbd4baef07ee0644e347252393b.tar.xz linux-14e931a264498fbd4baef07ee0644e347252393b.zip | |
Merge branch 'for-linus' of git://git.kernel.dk/linux-block
Pull block layer fixes from Jens Axboe:
"A few small, but important fixes. Most of them are marked for stable
as well
- Fix failure to release a semaphore on error path in mtip32xx.
- Fix crashable condition in bio_get_nr_vecs().
- Don't mark end-of-disk buffers as mapped, limit it to i_size.
- Fix for build problem with CONFIG_BLOCK=n on arm at least.
- Fix for a buffer overlow on UUID partition printing.
- Trivial removal of unused variables in dac960."
* 'for-linus' of git://git.kernel.dk/linux-block:
block: fix buffer overflow when printing partition UUIDs
Fix blkdev.h build errors when BLOCK=n
bio allocation failure due to bio_get_nr_vecs()
block: don't mark buffers beyond end of disk as mapped
mtip32xx: release the semaphore on an error path
dac960: Remove unused variables from DAC960_CreateProcEntries()
Diffstat (limited to 'drivers/ptp')
0 files changed, 0 insertions, 0 deletions