Skip to content

Commit a0725ab

Browse files
torvaldstorvalds
committed
Merge branch 'for-4.14/block' of git://git.kernel.dk/linux-block
Pull block layer updates from Jens Axboe: "This is the first pull request for 4.14, containing most of the code changes. It's a quiet series this round, which I think we needed after the churn of the last few series. This contains: - Fix for a registration race in loop, from Anton Volkov. - Overflow complaint fix from Arnd for DAC960. - Series of drbd changes from the usual suspects. - Conversion of the stec/skd driver to blk-mq. From Bart. - A few BFQ improvements/fixes from Paolo. - CFQ improvement from Ritesh, allowing idling for group idle. - A few fixes found by Dan's smatch, courtesy of Dan. - A warning fixup for a race between changing the IO scheduler and device remova. From David Jeffery. - A few nbd fixes from Josef. - Support for cgroup info in blktrace, from Shaohua. - Also from Shaohua, new features in the null_blk driver to allow it to actually hold data, among other things. - Various corner cases and error handling fixes from Weiping Zhang. - Improvements to the IO stats tracking for blk-mq from me. Can drastically improve performance for fast devices and/or big machines. - Series from Christoph removing bi_bdev as being needed for IO submission, in preparation for nvme multipathing code. - Series from Bart, including various cleanups and fixes for switch fall through case complaints" * 'for-4.14/block' of git://git.kernel.dk/linux-block: (162 commits) kernfs: checking for IS_ERR() instead of NULL drbd: remove BIOSET_NEED_RESCUER flag from drbd_{md_,}io_bio_set drbd: Fix allyesconfig build, fix recent commit drbd: switch from kmalloc() to kmalloc_array() drbd: abort drbd_start_resync if there is no connection drbd: move global variables to drbd namespace and make some static drbd: rename "usermode_helper" to "drbd_usermode_helper" drbd: fix race between handshake and admin disconnect/down drbd: fix potential deadlock when trying to detach during handshake drbd: A single dot should be put into a sequence. drbd: fix rmmod cleanup, remove _all_ debugfs entries drbd: Use setup_timer() instead of init_timer() to simplify the code. drbd: fix potential get_ldev/put_ldev refcount imbalance during attach drbd: new disk-option disable-write-same drbd: Fix resource role for newly created resources in events2 drbd: mark symbols static where possible drbd: Send P_NEG_ACK upon write error in protocol != C drbd: add explicit plugging when submitting batches drbd: change list_for_each_safe to while(list_first_entry_or_null) drbd: introduce drbd_recv_header_maybe_unplug ...
2 parents 3ee31b8 + ef13ecb commit a0725ab

160 files changed

Lines changed: 3684 additions & 3486 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎MAINTAINERS‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12561,6 +12561,12 @@ M: Ion Badulescu <ionut@badula.org>
1256112561
S: Odd Fixes
1256212562
F: drivers/net/ethernet/adaptec/starfire*
1256312563

12564+
STEC S1220 SKD DRIVER
12565+
M: Bart Van Assche <bart.vanassche@wdc.com>
12566+
L: linux-block@vger.kernel.org
12567+
S: Maintained
12568+
F: drivers/block/skd*[ch]
12569+
1256412570
STI CEC DRIVER
1256512571
M: Benjamin Gaignard <benjamin.gaignard@linaro.org>
1256612572
S: Maintained

‎arch/powerpc/sysdev/axonram.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ axon_ram_irq_handler(int irq, void *dev)
110110
static blk_qc_t
111111
axon_ram_make_request(struct request_queue *queue, struct bio *bio)
112112
{
113-
struct axon_ram_bank *bank = bio->bi_bdev->bd_disk->private_data;
113+
struct axon_ram_bank *bank = bio->bi_disk->private_data;
114114
unsigned long phys_mem, phys_end;
115115
void *user_mem;
116116
struct bio_vec vec;

0 commit comments

Comments
 (0)