linux-next: manual merge of the suspend tree with the net tree

linux-next: manual merge of the suspend tree with the net tree

[Stephen Rothwell]

Hi Rafael,

Today's linux-next merge of the suspend tree got a conflict in
drivers/net/e1000e/netdev.c between commit
c128ec29208d410568469bd8bb373b4cdc10912a ("e1000e: register pm_qos
request on hardware activation") from the net tree and commit
82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the
allocation in pm_qos_add_request()") from the suspend tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/net/e1000e/netdev.c
index 35c7dbd,9f13b66..0000000
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@@ -3525,12 -3495,6 +3525,13 @@@ static int e1000_open(struct net_devic
  	     E1000_MNG_DHCP_COOKIE_STATUS_VLAN))
  		e1000_update_mng_vlan(adapter);
  
 +	/* DMA latency requirement to workaround early-receive/jumbo issue */
 +	if (adapter->flags & FLAG_HAS_ERT)
- 		adapter->netdev->pm_qos_req =
- 		                    pm_qos_add_request(PM_QOS_CPU_DMA_LATENCY,
- 		                                       PM_QOS_DEFAULT_VALUE);
++		pm_qos_add_request(&adapter->netdev->pm_qos_req,
++				   PM_QOS_CPU_DMA_LATENCY,
++				   PM_QOS_DEFAULT_VALUE);
++
 +
  	/*
  	 * before we allocate an interrupt, we must be ready to handle it.
  	 * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
@@@ -3635,11 -3599,6 +3636,10 @@@ static int e1000_close(struct net_devic
  	if (adapter->flags & FLAG_HAS_AMT)
  		e1000_release_hw_control(adapter);
  
- 	if (adapter->flags & FLAG_HAS_ERT) {
- 		pm_qos_remove_request(adapter->netdev->pm_qos_req);
- 		adapter->netdev->pm_qos_req = NULL;
- 	}
++	if (adapter->flags & FLAG_HAS_ERT)
++		pm_qos_remove_request(&adapter->netdev->pm_qos_req);
++
 +
  	pm_runtime_put_sync(&pdev->dev);
  
  	return 0;

Re: linux-next: manual merge of the suspend tree with the net tree

[Florian Mickler]

Hi,

On Wed, 4 Aug 2010 13:14:11 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi Rafael,
> 
> Today's linux-next merge of the suspend tree got a conflict in
> drivers/net/e1000e/netdev.c between commit
> c128ec29208d410568469bd8bb373b4cdc10912a ("e1000e: register pm_qos
> request on hardware activation") from the net tree and commit
> 82f682514a5df89ffb3890627eebf0897b7a84ec ("pm_qos: Get rid of the
> allocation in pm_qos_add_request()") from the suspend tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

This is the right fix. Thx.

Cheers,
Flo

Re: linux-next: manual merge of the suspend tree with the net tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

Hi Florian,

On Wed, 4 Aug 2010 07:23:02 +0200 Florian Mickler <florian@mickler.org> wrote:
>
> This is the right fix. Thx.

Thanks for the confirmation.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]

Re: linux-next: manual merge of the suspend tree with the net tree

[Rafael J. Wysocki]

On Friday, April 29, 2011, Stephen Rothwell wrote:
> Hi Rafael,
> 
> Today's linux-next merge of the suspend tree got a conflict in
> arch/x86/Kconfig between commit 0a14842f5a3c ("net: filter: Just In Time
> compiler for x86-64") from the  tree and commit d9f1ce017fcf ("PM: Remove
> sysdev suspend, resume and shutdown operations") from the suspend tree.
> 
> Just context changes.  I fixed it up (see below) and can carry the fix as
> necessary.

Please do, thanks a lot!

Rafael

linux-next: manual merge of the suspend tree with the net tree

[Stephen Rothwell]

Hi Rafael,

Today's linux-next merge of the suspend tree got a conflict in
arch/x86/Kconfig between commit 0a14842f5a3c ("net: filter: Just In Time
compiler for x86-64") from the  tree and commit d9f1ce017fcf ("PM: Remove
sysdev suspend, resume and shutdown operations") from the suspend tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/Kconfig
index 92d07bd,140e254..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -71,8 -71,6 +71,7 @@@ config X8
  	select GENERIC_IRQ_SHOW
  	select IRQ_FORCED_THREADING
  	select USE_GENERIC_SMP_HELPERS if SMP
- 	select ARCH_NO_SYSDEV_OPS
 +	select HAVE_BPF_JIT if X86_64
  
  config INSTRUCTION_DECODER
  	def_bool (KPROBES || PERF_EVENTS)