From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: <ath10k@lists.infradead.org>, <linux-wireless@vger.kernel.org>
Subject: Re: [PATCH v2 0/9] ath10k: clean up ath10k_skb_cb
Date: Thu, 12 Nov 2015 21:29:04 +0200 [thread overview]
Message-ID: <87mvuj585b.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1447161055-2283-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 10 Nov 2015 14:10:46 +0100")
Michal Kazior <michal.kazior@tieto.com> 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
--
Kalle Valo
WARNING: multiple messages have this Message-ID (diff)
From: Kalle Valo <kvalo@qca.qualcomm.com>
To: Michal Kazior <michal.kazior@tieto.com>
Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org
Subject: Re: [PATCH v2 0/9] ath10k: clean up ath10k_skb_cb
Date: Thu, 12 Nov 2015 21:29:04 +0200 [thread overview]
Message-ID: <87mvuj585b.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <1447161055-2283-1-git-send-email-michal.kazior@tieto.com> (Michal Kazior's message of "Tue, 10 Nov 2015 14:10:46 +0100")
Michal Kazior <michal.kazior@tieto.com> 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
--
Kalle Valo
_______________________________________________
ath10k mailing list
ath10k@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/ath10k
next prev parent reply other threads:[~2015-11-12 19:29 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-02 14:03 [PATCH 0/8] ath10k: clean up ath10k_skb_cb Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 1/8] ath10k: merge is_protected with nohwcrypt Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 2/8] ath10k: rename function to adhere to naming convention Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 3/8] ath10k: remove txmode from skb_cb Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 4/8] ath10k: remove is_offchan Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 5/8] ath10k: remove freq from skb_cb Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 6/8] ath10k: pack up flags in skb_cb Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 7/8] ath10k: replace vdev_id and tid in skb cb Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-03 9:37 ` Michal Kazior
2015-11-03 9:37 ` Michal Kazior
2015-11-02 14:03 ` [PATCH 8/8] ath10k: store msdu_id instead of txbuf pointers Michal Kazior
2015-11-02 14:03 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 0/9] ath10k: clean up ath10k_skb_cb Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 1/9] ath10k: merge is_protected with nohwcrypt Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 2/9] ath10k: rename function to adhere to naming convention Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 3/9] ath10k: remove txmode from skb_cb Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 4/9] ath10k: remove is_offchan Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 5/9] ath10k: remove freq from skb_cb Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 6/9] ath10k: pack up flags in skb_cb Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 7/9] ath10k: fix tx header parsing Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 8/9] ath10k: replace vdev_id and tid in skb cb Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-10 13:10 ` [PATCH v2 9/9] ath10k: store msdu_id instead of txbuf pointers Michal Kazior
2015-11-10 13:10 ` Michal Kazior
2015-11-12 19:29 ` Kalle Valo [this message]
2015-11-12 19:29 ` [PATCH v2 0/9] ath10k: clean up ath10k_skb_cb Kalle Valo
2015-11-13 6:20 ` Michal Kazior
2015-11-13 6:20 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 " Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 1/9] ath10k: merge is_protected with nohwcrypt Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 2/9] ath10k: rename function to adhere to naming convention Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 3/9] ath10k: remove txmode from skb_cb Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 4/9] ath10k: remove is_offchan Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 5/9] ath10k: remove freq from skb_cb Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 6/9] ath10k: pack up flags in skb_cb Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 7/9] ath10k: fix tx header parsing Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 8/9] ath10k: replace vdev_id and tid in skb cb Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-18 5:59 ` [PATCH v3 9/9] ath10k: store msdu_id instead of txbuf pointers Michal Kazior
2015-11-18 5:59 ` Michal Kazior
2015-11-19 15:10 ` QCA998X not working at all Sebastian Gottschall
2015-11-19 15:33 ` Ben Greear
2015-11-19 15:35 ` Sebastian Gottschall
2015-11-19 16:13 ` Ben Greear
2015-11-19 17:12 ` Sebastian Gottschall
2015-11-19 18:21 ` Sebastian Gottschall
2015-11-20 11:53 ` Kalle Valo
2015-11-20 15:55 ` Sebastian Gottschall
2015-11-20 16:46 ` Ben Greear
2016-04-13 15:36 ` Ben Greear
2016-04-13 17:05 ` Alexis Green
2016-04-14 14:13 ` Sebastian Gottschall
2016-04-14 14:12 ` Sebastian Gottschall
2015-11-19 15:35 ` Sebastian Gottschall
2015-11-23 15:21 ` [PATCH v3 0/9] ath10k: clean up ath10k_skb_cb Kalle Valo
2015-11-23 15:21 ` Kalle Valo
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=87mvuj585b.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=linux-wireless@vger.kernel.org \
--cc=michal.kazior@tieto.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.