Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 675c354a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver patches from Greg KH:
 "Here's the big char/misc driver updates for 3.15-rc1.

  Lots of various things here, including the new mcb driver subsystem.

  All of these have been in linux-next for a while"

* tag 'char-misc-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (118 commits)
  extcon: Move OF helper function to extcon core and change function name
  extcon: of: Remove unnecessary function call by using the name of device_node
  extcon: gpio: Use SIMPLE_DEV_PM_OPS macro
  extcon: palmas: Use SIMPLE_DEV_PM_OPS macro
  mei: don't use deprecated DEFINE_PCI_DEVICE_TABLE macro
  mei: amthif: fix checkpatch error
  mei: client.h fix checkpatch errors
  mei: use cl_dbg where appropriate
  mei: fix Unnecessary space after function pointer name
  mei: report consistently copy_from/to_user failures
  mei: drop pr_fmt macros
  mei: make me hw headers private to me hw.
  mei: fix memory leak of pending write cb objects
  mei: me: do not reset when less than expected data is received
  drivers: mcb: Fix build error discovered by 0-day bot
  cs5535-mfgpt: Simplify dependencies
  spmi: pm: drop bus-level PM suspend/resume routines
  spmi: pmic_arb: make selectable on ARCH_QCOM
  Drivers: hv: vmbus: Increase the limit on the number of pfns we can handle
  pch_phub: Report error writing MAC back to user
  ...
parents c7092914 1b3fa22e

Documentation/DocBook/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml drm.xml media_api.xml

	    tracepoint.xml drm.xml media_api.xml w1.xml



include $(srctree)/Documentation/DocBook/media/Makefile

Documentation/DocBook/w1.tmpl

0 → 100644
+101 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>



<book id="w1id">

  <bookinfo>

    <title>W1: Dallas' 1-wire bus</title>



    <authorgroup>

      <author>

        <firstname>David</firstname>

        <surname>Fries</surname>

        <affiliation>

          <address>

            <email>David@Fries.net</email>

          </address>

        </affiliation>

      </author>



    </authorgroup>



    <copyright>

      <year>2013</year>

      <!--

      <holder></holder>

      -->

    </copyright>



    <legalnotice>

      <para>

        This documentation is free software; you can redistribute

        it and/or modify it under the terms of the GNU General Public

        License version 2.

      </para>



      <para>

        This program is distributed in the hope that it will be

        useful, but WITHOUT ANY WARRANTY; without even the implied

        warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

        For more details see the file COPYING in the source

        distribution of Linux.

      </para>

    </legalnotice>

  </bookinfo>



  <toc></toc>



  <chapter id="w1_internal">

    <title>W1 API internal to the kernel</title>



    <sect1 id="w1_internal_api">

      <title>W1 API internal to the kernel</title>

      <sect2 id="w1.h">

        <title>drivers/w1/w1.h</title>

        <para>W1 core functions.</para>

!Idrivers/w1/w1.h

      </sect2>



      <sect2 id="w1.c">

        <title>drivers/w1/w1.c</title>

        <para>W1 core functions.</para>

!Idrivers/w1/w1.c

      </sect2>



      <sect2 id="w1_family.h">

        <title>drivers/w1/w1_family.h</title>

        <para>Allows registering device family operations.</para>

!Idrivers/w1/w1_family.h

      </sect2>



      <sect2 id="w1_family.c">

        <title>drivers/w1/w1_family.c</title>

        <para>Allows registering device family operations.</para>

!Edrivers/w1/w1_family.c

      </sect2>



      <sect2 id="w1_int.c">

        <title>drivers/w1/w1_int.c</title>

        <para>W1 internal initialization for master devices.</para>

!Edrivers/w1/w1_int.c

      </sect2>



      <sect2 id="w1_netlink.h">

        <title>drivers/w1/w1_netlink.h</title>

        <para>W1 external netlink API structures and commands.</para>

!Idrivers/w1/w1_netlink.h

      </sect2>



      <sect2 id="w1_io.c">

        <title>drivers/w1/w1_io.c</title>

        <para>W1 input/output.</para>

!Edrivers/w1/w1_io.c

!Idrivers/w1/w1_io.c

      </sect2>



    </sect1>





  </chapter>



</book>

Documentation/connector/cn_test.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ static void cn_test_timer_func(unsigned long __data) 


		memcpy(m + 1, data, m->len);



		cn_netlink_send(m, 0, GFP_ATOMIC);

		cn_netlink_send(m, 0, 0, GFP_ATOMIC);

		kfree(m);

	}

Documentation/devices.txt

+2 −0
Original line number Diff line number Diff line
@@ -410,6 +410,7 @@ Your cooperation is appreciated. 
		194 = /dev/zkshim	Zero-Knowledge network shim control

		195 = /dev/elographics/e2201	Elographics touchscreen E271-2201

		196 = /dev/vfio/vfio	VFIO userspace driver interface

		197 = /dev/pxa3xx-gcu	PXA3xx graphics controller unit driver

		198 = /dev/sexec	Signed executable interface

		199 = /dev/scanners/cuecat :CueCat barcode scanner

		200 = /dev/net/tun	TAP/TUN network device
@@ -451,6 +452,7 @@ Your cooperation is appreciated. 
		236 = /dev/mapper/control	Device-Mapper control device

		237 = /dev/loop-control Loopback control device

		238 = /dev/vhost-net	Host kernel accelerator for virtio net

		239 = /dev/uhid		User-space I/O driver support for HID subsystem



		240-254			Reserved for local use

		255			Reserved for MISC_DYNAMIC_MINOR