diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-11-27 10:54:33 +0100 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2017-11-27 10:54:33 +0100 |
| commit | 1420edf7a3fbc9b8b0bbe24c3724d582dd4def28 (patch) | |
| tree | 919f3adb874b11cb5e4ed2df37a9370847300ea4 /scripts/patch-kernel | |
| parent | drm/rockchip: dw-mipi-dsi: fix possible un-balanced runtime PM enable (diff) | |
| parent | Linux 4.15-rc1 (diff) | |
Merge tag 'v4.15-rc1' into drm-misc-fixes
Linux 4.15-rc1
Pull in the merge window to resync. Dave didn't get his -fixes pull
landed in time, and now there's another rockchip fix pending, so
fast-forwarding isn't possible, hence backmerge.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
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 @@ #! /bin/sh +# SPDX-License-Identifier: GPL-2.0 # Script to apply kernel patches. # usage: patch-kernel [ sourcedir [ patchdir [ stopversion ] [ -acxx ] ] ] # The source directory defaults to /usr/src/linux, and the patch |