Hey folks,

for reasons beyond the scope of this mail, I've been trying to get aufs3
working on top of the current linux-media staging/for_v3.8 branch, which
is mostly 3.7-rc1 with some media-specific changes. Since there was some
non-trivial merging to be done, I thought I'd share my changes.

I tried rebasing on top of a clean 3.7-rc1, but I couldn't get git to
actually reapply my conflict resolution during the rebase and didn't
feel like doing it manually all over again.

Still, I guess my conflict resolution stuff, as well as the three extra
commits I needed to make aufs compile, might be useful for anyone. I
didn't do extensive testing, and I'm not sure that I picked the best
solution in all cases, but the Debian-live based system I used this
kernel in could succesfully boot, so it's not totally broken :-)

Here's the changes:

https://github.com/matthijskooijman/linux/commits/aufs3.7-rc1

Gr.

Matthijs

Attachment: signature.asc
Description: Digital signature

------------------------------------------------------------------------------
LogMeIn Central: Instant, anywhere, Remote PC access and management.
Stay in control, update software, and manage PCs from one command center
Diagnose problems and improve visibility into emerging IT issues
Automate, monitor and manage. Do more in less time with Central
http://p.sf.net/sfu/logmein12331_d2d

Reply via email to