[Pkg-acpi-devel] git conflicts

[Loïc Minier]

On Wed, Sep 24, 2008, Michael Meskes wrote:
> I stand by my own argumentation that there is a good reason. :-)
> >  (BTW the current Ubuntu kernels have no /ubuntu/acpi on my system, but
> >  I didn't check the closed source modules part.)
> Which is exactly what I'm worried about. It's not the kernel package itself,
> but the closed source add-ons. But given al the hassle this has created I'm
> willing to back off. :-)

 Right, but if the closed source add-ons are installed, then certainly
 the system's user would like to use them or he wouldn't be pulling them
 in I would guess?

 Also, the way the Ubuntu-specific modules are implemented, it could be
 any acpi module, not just closed source stuff.  For instance if Ubuntu
 were to pull some foobar-acpi module in their tree, it would end up in
 ubuntu/acpi.

> Sorry 'bout that. I did pull before doing that work, was a first time
> for me as well. Never had this happen before.

 We'll do better in the future :)

 I'll push the tag before pushing the package at least!

-- 
Loïc Minier