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
..
association.h
atmel_usba_udc.h
audio-v2.h
audio.h
c67x00.h
cdc_ncm.h
cdc-wdm.h
cdc.h	cdc: add header guards	2015-09-15 21:53:24 -07:00
ch9.h	usb: common: of_usb_get_maximum_speed to usb_get_maximum_speed	2015-09-27 10:54:31 -05:00
chipidea.h	usb: chipidea: Add support for 'phy-clkgate-delay-us' property	2015-10-22 09:24:25 +08:00
composite.h
ehci_def.h
ehci_pdriver.h
ehci-dbgp.h
ezusb.h
functionfs.h
g_hid.h
gadget_configfs.h	usb-gadget: use per-attribute show and store methods	2015-10-13 22:12:57 -07:00
gadget.h	usb: gadget: introduce 'enabled' flag in struct usb_ep	2015-09-27 10:54:31 -05:00
gpio_vbus.h
hcd.h	usb: define HCD_USB31 speed option for hosts that support USB 3.1 features	2015-10-04 10:34:17 +01:00
input.h
iowarrior.h
irda.h
isp116x.h
isp1301.h
isp1362.h
isp1760.h
m66592.h
msm_hsusb_hw.h
msm_hsusb.h
musb-omap.h
musb-ux500.h
musb.h	usb: musb: set the controller speed based on the config setting	2015-09-27 10:54:31 -05:00
net2280.h
of.h	usb: common: of_usb_get_dr_mode to usb_get_dr_mode	2015-09-27 10:54:31 -05:00
ohci_pdriver.h
otg-fsm.h
otg.h	usb: common: of_usb_get_dr_mode to usb_get_dr_mode	2015-09-27 10:54:31 -05:00
phy_companion.h
phy.h	usb: phy: change some comments	2015-09-27 10:54:31 -05:00
quirks.h
r8a66597.h
renesas_usbhs.h	usb: renesas_usbhs: fix build warning if 64-bit architecture	2015-10-04 10:59:03 +01:00
rndis_host.h
samsung_usb_phy.h
serial.h
sl811.h
storage.h
tegra_usb_phy.h
tilegx.h
uas.h
ulpi.h
usb338x.h
usb_phy_generic.h
usbnet.h
wusb-wa.h
wusb.h
xhci_pdriver.h