Merge remote-tracking branch 'trivial/for-next'

diff --cc drivers/block/pktcdvd.c
Simple merge

diff --cc drivers/net/ethernet/ti/netcp_core.c
Simple merge

diff --cc drivers/scsi/Kconfig
Simple merge

diff --cc fs/ext4/extents.c
Simple merge

diff --cc fs/ext4/namei.c
Simple merge

diff --cc fs/namei.c
Simple merge

diff --cc mm/huge_memory.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge