From: Johannes Berg <johannes@sipsolutions.net>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: Re: pull-request: iwlwifi-next 2012-02-12
Date: Tue, 12 Feb 2013 18:51:43 +0100 [thread overview]
Message-ID: <1360691503.29913.10.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <20130212174131.GD2086@tuxdriver.com>
On Tue, 2013-02-12 at 12:41 -0500, John W. Linville wrote:
> On Tue, Feb 12, 2013 at 12:37:50PM -0500, John W. Linville wrote:
> > On Tue, Feb 12, 2013 at 05:01:31PM +0100, Johannes Berg wrote:
> > > John,
> > >
> > > We continue work on our new driver, but I also have a WoWLAN and AP mode
> > > improvement for the previous driver and a change to use threaded
> > > interrupts to prepare us for working with non-PCIe devices.
> > >
> > > Please pull.
> > >
> > > Thanks,
> > > johannes
> > >
> > >
> > >
> > > The following changes since commit 8457703f1e86aaf0f134402dd1e09e1f13e65222:
> > >
> > > ath6kl: provide 64-bit per-station byte counters (2013-02-11 15:34:58 -0500)
> > >
> > > are available in the git repository at:
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git for-john
> > >
> > > for you to fetch changes up to 36eed56a8f7e1bd7fb5014ea0e702708e1702f30:
> > >
> > > iwlwifi: mvm: beautify code in rx_handlers (2013-02-12 16:52:26 +0100)
> >
> > Pulling now...
>
> Hmmm...
>
> CC [M] drivers/net/wireless/iwlwifi/mvm/mac80211.o
> drivers/net/wireless/iwlwifi/mvm/mac80211.c: In function ‘iwl_mvm_mac_setup_register’:
> drivers/net/wireless/iwlwifi/mvm/mac80211.c:116:1: error: expected expression before ‘<<’ token
> drivers/net/wireless/iwlwifi/mvm/mac80211.c:120:9: error: exponent has no digits
I think you didn't resolve the merge conflict:
hw->flags = IEEE80211_HW_SIGNAL_DBM |
IEEE80211_HW_SPECTRUM_MGMT |
IEEE80211_HW_REPORTS_TX_ACK_STATUS |
IEEE80211_HW_QUEUE_CONTROL |
IEEE80211_HW_WANT_MONITOR_VIF |
<<<<<<< HEAD
IEEE80211_HW_NEED_DTIM_BEFORE_ASSOC |
=======
IEEE80211_HW_SCAN_WHILE_IDLE |
>>>>>>> iwlwifi-next/for-john
IEEE80211_HW_SUPPORTS_PS |
IEEE80211_HW_SUPPORTS_DYNAMIC_PS |
IEEE80211_HW_AMPDU_AGGREGATION;
My mac80211-next tree removed HW_SCAN_WHILE_IDLE, iwlwifi-next removes
NEED_DTIM_BEFORE_ASSOC.
Sorry about that!
johannes
prev parent reply other threads:[~2013-02-12 17:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-12 16:01 pull-request: iwlwifi-next 2012-02-12 Johannes Berg
2013-02-12 16:01 ` [PATCH 01/15] iwlwifi: don't ack the card state notification Johannes Berg
2013-02-12 16:01 ` [PATCH 02/15] iwlwifi: use threaded interrupt handler Johannes Berg
2013-02-12 16:01 ` [PATCH 03/15] iwlwifi: mvm: Update quota settings for all bindings Johannes Berg
2013-02-12 16:01 ` [PATCH 04/15] iwlwifi: mvm: Change the Time Event type used for ROC Johannes Berg
2013-02-12 16:01 ` [PATCH 05/15] iwlwifi: mvm: fix the keyidx assignment Johannes Berg
2013-02-12 16:01 ` [PATCH 06/15] iwlwifi: mvm: fix TKIP key updating Johannes Berg
2013-02-12 16:01 ` [PATCH 07/15] iwlwifi: mvm: fix locking in iwl_mvm_ipv6_addr_change Johannes Berg
2013-02-12 16:02 ` [PATCH 08/15] iwlwifi: mvm: use atomic interface iteration to avoid deadlock Johannes Berg
2013-02-12 16:02 ` [PATCH 09/15] iwlwifi: dvm: query and report WoWLAN wakeup reason Johannes Berg
2013-02-12 16:02 ` [PATCH 10/15] iwlwifi: mvm: report wakeup reasons Johannes Berg
2013-02-12 16:02 ` [PATCH 11/15] iwlwifi: dvm: apply beacon changes immediately Johannes Berg
2013-02-12 16:02 ` [PATCH 12/15] iwlwifi: mvm: don't delay the association until after beacon Johannes Berg
2013-02-12 16:02 ` [PATCH 13/15] iwlwifi: mvm: don't wait for session protection to start Johannes Berg
2013-02-12 16:02 ` [PATCH 14/15] iwlwifi: mvm: update station when marked associated Johannes Berg
2013-02-12 16:02 ` [PATCH 15/15] iwlwifi: mvm: beautify code in rx_handlers Johannes Berg
2013-02-12 17:37 ` pull-request: iwlwifi-next 2012-02-12 John W. Linville
2013-02-12 17:41 ` John W. Linville
2013-02-12 17:49 ` John W. Linville
2013-02-12 17:51 ` Johannes Berg [this message]
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=1360691503.29913.10.camel@jlt4.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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