Matthijs Kooijman:
> I just tried to merge the aufs3.6 branch into the 3.6.2 kernel, which
> caused a merge failure. I'm not 100% sure if this is the right way to
> get with 3.6.2 with aufs, or where and how this should be fixed.
:::
> And here's the change that causes the conflict (copied from git diff v3.6
> v3.6.2, I haven't pinpointed the revision it was introduced in:
Confirmed.
$ git log1 v3.6..v3.6.2 fs/buffer.c
92b7722 2012-10-13 ext4: fix mtime update in nodelalloc mode
> Fixing this seems simple enough, just move the two lines introduced by aufs
> along wit the file_update_time call.
Exactly.
In other words, aufs3.6 doesn't support linux-3.6.2.
J. R. Okajima
------------------------------------------------------------------------------
Don't let slow site performance ruin your business. Deploy New Relic APM
Deploy New Relic app performance management and know exactly
what is happening inside your Ruby, Python, PHP, Java, and .NET app
Try New Relic at no cost today and get our sweet Data Nerd shirt too!
http://p.sf.net/sfu/newrelic-dev2dev
