Commit 866c9b94 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of... 

Merge tag 'for-linus-timers-conversion-final-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into timers/urgent

Pull the last batch of manual timer conversions from Kees Cook:

 - final batch of "non trivial" timer conversions (multi-tree dependencies,
   things Coccinelle couldn't handle, etc).

 - treewide conversions via Coccinelle, in 4 steps:
   - DEFINE_TIMER() functions converted to struct timer_list * argument
   - init_timer() -> setup_timer()
   - setup_timer() -> timer_setup()
   - setup_timer() -> timer_setup() (with a single embedded structure)

 - deprecated timer API removals (init_timer(), setup_*timer())

 - finalization of new API (remove global casts)
parents aea3706c 841b86f3

.gitignore

+28 −21
Original line number Original line Diff line number Diff line
@@ -7,38 +7,40 @@ 
# command after changing this file, to see if there are

# command after changing this file, to see if there are

# any tracked files which get ignored after the change.

# any tracked files which get ignored after the change.

#

#

# Normal rules

# Normal rules (sorted alphabetically)

#

#

.*

.*

*.a

*.bin

*.bz2

*.c.[012]*.*

*.dtb

*.dtb.S

*.dwo

*.elf

*.gcno

*.gz

*.i

*.ko

*.ll

*.lst

*.lz4

*.lzma

*.lzo

*.mod.c

*.o

*.o

*.o.*

*.o.*

*.a

*.order

*.patch

*.s

*.s

*.ko

*.so

*.so

*.so.dbg

*.so.dbg

*.mod.c

*.su

*.i

*.lst

*.symtypes

*.symtypes

*.order

*.elf

*.bin

*.tar

*.tar

*.gz

*.bz2

*.lzma

*.xz

*.xz

*.lz4

*.lzo

*.patch

*.gcno

*.ll

modules.builtin

Module.symvers

Module.symvers

*.dwo

modules.builtin

*.su

*.c.[012]*.*





#

#

# Top-level generic files

# Top-level generic files
@@ -53,6 +55,11 @@ Module.symvers 
/System.map

/System.map

/Module.markers

/Module.markers





#

# RPM spec file (make rpm-pkg)

#

/*.spec



#

#

# Debian directory (make deb-pkg)

# Debian directory (make deb-pkg)

#

#

.mailmap

+2 −0
Original line number Original line Diff line number Diff line
@@ -73,6 +73,8 @@ James E Wilson <wilson@specifix.com> 
James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

James Hogan <jhogan@kernel.org> <james.hogan@imgtec.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Hogan <jhogan@kernel.org> <james@albanarts.com>

James Ketrenos <jketreno@io.(none)>

James Ketrenos <jketreno@io.(none)>

Jason Gunthorpe <jgg@ziepe.ca> <jgg@mellanox.com>

Jason Gunthorpe <jgg@ziepe.ca> <jgunthorpe@obsidianresearch.com>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

Javi Merino <javi.merino@kernel.org> <javi.merino@arm.com>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

<javier@osg.samsung.com> <javier.martinez@collabora.co.uk>

Jean Tourrilhes <jt@hpl.hp.com>

Jean Tourrilhes <jt@hpl.hp.com>

Documentation/ABI/obsolete/proc-sys-vm-nr_pdflush_threads

deleted100644 → 0
+0 −5
Original line number Original line Diff line number Diff line 
What:		/proc/sys/vm/nr_pdflush_threads

Date:		June 2012

Contact:	Wanpeng Li <liwp@linux.vnet.ibm.com>

Description: Since pdflush is replaced by per-BDI flusher, the interface of old pdflush

             exported in /proc/sys/vm/ should be removed.

Documentation/ABI/obsolete/sysfs-gpio

+1 −1
Original line number Original line Diff line number Diff line
@@ -11,7 +11,7 @@ Description: 
  Kernel code may export it for complete or partial access.

  Kernel code may export it for complete or partial access.





  GPIOs are identified as they are inside the kernel, using integers in

  GPIOs are identified as they are inside the kernel, using integers in

  the range 0..INT_MAX.  See Documentation/gpio.txt for more information.

  the range 0..INT_MAX.  See Documentation/gpio/gpio.txt for more information.





    /sys/class/gpio

    /sys/class/gpio

	/export ... asks the kernel to export a GPIO to userspace

	/export ... asks the kernel to export a GPIO to userspace

Documentation/ABI/stable/sysfs-bus-vmbus

+70 −0
Original line number Original line Diff line number Diff line
@@ -41,3 +41,73 @@ KernelVersion: 4.5 
Contact:	K. Y. Srinivasan <kys@microsoft.com>

Contact:	K. Y. Srinivasan <kys@microsoft.com>

Description:	The 16 bit vendor ID of the device

Description:	The 16 bit vendor ID of the device

Users:		tools/hv/lsvmbus and user level RDMA libraries

Users:		tools/hv/lsvmbus and user level RDMA libraries



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	VCPU (sub)channel is affinitized to

Users:		tools/hv/lsvmbus and other debuggig tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/cpu

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	VCPU (sub)channel is affinitized to

Users:		tools/hv/lsvmbus and other debuggig tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/in_mask

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Inbound channel signaling state

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/latency

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Channel signaling latency

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/out_mask

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Outbound channel signaling state

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/pending

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Channel interrupt pending state

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/read_avail

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Bytes availabble to read

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/write_avail

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Bytes availabble to write

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/events

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Number of times we have signaled the host

Users:		Debugging tools



What:		/sys/bus/vmbus/devices/vmbus_*/channels/relid/interrupts

Date:		September. 2017

KernelVersion:	4.14

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Number of times we have taken an interrupt (incoming)

Users:		Debugging tools