Messages in this thread | | | Date | Mon, 14 Dec 2009 11:10:45 +0100 | From | Jiri Slaby <> | Subject | Re: linux-next: manual merge of the limits tree with Linus' tree |
| |
On 12/14/2009 04:39 AM, Stephen Rothwell wrote: > 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.
Hi.
Thanks, I fixed all 3 conflicts.
-- js
| |