Skip to contentSkip to conversation

Btrfs updates for 4.11-rc2

GIT PULL David Sterba 2 participants 2 messages Mar 9, 2017 – Mar 17, 2017 Btrfs file system

lore
Share & tools
lore

David Sterba

author maintainer
#0 lore raw

Hi,

there's a regression fix for the assertion failure reported by Dave Jones, the rest of patches are minor updates. Please pull, thanks.

The following changes since commit e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b:

Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11 (2017-02-28 14:35:09 -0800)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-chris-4.11-rc2

for you to fetch changes up to 94b5a2924fc0ec2bb2347ca31156be8fabe907c4:

Btrfs: consistent usage of types in balance_args (2017-03-09 14:23:00 +0100)

----------------------------------------------------------------
Dmitry V. Levin (2):
btrfs: remove btrfs_err_str function from uapi/linux/btrfs.h
MAINTAINERS: add btrfs file entries for include directories

Goldwyn Rodrigues (1):
btrfs: No need to check !(flags & MS_RDONLY) twice

Hans van Kranenburg (1):
Btrfs: consistent usage of types in balance_args

Liu Bo (2):
Btrfs: update comments in cache_save_setup
Btrfs: fix regression in lock_delalloc_pages

 MAINTAINERS                |  2 ++
 fs/btrfs/extent-tree.c     |  3 ++-
 fs/btrfs/extent_io.c       |  3 ++-
 fs/btrfs/super.c           |  3 +--
 include/uapi/linux/btrfs.h | 37 +++++--------------------------------
 5 files changed, 12 insertions(+), 36 deletions(-)
#1 lore raw
Quoted 9 lines · David Sterba

Hi,

there's a regression fix for the assertion failure reported by Dave Jones, the rest of patches are minor updates. Please pull, thanks.

The following changes since commit e9f467d028cd7d8bee2a4d6c4fb806caf8cd580b:

Merge branch 'for-chris-4.11-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.11 (2017-02-28 14:35:09 -0800)

Quoted 8 lines

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git for-chris-4.11-rc2

for you to fetch changes up to 94b5a2924fc0ec2bb2347ca31156be8fabe907c4:

Btrfs: consistent usage of types in balance_args (2017-03-09 14:23:00 +0100)

Thanks Dave, these all tested well all week, but a few were arguably cleanups. I've pull out the fixes only for this time and I'll queue the others for 4.12.

-chris