Merge branch 'btrfs-3.0' into for-linus (81d86e1b) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

81d86e1b

Commit 81d86e1b authored 13 years ago by Chris Mason

Downloads
- Plain Diff

Merge branch 'btrfs-3.0' into for-linus

parents 9a4327ca f1e490a7

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

fs/btrfs/ctree.h 4 additions, 6 deletions

fs/btrfs/ctree.h
fs/btrfs/extent-tree.c 59 additions, 16 deletions

fs/btrfs/extent-tree.c
fs/btrfs/file.c 16 additions, 0 deletions

fs/btrfs/file.c
fs/btrfs/free-space-cache.c 11 additions, 5 deletions

fs/btrfs/free-space-cache.c
fs/btrfs/ioctl.c 4 additions, 0 deletions

fs/btrfs/ioctl.c
fs/btrfs/tree-log.c 24 additions, 4 deletions

fs/btrfs/tree-log.c
fs/btrfs/volumes.c 47 additions, 4 deletions

fs/btrfs/volumes.c
fs/btrfs/volumes.h 2 additions, 0 deletions

fs/btrfs/volumes.h

with 167 additions and 35 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment