"e7996a9a77fc669387da43ff4823b91cc4872bd0" (history) in projects: openbmc

Searched hist:e7996a9a77fc669387da43ff4823b91cc4872bd0 (Results 1 – 25 of 1609) sorted by relevance

/openbmc/linux/arch/mips/lib/
H A D	multi3.c	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/drivers/s390/char/
H A D	defkeymap.map	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/drivers/gpu/drm/nouveau/nvkm/subdev/mmu/
H A D	mcp77.c	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
H A D	vmmmcp77.c	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/arch/s390/appldata/
H A D	Makefile	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/tools/arch/s390/include/uapi/asm/
H A D	perf_regs.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/net/wireless/certs/
H A D	sforshee.hex	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/drivers/s390/cio/
H A D	blacklist.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/tools/include/uapi/asm-generic/
H A D	bpf_perf_event.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/arch/s390/kernel/vdso64/
H A D	note.S	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/arch/s390/include/uapi/asm/
H A D	vmcp.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
H A D	sthyi.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
H A D	perf_regs.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/include/uapi/asm-generic/
H A D	bpf_perf_event.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/arch/x86/include/asm/
H A D	invpcid.h	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/clock/
H A D	ti-keystone-pllctrl.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
H A D	brcm,bcm2835-aux-clock.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/interrupt-controller/
H A D	img,pdc-intc.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
H A D	st,spear3xx-shirq.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/pinctrl/
H A D	brcm,cygnus-pinmux.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/nios2/
H A D	nios2.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/mfd/
H A D	ti-keystone-devctrl.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/mailbox/
H A D	brcm,iproc-pdc-mbox.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
H A D	altera-mailbox.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`
/openbmc/linux/Documentation/devicetree/bindings/net/
H A D	mdio.txt	`diff e7996a9a77fc669387da43ff4823b91cc4872bd0 Mon Jan 29 14:26:40 CST 2018 Jason Gunthorpe <jgg@mellanox.com> 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>`

12 3 4 5 6 7 8 9 10 >>...65

Project(s)

Full Search
Definition
Symbol
File Path
History
Type