RE: linux-next: manual merge of the ia64 tree with Linus' tree
From: "Luck, Tony" <tony.luck@intel.com>
Date: 2012-11-27 00:44:36
Also in:
lkml
I fixed it up (see below) and can carry the fix as necessary.
I rebased the series onto 3.7-rc7 (using the same merge fix that you did) ... so you shouldn't see the merge error next time. -Tony