linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Thierry Reding <thierry.reding@gmail.com>
To: Joe Perches <joe@perches.com>,
	Arend van Spriel <arend@broadcom.com>,
	Matti Gottlieb <matti.gottlieb@intel.com>,
	Eran Harary <eran.harary@intel.com>,
	"John W. Linville" <linville@tuxdriver.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: linux-next: manual merge of the wireless-next tree
Date: Tue, 22 Oct 2013 17:10:46 +0200	[thread overview]
Message-ID: <1382454649-16442-2-git-send-email-treding@nvidia.com> (raw)
In-Reply-To: <1382454649-16442-1-git-send-email-treding@nvidia.com>

Today's linux-next merge of the wireless-next tree got conflicts in

	drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
	drivers/net/wireless/iwlwifi/pcie/drv.c

caused by commits 9bd91f3 (brcm80211: Remove extern from function prototypes)
and a413e39 (brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg
support) as well as b499266 (iwlwifi: pcie: add new SKUs for 7000 & 3160 NIC
series) and c4aee08 (iwlwifi: Support 7265 devices).

I fixed them up (see below). Please verify that the resolution looks good.

Thanks,
Thierry
---
diff --cc drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
index c9b06b4,1b034ea..bfadcb8
--- a/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/sdio_host.h
@@@ -206,17 -210,22 +210,18 @@@ int brcmf_sdio_regrw_helper(struct brcm
   * Returns 0 or error code.
   * NOTE: Async operation is not currently supported.
   */
 -extern int
 -brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -		      uint flags, struct sk_buff_head *pktq);
 -extern int
 -brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -		      uint flags, u8 *buf, uint nbytes);
 -
 -extern int
 -brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -		      uint flags, struct sk_buff *pkt);
 -extern int
 -brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -		      uint flags, u8 *buf, uint nbytes);
 -extern int
 -brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 -			uint flags, struct sk_buff_head *pktq, uint totlen);
 +int brcmf_sdcard_send_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +			  uint flags, struct sk_buff_head *pktq);
 +int brcmf_sdcard_send_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +			  uint flags, u8 *buf, uint nbytes);
 +
 +int brcmf_sdcard_recv_pkt(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +			  uint flags, struct sk_buff *pkt);
 +int brcmf_sdcard_recv_buf(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
 +			  uint flags, u8 *buf, uint nbytes);
 +int brcmf_sdcard_recv_chain(struct brcmf_sdio_dev *sdiodev, u32 addr, uint fn,
- 			    uint flags, struct sk_buff_head *pktq);
++			    uint flags, struct sk_buff_head *pktq,
++			    uint totlen);
  
  /* Flags bits */
  
diff --cc drivers/net/wireless/iwlwifi/pcie/drv.c
index 26108a1,ddf15e1..941c0c8
--- a/drivers/net/wireless/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/iwlwifi/pcie/drv.c
@@@ -268,12 -258,10 +268,12 @@@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_c
  #endif /* CONFIG_IWLDVM */
  
  #if IS_ENABLED(CONFIG_IWLMVM)
- /* 7000 Series */
+ /* 7260 Series */
  	{IWL_PCI_DEVICE(0x08B1, 0x4070, iwl7260_2ac_cfg)},
 +	{IWL_PCI_DEVICE(0x08B1, 0x4072, iwl7260_2ac_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4170, iwl7260_2ac_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4060, iwl7260_2n_cfg)},
 +	{IWL_PCI_DEVICE(0x08B1, 0x406A, iwl7260_2n_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4160, iwl7260_2n_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4062, iwl7260_n_cfg)},
  	{IWL_PCI_DEVICE(0x08B1, 0x4162, iwl7260_n_cfg)},
@@@ -349,7 -308,9 +349,10 @@@
  	{IWL_PCI_DEVICE(0x08B3, 0x8062, iwl3160_n_cfg)},
  	{IWL_PCI_DEVICE(0x08B4, 0x8270, iwl3160_2ac_cfg)},
  	{IWL_PCI_DEVICE(0x08B3, 0x8470, iwl3160_2ac_cfg)},
 +	{IWL_PCI_DEVICE(0x08B3, 0x8570, iwl3160_2ac_cfg)},
+ 
+ /* 7265 Series */
+ 	{IWL_PCI_DEVICE(0x095A, 0x5010, iwl7265_2ac_cfg)},
  #endif /* CONFIG_IWLMVM */
  
  	{0}

  reply	other threads:[~2013-10-22 15:10 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-10-21 15:36 linux-next: Tree for Oct 21 Thierry Reding
2013-10-21 23:20 ` linux-next: Tree for Oct 21 (panel-simple.c) Randy Dunlap
2013-10-22  8:10   ` Thierry Reding
2013-10-22  0:58 ` linux-next: Tree for Oct 21 (sound/pci/hda/patch_hdmi.c) Randy Dunlap
2013-10-22  7:42   ` Takashi Iwai
2013-10-22 15:10 ` linux-next: manual merge of the net-next tree Thierry Reding
2013-10-22 15:10   ` Thierry Reding [this message]
2013-10-22 15:10   ` linux-next: manual merge of the drm tree Thierry Reding
2013-10-22 15:10   ` linux-next: manual merge of the arm-soc tree Thierry Reding
2013-10-23 12:19     ` Tony Lindgren
2013-10-22 15:10   ` linux-next: manual merge of the mvebu tree Thierry Reding
2013-10-23  8:59     ` Jason Cooper
  -- strict thread matches above, loose matches on Subject: below --
2013-10-07 15:18 linux-next: Tree for Oct 7 Thierry Reding
2013-10-07 15:18 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-10-07 15:48   ` Larry Finger
2013-10-07 15:56     ` Joe Perches
2013-10-07 16:09       ` Larry Finger
2013-10-07 16:17         ` Joe Perches
2013-10-07 17:16           ` Larry Finger
2013-09-30 11:26 linux-next: manual merge of the bcon tree Thierry Reding
2013-09-30 11:26 ` linux-next: manual merge of the wireless-next tree Thierry Reding
2013-09-30 14:26   ` Larry Finger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1382454649-16442-2-git-send-email-treding@nvidia.com \
    --to=thierry.reding@gmail.com \
    --cc=arend@broadcom.com \
    --cc=eran.harary@intel.com \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=matti.gottlieb@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).