Re: ACPI and PM material for v3.15-rc1 (current queue)

From: Rafael J. Wysocki
Date: Fri Mar 21 2014 - 12:25:09 EST


On Friday, March 21, 2014 08:39:39 AM Hanjun Guo wrote:
> Hi Rafael,

Hi,

> On 2014å03æ21æ 08:23, Rafael J. Wysocki wrote:
> > Hi All,
> >
> > My queue for the first pull request during the upcoming 3.15 merge window
> > contains the material below. Following the rule that everything I send
> > pull requests for should spend at least one day in linux-next, I'm not
> > going to add any more new commits to it at this point.
> >
> > Most likely, there will be more ACPI+PM pull request during the 3.15 cycle,
> > so if I missed something, it still may be possible to get that into that
> > kernel, but there has to be a good reason for it.
> >
> > Kind regards,
> > Rafael
> >
> >
> > ---------------
> >
> > Hanjun Guo (2):
> > ACPI / tables: Replace printk with pr_*
> > ACPI: Remove duplicate definitions of PREFIX
>
> It seems that you missed some of my patches:
> ACPI: Move BAD_MADT_ENTRY() to linux/acpi.h
> ACPI / idle: Make idle_boot_override depend on x86 and ia64
> ACPI / trivial: Fix the return value type of acpi_processor_eval_pdc()
> ACPI / processor: Replace hard-coded "ACPI0007" with
> ACPI_PROCESSOR_DEVICE_HID
>
> I think those 4 patches can be merged in 3.15 and you already accepted them.

Yes, I did not include the acpi-processor branch, sorry about that and thanks
for spotting it!

That branch was in linux-next before, though, so I'll push it for 3.15-rc1.

> and this patch still need more acks and then you will accept it:
> ACPI / processor_core: Rework _PDC related stuff to make it more
> arch-independent
>
> and this patch was reverted from your tree suggested by Catalin and Sudeep,
> ACPI / processor: Introduce map_gic_id() to get apic id from MADT or
> _MAT method
>
> Sorry for the confusion if I missed something.

I don't think you missed anything, thanks!

--
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/