按照http://zero.lichee.pro/%E8%B4%A1%E7%8C%AE/article%206.html教程进行zero适配Ethernet，修改dts和dtsi文件后进行u-boot编译，但是在编译过程中出现编译错误
Error: ./arch/arm/dts/sun8i-v3s.dtsi:290.40-41 syntax error
FATAL ERROR: Unable to parse input tree
scripts/Makefile.lib:322: recipe for target 'arch/arm/dts/sun8i-v3s-licheepi-zero.dtb' failed
make[2]: *** [arch/arm/dts/sun8i-v3s-licheepi-zero.dtb] Error 1
dts/Makefile:36: recipe for target 'arch-dtbs' failed
make[1]: *** [arch-dtbs] Error 2
Makefile:844: recipe for target 'dts/dt.dtb' failed
make: *** [dts/dt.dtb] Error 2请问是什么问题？
最近编辑记录 605364021 (2018-10-23 14:28:27)
离线
谢谢回复，我在对dtsi290行进行修改后再次编译，又出现了
ERROR (duplicate_property_names): Duplicate property name clocks in /soc/ethernet@1c30000
ERROR: Input tree has errors, aborting (use -f to force output)
scripts/Makefile.lib:322: recipe for target 'arch/arm/dts/sun8i-v3s-licheepi-zero.dtb' failed
make[2]: *** [arch/arm/dts/sun8i-v3s-licheepi-zero.dtb] Error 2
dts/Makefile:36: recipe for target 'arch-dtbs' failed
make[1]: *** [arch-dtbs] Error 2
Makefile:844: recipe for target 'dts/dt.dtb' failed
make: *** [dts/dt.dtb] Error 2....
离线
/soc/ethernet@1c30000 重名了，多次定义了。
我是按照教程进行修改的，出现多次定义应该怎么是什么原因呢？
离线
你把 sun8i-v3s-licheepi-zero.dts, sun8i-v3s.dtsi 贴上来看看, 像一楼一样用 code 标签.
我仔细看了一下 修改好了晕哥
离线
编译完成后并且把u-boot烧写进tf卡后，怎么测试Ethernet适配成功？
离线
命令行设置 u-boot 的 ip 地址, u-boot ping 没有防火墙的电脑IP, 有回应则网卡没问题，
进一步可以测试 tftp, nfs 等.
在securecrt进行ping时 现在ipaddr not set
离线
贴上日志看下
=> ping 192.168.126.1
*** ERROR: `ipaddr' not set
ping failed; host 192.168.126.1 is not alive离线
我进行ipaddr设置后串口调试端是这样
=> ping 192.168.126.1
*** ERROR: `ipaddr' not set
ping failed; host 192.168.126.1 is not alive
=> setenv ipaddr 192.168.1.100
=> ping 192.168.126.1
Using ethernet@1c30000 device
ARP Retry count exceeded; starting again
ping failed; host 192.168.126.1 is not alive离线
用别的电脑能ping 通 192.168.126.1 ？
192.168.126.1 有没有关闭防火墙?再设置一下掩码:
setenv netmask 255.255.255.0
我在虚拟机上的ubuntu可以ping同192.168.126.1
我在设置掩码并且进行saveenv操作后
=> ping 192.168.126.1
Using ethernet@1c30000 device
## Warning: gatewayip needed but not set
## Warning: gatewayip needed but not set
## Warning: gatewayip needed but not set
## Warning: gatewayip needed but not set离线
setenv ipaddr 192.168.126.100
setenv netmask 255.255.255.0你的 ip地址设置错了。
ping failed; host 192.168.126.1 is not alive
=> setenv ipaddr 192.168.126.100
=> setenv netmask 255.255.255.0
=> saveenv
Saving Environment to MMC...
Writing to MMC(0)... done
=> ping 192.168.126.1
Using ethernet@1c30000 device
ARP Retry count exceeded; starting again
ping failed; host 192.168.126.1 is not alive还是ping不通，但是我在ubuntu上可以ping通
zhang@zhang-virtual-machine:~/u-boot$ ping 192.168.126.1
PING 192.168.126.1 (192.168.126.1) 56(84) bytes of data.
64 bytes from 192.168.126.1: icmp_seq=1 ttl=64 time=0.185 ms
64 bytes from 192.168.126.1: icmp_seq=2 ttl=64 time=0.486 ms
64 bytes from 192.168.126.1: icmp_seq=3 ttl=64 time=0.491 ms
64 bytes from 192.168.126.1: icmp_seq=4 ttl=64 time=0.505 ms
64 bytes from 192.168.126.1: icmp_seq=5 ttl=64 time=0.506 ms
64 bytes from 192.168.126.1: icmp_seq=6 ttl=64 time=0.656 ms
^C
--- 192.168.126.1 ping statistics ---
6 packets transmitted, 6 received, 0% packet loss, time 5000ms
rtt min/avg/max/mdev = 0.185/0.471/0.656/0.142 ms 还有就是v3s开发板需要接网线吗？...
离线
我忘记拔插网线有没有log了，
你可以跟一下以太网的驱动，加一些调试语句，
看问题出在哪
这大概会是什么问题导致的？我是个纯新手 一步一步看着教程做的...
离线
v3s 说：网线，板子硬件，驱动凡事都有可能。
对，都有可能，记得我也发了一个uboot Ethernet 的帖子，你找找。
我在串口调试助手上输入ifconfig eth0 up
Welcome to Buildroot
buildroot login: root
# ifconfig eth0 up
ifconfig: SIOCGIFFLAGS: No such device这会是什么原因吗？
离线
u-boot 和 linux kernel 的设备树和驱动都是不共用的，
u-boot设置过的，linux kernel 仍然要重新来一次。
需要将tf卡重新格式化再移植Zimage .dtb文件和rootfs文件？
离线
zImage和 dtb 文件即可, rootfs 不用动。
因为修改驱动会重新生成 zImage, 修改 dts 会重新生成 dtb 文件.
可以直接用winscp把原来的zimage和dtb文件删除后，再复制过去？
离线
605364021 说：晕哥 说：u-boot 和 linux kernel 的设备树和驱动都是不共用的，
u-boot设置过的，linux kernel 仍然要重新来一次。需要将tf卡重新格式化再移植Zimage .dtb文件和rootfs文件？
zImage和 dtb 文件即可, rootfs 不用动。
因为修改驱动会重新生成 zImage, 修改 dts 会重新生成 dtb 文件.
我重新移植了linux上的Zimage和dock.dtb文件进tf卡中，但在串口端还是
# ifconfig eth0 up
ifconfig: SIOCGIFFLAGS: No such device离线
# ifconfig eth0
ifconfig: eth0: error fetching interface information: Device not found离线
u-boot 和 linux kernel 的设备树和驱动都是不共用的，
u-boot设置过的，linux kernel 仍然要重新来一次。
linux 内核需要重新编译一边吗？还是需要将tf卡格式化后再将zimge和dock.dtb文件移到tf卡中
离线
我重现编译zimge和dtb文件 并且拉到tf卡上了 还是不行....
离线
什么错误，拔插网线有没有反应，板子是不是好的，是不是荔枝派zero?
# ping 192.168.126.1
PING 192.168.126.1 (192.168.126.1): 56 data bytes
ping: sendto: Network is unreachable
# ifconfig eth0 up
ifconfig: SIOCGIFFLAGS: No such device是需要将网线把zero和pc连在一起才能ping通？我刚才试过连在一起也ping不通
离线
U-Boot 2017.01-rc2-00057-g32ab180-dirty (Oct 23 2018 - 15:04:07 +0800) Allwinner Technology
CPU: Allwinner V3s (SUN8I 1681)
Model: Lichee Pi Zero
DRAM: 64 MiB
MMC: SUNXI SD/MMC: 0
In: serial@01c28000
Out: serial@01c28000
Err: serial@01c28000
Net: phy interface0
eth0: ethernet@1c30000这是板子的启动信息，驱动应该是写进去了的
离线
很明显你在linux没有驱动网卡啊，
uboot驱动了，不代表不用在linux驱动，
他们是独立存在的，
linux仍然要再配置驱动和设备树。
我按照教程修改了.dtsi文件和.dts文件，并且重新编译了zimge和.dtb文件，把这2个文件拉到了tf卡上。至于您说的linux配置驱动和设备树是修改.dtsi和.dts文件吗？
离线
kernel适配Ethernet部分：在内核目录中进行make menuconfig ARCH=arm操作，但是进入Ethernet driver support选项中没有 Allwinner sun8i EMAC support选项是怎么问题？
离线
参考一下这个： https://whycan.cn/t_1646.html
我的这个里面没有这一项 <*> Allwinner sun8i GMAC support
可能是我的Linux版本太低了 你那边有是怎么打补丁的了
我的是4.10版本的kernel，可以直接把4.10更新到4.13吗？还是需要重新下载4.13版本然后再修改？
离线
如果你是 git clone 的， 那么切换一下分支就可以了。
如果不是， 还是用 clone 吧.
我在根目录下使用git clone https://github.com/Lichee-Pi/linux.git -b zero-4.13.y指令，提示我目标路径 'linux' 已经存在，并且不是一个空目录。我的linux kernel好像是通过百度网盘下载下来的。clone操作是什么.....
离线
如果已经克隆，只需要切换分支即可:
git checkout zero-4.13.y
git pull origin zero-4.13.y
是这2个操作？但是我进行操作时提示我
error: pathspec 'zero-4.13.y' did not match any file(s) known to git.
fatal: Not a git repository (or any of the parent directories): .git离线
看起来没有仓库文件，那你重新克隆吧。
zhang@zhang-virtual-machine:~/linux$ git pull origin zero-4.13.y
remote: Enumerating objects: 104224, done.
remote: Counting objects: 100% (104224/104224), done.
remote: Compressing objects: 100% (184/184), done.
remote: Total 257405 (delta 104131), reused 104040 (delta 104040), pack-reused 153181
接收对象中: 100% (257405/257405), 125.07 MiB | 3.72 MiB/s, 完成.
处理 delta 中: 100% (214445/214445), 完成 22941 个本地对象.
来自 https://github.com/Lichee-Pi/linux
* branch zero-4.13.y -> FETCH_HEAD
* [新分支] zero-4.13.y -> origin/zero-4.13.y
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got 'zhang@zhang-virtual-machine.(none)')应该是有仓库的，好像是我没设置..
离线
嗯，那你checkout 4.13,应该问题不大了。
zhang@zhang-virtual-machine:~/linux$ git checkout zero-4.13.y
error: Your local changes to the following files would be overwritten by checkout:
arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
arch/arm/boot/dts/sun8i-v3s.dtsi
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/tty/serial/serial_core.c
Please, commit your changes or stash them before you can switch branches.
error: The following untracked working tree files would be overwritten by checkout:
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
Please move or remove them before you can switch branches.
Aborting...各种问题
离线
zhang@zhang-virtual-machine:~/linux$ git checkout -b zero-4.13.y
M arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
M arch/arm/boot/dts/sun8i-v3s.dtsi
M drivers/spi/spi-sun6i.c
M drivers/staging/Kconfig
M drivers/staging/Makefile
M drivers/tty/serial/serial_core.c
切换到一个新分支 'zero-4.13.y'git checkout -b zero-4.13.y 已经可以了，但是git pull origin zero-4.13.y提示
来自 https://github.com/Lichee-Pi/linux
* branch zero-4.13.y -> FETCH_HEAD
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got 'zhang@zhang-virtual-machine.(none)')git pull origin zero-4.13.y操作是必须的？怎么在.git config文件添加需要的内容...
离线
git reset --hard HEAD^ ###强制恢复
git pull origin zero-4.13.y
git checkout zero-4.13.y试一试这样
zhang@zhang-virtual-machine:~/linux$ git reset --hard HEAD^ ###强制恢复
HEAD 现在位于 8524621 Merge branch 'ice/wext_def_open' into zero-4.10.y
zhang@zhang-virtual-machine:~/linux$ git pull origin zero-4.13.y
来自 https://github.com/Lichee-Pi/linux
* branch zero-4.13.y -> FETCH_HEAD
*** Please tell me who you are.
Run
git config --global user.email "you@example.com"
git config --global user.name "Your Name"
to set your account's default identity.
Omit --global to set the identity only in this repository.
fatal: unable to auto-detect email address (got 'zhang@zhang-virtual-machine.(none)')还是这样的提示
离线
这个已经是成功了，只是叫你最好设置一下 全局用户信息
git config --global user.email "you@example.com"
git config --global user.name "Your Name"按上面的设置就不会提示了。
我在.git config文件中加入了name和email 但是又出现了
git pull origin zero-4.13.y
来自 https://github.com/Lichee-Pi/linux
* branch zero-4.13.y -> FETCH_HEAD
error: The following untracked working tree files would be overwritten by merge:
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
Please move or remove them before you can merge.
Aborting 直接移除会有影响？
离线
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4357 and retry the command.
自动合并失败，修正冲突然后提交修正的结果。这是执行git pull origin zero-4.13.y的运行结果，是没成功？..
离线
这个看不出来， 你找个 git 的文档看下.
git pull origin zero-4.13.y
来自 https://github.com/Lichee-Pi/linux
* branch zero-4.13.y -> FETCH_HEAD
自动合并 virt/kvm/arm/vgic/vgic-irqfd.c
删除 tools/testing/selftests/sysctl/run_stringtests
删除 tools/testing/selftests/sysctl/run_numerictests
删除 tools/testing/selftests/sysctl/common_tests
删除 tools/testing/selftests/seccomp/test_harness.h
删除 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T
删除 tools/testing/selftests/rcutorture/configs/rcu/TREE02-T
删除 tools/testing/selftests/firmware/fw_userhelper.sh
删除 tools/testing/selftests/bpf/bpf_sys.h
删除 tools/testing/radix-tree/linux/types.h
删除 tools/testing/radix-tree/linux/mempool.h
删除 tools/testing/radix-tree/linux/export.h
删除 tools/testing/radix-tree/linux/bitops/non-atomic.h
删除 tools/testing/radix-tree/linux/bitops/le.h
删除 tools/testing/radix-tree/linux/bitops/hweight.h
删除 tools/testing/radix-tree/linux/bitops/fls64.h
删除 tools/testing/radix-tree/linux/bitops/fls.h
删除 tools/testing/radix-tree/linux/bitops/find.h
删除 tools/testing/radix-tree/linux/bitops/ffz.h
删除 tools/testing/radix-tree/linux/bitops/ffs.h
删除 tools/testing/radix-tree/linux/bitops/__ffs.h
删除 tools/testing/radix-tree/linux/bitops.h
删除 tools/perf/util/alias.c
删除 tools/lib/lockdep/uinclude/trace/events/lock.h
删除 tools/lib/lockdep/uinclude/linux/stringify.h
删除 tools/lib/lockdep/uinclude/linux/spinlock.h
删除 tools/lib/lockdep/uinclude/linux/seq_file.h
删除 tools/lib/lockdep/uinclude/linux/rcu.h
删除 tools/lib/lockdep/uinclude/linux/rbtree_augmented.h
删除 tools/lib/lockdep/uinclude/linux/proc_fs.h
删除 tools/lib/lockdep/uinclude/linux/prefetch.h
删除 tools/lib/lockdep/uinclude/linux/poison.h
删除 tools/lib/lockdep/uinclude/linux/mutex.h
删除 tools/lib/lockdep/uinclude/linux/module.h
删除 tools/lib/lockdep/uinclude/linux/lockdep.h
删除 tools/lib/lockdep/uinclude/linux/list.h
删除 tools/lib/lockdep/uinclude/linux/linkage.h
删除 tools/lib/lockdep/uinclude/linux/kernel.h
删除 tools/lib/lockdep/uinclude/linux/kallsyms.h
删除 tools/lib/lockdep/uinclude/linux/irqflags.h
删除 tools/lib/lockdep/uinclude/linux/interrupt.h
删除 tools/lib/lockdep/uinclude/linux/hash.h
删除 tools/lib/lockdep/uinclude/linux/gfp.h
删除 tools/lib/lockdep/uinclude/linux/ftrace.h
删除 tools/lib/lockdep/uinclude/linux/delay.h
删除 tools/lib/lockdep/uinclude/linux/debug_locks.h
删除 tools/lib/lockdep/uinclude/linux/compiler.h
删除 tools/lib/lockdep/uinclude/linux/bitops.h
删除 tools/lib/lockdep/uinclude/asm/sections.h
删除 tools/lib/lockdep/uinclude/asm/hweight.h
删除 tools/lib/lockdep/uinclude/asm/hash.h
自动合并 sound/soc/sunxi/sun8i-codec-analog.c
冲突（内容）：合并冲突于 sound/soc/sunxi/sun8i-codec-analog.c
自动合并 sound/soc/sunxi/sun4i-codec.c
冲突（内容）：合并冲突于 sound/soc/sunxi/sun4i-codec.c
删除 sound/soc/pxa/pxa2xx-ac97.h
删除 sound/soc/fsl/mpc5200_psc_ac97.h
删除 sound/soc/dwc/designware_pcm.c
删除 sound/soc/dwc/designware_i2s.c
自动合并 sound/pci/hda/patch_realtek.c
冲突（内容）：合并冲突于 sound/pci/hda/patch_realtek.c
自动合并 sound/pci/hda/hda_intel.c
自动合并 sound/pci/ctxfi/cthw20k1.c
冲突（内容）：合并冲突于 sound/pci/ctxfi/cthw20k1.c
自动合并 sound/core/timer.c
自动合并 sound/core/seq/seq_fifo.c
删除 sound/core/seq/seq_device.c
删除 sound/atmel/abdac.c
自动合并 security/integrity/ima/ima_main.c
自动合并 security/integrity/ima/ima_api.c
自动合并 security/integrity/ima/ima.h
删除 security/apparmor/sid.c
删除 security/apparmor/include/sid.h
删除 scripts/kernel-doc-xml-ref
删除 scripts/docproc.c
删除 scripts/check-lc_ctype.c
删除 scripts/analyze_suspend.py
删除 samples/mei/TODO
删除 samples/bpf/bpf_helpers.h
自动合并 net/sunrpc/xprtrdma/xprt_rdma.h
冲突（内容）：合并冲突于 net/sunrpc/xprtrdma/xprt_rdma.h
自动合并 net/sunrpc/xprtrdma/verbs.c
冲突（内容）：合并冲突于 net/sunrpc/xprtrdma/verbs.c
自动合并 net/sunrpc/xprtrdma/transport.c
冲突（内容）：合并冲突于 net/sunrpc/xprtrdma/transport.c
删除 net/sunrpc/xprtrdma/svc_rdma_marshal.c
自动合并 net/sunrpc/xprtrdma/rpc_rdma.c
冲突（内容）：合并冲突于 net/sunrpc/xprtrdma/rpc_rdma.c
自动合并 net/socket.c
删除 net/sctp/ssnmap.c
删除 net/rfkill/rfkill-regulator.c
删除 net/netfilter/nf_nat_proto_udplite.c
删除 net/netfilter/nf_conntrack_proto_udplite.c
自动合并 net/netfilter/nf_conntrack_helper.c
自动合并 net/ipv4/ip_sockglue.c
自动合并 net/ceph/osd_client.c
删除 net/bluetooth/ecc.h
删除 net/bluetooth/ecc.c
自动合并 mm/workingset.c
冲突（内容）：合并冲突于 mm/workingset.c
自动合并 mm/vmscan.c
冲突（内容）：合并冲突于 mm/vmscan.c
自动合并 mm/vmpressure.c
冲突（内容）：合并冲突于 mm/vmpressure.c
自动合并 mm/page_alloc.c
自动合并 mm/filemap.c
自动合并 mm/backing-dev.c
冲突（内容）：合并冲突于 mm/backing-dev.c
删除 lib/md5.c
删除 lib/halfmd4.c
删除 kernel/time/timer_stats.c
自动合并 kernel/signal.c
删除 kernel/sched/auto_group.h
删除 kernel/rcu/tree_trace.c
删除 kernel/rcu/srcu.c
删除 kernel/printk/nmi.c
自动合并 kernel/module.c
自动合并 kernel/memremap.c
冲突（内容）：合并冲突于 kernel/memremap.c
删除 kernel/cpuset.c
删除 kernel/cgroup_pids.c
删除 kernel/cgroup.c
自动合并 ipc/shm.c
删除 ipc/compat_mq.c
删除 include/video/Kbuild
删除 include/uapi/xen/Kbuild
删除 include/uapi/video/Kbuild
删除 include/uapi/sound/Kbuild
删除 include/uapi/scsi/fc/Kbuild
删除 include/uapi/scsi/Kbuild
删除 include/uapi/rdma/hfi/Kbuild
删除 include/uapi/rdma/Kbuild
删除 include/uapi/mtd/Kbuild
删除 include/uapi/misc/Kbuild
删除 include/uapi/linux/wimax/Kbuild
删除 include/uapi/linux/wil6210_uapi.h
删除 include/uapi/linux/usb/Kbuild
删除 include/uapi/linux/tc_ematch/Kbuild
删除 include/uapi/linux/tc_act/Kbuild
删除 include/uapi/linux/sunrpc/Kbuild
删除 include/uapi/linux/spi/Kbuild
删除 include/uapi/linux/raid/Kbuild
删除 include/uapi/linux/nfsd/Kbuild
删除 include/uapi/linux/netfilter_ipv6/Kbuild
删除 include/uapi/linux/netfilter_ipv4/Kbuild
删除 include/uapi/linux/netfilter_bridge/Kbuild
删除 include/uapi/linux/netfilter_arp/Kbuild
删除 include/uapi/linux/netfilter/ipset/Kbuild
删除 include/uapi/linux/netfilter/Kbuild
删除 include/uapi/linux/mmc/Kbuild
删除 include/uapi/linux/isdn/Kbuild
删除 include/uapi/linux/iio/Kbuild
删除 include/uapi/linux/hsi/Kbuild
删除 include/uapi/linux/hdlc/Kbuild
删除 include/uapi/linux/dvb/Kbuild
删除 include/uapi/linux/can/Kbuild
删除 include/uapi/linux/caif/Kbuild
删除 include/uapi/linux/byteorder/Kbuild
删除 include/uapi/linux/android/Kbuild
删除 include/uapi/drm/Kbuild
删除 include/uapi/asm-generic/Kbuild
删除 include/uapi/Kbuild
自动合并 include/scsi/scsi_device.h
冲突（内容）：合并冲突于 include/scsi/scsi_device.h
删除 include/scsi/fc/Kbuild
自动合并 include/rdma/ib_sa.h
冲突（内容）：合并冲突于 include/rdma/ib_sa.h
删除 include/media/v4l2-of.h
删除 include/media/cec-edid.h
删除 include/linux/spi/tsc2005.h
删除 include/linux/soc/qcom/smd.h
删除 include/linux/rfkill-regulator.h
删除 include/linux/qed/qede_roce.h
删除 include/linux/qed/qed_roce_if.h
自动合并 include/linux/ptr_ring.h
冲突（内容）：合并冲突于 include/linux/ptr_ring.h
删除 include/linux/power/bq24190_charger.h
删除 include/linux/pmem.h
删除 include/linux/platform_data/st21nfca.h
删除 include/linux/platform_data/st-nci.h
删除 include/linux/platform_data/rtc-m48t86.h
删除 include/linux/platform_data/pn544.h
删除 include/linux/platform_data/clk-realview.h
删除 include/linux/mtd/fsmc.h
自动合并 include/linux/mmzone.h
删除 include/linux/mmc/dw_mmc.h
删除 include/linux/mmc/boot.h
删除 include/linux/mg_disk.h
删除 include/linux/mfd/intel_bxtwc.h
删除 include/linux/intel_pmic_gpio.h
自动合并 include/linux/intel-iommu.h
删除 include/linux/input/tca8418_keypad.h
删除 include/linux/input/eeti_ts.h
删除 include/linux/i2c/twl4030-madc.h
删除 include/linux/i2c/tsc2007.h
删除 include/linux/i2c/mpr121_touchkey.h
删除 include/linux/i2c/i2c-sh_mobile.h
删除 include/linux/i2c/i2c-hid.h
自动合并 include/linux/hyperv.h
删除 include/linux/fscrypto.h
自动合并 include/linux/devfreq.h
冲突（内容）：合并冲突于 include/linux/devfreq.h
删除 include/linux/cputime.h
自动合并 include/linux/compat.h
删除 include/linux/can/platform/ti_hecc.h
删除 include/linux/amba/pl330.h
删除 include/dt-bindings/clock/rk1108-cru.h
删除 include/dt-bindings/clock/exynos4415.h
删除 include/drm/drm_mem_util.h
自动合并 include/crypto/algapi.h
删除 include/asm-generic/uaccess-unaligned.h
删除 include/asm-generic/siginfo.h
删除 include/asm-generic/cputime_nsecs.h
删除 include/asm-generic/cputime_jiffies.h
删除 include/asm-generic/cputime.h
删除 include/asm-generic/Kbuild.asm
自动合并 include/acpi/platform/acintel.h
冲突（添加/添加）：合并冲突于 include/acpi/platform/acintel.h
自动合并 include/acpi/platform/acenv.h
删除 include/Kbuild
自动合并 fs/xfs/xfs_iomap.c
冲突（内容）：合并冲突于 fs/xfs/xfs_iomap.c
删除 fs/xfs/uuid.h
删除 fs/xfs/uuid.c
删除 fs/notify/vfsmount_mark.c
删除 fs/notify/inode_mark.c
自动合并 fs/nfsd/vfs.c
删除 fs/nfs/objlayout/pnfs_osd_xdr_cli.c
删除 fs/nfs/objlayout/objlayout.h
删除 fs/nfs/objlayout/objlayout.c
删除 fs/nfs/objlayout/objio_osd.c
删除 fs/nfs/objlayout/Kbuild
自动合并 fs/nfs/nfs4xdr.c
自动合并 fs/nfs/nfs4proc.c
自动合并 fs/nfs/nfs42proc.c
冲突（内容）：合并冲突于 fs/nfs/nfs42proc.c
自动合并 fs/nfs/flexfilelayout/flexfilelayout.c
自动合并 fs/jbd2/transaction.c
自动合并 fs/gfs2/glock.c
冲突（内容）：合并冲突于 fs/gfs2/glock.c
自动合并 fs/fuse/file.c
自动合并 fs/f2fs/super.c
冲突（内容）：合并冲突于 fs/f2fs/super.c
自动合并 fs/f2fs/segment.h
冲突（内容）：合并冲突于 fs/f2fs/segment.h
自动合并 fs/f2fs/segment.c
自动合并 fs/f2fs/gc.c
冲突（内容）：合并冲突于 fs/f2fs/gc.c
自动合并 fs/f2fs/f2fs.h
自动合并 fs/f2fs/extent_cache.c
自动合并 fs/f2fs/dir.c
自动合并 fs/ext4/xattr.h
自动合并 fs/ext4/xattr.c
冲突（内容）：合并冲突于 fs/ext4/xattr.c
自动合并 fs/ext4/super.c
自动合并 fs/ext4/namei.c
冲突（内容）：合并冲突于 fs/ext4/namei.c
自动合并 fs/ext4/mballoc.c
自动合并 fs/ext4/inode.c
自动合并 fs/ext4/inline.c
冲突（内容）：合并冲突于 fs/ext4/inline.c
自动合并 fs/ext4/extents.c
自动合并 fs/cifs/file.c
自动合并 fs/ceph/addr.c
删除 drivers/xen/xenbus/xenbus_probe.h
删除 drivers/xen/xenbus/xenbus_comms.h
删除 drivers/w1/w1_log.h
删除 drivers/w1/w1_int.h
删除 drivers/w1/w1_family.h
删除 drivers/w1/w1.h
自动合并 drivers/w1/w1.c
自动合并 drivers/w1/masters/ds2490.c
冲突（内容）：合并冲突于 drivers/w1/masters/ds2490.c
自动合并 drivers/vme/vme.c
自动合并 drivers/virtio/virtio_balloon.c
自动合并 drivers/usb/serial/spcp8x5.c
自动合并 drivers/usb/serial/opticon.c
自动合并 drivers/usb/serial/mos7840.c
冲突（内容）：合并冲突于 drivers/usb/serial/mos7840.c
删除 drivers/usb/serial/keyspan.h
删除 drivers/usb/serial/io_tables.h
自动合并 drivers/usb/serial/ftdi_sio.c
自动合并 drivers/usb/serial/cp210x.c
自动合并 drivers/usb/serial/console.c
自动合并 drivers/usb/serial/ark3116.c
自动合并 drivers/usb/musb/sunxi.c
冲突（内容）：合并冲突于 drivers/usb/musb/sunxi.c
自动合并 drivers/usb/musb/da8xx.c
冲突（内容）：合并冲突于 drivers/usb/musb/da8xx.c
删除 drivers/usb/misc/ucsi.h
删除 drivers/usb/misc/ucsi.c
自动合并 drivers/usb/host/xhci-plat.c
冲突（内容）：合并冲突于 drivers/usb/host/xhci-plat.c
删除 drivers/usb/host/ohci-omap3.c
自动合并 drivers/usb/gadget/udc/fsl_udc_core.c
自动合并 drivers/usb/gadget/udc/core.c
删除 drivers/usb/gadget/udc/amd5536udc.c
删除 drivers/usb/gadget/function/u_uac1.c
自动合并 drivers/usb/gadget/function/f_hid.c
冲突（内容）：合并冲突于 drivers/usb/gadget/function/f_hid.c
自动合并 drivers/usb/dwc3/gadget.c
删除 drivers/thermal/db8500_cpufreq_cooling.c
删除 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_2835.h
自动合并 drivers/staging/rtl8712/rtl871x_recv.c
自动合并 drivers/staging/rtl8188eu/core/rtw_recv.c
删除 drivers/staging/most/aim-network/networking.h
删除 drivers/staging/media/st-cec/stih-cec.c
删除 drivers/staging/media/st-cec/TODO
删除 drivers/staging/media/st-cec/Kconfig
删除 drivers/staging/media/s5p-cec/s5p_cec.h
删除 drivers/staging/media/s5p-cec/s5p_cec.c
删除 drivers/staging/media/s5p-cec/exynos_hdmi_cecctrl.c
删除 drivers/staging/media/s5p-cec/exynos_hdmi_cec.h
删除 drivers/staging/media/s5p-cec/TODO
删除 drivers/staging/media/s5p-cec/Kconfig
删除 drivers/staging/media/lirc/lirc_sir.c
删除 drivers/staging/media/lirc/lirc_sasem.c
删除 drivers/staging/media/lirc/lirc_parallel.h
删除 drivers/staging/media/lirc/lirc_parallel.c
删除 drivers/staging/media/lirc/lirc_imon.c
删除 drivers/staging/media/lirc/lirc_bt829.c
删除 drivers/staging/media/lirc/TODO.lirc_zilog
删除 drivers/staging/lustre/lustre/include/lustre_eacl.h
自动合并 drivers/staging/lustre/lnet/selftest/rpc.c
删除 drivers/staging/iio/meter/ade7759.h
删除 drivers/staging/iio/meter/ade7754.h
删除 drivers/staging/iio/meter/ade7753.h
删除 drivers/staging/iio/light/tsl2x7x_core.c
删除 drivers/staging/iio/light/isl29028.c
删除 drivers/staging/iio/adc/lpc32xx_adc.c
删除 drivers/staging/iio/accel/adis16240_core.c
删除 drivers/staging/iio/accel/adis16240.h
删除 drivers/staging/iio/accel/adis16209_core.c
删除 drivers/staging/iio/accel/adis16209.h
删除 drivers/staging/iio/accel/adis16203_core.c
删除 drivers/staging/iio/accel/adis16203.h
删除 drivers/staging/iio/accel/adis16201_core.c
删除 drivers/staging/iio/accel/adis16201.h
删除 drivers/staging/i4l/pcbit/pcbit.h
删除 drivers/staging/i4l/pcbit/module.c
删除 drivers/staging/i4l/pcbit/layer2.h
删除 drivers/staging/i4l/pcbit/layer2.c
删除 drivers/staging/i4l/pcbit/edss1.h
删除 drivers/staging/i4l/pcbit/edss1.c
删除 drivers/staging/i4l/pcbit/drv.c
删除 drivers/staging/i4l/pcbit/capi.h
删除 drivers/staging/i4l/pcbit/capi.c
删除 drivers/staging/i4l/pcbit/callbacks.h
删除 drivers/staging/i4l/pcbit/callbacks.c
删除 drivers/staging/i4l/pcbit/Makefile
删除 drivers/staging/i4l/pcbit/Kconfig
删除 drivers/staging/i4l/icn/icn.h
删除 drivers/staging/i4l/icn/icn.c
删除 drivers/staging/i4l/icn/Makefile
删除 drivers/staging/i4l/icn/Kconfig
删除 drivers/staging/i4l/act2000/module.c
删除 drivers/staging/i4l/act2000/capi.h
删除 drivers/staging/i4l/act2000/capi.c
删除 drivers/staging/i4l/act2000/act2000_isa.h
删除 drivers/staging/i4l/act2000/act2000_isa.c
删除 drivers/staging/i4l/act2000/act2000.h
删除 drivers/staging/i4l/act2000/Makefile
删除 drivers/staging/i4l/act2000/Kconfig
删除 drivers/staging/i4l/TODO
删除 drivers/staging/i4l/Makefile
删除 drivers/staging/i4l/Kconfig
删除 drivers/staging/i4l/Documentation/README.sc
删除 drivers/staging/i4l/Documentation/README.pcbit
删除 drivers/staging/i4l/Documentation/README.icn
删除 drivers/staging/i4l/Documentation/README.act2000
删除 drivers/staging/greybus/timesync_platform.c
删除 drivers/staging/greybus/timesync.h
删除 drivers/staging/greybus/timesync.c
自动合并 drivers/staging/greybus/loopback.c
删除 drivers/staging/fsl-mc/include/mc-sys.h
删除 drivers/staging/fsl-mc/include/mc-cmd.h
删除 drivers/staging/fsl-mc/include/mc-bus.h
删除 drivers/staging/fsl-mc/include/dprc.h
删除 drivers/staging/fsl-mc/include/dpmng.h
删除 drivers/staging/fsl-mc/bus/dpmng.c
删除 drivers/staging/android/uapi/ion_test.h
删除 drivers/staging/android/lowmemorykiller.c
删除 drivers/staging/android/ion/tegra/tegra_ion.c
删除 drivers/staging/android/ion/tegra/Makefile
删除 drivers/staging/android/ion/ion_test.c
删除 drivers/staging/android/ion/ion_priv.h
删除 drivers/staging/android/ion/ion_of.h
删除 drivers/staging/android/ion/ion_of.c
删除 drivers/staging/android/ion/ion_dummy_driver.c
删除 drivers/staging/android/ion/hisilicon/hi6220_ion.c
删除 drivers/staging/android/ion/hisilicon/Makefile
删除 drivers/staging/android/ion/hisilicon/Kconfig
删除 drivers/staging/android/ion/devicetree.txt
删除 drivers/staging/android/ion/compat_ion.h
删除 drivers/staging/android/ion/compat_ion.c
自动合并 drivers/spi/spi-sun6i.c
自动合并 drivers/spi/spi-s3c64xx.c
删除 drivers/soc/qcom/smd.c
删除 drivers/scsi/sun3_scsi.h
自动合并 drivers/scsi/storvsc_drv.c
自动合并 drivers/scsi/scsi_lib.c
自动合并 drivers/scsi/qla2xxx/qla_os.c
自动合并 drivers/scsi/qla2xxx/qla_isr.c
冲突（内容）：合并冲突于 drivers/scsi/qla2xxx/qla_isr.c
自动合并 drivers/scsi/lpfc/lpfc_sli.c
自动合并 drivers/scsi/lpfc/lpfc_hw4.h
冲突（内容）：合并冲突于 drivers/scsi/lpfc/lpfc_hw4.h
删除 drivers/scsi/g_NCR5380.h
自动合并 drivers/scsi/aacraid/src.c
冲突（内容）：合并冲突于 drivers/scsi/aacraid/src.c
删除 drivers/s390/block/scm_blk_cluster.c
自动合并 drivers/rtc/rtc-sun6i.c
冲突（内容）：合并冲突于 drivers/rtc/rtc-sun6i.c
删除 drivers/rtc/rtc-gemini.c
自动合并 drivers/rtc/Kconfig
冲突（内容）：合并冲突于 drivers/rtc/Kconfig
删除 drivers/remoteproc/qcom_mdt_loader.h
冲突（修改/删除）：drivers/remoteproc/qcom_mdt_loader.c 在 507bd15d33b5c0d297f67bffdfe4a4e77ad8e0b8 中被删除，在 HEAD 中被 修改。drivers/remoteproc/qcom_mdt_loader.c 在 HEAD 中的版本被保留。
自动合并 drivers/regulator/core.c
删除 drivers/power/supply/intel_mid_battery.c
自动合并 drivers/power/reset/at91-sama5d2_shdwc.c
冲突（内容）：合并冲突于 drivers/power/reset/at91-sama5d2_shdwc.c
自动合并 drivers/power/reset/at91-poweroff.c
冲突（内容）：合并冲突于 drivers/power/reset/at91-poweroff.c
自动合并 drivers/power/reset/Kconfig
删除 drivers/platform/x86/intel_pmic_gpio.c
自动合并 drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
冲突（添加/添加）：合并冲突于 drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c
删除 drivers/pinctrl/sunxi/pinctrl-sun7i-a20.c
删除 drivers/pinctrl/sunxi/pinctrl-sun6i-a31s.c
删除 drivers/pinctrl/sunxi/pinctrl-sun5i-a13.c
删除 drivers/pinctrl/sunxi/pinctrl-sun5i-a10s.c
删除 drivers/pinctrl/sunxi/pinctrl-gr8.c
自动合并 drivers/pinctrl/sunxi/Makefile
冲突（内容）：合并冲突于 drivers/pinctrl/sunxi/Makefile
自动合并 drivers/pinctrl/sunxi/Kconfig
删除 drivers/pinctrl/mediatek/pinctrl-mtk-mt7623.h
删除 drivers/pinctrl/mediatek/pinctrl-mt7623.c
删除 drivers/phy/phy-tusb1210.c
冲突（修改/删除）：drivers/phy/phy-sun4i-usb.c 在 507bd15d33b5c0d297f67bffdfe4a4e77ad8e0b8 中被删除，在 HEAD 中被 修改。drivers/phy/phy-sun4i-usb.c 在 HEAD 中的版本被保留。
删除 drivers/phy/phy-rockchip-usb.c
删除 drivers/phy/phy-rockchip-inno-usb2.c
删除 drivers/phy/phy-rcar-gen3-usb2.c
删除 drivers/phy/phy-qcom-ufs.c
删除 drivers/phy/phy-qcom-ufs-qmp-20nm.c
删除 drivers/phy/phy-qcom-ufs-qmp-14nm.c
删除 drivers/phy/phy-qcom-ufs-i.h
删除 drivers/phy/phy-meson8b-usb2.c
删除 drivers/phy/phy-hi6220-usb.c
删除 drivers/phy/phy-exynos5-usbdrd.c
删除 drivers/phy/phy-exynos-mipi-video.c
删除 drivers/phy/phy-exynos-dp-video.c
删除 drivers/phy/phy-brcm-sata.c
删除 drivers/phy/phy-bcm-ns-usb3.c
删除 drivers/phy/phy-bcm-cygnus-pcie.c
自动合并 drivers/pci/hotplug/pnv_php.c
删除 drivers/pci/host/pcie-spear13xx.c
删除 drivers/pci/host/pcie-qcom.c
删除 drivers/pci/host/pcie-hisi.c
删除 drivers/pci/host/pcie-designware.h
删除 drivers/pci/host/pcie-designware.c
删除 drivers/pci/host/pcie-designware-plat.c
删除 drivers/pci/host/pcie-artpec6.c
删除 drivers/pci/host/pcie-armada8k.c
自动合并 drivers/pci/host/pcie-altera.c
删除 drivers/pci/host/pci-layerscape.c
删除 drivers/pci/host/pci-keystone.h
删除 drivers/pci/host/pci-keystone.c
删除 drivers/pci/host/pci-keystone-dw.c
删除 drivers/pci/host/pci-imx6.c
自动合并 drivers/pci/host/pci-hyperv.c
删除 drivers/pci/host/pci-exynos.c
删除 drivers/pci/host/pci-dra7xx.c
删除 drivers/nvme/host/scsi.c
删除 drivers/nfc/nfcwilink.c
删除 drivers/net/wireless/rsi/rsi_91x_pkt.c
自动合并 drivers/net/wireless/realtek/rtlwifi/usb.h
冲突（内容）：合并冲突于 drivers/net/wireless/realtek/rtlwifi/usb.h
自动合并 drivers/net/wireless/realtek/rtlwifi/usb.c
自动合并 drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c
自动合并 drivers/net/wireless/realtek/rtlwifi/rtl8192ee/hw.c
删除 drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h
删除 drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c
删除 drivers/net/wireless/intel/iwlwifi/iwl-fw.h
删除 drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h
删除 drivers/net/wireless/intel/iwlwifi/iwl-fw-error-dump.h
删除 drivers/net/wireless/intel/iwlwifi/iwl-a000.c
删除 drivers/net/wireless/intel/iwlwifi/iwl-9000.c
删除 drivers/net/wireless/intel/iwlwifi/iwl-8000.c
删除 drivers/net/wireless/intel/iwlwifi/iwl-7000.c
删除 drivers/net/wireless/intel/iwlwifi/iwl-6000.c
删除 drivers/net/wireless/ath/wil6210/ioctl.c
自动合并 drivers/net/wireless/ath/ath9k/main.c
自动合并 drivers/net/wireless/ath/ath9k/mac.h
自动合并 drivers/net/wireless/ath/ath9k/mac.c
自动合并 drivers/net/wireless/ath/ath9k/init.c
自动合并 drivers/net/wireless/ath/ath9k/ath9k.h
自动合并 drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
自动合并 drivers/net/wireless/ath/ath10k/core.c
删除 drivers/net/ethernet/synopsys/dwc_eth_qos.c
删除 drivers/net/ethernet/qualcomm/qca_framing.h
删除 drivers/net/ethernet/qualcomm/qca_framing.c
删除 drivers/net/ethernet/qlogic/qede/qede_roce.c
删除 drivers/net/ethernet/netronome/nfp/nfp_net_offload.c
删除 drivers/net/ethernet/netronome/nfp/nfp_bpf_verifier.c
删除 drivers/net/ethernet/netronome/nfp/nfp_bpf_jit.c
删除 drivers/net/ethernet/netronome/nfp/nfp_bpf.h
删除 drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h
删除 drivers/net/ethernet/intel/i40e/i40e_virtchnl.h
删除 drivers/net/ethernet/ibm/emac/debug.c
删除 drivers/net/ethernet/cadence/macb.c
删除 drivers/net/dsa/mv88e6xxx/mv88e6xxx.h
删除 drivers/net/can/usb/peak_usb/pcan_ucan.h
自动合并 drivers/net/can/usb/gs_usb.c
自动合并 drivers/mtd/nand/fsl_ifc_nand.c
删除 drivers/mtd/nand/atmel_nand_nfc.h
删除 drivers/mtd/nand/atmel_nand_ecc.h
删除 drivers/mtd/nand/atmel_nand.c
删除 drivers/mtd/maps/physmap_of.c
删除 drivers/mmc/host/tmio_mmc_pio.c
删除 drivers/mmc/host/tmio_mmc_dma.c
自动合并 drivers/mmc/host/sunxi-mmc.c
删除 drivers/mmc/host/sh_mobile_sdhi.c
删除 drivers/mmc/host/sdhci-s3c-regs.h
自动合并 drivers/mmc/host/sdhci-acpi.c
删除 drivers/mmc/core/quirks.c
删除 drivers/misc/panel.c
自动合并 drivers/misc/mei/main.c
冲突（内容）：合并冲突于 drivers/misc/mei/main.c
删除 drivers/misc/mei/amthif.c
删除 drivers/media/v4l2-core/v4l2-of.c
自动合并 drivers/media/usb/uvc/uvc_queue.c
删除 drivers/media/usb/pwc/philips.txt
自动合并 drivers/media/usb/dvb-usb/dvb-usb-firmware.c
冲突（内容）：合并冲突于 drivers/media/usb/dvb-usb/dvb-usb-firmware.c
自动合并 drivers/media/rc/lirc_dev.c
删除 drivers/media/rc/keymaps/rc-lirc.c
删除 drivers/media/platform/soc_camera/atmel-isi.c
自动合并 drivers/media/platform/am437x/am437x-vpfe.c
自动合并 drivers/media/media-device.c
删除 drivers/media/i2c/soc_camera/ov2640.c
删除 drivers/media/dvb-frontends/hd29l2_priv.h
删除 drivers/media/dvb-frontends/hd29l2.h
删除 drivers/media/dvb-frontends/hd29l2.c
删除 drivers/media/cec-edid.c
自动合并 drivers/md/linear.c
冲突（内容）：合并冲突于 drivers/md/linear.c
自动合并 drivers/md/dm-stats.c
自动合并 drivers/md/dm-raid.c
自动合并 drivers/md/dm-cache-target.c
删除 drivers/md/dm-cache-policy-cleaner.c
删除 drivers/md/dm-bio-prison.h
删除 drivers/md/dm-bio-prison.c
删除 drivers/macintosh/via-maciisi.c
删除 drivers/lightnvm/sysblk.c
删除 drivers/lightnvm/gennvm.h
删除 drivers/lightnvm/gennvm.c
删除 drivers/leds/leds-versatile.c
删除 drivers/leds/leds-sead3.c
删除 drivers/leds/dell-led.c
删除 drivers/irqchip/irq-moxart.c
自动合并 drivers/iommu/intel-iommu.c
删除 drivers/input/touchscreen/tsc2007.c
删除 drivers/input/touchscreen/intel-mid-touch.c
删除 drivers/input/misc/mpu3050.c
删除 drivers/infiniband/sw/rxe/rxe_dma.c
删除 drivers/infiniband/sw/rdmavt/dma.h
删除 drivers/infiniband/sw/rdmavt/dma.c
删除 drivers/infiniband/hw/qib/qib_dma.c
删除 drivers/infiniband/hw/qedr/qedr_hsi.h
删除 drivers/infiniband/hw/hfi1/dma.c
自动合并 drivers/infiniband/core/cma.c
自动合并 drivers/iio/pressure/mpl3115.c
删除 drivers/iio/adc/mxs-lradc.c
删除 drivers/i2c/i2c-core.c
删除 drivers/i2c/busses/i2c-designware-core.c
自动合并 drivers/hwtracing/coresight/coresight-etm-perf.c
删除 drivers/hwmon/twl4030-madc-hwmon.c
自动合并 drivers/hwmon/it87.c
自动合并 drivers/hv/ring_buffer.c
冲突（内容）：合并冲突于 drivers/hv/ring_buffer.c
自动合并 drivers/hv/hyperv_vmbus.h
自动合并 drivers/hv/hv_snapshot.c
自动合并 drivers/hv/hv_kvp.c
自动合并 drivers/hv/hv_fcopy.c
自动合并 drivers/hv/hv.c
冲突（内容）：合并冲突于 drivers/hv/hv.c
自动合并 drivers/hv/connection.c
冲突（内容）：合并冲突于 drivers/hv/connection.c
自动合并 drivers/hv/channel_mgmt.c
冲突（内容）：合并冲突于 drivers/hv/channel_mgmt.c
自动合并 drivers/hv/channel.c
冲突（内容）：合并冲突于 drivers/hv/channel.c
删除 drivers/gpu/drm/sti/sti_vtac.c
删除 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h
删除 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c
删除 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.h
删除 drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c
删除 drivers/gpu/drm/radeon/radeon_ioc32.c
删除 drivers/gpu/drm/omapdrm/dss/rfbi.c
删除 drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.h
删除 drivers/gpu/drm/nouveau/nvkm/engine/disp/outpdp.c
删除 drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.h
删除 drivers/gpu/drm/nouveau/nvkm/engine/disp/dport.c
删除 drivers/gpu/drm/i915/intel_guc.h
删除 drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
删除 drivers/gpu/drm/drm_platform.c
删除 drivers/gpu/drm/drm_fops.c
删除 drivers/gpu/drm/bridge/dw-hdmi.h
删除 drivers/gpu/drm/bridge/dw-hdmi.c
删除 drivers/gpu/drm/bridge/dw-hdmi-i2s-audio.c
删除 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h
删除 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c
删除 drivers/gpu/drm/amd/include/asic_reg/si/si_reg.h
删除 drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h
删除 drivers/gpu/drm/amd/amdgpu/cz_smumgr.h
删除 drivers/gpu/drm/amd/amdgpu/cz_smc.c
删除 drivers/gpu/drm/amd/amdgpu/cz_dpm.h
删除 drivers/gpu/drm/amd/amdgpu/cz_dpm.c
删除 drivers/gpio/gpio-moxart.c
删除 drivers/gpio/gpio-mcp23s08.c
删除 drivers/edac/edac_stub.c
删除 drivers/dma/zx296702_dma.c
自动合并 drivers/dma/sun6i-dma.c
冲突（内容）：合并冲突于 drivers/dma/sun6i-dma.c
自动合并 drivers/devfreq/governor_passive.c
自动合并 drivers/devfreq/governor.h
自动合并 drivers/devfreq/devfreq.c
删除 drivers/dax/dax.c
自动合并 drivers/crypto/vmx/aes_xts.c
冲突（内容）：合并冲突于 drivers/crypto/vmx/aes_xts.c
自动合并 drivers/crypto/vmx/aes_cbc.c
冲突（内容）：合并冲突于 drivers/crypto/vmx/aes_cbc.c
删除 drivers/clocksource/moxart_timer.c
删除 drivers/clocksource/clksrc-probe.c
删除 drivers/clk/versatile/clk-realview.c
自动合并 drivers/clk/sunxi-ng/ccu-sun8i-v3s.h
冲突（添加/添加）：合并冲突于 drivers/clk/sunxi-ng/ccu-sun8i-v3s.h
自动合并 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
冲突（添加/添加）：合并冲突于 drivers/clk/sunxi-ng/ccu-sun8i-v3s.c
自动合并 drivers/clk/sunxi-ng/Makefile
冲突（内容）：合并冲突于 drivers/clk/sunxi-ng/Makefile
自动合并 drivers/clk/sunxi-ng/Kconfig
删除 drivers/clk/samsung/clk-exynos4415.c
删除 drivers/clk/rockchip/clk-rk1108.c
自动合并 drivers/char/tpm/tpm_tis_core.c
冲突（内容）：合并冲突于 drivers/char/tpm/tpm_tis_core.c
自动合并 drivers/char/tpm/tpm_tis.c
冲突（内容）：合并冲突于 drivers/char/tpm/tpm_tis.c
删除 drivers/char/tpm/tpm_eventlog.c
自动合并 drivers/char/tpm/tpm-interface.c
删除 drivers/char/mmtimer.c
删除 drivers/char/hw_random/exynos-rng.c
删除 drivers/block/osdblk.c
删除 drivers/block/mg_disk.c
自动合并 drivers/block/loop.c
冲突（内容）：合并冲突于 drivers/block/loop.c
删除 drivers/block/hd.c
自动合并 drivers/bcma/main.c
删除 drivers/ata/pata_at91.c
删除 drivers/acpi/gsi.c
自动合并 crypto/xts.c
自动合并 crypto/testmgr.h
自动合并 crypto/Kconfig
冲突（内容）：合并冲突于 crypto/Kconfig
删除 arch/xtensa/include/asm/param.h
删除 arch/xtensa/include/asm/fb.h
删除 arch/xtensa/include/asm/device.h
删除 arch/xtensa/boot/boot-uboot/Makefile
删除 arch/x86/um/bug.c
删除 arch/x86/ras/mce_amd_inj.c
删除 arch/x86/ras/Makefile
删除 arch/x86/platform/intel-mid/device_libs/platform_pmic_gpio.c
删除 arch/x86/platform/intel-mid/device_libs/platform_ipc.h
删除 arch/x86/platform/intel-mid/device_libs/platform_ipc.c
删除 arch/x86/platform/efi/efi-bgrt.c
删除 arch/x86/platform/atom/pmc_atom.c
删除 arch/x86/mm/gup.c
删除 arch/x86/kvm/iommu.c
删除 arch/x86/kvm/assigned-dev.h
删除 arch/x86/kvm/assigned-dev.c
删除 arch/x86/kernel/test_rodata.c
删除 arch/x86/kernel/test_nx.c
删除 arch/x86/kernel/mcount_64.S
删除 arch/x86/include/asm/pmem.h
删除 arch/x86/include/asm/pmc_atom.h
删除 arch/x86/include/asm/e820.h
删除 arch/tile/include/uapi/arch/Kbuild
删除 arch/tile/include/arch/Kbuild
删除 arch/sparc/net/bpf_jit_comp.c
删除 arch/sparc/net/bpf_jit_asm.S
删除 arch/sparc/net/bpf_jit.h
删除 arch/sparc/include/asm/siginfo.h
删除 arch/score/include/uapi/asm/siginfo.h
删除 arch/score/include/asm/extable.h
删除 arch/score/include/asm/current.h
删除 arch/s390/kernel/sclp.c
删除 arch/s390/include/uapi/asm/termbits.h
删除 arch/s390/include/uapi/asm/sockios.h
删除 arch/s390/include/uapi/asm/resource.h
删除 arch/s390/include/uapi/asm/poll.h
删除 arch/s390/include/uapi/asm/param.h
删除 arch/s390/include/uapi/asm/mman.h
删除 arch/s390/include/uapi/asm/ioctl.h
删除 arch/s390/include/uapi/asm/fcntl.h
删除 arch/s390/include/uapi/asm/errno.h
删除 arch/s390/include/asm/local64.h
删除 arch/s390/include/asm/local.h
删除 arch/s390/include/asm/kmap_types.h
删除 arch/s390/include/asm/irq_regs.h
删除 arch/s390/include/asm/fb.h
删除 arch/s390/include/asm/emergency-restart.h
删除 arch/s390/include/asm/div64.h
删除 arch/s390/include/asm/device.h
删除 arch/s390/include/asm/cacheflush.h
删除 arch/powerpc/lib/usercopy_64.c
自动合并 arch/powerpc/kernel/hw_breakpoint.c
删除 arch/powerpc/kernel/ftrace.c
自动合并 arch/powerpc/kernel/cpu_setup_power.S
冲突（内容）：合并冲突于 arch/powerpc/kernel/cpu_setup_power.S
删除 arch/powerpc/include/uapi/asm/statfs.h
删除 arch/powerpc/include/uapi/asm/sockios.h
删除 arch/powerpc/include/uapi/asm/resource.h
删除 arch/powerpc/include/uapi/asm/poll.h
删除 arch/powerpc/include/uapi/asm/param.h
自动合并 arch/powerpc/include/asm/mmu.h
冲突（内容）：合并冲突于 arch/powerpc/include/asm/mmu.h
删除 arch/powerpc/configs/85xx/kmp204x_defconfig
删除 arch/powerpc/boot/dts/include/dt-bindings
删除 arch/parisc/lib/fixup.S
删除 arch/parisc/include/asm/current.h
删除 arch/nios2/kernel/early_printk.c
删除 arch/nios2/include/asm/signal.h
删除 arch/nios2/include/asm/prom.h
删除 arch/nios2/include/asm/cmpxchg.h
删除 arch/mn10300/include/uapi/asm/siginfo.h
删除 arch/mn10300/include/asm/fb.h
删除 arch/mn10300/include/asm/device.h
删除 arch/mips/lib/strlen_user.S
自动合并 arch/mips/lantiq/xway/sysctrl.c
自动合并 arch/mips/kernel/process.c
删除 arch/mips/kernel/module-rela.c
删除 arch/mips/kernel/mips_ksyms.c
删除 arch/mips/jz4740/gpio.c
删除 arch/mips/include/asm/unaligned.h
自动合并 arch/mips/include/asm/checksum.h
自动合并 arch/mips/cavium-octeon/octeon-memcpy.S
删除 arch/mips/boot/dts/include/dt-bindings
自动合并 arch/mips/bcm47xx/buttons.c
删除 arch/microblaze/include/uapi/asm/termios.h
删除 arch/microblaze/include/uapi/asm/termbits.h
删除 arch/microblaze/include/uapi/asm/swab.h
删除 arch/microblaze/include/uapi/asm/statfs.h
删除 arch/microblaze/include/uapi/asm/stat.h
删除 arch/microblaze/include/uapi/asm/sockios.h
删除 arch/microblaze/include/uapi/asm/socket.h
删除 arch/microblaze/include/uapi/asm/signal.h
删除 arch/microblaze/include/uapi/asm/siginfo.h
删除 arch/microblaze/include/uapi/asm/shmbuf.h
删除 arch/microblaze/include/uapi/asm/sembuf.h
删除 arch/microblaze/include/uapi/asm/resource.h
删除 arch/microblaze/include/uapi/asm/poll.h
删除 arch/microblaze/include/uapi/asm/param.h
删除 arch/microblaze/include/uapi/asm/msgbuf.h
删除 arch/microblaze/include/uapi/asm/mman.h
删除 arch/microblaze/include/uapi/asm/kvm_para.h
删除 arch/microblaze/include/uapi/asm/ipcbuf.h
删除 arch/microblaze/include/uapi/asm/ioctls.h
删除 arch/microblaze/include/uapi/asm/ioctl.h
删除 arch/microblaze/include/uapi/asm/fcntl.h
删除 arch/microblaze/include/uapi/asm/errno.h
删除 arch/microblaze/include/uapi/asm/bitsperlong.h
删除 arch/microblaze/include/asm/xor.h
删除 arch/microblaze/include/asm/ucontext.h
删除 arch/microblaze/include/asm/topology.h
删除 arch/microblaze/include/asm/shmparam.h
删除 arch/microblaze/include/asm/serial.h
删除 arch/microblaze/include/asm/percpu.h
删除 arch/microblaze/include/asm/parport.h
删除 arch/microblaze/include/asm/local64.h
删除 arch/microblaze/include/asm/local.h
删除 arch/microblaze/include/asm/linkage.h
删除 arch/microblaze/include/asm/kmap_types.h
删除 arch/microblaze/include/asm/kdebug.h
删除 arch/microblaze/include/asm/irq_regs.h
删除 arch/microblaze/include/asm/hardirq.h
删除 arch/microblaze/include/asm/fb.h
删除 arch/microblaze/include/asm/emergency-restart.h
删除 arch/microblaze/include/asm/div64.h
删除 arch/microblaze/include/asm/bugs.h
删除 arch/microblaze/include/asm/bug.h
删除 arch/microblaze/include/asm/bitops.h
删除 arch/metag/boot/dts/include/dt-bindings
删除 arch/m32r/include/uapi/asm/siginfo.h
删除 arch/m32r/include/asm/current.h
删除 arch/ia64/lib/strlen_user.S
删除 arch/ia64/include/asm/siginfo.h
删除 arch/h8300/include/asm/bitsperlong.h
删除 arch/frv/include/asm/fb.h
删除 arch/frv/include/asm/device.h
删除 arch/cris/include/uapi/arch-v32/arch/Kbuild
删除 arch/cris/include/uapi/arch-v10/arch/Kbuild
删除 arch/cris/include/asm/current.h
删除 arch/cris/include/arch-v32/arch/Kbuild
删除 arch/cris/include/arch-v10/arch/Kbuild
删除 arch/cris/boot/dts/include/dt-bindings
删除 arch/avr32/oprofile/op_model_avr32.c
删除 arch/avr32/oprofile/backtrace.c
删除 arch/avr32/oprofile/Makefile
删除 arch/avr32/mm/tlb.c
删除 arch/avr32/mm/ioremap.c
删除 arch/avr32/mm/init.c
删除 arch/avr32/mm/fault.c
删除 arch/avr32/mm/dma-coherent.c
删除 arch/avr32/mm/copy_page.S
删除 arch/avr32/mm/clear_page.S
删除 arch/avr32/mm/cache.c
删除 arch/avr32/mm/Makefile
删除 arch/avr32/mach-at32ap/sdramc.h
删除 arch/avr32/mach-at32ap/pm.h
删除 arch/avr32/mach-at32ap/pm.c
删除 arch/avr32/mach-at32ap/pm-at32ap700x.S
删除 arch/avr32/mach-at32ap/pio.h
删除 arch/avr32/mach-at32ap/pio.c
删除 arch/avr32/mach-at32ap/pdc.c
删除 arch/avr32/mach-at32ap/intc.h
删除 arch/avr32/mach-at32ap/intc.c
删除 arch/avr32/mach-at32ap/include/mach/sram.h
删除 arch/avr32/mach-at32ap/include/mach/smc.h
删除 arch/avr32/mach-at32ap/include/mach/portmux.h
删除 arch/avr32/mach-at32ap/include/mach/pm.h
删除 arch/avr32/mach-at32ap/include/mach/irq.h
删除 arch/avr32/mach-at32ap/include/mach/io.h
删除 arch/avr32/mach-at32ap/include/mach/init.h
删除 arch/avr32/mach-at32ap/include/mach/hmatrix.h
删除 arch/avr32/mach-at32ap/include/mach/gpio.h
删除 arch/avr32/mach-at32ap/include/mach/cpu.h
删除 arch/avr32/mach-at32ap/include/mach/chip.h
删除 arch/avr32/mach-at32ap/include/mach/board.h
删除 arch/avr32/mach-at32ap/include/mach/at32ap700x.h
删除 arch/avr32/mach-at32ap/hsmc.h
删除 arch/avr32/mach-at32ap/hsmc.c
删除 arch/avr32/mach-at32ap/hmatrix.c
删除 arch/avr32/mach-at32ap/extint.c
删除 arch/avr32/mach-at32ap/clock.h
删除 arch/avr32/mach-at32ap/clock.c
删除 arch/avr32/mach-at32ap/at32ap700x.c
删除 arch/avr32/mach-at32ap/Makefile
删除 arch/avr32/mach-at32ap/Kconfig
删除 arch/avr32/lib/strnlen_user.S
删除 arch/avr32/lib/strncpy_from_user.S
删除 arch/avr32/lib/memset.S
删除 arch/avr32/lib/memcpy.S
删除 arch/avr32/lib/io-writesw.S
删除 arch/avr32/lib/io-writesl.S
删除 arch/avr32/lib/io-writesb.S
删除 arch/avr32/lib/io-readsw.S
删除 arch/avr32/lib/io-readsl.S
删除 arch/avr32/lib/io-readsb.S
删除 arch/avr32/lib/findbit.S
删除 arch/avr32/lib/delay.c
删除 arch/avr32/lib/csum_partial_copy_generic.S
删除 arch/avr32/lib/csum_partial.S
删除 arch/avr32/lib/copy_user.S
删除 arch/avr32/lib/clear_user.S
删除 arch/avr32/lib/__avr32_lsr64.S
删除 arch/avr32/lib/__avr32_lsl64.S
删除 arch/avr32/lib/__avr32_asr64.S
删除 arch/avr32/lib/Makefile
删除 arch/avr32/kernel/vmlinux.lds.S
删除 arch/avr32/kernel/traps.c
删除 arch/avr32/kernel/time.c
删除 arch/avr32/kernel/syscall_table.S
删除 arch/avr32/kernel/syscall-stubs.S
删除 arch/avr32/kernel/switch_to.S
删除 arch/avr32/kernel/stacktrace.c
删除 arch/avr32/kernel/signal.c
删除 arch/avr32/kernel/setup.c
删除 arch/avr32/kernel/ptrace.c
删除 arch/avr32/kernel/process.c
删除 arch/avr32/kernel/ocd.c
删除 arch/avr32/kernel/nmi_debug.c
删除 arch/avr32/kernel/module.c
删除 arch/avr32/kernel/kprobes.c
删除 arch/avr32/kernel/irq.c
删除 arch/avr32/kernel/head.S
删除 arch/avr32/kernel/entry-avr32b.S
删除 arch/avr32/kernel/cpu.c
删除 arch/avr32/kernel/avr32_ksyms.c
删除 arch/avr32/kernel/asm-offsets.c
删除 arch/avr32/kernel/Makefile
删除 arch/avr32/include/uapi/asm/unistd.h
删除 arch/avr32/include/uapi/asm/types.h
删除 arch/avr32/include/uapi/asm/termios.h
删除 arch/avr32/include/uapi/asm/termbits.h
删除 arch/avr32/include/uapi/asm/swab.h
删除 arch/avr32/include/uapi/asm/stat.h
删除 arch/avr32/include/uapi/asm/sockios.h
删除 arch/avr32/include/uapi/asm/socket.h
删除 arch/avr32/include/uapi/asm/signal.h
删除 arch/avr32/include/uapi/asm/sigcontext.h
删除 arch/avr32/include/uapi/asm/shmbuf.h
删除 arch/avr32/include/uapi/asm/setup.h
删除 arch/avr32/include/uapi/asm/sembuf.h
删除 arch/avr32/include/uapi/asm/ptrace.h
删除 arch/avr32/include/uapi/asm/posix_types.h
删除 arch/avr32/include/uapi/asm/msgbuf.h
删除 arch/avr32/include/uapi/asm/cachectl.h
删除 arch/avr32/include/uapi/asm/byteorder.h
删除 arch/avr32/include/uapi/asm/auxvec.h
删除 arch/avr32/include/uapi/asm/Kbuild
删除 arch/avr32/include/asm/user.h
删除 arch/avr32/include/asm/unistd.h
删除 arch/avr32/include/asm/unaligned.h
删除 arch/avr32/include/asm/ucontext.h
删除 arch/avr32/include/asm/uaccess.h
删除 arch/avr32/include/asm/types.h
删除 arch/avr32/include/asm/traps.h
删除 arch/avr32/include/asm/tlbflush.h
删除 arch/avr32/include/asm/tlb.h
删除 arch/avr32/include/asm/timex.h
删除 arch/avr32/include/asm/thread_info.h
删除 arch/avr32/include/asm/termios.h
删除 arch/avr32/include/asm/sysreg.h
删除 arch/avr32/include/asm/syscalls.h
删除 arch/avr32/include/asm/switch_to.h
删除 arch/avr32/include/asm/string.h
删除 arch/avr32/include/asm/signal.h
删除 arch/avr32/include/asm/shmparam.h
删除 arch/avr32/include/asm/setup.h
删除 arch/avr32/include/asm/serial.h
删除 arch/avr32/include/asm/ptrace.h
删除 arch/avr32/include/asm/processor.h
删除 arch/avr32/include/asm/pgtable.h
删除 arch/avr32/include/asm/pgtable-2level.h
删除 arch/avr32/include/asm/pgalloc.h
删除 arch/avr32/include/asm/pci.h
删除 arch/avr32/include/asm/page.h
删除 arch/avr32/include/asm/ocd.h
删除 arch/avr32/include/asm/module.h
删除 arch/avr32/include/asm/mmu_context.h
删除 arch/avr32/include/asm/mmu.h
删除 arch/avr32/include/asm/linkage.h
删除 arch/avr32/include/asm/kprobes.h
删除 arch/avr32/include/asm/kmap_types.h
删除 arch/avr32/include/asm/kdebug.h
删除 arch/avr32/include/asm/irqflags.h
删除 arch/avr32/include/asm/irq.h
删除 arch/avr32/include/asm/io.h
删除 arch/avr32/include/asm/hw_irq.h
删除 arch/avr32/include/asm/hardirq.h
删除 arch/avr32/include/asm/gpio.h
删除 arch/avr32/include/asm/ftrace.h
删除 arch/avr32/include/asm/fb.h
删除 arch/avr32/include/asm/elf.h
删除 arch/avr32/include/asm/dma.h
删除 arch/avr32/include/asm/dma-mapping.h
删除 arch/avr32/include/asm/current.h
删除 arch/avr32/include/asm/cmpxchg.h
删除 arch/avr32/include/asm/checksum.h
删除 arch/avr32/include/asm/cacheflush.h
删除 arch/avr32/include/asm/cache.h
删除 arch/avr32/include/asm/bugs.h
删除 arch/avr32/include/asm/bug.h
删除 arch/avr32/include/asm/bitops.h
删除 arch/avr32/include/asm/barrier.h
删除 arch/avr32/include/asm/atomic.h
删除 arch/avr32/include/asm/asm.h
删除 arch/avr32/include/asm/asm-offsets.h
删除 arch/avr32/include/asm/addrspace.h
删除 arch/avr32/include/asm/Kbuild
删除 arch/avr32/configs/mimc200_defconfig
删除 arch/avr32/configs/merisc_defconfig
删除 arch/avr32/configs/hammerhead_defconfig
删除 arch/avr32/configs/favr-32_defconfig
删除 arch/avr32/configs/atstk1006_defconfig
删除 arch/avr32/configs/atstk1004_defconfig
删除 arch/avr32/configs/atstk1003_defconfig
删除 arch/avr32/configs/atstk1002_defconfig
删除 arch/avr32/configs/atngw100mkii_evklcd101_defconfig
删除 arch/avr32/configs/atngw100mkii_evklcd100_defconfig
删除 arch/avr32/configs/atngw100mkii_defconfig
删除 arch/avr32/configs/atngw100_mrmt_defconfig
删除 arch/avr32/configs/atngw100_evklcd101_defconfig
删除 arch/avr32/configs/atngw100_evklcd100_defconfig
删除 arch/avr32/configs/atngw100_defconfig
删除 arch/avr32/boot/u-boot/head.S
删除 arch/avr32/boot/u-boot/empty.S
删除 arch/avr32/boot/u-boot/Makefile
删除 arch/avr32/boot/images/Makefile
删除 arch/avr32/boot/images/.gitignore
删除 arch/avr32/boards/mimc200/setup.c
删除 arch/avr32/boards/mimc200/flash.c
删除 arch/avr32/boards/mimc200/Makefile
删除 arch/avr32/boards/merisc/setup.c
删除 arch/avr32/boards/merisc/merisc_sysfs.c
删除 arch/avr32/boards/merisc/merisc.h
删除 arch/avr32/boards/merisc/flash.c
删除 arch/avr32/boards/merisc/display.c
删除 arch/avr32/boards/merisc/Makefile
删除 arch/avr32/boards/merisc/Kconfig
删除 arch/avr32/boards/hammerhead/setup.c
删除 arch/avr32/boards/hammerhead/flash.h
删除 arch/avr32/boards/hammerhead/flash.c
删除 arch/avr32/boards/hammerhead/Makefile
删除 arch/avr32/boards/hammerhead/Kconfig
删除 arch/avr32/boards/favr-32/setup.c
删除 arch/avr32/boards/favr-32/flash.c
删除 arch/avr32/boards/favr-32/Makefile
删除 arch/avr32/boards/favr-32/Kconfig
删除 arch/avr32/boards/atstk1000/setup.c
删除 arch/avr32/boards/atstk1000/flash.c
删除 arch/avr32/boards/atstk1000/atstk1004.c
删除 arch/avr32/boards/atstk1000/atstk1003.c
删除 arch/avr32/boards/atstk1000/atstk1002.c
删除 arch/avr32/boards/atstk1000/atstk1000.h
删除 arch/avr32/boards/atstk1000/Makefile
删除 arch/avr32/boards/atstk1000/Kconfig
删除 arch/avr32/boards/atngw100/setup.c
删除 arch/avr32/boards/atngw100/mrmt.c
删除 arch/avr32/boards/atngw100/flash.c
删除 arch/avr32/boards/atngw100/evklcd10x.c
删除 arch/avr32/boards/atngw100/Makefile
删除 arch/avr32/boards/atngw100/Kconfig_mrmt
删除 arch/avr32/boards/atngw100/Kconfig
删除 arch/avr32/Makefile
删除 arch/avr32/Kconfig.debug
删除 arch/avr32/Kconfig
自动合并 arch/arm64/mm/mmu.c
冲突（内容）：合并冲突于 arch/arm64/mm/mmu.c
自动合并 arch/arm64/mm/dma-mapping.c
冲突（内容）：合并冲突于 arch/arm64/mm/dma-mapping.c
自动合并 arch/arm64/kernel/cpufeature.c
冲突（内容）：合并冲突于 arch/arm64/kernel/cpufeature.c
自动合并 arch/arm64/include/asm/kvm_mmu.h
删除 arch/arm64/include/asm/cachetype.h
删除 arch/arm64/crypto/crc32-arm64.c
删除 arch/arm64/boot/dts/include/dt-bindings
删除 arch/arm64/boot/dts/broadcom/vulcan.dtsi
删除 arch/arm64/boot/dts/broadcom/vulcan-eval.dts
删除 arch/arm64/boot/dts/amlogic/meson-gxm-s912-q200.dts
删除 arch/arm64/boot/dts/amlogic/meson-gxl-nexbox-a95x.dts
删除 arch/arm/plat-versatile/include/plat/clock.h
删除 arch/arm/mach-ux500/ste-dma40-db8500.h
删除 arch/arm/mach-ux500/setup.h
删除 arch/arm/mach-ux500/hotplug.c
删除 arch/arm/mach-ux500/board-mop500.h
删除 arch/arm/mach-ux500/board-mop500-audio.c
删除 arch/arm/mach-tegra/flowctrl.h
删除 arch/arm/mach-tegra/flowctrl.c
自动合并 arch/arm/mach-sunxi/sunxi.c
删除 arch/arm/mach-omap2/pmu.c
删除 arch/arm/mach-omap2/opp.c
删除 arch/arm/mach-omap2/gpmc-nand.c
删除 arch/arm/mach-gemini/time.c
删除 arch/arm/mach-gemini/reset.c
删除 arch/arm/mach-gemini/mm.c
删除 arch/arm/mach-gemini/irq.c
删除 arch/arm/mach-gemini/include/mach/uncompress.h
删除 arch/arm/mach-gemini/include/mach/irqs.h
删除 arch/arm/mach-gemini/include/mach/hardware.h
删除 arch/arm/mach-gemini/include/mach/global_reg.h
删除 arch/arm/mach-gemini/include/mach/entry-macro.S
删除 arch/arm/mach-gemini/idle.c
删除 arch/arm/mach-gemini/gpio.c
删除 arch/arm/mach-gemini/devices.c
删除 arch/arm/mach-gemini/common.h
删除 arch/arm/mach-gemini/board-wbd222.c
删除 arch/arm/mach-gemini/board-wbd111.c
删除 arch/arm/mach-gemini/board-rut1xx.c
删除 arch/arm/mach-gemini/board-nas4220b.c
删除 arch/arm/mach-gemini/Makefile.boot
删除 arch/arm/mach-at91/soc.h
删除 arch/arm/mach-at91/soc.c
删除 arch/arm/kvm/psci.c
删除 arch/arm/kvm/mmu.c
删除 arch/arm/kvm/arm.c
自动合并 arch/arm/include/asm/kvm_mmu.h
删除 arch/arm/include/asm/hardware/icst.h
删除 arch/arm/crypto/bsaes-armv7.pl
删除 arch/arm/crypto/aesbs-glue.c
删除 arch/arm/crypto/aesbs-core.S_shipped
删除 arch/arm/crypto/aes_glue.h
删除 arch/arm/crypto/aes_glue.c
删除 arch/arm/crypto/aes-armv4.S
自动合并 arch/arm/configs/licheepi_zero_defconfig
冲突（添加/添加）：合并冲突于 arch/arm/configs/licheepi_zero_defconfig
删除 arch/arm/common/icst.c
删除 arch/arm/boot/dts/tegra20-whistler.dts
自动合并 arch/arm/boot/dts/sun8i-v3s.dtsi
冲突（添加/添加）：合并冲突于 arch/arm/boot/dts/sun8i-v3s.dtsi
自动合并 arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
冲突（添加/添加）：合并冲突于 arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts
自动合并 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
冲突（添加/添加）：合并冲突于 arch/arm/boot/dts/sun8i-v3s-licheepi-zero-dock.dts
删除 arch/arm/boot/dts/rk1108.dtsi
删除 arch/arm/boot/dts/rk1108-evb.dts
删除 arch/arm/boot/dts/include/dt-bindings
删除 arch/arm/boot/dts/exynos4x12.dtsi
删除 arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
删除 arch/arm/boot/dts/exynos4212.dtsi
自动合并 arch/arm/boot/dts/at91-sama5d4_xplained.dts
自动合并 arch/arm/boot/dts/at91-sama5d2_xplained.dts
自动合并 arch/arm/boot/dts/Makefile
冲突（内容）：合并冲突于 arch/arm/boot/dts/Makefile
删除 arch/arc/plat-sim/Kconfig
删除 arch/alpha/include/asm/current.h
自动合并 Makefile
冲突（内容）：合并冲突于 Makefile
删除 Documentation/usb/proc_usb_info.txt
删除 Documentation/usb/power-management.txt
删除 Documentation/usb/persist.txt
删除 Documentation/usb/hotplug.txt
删除 Documentation/usb/error-codes.txt
删除 Documentation/usb/dma.txt
删除 Documentation/usb/callbacks.txt
删除 Documentation/usb/bulk-streams.txt
删除 Documentation/usb/anchors.txt
删除 Documentation/usb/URB.txt
删除 Documentation/unshare.txt
删除 Documentation/translations/zh_CN/CodingStyle
删除 Documentation/translations/ja_JP/HOWTO
删除 Documentation/timers/timer_stats.txt
删除 Documentation/spi/ep93xx_spi
删除 Documentation/sphinx/tmplcvt
删除 Documentation/sphinx/post_convert.sed
删除 Documentation/sphinx/convert_template.sed
删除 Documentation/security/tomoyo.txt
删除 Documentation/security/self-protection.txt
删除 Documentation/security/keys.txt
删除 Documentation/security/keys-trusted-encrypted.txt
删除 Documentation/security/keys-request-key.txt
删除 Documentation/security/keys-ecryptfs.txt
删除 Documentation/security/credentials.txt
删除 Documentation/security/conf.py
删除 Documentation/security/apparmor.txt
删除 Documentation/security/Yama.txt
删除 Documentation/security/Smack.txt
删除 Documentation/security/SELinux.txt
删除 Documentation/security/LoadPin.txt
删除 Documentation/security/LSM.txt
删除 Documentation/security/IMA-templates.txt
删除 Documentation/security/00-INDEX
删除 Documentation/prctl/seccomp_filter.txt
删除 Documentation/prctl/no_new_privs.txt
删除 Documentation/power/notifiers.txt
删除 Documentation/power/devices.txt
删除 Documentation/pinctrl.txt
删除 Documentation/networking/policy-routing.txt
删除 Documentation/media/kapi/v4l2-of.rst
删除 Documentation/md-cluster.txt
删除 Documentation/kselftest.txt
删除 Documentation/input/yealink.txt
删除 Documentation/input/xpad.txt
删除 Documentation/input/walkera0701.txt
删除 Documentation/input/userio.txt
删除 Documentation/input/shape.fig
删除 Documentation/input/sentelic.txt
删除 Documentation/input/rotary-encoder.txt
删除 Documentation/input/ntrig.txt
删除 Documentation/input/notifier.txt
删除 Documentation/input/multi-touch-protocol.txt
删除 Documentation/input/joystick.txt
删除 Documentation/input/joystick-parport.txt
删除 Documentation/input/joystick-api.txt
删除 Documentation/input/interactive.fig
删除 Documentation/input/input.txt
删除 Documentation/input/input-programming.txt
删除 Documentation/input/iforce-protocol.txt
删除 Documentation/input/gpio-tilt.txt
删除 Documentation/input/gameport-programming.txt
删除 Documentation/input/gamepad.txt
删除 Documentation/input/ff.txt
删除 Documentation/input/event-codes.txt
删除 Documentation/input/elantech.txt
删除 Documentation/input/edt-ft5x06.txt
删除 Documentation/input/cs461x.txt
删除 Documentation/input/cma3000_d0x.txt
删除 Documentation/input/cd32.txt
删除 Documentation/input/bcm5974.txt
删除 Documentation/input/atarikbd.txt
删除 Documentation/input/appletouch.txt
删除 Documentation/input/amijoy.txt
删除 Documentation/input/alps.txt
删除 Documentation/firmware_class/README
删除 Documentation/extcon/porting-android-switch-class
删除 Documentation/driver-api/usb.rst
删除 Documentation/doc-guide/docbook.rst
删除 Documentation/dma-buf-sharing.txt
删除 Documentation/devicetree/bindings/timer/moxa,moxart-timer.txt
删除 Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt
自动合并 Documentation/devicetree/bindings/sound/sun4i-codec.txt
删除 Documentation/devicetree/bindings/sound/max98926.txt
删除 Documentation/devicetree/bindings/sound/max98925.txt
自动合并 Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt
删除 Documentation/devicetree/bindings/net/qca-qca7000-spi.txt
删除 Documentation/devicetree/bindings/net/moxa,moxart-mac.txt
删除 Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt
删除 Documentation/devicetree/bindings/net/brcm,bgmac-nsp.txt
删除 Documentation/devicetree/bindings/input/touchscreen/sun4i.txt
删除 Documentation/devicetree/bindings/i2c/trivial-devices.txt
删除 Documentation/devicetree/bindings/i2c/i2c-mt6577.txt
删除 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt
删除 Documentation/devicetree/bindings/clock/rockchip,rk1108-cru.txt
删除 Documentation/devicetree/bindings/clock/exynos4415-clock.txt
删除 Documentation/cpu-hotplug.txt
删除 Documentation/cpu-freq/user-guide.txt
删除 Documentation/cpu-freq/intel-pstate.txt
删除 Documentation/cpu-freq/governors.txt
删除 Documentation/cpu-freq/boost.txt
删除 Documentation/blockdev/mflash.txt
自动合并 Documentation/arm/sunxi/README
冲突（内容）：合并冲突于 Documentation/arm/sunxi/README
自动合并 Documentation/admin-guide/kernel-parameters.txt
删除 Documentation/RCU/trace.txt
删除 Documentation/Makefile.sphinx
删除 Documentation/DocBook/z8530book.tmpl
删除 Documentation/DocBook/writing_usb_driver.tmpl
删除 Documentation/DocBook/writing_musb_glue_layer.tmpl
删除 Documentation/DocBook/w1.tmpl
删除 Documentation/DocBook/uio-howto.tmpl
删除 Documentation/DocBook/stylesheet.xsl
删除 Documentation/DocBook/sh.tmpl
删除 Documentation/DocBook/scsi.tmpl
删除 Documentation/DocBook/s390-drivers.tmpl
删除 Documentation/DocBook/regulator.tmpl
删除 Documentation/DocBook/rapidio.tmpl
删除 Documentation/DocBook/networking.tmpl
删除 Documentation/DocBook/mtdnand.tmpl
删除 Documentation/DocBook/lsm.tmpl
删除 Documentation/DocBook/librs.tmpl
删除 Documentation/DocBook/libata.tmpl
删除 Documentation/DocBook/kgdb.tmpl
删除 Documentation/DocBook/kernel-locking.tmpl
删除 Documentation/DocBook/kernel-hacking.tmpl
删除 Documentation/DocBook/kernel-api.tmpl
删除 Documentation/DocBook/iio.tmpl
删除 Documentation/DocBook/genericirq.tmpl
删除 Documentation/DocBook/gadget.tmpl
删除 Documentation/DocBook/filesystems.tmpl
删除 Documentation/DocBook/deviceiobook.tmpl
删除 Documentation/DocBook/Makefile
删除 Documentation/DocBook/.gitignore
删除 Documentation/ABI/testing/sysfs-hypervisor-pmu
删除 Documentation/ABI/obsolete/sysfs-block-zram
warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 4357 and retry the command.
自动合并失败，修正冲突然后提交修正的结果。完全不懂这要怎么改....
离线
换个目录重新克隆一份代码
git clone https://github.com/Lichee-Pi/linux.git -b zero-4.13.y重新下载linux源码？...5个G而且在ubuntu下载很慢 有别的路径下载？
离线
晕哥 我将内核重新更新为4.13y版本，但是在kernel menuconfig里面依然没有Allwinner sun8i EMAC support选项，只有A10 EMAC support选项
离线
参考一下这个： https://whycan.cn/t_1646.html
应该还是操作姿势不对.
A8 GMAC support我有 但是A8 EMAC support没有...
离线
晕哥 我保存的图片保存到本地 怎么贴上来？ 我的kernel里面有allwinnner sun8i GMAC support这个选项 ，但是上面 ALLwinnner device 里面只有A10 EMAC support 没有 A8 EMAC support 我看的教程是http://zero.lichee.pro/%E8%B4%A1%E7%8C%AE/article%206.html#kernelethernet
离线
FlyM 说：晕哥 说：群附件是spi nor flash的。
我明天验证后网络确实没问题之后，发TF卡用的 u-boot和zImage，文件系统到这个帖子，
你留意一下。晕哥好热心
这是我编译好的uboot, linux&dtb, rootfs: V3s_TFCard.7z
荔枝派Zero 开发板网卡确认没有问题：
https://whycan.cn/files/members/3/QQ20171215150950.jpg你试一试, 有什么问题在后面跟帖。
进行ping通的时候 需要用网线将笔记本和开发板连在一起？
离线