leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'linus' into timers/2038

Browse Source 
Merge upstream to pick up changes on which pending patches depend on.
This commit is contained in:
Thomas Gleixner
2018-05-19 13:55:40 +02:00
parent 4fe581d7f1 73fcb1a370
commit b563ea676a
1311 changed files with 14365 additions and 7781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sparc/include/uapi/asm/oradax.h
View File

@@ -3,7 +3,7 @@
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,

2
arch/sparc/kernel/vio.c
View File

@@ -403,7 +403,7 @@ static struct vio_dev *vio_create_one(struct mdesc_handle *hp, u64 mp,
if (err) {
printk(KERN_ERR "VIO: Could not register device %s, err=%d\n",
dev_name(&vdev->dev), err);
kfree(vdev);
put_device(&vdev->dev);
return NULL;
}
if (vdev->dp)