From: Dave Airlie Date: Tue, 3 Feb 2015 01:21:11 +0000 (+1000) Subject: Merge tag 'drm-amdkfd-fixes-2015-02-02' of git://people.freedesktop.org/~gabbayo... X-Git-Tag: v3.19~14^2~1 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=86640966f6ec8ab2fdc98e916456c6fc9d13262d;p=~emulex%2Finfiniband.git Merge tag 'drm-amdkfd-fixes-2015-02-02' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes Three small fixes that came up during last week, nothing scary: - Accidently incremented a counter instead of decrementing it (copy-paste error) - Module parameter of max num of queues must be at least 1 and not 0 - Don't do BUG() as a result from wrong user input * tag 'drm-amdkfd-fixes-2015-02-02' of git://people.freedesktop.org/~gabbayo/linux: drm/amdkfd: Don't create BUG due to incorrect user parameter drm/amdkfd: max num of queues can't be 0 drm/amdkfd: Fix bug in accounting of queues --- 86640966f6ec8ab2fdc98e916456c6fc9d13262d