<html><body><p>Sorry dear mailing list,<br><br>I tried to send pull request. But the pull request includes Jeremy's commit as well. Is this expected behavior or how to do pull request properly?<br><br>Please help.<br><br>Here is the commits of my forked linux repository dev-4.3 branch:<br>"d24fe31 [PATCH v3] hwmon: Add occ_i2c HWMON driver - Revise code based on comments from Jeremy Kerr <jk@ozlabs.org>. - Add new HWMON attributes<br>7940494 gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.<br>fa744b2 Add BMC HWMON driver to kernel. Format patch based on Joel's comments.<br>46b1744 net/faraday: Use ncsi_stop_dev()"<br><br>Here is the openbmc/linux dev-4.3 branch:<br>"6041e18 gpio/aspeed: Use handler_data in aspeed_gpio_irq_handler.<br>46b1744 net/faraday: Use ncsi_stop_dev()"<br><br>Thanks<br>-Yi<br><br><br><br><tt>"openbmc" <openbmc-bounces+shliyi=cn.ibm.com@lists.ozlabs.org> wrote on 12/06/2015 11:40:25 PM:<br><br>> From: OpenBMC Patches <openbmc-patches@stwcx.xyz></tt><br><tt>> To: openbmc@lists.ozlabs.org</tt><br><tt>> Date: 12/06/2015 11:42 PM</tt><br><tt>> Subject: [PATCH linux v2 2/3] gpio/aspeed: Use handler_data in <br>> aspeed_gpio_irq_handler.</tt><br><tt>> Sent by: "openbmc" <openbmc-bounces+shliyi=cn.ibm.com@lists.ozlabs.org></tt><br><tt>> <br>> From: Jeremy Kerr <jk@ozlabs.org><br>> <br>> In the port to 4.3, we converted to the newer irq api, but used the<br>> chip_data for the struct aspeed_gpio pointer, rather than the<br>> handler_data.<br>> <br>> We use irq_set_chaned_handler_and_data to establish this pointer, which<br>> sets handler_data. This change uses the appropriate pointer in our<br>> handler instead.<br>> <br>> Signed-off-by: Jeremy Kerr <jk@ozlabs.org><br>> ---<br>> drivers/gpio/gpio-aspeed.c | 2 +-<br>> 1 file changed, 1 insertion(+), 1 deletion(-)<br>> <br>> diff --git a/drivers/gpio/gpio-aspeed.c b/drivers/gpio/gpio-aspeed.c<br>> index 87e159a..152b7d4 100644<br>> --- a/drivers/gpio/gpio-aspeed.c<br>> +++ b/drivers/gpio/gpio-aspeed.c<br>> @@ -302,8 +302,8 @@ static int aspeed_gpio_set_type(struct irq_data <br>> *d, unsigned int type)<br>> <br>> static void aspeed_gpio_irq_handler(struct irq_desc *desc)<br>> {<br>> + struct aspeed_gpio *gpio = irq_desc_get_handler_data(desc);<br>> struct irq_chip *chip = irq_desc_get_chip(desc);<br>> - struct aspeed_gpio *gpio = irq_desc_get_chip_data(desc);<br>> unsigned int i, p, girq;<br>> unsigned long reg;<br>> <br>> -- <br>> 2.6.3<br>> <br>> <br>> _______________________________________________<br>> openbmc mailing list<br>> openbmc@lists.ozlabs.org<br>> <a href="https://lists.ozlabs.org/listinfo/openbmc">https://lists.ozlabs.org/listinfo/openbmc</a><br></tt><BR>
</body></html>