linux-next: manual merge of the percpu tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the percpu tree got a conflict in mm/percpu.c
between commit 403a91b1659cb149dbddc5885f892734ae4542d8 ("percpu: allow
pcpu_alloc() to be called with IRQs off") from Linus' tree and commit
0f5e4816dbf38ce9488e611ca2296925c1e90d5e ("percpu: remove some sparse
warnings") from the percpu tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc mm/percpu.c
index d907971,e2e80fc..0000000
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@@ -369,7 -364,8 +367,8 @@@ static struct pcpu_chunk *pcpu_chunk_ad
   * RETURNS:
   * 0 if noop, 1 if successfully extended, -errno on failure.
   */
 -static int pcpu_extend_area_map(struct pcpu_chunk *chunk)
 +static int pcpu_extend_area_map(struct pcpu_chunk *chunk, unsigned long *flags)
+ 	__releases(lock) __acquires(lock)
  {
  	int new_alloc;
  	int *new;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/