Skip to content

Commit 149cbd1

Browse files
kelsey-steelekelsey-steele
committed
Merge tag 'rolling-lts/wsl/6.6.36.3' into linux-msft-wsl-6.6.y
Linux rolling-lts/wsl/6.6.36.3 Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
2 parents 61945f2 + 4c1b6d6 commit 149cbd1

40 files changed

+36473
-46
lines changed

‎MAINTAINERS

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9771,6 +9771,13 @@ F: Documentation/devicetree/bindings/mtd/ti,am654-hbmc.yaml
97719771
F: drivers/mtd/hyperbus/
97729772
F: include/linux/mtd/hyperbus.h
97739773

9774+
Hyper-V vGPU DRIVER
9775+
M: Iouri Tarassov <iourit@microsoft.com>
9776+
L: linux-hyperv@vger.kernel.org
9777+
S: Supported
9778+
F: drivers/hv/dxgkrnl/
9779+
F: include/uapi/misc/d3dkmthk.h
9780+
97749781
HYPERVISOR VIRTUAL CONSOLE DRIVER
97759782
L: linuxppc-dev@lists.ozlabs.org
97769783
S: Odd Fixes

‎MSFT-Merge/log

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Name SHA1
2+
---- ----
3+
config/wsl-6.6 6bb42a690a802743d04a92968efe82c668454644
4+
feature/arm64-hyperv-hypercall-interface/6.6 8db985fdc14b63b0520d4286eaf57b04b25e00a4
5+
feature/arm64-hyperv-synthetic-clocks-timers/6.6 b63263237d73f1e1d76e2c2049e31b607ef78bec
6+
feature/dxgkrnl/6.6 423e5044c57566f8267bbb20cf7cf57d1aefb040
7+
feature/hvlite_virtio_pmem/6.6 7d955beb0207d880fa1862b1ace8487057b5aa6c
8+
fix/hv_utils_clock/6.6 a34090e9209d3d3db3d97aa567bb323ebc7620a4
9+
product/wsl/readme/6.6 e8bb7797885b28a31b42891d1002ddc17ec926ef
10+
product/wsl/security/6.6 c9cb753bbd093f0599408e24292aba20eed103f2

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
VERSION = 6
33
PATCHLEVEL = 6
44
SUBLEVEL = 36
5-
EXTRAVERSION =
5+
EXTRAVERSION = .3
66
NAME = Hurr durr I'ma ninja sloth
77

88
# *DOCUMENTATION*

‎Microsoft/config-wsl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../arch/x86/configs/config-wsl

‎Microsoft/config-wsl-arm64

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../arch/arm64/configs/config-wsl-arm64

‎README-Microsoft.WSL2

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
README.md

‎README.md

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Introduction
2+
3+
The [WSL2-Linux-Kernel][wsl2-kernel] repo contains the kernel source code and
4+
configuration files for the [WSL2][about-wsl2] kernel.
5+
6+
# Reporting Bugs
7+
8+
If you discover an issue relating to WSL or the WSL2 kernel, please report it on
9+
the [WSL GitHub project][wsl-issue]. It is not possible to report issues on the
10+
[WSL2-Linux-Kernel][wsl2-kernel] project.
11+
12+
If you're able to determine that the bug is present in the upstream Linux
13+
kernel, you may want to work directly with the upstream developers. Please note
14+
that there are separate processes for reporting a [normal bug][normal-bug] and
15+
a [security bug][security-bug].
16+
17+
# Feature Requests
18+
19+
Is there a missing feature that you'd like to see? Please request it on the
20+
[WSL GitHub project][wsl-issue].
21+
22+
If you're able and interested in contributing kernel code for your feature
23+
request, we encourage you to [submit the change upstream][submit-patch].
24+
25+
# Build Instructions
26+
27+
Instructions for building an x86_64 WSL2 kernel with an Ubuntu distribution are
28+
as follows:
29+
30+
1. Install the build dependencies:
31+
`$ sudo apt install build-essential flex bison dwarves libssl-dev libelf-dev`
32+
33+
2. Modify WSL2 kernel configs (optional):
34+
`$ make menuconfig KCONFIG_CONFIG=Microsoft/config-wsl`
35+
36+
Loadable module support is disabled when using a custom built kernel. Set any modules you want to be built-in before building.
37+
38+
3. Build the kernel using the WSL2 kernel configuration:
39+
`$ make KCONFIG_CONFIG=Microsoft/config-wsl`
40+
41+
# Install Instructions
42+
43+
Please see the documentation on the [.wslconfig configuration
44+
file][install-inst] for information on using a custom built kernel.
45+
46+
[wsl2-kernel]: https://github.com/microsoft/WSL2-Linux-Kernel
47+
[about-wsl2]: https://docs.microsoft.com/en-us/windows/wsl/about#what-is-wsl-2
48+
[wsl-issue]: https://github.com/microsoft/WSL/issues/new/choose
49+
[normal-bug]: https://www.kernel.org/doc/html/latest/admin-guide/bug-hunting.html#reporting-the-bug
50+
[security-bug]: https://www.kernel.org/doc/html/latest/admin-guide/security-bugs.html
51+
[submit-patch]: https://www.kernel.org/doc/html/latest/process/submitting-patches.html
52+
[install-inst]: https://docs.microsoft.com/en-us/windows/wsl/wsl-config#configure-global-options-with-wslconfig

‎SECURITY.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<!-- BEGIN MICROSOFT SECURITY.MD V0.0.7 BLOCK -->
2+
3+
## Security
4+
5+
Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).
6+
7+
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://aka.ms/opensource/security/definition), please report it to us as described below.
8+
9+
## Reporting Security Issues
10+
11+
**Please do not report security vulnerabilities through public GitHub issues.**
12+
13+
Instead, please report them to the Microsoft Security Response Center (MSRC) at [https://msrc.microsoft.com/create-report](https://aka.ms/opensource/security/create-report).
14+
15+
If you prefer to submit without logging in, send email to [secure@microsoft.com](mailto:secure@microsoft.com). If possible, encrypt your message with our PGP key; please download it from the [Microsoft Security Response Center PGP Key page](https://aka.ms/opensource/security/pgpkey).
16+
17+
You should receive a response within 24 hours. If for some reason you do not, please follow up via email to ensure we received your original message. Additional information can be found at [microsoft.com/msrc](https://aka.ms/opensource/security/msrc).
18+
19+
Please include the requested information listed below (as much as you can provide) to help us better understand the nature and scope of the possible issue:
20+
21+
* Type of issue (e.g. buffer overflow, SQL injection, cross-site scripting, etc.)
22+
* Full paths of source file(s) related to the manifestation of the issue
23+
* The location of the affected source code (tag/branch/commit or direct URL)
24+
* Any special configuration required to reproduce the issue
25+
* Step-by-step instructions to reproduce the issue
26+
* Proof-of-concept or exploit code (if possible)
27+
* Impact of the issue, including how an attacker might exploit the issue
28+
29+
This information will help us triage your report more quickly.
30+
31+
If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs.
32+
33+
## Preferred Languages
34+
35+
We prefer all communications to be in English.
36+
37+
## Policy
38+
39+
Microsoft follows the principle of [Coordinated Vulnerability Disclosure](https://aka.ms/opensource/security/cvd).
40+
41+
<!-- END MICROSOFT SECURITY.MD BLOCK -->

0 commit comments

Comments
 (0)