diff options
| author |   David S. Miller <davem@davemloft.net> | 2018-10-12 21:38:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-10-12 21:38:46 -0700 |
| commit | d864991b220b7c62e81d21209e1fd978fd67352c (patch) | |
| tree | b570a1ad6fc1b959c5bcda6ceca0b321319c01e0 /samples | |
| parent | Merge branch 's390-qeth-next' (diff) | |
| parent | Merge tag 'armsoc-fixes-4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc (diff) | |
| download | linux-dev-d864991b220b7c62e81d21209e1fd978fd67352c.tar.xz linux-dev-d864991b220b7c62e81d21209e1fd978fd67352c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts were easy to resolve using immediate context mostly,
except the cls_u32.c one where I simply too the entire HEAD
chunk.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/samples/Kconfig b/samples/Kconfig index bd133efc1a56..ad1ec7016d4c 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -1,5 +1,6 @@ menuconfig SAMPLES bool "Sample kernel code" + depends on !UML help You can build and test sample kernel code here. |