Merge tag 'm68k-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- miscellaneous fixes

- defconfig updates

* tag 'm68

Merge tag 'm68k-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- miscellaneous fixes

- defconfig updates

* tag 'm68k-for-v5.15-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix asm register constraints for atomic ops
m68k: Fix invalid RMW_INSNS on CPUs that lack CAS
m68k: defconfig: Update defconfigs for v5.14-rc1
m68k: emu: Fix invalid free in nfeth_cleanup()

show more ...

Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Merge tag 'v5.14-rc6' into locking/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

m68k: defconfig: Update defconfigs for v5.14-rc1

- Enable modular build of the new Netfilter base hook dump support,
- Drop CONFIG_SCSI=y (selected by ATA, as enabled since commit
b90257bfdd

m68k: defconfig: Update defconfigs for v5.14-rc1

- Enable modular build of the new Netfilter base hook dump support,
- Drop CONFIG_SCSI=y (selected by ATA, as enabled since commit
b90257bfddbd01f3 ("m68k: use libata instead of the legacy ide
driver")),
- Disable CIFS_STATS2 (defaults to enabled since commit
0d52df81e07739db ("cifs: enable extended stats by default")),
- Enable modular build of the glob self-test (visible since commit
b90257bfddbd01f3 ("m68k: use libata instead of the legacy ide
driver")),
- Drop CONFIG_TEST_LIST_SORT=m (auto-enabled since commit
ebd09577be6c15ee ("lib/test: convert lib/test_list_sort.c to use
KUnit")),
- Enable modular build of the new test for the scanf() family of
functions.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210712120456.4119260-1-geert@linux-m68k.org

show more ...

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Required bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.

Signed-off-by: Maarten Lankhorst <maarten.lankh

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Required bump from v5.13-rc3 to v5.14-rc3, and to pick up sysfb compilation fixes.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

show more ...

Merge tag 'v5.13' into next

Sync up with the mainline to get the latest parport API.

Merge drm/drm-next into drm-intel-gt-next

Catching up with 5.14-rc1 and also preparing for a
needed common topic branch for the "Minor revid/stepping
and workaround cleanup"

Reference: https://patc

Merge drm/drm-next into drm-intel-gt-next

Catching up with 5.14-rc1 and also preparing for a
needed common topic branch for the "Minor revid/stepping
and workaround cleanup"

Reference: https://patchwork.freedesktop.org/series/92299/
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

show more ...

Merge drm/drm-next into drm-intel-next

Catching up with 5.14-rc1

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Merge branch 'fixes-v5.14' into fixes

Merge branch 'cpufreq/cppc-fie' into cpufreq/arm/linux-next

Merge remote-tracking branch 'torvalds/master' into perf/core

To pick up fixes.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Merge tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- update Finn's email address in MAINTAINERS

- defc

Merge tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- update Finn's email address in MAINTAINERS

- defconfig updates

- minor fixes and improvements

* tag 'm68k-for-v5.14-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: atari: Fix ATARI_KBD_CORE kconfig unmet dependency warning
m68k: defconfig: Update defconfigs for v5.13-rc1
MAINTAINERS, .mailmap: Update Finn Thain's email address
m68k: dma: Remove unnecessary include of asm/cacheflush.h
m68k: Drop -fno-strength-reduce from KBUILD_CFLAGS

show more ...

Merge tag 'for-5.14/libata-2021-06-27' of git://git.kernel.dk/linux-block

Pull libata updates from Jens Axboe:
"The big change in this round is that we're finally in a position where
we can sanel

Merge tag 'for-5.14/libata-2021-06-27' of git://git.kernel.dk/linux-block

Pull libata updates from Jens Axboe:
"The big change in this round is that we're finally in a position where
we can sanely remove the old drivers/ide/ code, as libata covers
everything we need by now.

This is exciting for two reasons:

1) we delete a lot of legacy code that doesn't really meet the
standards we have today, and

2) it enables us to clean up various bits in the block layer that
exist only because of the old IDE code.

Outside of that, just a few minor fixes here, fixups for warnings,
etc"

* tag 'for-5.14/libata-2021-06-27' of git://git.kernel.dk/linux-block: (29 commits)
ata: rb532_cf: remove redundant codes
ide: remove the legacy ide driver
m68k: use libata instead of the legacy ide driver
ARM: disable CONFIG_IDE in pxa_defconfig
ARM: disable CONFIG_IDE in footbridge_defconfig
alpha: use libata instead of the legacy ide driver
pata_cypress: add a module option to disable BM-DMA
ata: pata_macio: Avoid overwriting initialised field in 'pata_macio_sht'
ata: pata_serverworks: Avoid overwriting initialised field in 'serverworks_osb4_sht
ata: pata_sc1200: sc1200_sht'Avoid overwriting initialised field in '
ata: pata_cs5530: Avoid overwriting initialised field in 'cs5530_sht'
ata: pata_cs5520: Avoid overwriting initialised field in 'cs5520_sht'
ata: pata_atiixp: Avoid overwriting initialised field in 'atiixp_sht'
ata: sata_nv: Do not over-write initialise fields in 'nv_adma_sht' and 'nv_swncq_sht'
ata: sata_mv: Do not over-write initialise fields in 'mv6_sht'
ata: sata_sil24: Do not over-write initialise fields in 'sil24_sht'
ata: ahci: Ensure initialised fields are not overwritten in AHCI_SHT()
ata: include: libata: Move fields commonly over-written to separate MACRO
ahci: Add support for Dell S140 and later controllers
ata: ahci_sunxi: Disable DIPM
...

show more ...

m68k: use libata instead of the legacy ide driver

Switch the m68 defconfigs from the deprecated ide subsystem to use libata
instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Geert Uy

m68k: use libata instead of the legacy ide driver

Switch the m68 defconfigs from the deprecated ide subsystem to use libata
instead.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210616134658.1471835-6-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>

show more ...

Merge tag 'v5.13-rc3' into asoc-5.13

Linux 5.13-rc3

Merge drm/drm-next into drm-intel-gt-next

Pulling in -rc2 fixes and TTM changes that next upcoming patches depend
on.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>

m68k: defconfig: Update defconfigs for v5.13-rc1

- Drop CONFIG_NF_LOG_NETDEV=m (removed in commit 1510618e45cb9fb7
("netfilter: nf_log_netdev: merge with nf_log_syslog")),
- Enable modular b

m68k: defconfig: Update defconfigs for v5.13-rc1

- Drop CONFIG_NF_LOG_NETDEV=m (removed in commit 1510618e45cb9fb7
("netfilter: nf_log_netdev: merge with nf_log_syslog")),
- Enable modular build of IPv4 packet logging (no longer auto-enabled
since commit db3187ae21bb0cff ("netfilter: nf_log_ipv4: rename to
nf_log_syslog")),
- Drop CONFIG_NF_LOG_BRIDGE=m (removed in commit 77ccee96a67422ac
("netfilter: nf_log_bridge: merge with nf_log_syslog")),
- Enable modular build of ECDSA crypto algorithm,
- Enable modular build of 64bit/32bit division and modulo test.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210510095302.4125561-1-geert@linux-m68k.org

show more ...

Merge tag 'v5.13-rc2' into spi-5.13

Linux 5.13-rc2

Merge branch 'fixes-rc1' into fixes

Merge drm/drm-next into drm-intel-next

Time to get back in sync...

Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

Merge drm/drm-next into drm-misc-next

Backmerging to get v5.12 fixes. Requested for vmwgfx.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>

Merge drm/drm-fixes into drm-misc-fixes

Start this new release drm-misc-fixes branch

Signed-off-by: Maxime Ripard <maxime@cerno.tech>

Merge branch 'next' into for-linus

Prepare input updates for 5.13 merge window.

Merge tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- defconfig updates

- Use common scripts for syscall

Merge tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

Pull m68k updates from Geert Uytterhoeven:

- defconfig updates

- Use common scripts for syscall table and header generation

- Fix timers on MVME platforms

- Fix lock imbalance in cacheflush syscall

- Minor fixes and improvements

* tag 'm68k-for-v5.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: sun3x: Remove unneeded semicolon
m68k: Add missing mmap_read_lock() to sys_cacheflush()
m68k: fpsp040,ifpsp060: Remove meaningless EXTRA_LDFLAGS
m68k: fpsp040: Remove meaningless $(OS_OBJS)
m68k: mvme147,mvme16x: Don't wipe PCC timer config bits
m68k: syscalls: switch to generic syscallhdr.sh
m68k: syscalls: switch to generic syscalltbl.sh
m68k: defconfig: Update defconfigs for v5.12-rc1
m68k: mm: Fix flatmem memory model setup

show more ...

Merge tag 'v5.12-rc7' into ecryptfs/next

Required to pick up idmapped mount changes which changed some function
parameters.