diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 15:03:07 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-26 15:03:07 -0700 | 
| commit | d05d7f40791ccbb6e543cc5dd6a6aa08fc71d635 (patch) | |
| tree | dc0039fe490a41a70de10d58fe8e6136db46463a /tools/perf/scripts/python/net_dropmonitor.py | |
| parent | 75a442efb1ca613f8d1cc71a32c2c9b0aefae4a5 (diff) | |
| parent | 17007f3994cdb4643355c73f54f0adad006cf59e (diff) | |
Merge branch 'for-4.8/core' of git://git.kernel.dk/linux-block
Pull core block updates from Jens Axboe:
   - the big change is the cleanup from Mike Christie, cleaning up our
     uses of command types and modified flags.  This is what will throw
     some merge conflicts
   - regression fix for the above for btrfs, from Vincent
   - following up to the above, better packing of struct request from
     Christoph
   - a 2038 fix for blktrace from Arnd
   - a few trivial/spelling fixes from Bart Van Assche
   - a front merge check fix from Damien, which could cause issues on
     SMR drives
   - Atari partition fix from Gabriel
   - convert cfq to highres timers, since jiffies isn't granular enough
     for some devices these days.  From Jan and Jeff
   - CFQ priority boost fix idle classes, from me
   - cleanup series from Ming, improving our bio/bvec iteration
   - a direct issue fix for blk-mq from Omar
   - fix for plug merging not involving the IO scheduler, like we do for
     other types of merges.  From Tahsin
   - expose DAX type internally and through sysfs.  From Toshi and Yigal
* 'for-4.8/core' of git://git.kernel.dk/linux-block: (76 commits)
  block: Fix front merge check
  block: do not merge requests without consulting with io scheduler
  block: Fix spelling in a source code comment
  block: expose QUEUE_FLAG_DAX in sysfs
  block: add QUEUE_FLAG_DAX for devices to advertise their DAX support
  Btrfs: fix comparison in __btrfs_map_block()
  block: atari: Return early for unsupported sector size
  Doc: block: Fix a typo in queue-sysfs.txt
  cfq-iosched: Charge at least 1 jiffie instead of 1 ns
  cfq-iosched: Fix regression in bonnie++ rewrite performance
  cfq-iosched: Convert slice_resid from u64 to s64
  block: Convert fifo_time from ulong to u64
  blktrace: avoid using timespec
  block/blk-cgroup.c: Declare local symbols static
  block/bio-integrity.c: Add #include "blk.h"
  block/partition-generic.c: Remove a set-but-not-used variable
  block: bio: kill BIO_MAX_SIZE
  cfq-iosched: temporarily boost queue priority for idle classes
  block: drbd: avoid to use BIO_MAX_SIZE
  block: bio: remove BIO_MAX_SECTORS
  ...
Diffstat (limited to 'tools/perf/scripts/python/net_dropmonitor.py')
0 files changed, 0 insertions, 0 deletions
