Hi,
I am having clone wpan-next [1] on my workspace. I did *git pull* on
master branch of tree. It ended up with following conflict..
*bhadram@cdac:wpan-next$ git pull*
remote: Counting objects: 2295, done.
remote: Compressing objects: 100% (2295/2295), done.
remote: Total 2295 (delta 1711), reused 0 (delta 0)
Receiving objects: 100% (2295/2295), 2.28 MiB | 268 KiB/s, done.
Resolving deltas: 100% (1711/1711), done.
From https://github.com/linux-wpan/wpan-next
+ 8959957...cad114a master -> origin/master (forced update)
Auto-merging net/nfc/digital_dep.c
Auto-merging net/mac802154/wpan.c
Auto-merging net/mac80211/iface.c
Auto-merging net/6lowpan/iphc.c
CONFLICT (content): Merge conflict in net/6lowpan/iphc.c
Auto-merging drivers/net/wireless/mwifiex/cfg80211.c
Auto-merging drivers/net/wireless/mac80211_hwsim.c
Auto-merging drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
Auto-merging drivers/net/wireless/ath/ath6kl/init.c
Auto-merging drivers/net/wireless/ath/ath6kl/cfg80211.c
Auto-merging MAINTAINERS
Automatic merge failed; fix conflicts and then commit the result.
--
Regards,
Varka Bhadram.
------------------------------------------------------------------------------
Infragistics Professional
Build stunning WinForms apps today!
Reboot your WinForms applications with our WinForms controls.
Build a bridge from your legacy apps to the future.
http://pubads.g.doubleclick.net/gampad/clk?id=153845071&iu=/4140/ostg.clktrk
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
