forked from roger-zhao/SMT-linux
-
Notifications
You must be signed in to change notification settings - Fork 0
/
pull.log
129 lines (129 loc) · 4.02 KB
/
pull.log
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
error: Your local changes to the following files would be overwritten by merge:
Documentation/devicetree/bindings/remoteproc/omap-remoteproc.txt
Documentation/devicetree/bindings/remoteproc/ti,keystone-rproc.txt
Documentation/filesystems/proc.txt
Documentation/sysrq.txt
Makefile
arch/Kconfig
arch/alpha/mm/fault.c
arch/arc/include/asm/futex.h
arch/arc/mm/fault.c
arch/arm/Kconfig
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/am335x-abbbi.dts
arch/arm/boot/dts/am335x-bone.dts
arch/arm/boot/dts/am335x-boneblack-bbbmini.dts
arch/arm/boot/dts/am335x-boneblack-emmc-overlay.dts
arch/arm/boot/dts/am335x-boneblack-hdmi-overlay.dts
arch/arm/boot/dts/am335x-boneblack-nhdmi-overlay.dts
arch/arm/boot/dts/am335x-boneblack-overlay.dts
arch/arm/boot/dts/am335x-boneblack-replicape.dts
arch/arm/boot/dts/am335x-boneblack-spi0.dts
arch/arm/boot/dts/am335x-boneblack-ttyS2.dts
arch/arm/boot/dts/am335x-boneblack-wl1835mod.dts
arch/arm/boot/dts/am335x-boneblack.dts
arch/arm/boot/dts/am335x-bonegreen-overlay.dts
arch/arm/boot/dts/am335x-bonegreen.dts
arch/arm/boot/dts/am571x-idk-lcd-osd.dts
arch/arm/boot/dts/am572x-idk-lcd-osd.dts
arch/arm/boot/dts/am57xx-beagle-x15.dts
arch/arm/boot/dts/am57xx-idk-lcd-osd.dtsi
arch/arm/boot/dts/dra7-evm-lcd-osd.dts
arch/arm/boot/dts/dra7-evm.dts
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/dra72-evm-lcd-osd.dts
arch/arm/boot/dts/dra72-evm.dts
arch/arm/boot/dts/dra74x.dtsi
arch/arm/boot/dts/dra7x-evm-lcd-osd.dtsi
arch/arm/boot/dts/imx27.dtsi
arch/arm/boot/dts/k2e-evm.dts
arch/arm/boot/dts/k2e.dtsi
arch/arm/boot/dts/k2g-evm.dts
arch/arm/boot/dts/k2g.dtsi
arch/arm/boot/dts/k2hk-evm.dts
arch/arm/boot/dts/k2hk.dtsi
arch/arm/boot/dts/k2l-evm.dts
arch/arm/boot/dts/k2l.dtsi
arch/arm/boot/dts/keystone.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5-uevm.dts
arch/arm/boot/dts/omap5.dtsi
arch/arm/boot/dts/sama5d4.dtsi
arch/arm/common/edma.c
arch/arm/configs/bb.org_defconfig
arch/arm/include/asm/cmpxchg.h
arch/arm/include/asm/futex.h
arch/arm/include/asm/switch_to.h
arch/arm/include/asm/thread_info.h
arch/arm/kernel/asm-offsets.c
arch/arm/kernel/entry-armv.S
arch/arm/kernel/process.c
arch/arm/kernel/signal.c
arch/arm/kernel/smp.c
arch/arm/kernel/unwind.c
arch/arm/kvm/arm.c
arch/arm/kvm/psci.c
arch/arm/mach-at91/pm_suspend.S
arch/arm/mach-exynos/platsmp.c
arch/arm/mach-hisi/platmcpm.c
arch/arm/mach-keystone/Kconfig
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-omap2/omap_hwmod.c
arch/arm/mach-omap2/opp33xx_data.c
arch/arm/mach-omap2/pdata-quirks.c
arch/arm/mach-omap2/pm33xx.c
arch/arm/mach-omap2/sleep33xx.S
arch/arm/mach-omap2/sleep43xx.S
arch/arm/mach-prima2/platsmp.c
arch/arm/mach-pxa/include/mach/pxa27x.h
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-qcom/platsmp.c
arch/arm/mach-spear/platsmp.c
arch/arm/mach-sti/platsmp.c
arch/arm/mach-tegra/board-paz00.c
arch/arm/mach-ux500/platsmp.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/fault.c
arch/arm/mm/highmem.c
arch/arm/plat-versatile/platsmp.c
arch/arm64/Kconfig
arch/arm64/include/asm/futex.h
arch/arm64/include/asm/ptrace.h
arch/arm64/include/asm/thread_info.h
arch/arm64/kernel/asm-offsets.c
arch/arm64/kernel/debug-monitors.c
arch/arm64/kernel/entry.S
arch/arm64/kernel/insn.c
arch/arm64/kernel/perf_event.c
arch/arm64/kernel/vmlinux.lds.S
arch/arm64/mm/fault.c
arch/avr32/include/asm/uaccess.h
arch/avr32/mm/fault.c
arch/cris/mm/fault.c
arch/frv/mm/fault.c
arch/frv/mm/highmem.c
arch/hexagon/include/asm/uaccess.h
arch/ia64/mm/fault.c
arch/m32r/include/asm/uaccess.h
arch/m32r/mm/fault.c
arch/m68k/mm/fault.c
arch/metag/mm/fault.c
arch/metag/mm/highmem.c
arch/microblaze/include/asm/uaccess.h
arch/microblaze/mm/fault.c
arch/microblaze/mm/highmem.c
arch/mips/Kconfig
arch/mips/include/asm/uaccess.h
arch/mips/kernel/signal-common.h
arch/mips/kvm/emulate.c
arch/mips/kvm/locore.S
arch/mips/kvm/mips.c
arch/mips/lantiq/clk.c
arch/mips/mm/fault.c
arch/mips/mm/highmem.c
arch/mips/mm/init.c
arch/mn10300/include/asm/highmem.h
arch/mn10300/mm/fault.c
arch/nios2/mm/fault.c
arch/
Aborting