lkml.org 
[lkml]   [2009]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
Subjectlinux-next: manual merge of the percpu tree with Linus' tree
Hi all,

Today's linux-next merge of the percpu tree got a conflict in
arch/alpha/include/asm/percpu.h between commit
b01e8dc34379f4ba2f454390e340a025edbaaa7e ("alpha: fix percpu build
breakage") from Linus' tree and commit
6088464cf1ae9fb3d2ccc0ec5feb3f5b971098d8 ("alpha: kill unnecessary __used
attribute in PER_CPU_ATTRIBUTES") from the percpu tree.

The latter just removes what the former changed, so I used the percpu
tree version of this file.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-07-01 09:21    [W:0.024 / U:1.816 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site