Merge branch 'svn-trunk'

This commit is contained in:
Bart Van Assche
2020-06-16 10:39:45 -07:00
2 changed files with 4 additions and 2 deletions

View File

@@ -29,7 +29,7 @@ or not your Linux distribution supports a package manager:
sudo rpm -U $PWD/{,scstadmin/}rpmbuilddir/RPMS/*/*.rpm
elif dpkg-query -s libc-bin >/dev/null 2>&1; then
sudo apt install build-essential debhelper devscripts gcc make lintian quilt
sudo apt install linux-headers-$(uname -r) || sudo apt install pve-headers-$(uname -r)
sudo apt install linux-headers-$(uname -r) || sudo apt install pve-headers-$(uname -r)
make dpkg
sudo dpkg -i $PWD/dpkg/{scst,iscsi-scst,scstadmin}_*.deb
else

View File

@@ -891,7 +891,9 @@ static inline bool list_entry_in_list(const struct list_head *entry)
* See also commit 108c14858b9e ("locking/lockdep: Add support for dynamic
* keys").
*/
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0)
#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) && \
(!defined(RHEL_MAJOR) || RHEL_MAJOR -0 < 8 || \
(RHEL_MAJOR -0 == 8 && RHEL_MINOR -0 < 2))
static inline void lockdep_register_key(struct lock_class_key *key)
{
}