diff options
| author | David S. Miller <davem@davemloft.net> | 2018-03-06 06:53:44 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-03-06 07:20:46 +0100 |
| commit | 0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70 (patch) | |
| tree | 439c89ea3c87496c23e167148f2cdbefb6e82b30 /tools/testing/selftests/memfd/config | |
| parent | Merge branch 'mvpp2-jumbo-frames-support' (diff) | |
| parent | Merge tag 'please-pull-ia64_misc' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| download | linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.tar.xz linux-0f3e9c97eb5a97972b0c0076a5cc01bb142f8e70.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
All of the conflicts were cases of overlapping changes.
In net/core/devlink.c, we have to make care that the
resouce size_params have become a struct member rather
than a pointer to such an object.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools/testing/selftests/memfd/config')
| -rw-r--r-- | tools/testing/selftests/memfd/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/memfd/config b/tools/testing/selftests/memfd/config new file mode 100644 index 000000000000..835c7f4dadcd --- /dev/null +++ b/tools/testing/selftests/memfd/config @@ -0,0 +1 @@ +CONFIG_FUSE_FS=m |