diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-02 11:17:22 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-11-02 11:17:22 -0700 | 
| commit | 0b21f21ae0d746b385a827aceb84cb26c551eb94 (patch) | |
| tree | be336be2ac7d21f673a0a19d7b0f53291c4a55df /net/unix/af_unix.c | |
| parent | 54480aa7fac324c1c50519e69287cf49aa2f3afc (diff) | |
| parent | a324e9396ca3d00e1101476ba067b412e0aba232 (diff) | |
Merge tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp
Pull more EDAC updates from Borislav Petkov:
 "The second part of the EDAC pile which contains the ADXL user and a
  build fix which addresses a not-so-sensical .config but fixes
  randconfig builds people do:
   - skx_edac: Address translation for NVDIMMs (Tony Luck and Qiuxu Zhuo)
   - ACPI_ADXL build fix"
[ I don't think "sensical" is a word, particularly when used in the
  context of actually meaning "nonsensical", but I like it   - Linus ]
* tag 'edac_for_4.20_2' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
  EDAC, skx: Fix randconfig builds
  EDAC, skx_edac: Add address translation for non-volatile DIMMs
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions
