8dd06ef34b6e2f41b29fbf5fc1663780f2524285 - Merge branch 'next' into for-linus

Sat, 06 Jun 2020 19:45:37 +0200

Merge branch 'next' into for-linusPrepare input updates for 5.8 merge window. List of files: /linux/drivers/mtd/nand/onenand/Makefile

d053cf0d771f6547cb0537759a9af63cf402908d - Merge branch 'for-5.8' into for-linus

Mon, 01 Jun 2020 10:15:16 +0200

Merge branch 'for-5.8' into for-linus List of files: /linux/drivers/mtd/nand/onenand/Makefile

0fdc50dfab47d525b71a9f0d8310746cdc0c09c5 - Merge tag 'v5.6' into next

Tue, 12 May 2020 21:18:21 +0200

Merge tag 'v5.6' into nextSync up with mainline to get device tree and other changes. List of files: /linux/drivers/mtd/nand/onenand/Makefile

c9f289701540baeef9ac7c9977d67a7259f404db - Merge branch 'for-5.7/appleir' into for-linus

Wed, 01 Apr 2020 12:26:12 +0200

Merge branch 'for-5.7/appleir' into for-linus- small code cleanups in hid-appleir from Lucas Tanure List of files: /linux/drivers/mtd/nand/onenand/Makefile

a4654e9bde4ecedb4921e6c8fe2088114bdff1b3 - Merge branch 'x86/kdump' into locking/kcsan, to resolve conflicts

Sat, 21 Mar 2020 09:23:40 +0100

Merge branch 'x86/kdump' into locking/kcsan, to resolve conflictsConflicts: arch/x86/purgatory/MakefileSigned-off-by: Ingo Molnar List of files: /linux/drivers/mtd/nand/onenand/Makefile

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

Tue, 25 Feb 2020 18:29:58 +0100

Merge drm/drm-next into drm-intel-next-queuedSome DSI and VBT pending patches from Hans will applycleanly and with less ugly conflicts if they are rebuilton top of other patches that recently landed on drm-next.Reference: https://patchwork.freedesktop.org/series/70952/Cc: Hans de Goede Signed-off-by: Rodrigo Vivi

546121b65f47384e11ec1fa2e55449fc9f4846b2 - Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patches

Mon, 24 Feb 2020 11:36:09 +0100

Merge tag 'v5.6-rc3' into sched/core, to pick up fixes and dependent patchesSigned-off-by: Ingo Molnar List of files: /linux/drivers/mtd/nand/onenand/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/mtd/nand/onenand/Makefile

28f2aff1caa4997f58ca31179cad1b4a84a62827 - Merge v5.6-rc2 into drm-misc-next

Mon, 17 Feb 2020 10:34:34 +0100

Merge v5.6-rc2 into drm-misc-nextLyude needs some patches in 5.6-rc2 and we didn't bring drm-misc-nextforward yet, so it looks like a good occasion.Signed-off-by: Maxime Ripard List of files: /linux/drivers/mtd/nand/onenand/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/mtd/nand/onenand/Makefile

74c12ee02af109adcde36ec184fa59c0afb0edaa - Merge v5.6-rc1 into drm-misc-fixes

Wed, 12 Feb 2020 14:08:59 +0100

Merge v5.6-rc1 into drm-misc-fixesWe're based on v5.6, need v5.6-rc1 at least. :)Signed-off-by: Maarten Lankhorst List of files: /linux/drivers/mtd/nand/onenand/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/mtd/nand/onenand/Makefile

35c222fd323629cf2e834eb8aff77058856ffdda - Merge tag 'mtd/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux

Fri, 31 Jan 2020 00:46:02 +0100

Merge tag 'mtd/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linuxPull MTD updates from Miquel Raynal: "MTD core - block2mtd: page index should use pgoff_t - maps: physmap: minimal Runtime PM support - maps: pcmciamtd: avoid possible sleep-in-atomic-context bugs - concat: Fix a comment referring to an unknown symbol Raw NAND: - Macronix: Use match_string() helper - Atmel: switch to using devm_fwnode_gpiod_get() - Denali: rework the SKIP_BYTES feature and add reset controlling - Brcmnand: set appropriate DMA mask - Cadence: add unspecified HAS_IOMEM dependency - Various cleanup. Onenand: - Rename Samsung and Omap2 drivers to avoid possible build warnings - Enable compile testing - Various build issues - Kconfig cleanup SPI-NAND: - Support for Toshiba TC58CVG2S0HRAIJ SPI-NOR: - Add support for TB selection using SR bit 6, - Add support for few flashes"* tag 'mtd/for-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux: (41 commits) mtd: concat: Fix a comment referring to an unknown symbol mtd: rawnand: add unspecified HAS_IOMEM dependency mtd: block2mtd: page index should use pgoff_t mtd: maps: physmap: Add minimal Runtime PM support mtd: maps: pcmciamtd: fix possible sleep-in-atomic-context bugs in pcmciamtd_set_vpp() mtd: onenand: Rename omap2 driver to avoid a build warning mtd: onenand: Use a better name for samsung driver mtd: rawnand: atmel: switch to using devm_fwnode_gpiod_get() mtd: spinand: add support for Toshiba TC58CVG2S0HRAIJ mtd: rawnand: macronix: Use match_string() helper to simplify the code mtd: sharpslpart: Fix unsigned comparison to zero mtd: onenand: Enable compile testing of OMAP and Samsung drivers mtd: onenand: samsung: Fix printing format for size_t on 64-bit mtd: onenand: samsung: Fix pointer cast -Wpointer-to-int-cast warnings on 64 bit mtd: rawnand: denali: remove hard-coded DENALI_DEFAULT_OOB_SKIP_BYTES mtd: rawnand: denali_dt: add reset controlling dt-bindings: mtd: denali_dt: document reset property mtd: rawnand: denali_dt: Add support for configuring SPARE_AREA_SKIP_BYTES mtd: rawnand: denali_dt: error out if platform has no associated data mtd: rawnand: brcmnand: Set appropriate DMA mask ... List of files: /linux/drivers/mtd/nand/onenand/Makefile

4575243c5c173f8adbc08a5c6ea2269742ea2b47 - Merge tag 'nand/for-5.6' into mtd/next

Mon, 27 Jan 2020 17:49:15 +0100

Merge tag 'nand/for-5.6' into mtd/nextRaw NAND* Macronix: Use match_string() helper* Atmel: switch to using devm_fwnode_gpiod_get()* Denali: rework the SKIP_BYTES feature and add reset controlling* Brcmnand: set appropriate DMA mask* Various cleanup.Onenand drivers* Rename Samsung and Omap2 drivers to avoid possible build warnings* Enable compile testing* Various build issues* Kconfig cleanupSPI-NAND* Support for Toshiba TC58CVG2S0HRAIJ List of files: /linux/drivers/mtd/nand/onenand/Makefile

d85339d9ea2660b550f12aca8bd040be4395c963 - mtd: onenand: Rename omap2 driver to avoid a build warning

Mon, 30 Dec 2019 18:31:03 +0100

mtd: onenand: Rename omap2 driver to avoid a build warningAs previously reported by Sudip Mukherjee for the Samsung driver, theomap2 onenand driver is called omap2.c in our directory and omap2.c inthe tty/serial/ directory. If both drivers are compiled as modules, itwould produce the following warning: warning: same module names found: drivers/tty/serial/omap2.ko drivers/mtd/nand/onenand/omap2.koRename the onenand omap2 driver so that it fits the folder'sconvention: onenand_omap2.c.Signed-off-by: Miquel Raynal List of files: /linux/drivers/mtd/nand/onenand/Makefile

446b6dc8d87482af53fa30d29780a78bbae1e9b8 - mtd: onenand: Use a better name for samsung driver

Mon, 30 Dec 2019 18:31:02 +0100

mtd: onenand: Use a better name for samsung driverCommit 55ed51fff224 ("{tty: serial, nand: onenand}: samsung: rename tofix build warning") has changed the samsung.c driver to besamsung_mtd.c in order to avoid a conflict in module names with thetty driver.Since the *_mtd suffix is very undescriptive, rename it toonenand_samsung.c, following the folder's convention. Same will beapplied to the omap2 onenand driver.Signed-off-by: Miquel Raynal List of files: /linux/drivers/mtd/nand/onenand/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/mtd/nand/onenand/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/mtd/nand/onenand/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/mtd/nand/onenand/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/mtd/nand/onenand/Makefile

Changes in Makefile