Changes in Makefile

c95baf12f5077419db01313ab61c2aac007d40cd - Merge drm-intel-next-queued into gvt-next

Thu, 20 Feb 2020 09:23:37 +0100

Merge drm-intel-next-queued into gvt-nextBackmerge to pull inhttps://patchwork.freedesktop.org/patch/353621/?series=73544&rev=1Signed-off-by: Zhenyu Wang List of files: /linux/drivers/s390/scsi/Makefile

28336be568bb473d16ba80db0801276fb4f1bbe5 - Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

Mon, 30 Dec 2019 08:10:51 +0100

Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflictsConflicts: init/main.c lib/Kconfig.debugSigned-off-by: Ingo Molnar List of files: /linux/drivers/s390/scsi/Makefile

b19efcabb587e5470a423ef778905f47e5a47f1a - Merge branch 'next' into for-linus

Sat, 01 Feb 2020 02:42:33 +0100

Merge branch 'next' into for-linusPrepare input updates for 5.6 merge window. List of files: /linux/drivers/s390/scsi/Makefile

1bdd3e05a0a3b4a97ea88bc46fef8fb265c8b94c - Merge tag 'v5.5-rc5' into next

Fri, 10 Jan 2020 23:56:04 +0100

Merge tag 'v5.5-rc5' into nextSync up with mainline to get SPI "delay" API changes. List of files: /linux/drivers/s390/scsi/Makefile

22164fbe274c2dd96d2887fe121896d321000a61 - Merge drm/drm-next into drm-misc-next

Mon, 06 Jan 2020 10:35:33 +0100

Merge drm/drm-next into drm-misc-nextRequested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/s390/scsi/Makefile

57e04eeda515ee979fec3bc3d64c408feae18acc - Merge tag 'perf-urgent-for-mingo-5.5-20191216' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent

Tue, 17 Dec 2019 12:28:02 +0100

Merge tag 'perf-urgent-for-mingo-5.5-20191216' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgentPull perf/urgent fixes:perf top: Arnaldo Carvalho de Melo: - Do not bail out when perf_env__read_cpuid() returns ENOSYS, which has been reported happening on aarch64.perf metricgroup: Kajol Jain: - Fix printing event names of metric group with multiple eventsvendor events:x86: Ravi Bangoria: - Fix Kernel_Utilization metric.s390: Ed Maste: - Fix counter long description for DTLB1_GPAGE_WRITES and L1D_RO_EXCL_WRITES.perf header: Michael Petlan: - Fix false warning when there are no duplicate cache entrieslibtraceevent: Sudip Mukherjee: - Allow custom libdir pathAPI headers: Arnaldo Carvalho de Melo: - Sync linux/kvm.h with the kernel sources.Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Ingo Molnar List of files: /linux/drivers/s390/scsi/Makefile

761bfc33dd7504de951aa7b9db27a3cc5df1fde6 - Merge remote-tracking branch 'torvalds/master' into perf/urgent

Wed, 11 Dec 2019 13:58:16 +0100

Merge remote-tracking branch 'torvalds/master' into perf/urgentTo pick up BPF fixes to allow a clean 'make -C tools/perf build-test': 7c3977d1e804 libbpf: Fix sym->st_value print on 32-bit arches 1fd450f99272 libbpf: Fix up generation of bpf_helper_defs.hSigned-off-by: Arnaldo Carvalho de Melo List of files: /linux/drivers/s390/scsi/Makefile

023265ed75d8792ca1d555430a8985511d3f8788 - Merge drm/drm-next into drm-intel-next-queued

Wed, 11 Dec 2019 09:35:37 +0100

Merge drm/drm-next into drm-intel-next-queuedSync up with v5.5-rc1 to get the updated lock_release() API among otherthings. Fix the conflict reported by Stephen Rothwell [1].[1] http://lore.kernel.org/r/20191210093957.5120f717@canb.auug.org.auSigned-off-by: Jani Nikula List of files: /linux/drivers/s390/scsi/Makefile

2040cf9f59037aa8aec749363e69ead165b67b43 - Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflicts

Tue, 10 Dec 2019 10:11:00 +0100

Merge tag 'v5.5-rc1' into core/kprobes, to resolve conflictsSigned-off-by: Ingo Molnar List of files: /linux/drivers/s390/scsi/Makefile

4f797f56c3786e2c6bc542b3f80e9a599b073976 - Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patches

Sun, 08 Dec 2019 14:37:10 +0100

Merge branch 'linus' into sched/urgent, to pick up the latest before merging new patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/s390/scsi/Makefile

942e6f8a8314e5550e254519dfba4ccd5170421d - Merge mainline/master into arm/fixes

Thu, 05 Dec 2019 22:16:58 +0100

Merge mainline/master into arm/fixesThis brings in the mainline tree right after armsoc contents was mergedthis release cycle, so that we can re-run savedefconfig, etc.Signed-off-by: Olof Johansson List of files: /linux/drivers/s390/scsi/Makefile

ef2cc88e2a205b8a11a19e78db63a70d3728cdf5 - Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Mon, 02 Dec 2019 22:37:02 +0100

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsiPull SCSI updates from James Bottomley: "This is mostly update of the usual drivers: aacraid, ufs, zfcp, NCR5380, lpfc, qla2xxx, smartpqi, hisi_sas, target, mpt3sas, pm80xx plus a whole load of minor updates and fixes. The major core changes are Al Viro's reworking of sg's handling of copy to/from user, Ming Lei's removal of the host busy counter to avoid contention in the multiqueue case and Damien Le Moal's fixing of residual tracking across error handling"* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (251 commits) scsi: bnx2fc: timeout calculation invalid for bnx2fc_eh_abort() scsi: target: core: Fix a pr_debug() argument scsi: iscsi: Don't send data to unbound connection scsi: target: iscsi: Wait for all commands to finish before freeing a session scsi: target: core: Release SPC-2 reservations when closing a session scsi: target: core: Document target_cmd_size_check() scsi: bnx2i: fix potential use after free Revert "scsi: qla2xxx: Fix memory leak when sending I/O fails" scsi: NCR5380: Add disconnect_mask module parameter scsi: NCR5380: Unconditionally clear ICR after do_abort() scsi: NCR5380: Call scsi_set_resid() on command completion scsi: scsi_debug: num_tgts must be >= 0 scsi: lpfc: use hdwq assigned cpu for allocation scsi: arcmsr: fix indentation issues scsi: qla4xxx: fix double free bug scsi: pm80xx: Modified the logic to collect fatal dump scsi: pm80xx: Tie the interrupt name to the module instance scsi: pm80xx: Controller fatal error through sysfs scsi: pm80xx: Do not request 12G sas speeds scsi: pm80xx: Cleanup command when a reset times out ... List of files: /linux/drivers/s390/scsi/Makefile

7e418833e68948cb9ed15262889173b7db2960cb - scsi: zfcp: diagnostics buffer caching and use for exchange port data

Fri, 25 Oct 2019 18:12:44 +0200

scsi: zfcp: diagnostics buffer caching and use for exchange port dataThe FCP channel exposes two central interfaces to receive information aboutthe local FCP-Adapter/-Port: Exchange Port and Exchange Config Data. Usingthese commands can negatively impact the adapter if we allow them to besent at a very high rate.The later parts of this patchset will introduce new user-interfaces toreceive more diagnostics from the adapter. To prevent any negative impactfrom using those, this patch adds a simple caching-mechanism that willprevent a malicious/faulty userspace-application from generating anabnormal high amount of Exchange Port/Config Data traffic.Relevant diagnostic data that is received via Exchange Config/Port Data iscached in buffers associated with the corresponding adapter-struct. Eachbuffer is associated with a timestamp that signals how old the data is,and, added via a following patch in this series, lets userspace-interfacesdetermine when the data is too old and needs to be updated.Buffer-updates are made during the normal response path of thecorresponding command. With this patch only the output of the Exchange PortData command is captured.Link: https://lore.kernel.org/r/054ca020ce0a53dc0d9176428bea373898944e6a.1572018130.git.bblock@linux.ibm.comReviewed-by: Steffen Maier Signed-off-by: Benjamin Block Signed-off-by: Martin K. Petersen List of files: /linux/drivers/s390/scsi/Makefile

664b0bae0b87f69bc9deb098f5e0158b9cf18e04 - Merge branch 'next' into for-linus

Thu, 05 Apr 2018 01:11:49 +0200

Merge branch 'next' into for-linusPrepare input updates for 4.17 merge window. List of files: /linux/drivers/s390/scsi/Makefile

ce8ee02d519ab20c5b87d3b3929b5e44ad89e26f - Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next

Wed, 07 Feb 2018 12:21:02 +0100

Merge remote-tracking branches 'asoc/fix/compress', 'asoc/fix/core', 'asoc/fix/dapm', 'asoc/fix/mtk' and 'asoc/fix/stm' into asoc-next List of files: /linux/drivers/s390/scsi/Makefile

d121f07691415df824e6b60520f782f6d13b3c81 - Merge branch 'for-4.16/dax' into libnvdimm-for-next

Sat, 03 Feb 2018 08:26:10 +0100

Merge branch 'for-4.16/dax' into libnvdimm-for-next List of files: /linux/drivers/s390/scsi/Makefile

10a558374f3751cf4eb55143008975641dfc2cf4 - Merge tag 'v4.15' into next

Thu, 01 Feb 2018 09:41:33 +0100

Merge tag 'v4.15' into nextSync with mainline to get in trackpoint updates and other changes. List of files: /linux/drivers/s390/scsi/Makefile

c86aa0129c07c8c7f54dc47656de99ab0eb809b3 - Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linus

Wed, 31 Jan 2018 16:23:58 +0100

Merge branches 'for-4.16/upstream' and 'for-4.15/upstream-fixes' into for-linusPull assorted small fixes queued for merge window. List of files: /linux/drivers/s390/scsi/Makefile

e7996a9a77fc669387da43ff4823b91cc4872bd0 - Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Mon, 29 Jan 2018 21:26:40 +0100

Merge tag v4.15 of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.gitTo resolve conflicts in: drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/mlx5/qp.cFrom patches merged into the -rc cycle. The conflict resolution matcheswhat linux-next has been carrying.Signed-off-by: Jason Gunthorpe List of files: /linux/drivers/s390/scsi/Makefile

7e86548e2cc8d308cb75439480f428137151b0de - Merge tag 'v4.15' into x86/pti, to be able to merge dependent changes

Tue, 30 Jan 2018 15:08:27 +0100

Merge tag 'v4.15' into x86/pti, to be able to merge dependent changesTime has come to switch PTI development over to a v4.15 base - we'll stilltry to make sure that all PTI fixes backport cleanly to v4.14 and earlier.Signed-off-by: Ingo Molnar List of files: /linux/drivers/s390/scsi/Makefile