On Thu, Jan 16, 2014 at 10:37 AM, Sven Geggus <li...@fuchsschwanzdomain.de> wrote: > Hello, > > I get merge conflicts while trying to merge aufs3-linux/aufs3.10 into a > vanilla Kernel Version 3.10.27. > > The Problem is whithin mm/fremap.c >
Patch by Okajima: http://comments.gmane.org/gmane.linux.file-systems.aufs.user/4553 Regards, Guan ------------------------------------------------------------------------------ CenturyLink Cloud: The Leader in Enterprise Cloud Services. Learn Why More Businesses Are Choosing CenturyLink Cloud For Critical Workloads, Development Environments & Everything In Between. Get a Quote or Start a Free Trial Today. http://pubads.g.doubleclick.net/gampad/clk?id=119420431&iu=/4140/ostg.clktrk
