Messages in this thread | | | Subject | Re: linux-next: manual merge of the akpm-current tree with the tip tree | From | Davidlohr Bueso <> | Date | Mon, 13 Jan 2014 21:04:07 -0800 |
| |
On Tue, 2014-01-14 at 15:53 +1100, Stephen Rothwell wrote: > Hi Andrew, > > Today's linux-next merge of the akpm-current tree got a conflict in > kernel/futex.c between commit a52b89ebb6d4 ("futexes: Increase hash table > size for better performance") from the tip tree and commit 61beee6c76e5 > ("futex: switch to USER_DS for futex test") from the akpm-current tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
Thanks Stephen. At least for my bits the fix seems ok. In the future, though, changes to this evil file should be routed only through one tree.
Thanks, Davidlohr
| |