On 12 November 2015 at 20:29, Kalle Valo <kvalo@xxxxxxxxxxxxxxxx> wrote: > Michal Kazior <michal.kazior@xxxxxxxxx> writes: > >> The ath10k_skb_cb structure wasn't really space >> efficient. Some stuff is removed or replaced with >> more compact representation. >> >> This cleanup is necessary for future features. >> >> The size of ath10k_skb_cb: >> >> before after >> x86-32 26 12 >> x86-64 34 20 >> >> >> v2: >> * fix a bug (patch 7/9 introduced) >> >> >> Michal Kazior (9): >> ath10k: merge is_protected with nohwcrypt >> ath10k: rename function to adhere to naming convention >> ath10k: remove txmode from skb_cb >> ath10k: remove is_offchan >> ath10k: remove freq from skb_cb >> ath10k: pack up flags in skb_cb >> ath10k: fix tx header parsing >> ath10k: replace vdev_id and tid in skb cb >> ath10k: store msdu_id instead of txbuf pointers > > I have a conflict which I can't fix myself: > > Applying: ath10k: merge is_protected with nohwcrypt > Applying: ath10k: rename function to adhere to naming convention > Applying: ath10k: remove txmode from skb_cb > Applying: ath10k: remove is_offchan > fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath10k/mac.c). > Repository lacks necessary blobs to fall back on 3-way merge. > Cannot fall back to three-way merge. > Patch failed at 0004 ath10k: remove is_offchan Ah, sorry. I thought I rebased on top of your master branch but it looks like I didn't. Let me fix that.. Michał -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
