Messages in this thread | | | From | mkrufky@linuxtv ... | Subject | Re: [v4l-dvb-maintainer] [PATCH] media: replace remaining __FUNCT ION__ occurences | Date | Thu, 3 Apr 2008 14:58:55 -0500 |
| |
Harvey Harrison wrote: > On Tue, 2008-03-04 at 01:38 -0500, Michael Krufky wrote: > >> Manu Abraham wrote: >> >>> Michael Krufky wrote: >>> >>>> On Mon, Mar 3, 2008 at 7:03 PM, Harvey Harrison >>>> <harvey.harrison@gmail.com> wrote: >>>> >>>>> __FUNCTION__ is gcc-specific, use __func__ >>>>> >>>>> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> >>>>> 162 files changed, 892 insertions(+), 892 deletions(-) >>>>> >>>> If we apply this, can it be broken down into several smaller patches? >>>> I am in the midst of a large overhaul of the tuning subsystem, and if >>>> this all gets applied at once, it will wreck havoc on my pending >>>> changesets. >>>> >>> Please make sure your changes don't conflict with the multiproto tree >>> changes. >>> >>> Regards, >>> Manu >>> >> Manu, >> >> Does that mean that you plan to merge multiproto soon? If that's the >> case, then we'd be better off if you give Harvey an "exclude list" of >> files he should stay away from. He can regenerate patches to those >> files after multiproto is merged. >> >> > > Or just apply it after both of you have merged and ignore any conflicts, > I can come back to it at a later time (2.6.26-rc1 maybe?).
Harvey,
The greater portion of my refactoring changes have been merged. As far as I am concerned, you should feel free to send in cleanup changesets now.
Manu,
We can't expect Harvey to avoid conflicts with multiproto -- do you have any plans to ACTUALLY merge these changes? You've been saying "any day now" for the past two years.
If you plan to merge multiproto for 2.6.26, then, IMHO, now is the time. Otherwise, it's safe for Harvey to do his cleanups.
Harvey,
If you decide to move forward with these cleanups now, please keep the previous discussion in mind -- please generate the changesets against the v4l-dvb master repository, hosted on linuxtv.org, and please separate the changesets by each level of the directory tree hierarchy.
Regards,
Mike Krufky
| |