Hi,
I have patches that rely on mac80211-next. Until now, I would wait for John to
pull them from mac80211-next into wireless-next,
then I'd merge wireless-next into my tree. On top of that I'd apply the new
patches.
"git request-pull wireless-next/master iwlwifi-next HEAD" didn't get confused
in this case, it would show my patches only and not the
patches in wireless-next obviously.
This time, I did something slightly different. I merged Johannes's tag - the
one he sent to John. So that I got content from mac80211-next
before it made it to wireless-next, and on top of that I applied my new
patches. I thought I could wait for John to pull from Johannes and
then, I'd just have to fetch wireless-next and let do git request-pull do its
magic... But...
"git request-pull wireless-next/master iwlwifi-next HEAD" lists my merge patch:
Emmanuel Grumbach (1):
Merge tag 'mac80211-next-for-john-2014-09-12' into HEAD
which is perfectly fine. I can see no mac80211 patches in the patch list, but...
[snip]
include/linux/ieee80211.h | 73
++++++++++++++++++++++++++++++++++-
include/net/cfg80211.h | 69
+++++++++++++++++++++++++++------
include/net/mac80211.h | 34 ++++++++--------
include/uapi/linux/nl80211.h | 116
++++++++++++++++++++++++++++++++++++++++++++++++++++++-
net/mac80211/agg-rx.c | 5 ++-
net/mac80211/cfg.c | 114
++++++++++++++++++++++++++++++++++++------------------
net/mac80211/chan.c | 191
+++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------
net/mac80211/debugfs.c | 6 +--
[snip]
It seems that the baseline taken by git request-pull to list the files I change
is wrong:
The following changes since commit f991e17ba2584e2be66476cc468f19769efd55cc:
iwlwifi: mvm: align CSA GO NOA time event naming with the firmware
(2014-09-14 22:02:24 +0300)
I'd expect git request-pull to notice that Johannes's tag that I pulled is
already in wireless-next and that I am not really changing these files?
$ git --version
git version 1.9.1
Thoughts?
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
