Merge tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging/IIO updates from Greg KH: "Here is the big staging tree update for 4.12-rc1. It's a big one, adding about 350k new lines of crap^Wcode, mostly all in a big dump of media drivers from Intel. But there's other new drivers in here as well, yet-another-wifi driver, new IIO drivers, and a new crypto accelerator. We also deleted a bunch of stuff, mostly in patch cleanups, but also the Android ION code has shrunk a lot, and the Android low memory killer driver was finally deleted, much to the celebration of the -mm developers. All of these have been in linux-next with a few build issues that will show up when you merge to your tree" Merge conflicts in the new rtl8723bs driver (due to the wifi changes this merge window) handled as per linux-next, courtesy of Stephen Rothwell. * tag 'staging-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1182 commits) staging: fsl-mc/dpio: add cpu <--> LE conversion for dpaa2_fd staging: ks7010: remove line continuations in quoted strings staging: vt6656: use tabs instead of spaces staging: android: ion: Fix unnecessary initialization of static variable staging: media: atomisp: fix range checking on clk_num staging: media: atomisp: fix misspelled word in comment staging: media: atomisp: kmap() can't fail staging: atomisp: remove #ifdef for runtime PM functions staging: atomisp: satm include directory is gone atomisp: remove some more unused files atomisp: remove hmm_load/store/clear indirections atomisp: kill off mmgr_free atomisp: clean up the hmm init/cleanup indirections atomisp: handle allocation calls before init in the hmm layer staging: fsl-dpaa2/eth: Add maintainer for Ethernet driver staging: fsl-dpaa2/eth: Add TODO file staging: fsl-dpaa2/eth: Add trace points staging: fsl-dpaa2/eth: Add driver specific stats staging: fsl-dpaa2/eth: Add ethtool support staging: fsl-dpaa2/eth: Add Freescale DPAA2 Ethernet driver ...
No related branches found
No related tags found
Showing
- .mailmap 1 addition, 0 deletions.mailmap
- Documentation/ABI/testing/sysfs-bus-iio 17 additions, 2 deletionsDocumentation/ABI/testing/sysfs-bus-iio
- Documentation/ABI/testing/sysfs-bus-iio-adc-max9611 17 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-iio-adc-max9611
- Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8 8 additions, 16 deletionsDocumentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8
- Documentation/ABI/testing/sysfs-bus-iio-timer-stm32 67 additions, 4 deletionsDocumentation/ABI/testing/sysfs-bus-iio-timer-stm32
- Documentation/devicetree/bindings/iio/accel/adxl345.txt 38 additions, 0 deletionsDocumentation/devicetree/bindings/iio/accel/adxl345.txt
- Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt 2 additions, 0 deletions...tion/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt
- Documentation/devicetree/bindings/iio/adc/aspeed_adc.txt 20 additions, 0 deletionsDocumentation/devicetree/bindings/iio/adc/aspeed_adc.txt
- Documentation/devicetree/bindings/iio/adc/cpcap-adc.txt 18 additions, 0 deletionsDocumentation/devicetree/bindings/iio/adc/cpcap-adc.txt
- Documentation/devicetree/bindings/iio/adc/ltc2497.txt 13 additions, 0 deletionsDocumentation/devicetree/bindings/iio/adc/ltc2497.txt
- Documentation/devicetree/bindings/iio/adc/max1118.txt 21 additions, 0 deletionsDocumentation/devicetree/bindings/iio/adc/max1118.txt
- Documentation/devicetree/bindings/iio/adc/max9611.txt 27 additions, 0 deletionsDocumentation/devicetree/bindings/iio/adc/max9611.txt
- Documentation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt 42 additions, 34 deletions...ntation/devicetree/bindings/iio/adc/qcom,pm8xxx-xoadc.txt
- Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt 1 addition, 0 deletions...mentation/devicetree/bindings/iio/adc/rockchip-saradc.txt
- Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt 4 additions, 0 deletionsDocumentation/devicetree/bindings/iio/adc/st,stm32-adc.txt
- Documentation/devicetree/bindings/iio/dac/ltc2632.txt 23 additions, 0 deletionsDocumentation/devicetree/bindings/iio/dac/ltc2632.txt
- Documentation/devicetree/bindings/iio/dac/st,stm32-dac.txt 61 additions, 0 deletionsDocumentation/devicetree/bindings/iio/dac/st,stm32-dac.txt
- Documentation/devicetree/bindings/iio/health/max30102.txt 30 additions, 0 deletionsDocumentation/devicetree/bindings/iio/health/max30102.txt
- Documentation/devicetree/bindings/iio/imu/inv_mpu6050.txt 25 additions, 2 deletionsDocumentation/devicetree/bindings/iio/imu/inv_mpu6050.txt
- Documentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt 2 additions, 0 deletionsDocumentation/devicetree/bindings/iio/imu/st_lsm6dsx.txt
Loading
Please register or sign in to comment