diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:53:06 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-07 04:53:06 -0500 |
| commit | b3d9a136815ca9284ade2a897a3b7d2b0084c33c (patch) | |
| tree | af222e53d833ff7218577cf98e1b856d9d6bda93 /scripts/patch-kernel | |
| parent | c7da092a1f243bfd1bfb4124f538e69e941882da (diff) | |
| parent | e4880bc5dfb1f02b152e62a894b5c6f3e995b3cf (diff) | |
Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts
Conflicts:
arch/x86/kernel/cpu/Makefile
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts/patch-kernel')
| -rwxr-xr-x | scripts/patch-kernel | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/patch-kernel b/scripts/patch-kernel index 49b4241e814a..033d5916797d 100755 --- a/scripts/patch-kernel +++ b/scripts/patch-kernel | |||
| @@ -1,4 +1,5 @@ | |||
| 1 | #! /bin/sh | 1 | #! /bin/sh |
| 2 | # SPDX-License-Identifier: GPL-2.0 | ||
| 2 | # Script to apply kernel patches. | 3 | # Script to apply kernel patches. |
| 3 | # usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ] | 4 | # usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ] |
| 4 | # The source directory defaults to /usr/src/linux, and the patch | 5 | # The source directory defaults to /usr/src/linux, and the patch |