update failed on git

Mon Dec 24 05:07:33 EST 2007

Hi
    i was really enthused by the new release of o11s and this is the 
output i got from the command..i am new to git so do pls check if things 
are ok or i need to do anything else....and moreover it really looked 
strange to find this url on the wiki for downloading the kernel

$ git clone ssh://quimby/home/luisca/backup-rosita/dev/o80211s/wireless-2.6

so i tried the normal git-pull on my existing git folder

# git pull
remote: Generating pack...
remote: Counting objects: 4047
remote: Done counting 25196 objects.
remote: Result has 19123 objects.
remote: Deltifying 19123 objects...
remote:  100% (19123/19123) done
Indexing 19123 objects...
remote: Total 19123 (delta 15985), reused 19101 (delta 15968)
 100% (19123/19123) done
Resolving 15985 deltas...
 100% (15985/15985) done
2517 objects were added to complete this thin pack.
* refs/remotes/origin/master: forcing update to non-fast forward branch 
'master' of git://o11s.org/open80211s
  old...new: 5b50b15...697a7b7
* refs/remotes/origin/v0.1.1: storing branch 'v0.1.1' of 
git://o11s.org/open80211s
  commit: 5b50b15
Auto-following refs/tags/o11s-0.1.2
remote: Generating pack...
remote: Done counting 1 objects.
remote: Deltifying 1 objects...
remote:  100% (1/1) done
remote: Total 1 (delta 0), reused 0 (delta 0)
Unpacking 1 objects...
 100% (1/1) done
* refs/tags/o11s-0.1.2: storing tag 'o11s-0.1.2' of 
git://o11s.org/open80211s
  tag: 4222242
Removed Documentation/networking/Configurable
Removed Documentation/networking/comx.txt
Removed Documentation/networking/ncsa-telnet
Removed Documentation/networking/net-modules.txt
Removed Documentation/networking/pt.txt
Removed Documentation/networking/routing.txt
Removed Documentation/networking/slicecom.hun
Removed Documentation/networking/slicecom.txt
Auto-merged MAINTAINERS
CONFLICT (content): Merge conflict in MAINTAINERS
Removed arch/blackfin/lib/udivdi3.S
Removed arch/blackfin/mach-bf527/boards/eth_mac.c
Removed arch/blackfin/mach-bf537/boards/eth_mac.c
Removed arch/i386/.gitignore
Removed arch/parisc/lib/libgcc/Makefile
Removed arch/parisc/lib/libgcc/__ashldi3.c
Removed arch/parisc/lib/libgcc/__ashrdi3.c
Removed arch/parisc/lib/libgcc/__clzsi2.c
Removed arch/parisc/lib/libgcc/__divdi3.c
Removed arch/parisc/lib/libgcc/__divsi3.c
Removed arch/parisc/lib/libgcc/__lshrdi3.c
Removed arch/parisc/lib/libgcc/__moddi3.c
Removed arch/parisc/lib/libgcc/__modsi3.c
Removed arch/parisc/lib/libgcc/__muldi3.c
Removed arch/parisc/lib/libgcc/__udivdi3.c
Removed arch/parisc/lib/libgcc/__udivmoddi4.c
Removed arch/parisc/lib/libgcc/__udivmodsi4.c
Removed arch/parisc/lib/libgcc/__udivsi3.c
Removed arch/parisc/lib/libgcc/__umoddi3.c
Removed arch/parisc/lib/libgcc/__umodsi3.c
Removed arch/parisc/lib/libgcc/__umulsidi3.c
Removed arch/parisc/lib/libgcc/libgcc.h
Removed arch/parisc/lib/milli/Makefile
Removed arch/parisc/lib/milli/divI.S
Removed arch/parisc/lib/milli/divU.S
Removed arch/parisc/lib/milli/div_const.S
Removed arch/parisc/lib/milli/dyncall.S
Removed arch/parisc/lib/milli/milli.S
Removed arch/parisc/lib/milli/milli.h
Removed arch/parisc/lib/milli/mulI.S
Removed arch/parisc/lib/milli/remI.S
Removed arch/parisc/lib/milli/remU.S
Removed arch/sh/boards/snapgear/rtc.c
Removed arch/sh/drivers/pci/pci-st40.c
Removed arch/sh/drivers/pci/pci-st40.h
Removed arch/x86/kernel/cpu/cpufreq/Kconfig_64
Removed arch/x86_64/.gitignore
Removed arch/x86_64/Kconfig
Removed arch/x86_64/Kconfig.debug
Auto-merged drivers/net/wireless/Kconfig
CONFLICT (content): Merge conflict in drivers/net/wireless/Kconfig
Auto-merged drivers/net/wireless/Makefile
Auto-merged drivers/net/wireless/ath5k/Makefile
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/Makefile
Auto-merged drivers/net/wireless/ath5k/ath5k.h
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/ath5k.h
Auto-merged drivers/net/wireless/ath5k/base.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/base.c
Auto-merged drivers/net/wireless/ath5k/base.h
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/base.h
Auto-merged drivers/net/wireless/ath5k/hw.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/hw.c
Auto-merged drivers/net/wireless/ath5k/initvals.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/initvals.c
Auto-merged drivers/net/wireless/ath5k/phy.c
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/phy.c
Auto-merged drivers/net/wireless/ath5k/reg.h
CONFLICT (add/add): Merge conflict in drivers/net/wireless/ath5k/reg.h
Removed drivers/net/wireless/iwlwifi/iwl-channel.h
Removed drivers/net/wireless/iwlwifi/iwl-eeprom.h
Removed drivers/net/wireless/iwlwifi/iwl-hw.h
Removed drivers/net/wireless/iwlwifi/iwl-io.h
Removed drivers/net/wireless/iwlwifi/iwl-priv.h
Removed drivers/net/wireless/iwlwifi/iwlwifi.h
Removed drivers/net/wireless/zd1211rw/zd_netdev.c
Removed drivers/net/wireless/zd1211rw/zd_netdev.h
Removed include/asm-arm26/irq_regs.h
Removed include/asm-mips/8253pit.h
Removed include/asm-mips/mach-au1x00/timex.h
Removed include/asm-mips/mach-generic/timex.h
Removed include/asm-mips/mach-jazz/timex.h
Removed include/asm-mips/mach-qemu/timex.h
Removed include/asm-mips/mach-rm/timex.h
Removed include/linux/cpu_acct.h
Auto-merged include/linux/ieee80211.h
CONFLICT (content): Merge conflict in include/linux/ieee80211.h
Auto-merged include/linux/nl80211.h
CONFLICT (content): Merge conflict in include/linux/nl80211.h
Auto-merged include/linux/rtnetlink.h
CONFLICT (content): Merge conflict in include/linux/rtnetlink.h
Auto-merged include/net/mac80211.h
CONFLICT (content): Merge conflict in include/net/mac80211.h
Removed kernel/cpu_acct.c
Auto-merged net/mac80211/Makefile
CONFLICT (content): Merge conflict in net/mac80211/Makefile
Auto-merged net/mac80211/cfg.c
CONFLICT (content): Merge conflict in net/mac80211/cfg.c
Auto-merged net/mac80211/debugfs_netdev.c
CONFLICT (content): Merge conflict in net/mac80211/debugfs_netdev.c
Auto-merged net/mac80211/ieee80211.c
CONFLICT (content): Merge conflict in net/mac80211/ieee80211.c
Removed net/mac80211/ieee80211_common.h
Auto-merged net/mac80211/ieee80211_i.h
CONFLICT (content): Merge conflict in net/mac80211/ieee80211_i.h
Auto-merged net/mac80211/ieee80211_iface.c
CONFLICT (content): Merge conflict in net/mac80211/ieee80211_iface.c
Auto-merged net/mac80211/ieee80211_sta.c
CONFLICT (content): Merge conflict in net/mac80211/ieee80211_sta.c
Auto-merged net/mac80211/ieee80211s.h
CONFLICT (add/add): Merge conflict in net/mac80211/ieee80211s.h
Auto-merged net/mac80211/mesh_pathtbl.c
CONFLICT (add/add): Merge conflict in net/mac80211/mesh_pathtbl.c
Auto-merged net/mac80211/rx.c
CONFLICT (content): Merge conflict in net/mac80211/rx.c
Auto-merged net/mac80211/tx.c
CONFLICT (content): Merge conflict in net/mac80211/tx.c
Auto-merged net/mac80211/util.c
CONFLICT (content): Merge conflict in net/mac80211/util.c
Auto-merged net/wireless/nl80211.c
CONFLICT (content): Merge conflict in net/wireless/nl80211.c
Automatic merge failed; fix conflicts and then commit the result.
#