diff options
| author | David S. Miller <davem@davemloft.net> | 2017-08-01 20:07:50 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-08-01 20:07:50 +0300 |
| commit | 29fda25a2d31098044f8dfa177c4d2834071828e (patch) | |
| tree | 9e4be11c49a4405c19ece8f81fbb1db478da1055 /drivers/md/dm-bufio.c | |
| parent | bb1182bc3e5956a93ab3ef8a3cbfb7966c42a94a (diff) | |
| parent | bc78d646e708dabd1744ca98744dea316f459497 (diff) | |
| download | linux-29fda25a2d31098044f8dfa177c4d2834071828e.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two minor conflicts in virtio_net driver (bug fix overlapping addition
of a helper) and MAINTAINERS (new driver edit overlapping revamp of
PHY entry).
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/md/dm-bufio.c')
| -rw-r--r-- | drivers/md/dm-bufio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/dm-bufio.c b/drivers/md/dm-bufio.c index 850ff6c67994..44f4a8ac95bd 100644 --- a/drivers/md/dm-bufio.c +++ b/drivers/md/dm-bufio.c @@ -1258,8 +1258,7 @@ EXPORT_SYMBOL_GPL(dm_bufio_write_dirty_buffers_async); */ int dm_bufio_write_dirty_buffers(struct dm_bufio_client *c) { - blk_status_t a; - int f; + int a, f; unsigned long buffers_processed = 0; struct dm_buffer *b, *tmp; |