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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et131x_netdev.c between commit 9d846fec22db
("staging: et131x: remove unused prototype et131x_vlan_rx_register") from
the net tree and commit 2e861534ca09 ("staging: et131x: et131x_netdev.c
checkpatch fixes") from the staging tree.

The latter seems to be a superset of the former, so I used the latter.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflicts in
drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
brcm80211 driver from the staging tree") from the staging tree.

The latter removed the files, so I did that
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Greg KH]

On Thu, Oct 13, 2011 at 04:43:53PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
> net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
> brcm80211 driver from the staging tree") from the staging tree.
> 
> The latter removed the files, so I did that

Wonderful, thanks for doing that.

greg

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

[Arend van Spriel]

[-- Attachment #1.1: Type: text/plain, Size: 537 bytes --]

On 10/13/2011 07:43 AM, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflicts in
> drivers/staging/brcm80211/brcmfmac/dhd_linux.c and
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commits from the
> net-next tree and commit fc2d6e573be6 ("staging: brcm80211: remove
> brcm80211 driver from the staging tree") from the staging tree.
> 
> The latter removed the files, so I did that

Great. The move to drivers/net/wireless has completed. Thanks for this.

Gr. AvS

[-- Attachment #1.2: 0xB5E1A116.asc --]
[-- Type: application/pgp-keys, Size: 3165 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 900 bytes --]

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/et131x/et1310_tx.c between commit bf3f1a6081aa ("et131x:
convert to SKB paged frag API") from the net tree and commit 10f00a49b048
("staging: et131x: Rename var name 'etdev' to 'adapter' throughout
module") from the staging 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/staging/et131x/et1310_tx.c
index 03e7a4e,2ecb934..0000000
--- a/drivers/staging/et131x/et1310_tx.c
+++ b/drivers/staging/et131x/et1310_tx.c
@@@ -519,12 -392,12 +392,12 @@@ static int nic_send_packet(struct et131
  			 * returned by pci_map_page() is always 32-bit
  			 * addressable (as defined by the pci/dma subsystem)
  			 */
 -			desc[frag++].addr_lo =
 -			    pci_map_page(adapter->pdev,
 -					 frags[i - 1].page,
 -					 frags[i - 1].page_offset,
 -					 frags[i - 1].size,
 -					 PCI_DMA_TODEVICE);
 +			desc[frag++].addr_lo = skb_frag_dma_map(
- 							&etdev->pdev->dev,
++							&adapter->pdev->dev,
 +							&frags[i - 1],
 +							0,
 +							frags[i - 1].size,
 +							PCI_DMA_TODEVICE);
  		}
  	}
  

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

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

[David Miller]

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 6 Oct 2011 16:04:33 +1100

> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/et131x/et1310_tx.c between commit bf3f1a6081aa ("et131x:
> convert to SKB paged frag API") from the net tree and commit 10f00a49b048
> ("staging: et131x: Rename var name 'etdev' to 'adapter' throughout
> module") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Yep, we saw this one coming too.  I think you'll need to carry this one
until the merge window flushes out.

Thanks!

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

[Stephen Rothwell]

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

Hi Dave,

On Thu, 06 Oct 2011 01:56:22 -0400 (EDT) David Miller <davem@davemloft.net> wrote:
>
> Yep, we saw this one coming too.  I think you'll need to carry this one
> until the merge window flushes out.

Sure, no problem.

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

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

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commit
37a41b4affa3 ("mac80211: add ieee80211_vif param to tsf functions") from
the net tree and commit 3956b4a2ddb0 ("staging: brcm80211: remove locking
macro definitions") from the staging tree.

I fixed it up (which essentially means I used the staging tree version
with one small change to the brcms_ops_conf_tx prototype) and can carry
the fixes as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au


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

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

[Arend van Spriel]

On 10/06/2011 06:58 AM, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/brcm80211/brcmsmac/mac80211_if.c between commit
> 37a41b4affa3 ("mac80211: add ieee80211_vif param to tsf functions") from
> the net tree and commit 3956b4a2ddb0 ("staging: brcm80211: remove locking
> macro definitions") from the staging tree.
>
> I fixed it up (which essentially means I used the staging tree version
> with one small change to the brcms_ops_conf_tx prototype) and can carry
> the fixes as necessary.

Thanks, Stephen

I had to make the mac80211 conf_tx callback change  for the mainline 
patch as well.

Acked.

Gr. AvS

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net:
remove use of ndo_set_multicast_list in drivers") from the net tree and
commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used")
from the staging tree.

The latter removed the file, so I did that.
-- 
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 staging tree with the net tree

[Greg KH]

On Fri, Aug 26, 2011 at 01:47:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net:
> remove use of ndo_set_multicast_list in drivers") from the net tree and
> commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used")
> from the staging tree.
> 
> The latter removed the file, so I did that.

Thanks, that should be the correct thing :)

greg k-h

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

[Larry Finger]

On 08/25/2011 11:33 PM, Greg KH wrote:
> On Fri, Aug 26, 2011 at 01:47:05PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> drivers/staging/rtl8192e/r8192E_core.c between commit afc4b13df143 ("net:
>> remove use of ndo_set_multicast_list in drivers") from the net tree and
>> commit 09505184ec3d ("staging: rtl8192e: Remove files that are not used")
>> from the staging tree.
>>
>> The latter removed the file, so I did that.
>
> Thanks, that should be the correct thing :)

I'm a little confused. The files deleted in 09505184ec3d are not used at all in 
the new rtl8192e. The only way it makes sense is you did not have the new 
version when the the error with r8192E_core.c occurred.

The error that was reported to me was 
"drivers/staging/rtl8192e/rtl_core.c:2917:2: error: unknown field 
'ndo_set_multicast_list' specified in initializer". The file rtl_core.c is 
needed with the new version. Yes, the names are quite confusing, which is part 
of the reason it took so long to delete the unused ones.

I have tested Stephan's patch and will send it to Greg with my SOB.

Larry

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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8192e/r8192E.h between commit 219eb47e6f35
("net/staging: add needed interrupt.h and hardirq.h includes") from the
net tree and commit 41134db17a7d ("Remove unneeded version.h includes
from drivers/staging/rtl*/") from the staging 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/staging/rtl8192e/r8192E.h
index 89fe8fc,0faa637..0000000
--- a/drivers/staging/rtl8192e/r8192E.h
+++ b/drivers/staging/rtl8192e/r8192E.h
@@@ -35,8 -35,6 +35,7 @@@
  #include <linux/proc_fs.h>	// Necessary because we use the proc fs
  #include <linux/if_arp.h>
  #include <linux/random.h>
- #include <linux/version.h>
 +#include <linux/interrupt.h>
  #include <asm/io.h>
  #include "ieee80211/rtl819x_HT.h"
  #include "ieee80211/ieee80211.h"

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

[Greg KH]

On Thu, Jul 07, 2011 at 03:44:18PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8192e/r8192E.h between commit 219eb47e6f35
> ("net/staging: add needed interrupt.h and hardirq.h includes") from the
> net tree and commit 41134db17a7d ("Remove unneeded version.h includes
> from drivers/staging/rtl*/") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Gotta love #include merge issues :(

thanks for doing this,

greg k-h

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

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c between commit
219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
includes") from the net tree and commit 41134db17a7d ("Remove unneeded
version.h includes from drivers/staging/rtl*/") from the staging 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/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 00ee02f,52a7386..0000000
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@@ -19,8 -19,6 +19,7 @@@
  #include <linux/random.h>
  #include <linux/delay.h>
  #include <linux/slab.h>
- #include <linux/version.h>
 +#include <linux/interrupt.h>
  #include <asm/uaccess.h>
  
  #include "dot11d.h"

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

[Greg KH]

On Thu, Jul 07, 2011 at 03:28:57PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c between commit
> 219eb47e6f35 ("net/staging: add needed interrupt.h and hardirq.h
> includes") from the net tree and commit 41134db17a7d ("Remove unneeded
> version.h includes from drivers/staging/rtl*/") from the staging tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Looks correct, thanks.

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/at76_usb/at76_usb.c between commits
6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
of 0 in ndo_start_xmit() functions") and
0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec ("netdev: drivers should make
ethtool_ops const") from the net tree and commit
c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 ("Staging: remove at76_usb
wireless driver") from the staging tree.

The latter just removes the driver, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Greg KH]

On Fri, Sep 04, 2009 at 05:32:25PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/at76_usb/at76_usb.c between commits
> 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
> of 0 in ndo_start_xmit() functions") and
> 0fc0b732eaa38beb93a6fb62f77c7bd9622c76ec ("netdev: drivers should make
> ethtool_ops const") from the net tree and commit
> c0e03fabb4f2a6e48f6e0b55729b26a599a2bd02 ("Staging: remove at76_usb
> wireless driver") from the staging tree.
> 
> The latter just removes the driver, so I did that.

Thanks, that's an easy fix :)

greg k-h

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

[Stephen Rothwell]

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

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/epl/VirtualEthernetLinux.c between commit
6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
of 0 in ndo_start_xmit() functions") from the net tree and commit
49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver")
from the staging tree.

The latter just removes the file, so I did that.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

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

[Greg KH]

On Wed, Jul 29, 2009 at 04:52:11PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/epl/VirtualEthernetLinux.c between commit
> 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
> of 0 in ndo_start_xmit() functions") from the net tree and commit
> 49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver")
> from the staging tree.
> 
> The latter just removes the file, so I did that.

Thanks a lot.  Yes, the epl driver has been dropped from staging, so
that's the right thing to do.

greg k-h

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

[David Miller]

From: Greg KH <greg@kroah.com>
Date: Wed, 29 Jul 2009 05:44:06 -0700

> On Wed, Jul 29, 2009 at 04:52:11PM +1000, Stephen Rothwell wrote:
>> Hi Greg,
>> 
>> Today's linux-next merge of the staging tree got a conflict in
>> drivers/staging/epl/VirtualEthernetLinux.c between commit
>> 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
>> of 0 in ndo_start_xmit() functions") from the net tree and commit
>> 49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver")
>> from the staging tree.
>> 
>> The latter just removes the file, so I did that.
> 
> Thanks a lot.  Yes, the epl driver has been dropped from staging, so
> that's the right thing to do.

Please make sure you integrate that change, if the driver is
simply moving out of staging to somewhere else.

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

[Greg KH]

On Wed, Jul 29, 2009 at 06:46:59AM -0700, David Miller wrote:
> From: Greg KH <greg@kroah.com>
> Date: Wed, 29 Jul 2009 05:44:06 -0700
> 
> > On Wed, Jul 29, 2009 at 04:52:11PM +1000, Stephen Rothwell wrote:
> >> Hi Greg,
> >> 
> >> Today's linux-next merge of the staging tree got a conflict in
> >> drivers/staging/epl/VirtualEthernetLinux.c between commit
> >> 6ed106549d17474ca17a16057f4c0ed4eba5a7ca ("net: use NETDEV_TX_OK instead
> >> of 0 in ndo_start_xmit() functions") from the net tree and commit
> >> 49acb975a21d150c4beba4e581f3e1d004dd2867 ("Staging: remove epl driver")
> >> from the staging tree.
> >> 
> >> The latter just removes the file, so I did that.
> > 
> > Thanks a lot.  Yes, the epl driver has been dropped from staging, so
> > that's the right thing to do.
> 
> Please make sure you integrate that change, if the driver is
> simply moving out of staging to somewhere else.

Nope, the driver is getting dropped into the bin, it's not maintained
upstream, no one cares about it, and is a total and complete mess.

thanks,

greg k-h