rpi-update [solved]

[billybangleballs]

After running sudo rpi-update, I get to the bit where it says, "Updating firmware (this will take a few minutes)".
How long is a few minutes and is an hour long enough?

It worked in November but it doesn't do anything today. I've upgraded the raspbian with sudo apt-get upgrade but rpi-update still hangs at "Updating firmware (this will take a few minutes)".

After an hour, I did ^C and got a bash prompt back, but nothing in the boot dir has been altered and the output of uname -a is still " Linux raspberrypi 3.2.27+ #260 PREEMPT Thu Nov 8 00:34:12 GMT 2012 armv6l GNU/Linux".

Am I doing something wrong or is it broke?

[dom]

I belive it will complete eventually, but it seems to have got very slow.

Code: Select all

sudo rm -rf /root/.rpi-firmware

before running rpi-update makes it complete more quickly.

[billybangleballs]

Thanks dom, I'll try that.

[billybangleballs]

Yeah, deleting that file fixed it and it updated OK.

Thanks dom.

[kalehrl]

Tonight I ran rpi-update.
It downloaded a whopping 415MB of data and it took a lot of time!
A couple of days ago I ran it and it finished in a couple of minutes.
I think now it pulls all the stuff from hexxeh's git, not just binaries.
Is this really necessary?

[dom]

Churten spotted what was making rpi-update slow, and I've pushed an update.
It should be quicker now.

[kalehrl]

I've just tried to update fiirmware and I get this:

Code: Select all

Auto-merging start_cd.elf
CONFLICT (add/add): Merge conflict in start_cd.elf
Auto-merging start.elf
CONFLICT (add/add): Merge conflict in start.elf
Auto-merging modules/3.6.11+/modules.symbols.bin
CONFLICT (add/add): Merge conflict in modules/3.6.11+/modules.symbols.bin
Auto-merging modules/3.6.11+/modules.symbols
CONFLICT (add/add): Merge conflict in modules/3.6.11+/modules.symbols
Auto-merging modules/3.6.11+/modules.order
CONFLICT (add/add): Merge conflict in modules/3.6.11+/modules.order
Auto-merging modules/3.6.11+/modules.dep.bin
CONFLICT (add/add): Merge conflict in modules/3.6.11+/modules.dep.bin
Auto-merging modules/3.6.11+/modules.dep
CONFLICT (add/add): Merge conflict in modules/3.6.11+/modules.dep
Auto-merging modules/3.6.11+/modules.alias.bin
CONFLICT (add/add): Merge conflict in modules/3.6.11+/modules.alias.bin
Auto-merging modules/3.6.11+/kernel/sound/drivers/snd-dummy.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/sound/drivers/snd-dummy.ko
Auto-merging modules/3.6.11+/kernel/sound/core/snd-pcm.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/sound/core/snd-pcm.ko
Auto-merging modules/3.6.11+/kernel/net/xfrm/xfrm_ipcomp.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/xfrm/xfrm_ipcomp.ko
Auto-merging modules/3.6.11+/kernel/net/wireless/lib80211_crypt_tkip.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/wireless/lib80211_crypt_tkip.ko
Auto-merging modules/3.6.11+/kernel/net/wireless/cfg80211.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/wireless/cfg80211.ko
Auto-merging modules/3.6.11+/kernel/net/wimax/wimax.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/wimax/wimax.ko
Auto-merging modules/3.6.11+/kernel/net/netfilter/xt_socket.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/netfilter/xt_socket.ko
Auto-merging modules/3.6.11+/kernel/net/netfilter/xt_TPROXY.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/netfilter/xt_TPROXY.ko
Auto-merging modules/3.6.11+/kernel/net/ipv6/ipv6.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/ipv6/ipv6.ko
Auto-merging modules/3.6.11+/kernel/net/ipv6/esp6.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/ipv6/esp6.ko
Auto-merging modules/3.6.11+/kernel/net/ipv4/tcp_diag.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/ipv4/tcp_diag.ko
Auto-merging modules/3.6.11+/kernel/net/ipv4/inet_lro.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/ipv4/inet_lro.ko
Auto-merging modules/3.6.11+/kernel/net/ipv4/esp4.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/ipv4/esp4.ko
Auto-merging modules/3.6.11+/kernel/net/core/pktgen.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/core/pktgen.ko
Auto-merging modules/3.6.11+/kernel/net/bluetooth/rfcomm/rfcomm.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/bluetooth/rfcomm/rfcomm.ko
Auto-merging modules/3.6.11+/kernel/net/bluetooth/hidp/hidp.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/bluetooth/hidp/hidp.ko
Auto-merging modules/3.6.11+/kernel/net/bluetooth/bnep/bnep.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/bluetooth/bnep/bnep.ko
Auto-merging modules/3.6.11+/kernel/net/bluetooth/bluetooth.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/bluetooth/bluetooth.ko
Auto-merging modules/3.6.11+/kernel/net/9p/9pnet.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/net/9p/9pnet.ko
Auto-merging modules/3.6.11+/kernel/fs/xfs/xfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/xfs/xfs.ko
Auto-merging modules/3.6.11+/kernel/fs/udf/udf.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/udf/udf.ko
Auto-merging modules/3.6.11+/kernel/fs/squashfs/squashfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/squashfs/squashfs.ko
Auto-merging modules/3.6.11+/kernel/fs/reiserfs/reiserfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/reiserfs/reiserfs.ko
Auto-merging modules/3.6.11+/kernel/fs/ocfs2/ocfs2.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/ocfs2/ocfs2.ko
Auto-merging modules/3.6.11+/kernel/fs/ocfs2/dlmfs/ocfs2_dlmfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/ocfs2/dlmfs/ocfs2_dlmfs.ko
Auto-merging modules/3.6.11+/kernel/fs/ocfs2/dlm/ocfs2_dlm.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/ocfs2/dlm/ocfs2_dlm.ko
Auto-merging modules/3.6.11+/kernel/fs/ocfs2/cluster/ocfs2_nodemanager.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/ocfs2/cluster/ocfs2_nodemanager.ko
Auto-merging modules/3.6.11+/kernel/fs/ntfs/ntfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/ntfs/ntfs.ko
Auto-merging modules/3.6.11+/kernel/fs/nilfs2/nilfs2.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/nilfs2/nilfs2.ko
Auto-merging modules/3.6.11+/kernel/fs/nfsd/nfsd.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/nfsd/nfsd.ko
Auto-merging modules/3.6.11+/kernel/fs/jfs/jfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/jfs/jfs.ko
Auto-merging modules/3.6.11+/kernel/fs/isofs/isofs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/isofs/isofs.ko
Auto-merging modules/3.6.11+/kernel/fs/hfsplus/hfsplus.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/hfsplus/hfsplus.ko
Auto-merging modules/3.6.11+/kernel/fs/hfs/hfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/hfs/hfs.ko
Auto-merging modules/3.6.11+/kernel/fs/gfs2/gfs2.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/gfs2/gfs2.ko
Auto-merging modules/3.6.11+/kernel/fs/fuse/fuse.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/fuse/fuse.ko
Auto-merging modules/3.6.11+/kernel/fs/fuse/cuse.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/fuse/cuse.ko
Auto-merging modules/3.6.11+/kernel/fs/ecryptfs/ecryptfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/ecryptfs/ecryptfs.ko
Auto-merging modules/3.6.11+/kernel/fs/cifs/cifs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/cifs/cifs.ko
Auto-merging modules/3.6.11+/kernel/fs/btrfs/btrfs.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/btrfs/btrfs.ko
Auto-merging modules/3.6.11+/kernel/fs/binfmt_misc.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/binfmt_misc.ko
Auto-merging modules/3.6.11+/kernel/fs/9p/9p.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/fs/9p/9p.ko
Auto-merging modules/3.6.11+/kernel/drivers/w1/wire.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/w1/wire.ko
Auto-merging modules/3.6.11+/kernel/drivers/usb/mon/usbmon.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/usb/mon/usbmon.ko
Auto-merging modules/3.6.11+/kernel/drivers/usb/misc/usbtest.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/usb/misc/usbtest.ko
Auto-merging modules/3.6.11+/kernel/drivers/usb/image/microtek.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/usb/image/microtek.ko
Auto-merging modules/3.6.11+/kernel/drivers/uio/uio.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/uio/uio.ko
Auto-merging modules/3.6.11+/kernel/drivers/staging/rtl8712/r8712u.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/staging/rtl8712/r8712u.ko
Auto-merging modules/3.6.11+/kernel/drivers/scsi/st.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/scsi/st.ko
Auto-merging modules/3.6.11+/kernel/drivers/scsi/osst.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/scsi/osst.ko
Auto-merging modules/3.6.11+/kernel/drivers/scsi/libiscsi_tcp.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/scsi/libiscsi_tcp.ko
Auto-merging modules/3.6.11+/kernel/drivers/scsi/iscsi_tcp.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/scsi/iscsi_tcp.ko
Auto-merging modules/3.6.11+/kernel/drivers/rtc/rtc-isl1208.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/rtc/rtc-isl1208.ko
Auto-merging modules/3.6.11+/kernel/drivers/rtc/rtc-ds1374.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/rtc/rtc-ds1374.ko
Auto-merging modules/3.6.11+/kernel/drivers/rtc/rtc-ds1307.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/rtc/rtc-ds1307.ko
Auto-merging modules/3.6.11+/kernel/drivers/rtc/rtc-ds1305.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/rtc/rtc-ds1305.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/rtl8192cu/8192cu.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/rt2x00/rt2x00lib.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/libertas/libertas_sdio.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/libertas/libertas.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/libertas/libertas.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/b43legacy/b43legacy.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/b43/b43.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/b43/b43.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/ath/carl9170/carl9170.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wimax/i2400m/i2400m.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wimax/i2400m/i2400m.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/wimax/i2400m/i2400m-usb.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/tun.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/tun.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/ppp/ppp_mppe.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/ppp/ppp_mppe.ko
Auto-merging modules/3.6.11+/kernel/drivers/net/irda/stir4200.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/net/irda/stir4200.ko
Auto-merging modules/3.6.11+/kernel/drivers/mmc/host/mmc_spi.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/mmc/host/mmc_spi.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/vivi.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/vivi.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/videobuf2-vmalloc.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/videobuf2-vmalloc.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/videobuf2-memops.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/videobuf2-memops.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/videobuf-dvb.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/videobuf-dvb.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/usbvision/usbvision.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/usbvision/usbvision.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/tlg2300/poseidon.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/tlg2300/poseidon.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/sn9c102/sn9c102.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/sn9c102/sn9c102.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/pvrusb2/pvrusb2.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/pvrusb2/pvrusb2.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/msp3400.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/msp3400.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/gspca/m5602/gspca_m5602.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/gspca/m5602/gspca_m5602.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/gspca/gspca_main.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/gspca/gspca_main.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/cpia2/cpia2.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/cpia2/cpia2.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/video/au0828/au0828.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/video/au0828/au0828.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/rc/rc-core.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/rc/rc-core.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/rc/mceusb.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/rc/mceusb.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/rc/lirc_dev.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/rc/lirc_dev.ko
Auto-merging modules/3.6.11+/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/media/dvb/dvb-core/dvb-core.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/raid456.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/raid456.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/raid10.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/raid10.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/raid1.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/raid1.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/md-mod.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/md-mod.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-zero.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-zero.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-snapshot.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-snapshot.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-raid.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-raid.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-mod.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-mod.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-mirror.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-mirror.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-delay.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-delay.ko
Auto-merging modules/3.6.11+/kernel/drivers/md/dm-crypt.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/md/dm-crypt.ko
Auto-merging modules/3.6.11+/kernel/drivers/cdrom/cdrom.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/cdrom/cdrom.ko
Auto-merging modules/3.6.11+/kernel/drivers/bluetooth/btmrvl.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/bluetooth/btmrvl.ko
Auto-merging modules/3.6.11+/kernel/drivers/block/pktcdvd.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/block/pktcdvd.ko
Auto-merging modules/3.6.11+/kernel/drivers/block/nbd.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/block/nbd.ko
Auto-merging modules/3.6.11+/kernel/drivers/block/drbd/drbd.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/block/drbd/drbd.ko
Auto-merging modules/3.6.11+/kernel/drivers/block/cryptoloop.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/drivers/block/cryptoloop.ko
Auto-merging modules/3.6.11+/kernel/crypto/authencesn.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/crypto/authencesn.ko
Auto-merging modules/3.6.11+/kernel/crypto/authenc.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/crypto/authenc.ko
Auto-merging modules/3.6.11+/kernel/crypto/async_tx/async_xor.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/crypto/async_tx/async_xor.ko
Auto-merging modules/3.6.11+/kernel/crypto/async_tx/async_raid6_recov.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/crypto/async_tx/async_raid6_recov.ko
Auto-merging modules/3.6.11+/kernel/crypto/async_tx/async_pq.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/crypto/async_tx/async_pq.ko
Auto-merging modules/3.6.11+/kernel/crypto/async_tx/async_memcpy.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/crypto/async_tx/async_memcpy.ko
Auto-merging modules/3.6.11+/kernel/arch/arm/oprofile/oprofile.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/arch/arm/oprofile/oprofile.ko
Auto-merging modules/3.6.11+/kernel/arch/arm/mach-bcm2708/dmaer_master.ko
CONFLICT (add/add): Merge conflict in modules/3.6.11+/kernel/arch/arm/mach-bcm2708/dmaer_master.ko
Auto-merging kernel_emergency.img
CONFLICT (add/add): Merge conflict in kernel_emergency.img
Auto-merging kernel.img
CONFLICT (add/add): Merge conflict in kernel.img
Auto-merging fixup_cd.dat
CONFLICT (add/add): Merge conflict in fixup_cd.dat
Auto-merging fixup.dat
CONFLICT (add/add): Merge conflict in fixup.dat
Automatic merge failed; fix conflicts and then commit the result.
pi@raspberrypi ~ $

EDIT: Fixed it with

Code: Select all

sudo rm -rf /root/.rpi-firmware

And ran sudo rpi-update again.