Merge branch 'for-linus' of git://git.kernel.dk/linux-block

Browse source

Pull block fixes from Jens Axboe:
 "Just two small fixes for this -rc.

  One is just killing an unused variable from Keith, but the other
  fixes a performance regression for nbd in this series, where we
  inadvertently flipped when we set MSG_MORE when outputting data"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nbd: only set MSG_MORE when we have more to send
  blk-mq: Remove unused variable

...

This commit is contained in:

Linus Torvalds 2017-01-20 12:28:02 -08:00

parent cca112ecf2 d61b7f972d

commit e3737b9145

2 changed files with 2 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

block/blk-mq.c

View file

6

drivers/block/nbd.c

View file