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

Pull more block fixes from Jens Axboe:
 "As mentioned in the pull the other day, a few more fixes for this
  round, all related to the bio op changes in this series.

  Two fixes, and then a cleanup, renaming bio->bi_rw to bio->bi_opf.  I
  wanted to do that change right after or right before -rc1, so that
  risk of conflict was reduced.  I just rebased the series on top of
  current master, and no new ->bi_rw usage has snuck in"

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: rename bio bi_rw to bi_opf
  target: iblock_execute_sync_cache() should use bio_set_op_attrs()
  mm: make __swap_writepage() use bio_set_op_attrs()
  block/mm: make bdev_ops->rw_page() take a bool for read/write

1 files changed, 6 insertions, 0 deletions

diff --git a/netsniff-ng.8 b/netsniff-ng.8
index c937978..e4cc14b 100644
--- a/netsniff-ng.8
+++ b/netsniff-ng.8
@@ -175,6 +175,12 @@ Process a number of packets and then exit. If the number of packets is 0, then
 this is equivalent to infinite packets resp. processing until interrupted.
 Otherwise, a number given as an unsigned integer will limit processing.
 .TP
+.B -O <N>, --overwrite <N>
+A number from 0 to N-1 will be used in the file name instead of a Unix
+timestamp. The previous file will be overwritten when number wraps around. The
+maximum value is 2^32 - 1. Intended for rotating capture files when used
+with options \fB\-F\fP and \fB\-P\fP.
+.TP
 .B -P <name>, --prefix <name>
 When dumping pcap files into a folder, a file name prefix can be defined with
 this option. If not otherwise specified, the default prefix is \[lq]dump\-\[rq]