diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-24 18:42:32 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-24 18:42:32 +0100 |
| commit | d146194f31c96f9b260c5a1cf1592d2e7f82a2e2 (patch) | |
| tree | ff576fb60ffbe6d3bcc325b217aef65e05c1331a /net/ipv4/tcp_cdg.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block (diff) | |
| download | linux-d146194f31c96f9b260c5a1cf1592d2e7f82a2e2.tar.xz linux-d146194f31c96f9b260c5a1cf1592d2e7f82a2e2.zip | |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fixes from Catalin Marinas::
- Fix wrong conflict resolution around CONFIG_ARM64_SSBD
- Fix sparse warning on unsigned long constant
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: cpufeature: Fix mismerge of CONFIG_ARM64_SSBD block
arm64: sysreg: fix sparse warnings
Diffstat (limited to 'net/ipv4/tcp_cdg.c')
0 files changed, 0 insertions, 0 deletions