Hi all,
Today's linux-next merge of the tip tree got a conflict in:
include/linux/kref.h
between commit:
56e3d1cd05cc ("kref: prefer atomic_inc_not_zero to atomic_add_unless")
from the drm tree and commit:
10383aea2f44 ("kref: Implement 'struct kref' using refcount_t")
from the tip tre
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/ttm/ttm_bo.c
between commit:
239ac65fa5ff ("drm/ttm: Make sure BOs being swapped out are cacheable")
from the drm tree and commit:
bdfafc4ffdd2 ("locking/atomic, kref: Kill kref_sub()")
cf6c467d67d3 ("
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/i915/i915_gem_shrinker.c
between commit:
1233e2db199d ("drm/i915: Move object backing storage manipulation to its own
locking")
from the drm tree and commit:
3ab7c086d5ec ("locking/drm: Kill mutex trick
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
between commit:
637dd3b5ca9e ("drm/amdgpu: prevent get_user_pages recursion")
from the drm tree and commit:
d4edcf0d5695 ("mm/gup: Switch all callers of get_user_pages() to not pa
Hi Arnd,
On Thu, 17 Mar 2016 10:00:56 +0100 Arnd Bergmann wrote:
>
> Your merge looks incorrect to me, and I got a build warning for it:
>
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c: In function
> 'amdgpu_ttm_tt_get_user_pages':
> drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c:535:17: error: unused var
On Thursday 17 March 2016 13:00:29 Stephen Rothwell wrote:
> diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> index 0f42b1a24446,7b82e57aa09c..
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
> @@@ -532,21 -516,9 +532,20 @@@ int amdgpu_
On 03/17/2016 02:00 AM, Arnd Bergmann wrote:
> On Thursday 17 March 2016 13:00:29 Stephen Rothwell wrote:
>> > - r = get_user_pages(current, current->mm, userptr,
>> > num_pages,
>> > - write, 0, p, NULL);
>> > + r = get_user_pages(userp
Hi all,
Today's linux-next merge of the tip tree got a conflict in
drivers/gpu/drm/gma500/mmu.c between commit b219372dff81 ("drm/gma500:
Make SGX MMU driver actually do something") from the drm tree and commit
840d2830e6e5 ("x86, cpufeature: Rename X86_FEATURE_CLFLSH to
X86_FEATURE_CLFLUSH") from
8 matches
Mail list logo