Changes in Makefile

0898782247ae533d1f4e47a06bc5d4870931b284 - Merge branch 'next' into for-linus

Mon, 16 Sep 2019 18:56:27 +0200

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

d3f9990f1b48514b33342612b51fad238592d774 - Merge branch 'for-next' into for-linus

Sat, 14 Sep 2019 17:24:57 +0200

Merge branch 'for-next' into for-linusSigned-off-by: Takashi Iwai List of files: /linux/drivers/scsi/pcmcia/Makefile

75bf465f0bc33e9b776a46d6a1b9b990f5fb7c37 - Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-next

Fri, 23 Aug 2019 06:08:04 +0200

Merge remote-tracking branch 'remotes/powerpc/topic/ppc-kvm' into kvm-ppc-nextThis merges in fixes for the XIVE interrupt controller which touch bothgeneric powerpc and PPC KVM code. To avoid merge conflicts, thesecommits will go upstream via the powerpc tree as well as the KVM tree.Signed-off-by: Paul Mackerras List of files: /linux/drivers/scsi/pcmcia/Makefile

58e16d792a6a8c6b750f637a4649967fcac853dc - Merge branch 'ti-sysc-fixes' into fixes

Tue, 13 Aug 2019 12:40:10 +0200

Merge branch 'ti-sysc-fixes' into fixes List of files: /linux/drivers/scsi/pcmcia/Makefile

cbd32a1c56e36fedaa93a727699188bd3e6e6f67 - Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgent

Mon, 12 Aug 2019 14:36:27 +0200

Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi into efi/urgentPull a single EFI fix for v5.3 from Ard: - Fix mixed mode breakage in EFI config table handling for TPM. List of files: /linux/drivers/scsi/pcmcia/Makefile

4aa31b4b61e4985e719352c329c3948d1932cb64 - Merge tag 'v5.3-rc4' into next

Mon, 12 Aug 2019 08:24:46 +0200

Merge tag 'v5.3-rc4' into nextSync up with mainline to bring in device_property_count_u32 andothernewer APIs. List of files: /linux/drivers/scsi/pcmcia/Makefile

3f61fd41f38328f0a585eaba2d72d339fe9aecda - Merge tag 'v5.3-rc3' into drm-next-5.4

Fri, 09 Aug 2019 20:07:28 +0200

Merge tag 'v5.3-rc3' into drm-next-5.4Linux 5.3-rc3Signed-off-by: Alex Deucher List of files: /linux/drivers/scsi/pcmcia/Makefile

ed32f8d42cee118b075e4372a55c7739a11094b2 - Merge drm/drm-next into drm-intel-next-queued

Mon, 29 Jul 2019 17:51:48 +0200

Merge drm/drm-next into drm-intel-next-queuedCatching up with 5.3-rc*Signed-off-by: Rodrigo Vivi List of files: /linux/drivers/scsi/pcmcia/Makefile

7a30bdd99f37352b188575b27924c407c6ddff9e - Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

Sun, 28 Jul 2019 22:22:40 +0200

Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.gitPick up the spectre documentation so the Grand Schemozzle can be added. List of files: /linux/drivers/scsi/pcmcia/Makefile

27988c96687667e74df1a9a3b8662519bc1c29c9 - Merge tag 'v5.3-rc1' into regulator-5.3

Wed, 24 Jul 2019 18:00:06 +0200

Merge tag 'v5.3-rc1' into regulator-5.3Linus 5.3-rc1 List of files: /linux/drivers/scsi/pcmcia/Makefile

e27a24210aa17b8a0cd462865130fe73afd7e001 - Merge tag 'v5.3-rc1' into docs-next

Mon, 22 Jul 2019 21:42:10 +0200

Merge tag 'v5.3-rc1' into docs-nextPull in all of the massive docs changes from elsewhere. List of files: /linux/drivers/scsi/pcmcia/Makefile

03b0f2ce735e97e9f49790d4563c82515b8fa702 - Merge v5.3-rc1 into drm-misc-next

Mon, 22 Jul 2019 21:24:10 +0200

Merge v5.3-rc1 into drm-misc-nextNoralf needs some SPI patches in 5.3 to merge some work on tinydrm.Signed-off-by: Maxime Ripard List of files: /linux/drivers/scsi/pcmcia/Makefile

3f98538c7673e5306a126fd3cb7e0a84abc170ee - Merge tag 'v5.3-rc1' into patchwork

Mon, 22 Jul 2019 13:40:55 +0200

Merge tag 'v5.3-rc1' into patchworkLinus 5.3-rc1* tag 'v5.3-rc1': (12816 commits) Linus 5.3-rc1 iommu/amd: fix a crash in iova_magazine_free_pfns hexagon: switch to generic version of pte allocation typo fix: it's d_make_root, not d_make_inode... dt-bindings: pinctrl: stm32: Fix missing 'clocks' property in examples dt-bindings: iio: ad7124: Fix dtc warnings in example dt-bindings: iio: avia-hx711: Fix avdd-supply typo in example dt-bindings: pinctrl: aspeed: Fix AST2500 example errors dt-bindings: pinctrl: aspeed: Fix 'compatible' schema errors dt-bindings: riscv: Limit cpus schema to only check RiscV 'cpu' nodes dt-bindings: Ensure child nodes are of type 'object' x86/entry/64: Prevent clobbering of saved CR2 value smp: Warn on function calls from softirq context KVM: x86: Add fixed counters to PMU filter KVM: nVMX: do not use dangling shadow VMCS after guest reset KVM: VMX: dump VMCS on failed entry KVM: x86/vPMU: refine kvm_pmu err msg when event creation failed KVM: s390: Use kvm_vcpu_wake_up in kvm_s390_vcpu_wakeup KVM: Boost vCPUs that are delivering interrupts KVM: selftests: Remove superfluous define from vmx.c ... List of files: /linux/drivers/scsi/pcmcia/Makefile

4df4888b17c433255ec023df13261b3728d858ad - Merge branch 'topic/hda-acomp-base' into for-next

Mon, 22 Jul 2019 09:18:07 +0200

Merge branch 'topic/hda-acomp-base' into for-nextPull the support for AMD / Nvidia HD-audio compmonent notificationSigned-off-by: Takashi Iwai List of files: /linux/drivers/scsi/pcmcia/Makefile

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

Fri, 12 Jul 2019 00:14:01 +0200

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: qla2xxx, hpsa, lpfc, ufs, mpt3sas, ibmvscsi, megaraid_sas, bnx2fc and hisi_sas as well as the removal of the osst driver (I heard from Willem privately that he would like the driver removed because all his test hardware has failed). Plus number of minor changes, spelling fixes and other trivia. The big merge conflict this time around is the SPDX licence tags. Following discussion on linux-next, we believe our version to be more accurate than the one in the tree, so the resolution is to take our version for all the SPDX conflicts"Note on the SPDX license tag conversion conflicts: the SCSI tree haddone its own SPDX conversion, which in some cases conflicted with thetreewide ones done by Thomas & co.In almost all cases, the conflicts were purely syntactic: the SCSI treeused the old-style SPDX tags ("GPL-2.0" and "GPL-2.0+") while thetreewide conversion had used the new-style ones ("GPL-2.0-only" and"GPL-2.0-or-later").In these cases I picked the new-style one.In a few cases, the SPDX conversion was actually different, though. Asexplained by James above, and in more detail in a pre-pull-requestthread: "The other problem is actually substantive: In the libsas code Luben Tuikov originally specified gpl 2.0 only by dint of stating: * This file is licensed under GPLv2. In all the libsas files, but then muddied the water by quoting GPLv2 verbatim (which includes the or later than language). So for these files Christoph did the conversion to v2 only SPDX tags and Thomas converted to v2 or later tags"So in those cases, where the spdx tag substantially mattered, I took theSCSI tree conversion of it, but then also took the opportunity to turnthe old-style "GPL-2.0" into a new-style "GPL-2.0-only" tag.Similarly, when there were whitespace differences or other differencesto the comments around the copyright notices, I took the version fromthe SCSI tree as being the more specific conversion.Finally, in the spdx conversions that had no conflicts (because thetreewide ones hadn't been done for those files), I just took the SCSItree version as-is, even if it was old-style. The old-style conversionsare perfectly valid, even if the "-only" and "-or-later" versions areperhaps more descriptive.* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (185 commits) scsi: qla2xxx: move IO flush to the front of NVME rport unregistration scsi: qla2xxx: Fix NVME cmd and LS cmd timeout race condition scsi: qla2xxx: on session delete, return nvme cmd scsi: qla2xxx: Fix kernel crash after disconnecting NVMe devices scsi: megaraid_sas: Update driver version to 07.710.06.00-rc1 scsi: megaraid_sas: Introduce various Aero performance modes scsi: megaraid_sas: Use high IOPS queues based on IO workload scsi: megaraid_sas: Set affinity for high IOPS reply queues scsi: megaraid_sas: Enable coalescing for high IOPS queues scsi: megaraid_sas: Add support for High IOPS queues scsi: megaraid_sas: Add support for MPI toolbox commands scsi: megaraid_sas: Offload Aero RAID5/6 division calculations to driver scsi: megaraid_sas: RAID1 PCI bandwidth limit algorithm is applicable for only Ventura scsi: megaraid_sas: megaraid_sas: Add check for count returned by HOST_DEVICE_LIST DCMD scsi: megaraid_sas: Handle sequence JBOD map failure at driver level scsi: megaraid_sas: Don't send FPIO to RL Bypass queue scsi: megaraid_sas: In probe context, retry IOC INIT once if firmware is in fault scsi: megaraid_sas: Release Mutex lock before OCR in case of DCMD timeout scsi: megaraid_sas: Call disable_irq from process IRQ poll scsi: megaraid_sas: Remove few debug counters from IO path ... List of files: /linux/drivers/scsi/pcmcia/Makefile

597473720f4dc69749542bfcfed4a927a43d935e - Merge branch 'next' into for-linus

Thu, 11 Jul 2019 08:24:10 +0200

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

8674a8aa2c399cb4014052796ba4bd0fbd6f3c03 - scsi: fdomain: Add PCMCIA support

Mon, 27 May 2019 22:19:47 +0200

scsi: fdomain: Add PCMCIA supportAdd PCMCIA card support to Future Domain SCSI driver.Tested with IBM SCSI PCMCIA Adapter 40G1890.Signed-off-by: Ondrej Zary Signed-off-by: Martin K. Petersen List of files: /linux/drivers/scsi/pcmcia/Makefile

2a267e7c41aa88215de2b542de797d03d16ecdfd - Merge tag 'v5.1' into next

Fri, 10 May 2019 20:43:46 +0200

Merge tag 'v5.1' into nextSync up with mainline to bring in the latest APIs. List of files: /linux/drivers/scsi/pcmcia/Makefile

63b6f0b827d6b40e53bac5abc8150fa117d27bec - Merge branches 'for-5.1/upstream-fixes', 'for-5.2/core', 'for-5.2/ish', 'for-5.2/logitech', 'for-5.2/macally', 'for-5.2/picolcd', 'for-5.2/sensor' and 'for-5.2/u2fzero' into for-linus

Mon, 06 May 2019 15:45:18 +0200

Merge branches 'for-5.1/upstream-fixes', 'for-5.2/core', 'for-5.2/ish', 'for-5.2/logitech', 'for-5.2/macally', 'for-5.2/picolcd', 'for-5.2/sensor' and 'for-5.2/u2fzero' into for-linus List of files: /linux/drivers/scsi/pcmcia/Makefile

c3bdd5e65185f46150b3bac103b3854040487857 - Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-next

Tue, 23 Apr 2019 00:25:39 +0200

Merge tag 'v5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mlx5-nextLinux 5.1-rc1We forgot to reset the branch last merge window thus mlx5-next is outdatedand still based on 5.0-rc2. This merge commit is needed to sync mlx5-nextbranch with 5.1-rc1.Signed-off-by: Saeed Mahameed List of files: /linux/drivers/scsi/pcmcia/Makefile