diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-24 18:11:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-24 18:11:15 -0700 |
| commit | 9981b4fb8684883dcc0daf088891ff32260b9794 (patch) | |
| tree | 2bdb23a3ba410c43096f7e0ea5ecfad12d2b6127 /net/core/sock.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | MIPS: ath79: fix register address in ath79_ddr_wb_flush() (diff) | |
| download | linux-dev-9981b4fb8684883dcc0daf088891ff32260b9794.tar.xz linux-dev-9981b4fb8684883dcc0daf088891ff32260b9794.zip | |
Merge tag 'mips_fixes_4.18_4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux
Pull MIPS fixes from Paul Burton:
"A couple more MIPS fixes for 4.18:
- Fix an off-by-one in reporting PCI resource sizes to userland which
regressed in v3.12.
- Fix writes to DDR controller registers used to flush write buffers,
which regressed with some refactoring in v4.2"
* tag 'mips_fixes_4.18_4' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux:
MIPS: ath79: fix register address in ath79_ddr_wb_flush()
MIPS: Fix off-by-one in pci_resource_to_user()
Diffstat (limited to 'net/core/sock.c')
0 files changed, 0 insertions, 0 deletions