Skip to contentSkip to conversation

ieee802154: pull requests for ieee802154/mac802154 branches

DISCUSSION Alexander Aring 1 participant 2 messages Jul 29, 2014 – Aug 3, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi,

I would like to send pull-requests for the net/ieee802154 net/mac802154 implementation.

I know that bluetooth sends pull requests to linux-wireless to avoid merge conflicts. My question is: Which branch is the best to send pull requests for my case. Also I like to get the permission to do that.

I can send pull requests to linux-wireless or linux-net or linux-bluetooth.

For the linux-bluetooth option:

There exists a new branch net/6lowpan which contains shared code between bluetooth 6LoWPAN and IEEE 802.15.4 6LoWPAN implementation. Currently Marcel apply patches for this branch and maybe it's better that I send pull requests to the bluetooth branch, to avoid merge conflicts with the net/6lowpan/* implementation.

Then I would base my pull request on the bluetooth-* branches.

Or should I send the pull requests to linux-wireless? I don't know the right option, but I think I should send pull requests to linux-wireless and take care about "possible" merge conflicts with bluetooth.

Thanks.

- Alex

#1 lore raw

Hi,

ping?

I talked with Marcel today and he would accept pull request for net/ieee802154 and net/mac802154 work. I will catch all patches from the newly generated linux-wpan (IEEE 802.15.4/IEEE 802.15.4 6LoWPAN) list.

I would base my repository on bluetooth/bluetooth-next branches then.

This option is better, because there exist shared 6LoWPAN code which is used by bluetooth and 802154.

David and John, is this okay for you? The alternative would be that I send pull request to wireless, but then we have the net/6lowpan conflicts issue. Bluetooth and 802154 should have the net/6lowpan directory mostly up-to-date.

If this is fine, can I take all patches for net/mac802154 and net/ieee802154? So no patches for this going into net-next/net to avoid conflicts.

For the net/6lowpan branch all patches should go into bluetooth/bluetooth-next. Please let me know if this is fine.

Thanks.

- Alex