linux-next: manual merge of the akpm-current tree

From: Stephen Rothwell
Date: Mon Apr 20 2015 - 01:36:19 EST

Next message: Ingo Molnar: "Re: qemu:arm test failure due to commit 8053871d0f7f (smp: Fix smp_call_function_single_async() locking)"
Previous message: Mark yao: "Re: [PATCH 1/2] drm: rockchip: Don't pass DRM fake offset to dma-api"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Andrew,

Today's linux-next merge of the akpm-current tree got many conflicts in
many files (presumably because most of this has been merged upstream).

I just dropped the akpm-current tree for today.

--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

Attachment: pgpLIG4gHjr2a.pgp
Description: OpenPGP digital signature

Next message: Ingo Molnar: "Re: qemu:arm test failure due to commit 8053871d0f7f (smp: Fix smp_call_function_single_async() locking)"
Previous message: Mark yao: "Re: [PATCH 1/2] drm: rockchip: Don't pass DRM fake offset to dma-api"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]