API tools faq
paste
Guest User

Untitled

a guest
Feb 4th, 2012
179
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 13.86 KB | None | 0 0
raw download clone embed print report
  1. user@ubuntu:~/marvin24s-kernel$ git pull
  2. Auto-merging arch/arm/configs/paz00_defconfig
  3. CONFLICT (content): Merge conflict in arch/arm/configs/paz00_defconfig
  4. Auto-merging arch/arm/mach-tegra/board-paz00-panel.c
  5. CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00-panel.c
  6. Auto-merging arch/arm/mach-tegra/board-paz00.c
  7. CONFLICT (content): Merge conflict in arch/arm/mach-tegra/board-paz00.c
  8. Auto-merging arch/arm/mach-tegra/devices.c
  9. CONFLICT (content): Merge conflict in arch/arm/mach-tegra/devices.c
  10. Auto-merging arch/arm/mach-tegra/devices.h
  11. CONFLICT (content): Merge conflict in arch/arm/mach-tegra/devices.h
  12. Removing arch/sparc/mm/generic_32.c
  13. Removing arch/sparc/mm/generic_64.c
  14. Automatic merge failed; fix conflicts and then commit the result.
  15. user@ubuntu:~/marvin24s-kernel$ git pull
  16. M Documentation/HOWTO
  17. M Documentation/development-process/5.Posting
  18. M Documentation/usb/power-management.txt
  19. M Documentation/usb/usbmon.txt
  20. M MAINTAINERS
  21. M Makefile
  22. U arch/arm/configs/paz00_defconfig
  23. M arch/arm/mach-at91/at91sam9260.c
  24. M arch/arm/mach-davinci/board-da850-evm.c
  25. M arch/arm/mach-davinci/board-dm646x-evm.c
  26. M arch/arm/mach-mxs/include/mach/mxs.h
  27. M arch/arm/mach-omap2/board-rx51-peripherals.c
  28. U arch/arm/mach-tegra/board-paz00-panel.c
  29. M arch/arm/mach-tegra/board-paz00-pinmux.c
  30. U arch/arm/mach-tegra/board-paz00.c
  31. U arch/arm/mach-tegra/devices.c
  32. U arch/arm/mach-tegra/devices.h
  33. M arch/arm/mach-ux500/Kconfig
  34. M arch/arm/mm/proc-v7.S
  35. M arch/arm/oprofile/common.c
  36. M arch/arm/plat-mxc/pwm.c
  37. M arch/ia64/kernel/acpi.c
  38. M arch/powerpc/include/asm/time.h
  39. M arch/powerpc/kernel/irq.c
  40. M arch/powerpc/kernel/time.c
  41. M arch/powerpc/platforms/pseries/hvCall_inst.c
  42. M arch/powerpc/platforms/pseries/lpar.c
  43. M arch/s390/oprofile/init.c
  44. M arch/score/kernel/entry.S
  45. M arch/sh/oprofile/common.c
  46. M arch/sparc/include/asm/pgtable_32.h
  47. M arch/sparc/include/asm/pgtable_64.h
  48. M arch/sparc/kernel/entry.h
  49. M arch/sparc/kernel/module.c
  50. M arch/sparc/kernel/pci_sun4v.c
  51. M arch/sparc/kernel/setup_64.c
  52. M arch/sparc/kernel/signal32.c
  53. M arch/sparc/kernel/signal_32.c
  54. M arch/sparc/kernel/signal_64.c
  55. M arch/sparc/kernel/visemul.c
  56. M arch/sparc/lib/memcpy.S
  57. M arch/sparc/mm/Makefile
  58. M arch/sparc/mm/btfixup.c
  59. D arch/sparc/mm/generic_32.c
  60. D arch/sparc/mm/generic_64.c
  61. M arch/x86/include/asm/amd_nb.h
  62. M arch/x86/include/asm/uv/uv_hub.h
  63. M arch/x86/kernel/amd_nb.c
  64. M arch/x86/kernel/apic/x2apic_uv_x.c
  65. M arch/x86/kernel/hpet.c
  66. M arch/x86/kernel/microcode_amd.c
  67. M arch/x86/kernel/process.c
  68. M arch/x86/mm/gup.c
  69. M arch/x86/mm/mmap.c
  70. M arch/x86/mm/srat.c
  71. M arch/x86/net/bpf_jit_comp.c
  72. M arch/x86/pci/Makefile
  73. M arch/x86/pci/acpi.c
  74. M arch/x86/pci/amd_bus.c
  75. M arch/x86/platform/uv/tlb_uv.c
  76. M arch/x86/xen/setup.c
  77. M block/blk-core.c
  78. M block/cfq-iosched.c
  79. M block/scsi_ioctl.c
  80. M chromeos/config/armel/common.config
  81. M chromeos/config/base.config
  82. M chromeos/config/i386/common.config
  83. M chromeos/config/x86_64/common.config
  84. M crypto/sha512_generic.c
  85. M drivers/acpi/acpica/dsargs.c
  86. M drivers/acpi/numa.c
  87. M drivers/acpi/processor_core.c
  88. M drivers/base/firmware_class.c
  89. M drivers/block/cciss.c
  90. M drivers/block/ub.c
  91. M drivers/block/virtio_blk.c
  92. M drivers/bluetooth/btusb.c
  93. M drivers/cdrom/cdrom.c
  94. M drivers/firmware/google/memconsole.c
  95. M drivers/firmware/iscsi_ibft.c
  96. M drivers/firmware/iscsi_ibft_find.c
  97. M drivers/gpu/drm/drm_auth.c
  98. M drivers/gpu/drm/drm_fops.c
  99. M drivers/gpu/drm/i915/i915_dma.c
  100. M drivers/gpu/drm/i915/i915_drv.h
  101. M drivers/gpu/drm/i915/intel_display.c
  102. M drivers/gpu/drm/i915/intel_sdvo.c
  103. M drivers/gpu/drm/radeon/evergreen.c
  104. M drivers/gpu/drm/radeon/r100.c
  105. M drivers/gpu/drm/radeon/r600_hdmi.c
  106. M drivers/gpu/drm/radeon/radeon_atombios.c
  107. M drivers/gpu/drm/radeon/radeon_device.c
  108. M drivers/gpu/drm/radeon/radeon_irq_kms.c
  109. M drivers/gpu/drm/radeon/rs600.c
  110. M drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
  111. M drivers/hid/hid-core.c
  112. M drivers/hid/hid-ids.h
  113. M drivers/hid/hid-input.c
  114. M drivers/hid/hid-multitouch.c
  115. M drivers/hid/hid-picolcd.c
  116. M drivers/hid/usbhid/hid-core.c
  117. M drivers/hid/usbhid/usbhid.h
  118. M drivers/hwmon/coretemp.c
  119. M drivers/hwmon/f71805f.c
  120. M drivers/hwmon/jz4740-hwmon.c
  121. M drivers/hwmon/sht15.c
  122. M drivers/hwmon/w83627ehf.c
  123. M drivers/i2c/busses/i2c-ali1535.c
  124. M drivers/i2c/busses/i2c-eg20t.c
  125. M drivers/i2c/busses/i2c-i801.c
  126. M drivers/i2c/busses/i2c-nforce2.c
  127. M drivers/i2c/busses/i2c-omap.c
  128. M drivers/i2c/busses/i2c-sis5595.c
  129. M drivers/i2c/busses/i2c-sis630.c
  130. M drivers/i2c/busses/i2c-viapro.c
  131. M drivers/ide/ide-floppy_ioctl.c
  132. M drivers/idle/intel_idle.c
  133. M drivers/infiniband/hw/qib/qib_iba6120.c
  134. M drivers/infiniband/hw/qib/qib_iba7220.c
  135. M drivers/infiniband/hw/qib/qib_iba7322.c
  136. M drivers/input/input-polldev.c
  137. M drivers/input/keyboard/atkbd.c
  138. M drivers/input/keyboard/lm8323.c
  139. M drivers/input/misc/adxl34x.c
  140. M drivers/input/misc/ati_remote2.c
  141. M drivers/input/mouse/cyapa.c
  142. M drivers/input/mouse/elantech.c
  143. M drivers/input/mouse/elantech.h
  144. M drivers/input/mouse/hgpk.c
  145. M drivers/input/mouse/logips2pp.c
  146. M drivers/input/mouse/psmouse-base.c
  147. M drivers/input/mouse/psmouse.h
  148. M drivers/input/mouse/sentelic.c
  149. M drivers/input/mouse/synaptics.c
  150. M drivers/input/mouse/trackpoint.c
  151. M drivers/input/serio/serio_raw.c
  152. M drivers/input/tablet/aiptek.c
  153. M drivers/input/touchscreen/ad7877.c
  154. M drivers/input/touchscreen/ad7879.c
  155. M drivers/input/touchscreen/ads7846.c
  156. M drivers/input/touchscreen/atmel_mxt_ts.c
  157. M drivers/md/dm-flakey.c
  158. M drivers/md/dm-linear.c
  159. M drivers/md/dm-mpath.c
  160. M drivers/md/raid5.c
  161. M drivers/media/video/s5p-fimc/fimc-core.c
  162. M drivers/media/video/uvc/uvc_v4l2.c
  163. M drivers/media/video/uvc/uvcvideo.h
  164. M drivers/media/video/v4l2-ioctl.c
  165. M drivers/mfd/twl-core.c
  166. M drivers/mfd/twl4030-madc.c
  167. M drivers/mmc/core/mmc.c
  168. M drivers/mmc/host/mmci.c
  169. M drivers/mmc/host/mxcmmc.c
  170. M drivers/mmc/host/sdhci.c
  171. M drivers/mmc/host/vub300.c
  172. M drivers/mtd/mtd_blkdevs.c
  173. M drivers/mtd/mtdoops.c
  174. M drivers/mtd/tests/mtd_stresstest.c
  175. M drivers/mtd/ubi/cdev.c
  176. M drivers/mtd/ubi/debug.h
  177. M drivers/mtd/ubi/eba.c
  178. M drivers/mtd/ubi/ubi.h
  179. M drivers/mtd/ubi/wl.c
  180. M drivers/net/bonding/bond_alb.c
  181. M drivers/net/bonding/bond_main.c
  182. M drivers/net/caif/caif_serial.c
  183. M drivers/net/caif/caif_spi.c
  184. M drivers/net/can/vcan.c
  185. M drivers/net/de600.c
  186. M drivers/net/irda/donauboe.c
  187. M drivers/net/irda/smsc-ircc2.c
  188. M drivers/net/phy/mdio-gpio.c
  189. M drivers/net/pptp.c
  190. M drivers/net/r8169.c
  191. M drivers/net/usb/asix.c
  192. M drivers/net/usb/pegasus.c
  193. M drivers/net/usb/smsc75xx.c
  194. M drivers/net/usb/smsc95xx.c
  195. M drivers/net/usb/usbnet.c
  196. M drivers/net/virtio_net.c
  197. M drivers/net/wan/sbni.c
  198. M drivers/net/wan/sealevel.c
  199. M drivers/net/wimax/i2400m/usb.c
  200. M drivers/net/wireless/ath/ath5k/base.c
  201. M drivers/net/wireless/ath/ath9k/calib.c
  202. M drivers/net/wireless/ath/ath9k/main.c
  203. M drivers/net/wireless/ath/carl9170/main.c
  204. M drivers/net/wireless/iwlegacy/iwl3945-base.c
  205. M drivers/net/wireless/iwlwifi/iwl-agn-lib.c
  206. M drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
  207. M drivers/net/wireless/iwlwifi/iwl-agn-tx.c
  208. M drivers/net/wireless/iwlwifi/iwl-agn.c
  209. M drivers/net/wireless/iwlwifi/iwl-agn.h
  210. M drivers/net/wireless/iwmc3200wifi/main.c
  211. M drivers/net/wireless/mwl8k.c
  212. M drivers/net/wireless/orinoco/main.c
  213. M drivers/net/wireless/p54/main.c
  214. M drivers/net/wireless/rt2x00/rt2500usb.c
  215. M drivers/net/wireless/rt2x00/rt2800.h
  216. M drivers/net/wireless/rt2x00/rt2800lib.c
  217. M drivers/net/wireless/rt2x00/rt2800pci.c
  218. M drivers/net/wireless/rt2x00/rt2800usb.c
  219. M drivers/net/wireless/rt2x00/rt2x00.h
  220. M drivers/net/wireless/rt2x00/rt2x00dev.c
  221. M drivers/net/wireless/rt2x00/rt2x00usb.c
  222. M drivers/net/wireless/rt2x00/rt61pci.c
  223. M drivers/net/wireless/rt2x00/rt73usb.c
  224. M drivers/net/wireless/rtlwifi/rtl8192se/fw.c
  225. M drivers/net/wireless/rtlwifi/wifi.h
  226. M drivers/net/wireless/wl12xx/boot.c
  227. M drivers/net/wireless/wl12xx/cmd.c
  228. M drivers/of/fdt.c
  229. M drivers/oprofile/oprofile_files.c
  230. M drivers/oprofile/oprofilefs.c
  231. M drivers/pci/intel-iommu.c
  232. M drivers/pci/msi.c
  233. M drivers/platform/x86/chromeos_laptop.c
  234. M drivers/pnp/quirks.c
  235. M drivers/ptp/ptp_clock.c
  236. M drivers/rtc/interface.c
  237. M drivers/rtc/rtc-m41t80.c
  238. M drivers/s390/scsi/zfcp_scsi.c
  239. M drivers/scsi/fcoe/fcoe.c
  240. M drivers/scsi/mpt2sas/mpt2sas_base.c
  241. M drivers/scsi/mpt2sas/mpt2sas_base.h
  242. M drivers/scsi/mpt2sas/mpt2sas_scsih.c
  243. M drivers/scsi/sd.c
  244. M drivers/scsi/sym53c8xx_2/sym_glue.c
  245. M drivers/ssb/driver_pcicore.c
  246. M drivers/staging/rtl8712/usb_intf.c
  247. M drivers/staging/zcache/zcache-main.c
  248. M drivers/target/target_core_cdb.c
  249. M drivers/target/target_core_transport.c
  250. M drivers/tty/serial/amba-pl011.c
  251. M drivers/tty/serial/atmel_serial.c
  252. M drivers/tty/serial/jsm/jsm_driver.c
  253. M drivers/tty/tty_port.c
  254. M drivers/usb/class/cdc-acm.c
  255. M drivers/usb/class/cdc-wdm.c
  256. M drivers/usb/core/driver.c
  257. M drivers/usb/core/hcd.c
  258. M drivers/usb/core/hub.c
  259. M drivers/usb/core/quirks.c
  260. M drivers/usb/host/ehci-fsl.c
  261. M drivers/usb/host/ehci-q.c
  262. M drivers/usb/host/ehci.h
  263. M drivers/usb/host/ohci-hcd.c
  264. M drivers/usb/host/ohci-pci.c
  265. M drivers/usb/host/ohci.h
  266. M drivers/usb/host/pci-quirks.c
  267. M drivers/usb/host/uhci-q.c
  268. M drivers/usb/host/whci/qset.c
  269. M drivers/usb/host/xhci-ring.c
  270. M drivers/usb/host/xhci.c
  271. M drivers/usb/host/xhci.h
  272. M drivers/usb/misc/isight_firmware.c
  273. M drivers/usb/misc/usbsevseg.c
  274. M drivers/usb/musb/musb_core.c
  275. M drivers/usb/serial/cp210x.c
  276. M drivers/usb/serial/ftdi_sio.c
  277. M drivers/usb/serial/ftdi_sio_ids.h
  278. M drivers/usb/serial/io_ti.c
  279. M drivers/usb/serial/omninet.c
  280. M drivers/usb/serial/option.c
  281. M drivers/usb/serial/qcaux.c
  282. M drivers/usb/serial/sierra.c
  283. M drivers/usb/serial/usb_wwan.c
  284. M drivers/usb/storage/usb.c
  285. M drivers/video/offb.c
  286. M drivers/watchdog/Kconfig
  287. M drivers/watchdog/Makefile
  288. M drivers/watchdog/hpwdt.c
  289. A drivers/watchdog/tegra_wdt.c
  290. M drivers/xen/swiotlb-xen.c
  291. M drivers/xen/xenbus/xenbus_xs.c
  292. M fs/dcache.c
  293. M fs/ecryptfs/crypto.c
  294. M fs/ecryptfs/inode.c
  295. M fs/ecryptfs/miscdev.c
  296. M fs/ecryptfs/read_write.c
  297. M fs/ext3/inode.c
  298. M fs/ext4/inode.c
  299. M fs/ext4/page-io.c
  300. M fs/ext4/super.c
  301. M fs/fuse/dev.c
  302. M fs/hfs/btree.c
  303. M fs/jbd/journal.c
  304. M fs/jbd2/journal.c
  305. M fs/namespace.c
  306. M fs/nfs/callback_proc.c
  307. M fs/nfs/nfs4state.c
  308. M fs/nfs/objlayout/objio_osd.c
  309. M fs/nfs/objlayout/objlayout.c
  310. M fs/nfs/pnfs.c
  311. M fs/nfs/pnfs.h
  312. M fs/nfs/super.c
  313. M fs/nfsd/export.c
  314. M fs/nilfs2/ioctl.c
  315. M fs/notify/mark.c
  316. M fs/partitions/tegrapart.c
  317. M fs/proc/base.c
  318. M fs/proc/meminfo.c
  319. M fs/proc/task_mmu.c
  320. M fs/proc/uptime.c
  321. M fs/reiserfs/super.c
  322. M fs/seq_file.c
  323. M fs/ubifs/debug.h
  324. M fs/udf/file.c
  325. M fs/udf/inode.c
  326. M fs/xfs/linux-2.6/xfs_acl.c
  327. M fs/xfs/linux-2.6/xfs_discard.c
  328. M fs/xfs/linux-2.6/xfs_export.c
  329. M fs/xfs/linux-2.6/xfs_super.c
  330. M fs/xfs/linux-2.6/xfs_sync.c
  331. M fs/xfs/linux-2.6/xfs_sync.h
  332. M fs/xfs/xfs_attr.c
  333. M fs/xfs/xfs_bmap.c
  334. M fs/xfs/xfs_inode.c
  335. M fs/xfs/xfs_vnodeops.c
  336. M include/acpi/acpi_numa.h
  337. M include/drm/drmP.h
  338. M include/drm/drm_pciids.h
  339. M include/linux/blkdev.h
  340. M include/linux/dcache.h
  341. M include/linux/fs.h
  342. M include/linux/hid.h
  343. M include/linux/i2c/twl4030-madc.h
  344. M include/linux/lglock.h
  345. M include/linux/log2.h
  346. M include/linux/memcontrol.h
  347. M include/linux/nl80211.h
  348. M include/linux/pci_regs.h
  349. M include/linux/pm.h
  350. M include/linux/sunrpc/svcsock.h
  351. M include/linux/usb.h
  352. M include/linux/usb/ch9.h
  353. M include/linux/videodev2.h
  354. M include/net/bluetooth/l2cap.h
  355. M include/net/cfg80211.h
  356. M include/net/netns/generic.h
  357. M include/net/sctp/structs.h
  358. M include/target/target_core_base.h
  359. M include/xen/interface/io/xs_wire.h
  360. M init/do_mounts.c
  361. M kernel/cgroup.c
  362. M kernel/cpu.c
  363. M kernel/exit.c
  364. M kernel/futex.c
  365. M kernel/hrtimer.c
  366. M kernel/hung_task.c
  367. M kernel/kprobes.c
  368. M kernel/printk.c
  369. M kernel/sysctl_binary.c
  370. M kernel/taskstats.c
  371. M kernel/time/alarmtimer.c
  372. M kernel/time/clockevents.c
  373. M kernel/trace/ftrace.c
  374. M mm/filemap.c
  375. M mm/hugetlb.c
  376. M mm/memcontrol.c
  377. M mm/oom_kill.c
  378. M mm/page_alloc.c
  379. M mm/percpu-vm.c
  380. M mm/percpu.c
  381. M mm/vmalloc.c
  382. M net/bluetooth/bnep/core.c
  383. M net/bluetooth/hci_sock.c
  384. M net/bluetooth/l2cap_core.c
  385. M net/bluetooth/rfcomm/core.c
  386. M net/bluetooth/sco.c
  387. M net/caif/caif_dev.c
  388. M net/caif/cfcnfg.c
  389. M net/core/net_namespace.c
  390. M net/dccp/ccids/ccid2.c
  391. M net/dccp/ccids/ccid3.c
  392. M net/dccp/ccids/lib/tfrc.c
  393. M net/dccp/ccids/lib/tfrc.h
  394. M net/dccp/dccp.h
  395. M net/dccp/proto.c
  396. M net/ipv4/ah4.c
  397. M net/ipv4/devinet.c
  398. M net/ipv4/igmp.c
  399. M net/ipv4/ipconfig.c
  400. M net/ipv4/ipip.c
  401. M net/ipv4/netfilter/ipt_ULOG.c
  402. M net/ipv4/netfilter/iptable_filter.c
  403. M net/ipv4/route.c
  404. M net/ipv4/tcp_ipv4.c
  405. M net/ipv4/tcp_output.c
  406. M net/ipv6/ah6.c
  407. M net/ipv6/netfilter/ip6table_filter.c
  408. M net/ipv6/sit.c
  409. M net/ipv6/tcp_ipv6.c
  410. M net/irda/irlan/irlan_common.c
  411. M net/l2tp/l2tp_ip.c
  412. M net/llc/af_llc.c
  413. M net/mac80211/agg-tx.c
  414. M net/mac80211/cfg.c
  415. M net/mac80211/mlme.c
  416. M net/mac80211/sta_info.h
  417. M net/mac80211/wpa.c
  418. M net/netfilter/nf_conntrack_acct.c
  419. M net/netfilter/nf_conntrack_ftp.c
  420. M net/netfilter/nf_conntrack_h323_main.c
  421. M net/netfilter/nf_conntrack_timestamp.c
  422. M net/rds/af_rds.c
  423. M net/sched/sch_gred.c
  424. M net/sched/sch_mqprio.c
  425. M net/sctp/associola.c
  426. M net/sctp/output.c
  427. M net/sctp/outqueue.c
  428. M net/sctp/protocol.c
  429. M net/sctp/socket.c
  430. M net/sctp/sysctl.c
  431. M net/sunrpc/svc.c
  432. M net/sunrpc/svc_xprt.c
  433. M net/wireless/nl80211.c
  434. M scripts/kconfig/streamline_config.pl
  435. M scripts/recordmcount.h
  436. M security/apparmor/path.c
  437. M security/integrity/ima/ima_api.c
  438. M security/integrity/ima/ima_queue.c
  439. M security/selinux/netport.c
  440. M security/tomoyo/realpath.c
  441. M sound/pci/hda/hda_local.h
  442. M sound/pci/hda/hda_proc.c
  443. M sound/pci/hda/patch_realtek.c
  444. M sound/pci/hda/patch_sigmatel.c
  445. M sound/pci/ice1712/amp.c
  446. M sound/pci/oxygen/xonar_wm87x6.c
  447. M sound/pci/sis7019.c
  448. M sound/soc/codecs/alc5632.c
  449. M sound/soc/codecs/alc5632.h
  450. M sound/soc/soc-core.c
  451. M sound/soc/soc-utils.c
  452. M sound/soc/tegra/tegra_alc5632.c
  453. M sound/usb/card.c
  454. M sound/usb/usx2y/usb_stream.c
  455. M tools/perf/util/trace-event-parse.c
  456. Pull is not possible because you have unmerged files.
  457. Please, fix them up in the work tree, and then use 'git add/rm <file>'
  458. as appropriate to mark resolution, or use 'git commit -a'.
  459. user@ubuntu:~/marvin24s-kernel$
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!