diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-19 15:22:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-19 15:22:03 -0700 |
| commit | 2e2c12200153e63749f836109cef8150f9c61ed8 (patch) | |
| tree | 0648d6b6a06449c1e6f793a0001cd4908ad8a603 /net/ipv4/tcp_timer.c | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| parent | ubifs: Convert xattr inum to host order (diff) | |
| download | linux-dev-2e2c12200153e63749f836109cef8150f9c61ed8.tar.xz linux-dev-2e2c12200153e63749f836109cef8150f9c61ed8.zip | |
Merge tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBIFS fixes from Richard Weinberger:
- build errors wrt xattrs
- mismerge which lead to a wrong Kconfig ifdef
- missing endianness conversion
* tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
ubifs: Convert xattr inum to host order
ubifs: Use correct config name for encryption
ubifs: Fix build error without CONFIG_UBIFS_FS_XATTR
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions