On Mon, 01 Feb 2010 17:37:23 -0800 "H. Peter Anvin" <hpa@xxxxxxxxx> wrote:
> On 02/01/2010 05:24 PM, Andrew Morton wrote:
> >>
> >> diff --git a/kernel/resource.c b/kernel/resource.c
> >> index b4d637a..e68cd74 100644
> >> --- a/kernel/resource.c
> >> +++ b/kernel/resource.c
> >> @@ -305,7 +305,7 @@ static int __is_ram(unsigned long pfn, unsigned long nr_pages, void *arg)
> >> * This generic page_is_ram() returns true if specified address is
> >> * registered as "System RAM" in iomem_resource list.
> >> */
> >> -int __attribute__((weak)) page_is_ram(unsigned long pfn)
> >> +int __weak page_is_ram(unsigned long pfn)
> >> {
> >> return walk_system_ram_range(pfn, 1, NULL, __is_ram) == 1;
> >> }
> >
> > hm, it's strange to do this as two separate commits?
> >
>
> You had it as a separate fix patch, and I generally don't want to fold
> patches which have different authorship, especially if the original code
> doesn't actually break anything.
Nobody's complained so far:
y:/usr/src/git26> git log | grep '\[.*@.*:' | wc -l
2434
It's a tradeoff between being nice to authors versus tree-cleanliness
and bisectability.
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|