linux-stable-mirror

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00

T

Uwe Kleine-König 1609faa9e6 coresight: etm4x: Fix merge resolution for amba rework

This was non-trivial to get right because commits
c23bc382ef ("coresight: etm4x: Refactor probing routine") and
5214b56358 ("coresight: etm4x: Add support for sysreg only devices")
changed the code flow considerably. With this change the driver can be
built again.

Fixes: 0573d3fa48 ("Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next")
Signed-off-by: Uwe Kleine-König <uwe@kleine-koenig.org>
Link: https://lore.kernel.org/r/20210205130848.20009-1-uwe@kleine-koenig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

2021-02-05 15:02:48 +01:00

arch

arm64: Add TRFCR_ELx definitions

2021-02-04 17:00:34 +01:00

block

Merge tag 'block-5.11-2021-01-10' of git://git.kernel.dk/linux-block

2021-01-10 12:53:08 -08:00

certs

…

crypto

X.509: Fix crash caused by NULL pointer

2021-01-20 11:33:51 -08:00

Documentation

Merge tag 'icc-5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-next

2021-02-05 11:11:14 +01:00

drivers

coresight: etm4x: Fix merge resolution for amba rework

2021-02-05 15:02:48 +01:00

Merge tag 'io_uring-5.11-2021-01-24' of git://git.kernel.dk/linux-block

2021-01-24 12:30:14 -08:00

include

Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next

2021-02-05 11:15:43 +01:00

init

Revert "init/console: Use ttynull as a fallback when there is no console"

2021-01-08 11:02:18 -08:00

ipc

Merge branch 'akpm' (patches from Andrew)

2020-12-15 12:53:37 -08:00

kernel

Merge tag 'irq_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2021-01-24 10:24:20 -08:00

lib

ubsan: disable unsigned-overflow check for i386

2021-01-24 10:34:52 -08:00

LICENSES

…

mm/highmem: prepare for overriding set_pte_at()

2021-01-24 10:34:52 -08:00

net

Merge tag 'ceph-for-5.11-rc5' of git://github.com/ceph/ceph-client

2021-01-22 13:47:25 -08:00

samples

Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2020-12-16 16:38:41 -08:00

scripts

ver_linux: Eliminate duplicate code in ldconfig processing logic

2021-01-27 14:54:42 +01:00

security

dump_common_audit_data(): fix racy accesses to ->d_name

2021-01-16 15:11:35 -05:00

sound

Merge branch 'devel-stable' of git://git.armlinux.org.uk/~rmk/linux-arm into char-misc-next

2021-02-05 11:15:43 +01:00

tools

Merge tag 'objtool_urgent_for_v5.11_rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2021-01-24 10:17:03 -08:00

usr

…

virt

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

2021-01-08 15:06:02 -08:00

.clang-format

…

.cocciconfig

…

.get_maintainer.ignore

…

.gitattributes

…

.gitignore

…

.mailmap

MAINTAINERS: Update my email address

2021-01-15 23:55:16 +01:00

COPYING

…

CREDITS

CREDITS: update email address and home address

2021-01-27 21:03:50 +02:00

Kbuild

…

Kconfig

…

MAINTAINERS

bus: fsl-mc: add bus rescan attribute

2021-01-27 15:13:53 +01:00

Makefile

Linux 5.11-rc5

2021-01-24 16:47:14 -08:00

README

…

README

Linux kernel
============

There are several guides for kernel developers and users. These guides can
be rendered in a number of formats, like HTML and PDF. Please read
Documentation/admin-guide/README.rst first.

In order to build the documentation, use ``make htmldocs`` or
``make pdfdocs``.  The formatted documentation can also be read online at:

    https://www.kernel.org/doc/html/latest/

There are various text files in the Documentation/ subdirectory,
several of them using the Restructured Text markup notation.

Please read the Documentation/process/changes.rst file, as it contains the
requirements for building and running the kernel, and information about
the problems which may result by upgrading your kernel.