From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 14 Apr 2014 11:22:46 +0000 (+0200)
Subject: Merge branch 'liblockdep-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: accepted/tizen/common/20141203.182822~194^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65063ced73077b9add610b413d87bc6a51e40bab;p=platform%2Fkernel%2Flinux-arm64.git

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>
---

65063ced73077b9add610b413d87bc6a51e40bab