Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

L

linux
- Activity
- Members
- Labels
- Environments

Snippets Groups Projects

43d871f0

Commit 43d871f0 authored 9 years ago by Chris Mason

Downloads
- Plain Diff

Merge branch 'integration-4.5' of...

Merge branch 'integration-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.5

parents e410e34f 0c0fe3b0

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

fs/btrfs/backref.c 6 additions, 4 deletions

fs/btrfs/backref.c
fs/btrfs/compression.c 1 addition, 5 deletions

fs/btrfs/compression.c
fs/btrfs/extent_io.c 11 additions, 34 deletions

fs/btrfs/extent_io.c
fs/btrfs/extent_io.h 0 additions, 3 deletions

fs/btrfs/extent_io.h
fs/btrfs/ioctl.c 97 additions, 22 deletions

fs/btrfs/ioctl.c

with 115 additions and 68 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