Merge 5.0-rc6 into staging-next

We need the staging fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
Greg Kroah-Hartman 2019-02-11 09:25:01 +01:00
commit 3b6effbc38
566 changed files with 5560 additions and 2185 deletions

View file

@ -330,7 +330,7 @@ static const struct option longopts[] = {
int main(int argc, char **argv)
{
unsigned long long num_loops = 2;
long long num_loops = 2;
unsigned long timedelay = 1000000;
unsigned long buf_len = 128;