From: Greg Kroah-Hartman Date: Tue, 8 Jul 2014 00:59:07 +0000 (-0700) Subject: Merge 3.16-rc4 into staging-next X-Git-Tag: v3.17-rc1~123^2~1260 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=c1a567d31b5488f4593eae7ca215264947b355ca;hp=-c Merge 3.16-rc4 into staging-next We want the staging tree fixes in here as well. Signed-off-by: Greg Kroah-Hartman --- c1a567d31b5488f4593eae7ca215264947b355ca diff --combined MAINTAINERS index a8bf1cb1e701,6813d0aa5ecf..0782374db6d6 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -943,16 -943,10 +943,10 @@@ L: linux-arm-kernel@lists.infradead.or S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git F: arch/arm/mach-imx/ + F: arch/arm/mach-mxs/ F: arch/arm/boot/dts/imx* F: arch/arm/configs/imx*_defconfig - ARM/FREESCALE MXS ARM ARCHITECTURE - M: Shawn Guo - L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) - S: Maintained - T: git git://git.linaro.org/people/shawnguo/linux-2.6.git - F: arch/arm/mach-mxs/ - ARM/GLOMATION GESBC9312SX MACHINE SUPPORT M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -1052,9 -1046,33 +1046,33 @@@ M: Santosh Shilimkar + L: linux-kernel@vger.kernel.org + S: Maintained + F: drivers/clk/keystone/ + + ARM/TEXAS INSTRUMENT KEYSTONE ClOCKSOURCE + M: Santosh Shilimkar + L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) + L: linux-kernel@vger.kernel.org + S: Maintained + F: drivers/clocksource/timer-keystone.c + + ARM/TEXAS INSTRUMENT KEYSTONE RESET DRIVER + M: Santosh Shilimkar + L: linux-kernel@vger.kernel.org + S: Maintained + F: drivers/power/reset/keystone-reset.c + + ARM/TEXAS INSTRUMENT AEMIF/EMIF DRIVERS + M: Santosh Shilimkar + L: linux-kernel@vger.kernel.org + S: Maintained + F: drivers/memory/*emif* + ARM/LOGICPD PXA270 MACHINE SUPPORT M: Lennert Buytenhek L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) @@@ -2917,6 -2935,9 +2935,9 @@@ L: linux-doc@vger.kernel.or T: quilt http://www.infradead.org/~rdunlap/Doc/patches/ S: Maintained F: Documentation/ + X: Documentation/ABI/ + X: Documentation/devicetree/ + X: Documentation/[a-z][a-z]_[A-Z][A-Z]/ DOUBLETALK DRIVER M: "James R. Van Zandt" @@@ -3189,14 -3210,6 +3210,6 @@@ L: linux-scsi@vger.kernel.or S: Maintained F: drivers/scsi/eata_pio.* - EBTABLES - L: netfilter-devel@vger.kernel.org - W: http://ebtables.sourceforge.net/ - S: Orphan - F: include/linux/netfilter_bridge/ebt_*.h - F: include/uapi/linux/netfilter_bridge/ebt_*.h - F: net/bridge/netfilter/ebt*.c - EC100 MEDIA DRIVER M: Antti Palosaari L: linux-media@vger.kernel.org @@@ -5517,10 -5530,11 +5530,11 @@@ S: Maintaine F: arch/arm/mach-lpc32xx/ LSILOGIC MPT FUSION DRIVERS (FC/SAS/SPI) - M: Nagalakshmi Nandigama - M: Sreekanth Reddy - M: support@lsi.com - L: DL-MPTFusionLinux@lsi.com + M: Nagalakshmi Nandigama + M: Praveen Krishnamoorthy + M: Sreekanth Reddy + M: Abhijit Mahajan + L: MPT-FusionLinux.pdl@avagotech.com L: linux-scsi@vger.kernel.org W: http://www.lsilogic.com/support S: Supported @@@ -6105,12 -6119,11 +6119,11 @@@ F: Documentation/networking/s2io.tx F: Documentation/networking/vxge.txt F: drivers/net/ethernet/neterion/ - NETFILTER/IPTABLES + NETFILTER ({IP,IP6,ARP,EB,NF}TABLES) M: Pablo Neira Ayuso M: Patrick McHardy M: Jozsef Kadlecsik L: netfilter-devel@vger.kernel.org - L: netfilter@vger.kernel.org L: coreteam@netfilter.org W: http://www.netfilter.org/ W: http://www.iptables.org/ @@@ -8196,13 -8209,15 +8209,15 @@@ S: Maintaine F: drivers/usb/misc/sisusbvga/ SLAB ALLOCATOR - M: Christoph Lameter + M: Christoph Lameter M: Pekka Enberg - M: Matt Mackall + M: David Rientjes + M: Joonsoo Kim + M: Andrew Morton L: linux-mm@kvack.org S: Maintained F: include/linux/sl?b*.h - F: mm/sl?b.c + F: mm/sl?b* SLEEPABLE READ-COPY UPDATE (SRCU) M: Lai Jiangshan @@@ -8496,6 -8511,12 +8511,6 @@@ L: devel@driverdev.osuosl.or S: Supported F: drivers/staging/ -STAGING - AGERE HERMES II and II.5 WIRELESS DRIVERS -M: Henk de Groot -S: Odd Fixes -F: drivers/staging/wlags49_h2/ -F: drivers/staging/wlags49_h25/ - STAGING - ASUS OLED M: Jakub Schmidtke S: Odd Fixes @@@ -8507,6 -8528,14 +8522,6 @@@ M: H Hartley Sweeten -M: Jarod Wilson -M: Scott Davilla -M: Manu Abraham -S: Odd Fixes -F: drivers/staging/crystalhd/ - STAGING - ECHO CANCELLER M: Steve Underwood M: David Rowe @@@ -8625,6 -8654,11 +8640,6 @@@ M: Forest Bond -S: Odd Fixes -F: drivers/staging/winbond/ - STAGING - XGI Z7,Z9,Z11 PCI DISPLAY DRIVER M: Arnaud Patard S: Odd Fixes @@@ -9391,12 -9425,6 +9406,6 @@@ S: Maintaine F: drivers/usb/host/isp116x* F: include/linux/usb/isp116x.h - USB KAWASAKI LSI DRIVER - M: Oliver Neukum - L: linux-usb@vger.kernel.org - S: Maintained - F: drivers/usb/serial/kl5kusb105.* - USB MASS STORAGE DRIVER M: Matthew Dharm L: linux-usb@vger.kernel.org @@@ -9424,12 -9452,6 +9433,6 @@@ S: Maintaine F: Documentation/usb/ohci.txt F: drivers/usb/host/ohci* - USB OPTION-CARD DRIVER - M: Matthias Urlichs - L: linux-usb@vger.kernel.org - S: Maintained - F: drivers/usb/serial/option.c - USB PEGASUS DRIVER M: Petko Manolov L: linux-usb@vger.kernel.org @@@ -9462,7 -9484,7 +9465,7 @@@ S: Maintaine F: drivers/net/usb/rtl8150.c USB SERIAL SUBSYSTEM - M: Johan Hovold + M: Johan Hovold L: linux-usb@vger.kernel.org S: Maintained F: Documentation/usb/usb-serial.txt diff --combined drivers/iio/adc/ad799x.c index 7e08c601f66e,6eba301ee03d..6cf9ee18a216 --- a/drivers/iio/adc/ad799x.c +++ b/drivers/iio/adc/ad799x.c @@@ -105,8 -105,9 +105,8 @@@ enum * struct ad799x_chip_info - chip specific information * @channel: channel specification * @num_channels: number of channels - * @monitor_mode: whether the chip supports monitor interrupts * @default_config: device default configuration - * @event_attrs: pointer to the monitor event attribute group + * @info: pointer to iio_info struct */ struct ad799x_chip_info { struct iio_chan_spec channel[9]; @@@ -426,9 -427,12 +426,12 @@@ static int ad799x_write_event_value(str int ret; struct ad799x_state *st = iio_priv(indio_dev); + if (val < 0 || val > RES_MASK(chan->scan_type.realbits)) + return -EINVAL; + mutex_lock(&indio_dev->mlock); ret = ad799x_i2c_write16(st, ad799x_threshold_reg(chan, dir, info), - val); + val << chan->scan_type.shift); mutex_unlock(&indio_dev->mlock); return ret; @@@ -451,7 -455,8 +454,8 @@@ static int ad799x_read_event_value(stru mutex_unlock(&indio_dev->mlock); if (ret < 0) return ret; - *val = valin; + *val = (valin >> chan->scan_type.shift) & + RES_MASK(chan->scan_type.realbits); return IIO_VAL_INT; } diff --combined drivers/staging/tidspbridge/core/tiomap3430.c index bf952ef7e696,cb50120ed7b5..f63dd8f4dde9 --- a/drivers/staging/tidspbridge/core/tiomap3430.c +++ b/drivers/staging/tidspbridge/core/tiomap3430.c @@@ -280,8 -280,10 +280,10 @@@ static int bridge_brd_monitor(struct br OMAP3430_IVA2_MOD, OMAP2_CM_CLKSTCTRL); /* Wait until the state has moved to ON */ - while (*pdata->dsp_prm_read(OMAP3430_IVA2_MOD, OMAP2_PM_PWSTST)& - OMAP_INTRANSITION_MASK); + while ((*pdata->dsp_prm_read)(OMAP3430_IVA2_MOD, + OMAP2_PM_PWSTST) & + OMAP_INTRANSITION_MASK) + ; /* Disable Automatic transition */ (*pdata->dsp_cm_write)(OMAP34XX_CLKSTCTRL_DISABLE_AUTO, OMAP3430_IVA2_MOD, OMAP2_CM_CLKSTCTRL); @@@ -1057,7 -1059,6 +1059,7 @@@ static int bridge_brd_mem_copy(struct b u32 total_bytes = ul_num_bytes; u8 host_buf[BUFFERSIZE]; struct bridge_dev_context *dev_context = dev_ctxt; + while (total_bytes > 0 && !status) { copy_bytes = total_bytes > BUFFERSIZE ? BUFFERSIZE : total_bytes; @@@ -1095,7 -1096,6 +1097,7 @@@ static int bridge_brd_mem_write(struct struct bridge_dev_context *dev_context = dev_ctxt; u32 ul_remain_bytes = 0; u32 ul_bytes = 0; + ul_remain_bytes = ul_num_bytes; while (ul_remain_bytes > 0 && !status) { ul_bytes =