Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Mon, 14 Apr 2014 11:22:46 +0000 (13:22 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 14 Apr 2014 11:22:46 +0000 (13:22 +0200)
commit65063ced73077b9add610b413d87bc6a51e40bab
tree555f3c04d2dfeb6361e5735806a9f1836ae56868
parenta227960fe0cafcc229a8d6bb8b454a3a0b33719d
parentbe227b45fb228adff4371b8de9e3989904209ff4
Merge branch 'liblockdep-fixes' of git://git./linux/kernel/git/sashal/linux into core/urgent

Pull liblockdep fixes from Sasha Levin:

 " 1. There was a build breakage caused by marking a function 'asmlinkage'
   in lockdep.h. Fix that by ignoring asmlinkage and visible annotations.

   2. Josh Boyer mentioned that Fedora would like to include liblockdep
   as a package, so we had to fix our versioning methods from being dumb
   and pointless to something actually usable. So now liblockdep.so tracks
   the kernel version which makes lives of distro folks much easier. "

Signed-off-by: Ingo Molnar <mingo@kernel.org>