diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 15:50:22 -0700 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-06-04 15:50:22 -0700 | 
| commit | 137f5ae4dae85011b13e3a7049414c4060ad94c0 (patch) | |
| tree | fdab1d304c8d731e9aed5bc6b8ef052312916092 /lib/timerqueue.c | |
| parent | 93e95fa57441b6976b39029bd658b6bbe7ccfe28 (diff) | |
| parent | b12c8a70643ffe2598c572cd206e4f68c524eb6f (diff) | |
Merge tag 'm68k-for-v4.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven:
 - a few time-related fixes:
     - off-by-one calendar month on some classes of machines
     - Y2038 preparation
 - build fix for ndelay() being called with a 64-bit type
 - revive 64-bit get_user(), which is used by some Android code
 - defconfig updates
 - fix for a long-standing fatal bug in iounmap() on '020/030, which was
   actually fixed in 2.4.23, but never in 2.5.x and later
 - default DMA mask to avoid warning splats
 - minor fixes and cleanups
* tag 'm68k-for-v4.18-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Set default dma mask for platform devices
  m68k/mm: Adjust VM area to be unmapped by gap size for __iounmap()
  m68k/defconfig: Update defconfigs for v4.17-rc3
  m68k/uaccess: Revive 64-bit get_user()
  m68k: Implement ndelay() as an inline function to force type checking/casting
  zorro: Add a blank line after declarations
  m68k: Use read_persistent_clock64() consistently
  m68k: Fix off-by-one calendar month
  m68k: Fix style, spelling, and grammar in siginfo_build_tests()
  m68k/mac: Fix SWIM memory resource end address
Diffstat (limited to 'lib/timerqueue.c')
0 files changed, 0 insertions, 0 deletions
