Hi Marcel,
On Sat, Jul 12, 2014 at 01:58:26AM +0200, Marcel Holtmann wrote:
> Hi Alexander,
>
> >>>>> index cbbbe6d..7ed1970 100644
> >>>>> --- a/net/Makefile
> >>>>> +++ b/net/Makefile
> >>>>> @@ -57,7 +57,8 @@ obj-$(CONFIG_CAIF) += caif/
> >>>>> ifneq ($(CONFIG_DCB),)
> >>>>> obj-y += dcb/
> >>>>> endif
> >>>>> -obj-y += ieee802154/
> >>>>> +obj-$(CONFIG_6LOWPAN) += 6lowpan/
> >>>>> +obj-$(CONFIG_IEEE802154) += ieee802154/
> >>>>> obj-$(CONFIG_MAC802154) += mac802154/
> >>>>>
> >>>>> ifeq ($(CONFIG_NET),y)
> >>>>> diff --git a/net/bluetooth/Kconfig b/net/bluetooth/Kconfig
> >>>>> index 06ec144..a54777d 100644
> >>>>> --- a/net/bluetooth/Kconfig
> >>>>> +++ b/net/bluetooth/Kconfig
> >>>>> @@ -6,7 +6,6 @@ menuconfig BT
> >>>>> tristate "Bluetooth subsystem support"
> >>>>> depends on NET && !S390
> >>>>> depends on RFKILL || !RFKILL
> >>>>> - select 6LOWPAN_IPHC if BT_6LOWPAN
> >>>>> select CRC16
> >>>>> select CRYPTO
> >>>>> select CRYPTO_BLKCIPHER
> >>>>> @@ -42,7 +41,7 @@ menuconfig BT
> >>>>>
> >>>>> config BT_6LOWPAN
> >>>>> bool "Bluetooth 6LoWPAN support"
> >>>>> - depends on BT && IPV6
> >>>>> + depends on BT && 6LOWPAN
> >>>>> help
> >>>>> IPv6 compression over Bluetooth.
> >>>>
> >>>> this will conflict with our changes in wireless-next tree. We converted out 6LoWPAN support into a separate module.
> >>>>
> >>>
> >>> oops, sorry I didn't check on this. I simple based it on net-next,
> >>> because the patch series adds a new branch.
> >>>
> >>>
> >>>
> >>> btw. we need to talk about who branch will commit changes to iphc code
> >>> to avoid conflicts.
> >>
> >> a few years back we decided to merge bluetooth-next via John's wireless-next tree so that any interaction with 802.11 and Bluetooth can be sorted out in John's tree. We are now also merging NFC into the wireless-next tree.
> >>
> >> So it might be a good idea to include the 6LoWPAN parts into the wireless-next tree as well. If there are conflicts with 802.15.4, maybe that should also go through his trees.
> >>
> >
> > Ok. I am maintainer since three days ago and I need some time to setup
> > my infrastructure, then I will ask him. At the end I need to update the
> > MAINTAINERS file to the new infrastructure.
> >
> >> If you want I can also take the net/6lowpan stuff through bluetooth-next tree.
> >>
> >
> > Yes, please Marcel. This is one file at the moment. I have in my local
> > branch also some patches (most of them use IPv6 API for address scopes
> > instead using the self builded macros). There is also a issue with error
> > handling which should be a long overdue fix. You will get some patches
> > for these issues in the next days.
>
> I resolved the conflict locally in bluetooth-next and applied both of your patches to bluetooth-next tree.
>
ok. Thanks.
I notice there is a patch in net-next for the old file
4710d806fcb825156e0a7b3a81104915c5e90f5d ("6lowpan: mac802154: fix coding
style issues").
It's not in bluetooth-next currently and the movement patch should not
occur any conflicts (I think). But I can't send you patches until this
is in bluetooth-next.
I wait until the next sync of bluetooth-next with net-next and you should not
apply any patches to "net/6lowpan/iphc.c" until that.
- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
