Linux 4.15

-----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJabj6pAAoJEHm+PkMAQRiGs8cIAJQFkCWnbz86e3vG4DuWhyA8 CMGHCQdUOxxFGa/ixhIiuetbC0x+JVHAjV2FwVYbAQfaZB3pfw2iR1ncQxpAP1AI oLU9vBEqTmwKMPc9CM5rRfnLFWpGcGwUNzgPdxD5yYqGDtcM8K840mF6NdkYe5AN xU8rv1wlcFPF4A5pvHCH0pvVmK4VxlVFk/2H67TFdxBs4PyJOnSBnf+bcGWgsKO6 hC8XIVtcKCH2GfFxt5d0Vgc5QXJEpX1zn2mtCa1MwYRjN2plgYfD84ha0xE7J0B0 oqV/wnjKXDsmrgVpncr3txd4+zKJFNkdNRE4eLAIupHo2XHTG4HvDJ5dBY2NhGU= =sOml -----END PGP SIGNATURE----- Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git To resolve conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/qp.c From patches merged into the -rc cycle. The conflict resolution matches what linux-next has been carrying. Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
2026-09-26 18:16:26 +00:00 · 2018-01-29 13:26:40 -07:00 · 2018-01-29 13:26:40 -07:00 · e7996a9a77
commit e7996a9a77
parent b5fa635aab d8a5b80568
2113 changed files with 25692 additions and 13477 deletions
--- a/include/asm-generic/mm_hooks.h
+++ b/include/asm-generic/mm_hooks.h
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
--- a/include/crypto/if_alg.h
+++ b/include/crypto/if_alg.h
--- a/include/crypto/internal/hash.h
+++ b/include/crypto/internal/hash.h
--- a/include/crypto/mcryptd.h
+++ b/include/crypto/mcryptd.h
--- a/include/drm/drm_connector.h
+++ b/include/drm/drm_connector.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_mode_config.h
+++ b/include/drm/drm_mode_config.h
--- a/include/kvm/arm_arch_timer.h
+++ b/include/kvm/arm_arch_timer.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
--- a/include/linux/bpf_verifier.h
+++ b/include/linux/bpf_verifier.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/completion.h
+++ b/include/linux/completion.h
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
--- a/include/linux/crash_core.h
+++ b/include/linux/crash_core.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
--- a/include/linux/dma-mapping.h
+++ b/include/linux/dma-mapping.h
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
--- a/include/linux/fscache.h
+++ b/include/linux/fscache.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/gpio/driver.h
+++ b/include/linux/gpio/driver.h
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h
--- a/include/linux/idr.h
+++ b/include/linux/idr.h
--- a/include/linux/iio/timer/stm32-lptim-trigger.h
+++ b/include/linux/iio/timer/stm32-lptim-trigger.h
--- a/include/linux/intel-pti.h
+++ b/include/linux/intel-pti.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
--- a/include/linux/irqdomain.h
+++ b/include/linux/irqdomain.h
--- a/include/linux/irqflags.h
+++ b/include/linux/irqflags.h
--- a/include/linux/jump_label.h
+++ b/include/linux/jump_label.h
--- a/include/linux/kmemcheck.h
+++ b/include/linux/kmemcheck.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
--- a/include/linux/mfd/rtsx_pci.h
+++ b/include/linux/mfd/rtsx_pci.h
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
--- a/include/linux/mlx5/mlx5_ifc.h
+++ b/include/linux/mlx5/mlx5_ifc.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/oom.h
+++ b/include/linux/oom.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/pm.h
+++ b/include/linux/pm.h
--- a/include/linux/pti.h
+++ b/include/linux/pti.h
--- a/include/linux/ptr_ring.h
+++ b/include/linux/ptr_ring.h
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
--- a/include/linux/rculist_nulls.h
+++ b/include/linux/rculist_nulls.h
--- a/include/linux/rwlock_types.h
+++ b/include/linux/rwlock_types.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/sched/coredump.h
+++ b/include/linux/sched/coredump.h
--- a/include/linux/serdev.h
+++ b/include/linux/serdev.h
--- a/include/linux/sh_eth.h
+++ b/include/linux/sh_eth.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
--- a/include/linux/spinlock.h
+++ b/include/linux/spinlock.h
--- a/include/linux/spinlock_types.h
+++ b/include/linux/spinlock_types.h
--- a/include/linux/string.h
+++ b/include/linux/string.h
--- a/include/linux/swapops.h
+++ b/include/linux/swapops.h
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
--- a/include/linux/trace.h
+++ b/include/linux/trace.h
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h
--- a/include/net/arp.h
+++ b/include/net/arp.h
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
--- a/include/net/dst.h
+++ b/include/net/dst.h
--- a/include/net/gue.h
+++ b/include/net/gue.h
--- a/include/net/ip.h
+++ b/include/net/ip.h
--- a/include/net/ipv6.h
+++ b/include/net/ipv6.h
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
--- a/include/net/pkt_cls.h
+++ b/include/net/pkt_cls.h
--- a/include/net/red.h
+++ b/include/net/red.h
--- a/include/net/sch_generic.h
+++ b/include/net/sch_generic.h
--- a/include/net/sctp/structs.h
+++ b/include/net/sctp/structs.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/tc_act/tc_sample.h
+++ b/include/net/tc_act/tc_sample.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/net/tls.h
+++ b/include/net/tls.h
--- a/include/net/vxlan.h
+++ b/include/net/vxlan.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
--- a/include/trace/events/clk.h
+++ b/include/trace/events/clk.h
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
--- a/include/trace/events/preemptirq.h
+++ b/include/trace/events/preemptirq.h
--- a/include/trace/events/tcp.h
+++ b/include/trace/events/tcp.h
--- a/include/trace/events/xdp.h
+++ b/include/trace/events/xdp.h
--- a/include/uapi/asm-generic/bpf_perf_event.h
+++ b/include/uapi/asm-generic/bpf_perf_event.h
--- a/include/uapi/linux/bpf_perf_event.h
+++ b/include/uapi/linux/bpf_perf_event.h
--- a/include/uapi/linux/if_ether.h
+++ b/include/uapi/linux/if_ether.h
--- a/include/uapi/linux/kvm.h
+++ b/include/uapi/linux/kvm.h
--- a/include/uapi/linux/libc-compat.h
+++ b/include/uapi/linux/libc-compat.h
--- a/include/uapi/linux/netfilter/nf_conntrack_common.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_common.h
--- a/include/uapi/linux/openvswitch.h
+++ b/include/uapi/linux/openvswitch.h
--- a/Show more
+++ b/Show more