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

Today's linux-next merge of the limits tree got a conflict in
arch/ia64/kernel/sys_ia64.c between commit
bb52d6694002b9d632bb355f64daa045c6293a4e ("Get rid of open-coding in
ia64_brk()") from Linus' tree and commit
d9ef7d0ce61f214180f505b78cdf8f9b3d862dfa ("IA64: use helpers for
rlimits") from the limits tree.

The former removed the code that the latter was updating. A merge with
Linus' tree will fix this up, but it is pretty trivial anyway.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
[unhandled content-type:application/pgp-signature]
\
 
 \ /
  Last update: 2009-12-14 04:41    [W:1.252 / U:0.004 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site