Linus Torvalds 9aa3d651a9 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending ... Pull SCSI target updates from Nicholas Bellinger: "This series contains HCH's changes to absorb configfs attribute ->show() + ->store() function pointer usage from it's original tree-wide consumers, into common configfs code. It includes usb-gadget, target w/ drivers, netconsole and ocfs2 changes to realize the improved simplicity, that now renders the original include/target/configfs_macros.h CPP magic for fabric drivers and others, unnecessary and obsolete. And with common code in place, new configfs attributes can be added easier than ever before. Note, there are further improvements in-flight from other folks for v4.5 code in configfs land, plus number of target fixes for post -rc1 code" In the meantime, a new user of the now-removed old configfs API came in through the char/misc tree in commit 7bd1d4093c ("stm class: Introduce an abstraction for System Trace Module devices"). This merge resolution comes from Alexander Shishkin, who updated his stm class tracing abstraction to account for the removal of the old show_attribute and store_attribute methods in commit 517982229f ("configfs: remove old API") from this pull. As Alexander says about that patch: "There's no need to keep an extra wrapper structure per item and the awkward show_attribute/store_attribute item ops are no longer needed. This patch converts policy code to the new api, all the while making the code quite a bit smaller and easier on the eyes. Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com>" That patch was folded into the merge so that the tree should be fully bisectable. * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (23 commits) configfs: remove old API ocfs2/cluster: use per-attribute show and store methods ocfs2/cluster: move locking into attribute store methods netconsole: use per-attribute show and store methods target: use per-attribute show and store methods spear13xx_pcie_gadget: use per-attribute show and store methods dlm: use per-attribute show and store methods usb-gadget/f_serial: use per-attribute show and store methods usb-gadget/f_phonet: use per-attribute show and store methods usb-gadget/f_obex: use per-attribute show and store methods usb-gadget/f_uac2: use per-attribute show and store methods usb-gadget/f_uac1: use per-attribute show and store methods usb-gadget/f_mass_storage: use per-attribute show and store methods usb-gadget/f_sourcesink: use per-attribute show and store methods usb-gadget/f_printer: use per-attribute show and store methods usb-gadget/f_midi: use per-attribute show and store methods usb-gadget/f_loopback: use per-attribute show and store methods usb-gadget/ether: use per-attribute show and store methods usb-gadget/f_acm: use per-attribute show and store methods usb-gadget/f_hid: use per-attribute show and store methods ...		2015-11-13 20:04:17 -08:00
..
events	xen/events: fifo: Make it running on 64KB granularity	2015-10-23 14:20:38 +01:00
xen-pciback	xen-pciback: Add name prefix to global 'permissive' variable	2015-04-29 17:34:50 +01:00
xenbus	xenbus: Support multiple grants ring with 64KB	2015-10-23 14:20:47 +01:00
xenfs	xen: xensyms support	2015-08-20 12:24:25 +01:00
acpi.c
balloon.c	xen/balloon: Use the correct sizeof when declaring frame_list	2015-10-23 14:20:44 +01:00
biomerge.c	xen/biomerge: Don't allow biovec's to be merged when Linux is not using 4KB pages	2015-10-23 14:20:36 +01:00
cpu_hotplug.c	xen, cpu_hotplug: call device_offline instead of cpu_down	2015-10-23 14:20:48 +01:00
dbgp.c
efi.c
evtchn.c
fallback.c
features.c
gntalloc.c	Merge branch 'akpm' (patches from Andrew)	2015-09-10 18:19:42 -07:00
gntdev.c	mm: mark most vm_operations_struct const	2015-09-10 13:29:01 -07:00
grant-table.c	xen/grant-table: Add an helper to iterate over a specific number of grants	2015-10-23 14:20:46 +01:00
Kconfig	xen/PMU: Sysfs interface for setting Xen PMU mode	2015-08-20 12:24:26 +01:00
Makefile	xen/arm: Enable cpu_hotplug.c	2015-10-23 14:20:47 +01:00
manage.c	xen: Use correctly the Xen memory terminologies	2015-09-08 18:03:49 +01:00
mcelog.c
pci.c
pcpu.c
platform-pci.c
preempt.c	xen/preempt: use need_resched() instead of should_resched()	2015-08-20 12:24:14 +01:00
privcmd.c	xen/privcmd: Add support for Linux 64KB page granularity	2015-10-23 14:20:42 +01:00
privcmd.h
swiotlb-xen.c	xen/swiotlb: Add support for 64KB page granularity	2015-10-23 14:20:43 +01:00
sys-hypervisor.c	xen/PMU: Sysfs interface for setting Xen PMU mode	2015-08-20 12:24:26 +01:00
tmem.c	xen/tmem: Use xen_page_to_gfn rather than pfn_to_gfn	2015-09-08 18:03:52 +01:00
xen-acpi-cpuhotplug.c	Xen / ACPI / processor: Remove unneeded NULL check	2015-05-13 23:28:15 +02:00
xen-acpi-memhotplug.c
xen-acpi-pad.c
xen-acpi-processor.c	ACPI / processor: Drop an unused argument of a cleanup routine	2015-07-22 22:11:16 +02:00
xen-balloon.c
xen-scsiback.c	target: use per-attribute show and store methods	2015-10-13 22:17:49 -07:00
xen-selfballoon.c
xen-stub.c
xlate_mmu.c	xen/privcmd: Add support for Linux 64KB page granularity	2015-10-23 14:20:42 +01:00