gistfile1.txt

microserver % git merge upstream/master
Removing sys/powerpc/mpc85xx/fsl_sdhc.h
Removing sys/powerpc/mpc85xx/fsl_sdhc.c
Auto-merging sys/dev/sdhci/fsl_sdhci.c
Auto-merging sys/dev/hyperv/netvsc/if_hn.c
Removing sys/dev/hyperv/netvsc/hv_net_vsc.h
Auto-merging sys/dev/hyperv/netvsc/hn_rndis.h
Auto-merging sys/dev/hyperv/netvsc/hn_rndis.c
Auto-merging sys/dev/hyperv/netvsc/hn_nvs.c
Auto-merging sys/dev/fdt/fdt_intr.h
Auto-merging sys/boot/fdt/dts/arm/ufw.dts
Removing sys/arm/ti/ti_common.c
Removing sys/arm/broadcom/bcm2835/bcm2836.h
Removing sys/arm/broadcom/bcm2835/bcm2835_common.c
Auto-merging sys/amd64/conf/GENERIC
CONFLICT (content): Merge conflict in sys/amd64/conf/GENERIC
Automatic merge failed; fix conflicts and then commit the result.
microserver % git status -s | grep ^UU
UU sys/amd64/conf/GENERIC