* [PATCH 1/2] e1000e: Add pm_qos header
@ 2015-05-12 15:36 David Ahern
2015-05-12 15:37 ` [PATCH 2/2] net: Remove remaining remnants of pm_qos from netdevice.h David Ahern
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: David Ahern @ 2015-05-12 15:36 UTC (permalink / raw)
To: netdev; +Cc: David Ahern, Thomas Graf, Jeff Kirsher
Commit e2c6544829f moved pm_qos_req to e1000_adapter. Add the header file
that defines the struct.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Thomas Graf <tgraf@suug.ch>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---
drivers/net/ethernet/intel/e1000e/e1000.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/intel/e1000e/e1000.h b/drivers/net/ethernet/intel/e1000e/e1000.h
index 5d9ceb17b4cb..0abc942c966e 100644
--- a/drivers/net/ethernet/intel/e1000e/e1000.h
+++ b/drivers/net/ethernet/intel/e1000e/e1000.h
@@ -40,6 +40,7 @@
#include <linux/ptp_classify.h>
#include <linux/mii.h>
#include <linux/mdio.h>
+#include <linux/pm_qos.h>
#include "hw.h"
struct e1000_info;
--
2.2.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 2/2] net: Remove remaining remnants of pm_qos from netdevice.h
2015-05-12 15:36 [PATCH 1/2] e1000e: Add pm_qos header David Ahern
@ 2015-05-12 15:37 ` David Ahern
2015-05-13 3:22 ` David Miller
2015-05-12 21:46 ` [PATCH 1/2] e1000e: Add pm_qos header Sergei Shtylyov
2015-05-13 3:22 ` David Miller
2 siblings, 1 reply; 5+ messages in thread
From: David Ahern @ 2015-05-12 15:37 UTC (permalink / raw)
To: netdev; +Cc: David Ahern, Thomas Graf
Commit e2c6544829f removed pm_qos from struct net_device but left the
comment and header file. Remove those.
Signed-off-by: David Ahern <dsahern@gmail.com>
Cc: Thomas Graf <tgraf@suug.ch>
---
include/linux/netdevice.h | 3 ---
1 file changed, 3 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index a6d706b2a947..6317012ec1e1 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -25,7 +25,6 @@
#ifndef _LINUX_NETDEVICE_H
#define _LINUX_NETDEVICE_H
-#include <linux/pm_qos.h>
#include <linux/timer.h>
#include <linux/bug.h>
#include <linux/delay.h>
@@ -1499,8 +1498,6 @@ enum netdev_priv_flags {
*
* @qdisc_tx_busylock: XXX: need comments on this one
*
- * @pm_qos_req: Power Management QoS object
- *
* FIXME: cleanup struct net_device such that network protocol info
* moves out.
*/
--
2.2.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] e1000e: Add pm_qos header
2015-05-12 15:36 [PATCH 1/2] e1000e: Add pm_qos header David Ahern
2015-05-12 15:37 ` [PATCH 2/2] net: Remove remaining remnants of pm_qos from netdevice.h David Ahern
@ 2015-05-12 21:46 ` Sergei Shtylyov
2015-05-13 3:22 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: Sergei Shtylyov @ 2015-05-12 21:46 UTC (permalink / raw)
To: David Ahern, netdev; +Cc: Thomas Graf, Jeff Kirsher
Hello.
On 05/12/2015 06:36 PM, David Ahern wrote:
> Commit e2c6544829f moved pm_qos_req to e1000_adapter. Add the header file
Please also specify that commit's summary line in parens.
> that defines the struct.
> Signed-off-by: David Ahern <dsahern@gmail.com>
> Cc: Thomas Graf <tgraf@suug.ch>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Same comment about the 2nd patch.
WBR, Sergei
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH 1/2] e1000e: Add pm_qos header
2015-05-12 15:36 [PATCH 1/2] e1000e: Add pm_qos header David Ahern
2015-05-12 15:37 ` [PATCH 2/2] net: Remove remaining remnants of pm_qos from netdevice.h David Ahern
2015-05-12 21:46 ` [PATCH 1/2] e1000e: Add pm_qos header Sergei Shtylyov
@ 2015-05-13 3:22 ` David Miller
2 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2015-05-13 3:22 UTC (permalink / raw)
To: dsahern; +Cc: netdev, tgraf, jeffrey.t.kirsher
From: David Ahern <dsahern@gmail.com>
Date: Tue, 12 May 2015 09:36:59 -0600
> Commit e2c6544829f moved pm_qos_req to e1000_adapter. Add the header file
> that defines the struct.
>
> Signed-off-by: David Ahern <dsahern@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-13 3:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-12 15:36 [PATCH 1/2] e1000e: Add pm_qos header David Ahern
2015-05-12 15:37 ` [PATCH 2/2] net: Remove remaining remnants of pm_qos from netdevice.h David Ahern
2015-05-13 3:22 ` David Miller
2015-05-12 21:46 ` [PATCH 1/2] e1000e: Add pm_qos header Sergei Shtylyov
2015-05-13 3:22 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).