tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc

Pull char / misc driver fixes from Greg KH:
"Here are 3 patches, one a revert of the UIO patch you objected to in
3.16-rc1 and that no one wanted to defend, a w1 driver bugfix, and a
MAINTAINERS update for the vmware balloon driver.

All of these, except for the MAINTAINERS update which just got added,
have been in linux-next just fine"

* tag 'char-misc-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
MAINTAINERS: add entry for VMware Balloon driver
w1: mxc_w1: Fix incorrect "presence" status
Revert "uio: fix vma io range check in mmap"

Linus Torvalds 60761c10 e6934ab4

+12 -3
+8
MAINTAINERS
··· 9744 9744 S: Supported 9745 9745 F: arch/x86/kernel/cpu/vmware.c 9746 9746 9747 + VMWARE BALLOON DRIVER 9748 + M: Xavier Deguillard <xdeguillard@vmware.com> 9749 + M: Philip Moltmann <moltmann@vmware.com> 9750 + M: "VMware, Inc." <pv-drivers@vmware.com> 9751 + L: linux-kernel@vger.kernel.org 9752 + S: Maintained 9753 + F: drivers/misc/vmw_balloon.c 9754 + 9747 9755 VMWARE VMXNET3 ETHERNET DRIVER 9748 9756 M: Shreyas Bhatewara <sbhatewara@vmware.com> 9749 9757 M: "VMware, Inc." <pv-drivers@vmware.com>
+2 -1
drivers/misc/vmw_balloon.c
··· 17 17 * along with this program; if not, write to the Free Software 18 18 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. 19 19 * 20 - * Maintained by: Dmitry Torokhov <dtor@vmware.com> 20 + * Maintained by: Xavier Deguillard <xdeguillard@vmware.com> 21 + * Philip Moltmann <moltmann@vmware.com> 21 22 */ 22 23 23 24 /*
+1 -1
drivers/uio/uio.c
··· 655 655 656 656 if (mem->addr & ~PAGE_MASK) 657 657 return -ENODEV; 658 - if (vma->vm_end - vma->vm_start > PAGE_ALIGN(mem->size)) 658 + if (vma->vm_end - vma->vm_start > mem->size) 659 659 return -EINVAL; 660 660 661 661 vma->vm_ops = &uio_physical_vm_ops;
+1 -1
drivers/w1/masters/mxc_w1.c
··· 66 66 67 67 udelay(100); 68 68 } 69 - return !!(reg_val & MXC_W1_CONTROL_PST); 69 + return !(reg_val & MXC_W1_CONTROL_PST); 70 70 } 71 71 72 72 /*