Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupl...
Len Brown [Thu, 26 Jul 2012 04:03:58 +0000 (00:03 -0400)]
1  2  3  4  5  6  7  8  9  10  11  12 
MAINTAINERS
drivers/acpi/acpi_pad.c
drivers/acpi/acpica/hwsleep.c
drivers/acpi/acpica/nspredef.c
drivers/acpi/bus.c
drivers/acpi/processor_idle.c
drivers/acpi/scan.c
drivers/acpi/sleep.c
drivers/cpuidle/cpuidle.c
drivers/thermal/spear_thermal.c
include/acpi/acpi_bus.h

diff --cc MAINTAINERS
@@@@@@@@@@@@@ -1736,11 -1727,10 -1743,11 -1727,10 -1727,10 -1727,10 -1727,10 -1743,11 -1743,11 -1743,11 -1727,10 -1743,11 +1736,11 @@@@@@@@@@@@@ F:     include/linux/can/platform
            CAPABILITIES
            M:  Serge Hallyn <serge.hallyn@canonical.com>
            L:  linux-security-module@vger.kernel.org
 - -----  --S:  Supported       
 + +++++  ++S:  Supported
            F:  include/linux/capability.h
            F:  security/capability.c
 - -----  --F:  security/commoncap.c 
 + +++++  ++F:  security/commoncap.c
 + ++++   + F:  kernel/capability.c
            
            CELL BROADBAND ENGINE ARCHITECTURE
            M:  Arnd Bergmann <arnd@arndb.de>
@@@@@@@@@@@@@ -4094,10 -4036,8 -4101,10 -4034,7 -4036,8 -4036,8 -4036,8 -4094,8 -4105,10 -4105,10 -4036,8 -4094,8 +4098,10 @@@@@@@@@@@@@ F:     Documentation/scsi/53c700.tx
            F:  drivers/scsi/53c700*
            
            LED SUBSYSTEM
   +        M:  Bryan Wu <bryan.wu@canonical.com>
            M:  Richard Purdie <rpurdie@rpsys.net>
 + +++++  ++L:  linux-leds@vger.kernel.org
 + +++++  ++T:  git git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds.git
            S:  Maintained
            F:  drivers/leds/
            F:  include/linux/leds.h
@@@@@@@@@@@@@ -5158,10 -5104,10 -5165,10 -5101,10 -5104,10 -5104,10 -5104,10 -5149,10 -5172,10 -5172,10 -5104,10 -5149,10 +5165,10 @@@@@@@@@@@@@ F:     drivers/leds/leds-pca9532.
            F:  include/linux/leds-pca9532.h
            
            PCA9541 I2C BUS MASTER SELECTOR DRIVER
 - -----  --M:  Guenter Roeck <guenter.roeck@ericsson.com>
 + +++++  ++M:  Guenter Roeck <linux@roeck-us.net>
            L:  linux-i2c@vger.kernel.org
            S:  Maintained
 - ----   - F:  drivers/i2c/muxes/pca9541.c
 + ++++   + F:  drivers/i2c/muxes/i2c-mux-pca9541.c
            
            PCA9564/PCA9665 I2C BUS DRIVER
            M:  Wolfram Sang <w.sang@pengutronix.de>
@@@@@@@@@@@@@ -5283,14 -5235,6 -5290,14 -5232,6 -5235,6 -5235,6 -5235,6 -5274,14 -5297,14 -5297,14 -5235,6 -5274,14 +5290,14 @@@@@@@@@@@@@ M:   Linus Walleij <linus.walleij@linaro.
            S:  Maintained
            F:  drivers/pinctrl/
            
 + ++++   + PIN CONTROLLER - ST SPEAR
- -    -   -M:  Viresh Kumar <viresh.kumar@st.com>
++++++++  ++M:     Viresh Kumar <viresh.linux@gmail.com>
 + ++++   + L:  spear-devel@list.st.com
 + ++++   + L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 + ++++   + W:  http://www.st.com/spear
 + ++++   + S:  Maintained
 + ++++   + F:  driver/pinctrl/spear/
 + ++++   + 
            PKTCDVD DRIVER
            M:  Peter Osterlund <petero2@telia.com>
            S:  Maintained
            F:  include/linux/compiler.h
            
            SPEAR PLATFORM SUPPORT
--------  --M:  Viresh Kumar <viresh.kumar@st.com>
++++++++  ++M:     Viresh Kumar <viresh.linux@gmail.com>
 + ++++   + M:  Shiraz Hashim <shiraz.hashim@st.com>
            L:  spear-devel@list.st.com
            L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
            W:  http://www.st.com/spear
            S:  Maintained
            F:  arch/arm/plat-spear/
            
 + ++++   + SPEAR13XX MACHINE SUPPORT
- -    -   -M:  Viresh Kumar <viresh.kumar@st.com>
++++++++  ++M:     Viresh Kumar <viresh.linux@gmail.com>
 + ++++   + M:  Shiraz Hashim <shiraz.hashim@st.com>
 + ++++   + L:  spear-devel@list.st.com
 + ++++   + L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 + ++++   + W:  http://www.st.com/spear
 + ++++   + S:  Maintained
 + ++++   + F:  arch/arm/mach-spear13xx/
 + ++++   + 
            SPEAR3XX MACHINE SUPPORT
--------  --M:  Viresh Kumar <viresh.kumar@st.com>
++++++++  ++M:     Viresh Kumar <viresh.linux@gmail.com>
 + ++++   + M:  Shiraz Hashim <shiraz.hashim@st.com>
            L:  spear-devel@list.st.com
            L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
            W:  http://www.st.com/spear
@@@@@@@@@@@@@ -6390,8 -6315,6 -6397,8 -6312,6 -6315,6 -6315,6 -6315,6 -6381,8 -6406,8 -6406,8 -6315,6 -6381,8 +6399,8 @@@@@@@@@@@@@ F:  arch/arm/mach-spear3xx
            
            SPEAR6XX MACHINE SUPPORT
            M:  Rajeev Kumar <rajeev-dlh.kumar@st.com>
 + ++++   + M:  Shiraz Hashim <shiraz.hashim@st.com>
- -    -   -M:  Viresh Kumar <viresh.kumar@st.com>
++++++++  ++M:     Viresh Kumar <viresh.linux@gmail.com>
            L:  spear-devel@list.st.com
            L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
            W:  http://www.st.com/spear
            F:  arch/arm/mach-spear6xx/
            
            SPEAR CLOCK FRAMEWORK SUPPORT
--------  --M:  Viresh Kumar <viresh.kumar@st.com>
 -  ---   - L:  spear-devel@list.st.com
 -  ---   - L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 -  ---   - W:  http://www.st.com/spear
 -  ---   - S:  Maintained
 -  ---   - F:  arch/arm/mach-spear*/clock.c
 -  ---   - F:  arch/arm/plat-spear/clock.c
 -  ---   - F:  arch/arm/plat-spear/include/plat/clock.h
 -  ---   - 
 -  ---   - SPEAR PAD MULTIPLEXING SUPPORT
 -  ---   - M:  Viresh Kumar <viresh.kumar@st.com>
++++++++  ++M:     Viresh Kumar <viresh.linux@gmail.com>
            L:  spear-devel@list.st.com
            L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
            W:  http://www.st.com/spear
            S:  Maintained
 -  ---   - F:  arch/arm/plat-spear/include/plat/padmux.h
 -  ---   - F:  arch/arm/plat-spear/padmux.c
 -  ---   - F:  arch/arm/mach-spear*/spear*xx.c
 -  ---   - F:  arch/arm/mach-spear*/include/mach/generic.h
 -  ---   - F:  arch/arm/mach-spear3xx/spear3*0.c
 -  ---   - F:  arch/arm/mach-spear3xx/spear3*0_evb.c
 -  ---   - F:  arch/arm/mach-spear6xx/spear600.c
 -  ---   - F:  arch/arm/mach-spear6xx/spear600_evb.c
   -        F:  arch/arm/mach-spear*/clock.c
   -        F:  arch/arm/plat-spear/clock.c
   -        F:  arch/arm/plat-spear/include/plat/clock.h
   -        
   -        SPEAR PAD MULTIPLEXING SUPPORT
   -        M:  Viresh Kumar <viresh.kumar@st.com>
   -        L:  spear-devel@list.st.com
   -        L:  linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   -        W:  http://www.st.com/spear
   -        S:  Maintained
   -        F:  arch/arm/plat-spear/include/plat/padmux.h
   -        F:  arch/arm/plat-spear/padmux.c
   -        F:  arch/arm/mach-spear*/spear*xx.c
   -        F:  arch/arm/mach-spear*/include/mach/generic.h
   -        F:  arch/arm/mach-spear3xx/spear3*0.c
   -        F:  arch/arm/mach-spear3xx/spear3*0_evb.c
   -        F:  arch/arm/mach-spear6xx/spear600.c
   -        F:  arch/arm/mach-spear6xx/spear600_evb.c
 + ++++   + F:  drivers/clk/spear/
            
            SPI SUBSYSTEM
            M:  Grant Likely <grant.likely@secretlab.ca>
            F:  drivers/vlynq/vlynq.c
            F:  include/linux/vlynq.h
            
 + ++++   + VME SUBSYSTEM
 + ++++   + M:  Martyn Welch <martyn.welch@ge.com>
- -    -   -M:  Manohar Vanga <manohar.vanga@cern.ch>
++++++++  ++M:  Manohar Vanga <manohar.vanga@gmail.com>
 + ++++   + M:  Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 + ++++   + L:  devel@driverdev.osuosl.org
 + ++++   + S:  Maintained
 + ++++   + T:  git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git
 + ++++   + F:  Documentation/vme_api.txt
 + ++++   + F:  drivers/staging/vme/
 + ++++   + F:  drivers/vme/
 + ++++   + F:  include/linux/vme*
 + ++++   + 
            VMWARE VMXNET3 ETHERNET DRIVER
            M:  Shreyas Bhatewara <sbhatewara@vmware.com>
            M:  "VMware, Inc." <pv-drivers@vmware.com>
Simple merge
Simple merge
Simple merge
@@@@@@@@@@@@@ -211,37 -213,10 -211,37 -213,10 -213,10 -213,10 -213,10 -213,10 -211,37 -211,37 -213,10 -211,37 +211,37 @@@@@@@@@@@@@ static int __acpi_bus_get_power(struct 
                        /* TBD: Non-recursive algorithm for walking up hierarchy. */
                        *state = device->parent ?
                                device->parent->power.state : ACPI_STATE_D0;
 + +++++  +             goto out;
       +        }
       +    
 - ----   -     ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",
 - ----   -                       device->pnp.bus_id, *state));
 + +++++  +     /*
 + +++++  +      * Get the device's power state either directly (via _PSC) or
 + +++++  +      * indirectly (via power resources).
 + +++++  +      */
 + +++++  +     if (device->power.flags.explicit_get) {
 + +++++  +             unsigned long long psc;
 + +++++  +             acpi_status status = acpi_evaluate_integer(device->handle,
 + +++++  +                                                        "_PSC", NULL, &psc);
 + +++++  +             if (ACPI_FAILURE(status))
 + +++++  +                     return -ENODEV;
 + +++++  + 
 + +++++  +             result = psc;
 + +++++  +     }
 + +++++  +     /* The test below covers ACPI_STATE_UNKNOWN too. */
 + +++++  +     if (result <= ACPI_STATE_D2) {
 + +++++  +       ; /* Do nothing. */
 + +++++  +     } else if (device->power.flags.power_resources) {
 + +++++  +             int error = acpi_power_get_inferred_state(device, &result);
 + +++++  +             if (error)
 + +++++  +                     return error;
 + +++++  +     } else if (result == ACPI_STATE_D3_HOT) {
 + +++++  +             result = ACPI_STATE_D3;
 + ++++   +     }
 + +++++  +     *state = result;
 + ++++   + 
       -        ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is D%d\n",
       -                          device->pnp.bus_id, *state));
 + +++++  +  out:
 + +++++  +     ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Device [%s] power state is %s\n",
 + +++++  +                       device->pnp.bus_id, state_string(*state)));
            
                return 0;
            }
Simple merge
@@@@@@@@@@@@@ -129,10 -129,10 -129,10 -129,10 -129,10 -129,10 -129,10 -139,21 -129,10 -129,10 -129,10 -129,10 +139,21 @@@@@@@@@@@@@ void acpi_bus_hot_remove_device(void *c
                 * TBD: _EJD support.
                 */
                status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
------- ----    if (ACPI_FAILURE(status))
------- ----            printk(KERN_WARNING PREFIX
------- ----                            "Eject device failed\n");
+++++++ ++++    if (ACPI_FAILURE(status)) {
+++++++ ++++            if (status != AE_NOT_FOUND)
+++++++ ++++                    printk(KERN_WARNING PREFIX
+++++++ ++++                                    "Eject device failed\n");
+++++++ ++++            goto err_out;
+++++++ ++++    }
+++ +++ ++++
+++++++ ++++    kfree(context);
+++++++ ++++    return;
   +        
+++++++ ++++err_out:
+++++++ ++++    /* Inform firmware the hot-remove operation has completed w/ error */
+++++++ ++++    (void) acpi_evaluate_hotplug_ost(handle,
+++++++ ++++                            ej_event->event, ost_code, NULL);
+++++++ ++++    kfree(context);
                return;
            }
            
Simple merge
Simple merge
@@@@@@@@@@@@@ -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -144,10 -143,10 -144,10 +143,10 @@@@@@@@@@@@@ static int spear_thermal_probe(struct p
                        goto put_clk;
                }
            
---------- -    stdev->flags = pdata->thermal_flags;
++++++++++ +    stdev->flags = val;
                writel_relaxed(stdev->flags, stdev->thermal_base);
            
--------- --    spear_thermal = thermal_zone_device_register("spear_thermal", 0,
+++++++++ ++    spear_thermal = thermal_zone_device_register("spear_thermal", 0, 0,
                                        stdev, &ops, 0, 0, 0, 0);
                if (IS_ERR(spear_thermal)) {
                        dev_err(&pdev->dev, "thermal zone device is NULL\n");
@@@@@@@@@@@@@ -50,38 -50,7 -50,38 -50,7 -50,7 -50,7 -50,7 -50,41 -50,38 -50,38 -50,7 -50,38 +50,41 @@@@@@@@@@@@@ acpi_evaluate_reference(acpi_handle han
                                acpi_string pathname,
                                struct acpi_object_list *arguments,
                                struct acpi_handle_list *list);
+++++++ ++++acpi_status
+++++++ ++++acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
+++++++ ++++                    u32 status_code, struct acpi_buffer *status_buf);
 + ++++   + 
 + ++++   + struct acpi_pld {
 + ++++   +     unsigned int revision:7; /* 0 */
 + ++++   +     unsigned int ignore_colour:1; /* 7 */
 + ++++   +     unsigned int colour:24; /* 8 */
 + ++++   +     unsigned int width:16; /* 32 */
 + ++++   +     unsigned int height:16; /* 48 */
 + ++++   +     unsigned int user_visible:1; /* 64 */
 + ++++   +     unsigned int dock:1; /* 65 */
 + ++++   +     unsigned int lid:1; /* 66 */
 + ++++   +     unsigned int panel:3; /* 67 */
 + ++++   +     unsigned int vertical_pos:2; /* 70 */
 + ++++   +     unsigned int horizontal_pos:2; /* 72 */
 + ++++   +     unsigned int shape:4; /* 74 */
 + ++++   +     unsigned int group_orientation:1; /* 78 */
 + ++++   +     unsigned int group_token:8; /* 79 */
 + ++++   +     unsigned int group_position:8; /* 87 */
 + ++++   +     unsigned int bay:1; /* 95 */
 + ++++   +     unsigned int ejectable:1; /* 96 */
 + ++++   +     unsigned int ospm_eject_required:1; /* 97 */
 + ++++   +     unsigned int cabinet_number:8; /* 98 */
 + ++++   +     unsigned int card_cage_number:8; /* 106 */
 + ++++   +     unsigned int reference:1; /* 114 */
 + ++++   +     unsigned int rotation:4; /* 115 */
 + ++++   +     unsigned int order:5; /* 119 */
 + ++++   +     unsigned int reserved:4; /* 124 */
 + ++++   +     unsigned int vertical_offset:16; /* 128 */
 + ++++   +     unsigned int horizontal_offset:16; /* 144 */
 + ++++   + } __attribute__((__packed__));
            
 + ++++   + acpi_status
 + ++++   + acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld *pld);
            #ifdef CONFIG_ACPI
            
            #include <linux/proc_fs.h>
@@@@@@@@@@@@@ -438,11 -407,6 -438,11 -407,6 -407,6 -407,6 -407,6 -448,11 -438,11 -438,11 -407,6 -438,11 +448,11 @@@@@@@@@@@@@ static inline int acpi_pm_device_sleep_
            }
            #endif
            
 + ++++   + #else       /* CONFIG_ACPI */
 + ++++   + 
       -    static int register_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
       -    static int unregister_acpi_bus_type(struct acpi_bus_type *bus) { return 0; }
 + +++++  + static inline int register_acpi_bus_type(void *bus) { return 0; }
 + +++++  + static inline int unregister_acpi_bus_type(void *bus) { return 0; }
 + ++++   + 
            #endif                              /* CONFIG_ACPI */
            
            #endif /*__ACPI_BUS_H__*/