| commit | af6472881a6127ad075adf64e459d2905fbc8a5c | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 08 20:59:02 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 08 20:59:02 2015 -0700 |
| tree | 269f23c65caea29a56935182659c3508c944aeba | |
| parent | 5d5df5ee7cdb77bfdac3703fd7a6bae5e3e4ab36 [diff] | |
| parent | 1d3c61c2eb3fe4f96d3192212f1bdcee49ea55aa [diff] |
Merge branch 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs Pull btrfs fix from Chris Mason: "When an arm user reported crashes near page_address(page) in my new code, it became clear that I can't be trusted with GFP masks. Filipe beat me to the patch, and I'll just be in the corner with my dunce cap on" * 'for-linus-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs: Btrfs: fix wrong mapping flags for free space inode