Merge branch 'linus' into x86/asm, to resolve conflict

CREDITS

MAINTAINERS

arch/arm/kernel/traps.c

arch/x86/mm/mem_encrypt.c

drivers/acpi/sleep.c

drivers/ide/ide-cd.c

drivers/net/bonding/bond_main.c

drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h

drivers/net/ethernet/marvell/mvpp2.c

drivers/net/ethernet/mellanox/mlx5/core/en_fs.c

drivers/net/usb/asix_devices.c

drivers/net/usb/cdc_ether.c

drivers/net/usb/qmi_wwan.c

drivers/scsi/scsi_lib.c

drivers/scsi/scsi_transport_srp.c

include/linux/skbuff.h

include/linux/sysctl.h

include/net/act_api.h

include/net/pkt_cls.h

include/sound/seq_kernel.h