Hi!

> > > > Pavel, another week has passed. I am considering just including the 
> > > > trivial LED #define additions and take them through hid.git unless I hear 
> > > > from you today.
> > > 
> > > I'd prefer not to deal with rejects / common immutable branches / etc.
> > 
> > I am not proposing common immutable branch; and if there are going to be 
> > trivial cotext conflicts because of that, those will be sorted out by 
> > Linus without you even noticing.
> > 
> > > You don't _need_ the defines at all
> > 
> > As I've already pointed to you in several threads, we have quite a lot of 
> > code queued that does depend on the defines.
> > 
> > > and you don't need them in the common place.
> > 
> > I compltely fail to see the point of having them teporarily local before 
> > you manage to finally do something about the trivial addition to proper 
> > shared header.
> > 
> > > Just merge the patch without the defines. I'll merge the defines. That 
> > > seems like least complex solution to me.
> > 
> > That would cause my tree not to build.
> 
> In other words: could you please elaborate what exact issue are you trying 
> to avoid by not providing your Acked-by: and letting it go through hid.git 
> with all the rest of the code depending on it?

I'm trying to avoid merge conflict.

I believe open-coding string for a while is acceptable price to pay
for that, and I'd prefer that solution.

If you can promise that no conflicts or other problems will happen for
either me or Linus... go ahead and merge the patch.

Best regards,
								Pavel
-- 
http://www.livejournal.com/~pavelmachek