linux

mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 02:21:52 +09:00

Go to file

Ingo Molnar 082f20b21d Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict

Resolve the conflict between these commits:

   x86/fpu:      1193f408cd ("x86/fpu/signal: Change return type of __fpu_restore_sig() to boolean")

   x86/urgent:   d298b03506 ("x86/fpu: Restore the masking out of reserved MXCSR bits")
                 b2381acd3f ("x86/fpu: Mask out the invalid MXCSR bits properly")

 Conflicts:
        arch/x86/kernel/fpu/signal.c

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

2021-10-16 15:17:46 +02:00

arch

Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict

2021-10-16 15:17:46 +02:00

block

Merge tag 'block-5.15-2021-10-09' of git://git.kernel.dk/linux-block

2021-10-09 14:51:59 -07:00

certs

certs: Add support for using elliptic curve keys for signing modules

2021-08-23 19:55:42 +03:00

crypto

Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

2021-08-30 12:57:10 -07:00

Documentation

Merge tag 'for-linus-5.15b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2021-10-08 12:55:23 -07:00

drivers

Merge branch 'i2c/for-current-fixed' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux

2021-10-09 15:03:48 -07:00

Merge tag '5.15-rc4-ksmbd-fixes' of git://git.samba.org/ksmbd

2021-10-09 10:17:17 -07:00

include

Merge tag 'for-linus-5.15b-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip

2021-10-08 12:55:23 -07:00

init

Merge branch 'work.init' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

2021-09-24 10:18:07 -07:00

ipc

ipc: remove memcg accounting for sops objects in do_semtimedop()

2021-09-14 10:22:11 -07:00

kernel

Merge tag 'net-5.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

2021-10-07 09:50:31 -07:00

lib

lib/zlib_inflate/inffast: check config in C to avoid unused function warning

2021-09-24 16:13:35 -07:00

LICENSES

LICENSES/dual/CC-BY-4.0: Git rid of "smart quotes"

2021-07-15 06:31:24 -06:00

mm: fix uninitialized use in overcommit_policy_handler

2021-09-24 16:13:35 -07:00

net

Merge tag 'nfsd-5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux

2021-10-07 14:11:40 -07:00

samples

samples/bpf: Relicense bpf_insn.h as GPL-2.0-only OR BSD-2-Clause

2021-09-29 16:03:55 +02:00

scripts

Merge branch 'x86/urgent' into x86/fpu, to resolve a conflict

2021-10-16 15:17:46 +02:00

security

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/

2021-10-07 12:44:41 +01:00

sound

ALSA: pcsp: Make hrtimer forwarding more robust

2021-09-28 10:58:08 +02:00

tools

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

2021-10-10 10:05:39 -07:00

usr

.gitignore: prefix local generated files with a slash

2021-05-02 00:43:35 +09:00

virt

KVM: Remove tlbs_dirty

2021-09-23 11:01:12 -04:00

.clang-format

clang-format: Update with the latest for_each macro list

2021-05-12 23:32:39 +02:00

.cocciconfig

…

.get_maintainer.ignore

Opt out of scripts/get_maintainer.pl

2019-05-16 10:53:40 -07:00

.gitattributes

.gitattributes: use 'dts' diff driver for dts files

2019-12-04 19:44:11 -08:00

.gitignore

.gitignore: ignore only top-level modules.builtin

2021-05-02 00:43:35 +09:00

.mailmap

mailmap: update email address of Matthias Fuchs and Thomas Körper

2021-08-19 09:39:44 +02:00

COPYING

COPYING: state that all contributions really are covered by this file

2020-02-10 13:32:20 -08:00

CREDITS

MAINTAINERS: Move Daniel Drake to credits

2021-09-21 08:34:58 +03:00

Kbuild

kbuild: rename hostprogs-y/always to hostprogs/always-y

2020-02-04 01:53:07 +09:00

Kconfig

kbuild: ensure full rebuild when the compiler is updated

2020-05-12 13:28:33 +09:00

MAINTAINERS

Merge tag 'armsoc-fixes-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

2021-10-07 14:01:29 -07:00

Makefile

Linux 5.15-rc5

2021-10-10 17:01:59 -07:00

README

Drop all 00-INDEX files from Documentation/

2018-09-09 15:08:58 -06:00

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.