summary refs log tree commit diff
path: root/Documentation/nios2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-03 07:06:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-03 07:06:53 -0500
commit7b367f5dba5c5162a7308e85d3fc9170b0cb3e5f (patch)
treea93a93e01dcb4203d545ef61edcb5c4236b49ded /Documentation/nios2
parent17084b7e07909d3a8d51b66b7dfb50a2083a2685 (diff)
parent353def94606fda16d9ae1761b4b0583286481ec5 (diff)
downloadlinux-7b367f5dba5c5162a7308e85d3fc9170b0cb3e5f.tar.gz
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull core kernel fixes from Ingo Molnar:
 "This contains the nohz/atomic cleanup/fix for the fetch_or() ugliness
  you noted during the original nohz pull request, plus there's also
  misc fixes:

   - fix liblockdep build bug
   - fix uapi header build bug
   - print more lockdep hash collision info to help debug recent reports
     of hash collisions
   - update MAINTAINERS email address"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  MAINTAINERS: Update my email address
  locking/lockdep: Print chain_key collision information
  uapi/linux/stddef.h: Provide __always_inline to userspace headers
  tools/lib/lockdep: Fix unsupported 'basename -s' in run_tests.sh
  locking/atomic, sched: Unexport fetch_or()
  timers/nohz: Convert tick dependency mask to atomic_t
  locking/atomic: Introduce atomic_fetch_or()
Diffstat (limited to 'Documentation/nios2')
0 files changed, 0 insertions, 0 deletions