public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
No description
1252498 commits 2 branches 900 tags 3.7 GiB
C 97.4%
Assembly 1%
Shell 0.6%
Python 0.3%
Makefile 0.3%
Other 0.2%
Find a file
Ingo Molnar 2e2bc42c83 Merge branch 'linus' into x86/boot, to resolve conflict 
There's a new conflict with Linus's upstream tree, because
in the following merge conflict resolution in <asm/coco.h>:

  38b334fc76 Merge tag 'x86_sev_for_v6.9_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Linus has resolved the conflicting placement of 'cc_mask' better
than the original commit:

  1c811d403a x86/sev: Fix position dependent variable references in startup code

... which was also done by an internal merge resolution:

  2e5fc4786b Merge branch 'x86/sev' into x86/boot, to resolve conflicts and to pick up dependent tree

But Linus is right in 38b334fc76, the 'cc_mask' declaration is sufficient
within the #ifdef CONFIG_ARCH_HAS_CC_PLATFORM block.

So instead of forcing Linus to do the same resolution again, merge in Linus's
tree and follow his conflict resolution.

 Conflicts:
	arch/x86/include/asm/coco.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2024-03-12 09:55:57 +01:00
arch Merge branch 'linus' into x86/boot, to resolve conflict 2024-03-12 09:55:57 +01:00
block
certs
crypto
Documentation Merge branch 'linus' into x86/boot, to resolve conflict 2024-03-12 09:55:57 +01:00
drivers Merge branch 'linus' into x86/boot, to resolve conflict 2024-03-12 09:55:57 +01:00
fs
include Core x86 changes for v6.9: 2024-03-11 19:53:15 -07:00
init Misc cleanups, including a large series from Thomas Gleixner to 2024-03-11 19:37:56 -07:00
io_uring
ipc
kernel Core x86 changes for v6.9: 2024-03-11 19:53:15 -07:00
lib
LICENSES
mm
net Core x86 changes for v6.9: 2024-03-11 19:53:15 -07:00
rust
samples
scripts Core x86 changes for v6.9: 2024-03-11 19:53:15 -07:00
security
sound
tools Core x86 changes for v6.9: 2024-03-11 19:53:15 -07:00
usr
virt
.clang-format
.cocciconfig
.editorconfig
.get_maintainer.ignore
.gitattributes
.gitignore
.mailmap
.rustfmt.toml
COPYING
CREDITS
Kbuild
Kconfig
MAINTAINERS
Makefile
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.