diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-18 14:27:25 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-05-18 14:27:25 +1000 |
| commit | 621a2a0fb6688af5dce47d60a6d4b5a19ae2c2e4 (patch) | |
| tree | 90b25130cee804d97cbffb414ead061261e43d5e | |
| parent | 835519b7469b21256b1a65404a7e306996e9296a (diff) | |
| download | linux-next-621a2a0fb6688af5dce47d60a6d4b5a19ae2c2e4.tar.gz | |
Add linux-next specific files for 20160518next-20160518
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 238 | ||||
| -rw-r--r-- | Next/Trees | 240 | ||||
| -rw-r--r-- | Next/merge.log | 11400 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 11883 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..9d663cc62231 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,238 @@ +Name SHA1 +---- ---- +origin 7f427d3a6029331304f91ef4d7cf646f054216d2 +fixes b507146bb6b9ac0c0197100ba3e299825a21fed3 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 44549e8f5eea4e0a41b487b63e616cb089922b99 +arm-current ec953b70f368330e806a94df6fe2dd1d72176b2d +m68k-current 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +powerpc-fixes b4c112114aab9aff5ed4568ca5e662bb02cdfe74 +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 33656a1f2ee5346c742d63ddd0e0970c95a56b70 +net 2dcd0af568b0cf583645c8a317dd12e344b1c72a +ipsec d6af1a31cc72fbd558c7eddbc36f61bf09d1cf6a +ipvs f28f20da704d399fb1e4d8838ffd697a357d9cc8 +wireless-drivers cbbba30f1ac95a04aae9c61a55aebe5e6fdf29f0 +mac80211 e6436be21e77e3659b4ff7e357ab5a8342d132d2 +sound-current c7c5856b6f6f30de622bf87947363890b286553f +pci-current 9a2a5a638f8eb9c612a7a9af0afab93f506f6ba4 +driver-core.current c3b46c73264b03000d1e18b22f5caf63332547c9 +tty.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +usb.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +usb-gadget-fixes 38740a5b87d53ceb89eb2c970150f6e94e00373a +usb-serial-fixes 74d2a91aec97ab832790c9398d320413ad185321 +usb-chipidea-fixes d144dfea8af7108f613139623e63952ed7e69c0c +staging.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +char-misc.current 44549e8f5eea4e0a41b487b63e616cb089922b99 +input-current 23ea5967d6bd30ed59480edbc5fe21eec81682a3 +crypto-current 4a6b27b79da5ccc6b85dc05bbe6a091e58be896a +ide 1993b176a8224e371e0732ffada7ab9eb3b0912b +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 8244062ef1e54502ef55f54cced659913f244c3e +vfio-fixes 8160c4e455820d5008a1116d2dca35f0363bb062 +kselftest-fixes 505ce68c6da3432454c62e43c24a22ea5b1d754b +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 2dcd0af568b0cf583645c8a317dd12e344b1c72a +asm-generic b0da6d44157aa6e652de7634343708251ba64146 +arc 445a64214285073ebc02af633a8a149e1522b7cb +arm b6810489fa29e6fbd131051892c6e521aa712463 +arm-perf 4ba2578fa7b557012b8f59ad7a9284ff15394338 +arm-soc 83e0a1672eb5e5c691612d9494d2079393ff096a +at91 5a0d7c6a48ae60c41304858c6e885e3daeb8a083 +bcm2835-dt 896ad420db8d5ec4cc4727b786d15e28eb59b366 +bcm2835-soc 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-drivers 92e963f50fc74041b5e9e744c330dca48e04f08d +bcm2835-defconfig 3652bb35abf6ee11333cbec1d2855c1c0f9f6b27 +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs 63b44471754bc0c7a1fbb6b430d0c7cdd091ee7a +keystone 02e15d23400608a9843a66c0b5fc4f3d6dd80b50 +mvebu 01316cded75be7e2ec0976179e027a3cc8c61a08 +omap 5c66191b5c76526317b70177cc09f84f8f96c066 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 100b83d52f51b08c62abe108e78db0278285ee16 +renesas e5c640c6f9cc42174510a1e5a8cd573f3fcddac1 +rockchip a108aca0c77fa96b2561da9bc31ff2bb124b9b66 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 92e963f50fc74041b5e9e744c330dca48e04f08d +samsung-krzk 05e8e9a8696c442926ff0f7e34f893745e49c36c +tegra 5c282bc9d0a37e247d203b515a90909c45e82547 +arm64 e6d9a52543338603e25e71e0e4942f05dae0dd8a +blackfin 391e74a51ea2ce54f4d4a213a207a6bfb73e0b33 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 8cad489261c564d4ee1db4de4ac365af56807d8a +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 787ca32dc704bde981760de01a3a7e6ce9835fdb +m68k 9a6462763b170bd22be707d5d9e2b8ba8cc4028e +m68knommu 44156affd1844bdfd90cc791cf5fdb6f9a04e238 +metag 096a8b6d5e7ab9f8ca3d2474b3ca6a1fe79e0371 +microblaze 52e9e6e05617264e6e609a8699098380d6b7a6aa +mips 2c93cd0d5d69c40f28bb7be703cd35083fb5c799 +nios2 1a0f29e06356733ba2a5826ae7d19863f86f46ff +parisc-hd 695499920489eba7e610bc938921c989a1fd2435 +powerpc 1d4e89cf0a4e819fbde428e9e5286e7141a02e06 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 1eef33bec12d7e46a58f12b3604556a80c362a0d +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 c53db5222b92d1df384a89ceba7808f8e4c535dd +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 4ef00aa30a3f382de9530df8f4083da316d95fb6 +uml ad32a1f3c36b046b2e7b0361b88c18e3af61419e +unicore32 c83d8b2fc98606ac6a9a0cb5f42908488314ea22 +xtensa 9da8320bb97768e35f2e64fa7642015271d672eb +btrfs bb7ab3b92e46da06b580c6f83abe7894dc449cca +btrfs-kdave a3a7fdf24a89df4e83fc1081e50c815a1ec09227 +ceph d3767f0faeda5abdf205f947ae912d48dc70fa06 +cifs 897fba1172d637d344f009d700f7eb8a1fa262f1 +configfs 96c22a3293512ba684e73a981196430f524689da +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 2a28900be20640fcd1e548b1e3bad79e8221fcf9 +ext4 12735f881952c32b31bc4e433768f18489f79ec9 +f2fs f1d934769e092b37814c49438e72a9bf288b0262 +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 4441f63ab7e581ae460c9f7e06fba8a2be192e81 +gfs2 68cd4ce2caf22a81833eb1abfa075eb1cc39bfe2 +jfs 6ed71e9819ac3412fc6a3495f5ce141df274c916 +nfs 44549e8f5eea4e0a41b487b63e616cb089922b99 +nfsd d9e4084f6c9746e51a78a4d7ebf4983023289b32 +orangefs e56f49814250f4ca4b66ec7d3a71152846761d1b +overlayfs 41523ff335f44bde380af00c9735ab847441a671 +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs c27cb97218b3e72417ffc5e73dce488844017b39 +xfs d8bdd04e309b1b56939f44f9ad14038b9a6dd2e8 +file-locks 5af9c2e19da6514a1a50b07d97d93b74a7711873 +vfs 16a9fad4ef80ba18d84615eec1a6286b9d71e909 +pci e257ef55ce51d7ec399193ee85acda8b8759d930 +hid 185a9cac5b1e3914ca48848339fc4431ab3e77c7 +i2c d3e47ff44331cfae8e0ca588c606388a6bf54032 +jdelvare-hwmon f02de116250d4ac6137cd3255be7d1f5678ac460 +dmi c3db05ecf8acef3e4ae9436d357a067052061eb0 +hwmon-staging d6a442df63b2f0043c0b4fc05504ac4ded96ae80 +v4l-dvb 73dfb701d254a270984dd8658b9e008fa3ce7b0b +pm 16490980e396fac079248b23b1dd81e7d48bebf3 +idle f55532a0c0b8bb6148f4e07853b876ef73bc69ca +thermal f1ba9eb85b5e2ad79a3fcd594c6fe4d6956fd163 +thermal-soc ddc8fdc6e2f06aabdbb9dc4a5e01ca793cd2e285 +ieee1394 384fbb96f9268eee0b703b39cb07557403bd9aac +dlm 82c7d823cc31cf56d964eebe1f91aaf1691cddce +swiotlb 386744425e35e04984c6e741c7750fd6eef1a9df +slave-dma 628b5139c906e1b875bc2a275288362a8e01791a +net-next 917fa5353da05e8a0045b8acacba8d50400d5b12 +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 698e2a8dca98e4de32f3f630e6d9cd93753c52e1 +wireless-drivers-next 52776a700b53969345a3cc5daed1c797d016a188 +bluetooth 27896c83fe94e2190f121a2fdbffffbf1d83d573 +mac80211-next 4f45bb3e8a8f26b683a814cb9523d5a0775de81f +rdma 94d7f1a255db84233a2da70b27d9abf9c0a57135 +rdma-leon 2dcd0af568b0cf583645c8a317dd12e344b1c72a +rdma-leon-test 2dcd0af568b0cf583645c8a317dd12e344b1c72a +mtd 20c07a5bf094198ff2382aa5e7c930b3c9807792 +l2-mtd e5366a266a8cd4cd6b0fe66876462cca2e1c6a89 +nand 666b65683dad9aa90efaa4aad24ef3710101e3aa +crypto 256b1cfb9a346bb4808cd27b7b8f9b120f96491e +drm 7c10ddf87472c07eabc206e273dc59f77c700858 +drm-panel 227e4f4079e198695b9b5df344aa0e29676a5a29 +drm-intel 5b4fd5b1111b1230cd037df3b314e7b36d45d483 +drm-tegra 057eab2013ecbba2e772293acc177e2e3210f05d +drm-misc 255f0e7c418ad95a4baeda017ae6182ba9b3c423 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2b669875332fbdff0a7ad559e8662e875e7a1526 +hdlcd 69c2565a3cca3d79572941d62165af7805d72762 +drm-vc4 efea172891fc32928291a633c17a146338a73ba9 +sunxi ed490b3ebfa4717e0c39f83efee069815ad9d0e6 +kbuild 9ef4c6a22724eef083fb0357b77686672a035a35 +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap d4ab78d7076d2a58a2d690b2f4a03a24d978ac1c +sound 6971ce4134174b9772ed79ff7747696eab087d30 +sound-asoc 02496e5e762f7f8218b0473eb44d7c0008d472a9 +modules e2d1248432c4bc8b3e4cdfc13074acbce3a749cd +input d96caf8c33cad42b5eabcf1b686dd91581e306f4 +block 661806a319890962aaa839dc1dbf7ea356aa6b92 +lightnvm 2a65aee4011bd3a372ce23681ceb3a6960a96c8c +device-mapper 202bae52934d4eb79ffaebf49f49b1cc64d8e40b +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc-uh 57da0c042f4af52614f4bd1a148155a299ae5cd8 +md 1fa9a1ad0a9db3c745fe0c1bfa73fd87901fd7f3 +mfd 68b21094ef9ba3ef0dd8b1e24b03e00cd3b34e26 +backlight 60d613d6aef4ae49988eeb3ad38af948c561db1e +battery 4a99fa06a8ca27a5187636e630568658000af575 +omap_dss2 ffe1b6c453ef49e6fcf31c23636333aa4e65aa47 +regulator 6b3f657e5e3eb83a06a5808d69b705e7fdf0b98a +security b937190c40de0f6f07f592042e3097b16c6b0130 +integrity 05d1a717ec0430c916a749b94eb90ab74bbfa356 +keys 75aeddd12f205d07b36ed76db3426e974b8f2a21 +selinux b937190c40de0f6f07f592042e3097b16c6b0130 +tpmdd e8f2f45a4402deb715220b750d892f7a70b0f868 +watchdog ae67643edc6edcab41d8d5d35cb796416b253a01 +iommu 6c0b43df74f900e7f31a49d1844f166df0f8afc6 +dwmw2-iommu 22e2f9fa63b092923873fc8a52955151f4d83274 +vfio 5ed4aba1265f3c7532bf4ae1f25a277568b86871 +jc_docs 9f8036643dd9609b329aa1b89c9a95981e9ba62f +trivial 52bbe141f37f093e2c612e97c40d27422e5a1fdf +audit 188e3c5cd2b672620291e64a21f1598fe91e40b6 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh 4da8d6f6abe7ea23112b16113ef97adaafaff2e1 +mailbox c430cf376fee0b03d9c9293615f9737649de1b12 +spi 80862e3d2e65780d831eb6699d00e8b4ca380cd1 +tip 139f278f8e96885cb571ca57e93f89a4f16deb09 +clockevents cee77c2c5b5764f4a2a8eb14a7343e0d0376f723 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 3f37a36b6282621d7c5a99b6911275f989766996 +irqchip a66ce4b7d9d20b59afe0a898fa0b4faf0651fbcd +ftrace 0fc1b09ff1ff404ddf753f5ffa5cd0adc8fdcdc9 +rcu d9eccc08671bf1902874107ce07bd8a5a0703431 +kvm c4a8de357ef1916c38e4419c0bafad86ca4fbcf7 +kvm-arm 06485053244480f5f403d8f89b8617bd7d549113 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus b1a4286b8f3393857a205ec89607683161b75f90 +kvms390 60a37709ce603da62d0b60699b713558b4cfd513 +xen-tip 51c2a7526e5443b37a0ee902171797c14d509c08 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues f1e89a8f335824eeb720701e17fdc933a40fa605 +drivers-x86 9a73a6895fc56a39445757d5a1589c2041bfeb1e +chrome-platform 9e96aa70e9acd03eee61c2094b4755b80a386c47 +hsi c2f90a465df75254fb41bf6e7975464929c21e26 +leds 80d6737b27bbdf645a815c136606836b435f0268 +ipmi a1b4e31bfabb3172c78890b0a03a050fad082b1c +driver-core c6e360a0d9d282e9c8688dcdabdc3669912b66ef +tty d20bb59af64667a16f2468b54fc0adb2f824a3b6 +usb 60d5794fe5a50d02f4a0df84b45910a4dfa8b487 +usb-gadget 2a58f9c12bb360f38fb39e470bb5ff94014356e6 +usb-serial b923c6c62981cec5e2d2187fd700c2fc4386fc45 +usb-chipidea-next 764763f0a0c81cbed4d2c7dc2b05e7173ff85b5b +staging ffc83a79b44e02995ab5e93af07e26f6c7243c53 +char-misc 725d0123dfff3d7b666cf57f5d29c50addfc99d3 +extcon 453fc627c7b58b9fde0e50739f6b40bf5af20f46 +cgroup a6b18f07bc86141f6a4bf1cdf4825d80408c78c9 +scsi 02714f2c73a6113c78dee31645db6bffa2196dfb +target-updates 8f0dfb3d8b1120c61f6e2cc3729290db10772b2d +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +libata a857423325111e6c9d089e87d6c05d8152e0c5e0 +pinctrl 58d73d264a025fda557128dfc6ad526b97b4e836 +vhost e00f7bd221292b318d4d09c3f0c2c8af9b1e5edf +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg 0259cd1b6496a8b54cc588ec0fc416eda6034262 +gpio d30a2b47d4c2b75573d93f60655d48ba8e3ed2b3 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 4295ada2fe8749bb1708630bd6aa7ebde8cb30dd +dma-buf 12566cc35d0e68308bde7aad615743d560cb097b +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest f55532a0c0b8bb6148f4e07853b876ef73bc69ca +clk 9ffee1c4be7c1981e47e520172638a4b00881880 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest 6eab37daf0ec1077fd612ff27ab513db20f33767 +y2038 4b277763c5b3ce6d60168797e6f38260416d9b13 +luto-misc afd2ff9b7e1b367172f18ba7f693dfb62bdcb2dc +borntraeger b562e44f507e863c6792946e4e1b1449fbbac85d +livepatching 6d9122078097233dbfc4ad3a45512393cddf8540 +coresight f85f84cd36afd949150227bf5957a2755eed7dd8 +rtc 854ec813cc23df88cee39dc2295aa5d3aaa53489 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm e897b3cc7a5a50a5f2a571e1a9a7a88f63b63450 +dax-misc 314f3d553c66e0f8de196bdeaa1a227f74878ebc +akpm-current a758ba8622449cb31893a0030d0dada82cfb9315 +akpm 00e984c3a3ea20cdaf22ff5355f50d8a01a81ce7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..46698321ba58 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,240 @@ +Trees included into this release: + +Name Type URL +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#master +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#rc-fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +powerpc-merge-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +devicetree-current git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/merge +rr-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#fixes +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835-dt git git://github.com/anholt/linux.git#bcm2835-dt-next +bcm2835-soc git git://github.com/anholt/linux.git#bcm2835-soc-next +bcm2835-drivers git git://github.com/anholt/linux.git#bcm2835-drivers-next +bcm2835-defconfig git git://github.com/anholt/linux.git#bcm2835-defconfig-next +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +blackfin git http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git#for-linus +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-mpe git git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/czankel/xtensa-linux.git#for_next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/linux/kernel/git/dgc/linux-xfs.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +v4l-dvb git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +rdma-leon git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#rdma-next +rdma-leon-test git git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma.git#testing/rdma-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm-intel#topic/drm-misc +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +drm-vc4 git git://github.com/anholt/linux.git#drm-vc4-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild.git#for-next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git#master +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.infradead.org/battery-2.6.git#master +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +jc_docs git git://git.lwn.net/linux.git#docs-next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git#devicetree/next +dt-rh git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-ppc git git://github.com/agraf/linux-2.6.git#kvm-ppc-next +kvm-ppc-paulus git git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc.git#kvm-ppc-next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://git.code.sf.net/p/openipmi/linux-ipmi#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +remoteproc git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc.git#for-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +akpm-current mmotm http://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm http://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..af15e3b1b6a1 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,11400 @@ +$ date -R +Wed, 18 May 2016 07:51:06 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at cf6ed9a6682d Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip +Merging origin/master (7f427d3a6029 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge origin/master +Updating cf6ed9a6682d..7f427d3a6029 +Fast-forward + Documentation/DocBook/crypto-API.tmpl | 6 +- + Documentation/acpi/initrd_table_override.txt | 65 +- + Documentation/arm64/booting.txt | 4 + + .../bindings/arm/altera/socfpga-eccmgr.txt | 50 + + Documentation/devicetree/bindings/arm/pmu.txt | 3 +- + .../devicetree/bindings/crypto/fsl-imx-scc.txt | 21 + + .../devicetree/bindings/crypto/samsung-sss.txt | 6 +- + .../bindings/devfreq/event/exynos-nocp.txt | 26 + + .../devicetree/bindings/devfreq/exynos-bus.txt | 409 ++++ + .../devicetree/bindings/hwmon/ltc2978.txt | 1 + + .../bindings/interrupt-controller/arm,gic-v3.txt | 34 +- + .../interrupt-controller/fsl,ls-scfg-msi.txt | 30 + + Documentation/devicetree/bindings/leds/common.txt | 3 + + .../devicetree/bindings/leds/leds-gpio.txt | 2 + + Documentation/devicetree/bindings/mmc/sdhci-st.txt | 4 +- + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 3 + + .../devicetree/bindings/mmc/usdhi6rol0.txt | 6 + + Documentation/devicetree/bindings/numa.txt | 275 +++ + .../bindings/power/rockchip-io-domain.txt | 4 +- + .../bindings/regulator/max8973-regulator.txt | 7 + + .../devicetree/bindings/regulator/pv88080.txt | 49 + + .../bindings/regulator/qcom,spmi-regulator.txt | 37 + + .../bindings/regulator/regulator-max77620.txt | 22 + + .../bindings/regulator/ti-abb-regulator.txt | 10 +- + .../bindings/regulator/twl-regulator.txt | 6 + + Documentation/devicetree/bindings/rng/hisi-rng.txt | 12 + + .../devicetree/bindings/timer/arm,mps2-timer.txt | 28 + + Documentation/filesystems/porting | 53 + + Documentation/hwmon/fam15h_power | 65 +- + Documentation/hwmon/it87 | 15 +- + Documentation/hwmon/max31722 | 34 + + Documentation/kernel-parameters.txt | 24 +- + Documentation/trace/ftrace.txt | 10 +- + Documentation/x86/pat.txt | 32 + + MAINTAINERS | 26 +- + arch/alpha/kernel/osf_sys.c | 4 +- + arch/arm/Kconfig | 2 + + arch/arm/boot/dts/imx25.dtsi | 9 + + arch/arm/include/asm/cpuidle.h | 2 +- + arch/arm/include/asm/kvm_host.h | 10 +- + arch/arm/include/asm/kvm_mmu.h | 1 + + arch/arm/include/asm/mmu_context.h | 3 + + arch/arm/kernel/cpuidle.c | 6 +- + arch/arm/kvm/arm.c | 118 +- + arch/arm/kvm/mmu.c | 5 + + arch/arm/mach-berlin/berlin.c | 6 - + arch/arm/mach-davinci/devices-da8xx.c | 20 - + arch/arm/mach-davinci/devices.c | 16 - + arch/arm/mach-exynos/exynos.c | 29 - + arch/arm/mach-imx/imx27-dt.c | 10 - + arch/arm/mach-imx/mach-imx51.c | 3 - + arch/arm/mach-imx/mach-imx53.c | 2 - + arch/arm/mach-imx/mach-imx7d.c | 6 - + arch/arm/mach-lpc32xx/phy3250.c | 1 - + arch/arm/mach-mvebu/pmsu.c | 85 - + arch/arm/mach-omap2/pm.c | 7 +- + arch/arm/mach-pxa/raumfeld.c | 12 +- + arch/arm/mach-rockchip/rockchip.c | 1 - + arch/arm/mach-shmobile/Makefile | 1 - + arch/arm/mach-shmobile/common.h | 7 - + arch/arm/mach-shmobile/cpufreq.c | 19 - + arch/arm/mach-socfpga/core.h | 2 + + arch/arm/mach-socfpga/l2_cache.c | 49 + + arch/arm/mach-socfpga/ocram.c | 133 ++ + arch/arm/mach-socfpga/socfpga.c | 12 +- + arch/arm/mach-sunxi/sunxi.c | 9 - + arch/arm/mach-tegra/board-paz00.c | 6 +- + arch/arm/mach-zynq/common.c | 2 - + arch/arm64/Kconfig | 45 +- + arch/arm64/Kconfig.debug | 2 +- + arch/arm64/boot/dts/broadcom/vulcan.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + arch/arm64/include/asm/assembler.h | 133 +- + arch/arm64/include/asm/cpufeature.h | 27 +- + arch/arm64/include/asm/elf.h | 3 +- + arch/arm64/include/asm/kernel-pgtable.h | 21 +- + arch/arm64/include/asm/kvm_arm.h | 11 - + arch/arm64/include/asm/kvm_asm.h | 3 + + arch/arm64/include/asm/kvm_host.h | 14 +- + arch/arm64/include/asm/kvm_mmu.h | 1 + + arch/arm64/include/asm/memory.h | 33 +- + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/mmzone.h | 12 + + arch/arm64/include/asm/numa.h | 45 + + arch/arm64/include/asm/page.h | 2 + + arch/arm64/include/asm/pgtable-hwdef.h | 1 - + arch/arm64/include/asm/pgtable-types.h | 32 - + arch/arm64/include/asm/pgtable.h | 62 +- + arch/arm64/include/asm/smp.h | 11 + + arch/arm64/include/asm/suspend.h | 32 +- + arch/arm64/include/asm/sysreg.h | 24 +- + arch/arm64/include/asm/topology.h | 10 + + arch/arm64/include/asm/virt.h | 22 + + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/acpi.c | 33 +- + arch/arm64/kernel/asm-offsets.c | 10 +- + arch/arm64/kernel/cpu_errata.c | 24 +- + arch/arm64/kernel/cpufeature.c | 343 +-- + arch/arm64/kernel/cpuidle.c | 9 +- + arch/arm64/kernel/cpuinfo.c | 40 +- + arch/arm64/kernel/debug-monitors.c | 3 +- + arch/arm64/kernel/efi-entry.S | 2 +- + arch/arm64/kernel/head.S | 165 +- + arch/arm64/kernel/hibernate-asm.S | 176 ++ + arch/arm64/kernel/hibernate.c | 487 +++++ + arch/arm64/kernel/hw_breakpoint.c | 8 +- + arch/arm64/kernel/hyp-stub.S | 45 +- + arch/arm64/kernel/image.h | 2 + + arch/arm64/kernel/insn.c | 2 +- + arch/arm64/kernel/kaslr.c | 6 +- + arch/arm64/kernel/pci.c | 10 + + arch/arm64/kernel/perf_event.c | 553 +++-- + arch/arm64/kernel/process.c | 18 +- + arch/arm64/kernel/setup.c | 81 +- + arch/arm64/kernel/sleep.S | 157 +- + arch/arm64/kernel/smp.c | 78 +- + arch/arm64/kernel/suspend.c | 102 +- + arch/arm64/kernel/sys.c | 10 + + arch/arm64/kernel/vdso.c | 4 +- + arch/arm64/kernel/vmlinux.lds.S | 48 +- + arch/arm64/kvm/handle_exit.c | 7 + + arch/arm64/kvm/hyp-init.S | 48 +- + arch/arm64/kvm/hyp.S | 11 +- + arch/arm64/kvm/hyp/entry.S | 19 + + arch/arm64/kvm/hyp/hyp-entry.S | 10 +- + arch/arm64/kvm/reset.c | 30 + + arch/arm64/mm/Makefile | 1 + + arch/arm64/mm/cache.S | 2 - + arch/arm64/mm/context.c | 3 +- + arch/arm64/mm/dma-mapping.c | 56 +- + arch/arm64/mm/dump.c | 52 +- + arch/arm64/mm/fault.c | 87 +- + arch/arm64/mm/init.c | 112 +- + arch/arm64/mm/mm.h | 1 - + arch/arm64/mm/mmap.c | 2 - + arch/arm64/mm/mmu.c | 24 +- + arch/arm64/mm/numa.c | 396 ++++ + arch/arm64/mm/proc-macros.S | 98 - + arch/arm64/mm/proc.S | 56 +- + arch/ia64/include/asm/iommu.h | 1 - + arch/m68k/bvme6000/rtc.c | 2 +- + arch/m68k/mvme16x/rtc.c | 2 +- + arch/metag/include/asm/atomic_lnkget.h | 2 +- + arch/metag/kernel/ftrace.c | 1 - + arch/metag/kernel/perf/perf_event.c | 3 + + arch/nios2/include/asm/io.h | 1 - + arch/nios2/include/asm/page.h | 2 +- + arch/nios2/include/asm/pgtable.h | 2 +- + arch/openrisc/include/asm/page.h | 2 - + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/sh/boards/board-sh7757lcr.c | 1 - + arch/sh/boards/mach-ap325rxa/setup.c | 1 - + arch/sh/boards/mach-ecovec24/setup.c | 1 - + arch/sh/boards/mach-kfr2r09/setup.c | 1 - + arch/sh/boards/mach-migor/setup.c | 1 - + arch/sh/boards/mach-se/7724/setup.c | 1 - + arch/x86/Kconfig | 72 +- + arch/x86/Makefile | 3 +- + arch/x86/boot/Makefile | 13 +- + arch/x86/boot/compressed/Makefile | 23 +- + arch/x86/boot/compressed/aslr.c | 339 --- + arch/x86/boot/compressed/cmdline.c | 4 +- + arch/x86/boot/compressed/error.c | 22 + + arch/x86/boot/compressed/error.h | 7 + + arch/x86/boot/compressed/head_32.S | 22 +- + arch/x86/boot/compressed/head_64.S | 19 +- + arch/x86/boot/compressed/kaslr.c | 510 +++++ + arch/x86/boot/compressed/misc.c | 188 +- + arch/x86/boot/compressed/misc.h | 27 +- + arch/x86/boot/compressed/mkpiggy.c | 34 +- + arch/x86/boot/compressed/pagetable.c | 129 ++ + arch/x86/boot/compressed/string.c | 37 +- + arch/x86/boot/compressed/vmlinux.lds.S | 1 + + arch/x86/boot/early_serial_console.c | 4 + + arch/x86/boot/header.S | 109 +- + arch/x86/configs/x86_64_defconfig | 1 + + arch/x86/crypto/aesni-intel_glue.c | 2 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 5 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 4 +- + arch/x86/crypto/chacha20_glue.c | 3 +- + arch/x86/crypto/poly1305_glue.c | 5 +- + arch/x86/crypto/serpent_avx2_glue.c | 2 +- + arch/x86/crypto/serpent_sse2_glue.c | 2 +- + arch/x86/crypto/sha-mb/sha1_mb.c | 4 +- + arch/x86/crypto/sha1_ssse3_glue.c | 2 +- + arch/x86/crypto/sha256_ssse3_glue.c | 2 +- + arch/x86/crypto/sha512_ssse3_glue.c | 2 +- + arch/x86/entry/common.c | 2 +- + arch/x86/entry/entry_32.S | 7 - + arch/x86/entry/entry_64.S | 21 +- + arch/x86/entry/entry_64_compat.S | 45 +- + arch/x86/entry/syscalls/syscall_64.tbl | 2 + + arch/x86/entry/vdso/vclock_gettime.c | 15 - + arch/x86/entry/vdso/vdso-layout.lds.S | 5 +- + arch/x86/entry/vdso/vma.c | 11 - + arch/x86/events/core.c | 4 +- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/ia32/ia32_signal.c | 2 +- + arch/x86/include/asm/alternative.h | 35 +- + arch/x86/include/asm/apic.h | 4 +- + arch/x86/include/asm/bios_ebda.h | 21 - + arch/x86/include/asm/boot.h | 39 +- + arch/x86/include/asm/clocksource.h | 9 +- + arch/x86/include/asm/compat.h | 4 +- + arch/x86/include/asm/cpufeature.h | 25 - + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/elf.h | 6 +- + arch/x86/include/asm/hugetlb.h | 2 +- + arch/x86/include/asm/irq_work.h | 2 +- + arch/x86/include/asm/kgdb.h | 2 + + arch/x86/include/asm/linkage.h | 34 - + arch/x86/include/asm/mmu_context.h | 101 +- + arch/x86/include/asm/msr.h | 20 +- + arch/x86/include/asm/mtrr.h | 6 +- + arch/x86/include/asm/page.h | 5 + + arch/x86/include/asm/page_64_types.h | 8 +- + arch/x86/include/asm/paravirt.h | 56 +- + arch/x86/include/asm/paravirt_types.h | 20 +- + arch/x86/include/asm/pat.h | 2 +- + arch/x86/include/asm/pgtable.h | 2 +- + arch/x86/include/asm/processor.h | 13 +- + arch/x86/include/asm/segment.h | 49 +- + arch/x86/include/asm/setup.h | 1 + + arch/x86/include/asm/switch_to.h | 4 +- + arch/x86/include/asm/text-patching.h | 40 + + arch/x86/include/asm/thread_info.h | 2 +- + arch/x86/include/asm/tlbflush.h | 2 +- + arch/x86/include/asm/tsc.h | 2 +- + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/include/asm/uv/bios.h | 59 +- + arch/x86/include/asm/uv/uv_bau.h | 2 +- + arch/x86/include/asm/uv/uv_hub.h | 409 +++- + arch/x86/include/asm/uv/uv_mmrs.h | 2207 +++++++++++++++---- + arch/x86/include/asm/x86_init.h | 50 + + arch/x86/include/asm/xor_32.h | 2 +- + arch/x86/include/asm/xor_avx.h | 4 +- + arch/x86/include/uapi/asm/bootparam.h | 41 +- + arch/x86/kernel/Makefile | 6 +- + arch/x86/kernel/acpi/boot.c | 18 +- + arch/x86/kernel/alternative.c | 1 + + arch/x86/kernel/apic/apic.c | 32 +- + arch/x86/kernel/apic/apic_noop.c | 4 +- + arch/x86/kernel/apic/io_apic.c | 2 +- + arch/x86/kernel/apic/ipi.c | 2 +- + arch/x86/kernel/apic/vector.c | 2 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 850 ++++++-- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/asm-offsets.c | 1 + + arch/x86/kernel/cpu/amd.c | 20 +- + arch/x86/kernel/cpu/common.c | 82 +- + arch/x86/kernel/cpu/cyrix.c | 2 +- + arch/x86/kernel/cpu/intel.c | 14 +- + arch/x86/kernel/cpu/mcheck/mce_intel.c | 2 +- + arch/x86/kernel/cpu/mcheck/therm_throt.c | 2 +- + arch/x86/kernel/cpu/mtrr/cyrix.c | 4 +- + arch/x86/kernel/cpu/mtrr/generic.c | 28 +- + arch/x86/kernel/cpu/mtrr/main.c | 13 +- + arch/x86/kernel/cpu/mtrr/mtrr.h | 1 + + arch/x86/kernel/cpu/vmware.c | 2 +- + arch/x86/kernel/devicetree.c | 2 +- + arch/x86/kernel/dumpstack.c | 19 +- + arch/x86/kernel/{head.c => ebda.c} | 2 +- + arch/x86/kernel/fpu/bugs.c | 16 +- + arch/x86/kernel/fpu/core.c | 50 +- + arch/x86/kernel/fpu/init.c | 16 +- + arch/x86/kernel/fpu/regset.c | 25 +- + arch/x86/kernel/fpu/xstate.c | 18 +- + arch/x86/kernel/head32.c | 2 + + arch/x86/kernel/head64.c | 1 + + arch/x86/kernel/head_32.S | 116 +- + arch/x86/kernel/head_64.S | 103 +- + arch/x86/kernel/hpet.c | 3 +- + arch/x86/kernel/jump_label.c | 1 + + arch/x86/kernel/kgdb.c | 1 + + arch/x86/kernel/kprobes/core.c | 1 + + arch/x86/kernel/kprobes/opt.c | 1 + + arch/x86/kernel/kvm.c | 10 +- + arch/x86/kernel/module.c | 1 + + arch/x86/kernel/paravirt.c | 7 +- + arch/x86/kernel/pci-iommu_table.c | 2 +- + arch/x86/kernel/platform-quirks.c | 35 + + arch/x86/kernel/process_64.c | 241 +-- + arch/x86/kernel/ptrace.c | 50 +- + arch/x86/kernel/rtc.c | 18 +- + arch/x86/kernel/setup.c | 12 +- + arch/x86/kernel/signal.c | 6 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/tboot.c | 6 - + arch/x86/kernel/tce_64.c | 2 +- + arch/x86/kernel/tls.c | 42 + + arch/x86/kernel/traps.c | 1 + + arch/x86/kernel/tsc.c | 33 +- + arch/x86/kernel/uprobes.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 2 +- + arch/x86/kvm/cpuid.c | 2 +- + arch/x86/kvm/mmu.c | 3 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/kvm/trace.h | 3 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 16 +- + arch/x86/lguest/boot.c | 3 - + arch/x86/lib/usercopy_32.c | 4 +- + arch/x86/mm/Makefile | 3 +- + arch/x86/mm/extable.c | 96 +- + arch/x86/mm/hugetlbpage.c | 4 +- + arch/x86/mm/ident_map.c | 79 + + arch/x86/mm/init.c | 8 +- + arch/x86/mm/init_32.c | 5 +- + arch/x86/mm/init_64.c | 78 +- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/pageattr.c | 4 +- + arch/x86/mm/pat.c | 109 +- + arch/x86/mm/tlb.c | 116 + + arch/x86/oprofile/nmi_int.c | 6 +- + arch/x86/oprofile/op_model_ppro.c | 2 +- + arch/x86/pci/acpi.c | 1 - + arch/x86/pci/xen.c | 2 +- + arch/x86/platform/efi/quirks.c | 2 +- + arch/x86/platform/uv/bios_uv.c | 48 +- + arch/x86/platform/uv/tlb_uv.c | 38 +- + arch/x86/platform/uv/uv_sysfs.c | 2 +- + arch/x86/platform/uv/uv_time.c | 6 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/tools/calc_run_size.sh | 42 - + arch/x86/xen/enlighten.c | 52 +- + crypto/algif_aead.c | 268 ++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/drbg.c | 39 +- + crypto/lzo.c | 2 +- + crypto/testmgr.c | 9 + + drivers/acpi/Kconfig | 12 +- + drivers/acpi/Makefile | 3 +- + drivers/acpi/acpi_amba.c | 3 +- + drivers/acpi/acpi_apd.c | 3 +- + drivers/acpi/acpi_video.c | 83 +- + drivers/acpi/acpica/Makefile | 2 + + drivers/acpi/acpica/acdebug.h | 10 +- + drivers/acpi/acpica/acevents.h | 3 +- + drivers/acpi/acpica/acglobal.h | 11 + + drivers/acpi/acpica/acinterp.h | 4 +- + drivers/acpi/acpica/aclocal.h | 62 +- + drivers/acpi/acpica/acmacros.h | 21 +- + drivers/acpi/acpica/acnamesp.h | 5 +- + drivers/acpi/acpica/acparser.h | 2 +- + drivers/acpi/acpica/acpredef.h | 14 +- + drivers/acpi/acpica/acresrc.h | 12 +- + drivers/acpi/acpica/acstruct.h | 2 +- + drivers/acpi/acpica/actables.h | 2 - + drivers/acpi/acpica/acutils.h | 58 +- + drivers/acpi/acpica/dbcmds.c | 4 +- + drivers/acpi/acpica/dbconvert.c | 8 +- + drivers/acpi/acpica/dbexec.c | 2 +- + drivers/acpi/acpica/dbinput.c | 19 +- + drivers/acpi/acpica/dbnames.c | 4 +- + drivers/acpi/acpica/dbutils.c | 9 +- + drivers/acpi/acpica/dbxface.c | 4 +- + drivers/acpi/acpica/dscontrol.c | 4 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 2 +- + drivers/acpi/acpica/dsutils.c | 2 +- + drivers/acpi/acpica/dswload.c | 4 +- + drivers/acpi/acpica/dswload2.c | 4 +- + drivers/acpi/acpica/dswstate.c | 10 +- + drivers/acpi/acpica/evgpe.c | 4 +- + drivers/acpi/acpica/evgpeblk.c | 4 +- + drivers/acpi/acpica/evgpeutil.c | 4 +- + drivers/acpi/acpica/evhandler.c | 2 +- + drivers/acpi/acpica/evmisc.c | 3 +- + drivers/acpi/acpica/evregion.c | 74 +- + drivers/acpi/acpica/evrgnini.c | 3 +- + drivers/acpi/acpica/evxfgpe.c | 2 +- + drivers/acpi/acpica/exconcat.c | 439 ++++ + drivers/acpi/acpica/exconfig.c | 4 +- + drivers/acpi/acpica/exconvrt.c | 8 +- + drivers/acpi/acpica/excreate.c | 2 +- + drivers/acpi/acpica/exdump.c | 15 +- + drivers/acpi/acpica/exfield.c | 4 +- + drivers/acpi/acpica/exfldio.c | 14 +- + drivers/acpi/acpica/exmisc.c | 290 --- + drivers/acpi/acpica/exnames.c | 2 +- + drivers/acpi/acpica/exoparg3.c | 8 +- + drivers/acpi/acpica/exoparg6.c | 2 +- + drivers/acpi/acpica/exregion.c | 6 +- + drivers/acpi/acpica/exresnte.c | 4 +- + drivers/acpi/acpica/exresolv.c | 2 +- + drivers/acpi/acpica/exresop.c | 4 +- + drivers/acpi/acpica/exstorob.c | 4 +- + drivers/acpi/acpica/exutils.c | 12 +- + drivers/acpi/acpica/hwgpe.c | 6 +- + drivers/acpi/acpica/hwregs.c | 291 ++- + drivers/acpi/acpica/hwxface.c | 11 +- + drivers/acpi/acpica/nsaccess.c | 7 +- + drivers/acpi/acpica/nsconvert.c | 9 +- + drivers/acpi/acpica/nsdump.c | 9 +- + drivers/acpi/acpica/nsinit.c | 76 +- + drivers/acpi/acpica/nsload.c | 2 +- + drivers/acpi/acpica/nsnames.c | 2 +- + drivers/acpi/acpica/nsobject.c | 4 +- + drivers/acpi/acpica/nsprepkg.c | 92 + + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 6 +- + drivers/acpi/acpica/nsutils.c | 8 +- + drivers/acpi/acpica/nsxfeval.c | 113 +- + drivers/acpi/acpica/nsxfname.c | 6 +- + drivers/acpi/acpica/nsxfobj.c | 6 +- + drivers/acpi/acpica/psargs.c | 2 +- + drivers/acpi/acpica/psopinfo.c | 2 +- + drivers/acpi/acpica/psparse.c | 4 +- + drivers/acpi/acpica/psutils.c | 2 +- + drivers/acpi/acpica/psxface.c | 2 +- + drivers/acpi/acpica/rscalc.c | 90 +- + drivers/acpi/acpica/rscreate.c | 2 +- + drivers/acpi/acpica/rsdump.c | 50 +- + drivers/acpi/acpica/rsdumpinfo.c | 9 +- + drivers/acpi/acpica/rsmisc.c | 2 +- + drivers/acpi/acpica/rsserial.c | 21 +- + drivers/acpi/acpica/rsutils.c | 14 +- + drivers/acpi/acpica/rsxface.c | 6 +- + drivers/acpi/acpica/tbdata.c | 15 +- + drivers/acpi/acpica/tbfadt.c | 28 +- + drivers/acpi/acpica/tbfind.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 6 +- + drivers/acpi/acpica/tbutils.c | 33 +- + drivers/acpi/acpica/tbxface.c | 6 +- + drivers/acpi/acpica/tbxfload.c | 2 +- + drivers/acpi/acpica/tbxfroot.c | 8 +- + drivers/acpi/acpica/utalloc.c | 5 +- + drivers/acpi/acpica/utascii.c | 140 ++ + drivers/acpi/acpica/utbuffer.c | 24 +- + drivers/acpi/acpica/utcache.c | 7 +- + drivers/acpi/acpica/utcopy.c | 16 +- + drivers/acpi/acpica/utdebug.c | 47 +- + drivers/acpi/acpica/utdecode.c | 30 +- + drivers/acpi/acpica/uteval.c | 4 +- + drivers/acpi/acpica/utglobal.c | 48 + + drivers/acpi/acpica/utids.c | 8 +- + drivers/acpi/acpica/utmath.c | 4 +- + drivers/acpi/acpica/utmisc.c | 2 +- + drivers/acpi/acpica/utnonansi.c | 67 +- + drivers/acpi/acpica/utobject.c | 18 +- + drivers/acpi/acpica/utosi.c | 4 +- + drivers/acpi/acpica/utownerid.c | 6 +- + drivers/acpi/acpica/utprint.c | 19 +- + drivers/acpi/acpica/utstring.c | 71 +- + drivers/acpi/acpica/uttrack.c | 2 +- + drivers/acpi/acpica/utxface.c | 4 +- + drivers/acpi/blacklist.c | 196 +- + drivers/acpi/bus.c | 39 +- + drivers/acpi/device_sysfs.c | 44 +- + drivers/acpi/ec.c | 241 +-- + drivers/acpi/evged.c | 154 ++ + drivers/acpi/internal.h | 3 +- + drivers/acpi/numa.c | 16 +- + drivers/acpi/osi.c | 522 +++++ + drivers/acpi/osl.c | 505 +---- + drivers/acpi/pci_link.c | 131 +- + drivers/acpi/sleep.c | 7 + + drivers/acpi/sysfs.c | 7 +- + drivers/acpi/tables.c | 316 ++- + drivers/acpi/utils.c | 6 +- + drivers/acpi/video_detect.c | 2 +- + drivers/base/platform.c | 19 +- + drivers/base/power/clock_ops.c | 2 +- + drivers/base/power/domain.c | 145 +- + drivers/base/power/domain_governor.c | 20 +- + drivers/base/power/main.c | 18 +- + drivers/base/power/opp/Makefile | 1 + + drivers/base/power/opp/core.c | 440 +--- + drivers/base/power/opp/cpu.c | 199 +- + drivers/base/power/opp/of.c | 591 +++++ + drivers/base/power/opp/opp.h | 14 + + drivers/base/power/runtime.c | 9 +- + drivers/base/property.c | 34 +- + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache.c | 2 +- + drivers/char/hw_random/Kconfig | 29 +- + drivers/char/hw_random/Makefile | 2 +- + drivers/char/hw_random/exynos-rng.c | 33 +- + drivers/char/hw_random/hisi-rng.c | 126 ++ + drivers/char/hw_random/ppc4xx-rng.c | 147 -- + drivers/char/ipmi/ipmi_si_intf.c | 65 +- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/clocksource/Kconfig | 6 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/dw_apb_timer.c | 1 + + drivers/clocksource/mps2-timer.c | 275 +++ + drivers/clocksource/mtk_timer.c | 2 +- + drivers/clocksource/tegra20_timer.c | 14 - + drivers/cpufreq/Kconfig | 45 + + drivers/cpufreq/Kconfig.arm | 9 - + drivers/cpufreq/Kconfig.x86 | 1 + + drivers/cpufreq/Makefile | 4 +- + drivers/cpufreq/acpi-cpufreq.c | 129 +- + drivers/cpufreq/arm_big_little.c | 54 +- + drivers/cpufreq/arm_big_little.h | 4 +- + drivers/cpufreq/arm_big_little_dt.c | 21 +- + drivers/cpufreq/cppc_cpufreq.c | 21 + + drivers/cpufreq/cpufreq-dt-platdev.c | 94 + + drivers/cpufreq/cpufreq-dt.c | 22 +- + drivers/cpufreq/cpufreq-nforce2.c | 28 +- + drivers/cpufreq/cpufreq.c | 164 +- + drivers/cpufreq/cpufreq_conservative.c | 25 +- + drivers/cpufreq/cpufreq_governor.c | 271 +-- + drivers/cpufreq/cpufreq_governor.h | 46 +- + drivers/cpufreq/cpufreq_governor_attr_set.c | 84 + + drivers/cpufreq/cpufreq_ondemand.c | 29 +- + drivers/cpufreq/cpufreq_userspace.c | 43 +- + drivers/cpufreq/e_powersaver.c | 76 +- + drivers/cpufreq/elanfreq.c | 4 +- + drivers/cpufreq/hisi-acpu-cpufreq.c | 42 - + drivers/cpufreq/ia64-acpi-cpufreq.c | 10 +- + drivers/cpufreq/intel_pstate.c | 303 ++- + drivers/cpufreq/longhaul.c | 86 +- + drivers/cpufreq/loongson2_cpufreq.c | 7 +- + drivers/cpufreq/maple-cpufreq.c | 11 +- + drivers/cpufreq/mt8173-cpufreq.c | 14 +- + drivers/cpufreq/mvebu-cpufreq.c | 107 + + drivers/cpufreq/omap-cpufreq.c | 7 +- + drivers/cpufreq/p4-clockmod.c | 19 +- + drivers/cpufreq/pmac32-cpufreq.c | 14 +- + drivers/cpufreq/pmac64-cpufreq.c | 47 +- + drivers/cpufreq/powernow-k6.c | 16 +- + drivers/cpufreq/powernow-k7.c | 70 +- + drivers/cpufreq/powernv-cpufreq.c | 272 ++- + drivers/cpufreq/ppc_cbe_cpufreq.h | 2 +- + drivers/cpufreq/ppc_cbe_cpufreq_pmi.c | 15 +- + drivers/cpufreq/pxa2xx-cpufreq.c | 18 +- + drivers/cpufreq/qoriq-cpufreq.c | 9 +- + drivers/cpufreq/s3c2412-cpufreq.c | 15 +- + drivers/cpufreq/s3c2440-cpufreq.c | 6 +- + drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 4 +- + drivers/cpufreq/s3c24xx-cpufreq.c | 59 +- + drivers/cpufreq/s5pv210-cpufreq.c | 10 +- + drivers/cpufreq/sc520_freq.c | 10 +- + drivers/cpufreq/scpi-cpufreq.c | 47 +- + drivers/cpufreq/speedstep-centrino.c | 6 +- + drivers/cpufreq/speedstep-ich.c | 8 +- + drivers/cpufreq/speedstep-lib.c | 11 +- + drivers/cpufreq/speedstep-smi.c | 7 +- + drivers/cpufreq/tegra124-cpufreq.c | 7 - + drivers/cpufreq/vexpress-spc-cpufreq.c | 4 +- + drivers/cpuidle/cpuidle.c | 14 +- + drivers/crypto/Kconfig | 27 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/amcc/Makefile | 1 + + drivers/crypto/amcc/crypto4xx_core.c | 7 +- + drivers/crypto/amcc/crypto4xx_core.h | 4 + + drivers/crypto/amcc/crypto4xx_reg_def.h | 1 + + drivers/crypto/amcc/crypto4xx_trng.c | 131 ++ + drivers/crypto/amcc/crypto4xx_trng.h | 34 + + drivers/crypto/caam/jr.c | 2 +- + drivers/crypto/ccp/Kconfig | 2 + + drivers/crypto/ccp/Makefile | 6 +- + drivers/crypto/ccp/ccp-dev-v3.c | 13 +- + drivers/crypto/ccp/ccp-dev.c | 2 +- + drivers/crypto/ccp/ccp-dev.h | 49 +- + drivers/crypto/ccp/ccp-dmaengine.c | 727 +++++++ + drivers/crypto/ccp/ccp-ops.c | 69 +- + drivers/crypto/marvell/cesa.c | 10 +- + drivers/crypto/marvell/hash.c | 3 +- + drivers/crypto/marvell/tdma.c | 5 +- + drivers/crypto/mxc-scc.c | 765 +++++++ + drivers/crypto/n2_core.c | 2 +- + drivers/crypto/omap-aes.c | 62 +- + drivers/crypto/omap-des.c | 165 +- + drivers/crypto/omap-sham.c | 25 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 4 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 23 - + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 6 +- + drivers/crypto/qat/qat_c62x/adf_drv.c | 4 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 23 - + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 6 +- + drivers/crypto/qat/qat_common/Makefile | 4 +- + drivers/crypto/qat/qat_common/adf_admin.c | 2 +- + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 2 - + drivers/crypto/qat/qat_common/adf_common_drv.h | 28 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 40 +- + drivers/crypto/qat/qat_common/adf_init.c | 15 +- + drivers/crypto/qat/qat_common/adf_isr.c | 4 +- + drivers/crypto/qat/qat_common/adf_sriov.c | 8 +- + drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 92 + + drivers/crypto/qat/qat_common/adf_vf_isr.c | 61 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 4 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 4 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 23 - + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 6 +- + drivers/crypto/s5p-sss.c | 368 ++-- + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 10 +- + drivers/crypto/talitos.c | 64 + + drivers/crypto/vmx/ppc-xlate.pl | 20 + + drivers/devfreq/Kconfig | 36 +- + drivers/devfreq/Makefile | 4 +- + drivers/devfreq/devfreq-event.c | 5 + + drivers/devfreq/devfreq.c | 207 +- + drivers/devfreq/event/Kconfig | 8 + + drivers/devfreq/event/Makefile | 2 + + drivers/devfreq/event/exynos-nocp.c | 304 +++ + drivers/devfreq/event/exynos-nocp.h | 78 + + drivers/devfreq/exynos-bus.c | 570 +++++ + drivers/devfreq/exynos/Makefile | 3 - + drivers/devfreq/exynos/exynos4_bus.c | 1055 --------- + drivers/devfreq/exynos/exynos4_bus.h | 110 - + drivers/devfreq/exynos/exynos5_bus.c | 431 ---- + drivers/devfreq/exynos/exynos_ppmu.c | 119 - + drivers/devfreq/exynos/exynos_ppmu.h | 86 - + drivers/devfreq/governor_passive.c | 205 ++ + drivers/edac/Kconfig | 5 +- + drivers/edac/altera_edac.c | 412 +++- + drivers/edac/altera_edac.h | 128 ++ + drivers/edac/amd64_edac.c | 129 +- + drivers/edac/amd64_edac.h | 2 +- + drivers/edac/edac_mc.c | 2 +- + drivers/edac/edac_mc_sysfs.c | 3 +- + drivers/edac/i7core_edac.c | 81 +- + drivers/edac/ie31200_edac.c | 121 +- + drivers/edac/sb_edac.c | 222 +- + drivers/firmware/efi/arm-init.c | 8 + + drivers/firmware/efi/libstub/arm64-stub.c | 15 +- + drivers/firmware/efi/libstub/fdt.c | 24 +- + drivers/firmware/psci.c | 2 +- + drivers/gpu/drm/drm_cache.c | 6 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- + drivers/hwmon/Kconfig | 15 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ads7828.c | 10 + + drivers/hwmon/fam15h_power.c | 215 +- + drivers/hwmon/it87.c | 2281 +++++++++++--------- + drivers/hwmon/max31722.c | 165 ++ + drivers/hwmon/sch5636.c | 2 +- + drivers/idle/intel_idle.c | 137 ++ + drivers/input/joystick/analog.c | 6 +- + drivers/iommu/irq_remapping.c | 2 +- + drivers/irqchip/Kconfig | 9 + + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-alpine-msi.c | 2 +- + drivers/irqchip/irq-bcm2836.c | 10 +- + drivers/irqchip/irq-crossbar.c | 2 +- + drivers/irqchip/irq-gic-common.c | 20 +- + drivers/irqchip/irq-gic-v2m.c | 19 +- + drivers/irqchip/irq-gic-v3-its.c | 42 +- + drivers/irqchip/irq-gic-v3.c | 195 +- + drivers/irqchip/irq-gic.c | 327 ++- + drivers/irqchip/irq-lpc32xx.c | 238 ++ + drivers/irqchip/irq-ls-scfg-msi.c | 240 ++ + drivers/irqchip/irq-mbigen.c | 4 +- + drivers/irqchip/irq-partition-percpu.c | 256 +++ + drivers/irqchip/irq-tegra.c | 2 +- + drivers/leds/Kconfig | 5 +- + drivers/leds/led-triggers.c | 2 +- + drivers/leds/leds-gpio.c | 4 + + drivers/leds/leds-ss4200.c | 13 + + drivers/leds/leds-tca6507.c | 2 + + drivers/leds/leds.h | 1 + + drivers/leds/trigger/Kconfig | 18 + + drivers/leds/trigger/Makefile | 2 + + drivers/leds/trigger/ledtrig-ide-disk.c | 3 +- + drivers/leds/trigger/ledtrig-mtd.c | 45 + + drivers/leds/trigger/ledtrig-panic.c | 77 + + drivers/lguest/x86/core.c | 2 +- + drivers/mfd/intel-lpss-acpi.c | 12 +- + drivers/mfd/intel-lpss-pci.c | 20 +- + drivers/mfd/intel-lpss.c | 2 +- + drivers/mfd/intel-lpss.h | 4 +- + drivers/mfd/mfd-core.c | 4 +- + drivers/misc/sgi-gru/grukservices.c | 38 +- + drivers/mmc/card/block.c | 45 +- + drivers/mmc/core/Kconfig | 21 + + drivers/mmc/core/Makefile | 4 +- + drivers/mmc/core/core.c | 12 +- + drivers/mmc/core/host.c | 22 +- + drivers/mmc/core/mmc.c | 64 +- + drivers/mmc/core/pwrseq.c | 108 +- + drivers/mmc/core/pwrseq.h | 19 +- + drivers/mmc/core/pwrseq_emmc.c | 81 +- + drivers/mmc/core/pwrseq_simple.c | 91 +- + drivers/mmc/core/sdio_cis.c | 7 +- + drivers/mmc/host/Kconfig | 4 +- + drivers/mmc/host/atmel-mci.c | 9 - + drivers/mmc/host/davinci_mmc.c | 151 +- + drivers/mmc/host/dw_mmc-exynos.c | 23 +- + drivers/mmc/host/dw_mmc-rockchip.c | 43 +- + drivers/mmc/host/dw_mmc.c | 11 +- + drivers/mmc/host/dw_mmc.h | 2 - + drivers/mmc/host/mmci.c | 20 - + drivers/mmc/host/mtk-sd.c | 19 +- + drivers/mmc/host/omap.c | 48 +- + drivers/mmc/host/omap_hsmmc.c | 90 +- + drivers/mmc/host/sdhci-acpi.c | 9 +- + drivers/mmc/host/sdhci-of-arasan.c | 26 +- + drivers/mmc/host/sdhci-of-at91.c | 74 +- + drivers/mmc/host/sdhci-pci-core.c | 9 +- + drivers/mmc/host/sdhci-pic32.c | 1 - + drivers/mmc/host/sdhci-pltfm.c | 42 +- + drivers/mmc/host/sdhci.c | 320 ++- + drivers/mmc/host/sdhci.h | 10 +- + drivers/mmc/host/sh_mmcif.c | 74 +- + drivers/mmc/host/sh_mobile_sdhi.c | 194 +- + drivers/mmc/host/tmio_mmc.h | 75 +- + drivers/mmc/host/tmio_mmc_dma.c | 1 - + drivers/mmc/host/tmio_mmc_pio.c | 196 +- + drivers/mmc/host/toshsd.c | 1 + + drivers/mmc/host/usdhi6rol0.c | 60 +- + drivers/mtd/mtdcore.c | 19 + + drivers/mtd/nand/nand_base.c | 29 +- + drivers/net/hamradio/baycom_epp.c | 8 +- + drivers/of/Kconfig | 3 + + drivers/of/Makefile | 1 + + drivers/of/of_numa.c | 211 ++ + drivers/platform/x86/acer-wmi.c | 16 +- + drivers/platform/x86/eeepc-wmi.c | 24 +- + drivers/pnp/pnpbios/core.c | 3 +- + drivers/power/avs/rockchip-io-domain.c | 10 +- + drivers/powercap/intel_rapl.c | 2 + + drivers/pwm/core.c | 21 +- + drivers/pwm/pwm-clps711x.c | 2 +- + drivers/pwm/pwm-pxa.c | 2 +- + drivers/regulator/Kconfig | 17 + + drivers/regulator/Makefile | 8 +- + drivers/regulator/act8865-regulator.c | 113 +- + drivers/regulator/as3722-regulator.c | 65 +- + drivers/regulator/core.c | 279 ++- + drivers/regulator/fan53555.c | 24 + + drivers/regulator/helpers.c | 2 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/lp873x-regulator.c | 241 +++ + .../regulator/{max14577.c => max14577-regulator.c} | 0 + drivers/regulator/max77620-regulator.c | 83 +- + drivers/regulator/max77686-regulator.c | 17 +- + .../regulator/{max77693.c => max77693-regulator.c} | 0 + drivers/regulator/max77802-regulator.c | 2 +- + drivers/regulator/max8973-regulator.c | 97 + + .../regulator/{max8997.c => max8997-regulator.c} | 2 +- + drivers/regulator/of_regulator.c | 6 +- + drivers/regulator/palmas-regulator.c | 67 +- + drivers/regulator/pv88080-regulator.c | 419 ++++ + drivers/regulator/pv88080-regulator.h | 92 + + drivers/regulator/pwm-regulator.c | 78 +- + drivers/regulator/qcom_spmi-regulator.c | 275 ++- + drivers/regulator/rk808-regulator.c | 310 +-- + drivers/regulator/s2mps11.c | 13 +- + drivers/regulator/tps6524x-regulator.c | 2 +- + drivers/regulator/twl-regulator.c | 106 +- + drivers/soc/qcom/spm.c | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 4 +- + .../staging/lustre/lustre/llite/llite_internal.h | 4 +- + drivers/staging/lustre/lustre/llite/xattr.c | 6 +- + drivers/staging/unisys/visorbus/visorchipset.c | 2 +- + drivers/thermal/Kconfig | 28 +- + drivers/thermal/int340x_thermal/Kconfig | 42 + + drivers/thermal/int340x_thermal/Makefile | 1 + + drivers/thermal/int340x_thermal/int3406_thermal.c | 236 ++ + drivers/video/backlight/backlight.c | 39 +- + fs/9p/acl.c | 8 +- + fs/9p/vfs_dir.c | 4 +- + fs/9p/vfs_inode.c | 2 +- + fs/9p/xattr.c | 4 +- + fs/affs/dir.c | 2 +- + fs/afs/dir.c | 16 +- + fs/autofs4/root.c | 4 +- + fs/bad_inode.c | 4 +- + fs/befs/befs.h | 4 +- + fs/befs/btree.c | 16 +- + fs/befs/btree.h | 4 +- + fs/befs/datastream.c | 26 +- + fs/befs/datastream.h | 11 +- + fs/befs/linuxvfs.c | 6 +- + fs/bfs/dir.c | 2 +- + fs/btrfs/acl.c | 3 - + fs/btrfs/inode.c | 2 +- + fs/btrfs/ioctl.c | 18 +- + fs/btrfs/tree-log.c | 6 +- + fs/btrfs/xattr.c | 6 +- + fs/ceph/acl.c | 2 + + fs/ceph/super.h | 2 +- + fs/ceph/xattr.c | 8 +- + fs/cifs/cifs_dfs_ref.c | 2 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/inode.c | 3 +- + fs/cifs/readdir.c | 57 +- + fs/cifs/xattr.c | 56 +- + fs/coda/dir.c | 18 +- + fs/compat.c | 12 +- + fs/configfs/dir.c | 37 +- + fs/configfs/inode.c | 2 +- + fs/cramfs/inode.c | 2 +- + fs/dcache.c | 267 ++- + fs/ecryptfs/crypto.c | 37 +- + fs/ecryptfs/ecryptfs_kernel.h | 7 +- + fs/ecryptfs/file.c | 2 +- + fs/ecryptfs/inode.c | 30 +- + fs/ecryptfs/mmap.c | 3 +- + fs/ecryptfs/super.c | 5 +- + fs/efs/dir.c | 3 +- + fs/efs/namei.c | 2 +- + fs/exofs/dir.c | 16 +- + fs/exofs/super.c | 2 +- + fs/exportfs/expfs.c | 12 +- + fs/ext2/acl.c | 3 - + fs/ext2/dir.c | 16 +- + fs/ext2/namei.c | 2 +- + fs/ext2/xattr_security.c | 6 +- + fs/ext2/xattr_trusted.c | 6 +- + fs/ext2/xattr_user.c | 8 +- + fs/ext4/acl.c | 3 - + fs/ext4/dir.c | 4 +- + fs/ext4/namei.c | 4 +- + fs/ext4/xattr_security.c | 6 +- + fs/ext4/xattr_trusted.c | 6 +- + fs/ext4/xattr_user.c | 8 +- + fs/f2fs/acl.c | 3 - + fs/f2fs/dir.c | 2 +- + fs/f2fs/namei.c | 2 +- + fs/f2fs/xattr.c | 14 +- + fs/fat/dir.c | 6 +- + fs/file.c | 5 + + fs/freevxfs/vxfs_lookup.c | 2 +- + fs/fuse/dir.c | 99 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/inode.c | 9 +- + fs/gfs2/ops_fstype.c | 4 +- + fs/gfs2/super.c | 2 +- + fs/gfs2/xattr.c | 6 +- + fs/hfs/attr.c | 5 +- + fs/hfs/catalog.c | 3 + + fs/hfs/dir.c | 12 +- + fs/hfs/hfs_fs.h | 5 +- + fs/hfs/inode.c | 2 + + fs/hfsplus/catalog.c | 3 + + fs/hfsplus/dir.c | 12 +- + fs/hfsplus/hfsplus_fs.h | 1 + + fs/hfsplus/inode.c | 1 + + fs/hfsplus/posix_acl.c | 3 - + fs/hfsplus/super.c | 1 + + fs/hfsplus/xattr.c | 10 +- + fs/hfsplus/xattr.h | 2 +- + fs/hfsplus/xattr_security.c | 6 +- + fs/hfsplus/xattr_trusted.c | 6 +- + fs/hfsplus/xattr_user.c | 6 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/dir.c | 12 +- + fs/hpfs/dnode.c | 8 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/inode.c | 17 +- + fs/isofs/dir.c | 4 +- + fs/jffs2/acl.c | 2 - + fs/jffs2/dir.c | 4 +- + fs/jffs2/security.c | 6 +- + fs/jffs2/super.c | 2 +- + fs/jffs2/xattr_trusted.c | 6 +- + fs/jffs2/xattr_user.c | 6 +- + fs/jfs/acl.c | 6 - + fs/jfs/jfs_xattr.h | 2 +- + fs/jfs/namei.c | 2 +- + fs/jfs/xattr.c | 8 +- + fs/kernfs/dir.c | 17 +- + fs/kernfs/inode.c | 6 +- + fs/kernfs/kernfs-internal.h | 4 +- + fs/kernfs/mount.c | 5 +- + fs/libfs.c | 11 +- + fs/logfs/dir.c | 4 +- + fs/minix/dir.c | 2 +- + fs/namei.c | 387 ++-- + fs/nfs/dir.c | 80 +- + fs/nfs/direct.c | 2 +- + fs/nfs/inode.c | 4 +- + fs/nfs/nfs3acl.c | 43 +- + fs/nfs/nfs4proc.c | 14 +- + fs/nfs/nfstrace.h | 2 +- + fs/nfs/unlink.c | 192 +- + fs/nfsd/nfs3proc.c | 4 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nilfs2/dir.c | 16 +- + fs/nilfs2/namei.c | 2 +- + fs/ocfs2/aops.c | 4 +- + fs/ocfs2/dlmglue.c | 3 + + fs/ocfs2/file.c | 2 +- + fs/ocfs2/inode.c | 2 +- + fs/ocfs2/xattr.c | 20 +- + fs/omfs/dir.c | 2 +- + fs/open.c | 2 +- + fs/openpromfs/inode.c | 2 +- + fs/orangefs/file.c | 4 +- + fs/orangefs/orangefs-kernel.h | 4 +- + fs/orangefs/xattr.c | 10 +- + fs/overlayfs/inode.c | 4 +- + fs/overlayfs/overlayfs.h | 4 +- + fs/overlayfs/readdir.c | 4 +- + fs/overlayfs/super.c | 2 +- + fs/posix_acl.c | 116 +- + fs/proc/base.c | 35 +- + fs/proc/fd.c | 8 +- + fs/proc/generic.c | 2 +- + fs/proc/namespaces.c | 3 +- + fs/proc/proc_net.c | 2 +- + fs/proc/proc_sysctl.c | 17 +- + fs/proc/root.c | 4 +- + fs/qnx4/dir.c | 2 +- + fs/qnx6/dir.c | 2 +- + fs/read_write.c | 12 - + fs/readdir.c | 37 +- + fs/reiserfs/dir.c | 2 +- + fs/reiserfs/file.c | 6 +- + fs/reiserfs/ioctl.c | 6 +- + fs/reiserfs/namei.c | 18 +- + fs/reiserfs/xattr.c | 54 - + fs/reiserfs/xattr.h | 9 +- + fs/reiserfs/xattr_acl.c | 8 +- + fs/reiserfs/xattr_security.c | 19 +- + fs/reiserfs/xattr_trusted.c | 19 +- + fs/reiserfs/xattr_user.c | 19 +- + fs/romfs/super.c | 4 +- + fs/squashfs/dir.c | 4 +- + fs/squashfs/xattr.c | 6 +- + fs/sysv/dir.c | 2 +- + fs/ubifs/dir.c | 2 +- + fs/ubifs/ubifs.h | 4 +- + fs/ubifs/xattr.c | 6 +- + fs/udf/dir.c | 2 +- + fs/udf/namei.c | 2 +- + fs/ufs/dir.c | 16 +- + fs/ufs/super.c | 2 +- + fs/xattr.c | 12 +- + fs/xfs/xfs_acl.c | 20 +- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_xattr.c | 6 +- + include/acpi/acpi_bus.h | 2 +- + include/acpi/acpi_drivers.h | 1 - + include/acpi/acpiosxf.h | 10 +- + include/acpi/acpixf.h | 25 +- + include/acpi/acrestyp.h | 1 + + include/acpi/actbl.h | 4 +- + include/acpi/actbl1.h | 74 +- + include/acpi/actbl2.h | 39 +- + include/acpi/actbl3.h | 66 +- + include/acpi/actypes.h | 48 +- + include/acpi/platform/acenv.h | 44 +- + include/acpi/platform/acmsvcex.h | 54 - + include/acpi/platform/acwinex.h | 49 - + include/acpi/video.h | 20 + + include/asm-generic/vmlinux.lds.h | 4 +- + include/crypto/aead.h | 3 +- + include/crypto/hash.h | 3 +- + include/crypto/skcipher.h | 3 +- + include/linux/acpi.h | 13 +- + include/linux/apple-gmux.h | 2 +- + include/linux/backlight.h | 3 +- + include/linux/ccp.h | 36 +- + include/linux/clocksource.h | 1 + + include/linux/cpu.h | 18 - + include/linux/cpufreq-dt.h | 22 - + include/linux/cpufreq.h | 54 + + include/linux/cpuhotplug.h | 2 + + include/linux/cpumask.h | 6 +- + include/linux/crypto.h | 3 +- + include/linux/dcache.h | 26 +- + include/linux/devfreq.h | 99 + + include/linux/device.h | 5 - + include/linux/file.h | 13 + + include/linux/fs.h | 51 +- + include/linux/irq.h | 4 + + include/linux/irqchip/arm-gic-v3.h | 2 - + include/linux/irqchip/irq-partition-percpu.h | 59 + + include/linux/irqdesc.h | 1 + + include/linux/irqdomain.h | 20 +- + include/linux/leds.h | 8 + + include/linux/lockdep.h | 23 +- + include/linux/lsm_hooks.h | 5 +- + include/linux/mfd/as3722.h | 1 + + include/linux/mfd/core.h | 4 +- + include/linux/mfd/samsung/core.h | 3 + + include/linux/mfd/tmio.h | 4 +- + include/linux/mm.h | 6 +- + include/linux/mmc/dw_mmc.h | 12 +- + include/linux/mmc/host.h | 31 +- + include/linux/mmc/sh_mobile_sdhi.h | 10 - + include/linux/mmc/tmio.h | 71 - + include/linux/mmu_context.h | 7 + + include/linux/mtd/mtd.h | 12 +- + include/linux/nfs_fs.h | 11 +- + include/linux/nfs_xdr.h | 4 +- + include/linux/of.h | 9 + + include/linux/perf/arm_pmu.h | 2 + + include/linux/platform_device.h | 6 +- + include/linux/pm.h | 2 +- + include/linux/pm_domain.h | 6 +- + include/linux/pm_opp.h | 62 +- + include/linux/pm_runtime.h | 6 + + include/linux/pnp.h | 2 + + include/linux/posix_acl.h | 1 - + include/linux/property.h | 15 +- + include/linux/pwm.h | 33 + + include/linux/regulator/act8865.h | 2 + + include/linux/regulator/consumer.h | 4 +- + include/linux/regulator/driver.h | 7 +- + include/linux/regulator/machine.h | 1 + + include/linux/regulator/max8973-regulator.h | 5 + + include/linux/sched.h | 129 +- + include/linux/security.h | 20 +- + include/linux/timekeeping.h | 17 +- + include/linux/xattr.h | 5 +- + include/trace/events/ext4.h | 6 +- + include/trace/events/mmc.h | 182 ++ + kernel/audit_watch.c | 2 +- + kernel/cpu.c | 32 +- + kernel/irq/ipi.c | 45 +- + kernel/irq/irqdesc.c | 26 +- + kernel/irq/irqdomain.c | 19 +- + kernel/irq/manage.c | 2 +- + kernel/locking/lockdep.c | 71 +- + kernel/power/swap.c | 18 + + kernel/sched/Makefile | 1 + + kernel/sched/clock.c | 48 +- + kernel/sched/core.c | 749 ++++--- + kernel/sched/cpuacct.c | 147 +- + kernel/sched/cpudeadline.c | 4 +- + kernel/sched/cpufreq.c | 48 +- + kernel/sched/cpufreq_schedutil.c | 530 +++++ + kernel/sched/cpupri.c | 4 +- + kernel/sched/deadline.c | 55 +- + kernel/sched/debug.c | 10 +- + kernel/sched/fair.c | 513 +++-- + kernel/sched/idle_task.c | 2 +- + kernel/sched/loadavg.c | 11 +- + kernel/sched/rt.c | 38 +- + kernel/sched/sched.h | 148 +- + kernel/sched/stop_task.c | 2 +- + kernel/time/tick-sched.c | 9 +- + kernel/time/time.c | 8 +- + kernel/trace/power-traces.c | 1 + + kernel/trace/ring_buffer.c | 35 +- + lib/asn1_decoder.c | 3 + + lib/mpi/mpicoder.c | 122 +- + mm/mmu_context.c | 2 +- + mm/shmem.c | 9 +- + net/socket.c | 2 +- + security/commoncap.c | 8 +- + security/integrity/evm/evm_main.c | 6 +- + security/security.c | 2 +- + security/selinux/hooks.c | 11 +- + security/smack/smack_lsm.c | 6 +- + sound/pci/hda/thinkpad_helper.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + tools/lguest/lguest.c | 10 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 47 +- + .../acpi/os_specific/service_layers/osunixmap.c | 2 +- + .../acpi/os_specific/service_layers/osunixxf.c | 24 +- + tools/power/acpi/tools/acpidbg/acpidbg.c | 4 +- + tools/power/acpi/tools/acpidump/Makefile | 1 + + tools/power/acpi/tools/acpidump/apdump.c | 13 +- + tools/power/acpi/tools/acpidump/apmain.c | 3 +- + tools/power/cpupower/Makefile | 12 +- + tools/power/cpupower/bench/Makefile | 2 +- + tools/power/cpupower/bench/README-BENCH | 2 +- + tools/power/cpupower/bench/benchmark.c | 4 +- + tools/power/cpupower/bench/parse.c | 20 +- + tools/power/cpupower/bench/system.c | 3 +- + tools/power/cpupower/lib/cpufreq.c | 550 ++++- + tools/power/cpupower/lib/cpufreq.h | 59 +- + tools/power/cpupower/lib/cpuidle.c | 380 ++++ + tools/power/cpupower/lib/cpuidle.h | 23 + + tools/power/cpupower/lib/cpupower.c | 192 ++ + tools/power/cpupower/lib/cpupower.h | 35 + + tools/power/cpupower/lib/cpupower_intern.h | 5 + + tools/power/cpupower/lib/sysfs.c | 672 ------ + tools/power/cpupower/lib/sysfs.h | 31 - + tools/power/cpupower/man/cpupower-frequency-info.1 | 2 +- + tools/power/cpupower/man/cpupower-frequency-set.1 | 2 +- + tools/power/cpupower/man/cpupower-idle-info.1 | 2 +- + tools/power/cpupower/man/cpupower-idle-set.1 | 2 +- + tools/power/cpupower/utils/cpufreq-set.c | 8 +- + tools/power/cpupower/utils/cpuidle-info.c | 32 +- + tools/power/cpupower/utils/cpuidle-set.c | 26 +- + tools/power/cpupower/utils/helpers/helpers.h | 26 +- + tools/power/cpupower/utils/helpers/topology.c | 107 +- + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 12 +- + tools/testing/selftests/x86/Makefile | 1 + + tools/testing/selftests/x86/fsgsbase.c | 398 ++++ + tools/testing/selftests/x86/ldt_gdt.c | 250 +++ + 1085 files changed, 33291 insertions(+), 16974 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/fsl-imx-scc.txt + create mode 100644 Documentation/devicetree/bindings/devfreq/event/exynos-nocp.txt + create mode 100644 Documentation/devicetree/bindings/devfreq/exynos-bus.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt + create mode 100644 Documentation/devicetree/bindings/numa.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pv88080.txt + create mode 100644 Documentation/devicetree/bindings/rng/hisi-rng.txt + create mode 100644 Documentation/devicetree/bindings/timer/arm,mps2-timer.txt + create mode 100644 Documentation/hwmon/max31722 + delete mode 100644 arch/arm/mach-shmobile/cpufreq.c + create mode 100644 arch/arm64/include/asm/mmzone.h + create mode 100644 arch/arm64/include/asm/numa.h + create mode 100644 arch/arm64/kernel/hibernate-asm.S + create mode 100644 arch/arm64/kernel/hibernate.c + create mode 100644 arch/arm64/mm/numa.c + delete mode 100644 arch/arm64/mm/proc-macros.S + delete mode 100644 arch/x86/boot/compressed/aslr.c + create mode 100644 arch/x86/boot/compressed/error.c + create mode 100644 arch/x86/boot/compressed/error.h + create mode 100644 arch/x86/boot/compressed/kaslr.c + create mode 100644 arch/x86/boot/compressed/pagetable.c + create mode 100644 arch/x86/include/asm/text-patching.h + rename arch/x86/kernel/{head.c => ebda.c} (98%) + create mode 100644 arch/x86/kernel/platform-quirks.c + create mode 100644 arch/x86/mm/ident_map.c + delete mode 100644 arch/x86/tools/calc_run_size.sh + create mode 100644 drivers/acpi/acpica/exconcat.c + create mode 100644 drivers/acpi/acpica/utascii.c + create mode 100644 drivers/acpi/evged.c + create mode 100644 drivers/acpi/osi.c + create mode 100644 drivers/base/power/opp/of.c + create mode 100644 drivers/char/hw_random/hisi-rng.c + delete mode 100644 drivers/char/hw_random/ppc4xx-rng.c + create mode 100644 drivers/clocksource/mps2-timer.c + create mode 100644 drivers/cpufreq/cpufreq-dt-platdev.c + create mode 100644 drivers/cpufreq/cpufreq_governor_attr_set.c + delete mode 100644 drivers/cpufreq/hisi-acpu-cpufreq.c + create mode 100644 drivers/cpufreq/mvebu-cpufreq.c + create mode 100644 drivers/crypto/amcc/crypto4xx_trng.c + create mode 100644 drivers/crypto/amcc/crypto4xx_trng.h + create mode 100644 drivers/crypto/ccp/ccp-dmaengine.c + create mode 100644 drivers/crypto/mxc-scc.c + create mode 100644 drivers/crypto/qat/qat_common/adf_vf2pf_msg.c + create mode 100644 drivers/devfreq/event/exynos-nocp.c + create mode 100644 drivers/devfreq/event/exynos-nocp.h + create mode 100644 drivers/devfreq/exynos-bus.c + delete mode 100644 drivers/devfreq/exynos/Makefile + delete mode 100644 drivers/devfreq/exynos/exynos4_bus.c + delete mode 100644 drivers/devfreq/exynos/exynos4_bus.h + delete mode 100644 drivers/devfreq/exynos/exynos5_bus.c + delete mode 100644 drivers/devfreq/exynos/exynos_ppmu.c + delete mode 100644 drivers/devfreq/exynos/exynos_ppmu.h + create mode 100644 drivers/devfreq/governor_passive.c + create mode 100644 drivers/hwmon/max31722.c + create mode 100644 drivers/irqchip/irq-lpc32xx.c + create mode 100644 drivers/irqchip/irq-ls-scfg-msi.c + create mode 100644 drivers/irqchip/irq-partition-percpu.c + create mode 100644 drivers/leds/trigger/ledtrig-mtd.c + create mode 100644 drivers/leds/trigger/ledtrig-panic.c + create mode 100644 drivers/of/of_numa.c + create mode 100644 drivers/regulator/lp873x-regulator.c + rename drivers/regulator/{max14577.c => max14577-regulator.c} (100%) + rename drivers/regulator/{max77693.c => max77693-regulator.c} (100%) + rename drivers/regulator/{max8997.c => max8997-regulator.c} (99%) + create mode 100644 drivers/regulator/pv88080-regulator.c + create mode 100644 drivers/regulator/pv88080-regulator.h + create mode 100644 drivers/thermal/int340x_thermal/Kconfig + create mode 100644 drivers/thermal/int340x_thermal/int3406_thermal.c + delete mode 100644 include/acpi/platform/acmsvcex.h + delete mode 100644 include/acpi/platform/acwinex.h + delete mode 100644 include/linux/cpufreq-dt.h + create mode 100644 include/linux/irqchip/irq-partition-percpu.h + delete mode 100644 include/linux/mmc/sh_mobile_sdhi.h + delete mode 100644 include/linux/mmc/tmio.h + create mode 100644 include/trace/events/mmc.h + create mode 100644 kernel/sched/cpufreq_schedutil.c + create mode 100644 tools/power/cpupower/lib/cpuidle.c + create mode 100644 tools/power/cpupower/lib/cpuidle.h + create mode 100644 tools/power/cpupower/lib/cpupower.c + create mode 100644 tools/power/cpupower/lib/cpupower.h + create mode 100644 tools/power/cpupower/lib/cpupower_intern.h + delete mode 100644 tools/power/cpupower/lib/sysfs.c + delete mode 100644 tools/power/cpupower/lib/sysfs.h + create mode 100644 tools/testing/selftests/x86/fsgsbase.c +Merging fixes/master (b507146bb6b9 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/rc-fixes (3d1450d54a4f Makefile: Force gzip and xz on module install) +$ git merge kbuild-current/rc-fixes +Already up-to-date. +Merging arc-current/for-curr (44549e8f5eea Linux 4.6-rc7) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (ec953b70f368 ARM: 8573/1: domain: move {set,get}_domain under config guard) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (b4c112114aab powerpc: Fix bad inline asm constraint in create_zero_mask()) +$ git merge powerpc-fixes/fixes +Already up-to-date. +Merging powerpc-merge-mpe/fixes (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-merge-mpe/fixes +Already up-to-date. +Merging sparc/master (33656a1f2ee5 Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs) +$ git merge sparc/master +Already up-to-date. +Merging net/master (2dcd0af568b0 Linux 4.6) +$ git merge net/master +Already up-to-date. +Merging ipsec/master (d6af1a31cc72 vti: Add pmtu handling to vti_xmit.) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (f28f20da704d Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (cbbba30f1ac9 Merge tag 'iwlwifi-for-kalle-2016-05-04' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes) +$ git merge wireless-drivers/master +Already up-to-date. +Merging mac80211/master (e6436be21e77 mac80211: fix statistics leak if dev_alloc_name() fails) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (c7c5856b6f6f sound: oss: Use setup_timer and mod_timer.) +$ git merge sound-current/for-linus +Auto-merging sound/soc/intel/boards/cht_bsw_rt5645.c +Auto-merging sound/soc/intel/boards/cht_bsw_max98090_ti.c +Removing sound/core/rtctimer.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/davinci-mcbsp.txt | 51 +++ + .../devicetree/bindings/sound/fsl-sai.txt | 9 +- + .../devicetree/bindings/sound/pcm5102a.txt | 13 + + Documentation/sound/alsa/HD-Audio.txt | 26 +- + Documentation/sound/alsa/compress_offload.txt | 4 +- + Documentation/sound/alsa/soc/dapm.txt | 2 +- + Documentation/sound/alsa/soc/overview.txt | 2 +- + Documentation/sound/alsa/timestamping.txt | 2 +- + MAINTAINERS | 1 + + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 + + include/sound/dmaengine_pcm.h | 12 + + include/sound/hda_chmap.h | 2 + + include/sound/hda_i915.h | 10 +- + include/sound/hdaudio_ext.h | 13 + + include/sound/hdmi-codec.h | 100 +++++ + include/sound/pcm_iec958.h | 2 + + include/sound/soc-dapm.h | 3 +- + include/sound/soc.h | 5 +- + include/uapi/sound/asound.h | 2 +- + sound/core/Kconfig | 29 -- + sound/core/Makefile | 1 - + sound/core/compress_offload.c | 25 +- + sound/core/hrtimer.c | 56 ++- + sound/core/pcm_dmaengine.c | 11 +- + sound/core/pcm_iec958.c | 65 +++- + sound/core/pcm_lib.c | 4 +- + sound/core/pcm_native.c | 4 +- + sound/core/rtctimer.c | 187 --------- + sound/core/seq/seq.c | 2 - + sound/core/timer.c | 5 +- + sound/firewire/Kconfig | 1 + + sound/firewire/Makefile | 3 + + sound/firewire/amdtp-stream-trace.h | 110 ++++++ + sound/firewire/amdtp-stream.c | 210 +++++----- + sound/firewire/amdtp-stream.h | 37 +- + sound/firewire/bebob/bebob.c | 217 ++++++----- + sound/firewire/bebob/bebob.h | 6 +- + sound/firewire/bebob/bebob_stream.c | 101 ++--- + sound/firewire/dice/dice.c | 41 +- + sound/firewire/digi00x/amdtp-dot.c | 2 +- + sound/firewire/digi00x/digi00x-transaction.c | 7 +- + sound/firewire/digi00x/digi00x.c | 107 +++-- + sound/firewire/digi00x/digi00x.h | 3 + + sound/firewire/fireworks/fireworks.c | 168 +++++--- + sound/firewire/fireworks/fireworks.h | 4 +- + sound/firewire/fireworks/fireworks_stream.c | 84 +--- + sound/firewire/lib.c | 32 ++ + sound/firewire/lib.h | 3 + + sound/firewire/oxfw/oxfw-stream.c | 3 +- + sound/firewire/oxfw/oxfw.c | 151 ++++--- + sound/firewire/oxfw/oxfw.h | 4 +- + sound/firewire/tascam/tascam-stream.c | 26 +- + sound/firewire/tascam/tascam.c | 118 ++++-- + sound/firewire/tascam/tascam.h | 2 + + sound/hda/ext/hdac_ext_bus.c | 4 + + sound/hda/ext/hdac_ext_controller.c | 66 ++++ + sound/hda/hdac_controller.c | 17 + + sound/hda/hdac_i915.c | 47 ++- + sound/hda/hdmi_chmap.c | 44 ++- + sound/hda/local.h | 10 + + sound/isa/wavefront/wavefront_synth.c | 9 + + sound/oss/waveartist.c | 8 +- + sound/pci/au88x0/au88x0_core.c | 14 +- + sound/pci/au88x0/au88x0_pcm.c | 5 +- + sound/pci/ctxfi/cttimer.c | 6 +- + sound/pci/ens1370.c | 2 +- + sound/pci/hda/Kconfig | 10 +- + sound/pci/hda/hda_generic.c | 2 + + sound/pci/hda/patch_hdmi.c | 386 ++++++++++++------ + sound/pci/hda/patch_realtek.c | 15 + + sound/pci/intel8x0.c | 20 +- + sound/pci/lx6464es/lx_core.c | 2 +- + sound/soc/atmel/atmel_ssc_dai.c | 4 +- + sound/soc/au1x/dbdma2.c | 4 +- + sound/soc/bcm/bcm2835-i2s.c | 27 +- + sound/soc/codecs/Kconfig | 10 + + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/ak4642.c | 4 +- + sound/soc/codecs/arizona.c | 32 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs47l24.c | 46 ++- + sound/soc/codecs/da7213.c | 99 ++++- + sound/soc/codecs/da7213.h | 35 +- + sound/soc/codecs/da7218.c | 32 +- + sound/soc/codecs/da7218.h | 21 +- + sound/soc/codecs/da7219.c | 38 +- + sound/soc/codecs/da7219.h | 20 +- + sound/soc/codecs/es8328.c | 194 ++++++--- + sound/soc/codecs/es8328.h | 23 +- + sound/soc/codecs/hdac_hdmi.c | 194 ++++++++- + sound/soc/codecs/hdmi-codec.c | 432 +++++++++++++++++++++ + sound/soc/codecs/pcm5102a.c | 69 ++++ + sound/soc/codecs/rt298.c | 19 +- + sound/soc/codecs/rt5645.c | 16 +- + sound/soc/codecs/wm5102.c | 4 + + sound/soc/codecs/wm5110.c | 6 + + sound/soc/codecs/wm_adsp.c | 292 ++++++++++---- + sound/soc/codecs/wm_adsp.h | 1 + + sound/soc/davinci/Kconfig | 6 +- + sound/soc/davinci/davinci-i2s.c | 80 ++-- + sound/soc/davinci/davinci-mcasp.c | 92 +++-- + sound/soc/davinci/davinci-mcasp.h | 5 + + sound/soc/dwc/designware_i2s.c | 14 +- + sound/soc/fsl/fsl_sai.c | 24 +- + sound/soc/fsl/fsl_ssi.c | 81 +++- + sound/soc/fsl/imx-pcm-fiq.c | 2 +- + sound/soc/intel/Kconfig | 16 + + sound/soc/intel/atom/sst-atom-controls.c | 2 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/broadwell.c | 2 +- + sound/soc/intel/boards/bxt_rt298.c | 353 +++++++++++++++++ + sound/soc/intel/boards/bytcr_rt5640.c | 2 +- + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/haswell.c | 2 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 87 ++++- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 86 +++- + sound/soc/intel/boards/skl_rt286.c | 59 ++- + sound/soc/intel/common/sst-acpi.h | 9 + + sound/soc/intel/haswell/sst-haswell-pcm.c | 2 +- + sound/soc/intel/skylake/Makefile | 2 +- + sound/soc/intel/skylake/bxt-sst.c | 328 ++++++++++++++++ + sound/soc/intel/skylake/skl-messages.c | 122 +++++- + sound/soc/intel/skylake/skl-nhlt.c | 15 +- + sound/soc/intel/skylake/skl-pcm.c | 119 +++++- + sound/soc/intel/skylake/skl-sst-dsp.c | 2 - + sound/soc/intel/skylake/skl-sst-dsp.h | 15 +- + sound/soc/intel/skylake/skl-sst.c | 13 +- + sound/soc/intel/skylake/skl-topology.c | 27 +- + sound/soc/intel/skylake/skl-topology.h | 2 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 2 +- + sound/soc/intel/skylake/skl.c | 39 +- + sound/soc/intel/skylake/skl.h | 6 +- + sound/soc/rockchip/rockchip_i2s.c | 87 +++-- + sound/soc/soc-core.c | 14 +- + sound/soc/soc-generic-dmaengine-pcm.c | 57 +-- + sound/usb/card.c | 4 + + sound/usb/clock.c | 4 + + sound/usb/helper.c | 1 + + sound/usb/midi.c | 1 + + sound/usb/mixer.c | 78 +++- + sound/usb/usbaudio.h | 1 + + 144 files changed, 4737 insertions(+), 1525 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt + create mode 100644 Documentation/devicetree/bindings/sound/pcm5102a.txt + create mode 100644 include/sound/hdmi-codec.h + delete mode 100644 sound/core/rtctimer.c + create mode 100644 sound/firewire/amdtp-stream-trace.h + create mode 100644 sound/soc/codecs/hdmi-codec.c + create mode 100644 sound/soc/codecs/pcm5102a.c + create mode 100644 sound/soc/intel/boards/bxt_rt298.c + create mode 100644 sound/soc/intel/skylake/bxt-sst.c +Merging pci-current/for-linus (9a2a5a638f8e PCI: Do not treat EPROBE_DEFER as device attach failure) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (c3b46c73264b Linux 4.6-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (38740a5b87d5 usb: gadget: f_fs: Fix use-after-free) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (74d2a91aec97 USB: serial: option: add even more ZTE device ids) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/option.c | 155 ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 148 insertions(+), 7 deletions(-) +Merging usb-chipidea-fixes/ci-for-usb-stable (d144dfea8af7 usb: chipidea: otg: change workqueue ci_otg as freezable) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (44549e8f5eea Linux 4.6-rc7) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (23ea5967d6bd Merge branch 'next' into for-linus) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/gpio-keys.txt | 10 +-- + .../input/touchscreen/brcm,iproc-touchscreen.txt | 23 +++++-- + arch/arm/boot/dts/bcm-cygnus.dtsi | 11 +++- + drivers/input/keyboard/omap-keypad.c | 52 +-------------- + drivers/input/keyboard/twl4030_keypad.c | 28 ++++---- + drivers/input/misc/cm109.c | 47 +++++++++---- + drivers/input/misc/rotary_encoder.c | 8 +-- + drivers/input/misc/twl6040-vibra.c | 15 +---- + drivers/input/mouse/byd.c | 1 - + drivers/input/tablet/acecad.c | 12 ++-- + drivers/input/tablet/aiptek.c | 20 +++--- + drivers/input/tablet/gtco.c | 24 +++---- + drivers/input/tablet/kbtab.c | 8 +-- + drivers/input/touchscreen/bcm_iproc_tsc.c | 77 ++++++++++++---------- + drivers/input/touchscreen/ti_am335x_tsc.c | 16 ++--- + 15 files changed, 170 insertions(+), 182 deletions(-) +Merging crypto-current/master (4a6b27b79da5 crypto: sha1-mb - make sha1_x8_avx2() conform to C function ABI) +$ git merge crypto-current/master +Merge made by the 'recursive' strategy. + arch/x86/crypto/sha-mb/sha1_x8_avx2.S | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) +Merging ide/master (1993b176a822 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide) +$ git merge ide/master +Already up-to-date. +Merging devicetree-current/devicetree/merge (f76502aa9140 of/dynamic: Fix test for PPC_PSERIES) +$ git merge devicetree-current/devicetree/merge +Already up-to-date. +Merging rr-fixes/fixes (8244062ef1e5 modules: fix longstanding /proc/kallsyms vs module insertion race.) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (8160c4e45582 vfio: fix ioctl error handling) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (505ce68c6da3 selftest/seccomp: Fix the seccomp(2) signature) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1b52e50f2a40 mfd: max77843: Fix max77843_chg_init() return on error) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (2dcd0af568b0 Linux 4.6) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (b0da6d44157a asm-generic: Drop renameat syscall from default list) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/arc/include/uapi/asm/unistd.h | 1 + + arch/arm64/include/uapi/asm/unistd.h | 3 +++ + arch/c6x/include/uapi/asm/unistd.h | 1 + + arch/h8300/include/uapi/asm/unistd.h | 2 ++ + arch/hexagon/include/uapi/asm/unistd.h | 1 + + arch/metag/include/uapi/asm/unistd.h | 2 ++ + arch/nios2/include/uapi/asm/unistd.h | 2 ++ + arch/openrisc/include/uapi/asm/unistd.h | 1 + + arch/score/include/uapi/asm/unistd.h | 1 + + arch/tile/include/uapi/asm/unistd.h | 1 + + arch/unicore32/include/uapi/asm/unistd.h | 2 ++ + include/uapi/asm-generic/unistd.h | 3 +++ + 12 files changed, 20 insertions(+) +Merging arc/for-next (445a64214285 arc: axs10x: Add DT bindings for I2S PLL Clock) +$ git merge arc/for-next +Resolved 'drivers/irqchip/Kconfig' using previous resolution. +Resolved 'drivers/irqchip/Makefile' using previous resolution. +Auto-merging drivers/irqchip/Makefile +CONFLICT (content): Merge conflict in drivers/irqchip/Makefile +Auto-merging drivers/irqchip/Kconfig +CONFLICT (content): Merge conflict in drivers/irqchip/Kconfig +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Removing arch/arc/kernel/clk.c +Removing arch/arc/include/asm/clk.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a81ccef3814f] Merge remote-tracking branch 'arc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arc/eznps.txt | 7 + + .../interrupt-controller/ezchip,nps400-ic.txt | 17 ++ + .../bindings/timer/ezchip,nps400-timer.txt | 15 ++ + .../devicetree/bindings/timer/snps,arc-timer.txt | 31 +++ + .../devicetree/bindings/timer/snps,archs-gfrc.txt | 14 ++ + .../devicetree/bindings/timer/snps,archs-rtc.txt | 14 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 6 + + arch/arc/Kconfig | 16 +- + arch/arc/Makefile | 5 + + arch/arc/boot/dts/abilis_tb10x.dtsi | 14 ++ + arch/arc/boot/dts/axc001.dtsi | 14 +- + arch/arc/boot/dts/axc003.dtsi | 16 +- + arch/arc/boot/dts/axc003_idu.dtsi | 14 +- + arch/arc/boot/dts/axs10x_mb.dtsi | 13 ++ + arch/arc/boot/dts/eznps.dts | 96 +++++++++ + arch/arc/boot/dts/nsim_700.dts | 10 +- + arch/arc/boot/dts/nsim_hs.dts | 8 +- + arch/arc/boot/dts/nsim_hs_idu.dts | 8 +- + arch/arc/boot/dts/nsimosci.dts | 10 +- + arch/arc/boot/dts/nsimosci_hs.dts | 8 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 8 +- + arch/arc/boot/dts/skeleton.dtsi | 14 ++ + arch/arc/boot/dts/skeleton_hs.dtsi | 52 +++++ + arch/arc/boot/dts/skeleton_hs_idu.dtsi | 46 ++++ + arch/arc/boot/dts/vdk_axc003.dtsi | 14 +- + arch/arc/boot/dts/vdk_axc003_idu.dtsi | 12 +- + arch/arc/configs/nps_defconfig | 84 ++++++++ + arch/arc/include/asm/atomic.h | 83 ++++++- + arch/arc/include/asm/barrier.h | 12 +- + arch/arc/include/asm/bitops.h | 60 +++++- + arch/arc/include/asm/clk.h | 22 -- + arch/arc/include/asm/cmpxchg.h | 76 ++++++- + arch/arc/include/asm/entry-compact.h | 6 + + arch/arc/include/asm/irq.h | 13 +- + arch/arc/include/asm/page.h | 4 + + arch/arc/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/processor.h | 51 +++-- + arch/arc/include/asm/setup.h | 4 + + arch/arc/include/asm/spinlock.h | 14 ++ + arch/arc/include/uapi/asm/byteorder.h | 2 +- + arch/arc/kernel/Makefile | 2 +- + arch/arc/kernel/clk.c | 21 -- + arch/arc/kernel/ctx_sw.c | 13 ++ + arch/arc/kernel/devtree.c | 13 +- + arch/arc/kernel/intc-arcv2.c | 17 +- + arch/arc/kernel/intc-compact.c | 17 +- + arch/arc/kernel/irq.c | 50 +---- + arch/arc/kernel/mcip.c | 7 +- + arch/arc/kernel/setup.c | 17 +- + arch/arc/kernel/smp.c | 25 ++- + arch/arc/kernel/time.c | 238 ++++++++++++++------- + arch/arc/mm/tlb.c | 11 + + arch/arc/plat-axs10x/axs10x.c | 27 ++- + arch/arc/plat-eznps/Kconfig | 35 +++ + arch/arc/plat-eznps/Makefile | 7 + + arch/arc/plat-eznps/entry.S | 70 ++++++ + arch/arc/plat-eznps/include/plat/ctop.h | 209 ++++++++++++++++++ + arch/arc/plat-eznps/include/plat/mtm.h | 60 ++++++ + arch/arc/plat-eznps/include/plat/smp.h | 26 +++ + arch/arc/plat-eznps/mtm.c | 133 ++++++++++++ + arch/arc/plat-eznps/platform.c | 102 +++++++++ + arch/arc/plat-eznps/smp.c | 155 ++++++++++++++ + drivers/clocksource/Kconfig | 10 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-nps.c | 98 +++++++++ + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-eznps.c | 165 ++++++++++++++ + include/soc/nps/common.h | 166 ++++++++++++++ + 70 files changed, 2335 insertions(+), 283 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arc/eznps.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ezchip,nps400-ic.txt + create mode 100644 Documentation/devicetree/bindings/timer/ezchip,nps400-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,arc-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-gfrc.txt + create mode 100644 Documentation/devicetree/bindings/timer/snps,archs-rtc.txt + create mode 100644 arch/arc/boot/dts/eznps.dts + create mode 100644 arch/arc/boot/dts/skeleton_hs.dtsi + create mode 100644 arch/arc/boot/dts/skeleton_hs_idu.dtsi + create mode 100644 arch/arc/configs/nps_defconfig + delete mode 100644 arch/arc/include/asm/clk.h + delete mode 100644 arch/arc/kernel/clk.c + create mode 100644 arch/arc/plat-eznps/Kconfig + create mode 100644 arch/arc/plat-eznps/Makefile + create mode 100644 arch/arc/plat-eznps/entry.S + create mode 100644 arch/arc/plat-eznps/include/plat/ctop.h + create mode 100644 arch/arc/plat-eznps/include/plat/mtm.h + create mode 100644 arch/arc/plat-eznps/include/plat/smp.h + create mode 100644 arch/arc/plat-eznps/mtm.c + create mode 100644 arch/arc/plat-eznps/platform.c + create mode 100644 arch/arc/plat-eznps/smp.c + create mode 100644 drivers/clocksource/timer-nps.c + create mode 100644 drivers/irqchip/irq-eznps.c + create mode 100644 include/soc/nps/common.h +Merging arm/for-next (b6810489fa29 Merge branch 'devel-stable' into for-next) +$ git merge arm/for-next +Auto-merging arch/arm/kernel/setup.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2c2x0.txt | 6 ++ + Documentation/kdump/kdump.txt | 13 +-- + Documentation/kernel-parameters.txt | 5 -- + arch/arm/boot/Makefile | 2 +- + arch/arm/include/asm/dma-mapping.h | 2 - + arch/arm/include/asm/io.h | 12 +++ + arch/arm/include/asm/memory.h | 38 +++++++-- + arch/arm/kernel/bios32.c | 3 - + arch/arm/kernel/reboot.c | 3 - + arch/arm/kernel/setup.c | 26 ++++++ + arch/arm/mach-keystone/keystone.c | 7 +- + arch/arm/mm/cache-l2x0.c | 26 ++++-- + arch/arm/mm/cache-uniphier.c | 26 +++++- + arch/arm/mm/dma-mapping.c | 16 ---- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/ioremap.c | 16 +++- + arch/arm/mm/nommu.c | 9 ++ + arch/arm/tools/Makefile | 11 ++- + drivers/amba/bus.c | 100 ++++++++++++++++++++--- + drivers/mtd/maps/pxa2xx-flash.c | 6 +- + kernel/memremap.c | 11 ++- + scripts/kallsyms.c | 10 +-- + scripts/link-vmlinux.sh | 4 - + 23 files changed, 260 insertions(+), 94 deletions(-) +Merging arm-perf/for-next/perf (4ba2578fa7b5 arm64: perf: don't expose CHAIN event in sysfs) +$ git merge arm-perf/for-next/perf +Already up-to-date. +Merging arm-soc/for-next (83e0a1672eb5 Merge branch 'next/defconfig' into for-next) +$ git merge arm-soc/for-next +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'arch/arm/mach-shmobile/Makefile' using previous resolution. +Auto-merging include/linux/soc/renesas/rcar-sysc.h +Auto-merging drivers/soc/qcom/spm.c +Auto-merging drivers/firmware/psci.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/rockchip/rk3399-evb.dts +Removing arch/arm/mach-shmobile/pm-rcar.c +Auto-merging arch/arm/mach-shmobile/Makefile +CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Makefile +Auto-merging arch/arm/mach-lpc32xx/phy3250.c +Removing arch/arm/mach-exynos/regs-srom.h +Auto-merging arch/arm/mach-exynos/exynos.c +Removing arch/arm/boot/dts/phy3250.dts +Auto-merging arch/arm/boot/dts/mps2-an385.dts +Auto-merging arch/arm/boot/dts/lpc3250-ea3250.dts +Auto-merging arch/arm/boot/dts/keystone-k2l.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2l-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2hk.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2hk-evm.dts +Auto-merging arch/arm/boot/dts/keystone-k2e.dtsi +Auto-merging arch/arm/boot/dts/keystone-k2e-evm.dts +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 070a10cc0408] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.txt | 3 + + Documentation/devicetree/bindings/arm/arm-boards | 8 + + .../devicetree/bindings/arm/atmel-at91.txt | 6 +- + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + .../bindings/arm/hisilicon/hisilicon.txt | 20 +- + .../devicetree/bindings/arm/omap/omap.txt | 6 + + Documentation/devicetree/bindings/arm/oxnas.txt | 9 + + Documentation/devicetree/bindings/arm/rockchip.txt | 14 +- + .../bindings/arm/samsung/samsung-boards.txt | 2 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.txt | 92 +- + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 27 + + .../bindings/gpio/nvidia,tegra186-gpio.txt | 161 ++ + .../devicetree/bindings/gpu/nvidia,gk20a.txt | 37 +- + .../arm,versatile-fpga-irq.txt | 2 +- + .../brcm,bcm2835-armctrl-ic.txt | 4 +- + .../interrupt-controller/nxp,lpc3220-mic.txt | 70 +- + .../bindings/memory-controllers/exynos-srom.txt | 79 + + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 81 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 1 + + .../devicetree/bindings/mtd/arm-versatile.txt | 20 +- + .../devicetree/bindings/mtd/fsl-quadspi.txt | 3 +- + .../bindings/pci/nvidia,tegra20-pcie.txt | 224 ++- + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 733 +++++++ + .../bindings/phy/phy-lpc18xx-usb-otg.txt | 2 +- + .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 6 + + .../bindings/power/renesas,rcar-sysc.txt | 48 + + .../devicetree/bindings/reset/oxnas,reset.txt | 58 + + .../devicetree/bindings/soc/mediatek/auxadc.txt | 21 + + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + .../devicetree/bindings/soc/rockchip/grf.txt | 35 + + .../bindings/soc/rockchip/power_domain.txt | 47 + + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 5 +- + Documentation/devicetree/bindings/spi/ti_qspi.txt | 7 + + .../bindings/usb/nvidia,tegra124-xusb.txt | 120 ++ + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 7 + + Documentation/phy.txt | 16 +- + MAINTAINERS | 68 +- + arch/arm/Kconfig | 16 + + arch/arm/Kconfig.debug | 8 - + arch/arm/Makefile | 1 + + arch/arm/arm-soc-for-next-contents.txt | 335 ++++ + arch/arm/boot/dts/Makefile | 68 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 71 + + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 119 ++ + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 398 +--- + arch/arm/boot/dts/am335x-baltos.dtsi | 408 ++++ + arch/arm/boot/dts/am335x-chiliboard.dts | 75 + + arch/arm/boot/dts/am335x-chilisom.dtsi | 77 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 1 + + arch/arm/boot/dts/am335x-evm.dts | 1 + + arch/arm/boot/dts/am335x-icev2.dts | 306 +++ + arch/arm/boot/dts/am335x-igep0033.dtsi | 1 + + arch/arm/boot/dts/am335x-phycore-som.dtsi | 1 + + arch/arm/boot/dts/am335x-shc.dts | 2 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 90 +- + arch/arm/boot/dts/am33xx.dtsi | 8 +- + arch/arm/boot/dts/am35xx-clocks.dtsi | 20 +- + arch/arm/boot/dts/am4372.dtsi | 14 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 3 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 3 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 170 +- + arch/arm/boot/dts/am572x-idk.dts | 85 + + arch/arm/boot/dts/am57xx-beagle-x15.dts | 14 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/am57xx-commercial-grade.dtsi | 23 + + arch/arm/boot/dts/am57xx-idk-common.dtsi | 304 +++ + arch/arm/boot/dts/am57xx-industrial-grade.dtsi | 23 + + arch/arm/boot/dts/arm-realview-eb-11mp-revb.dts | 93 + + arch/arm/boot/dts/arm-realview-eb-11mp.dts | 74 + + arch/arm/boot/dts/arm-realview-eb-a9mp.dts | 70 + + arch/arm/boot/dts/arm-realview-eb-mp.dtsi | 225 +++ + arch/arm/boot/dts/arm-realview-eb.dts | 166 ++ + arch/arm/boot/dts/arm-realview-eb.dtsi | 453 +++++ + arch/arm/boot/dts/arm-realview-pb1176.dts | 40 + + arch/arm/boot/dts/arm-realview-pb11mp.dts | 19 +- + arch/arm/boot/dts/arm-realview-pba8.dts | 178 ++ + arch/arm/boot/dts/arm-realview-pbx-a9.dts | 229 +++ + arch/arm/boot/dts/arm-realview-pbx.dtsi | 542 ++++++ + arch/arm/boot/dts/armada-385-linksys.dtsi | 6 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 4 +- + arch/arm/boot/dts/armv7-m.dtsi | 2 +- + arch/arm/boot/dts/artpec6.dtsi | 99 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 25 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 25 + + arch/arm/boot/dts/aspeed-g4.dtsi | 161 ++ + arch/arm/boot/dts/aspeed-g5.dtsi | 170 ++ + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 9 + + arch/arm/boot/dts/at91-vinco.dts | 4 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 + + arch/arm/boot/dts/bcm2835-rpi-a.dts | 4 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 4 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 4 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 9 + + arch/arm/boot/dts/bcm2835.dtsi | 11 + + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 + + arch/arm/boot/dts/bcm283x.dtsi | 47 + + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 10 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 6 +- + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 17 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 6 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 2 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 5 + + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 8 + + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 6 +- + arch/arm/boot/dts/bcm5301x.dtsi | 32 + + arch/arm/boot/dts/cros-adc-thermistors.dtsi | 8 +- + arch/arm/boot/dts/da850-enbw-cmc.dts | 14 +- + arch/arm/boot/dts/da850-evm.dts | 26 +- + arch/arm/boot/dts/da850.dtsi | 95 +- + arch/arm/boot/dts/dm814x-clocks.dtsi | 10 +- + arch/arm/boot/dts/dm814x.dtsi | 2 + + arch/arm/boot/dts/dm816x-clocks.dtsi | 42 +- + arch/arm/boot/dts/dm816x.dtsi | 2 + + arch/arm/boot/dts/dra7-evm.dts | 70 +- + arch/arm/boot/dts/dra7.dtsi | 200 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 817 ++++++++ + arch/arm/boot/dts/dra72-evm-revc.dts | 73 + + arch/arm/boot/dts/dra72-evm.dts | 835 +------- + arch/arm/boot/dts/dra7xx-clocks.dtsi | 376 ++-- + arch/arm/boot/dts/emev2-kzm9d.dts | 4 +- + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 43 + + arch/arm/boot/dts/exynos3250-artik5.dtsi | 334 ++++ + arch/arm/boot/dts/exynos3250-monk.dts | 59 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 80 + + arch/arm/boot/dts/exynos3250-rinato.dts | 159 +- + arch/arm/boot/dts/exynos3250.dtsi | 208 +- + arch/arm/boot/dts/exynos4.dtsi | 27 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos4210-trats.dts | 4 +- + arch/arm/boot/dts/exynos4210.dtsi | 159 ++ + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 60 +- + arch/arm/boot/dts/exynos4412-ppmu-common.dtsi | 50 + + arch/arm/boot/dts/exynos4412-trats2.dts | 104 +- + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 7 + + arch/arm/boot/dts/exynos4x12.dtsi | 176 +- + arch/arm/boot/dts/exynos5.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 2 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 8 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 12 +- + arch/arm/boot/dts/exynos5250-spring.dts | 2 +- + arch/arm/boot/dts/exynos5250.dtsi | 10 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 +- + arch/arm/boot/dts/exynos5410.dtsi | 4 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 7 - + arch/arm/boot/dts/exynos5420-peach-pit.dts | 11 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 9 +- + arch/arm/boot/dts/exynos5420.dtsi | 420 +++- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 123 +- + arch/arm/boot/dts/exynos5440.dtsi | 4 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 + + arch/arm/boot/dts/imx25-pinfunc.h | 124 +- + arch/arm/boot/dts/imx28-m28.dtsi | 26 - + arch/arm/boot/dts/imx28.dtsi | 26 + + arch/arm/boot/dts/imx31.dtsi | 8 + + arch/arm/boot/dts/imx35.dtsi | 8 + + arch/arm/boot/dts/imx53-m53evk.dts | 21 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts | 42 +- + arch/arm/boot/dts/imx6dl-tx6s-8034.dts | 237 +++ + arch/arm/boot/dts/imx6dl-tx6s-8035.dts | 253 +++ + arch/arm/boot/dts/imx6dl-tx6u-801x.dts | 42 +- + arch/arm/boot/dts/imx6dl-tx6u-8033.dts | 248 +++ + arch/arm/boot/dts/imx6dl-tx6u-811x.dts | 60 +- + arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts | 255 +++ + arch/arm/boot/dts/imx6dl.dtsi | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 45 + + arch/arm/boot/dts/imx6q-b450v3.dts | 5 +- + arch/arm/boot/dts/imx6q-b650v3.dts | 5 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 33 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 6 +- + arch/arm/boot/dts/imx6q-gw5400-a.dts | 2 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 403 ++++ + arch/arm/boot/dts/imx6q-tbs2910.dts | 4 +- + arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts | 42 +- + arch/arm/boot/dts/imx6q-tx6q-1010.dts | 42 +- + arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts | 72 +- + arch/arm/boot/dts/imx6q-tx6q-1020.dts | 72 +- + arch/arm/boot/dts/imx6q-tx6q-1036.dts | 252 +++ + arch/arm/boot/dts/imx6q-tx6q-1110.dts | 60 +- + arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts | 264 +++ + arch/arm/boot/dts/imx6q.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 30 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 788 ++++---- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 98 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 32 +- + arch/arm/boot/dts/imx6qp-nitrogen6_max.dts | 59 + + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 709 +++++++ + arch/arm/boot/dts/imx6sx-sdb-sai.dts | 67 + + arch/arm/boot/dts/imx6sx-sdb.dts | 2 + + arch/arm/boot/dts/imx6sx-sdb.dtsi | 16 + + arch/arm/boot/dts/imx6sx.dtsi | 8 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 74 + + arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 516 +++++ + arch/arm/boot/dts/imx6ul-tx6ul-0010.dts | 53 + + arch/arm/boot/dts/imx6ul-tx6ul-0011.dts | 68 + + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 271 +++ + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 973 ++++++++++ + arch/arm/boot/dts/imx6ul.dtsi | 12 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 745 +++++++ + arch/arm/boot/dts/imx7d.dtsi | 31 + + arch/arm/boot/dts/integrator.dtsi | 3 +- + .../{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} | 0 + .../boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} | 2 +- + .../{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} | 4 +- + ...{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} | 0 + .../dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} | 2 +- + .../{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} | 0 + .../arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} | 4 +- + .../{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} | 0 + .../boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} | 2 +- + .../{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} | 0 + arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} | 4 +- + arch/arm/boot/dts/keystone.dtsi | 11 + + arch/arm/boot/dts/kirkwood-6192.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-6281.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-6282.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-98dx4122.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-b3.dts | 19 +- + arch/arm/boot/dts/kirkwood-blackarmor-nas220.dts | 4 +- + arch/arm/boot/dts/kirkwood-cloudbox.dts | 2 +- + arch/arm/boot/dts/kirkwood-db-88f6281.dts | 14 +- + arch/arm/boot/dts/kirkwood-db-88f6282.dts | 20 +- + arch/arm/boot/dts/kirkwood-dir665.dts | 20 +- + arch/arm/boot/dts/kirkwood-dnskw.dtsi | 6 +- + arch/arm/boot/dts/kirkwood-ds111.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds112.dts | 6 +- + arch/arm/boot/dts/kirkwood-ds212.dts | 2 +- + arch/arm/boot/dts/kirkwood-ds411.dts | 6 +- + arch/arm/boot/dts/kirkwood-ds411slim.dts | 2 +- + arch/arm/boot/dts/kirkwood-ib62x0.dts | 4 +- + arch/arm/boot/dts/kirkwood-iconnect.dts | 22 +- + arch/arm/boot/dts/kirkwood-km_common.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-laplug.dts | 19 +- + arch/arm/boot/dts/kirkwood-linkstation.dtsi | 17 +- + arch/arm/boot/dts/kirkwood-linksys-viper.dts | 240 +++ + arch/arm/boot/dts/kirkwood-lsxl.dtsi | 16 +- + arch/arm/boot/dts/kirkwood-mplcec4.dts | 18 +- + arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts | 24 +- + arch/arm/boot/dts/kirkwood-nas2big.dts | 18 +- + .../boot/dts/kirkwood-netgear_readynas_duo_v2.dts | 20 +- + .../boot/dts/kirkwood-netgear_readynas_nv+_v2.dts | 23 +- + arch/arm/boot/dts/kirkwood-netxbig.dtsi | 8 +- + arch/arm/boot/dts/kirkwood-ns2-common.dtsi | 4 +- + arch/arm/boot/dts/kirkwood-nsa310.dts | 18 +- + arch/arm/boot/dts/kirkwood-nsa320.dts | 31 +- + arch/arm/boot/dts/kirkwood-nsa325.dts | 17 +- + arch/arm/boot/dts/kirkwood-nsa3x0-common.dtsi | 24 +- + arch/arm/boot/dts/kirkwood-openblocks_a6.dts | 2 +- + arch/arm/boot/dts/kirkwood-openblocks_a7.dts | 2 +- + arch/arm/boot/dts/kirkwood-openrd.dtsi | 14 +- + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6192.dts | 20 +- + arch/arm/boot/dts/kirkwood-rd88f6281-a.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281-z0.dts | 2 +- + arch/arm/boot/dts/kirkwood-rd88f6281.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-rs212.dts | 6 +- + arch/arm/boot/dts/kirkwood-synology.dtsi | 22 +- + arch/arm/boot/dts/kirkwood-t5325.dts | 22 +- + arch/arm/boot/dts/kirkwood-ts219-6281.dts | 4 +- + arch/arm/boot/dts/kirkwood-ts219-6282.dts | 16 +- + arch/arm/boot/dts/kirkwood-ts219.dtsi | 20 +- + arch/arm/boot/dts/kirkwood-ts419-6282.dts | 15 +- + arch/arm/boot/dts/kirkwood-ts419.dtsi | 4 +- + arch/arm/boot/dts/kirkwood.dtsi | 2 +- + arch/arm/boot/dts/lpc18xx.dtsi | 47 +- + .../boot/dts/{ea3250.dts => lpc3250-ea3250.dts} | 230 ++- + arch/arm/boot/dts/lpc3250-phy3250.dts | 226 +++ + arch/arm/boot/dts/lpc32xx.dtsi | 77 +- + arch/arm/boot/dts/lpc4350-hitex-eval.dts | 41 +- + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 29 +- + arch/arm/boot/dts/ls1021a.dtsi | 65 +- + .../dts/{rk3288-thermal.dtsi => mps2-an385.dts} | 96 +- + arch/arm/boot/dts/mps2-an399.dts | 92 + + arch/arm/boot/dts/mps2.dtsi | 241 +++ + arch/arm/boot/dts/mt2701.dtsi | 19 + + arch/arm/boot/dts/omap2420-clocks.dtsi | 38 +- + arch/arm/boot/dts/omap2420-n8x0-common.dtsi | 2 +- + arch/arm/boot/dts/omap2420.dtsi | 4 + + arch/arm/boot/dts/omap2430-clocks.dtsi | 58 +- + arch/arm/boot/dts/omap2430.dtsi | 6 +- + arch/arm/boot/dts/omap24xx-clocks.dtsi | 228 +-- + arch/arm/boot/dts/omap3-beagle.dts | 1 + + arch/arm/boot/dts/omap3-n9.dts | 14 + + arch/arm/boot/dts/omap3-n950-n9.dtsi | 151 ++ + arch/arm/boot/dts/omap3-n950.dts | 99 + + arch/arm/boot/dts/omap3.dtsi | 6 +- + arch/arm/boot/dts/omap3430es1-clocks.dtsi | 30 +- + arch/arm/boot/dts/omap34xx-omap36xx-clocks.dtsi | 44 +- + arch/arm/boot/dts/omap34xx.dtsi | 2 +- + .../omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 32 +- + arch/arm/boot/dts/omap36xx-clocks.dtsi | 14 +- + .../boot/dts/omap36xx-omap3430es2plus-clocks.dtsi | 14 +- + arch/arm/boot/dts/omap36xx.dtsi | 4 +- + arch/arm/boot/dts/omap3xxx-clocks.dtsi | 276 +-- + arch/arm/boot/dts/omap4-kc1.dts | 182 ++ + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 6 +- + arch/arm/boot/dts/omap443x-clocks.dtsi | 2 +- + arch/arm/boot/dts/omap443x.dtsi | 2 +- + arch/arm/boot/dts/omap4460.dtsi | 2 +- + arch/arm/boot/dts/omap446x-clocks.dtsi | 4 +- + arch/arm/boot/dts/omap44xx-clocks.dtsi | 316 +-- + arch/arm/boot/dts/omap5-board-common.dtsi | 12 +- + arch/arm/boot/dts/omap5-cm-t54.dts | 2 +- + arch/arm/boot/dts/omap5.dtsi | 6 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 260 +-- + arch/arm/boot/dts/orion5x-kuroboxpro.dts | 127 ++ + arch/arm/boot/dts/ox810se.dtsi | 336 ++++ + arch/arm/boot/dts/phy3250.dts | 227 --- + .../boot/dts/qcom-apq8064-arrow-db600c-pins.dtsi | 52 + + arch/arm/boot/dts/qcom-apq8064-arrow-db600c.dts | 349 ++++ + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 6 + + arch/arm/boot/dts/qcom-apq8064-pins.dtsi | 39 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 135 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts | 22 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 112 ++ + arch/arm/boot/dts/qcom-ipq4019.dtsi | 267 +++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 52 +- + arch/arm/boot/dts/r7s72100.dtsi | 15 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 20 +- + arch/arm/boot/dts/r8a73a4.dtsi | 75 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 34 +- + arch/arm/boot/dts/r8a7740.dtsi | 57 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 40 +- + arch/arm/boot/dts/r8a7778.dtsi | 22 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 36 +- + arch/arm/boot/dts/r8a7779.dtsi | 72 +- + arch/arm/boot/dts/r8a7790-lager.dts | 117 +- + arch/arm/boot/dts/r8a7790.dtsi | 278 +-- + arch/arm/boot/dts/r8a7791-koelsch.dts | 71 +- + arch/arm/boot/dts/r8a7791-porter.dts | 59 +- + arch/arm/boot/dts/r8a7791.dtsi | 243 ++- + arch/arm/boot/dts/r8a7793-gose.dts | 162 +- + arch/arm/boot/dts/r8a7793.dtsi | 228 ++- + arch/arm/boot/dts/r8a7794-alt.dts | 32 +- + arch/arm/boot/dts/r8a7794-silk.dts | 44 +- + arch/arm/boot/dts/r8a7794.dtsi | 266 ++- + arch/arm/boot/dts/rk3036-evb.dts | 5 + + arch/arm/boot/dts/rk3036-kylin.dts | 18 +- + arch/arm/boot/dts/rk3036.dtsi | 71 +- + arch/arm/boot/dts/rk3066a-bqcurie2.dts | 11 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 9 +- + arch/arm/boot/dts/rk3066a.dtsi | 6 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 7 +- + arch/arm/boot/dts/rk3188.dtsi | 6 +- + arch/arm/boot/dts/rk3228-evb.dts | 8 +- + arch/arm/boot/dts/rk3228.dtsi | 149 ++ + arch/arm/boot/dts/rk3288-evb.dtsi | 8 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 9 +- + arch/arm/boot/dts/rk3288-miqi.dts | 472 +++++ + arch/arm/boot/dts/rk3288-popmetal.dts | 9 +- + arch/arm/boot/dts/rk3288-r89.dts | 7 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 100 + + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 49 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 9 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 44 + + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 7 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 16 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 18 +- + arch/arm/boot/dts/rk3288.dtsi | 158 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 2 +- + arch/arm/boot/dts/sama5d2-pinfunc.h | 4 +- + arch/arm/boot/dts/sama5d2.dtsi | 53 + + arch/arm/boot/dts/sama5d3.dtsi | 7 + + arch/arm/boot/dts/sama5d4.dtsi | 8 + + arch/arm/boot/dts/sh73a0-kzm9g.dts | 37 +- + arch/arm/boot/dts/sh73a0.dtsi | 89 +- + arch/arm/boot/dts/socfpga.dtsi | 4 + + arch/arm/boot/dts/socfpga_arria10.dtsi | 32 +- + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5.dtsi | 6 - + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 94 +- + arch/arm/boot/dts/socfpga_cyclone5_socrates.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 310 +++ + arch/arm/boot/dts/ste-ccu9540.dts | 2 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 92 +- + arch/arm/boot/dts/ste-href-stuib.dtsi | 4 +- + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 16 +- + arch/arm/boot/dts/ste-hrefprev60.dtsi | 8 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 6 +- + arch/arm/boot/dts/ste-nomadik-nhk15.dts | 13 +- + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 38 + + arch/arm/boot/dts/ste-snowball.dts | 19 +- + arch/arm/boot/dts/stih407-family.dtsi | 126 +- + arch/arm/boot/dts/sun4i-a10-a1000.dts | 24 + + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 281 +++ + arch/arm/boot/dts/sun4i-a10.dtsi | 76 +- + arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts | 226 +++ + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 19 +- + arch/arm/boot/dts/sun5i-a13-inet-98v-rev2.dts | 15 - + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 41 + + arch/arm/boot/dts/sun5i-a13.dtsi | 66 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 12 + + arch/arm/boot/dts/sun5i-r8.dtsi | 142 +- + arch/arm/boot/dts/sun5i.dtsi | 43 + + arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts | 208 ++ + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 24 + + arch/arm/boot/dts/sun7i-a20-itead-ibox.dts | 24 + + .../boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts | 82 + + arch/arm/boot/dts/sun7i-a20.dtsi | 77 +- + arch/arm/boot/dts/sun8i-a23-gt90h-v4.dts | 120 +- + .../boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts | 243 +++ + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 186 ++ + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 145 ++ + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 167 ++ + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 105 +- + arch/arm/boot/dts/sun8i-h3.dtsi | 123 ++ + arch/arm/boot/dts/tango4-common.dtsi | 16 +- + arch/arm/boot/dts/tango4-smp8758.dtsi | 28 +- + arch/arm/boot/dts/tango4-vantage-1172.dts | 1 - + arch/arm/boot/dts/tegra114-dalmore.dts | 6 +- + arch/arm/boot/dts/tegra114-roth.dts | 2 +- + arch/arm/boot/dts/tegra114-tn7.dts | 2 +- + arch/arm/boot/dts/tegra114.dtsi | 4 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 148 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 130 +- + arch/arm/boot/dts/tegra124-venice2.dts | 107 +- + arch/arm/boot/dts/tegra124.dtsi | 171 +- + arch/arm/boot/dts/tegra20-harmony.dts | 6 +- + arch/arm/boot/dts/tegra20-iris-512.dts | 4 + + arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 + + arch/arm/boot/dts/tegra20-paz00.dts | 6 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 8 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 + + arch/arm/boot/dts/tegra20-trimslice.dts | 6 +- + arch/arm/boot/dts/tegra20-ventana.dts | 6 +- + arch/arm/boot/dts/tegra20-whistler.dts | 6 +- + arch/arm/boot/dts/tegra20.dtsi | 4 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 6 +- + arch/arm/boot/dts/tegra30-beaver.dts | 4 + + arch/arm/boot/dts/tegra30-cardhu.dtsi | 6 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 6 +- + arch/arm/boot/dts/tegra30.dtsi | 4 +- + arch/arm/boot/dts/twl6030.dtsi | 6 + + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 10 + + arch/arm/boot/dts/versatile-ab.dts | 5 +- + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 44 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 44 +- + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 47 +- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 57 +- + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 37 +- + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 41 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 16 + + arch/arm/boot/dts/vf-colibri.dtsi | 40 +- + arch/arm/boot/dts/vf500-colibri.dtsi | 5 + + arch/arm/boot/dts/vf500.dtsi | 1 + + arch/arm/boot/dts/vf610-colibri.dtsi | 5 + + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 734 +++++++ + arch/arm/boot/dts/vfxxx.dtsi | 21 + + arch/arm/boot/dts/wd-mbwe.dts | 112 ++ + arch/arm/configs/aspeed_g4_defconfig | 86 + + arch/arm/configs/aspeed_g5_defconfig | 88 + + arch/arm/configs/bcm2835_defconfig | 11 +- + arch/arm/configs/davinci_all_defconfig | 7 +- + arch/arm/configs/exynos_defconfig | 11 + + arch/arm/configs/imx_v6_v7_defconfig | 6 + + arch/arm/configs/keystone_defconfig | 2 + + arch/arm/configs/lpc32xx_defconfig | 29 +- + arch/arm/configs/mps2_defconfig | 109 ++ + arch/arm/configs/multi_v5_defconfig | 29 +- + arch/arm/configs/multi_v7_defconfig | 37 +- + arch/arm/configs/mvebu_v5_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 1 + + arch/arm/configs/omap2plus_defconfig | 66 +- + arch/arm/configs/sama5_defconfig | 13 +- + arch/arm/configs/shmobile_defconfig | 5 +- + arch/arm/configs/tegra_defconfig | 2 + + arch/arm/configs/u8500_defconfig | 5 +- + arch/arm/mach-aspeed/Kconfig | 30 + + arch/arm/mach-at91/sama5.c | 20 +- + arch/arm/mach-at91/soc.c | 81 +- + arch/arm/mach-at91/soc.h | 12 +- + arch/arm/mach-bcm/Kconfig | 2 +- + arch/arm/mach-davinci/Makefile | 4 +- + arch/arm/mach-davinci/clock.c | 21 +- + arch/arm/mach-davinci/clock.h | 1 + + arch/arm/mach-davinci/common.c | 6 - + arch/arm/mach-davinci/cp_intc.c | 3 + + arch/arm/mach-davinci/da830.c | 2 + + arch/arm/mach-davinci/da850.c | 83 +- + arch/arm/mach-davinci/da8xx-dt.c | 19 +- + arch/arm/mach-davinci/dm355.c | 1 + + arch/arm/mach-davinci/dm365.c | 1 + + arch/arm/mach-davinci/dm644x.c | 1 + + arch/arm/mach-davinci/dm646x.c | 1 + + arch/arm/mach-davinci/usb-da8xx.c | 107 + + arch/arm/mach-davinci/usb.c | 89 - + arch/arm/mach-dove/common.c | 3 +- + arch/arm/mach-exynos/Kconfig | 3 + + arch/arm/mach-exynos/exynos.c | 17 - + arch/arm/mach-exynos/include/mach/map.h | 3 - + arch/arm/mach-exynos/regs-srom.h | 53 - + arch/arm/mach-exynos/suspend.c | 20 +- + arch/arm/mach-imx/Kconfig | 2 +- + arch/arm/mach-integrator/integrator_ap.c | 62 - + arch/arm/mach-integrator/integrator_cp.c | 51 - + arch/arm/mach-lpc32xx/common.c | 95 - + arch/arm/mach-lpc32xx/common.h | 24 +- + arch/arm/mach-lpc32xx/phy3250.c | 2 +- + arch/arm/mach-mediatek/Kconfig | 4 + + arch/arm/mach-mediatek/mediatek.c | 1 + + arch/arm/mach-mv78xx0/common.c | 3 +- + arch/arm/mach-omap2/Makefile | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 35 +- + arch/arm/mach-omap2/omap-wakeupgen.c | 5 + + arch/arm/mach-omap2/omap_hwmod.c | 12 +- + arch/arm/mach-omap2/omap_hwmod.h | 2 + + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 2 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 364 +++- + arch/arm/mach-omap2/omap_hwmod_reset.c | 65 + + arch/arm/mach-omap2/pdata-quirks.c | 57 +- + arch/arm/mach-omap2/powerdomains7xx_data.c | 82 +- + arch/arm/mach-omap2/soc.h | 140 +- + arch/arm/mach-orion5x/common.c | 3 +- + arch/arm/mach-oxnas/Kconfig | 24 + + arch/arm/mach-realview/realview_pbx.c | 2 + + arch/arm/mach-rockchip/platsmp.c | 2 +- + arch/arm/mach-shmobile/Kconfig | 11 +- + arch/arm/mach-shmobile/Makefile | 1 - + arch/arm/mach-shmobile/pm-r8a7779.c | 3 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 2 +- + arch/arm/mach-shmobile/pm-rcar.c | 164 -- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- + arch/arm/mach-shmobile/timer.c | 52 +- + arch/arm/mach-sti/Kconfig | 9 +- + arch/arm/mach-tegra/platsmp.c | 16 +- + arch/arm/mach-uniphier/platsmp.c | 4 +- + arch/arm/mach-versatile/versatile_dt.c | 47 - + arch/arm/mach-vexpress/Makefile | 4 +- + arch/arm/mach-vexpress/Makefile.boot | 3 + + arch/arm/mach-vexpress/v2m-mps2.c | 21 + + arch/arm/plat-samsung/include/plat/map-s5p.h | 1 - + arch/arm64/Kconfig.platforms | 10 +- + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 3 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 69 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 52 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 52 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 65 + + .../boot/dts/amlogic/meson-gxbb-vega-s95-meta.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-pro.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95-telos.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 - + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 6 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 10 + + arch/arm64/boot/dts/broadcom/ns2-clock.dtsi | 105 + + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 45 + + arch/arm64/boot/dts/broadcom/ns2.dtsi | 155 +- + .../boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi | 25 + + .../arm64/boot/dts/exynos/exynos7-trip-points.dtsi | 54 + + arch/arm64/boot/dts/exynos/exynos7.dtsi | 49 + + arch/arm64/boot/dts/freescale/Makefile | 3 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 181 ++ + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 13 + + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 22 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 110 +- + arch/arm64/boot/dts/hisilicon/Makefile | 4 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 200 +- + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 623 ++++++ + arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi | 705 +++++++ + arch/arm64/boot/dts/hisilicon/hip05-d02.dts | 34 + + arch/arm64/boot/dts/hisilicon/hip05.dtsi | 10 + + arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 34 + + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 307 +++ + arch/arm64/boot/dts/lg/Makefile | 5 + + arch/arm64/boot/dts/lg/lg1312-ref.dts | 36 + + arch/arm64/boot/dts/lg/lg1312.dtsi | 351 ++++ + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 32 +- + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 1 - + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 20 +- + arch/arm64/boot/dts/marvell/armada-7020.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 108 +- + arch/arm64/boot/dts/marvell/armada-7040.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-ap806-dual.dtsi | 1 - + arch/arm64/boot/dts/marvell/armada-ap806-quad.dtsi | 2 - + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 56 +- + .../boot/dts/marvell/armada-cp110-master.dtsi | 228 +++ + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 60 + + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 55 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 120 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 8 +- + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 14 +- + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 2 +- + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 30 +- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 1424 ++++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 130 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 63 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 212 +- + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 8 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 319 +++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 8 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 82 +- + .../{rk3368-thermal.dtsi => rk3399-evb.dts} | 124 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 1013 ++++++++++ + .../boot/dts/socionext/uniphier-ph1-ld20-ref.dts | 1 + + .../boot/dts/socionext/uniphier-ph1-ld20.dtsi | 6 + + .../boot/dts/socionext/uniphier-ref-daughter.dtsi | 1 + + arch/arm64/configs/defconfig | 47 +- + drivers/bus/Kconfig | 5 +- + drivers/bus/arm-ccn.c | 7 +- + drivers/clk/Kconfig | 1 + + drivers/clk/imx/clk-gate2.c | 7 +- + drivers/clk/imx/clk-imx6sx.c | 10 +- + drivers/clk/imx/clk-imx7d.c | 3 +- + drivers/clk/imx/clk-vf610.c | 60 +- + drivers/clk/imx/clk.h | 13 +- + drivers/clk/renesas/Kconfig | 16 + + drivers/clk/renesas/Makefile | 26 +- + drivers/clk/renesas/clk-mstp.c | 7 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 34 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 47 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 6 +- + drivers/clk/samsung/clk-exynos3250.c | 15 + + drivers/clk/samsung/clk-exynos5420.c | 77 +- + drivers/clk/tegra/clk-tegra210.c | 58 + + drivers/clk/ti/clk-7xx.c | 2 +- + drivers/firmware/psci.c | 6 +- + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/gpu/drm/vc4/vc4_drv.c | 20 + + drivers/irqchip/irq-versatile-fpga.c | 1 + + drivers/memory/Kconfig | 1 + + drivers/memory/Makefile | 1 + + drivers/memory/samsung/Kconfig | 13 + + drivers/memory/samsung/Makefile | 1 + + drivers/memory/samsung/exynos-srom.c | 231 +++ + drivers/memory/samsung/exynos-srom.h | 51 + + drivers/mtd/maps/Kconfig | 10 + + drivers/mtd/maps/Makefile | 3 + + drivers/mtd/maps/physmap_of.c | 6 + + drivers/mtd/maps/physmap_of_versatile.c | 255 +++ + drivers/mtd/maps/physmap_of_versatile.h | 16 + + drivers/of/platform.c | 28 +- + drivers/pci/host/Kconfig | 4 +- + drivers/pci/host/Makefile | 2 +- + drivers/pci/host/pci-tegra.c | 244 ++- + drivers/phy/Kconfig | 2 + + drivers/phy/Makefile | 2 + + drivers/phy/phy-core.c | 50 +- + drivers/phy/tegra/Kconfig | 8 + + drivers/phy/tegra/Makefile | 6 + + drivers/phy/tegra/xusb-tegra124.c | 1752 +++++++++++++++++ + drivers/phy/tegra/xusb-tegra210.c | 2045 ++++++++++++++++++++ + drivers/phy/tegra/xusb.c | 1021 ++++++++++ + drivers/phy/tegra/xusb.h | 421 ++++ + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 20 +- + drivers/reset/Kconfig | 3 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 217 ++- + drivers/reset/reset-lpc18xx.c | 22 +- + drivers/reset/reset-oxnas.c | 136 ++ + drivers/soc/Makefile | 3 +- + drivers/soc/brcmstb/Kconfig | 1 + + drivers/soc/brcmstb/common.c | 66 + + drivers/soc/mediatek/mtk-pmic-wrap.c | 544 ++++-- + drivers/soc/qcom/smd-rpm.c | 9 +- + drivers/soc/qcom/smd.c | 247 ++- + drivers/soc/qcom/smem.c | 3 +- + drivers/soc/qcom/spm.c | 8 +- + drivers/soc/qcom/wcnss_ctrl.c | 8 +- + drivers/soc/renesas/Makefile | 7 + + drivers/soc/renesas/r8a7779-sysc.c | 34 + + drivers/soc/renesas/r8a7790-sysc.c | 48 + + drivers/soc/renesas/r8a7791-sysc.c | 33 + + drivers/soc/renesas/r8a7794-sysc.c | 33 + + drivers/soc/renesas/r8a7795-sysc.c | 56 + + drivers/soc/renesas/rcar-sysc.c | 401 ++++ + drivers/soc/renesas/rcar-sysc.h | 58 + + drivers/soc/rockchip/pm_domains.c | 247 ++- + drivers/soc/tegra/Kconfig | 2 - + drivers/soc/tegra/pmc.c | 613 +++++- + drivers/soc/versatile/soc-realview.c | 19 +- + drivers/usb/host/Kconfig | 9 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/xhci-tegra.c | 1331 +++++++++++++ + include/dt-bindings/clock/exynos3250.h | 11 +- + include/dt-bindings/clock/exynos5420.h | 24 +- + include/dt-bindings/clock/imx7d-clock.h | 3 +- + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 5 + + include/dt-bindings/clock/rk3399-cru.h | 755 ++++++++ + include/dt-bindings/clock/vf610-clock.h | 8 +- + include/dt-bindings/gpio/tegra-gpio.h | 68 +- + include/dt-bindings/gpio/tegra186-gpio.h | 56 + + include/dt-bindings/pinctrl/hisi.h | 59 + + include/dt-bindings/power/r8a7779-sysc.h | 27 + + include/dt-bindings/power/r8a7790-sysc.h | 34 + + include/dt-bindings/power/r8a7791-sysc.h | 26 + + include/dt-bindings/power/r8a7793-sysc.h | 28 + + include/dt-bindings/power/r8a7794-sysc.h | 26 + + include/dt-bindings/power/r8a7795-sysc.h | 42 + + include/dt-bindings/power/rk3399-power.h | 53 + + include/linux/clk/renesas.h | 16 +- + include/linux/clk/tegra.h | 5 + + include/linux/phy/phy.h | 31 +- + include/linux/phy/tegra/xusb.h | 30 + + include/linux/platform_data/media/ir-rx51.h | 1 + + include/linux/platform_data/pwm_omap_dmtimer.h | 21 + + include/linux/psci.h | 2 - + include/linux/reset-controller.h | 2 + + include/linux/reset.h | 194 +- + include/linux/soc/qcom/smd.h | 11 +- + include/linux/soc/qcom/smem_state.h | 35 + + .../linux/soc/renesas/rcar-sysc.h | 9 +- + include/soc/at91/atmel-sfr.h | 18 + + include/soc/tegra/fuse.h | 1 + + include/soc/tegra/pmc.h | 36 +- + 729 files changed, 47906 insertions(+), 7914 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/oxnas.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nvidia,tegra186-gpio.txt + create mode 100644 Documentation/devicetree/bindings/memory-controllers/exynos-srom.txt + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt + create mode 100644 Documentation/devicetree/bindings/power/renesas,rcar-sysc.txt + create mode 100644 Documentation/devicetree/bindings/reset/oxnas,reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/auxadc.txt + create mode 100644 Documentation/devicetree/bindings/soc/rockchip/grf.txt + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-baltos-ir2110.dts + create mode 100644 arch/arm/boot/dts/am335x-baltos-ir3220.dts + create mode 100644 arch/arm/boot/dts/am335x-baltos.dtsi + create mode 100644 arch/arm/boot/dts/am335x-icev2.dts + create mode 100644 arch/arm/boot/dts/am572x-idk.dts + create mode 100644 arch/arm/boot/dts/am57xx-commercial-grade.dtsi + create mode 100644 arch/arm/boot/dts/am57xx-idk-common.dtsi + create mode 100644 arch/arm/boot/dts/am57xx-industrial-grade.dtsi + create mode 100644 arch/arm/boot/dts/arm-realview-eb-11mp-revb.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb-11mp.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb-a9mp.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb-mp.dtsi + create mode 100644 arch/arm/boot/dts/arm-realview-eb.dts + create mode 100644 arch/arm/boot/dts/arm-realview-eb.dtsi + create mode 100644 arch/arm/boot/dts/arm-realview-pba8.dts + create mode 100644 arch/arm/boot/dts/arm-realview-pbx-a9.dts + create mode 100644 arch/arm/boot/dts/arm-realview-pbx.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-ast2500-evb.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts + create mode 100644 arch/arm/boot/dts/aspeed-g4.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-g5.dtsi + create mode 100644 arch/arm/boot/dts/dra72-evm-common.dtsi + create mode 100644 arch/arm/boot/dts/dra72-evm-revc.dts + create mode 100644 arch/arm/boot/dts/exynos3250-artik5-eval.dts + create mode 100644 arch/arm/boot/dts/exynos3250-artik5.dtsi + create mode 100644 arch/arm/boot/dts/exynos4412-ppmu-common.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8034.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6s-8035.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-8033.dts + create mode 100644 arch/arm/boot/dts/imx6dl-tx6u-81xx-mb7.dts + create mode 100644 arch/arm/boot/dts/imx6q-marsboard.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-1036.dts + create mode 100644 arch/arm/boot/dts/imx6q-tx6q-11x0-mb7.dts + create mode 100644 arch/arm/boot/dts/imx6qp-nitrogen6_max.dts + create mode 100644 arch/arm/boot/dts/imx6sx-nitrogen6sx.dts + create mode 100644 arch/arm/boot/dts/imx6sx-sdb-sai.dts + create mode 100644 arch/arm/boot/dts/imx6ul-pico-hobbit.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul-0010.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul-0011.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts + create mode 100644 arch/arm/boot/dts/imx6ul-tx6ul.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-nitrogen7.dts + rename arch/arm/boot/dts/{k2e-clocks.dtsi => keystone-k2e-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2e-evm.dts => keystone-k2e-evm.dts} (98%) + rename arch/arm/boot/dts/{k2e-netcp.dtsi => keystone-k2e-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2e.dtsi => keystone-k2e.dtsi} (97%) + rename arch/arm/boot/dts/{k2hk-clocks.dtsi => keystone-k2hk-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk-evm.dts => keystone-k2hk-evm.dts} (99%) + rename arch/arm/boot/dts/{k2hk-netcp.dtsi => keystone-k2hk-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2hk.dtsi => keystone-k2hk.dtsi} (96%) + rename arch/arm/boot/dts/{k2l-clocks.dtsi => keystone-k2l-clocks.dtsi} (100%) + rename arch/arm/boot/dts/{k2l-evm.dts => keystone-k2l-evm.dts} (98%) + rename arch/arm/boot/dts/{k2l-netcp.dtsi => keystone-k2l-netcp.dtsi} (100%) + rename arch/arm/boot/dts/{k2l.dtsi => keystone-k2l.dtsi} (96%) + create mode 100644 arch/arm/boot/dts/kirkwood-linksys-viper.dts + rename arch/arm/boot/dts/{ea3250.dts => lpc3250-ea3250.dts} (61%) + create mode 100644 arch/arm/boot/dts/lpc3250-phy3250.dts + rename arch/arm/boot/dts/{rk3288-thermal.dtsi => mps2-an385.dts} (54%) + create mode 100644 arch/arm/boot/dts/mps2-an399.dts + create mode 100644 arch/arm/boot/dts/mps2.dtsi + create mode 100644 arch/arm/boot/dts/omap4-kc1.dts + create mode 100644 arch/arm/boot/dts/orion5x-kuroboxpro.dts + create mode 100644 arch/arm/boot/dts/ox810se.dtsi + delete mode 100644 arch/arm/boot/dts/phy3250.dts + create mode 100644 arch/arm/boot/dts/qcom-apq8064-arrow-db600c-pins.dtsi + create mode 100644 arch/arm/boot/dts/qcom-apq8064-arrow-db600c.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1-c1.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq4019.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-miqi.dts + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts + create mode 100644 arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-difrnce-dit4350.dts + create mode 100644 arch/arm/boot/dts/sun6i-a31s-colorfly-e708-q1.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts + create mode 100644 arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-2.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-one.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts + create mode 100644 arch/arm/boot/dts/vf610-zii-dev-rev-b.dts + create mode 100644 arch/arm/boot/dts/wd-mbwe.dts + create mode 100644 arch/arm/configs/aspeed_g4_defconfig + create mode 100644 arch/arm/configs/aspeed_g5_defconfig + create mode 100644 arch/arm/configs/mps2_defconfig + create mode 100644 arch/arm/mach-aspeed/Kconfig + create mode 100644 arch/arm/mach-davinci/usb-da8xx.c + delete mode 100644 arch/arm/mach-exynos/regs-srom.h + create mode 100644 arch/arm/mach-oxnas/Kconfig + delete mode 100644 arch/arm/mach-shmobile/pm-rcar.c + create mode 100644 arch/arm/mach-vexpress/Makefile.boot + create mode 100644 arch/arm/mach-vexpress/v2m-mps2.c + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi + create mode 100644 arch/arm64/boot/dts/broadcom/ns2-clock.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi + create mode 100644 arch/arm64/boot/dts/exynos/exynos7-trip-points.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hikey-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/hisilicon/hip06-d03.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/hip06.dtsi + create mode 100644 arch/arm64/boot/dts/lg/Makefile + create mode 100644 arch/arm64/boot/dts/lg/lg1312-ref.dts + create mode 100644 arch/arm64/boot/dts/lg/lg1312.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-smaug.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts + rename arch/arm64/boot/dts/rockchip/{rk3368-thermal.dtsi => rk3399-evb.dts} (55%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399.dtsi + create mode 120000 arch/arm64/boot/dts/socionext/uniphier-ref-daughter.dtsi + create mode 100644 drivers/clk/renesas/Kconfig + create mode 100644 drivers/memory/samsung/Kconfig + create mode 100644 drivers/memory/samsung/Makefile + create mode 100644 drivers/memory/samsung/exynos-srom.c + create mode 100644 drivers/memory/samsung/exynos-srom.h + create mode 100644 drivers/mtd/maps/physmap_of_versatile.c + create mode 100644 drivers/mtd/maps/physmap_of_versatile.h + create mode 100644 drivers/phy/tegra/Kconfig + create mode 100644 drivers/phy/tegra/Makefile + create mode 100644 drivers/phy/tegra/xusb-tegra124.c + create mode 100644 drivers/phy/tegra/xusb-tegra210.c + create mode 100644 drivers/phy/tegra/xusb.c + create mode 100644 drivers/phy/tegra/xusb.h + create mode 100644 drivers/reset/reset-oxnas.c + create mode 100644 drivers/soc/renesas/Makefile + create mode 100644 drivers/soc/renesas/r8a7779-sysc.c + create mode 100644 drivers/soc/renesas/r8a7790-sysc.c + create mode 100644 drivers/soc/renesas/r8a7791-sysc.c + create mode 100644 drivers/soc/renesas/r8a7794-sysc.c + create mode 100644 drivers/soc/renesas/r8a7795-sysc.c + create mode 100644 drivers/soc/renesas/rcar-sysc.c + create mode 100644 drivers/soc/renesas/rcar-sysc.h + create mode 100644 drivers/usb/host/xhci-tegra.c + create mode 100644 include/dt-bindings/clock/rk3399-cru.h + create mode 100644 include/dt-bindings/gpio/tegra186-gpio.h + create mode 100644 include/dt-bindings/pinctrl/hisi.h + create mode 100644 include/dt-bindings/power/r8a7779-sysc.h + create mode 100644 include/dt-bindings/power/r8a7790-sysc.h + create mode 100644 include/dt-bindings/power/r8a7791-sysc.h + create mode 100644 include/dt-bindings/power/r8a7793-sysc.h + create mode 100644 include/dt-bindings/power/r8a7794-sysc.h + create mode 100644 include/dt-bindings/power/r8a7795-sysc.h + create mode 100644 include/dt-bindings/power/rk3399-power.h + create mode 100644 include/linux/phy/tegra/xusb.h + rename arch/arm/mach-shmobile/pm-rcar.h => include/linux/soc/renesas/rcar-sysc.h (60%) + create mode 100644 include/soc/at91/atmel-sfr.h +Merging at91/at91-next (5a0d7c6a48ae Merge branch 'at91-4.7-defconfig' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835-dt/bcm2835-dt-next (896ad420db8d dt/bindings: bcm2835: correct description for DMA-int) +$ git merge bcm2835-dt/bcm2835-dt-next +Already up-to-date. +Merging bcm2835-soc/bcm2835-soc-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (3652bb35abf6 ARM: bcm2835: Enable NFS root support.) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Already up-to-date. +Merging berlin/berlin/for-next (9a7e06833249 Merge branch 'berlin/fixes' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (63b44471754b Merge branch 'imx/defconfig64' into for-next) +$ git merge imx-mxs/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/imx35-clock.txt | 1 + + drivers/clk/imx/clk-imx35.c | 4 ++-- + drivers/clk/imx/clk-imx7d.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 9 ++++++++- + 4 files changed, 12 insertions(+), 4 deletions(-) +Merging keystone/next (02e15d234006 Merge branch 'for_4.7/kesytone' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (01316cded75b Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (5c66191b5c76 Merge branch 'omap-for-v4.7/dt' into for-next) +$ git merge omap/for-next +Auto-merging arch/arm/boot/dts/dm814x-clocks.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-idk-common.dtsi | 32 ++++++++++--------- + arch/arm/boot/dts/dm8148-evm.dts | 8 +++++ + arch/arm/boot/dts/dm8148-t410.dts | 9 ++++++ + arch/arm/boot/dts/dm814x-clocks.dtsi | 4 +-- + arch/arm/boot/dts/dra7.dtsi | 2 ++ + arch/arm/boot/dts/omap3-evm-37xx.dts | 2 +- + arch/arm/boot/dts/omap3-igep.dtsi | 1 + + arch/arm/boot/dts/omap3-igep0020-common.dtsi | 11 +++++++ + arch/arm/boot/dts/omap3-n900.dts | 4 +-- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 6 ++-- + arch/arm/boot/dts/omap3-zoom3.dts | 6 ++-- + arch/arm/boot/dts/omap5-board-common.dtsi | 48 ++++++++++++++++++++++++++-- + arch/arm/boot/dts/omap5-igep0050.dts | 26 +++++++++++++++ + arch/arm/boot/dts/omap5-uevm.dts | 10 ++++++ + arch/arm/mach-omap2/Kconfig | 10 ++++++ + arch/arm/mach-omap2/omap-secure.h | 1 + + arch/arm/mach-omap2/omap-smp.c | 48 +++++++++++++++++++++++++--- + 17 files changed, 195 insertions(+), 33 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (100b83d52f51 ARM: dts: msm8974: Add SCM firmware node) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/firmware/qcom,scm.txt | 25 ++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + drivers/firmware/qcom_scm-32.c | 82 +++++++ + drivers/firmware/qcom_scm-64.c | 25 ++ + drivers/firmware/qcom_scm.c | 271 ++++++++++++++++++++- + drivers/firmware/qcom_scm.h | 12 + + include/linux/qcom_scm.h | 6 + + 7 files changed, 424 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt +Merging renesas/next (e5c640c6f9cc Merge branches 'heads/arm64-defconfig-for-v4.7', 'heads/arm64-dt-pm-domain-for-v4.7', 'heads/dt-for-v4.7' and 'heads/pci-defconfig-for-v4.7' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (a108aca0c77f Merge branch 'v4.7-clk/fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3399-cru.txt | 62 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-cpu.c | 29 +- + drivers/clk/rockchip/clk-mmc-phase.c | 15 +- + drivers/clk/rockchip/clk-pll.c | 336 ++++- + drivers/clk/rockchip/clk-rk3036.c | 21 +- + drivers/clk/rockchip/clk-rk3188.c | 51 +- + drivers/clk/rockchip/clk-rk3228.c | 21 +- + drivers/clk/rockchip/clk-rk3288.c | 23 +- + drivers/clk/rockchip/clk-rk3368.c | 28 +- + drivers/clk/rockchip/clk-rk3399.c | 1575 ++++++++++++++++++++ + drivers/clk/rockchip/clk.c | 151 +- + drivers/clk/rockchip/clk.h | 104 +- + 13 files changed, 2235 insertions(+), 182 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt + create mode 100644 drivers/clk/rockchip/clk-rk3399.c +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (92e963f50fc7 Linux 4.5-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (05e8e9a8696c Merge branch 'fixes' into for-next) +$ git merge samsung-krzk/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (5c282bc9d0a3 Merge branch for-4.7/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging drivers/clk/tegra/clk.c +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/tegra30-beaver.dts | 39 ++++++---- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-dfll.c | 11 +-- + drivers/clk/tegra/clk-dfll.h | 22 +++--- + drivers/clk/tegra/clk-id.h | 2 + + drivers/clk/tegra/clk-periph-fixed.c | 120 +++++++++++++++++++++++++++++ + drivers/clk/tegra/clk-periph-gate.c | 2 +- + drivers/clk/tegra/clk-periph.c | 2 +- + drivers/clk/tegra/clk-pll.c | 46 +++++++++++ + drivers/clk/tegra/clk-tegra-fixed.c | 1 - + drivers/clk/tegra/clk-tegra-periph.c | 5 +- + drivers/clk/tegra/clk-tegra114.c | 6 +- + drivers/clk/tegra/clk-tegra124-dfll-fcpu.c | 103 ++++++++++++++----------- + drivers/clk/tegra/clk-tegra124.c | 4 + + drivers/clk/tegra/clk-tegra210.c | 29 ++++++- + drivers/clk/tegra/clk-tegra30.c | 12 +-- + drivers/clk/tegra/clk.c | 4 +- + drivers/clk/tegra/clk.h | 27 ++++++- + drivers/clk/tegra/cvb.c | 71 ++++++++++------- + drivers/clk/tegra/cvb.h | 15 ++-- + include/dt-bindings/clock/tegra210-car.h | 2 +- + 21 files changed, 394 insertions(+), 130 deletions(-) + create mode 100644 drivers/clk/tegra/clk-periph-fixed.c +Merging arm64/for-next/core (e6d9a5254333 arm64: do not enforce strict 16 byte alignment to stack pointer) +$ git merge arm64/for-next/core +Already up-to-date. +Merging blackfin/for-linus (391e74a51ea2 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Resolved 'arch/blackfin/mach-common/pm.c' using previous resolution. +Auto-merging arch/blackfin/mach-common/pm.c +CONFLICT (content): Merge conflict in arch/blackfin/mach-common/pm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master df8cbad69d00] Merge remote-tracking branch 'blackfin/for-linus' +$ git diff -M --stat --summary HEAD^.. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (8cad489261c5 h8300: switch EARLYCON) +$ git merge h8300/h8300-next +Already up-to-date. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (787ca32dc704 ia64/unaligned: Silence another GCC warning about an uninitialised variable) +$ git merge ia64/next +Merge made by the 'recursive' strategy. + arch/ia64/kernel/mca.c | 5 +---- + arch/ia64/kernel/traps.c | 1 + + arch/ia64/kernel/unaligned.c | 1 + + arch/ia64/sn/kernel/io_acpi_init.c | 1 - + arch/ia64/sn/kernel/io_init.c | 4 ++-- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 35 +++++++++++++++++++++++------------ + 6 files changed, 28 insertions(+), 19 deletions(-) +Merging m68k/for-next (9a6462763b17 m68k/mvme16x: Include generic <linux/rtc.h>) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (44156affd184 m68k: change m68knommu maintainer email address) +$ git merge m68knommu/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging metag/for-next (096a8b6d5e7a metag: Fix atomic_*_return inline asm constraints) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (52e9e6e05617 microblaze: pci: export isa_io_base to fix link errors) +$ git merge microblaze/next +Merge made by the 'recursive' strategy. + arch/microblaze/include/asm/unistd.h | 2 +- + arch/microblaze/include/uapi/asm/unistd.h | 3 +++ + arch/microblaze/kernel/syscall_table.S | 3 +++ + arch/microblaze/pci/pci-common.c | 2 ++ + 4 files changed, 9 insertions(+), 1 deletion(-) +Merging mips/mips-for-linux-next (2c93cd0d5d69 MIPS: Clear Status IPL field when using EIC) +$ git merge mips/mips-for-linux-next +Auto-merging include/linux/signal.h +Removing drivers/usb/host/ohci-jz4740.c +Auto-merging drivers/firmware/broadcom/bcm47xx_sprom.c +Auto-merging drivers/cpufreq/loongson1-cpufreq.c +Auto-merging drivers/cpufreq/Makefile +Auto-merging drivers/clk/Kconfig +Removing arch/mips/math-emu/sp_msubf.c +Removing arch/mips/math-emu/dp_msubf.c +Removing arch/mips/include/asm/clkdev.h +Auto-merging arch/mips/configs/loongson1b_defconfig +Removing arch/mips/boot/dts/pic32/pic32mzda-clk.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/microchip,pic32.txt | 39 + + .../interrupt-controller/brcm,bcm6345-l1-intc.txt | 57 ++ + .../devicetree/bindings/mips/brcm/soc.txt | 3 +- + .../devicetree/bindings/mips/cavium/ciu3.txt | 27 + + .../bindings/serial/microchip,pic32-uart.txt | 29 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../bindings/watchdog/microchip,pic32-dmt.txt | 19 + + .../bindings/watchdog/microchip,pic32-wdt.txt | 18 + + MAINTAINERS | 13 +- + arch/mips/Kconfig | 139 ++- + arch/mips/Makefile | 22 + + arch/mips/alchemy/common/clock.c | 3 +- + arch/mips/ath79/Kconfig | 12 - + arch/mips/ath79/clock.c | 213 ++-- + arch/mips/ath79/common.c | 24 +- + arch/mips/ath79/setup.c | 61 +- + arch/mips/bcm47xx/Makefile | 2 +- + arch/mips/bcm47xx/bcm47xx_private.h | 3 - + arch/mips/bcm47xx/setup.c | 2 +- + arch/mips/bmips/Kconfig | 4 + + arch/mips/bmips/setup.c | 12 + + arch/mips/boot/compressed/Makefile | 5 + + arch/mips/boot/dts/brcm/Makefile | 2 + + arch/mips/boot/dts/brcm/bcm6328.dtsi | 50 +- + arch/mips/boot/dts/brcm/bcm6358.dtsi | 130 +++ + arch/mips/boot/dts/brcm/bcm6368.dtsi | 32 +- + arch/mips/boot/dts/brcm/bcm7125.dtsi | 69 +- + arch/mips/boot/dts/brcm/bcm7346.dtsi | 6 +- + arch/mips/boot/dts/brcm/bcm7358.dtsi | 2 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 42 +- + arch/mips/boot/dts/brcm/bcm7362.dtsi | 6 +- + arch/mips/boot/dts/brcm/bcm7420.dtsi | 77 +- + arch/mips/boot/dts/brcm/bcm7425.dtsi | 100 +- + arch/mips/boot/dts/brcm/bcm7435.dtsi | 141 ++- + arch/mips/boot/dts/brcm/bcm96358nb4ser.dts | 46 + + arch/mips/boot/dts/brcm/bcm96368mvwg.dts | 4 +- + arch/mips/boot/dts/brcm/bcm97125cbmb.dts | 24 + + arch/mips/boot/dts/brcm/bcm97360svmb.dts | 8 + + arch/mips/boot/dts/brcm/bcm97420c.dts | 28 + + arch/mips/boot/dts/brcm/bcm97425svmb.dts | 28 + + arch/mips/boot/dts/brcm/bcm97435svmb.dts | 38 +- + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 78 ++ + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dts | 205 +--- + arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi | 231 +++++ + arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts | 59 ++ + arch/mips/boot/dts/ingenic/jz4740.dtsi | 14 + + arch/mips/boot/dts/lantiq/easy50712.dts | 2 +- + arch/mips/boot/dts/pic32/pic32mzda-clk.dtsi | 236 ----- + arch/mips/boot/dts/pic32/pic32mzda.dtsi | 63 +- + arch/mips/boot/dts/pic32/pic32mzda_sk.dts | 5 +- + arch/mips/boot/dts/qca/Makefile | 7 +- + arch/mips/boot/dts/qca/ar9132.dtsi | 17 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 98 +- + arch/mips/boot/dts/qca/ar9331.dtsi | 155 +++ + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 78 ++ + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 102 ++ + arch/mips/boot/dts/qca/ar9331_omega.dts | 78 ++ + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 118 +++ + arch/mips/boot/tools/.gitignore | 1 + + arch/mips/boot/tools/Makefile | 8 + + arch/mips/boot/tools/relocs.c | 680 +++++++++++++ + arch/mips/boot/tools/relocs.h | 45 + + arch/mips/boot/tools/relocs_32.c | 17 + + arch/mips/boot/tools/relocs_64.c | 27 + + arch/mips/boot/tools/relocs_main.c | 84 ++ + arch/mips/cavium-octeon/csrc-octeon.c | 13 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 43 + + arch/mips/cavium-octeon/executive/cvmx-sysinfo.c | 72 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 82 +- + arch/mips/cavium-octeon/octeon-irq.c | 679 ++++++++++++- + arch/mips/cavium-octeon/octeon-platform.c | 94 +- + arch/mips/cavium-octeon/setup.c | 86 +- + arch/mips/cavium-octeon/smp.c | 155 ++- + arch/mips/configs/bcm47xx_defconfig | 1 - + arch/mips/configs/bcm63xx_defconfig | 1 + + arch/mips/configs/bigsur_defconfig | 1 - + arch/mips/configs/bmips_be_defconfig | 1 + + arch/mips/configs/cavium_octeon_defconfig | 15 +- + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/ip22_defconfig | 1 - + arch/mips/configs/ip27_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 1 - + .../{ls1b_defconfig => loongson1b_defconfig} | 35 +- + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/nlm_xlp_defconfig | 1 - + arch/mips/configs/nlm_xlr_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/dec/setup.c | 1 + + arch/mips/include/asm/Kbuild | 1 + + arch/mips/include/asm/asmmacro.h | 195 ++-- + arch/mips/include/asm/bitops.h | 17 +- + arch/mips/include/asm/bitrev.h | 30 + + arch/mips/include/asm/bmips.h | 1 + + arch/mips/include/asm/bootinfo.h | 18 + + arch/mips/include/asm/cacheflush.h | 7 +- + arch/mips/include/asm/cacheops.h | 6 + + arch/mips/include/asm/clkdev.h | 27 - + arch/mips/include/asm/cpu-features.h | 137 ++- + arch/mips/include/asm/cpu-info.h | 43 +- + arch/mips/include/asm/cpu-type.h | 5 + + arch/mips/include/asm/cpu.h | 113 ++- + arch/mips/include/asm/elf.h | 149 +-- + arch/mips/include/asm/hazards.h | 7 +- + arch/mips/include/asm/highmem.h | 4 +- + arch/mips/include/asm/io.h | 10 +- + arch/mips/include/asm/irq_regs.h | 10 + + arch/mips/include/asm/irqflags.h | 5 + + arch/mips/include/asm/kvm_host.h | 5 +- + arch/mips/include/asm/llsc.h | 28 + + .../include/asm/mach-bmips/cpu-feature-overrides.h | 14 + + arch/mips/include/asm/mach-bmips/ioremap.h | 33 + + arch/mips/include/asm/mach-jz4740/platform.h | 1 - + .../include/asm/mach-lantiq/falcon/lantiq_soc.h | 2 +- + arch/mips/include/asm/mach-lantiq/lantiq.h | 2 +- + .../mips/include/asm/mach-lantiq/lantiq_platform.h | 2 +- + arch/mips/include/asm/mach-lantiq/xway/irq.h | 2 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_irq.h | 2 +- + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 2 +- + arch/mips/include/asm/mach-lantiq/xway/xway_dma.h | 2 +- + arch/mips/include/asm/mach-loongson32/cpufreq.h | 1 - + arch/mips/include/asm/mach-loongson32/dma.h | 25 + + arch/mips/include/asm/mach-loongson32/irq.h | 1 - + arch/mips/include/asm/mach-loongson32/loongson1.h | 4 +- + arch/mips/include/asm/mach-loongson32/nand.h | 30 + + arch/mips/include/asm/mach-loongson32/platform.h | 14 +- + arch/mips/include/asm/mach-loongson32/regs-clk.h | 24 +- + arch/mips/include/asm/mach-loongson32/regs-mux.h | 84 +- + arch/mips/include/asm/mach-loongson32/regs-pwm.h | 12 +- + .../asm/mach-loongson64/cpu-feature-overrides.h | 18 +- + .../asm/mach-loongson64/kernel-entry-init.h | 18 +- + arch/mips/include/asm/mach-ralink/mt7620.h | 3 +- + arch/mips/include/asm/mach-ralink/mt7621.h | 2 +- + arch/mips/include/asm/mach-ralink/pinmux.h | 2 +- + arch/mips/include/asm/mach-ralink/ralink_regs.h | 2 +- + arch/mips/include/asm/mach-ralink/rt288x.h | 2 +- + arch/mips/include/asm/mach-ralink/rt305x.h | 2 +- + arch/mips/include/asm/mips-cm.h | 12 +- + arch/mips/include/asm/mips-cpc.h | 3 + + arch/mips/include/asm/mipsregs.h | 636 +++++++++++- + arch/mips/include/asm/mmu_context.h | 41 +- + arch/mips/include/asm/msa.h | 13 + + arch/mips/include/asm/octeon/cvmx-bootinfo.h | 16 +- + arch/mips/include/asm/octeon/cvmx-ciu3-defs.h | 353 +++++++ + arch/mips/include/asm/octeon/cvmx-coremask.h | 89 ++ + arch/mips/include/asm/octeon/cvmx-fpa-defs.h | 1 + + arch/mips/include/asm/octeon/cvmx-mio-defs.h | 410 +++++++- + arch/mips/include/asm/octeon/cvmx-sysinfo.h | 37 +- + arch/mips/include/asm/octeon/cvmx.h | 27 +- + arch/mips/include/asm/octeon/octeon-feature.h | 19 +- + arch/mips/include/asm/octeon/octeon-model.h | 5 + + arch/mips/include/asm/octeon/octeon.h | 25 + + arch/mips/include/asm/pci.h | 10 +- + arch/mips/include/asm/pgtable-32.h | 33 +- + arch/mips/include/asm/pgtable-64.h | 18 +- + arch/mips/include/asm/pgtable-bits.h | 213 ++-- + arch/mips/include/asm/pgtable.h | 156 ++- + arch/mips/include/asm/processor.h | 10 +- + arch/mips/include/asm/seccomp.h | 47 +- + arch/mips/include/asm/sibyte/bcm1480_regs.h | 4 +- + arch/mips/include/asm/signal.h | 12 +- + arch/mips/include/asm/smp-cps.h | 2 +- + arch/mips/include/asm/switch_to.h | 2 +- + arch/mips/include/asm/uasm.h | 3 +- + arch/mips/include/asm/watch.h | 10 +- + arch/mips/include/uapi/asm/inst.h | 11 + + arch/mips/include/uapi/asm/siginfo.h | 22 +- + arch/mips/jz4740/board-qi_lb60.c | 52 +- + arch/mips/jz4740/platform.c | 25 - + arch/mips/kernel/Makefile | 4 +- + arch/mips/kernel/asm-offsets.c | 10 + + arch/mips/kernel/binfmt_elfn32.c | 16 +- + arch/mips/kernel/binfmt_elfo32.c | 32 +- + arch/mips/kernel/bmips_5xxx_init.S | 753 ++++++++++++++ + arch/mips/kernel/bmips_vec.S | 50 +- + arch/mips/kernel/branch.c | 18 +- + arch/mips/kernel/cevt-r4k.c | 82 +- + arch/mips/kernel/cps-vec.S | 296 ++++-- + arch/mips/kernel/cpu-probe.c | 380 +++++++- + arch/mips/kernel/crash.c | 16 +- + arch/mips/kernel/genex.S | 58 +- + arch/mips/kernel/head.S | 21 +- + arch/mips/kernel/idle.c | 5 + + arch/mips/kernel/irq.c | 3 + + arch/mips/kernel/mips-r2-to-r6-emul.c | 105 +- + arch/mips/kernel/module-rela.c | 58 +- + arch/mips/kernel/module.c | 60 +- + arch/mips/kernel/perf_event_mipsxx.c | 64 +- + arch/mips/kernel/pm-cps.c | 15 +- + arch/mips/kernel/pm.c | 2 +- + arch/mips/kernel/proc.c | 1 + + arch/mips/kernel/process.c | 50 +- + arch/mips/kernel/ptrace.c | 34 +- + arch/mips/kernel/r4k_fpu.S | 10 +- + arch/mips/kernel/r4k_switch.S | 1 - + arch/mips/kernel/relocate.c | 386 ++++++++ + arch/mips/kernel/scall32-o32.S | 11 +- + arch/mips/kernel/scall64-64.S | 3 +- + arch/mips/kernel/scall64-n32.S | 14 +- + arch/mips/kernel/scall64-o32.S | 14 +- + arch/mips/kernel/setup.c | 79 +- + arch/mips/kernel/signal.c | 9 +- + arch/mips/kernel/signal32.c | 6 + + arch/mips/kernel/smp-bmips.c | 88 ++ + arch/mips/kernel/smp-cps.c | 64 +- + arch/mips/kernel/smp.c | 24 +- + arch/mips/kernel/spram.c | 1 + + arch/mips/kernel/traps.c | 32 +- + arch/mips/kernel/unaligned.c | 1 + + arch/mips/kernel/vmlinux.lds.S | 21 + + arch/mips/kernel/watch.c | 79 +- + arch/mips/kvm/emulate.c | 25 +- + arch/mips/kvm/locore.S | 94 +- + arch/mips/kvm/tlb.c | 33 +- + arch/mips/kvm/trap_emul.c | 3 +- + arch/mips/lantiq/Kconfig | 12 +- + arch/mips/lantiq/Makefile | 2 +- + arch/mips/lantiq/clk.c | 2 +- + arch/mips/lantiq/clk.h | 2 +- + arch/mips/lantiq/early_printk.c | 2 +- + arch/mips/lantiq/falcon/prom.c | 2 +- + arch/mips/lantiq/falcon/reset.c | 2 +- + arch/mips/lantiq/falcon/sysctrl.c | 2 +- + arch/mips/lantiq/irq.c | 2 +- + arch/mips/lantiq/prom.c | 15 +- + arch/mips/lantiq/prom.h | 2 +- + arch/mips/lantiq/xway/clk.c | 2 +- + arch/mips/lantiq/xway/dcdc.c | 2 +- + arch/mips/lantiq/xway/dma.c | 2 +- + arch/mips/lantiq/xway/gptu.c | 2 +- + arch/mips/lantiq/xway/prom.c | 2 +- + arch/mips/lantiq/xway/reset.c | 4 +- + arch/mips/lantiq/xway/sysctrl.c | 2 +- + arch/mips/lantiq/xway/vmmc.c | 2 +- + arch/mips/lantiq/xway/xrx200_phy_fw.c | 4 +- + arch/mips/lib/dump_tlb.c | 27 +- + arch/mips/lib/memset.S | 2 + + arch/mips/lib/r3k_dump_tlb.c | 9 +- + arch/mips/loongson32/common/platform.c | 105 +- + arch/mips/loongson32/common/reset.c | 13 +- + arch/mips/loongson32/common/time.c | 27 +- + arch/mips/loongson32/ls1b/board.c | 67 +- + arch/mips/loongson64/Platform | 2 +- + arch/mips/loongson64/common/env.c | 7 +- + arch/mips/loongson64/loongson-3/Makefile | 2 +- + .../mips/loongson64/loongson-3}/acpi_init.c | 0 + arch/mips/loongson64/loongson-3/irq.c | 10 +- + arch/mips/loongson64/loongson-3/numa.c | 6 +- + arch/mips/loongson64/loongson-3/smp.c | 107 +- + arch/mips/math-emu/Makefile | 4 +- + arch/mips/math-emu/cp1emu.c | 45 +- + arch/mips/math-emu/dp_maddf.c | 35 +- + arch/mips/math-emu/dp_msubf.c | 269 ----- + arch/mips/math-emu/dp_mul.c | 4 +- + arch/mips/math-emu/dsemul.c | 2 +- + arch/mips/math-emu/ieee754dp.c | 9 +- + arch/mips/math-emu/ieee754dp.h | 1 + + arch/mips/math-emu/ieee754int.h | 10 + + arch/mips/math-emu/ieee754sp.c | 12 +- + arch/mips/math-emu/ieee754sp.h | 17 +- + arch/mips/math-emu/sp_add.c | 6 +- + arch/mips/math-emu/sp_maddf.c | 43 +- + arch/mips/math-emu/sp_msubf.c | 258 ----- + arch/mips/math-emu/sp_sub.c | 6 +- + arch/mips/mm/c-r4k.c | 72 +- + arch/mips/mm/cache.c | 41 +- + arch/mips/mm/dma-default.c | 7 +- + arch/mips/mm/init.c | 14 +- + arch/mips/mm/page.c | 9 + + arch/mips/mm/sc-mips.c | 1 + + arch/mips/mm/tlb-r3k.c | 24 +- + arch/mips/mm/tlb-r4k.c | 35 +- + arch/mips/mm/tlb-r8k.c | 2 +- + arch/mips/mm/tlbex.c | 240 +++-- + arch/mips/mm/uasm-mips.c | 2 + + arch/mips/mm/uasm.c | 3 + + arch/mips/mti-malta/malta-setup.c | 7 +- + arch/mips/mti-malta/malta-time.c | 40 +- + arch/mips/mti-sead3/sead3-setup.c | 5 + + arch/mips/netlogic/common/reset.S | 11 +- + arch/mips/netlogic/common/smpboot.S | 4 +- + arch/mips/netlogic/xlp/nlm_hal.c | 2 +- + arch/mips/netlogic/xlr/setup.c | 2 +- + arch/mips/oprofile/common.c | 2 +- + arch/mips/oprofile/op_model_mipsxx.c | 4 +- + arch/mips/pci/fixup-lantiq.c | 2 +- + arch/mips/pci/ops-lantiq.c | 2 +- + arch/mips/pci/pci-alchemy.c | 2 +- + arch/mips/pci/pci-ip32.c | 1 - + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-lantiq.h | 2 +- + arch/mips/pci/pci-mt7620.c | 2 +- + arch/mips/pci/pci-rt2880.c | 2 +- + arch/mips/pci/pci.c | 3 - + arch/mips/pic32/pic32mzda/time.c | 13 +- + arch/mips/pistachio/init.c | 35 +- + arch/mips/pmcs-msp71xx/msp_setup.c | 2 +- + arch/mips/pnx833x/common/setup.c | 3 - + arch/mips/ralink/Makefile | 2 +- + arch/mips/ralink/bootrom.c | 2 +- + arch/mips/ralink/cevt-rt3352.c | 2 +- + arch/mips/ralink/clk.c | 2 +- + arch/mips/ralink/common.h | 2 +- + arch/mips/ralink/ill_acc.c | 2 +- + arch/mips/ralink/irq-gic.c | 2 +- + arch/mips/ralink/irq.c | 2 +- + arch/mips/ralink/mt7620.c | 9 +- + arch/mips/ralink/mt7621.c | 2 +- + arch/mips/ralink/of.c | 2 +- + arch/mips/ralink/prom.c | 2 +- + arch/mips/ralink/reset.c | 4 +- + arch/mips/ralink/rt288x.c | 2 +- + arch/mips/ralink/rt305x.c | 2 +- + arch/mips/ralink/rt3883.c | 2 +- + arch/mips/ralink/timer-gic.c | 2 +- + arch/mips/ralink/timer.c | 4 +- + arch/mips/sibyte/Kconfig | 3 +- + arch/mips/vdso/Makefile | 40 +- + arch/mips/vr41xx/common/pmu.c | 2 +- + drivers/bus/brcmstb_gisb.c | 30 + + drivers/bus/mips_cdmm.c | 12 +- + drivers/clk/Kconfig | 3 + + drivers/clk/Makefile | 1 + + drivers/clk/microchip/Makefile | 2 + + drivers/clk/microchip/clk-core.c | 1031 ++++++++++++++++++++ + drivers/clk/microchip/clk-core.h | 84 ++ + drivers/clk/microchip/clk-pic32mzda.c | 275 ++++++ + drivers/cpufreq/Makefile | 2 +- + .../{ls1x-cpufreq.c => loongson1-cpufreq.c} | 114 +-- + drivers/firmware/broadcom/Kconfig | 11 + + drivers/firmware/broadcom/Makefile | 1 + + .../firmware/broadcom/bcm47xx_sprom.c | 27 +- + drivers/irqchip/irq-mips-gic.c | 22 +- + drivers/platform/mips/Kconfig | 4 - + drivers/platform/mips/Makefile | 1 - + drivers/platform/mips/cpu_hwmon.c | 4 +- + drivers/tty/serial/Kconfig | 21 + + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/pic32_uart.c | 960 ++++++++++++++++++ + drivers/tty/serial/pic32_uart.h | 126 +++ + drivers/usb/host/ohci-hcd.c | 5 - + drivers/usb/host/ohci-jz4740.c | 245 ----- + drivers/watchdog/Kconfig | 26 + + drivers/watchdog/Makefile | 2 + + drivers/watchdog/pic32-dmt.c | 257 +++++ + drivers/watchdog/pic32-wdt.c | 263 +++++ + fs/proc/vmcore.c | 2 +- + include/asm-generic/seccomp.h | 14 + + include/asm-generic/siginfo.h | 15 - + include/dt-bindings/clock/ath79-clk.h | 19 + + include/dt-bindings/clock/microchip,pic32-clock.h | 42 + + include/linux/bcm47xx_sprom.h | 24 + + include/linux/crash_dump.h | 8 +- + include/linux/irqchip/mips-gic.h | 17 + + include/linux/signal.h | 15 + + include/uapi/linux/serial_core.h | 3 + + kernel/seccomp.c | 13 +- + scripts/ld-version.sh | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 30 +- + 359 files changed, 14008 insertions(+), 3399 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/microchip,pic32.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm6345-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/mips/cavium/ciu3.txt + create mode 100644 Documentation/devicetree/bindings/serial/microchip,pic32-uart.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-dmt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/microchip,pic32-wdt.txt + create mode 100644 arch/mips/boot/dts/brcm/bcm6358.dtsi + create mode 100644 arch/mips/boot/dts/brcm/bcm96358nb4ser.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/dlink_dsr-1000n.dts + create mode 100644 arch/mips/boot/dts/cavium-octeon/octeon_3xxx.dtsi + create mode 100644 arch/mips/boot/dts/cavium-octeon/ubnt_e100.dts + delete mode 100644 arch/mips/boot/dts/pic32/pic32mzda-clk.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331.dtsi + create mode 100644 arch/mips/boot/dts/qca/ar9331_dpt_module.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_omega.dts + create mode 100644 arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts + create mode 100644 arch/mips/boot/tools/.gitignore + create mode 100644 arch/mips/boot/tools/Makefile + create mode 100644 arch/mips/boot/tools/relocs.c + create mode 100644 arch/mips/boot/tools/relocs.h + create mode 100644 arch/mips/boot/tools/relocs_32.c + create mode 100644 arch/mips/boot/tools/relocs_64.c + create mode 100644 arch/mips/boot/tools/relocs_main.c + rename arch/mips/configs/{ls1b_defconfig => loongson1b_defconfig} (84%) + create mode 100644 arch/mips/include/asm/bitrev.h + delete mode 100644 arch/mips/include/asm/clkdev.h + create mode 100644 arch/mips/include/asm/llsc.h + create mode 100644 arch/mips/include/asm/mach-bmips/cpu-feature-overrides.h + create mode 100644 arch/mips/include/asm/mach-bmips/ioremap.h + create mode 100644 arch/mips/include/asm/mach-loongson32/dma.h + create mode 100644 arch/mips/include/asm/mach-loongson32/nand.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-ciu3-defs.h + create mode 100644 arch/mips/include/asm/octeon/cvmx-coremask.h + create mode 100644 arch/mips/kernel/bmips_5xxx_init.S + create mode 100644 arch/mips/kernel/relocate.c + rename {drivers/platform/mips => arch/mips/loongson64/loongson-3}/acpi_init.c (100%) + delete mode 100644 arch/mips/math-emu/dp_msubf.c + delete mode 100644 arch/mips/math-emu/sp_msubf.c + create mode 100644 drivers/clk/microchip/Makefile + create mode 100644 drivers/clk/microchip/clk-core.c + create mode 100644 drivers/clk/microchip/clk-core.h + create mode 100644 drivers/clk/microchip/clk-pic32mzda.c + rename drivers/cpufreq/{ls1x-cpufreq.c => loongson1-cpufreq.c} (65%) + rename arch/mips/bcm47xx/sprom.c => drivers/firmware/broadcom/bcm47xx_sprom.c (98%) + create mode 100644 drivers/tty/serial/pic32_uart.c + create mode 100644 drivers/tty/serial/pic32_uart.h + delete mode 100644 drivers/usb/host/ohci-jz4740.c + create mode 100644 drivers/watchdog/pic32-dmt.c + create mode 100644 drivers/watchdog/pic32-wdt.c + create mode 100644 include/dt-bindings/clock/ath79-clk.h + create mode 100644 include/dt-bindings/clock/microchip,pic32-clock.h + create mode 100644 include/linux/bcm47xx_sprom.h +Merging nios2/for-next (1a0f29e06356 nios2: Add order-only DTC dependency to %.dtb target) +$ git merge nios2/for-next +Merge made by the 'recursive' strategy. + arch/nios2/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging parisc-hd/for-next (695499920489 parisc: Add native high-resolution sched_clock() implementation) +$ git merge parisc-hd/for-next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging arch/parisc/kernel/syscall.S +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 3 + + arch/parisc/include/asm/cmpxchg.h | 9 +- + arch/parisc/include/asm/ftrace.h | 2 + + arch/parisc/include/asm/syscall.h | 9 + + arch/parisc/include/asm/thread_info.h | 4 +- + arch/parisc/include/asm/uaccess.h | 91 +++---- + arch/parisc/include/uapi/asm/ptrace.h | 48 ++++ + arch/parisc/kernel/ptrace.c | 368 +++++++++++++++++++++++++- + arch/parisc/kernel/syscall.S | 1 + + arch/parisc/kernel/time.c | 63 ++++- + arch/parisc/lib/bitops.c | 6 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 8 +- + 12 files changed, 542 insertions(+), 70 deletions(-) +Merging powerpc/next (1d4e89cf0a4e powerpc/powernv/npu: Add PE to PHB's list) +$ git merge powerpc/next +Resolved 'arch/powerpc/kernel/prom.c' using previous resolution. +Auto-merging tools/testing/selftests/powerpc/reg.h +Auto-merging tools/perf/config/Makefile +Auto-merging drivers/misc/cxl/native.c +Auto-merging drivers/misc/cxl/cxl.h +Auto-merging drivers/misc/cxl/context.c +Auto-merging drivers/infiniband/hw/qib/qib_file_ops.c +Auto-merging drivers/cpufreq/pmac32-cpufreq.c +Auto-merging arch/powerpc/perf/callchain.c +Auto-merging arch/powerpc/mm/mmu_context_book3s64.c +Auto-merging arch/powerpc/kernel/prom.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/prom.c +Auto-merging arch/powerpc/include/asm/nohash/64/pgalloc.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e881bb4ccbba] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-cxl | 8 + + .../features/perf/perf-regs/arch-support.txt | 2 +- + .../features/perf/perf-stackdump/arch-support.txt | 2 +- + Documentation/powerpc/eeh-pci-error-recovery.txt | 2 +- + MAINTAINERS | 13 + + arch/powerpc/Kconfig | 9 +- + arch/powerpc/Kconfig.debug | 8 - + arch/powerpc/include/asm/book3s/32/hash.h | 3 - + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 6 +- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 109 +++ + arch/powerpc/include/asm/book3s/64/hash-4k.h | 136 +-- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 215 ++--- + arch/powerpc/include/asm/book3s/64/hash.h | 485 ++--------- + arch/powerpc/include/asm/book3s/64/hugetlb-radix.h | 14 + + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 79 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 137 +++ + arch/powerpc/include/asm/book3s/64/pgalloc.h | 207 +++++ + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 53 ++ + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 64 ++ + arch/powerpc/include/asm/book3s/64/pgtable.h | 816 ++++++++++++++++-- + arch/powerpc/include/asm/book3s/64/radix-4k.h | 12 + + arch/powerpc/include/asm/book3s/64/radix-64k.h | 12 + + arch/powerpc/include/asm/book3s/64/radix.h | 232 +++++ + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 41 +- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 33 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 76 ++ + arch/powerpc/include/asm/book3s/pgalloc.h | 19 + + arch/powerpc/include/asm/hugetlb.h | 14 + + arch/powerpc/include/asm/kvm_book3s_64.h | 36 +- + arch/powerpc/include/asm/livepatch.h | 62 ++ + arch/powerpc/include/asm/machdep.h | 1 + + arch/powerpc/include/asm/mmu.h | 51 +- + arch/powerpc/include/asm/mmu_context.h | 29 +- + .../asm/{pgalloc-32.h => nohash/32/pgalloc.h} | 0 + .../asm/{pgalloc-64.h => nohash/64/pgalloc.h} | 92 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 10 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 23 + + arch/powerpc/include/asm/opal-api.h | 16 +- + arch/powerpc/include/asm/page.h | 14 +- + arch/powerpc/include/asm/page_64.h | 5 +- + arch/powerpc/include/asm/pci-bridge.h | 41 +- + arch/powerpc/include/asm/pgalloc.h | 19 +- + arch/powerpc/include/asm/pgtable-be-types.h | 92 ++ + arch/powerpc/include/asm/pgtable-types.h | 58 +- + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/include/asm/ppc-pci.h | 6 +- + arch/powerpc/include/asm/ppc_asm.h | 3 + + arch/powerpc/include/asm/pte-common.h | 26 +- + arch/powerpc/include/asm/reg.h | 3 + + arch/powerpc/include/asm/thread_info.h | 4 +- + arch/powerpc/include/asm/tlbflush.h | 3 +- + arch/powerpc/include/uapi/asm/perf_regs.h | 50 ++ + arch/powerpc/kernel/asm-offsets.c | 8 + + arch/powerpc/kernel/btext.c | 2 +- + arch/powerpc/kernel/cputable.c | 2 - + arch/powerpc/kernel/eeh.c | 9 +- + arch/powerpc/kernel/eeh_driver.c | 46 +- + arch/powerpc/kernel/eeh_event.c | 2 +- + arch/powerpc/kernel/eeh_pe.c | 2 +- + arch/powerpc/kernel/entry_64.S | 113 ++- + arch/powerpc/kernel/exceptions-64s.S | 163 +--- + arch/powerpc/kernel/ftrace.c | 10 + + arch/powerpc/kernel/head_64.S | 13 +- + arch/powerpc/kernel/ibmebus.c | 2 +- + arch/powerpc/kernel/irq.c | 3 + + arch/powerpc/kernel/isa-bridge.c | 4 +- + arch/powerpc/kernel/machine_kexec.c | 18 +- + arch/powerpc/kernel/machine_kexec_64.c | 15 +- + arch/powerpc/kernel/mce.c | 2 +- + arch/powerpc/kernel/mce_power.c | 13 + + arch/powerpc/kernel/misc_32.S | 6 - + arch/powerpc/kernel/nvram_64.c | 12 +- + arch/powerpc/kernel/pci-hotplug.c | 47 +- + arch/powerpc/kernel/pci_64.c | 5 +- + arch/powerpc/kernel/pci_dn.c | 66 +- + arch/powerpc/kernel/process.c | 23 +- + arch/powerpc/kernel/prom.c | 2 + + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/setup-common.c | 6 - + arch/powerpc/kernel/setup_64.c | 17 +- + arch/powerpc/kernel/swsusp.c | 2 +- + arch/powerpc/kernel/time.c | 1 + + arch/powerpc/kernel/vio.c | 4 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 11 +- + arch/powerpc/kvm/book3s_hv.c | 6 + + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 12 +- + arch/powerpc/kvm/book3s_pr.c | 6 +- + arch/powerpc/lib/copy_32.S | 2 +- + arch/powerpc/lib/sstep.c | 5 + + arch/powerpc/lib/xor_vmx.c | 10 + + arch/powerpc/mm/Makefile | 10 +- + arch/powerpc/mm/fsl_booke_mmu.c | 2 +- + arch/powerpc/mm/hash64_4k.c | 29 +- + arch/powerpc/mm/hash64_64k.c | 71 +- + arch/powerpc/mm/hash_native_64.c | 11 +- + arch/powerpc/mm/hash_utils_64.c | 190 +++- + arch/powerpc/mm/hugepage-hash64.c | 22 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 29 +- + arch/powerpc/mm/hugetlbpage-radix.c | 87 ++ + arch/powerpc/mm/hugetlbpage.c | 20 +- + arch/powerpc/mm/init_64.c | 73 +- + arch/powerpc/mm/mem.c | 40 +- + arch/powerpc/mm/mmap.c | 110 +++ + ...mmu_context_hash64.c => mmu_context_book3s64.c} | 52 +- + arch/powerpc/mm/mmu_context_nohash.c | 6 +- + arch/powerpc/mm/mmu_decl.h | 5 - + arch/powerpc/mm/pgtable-book3e.c | 122 +++ + arch/powerpc/mm/pgtable-book3s64.c | 118 +++ + arch/powerpc/mm/pgtable-hash64.c | 342 ++++++++ + arch/powerpc/mm/pgtable-radix.c | 526 ++++++++++++ + arch/powerpc/mm/pgtable.c | 24 +- + arch/powerpc/mm/pgtable_64.c | 557 ++---------- + arch/powerpc/mm/slb.c | 1 - + arch/powerpc/mm/slb_low.S | 54 +- + arch/powerpc/mm/slice.c | 20 +- + arch/powerpc/mm/tlb-radix.c | 251 ++++++ + arch/powerpc/mm/tlb_hash64.c | 6 +- + arch/powerpc/perf/Makefile | 2 +- + arch/powerpc/perf/callchain.c | 2 +- + arch/powerpc/perf/perf_regs.c | 104 +++ + arch/powerpc/perf/power8-events-list.h | 40 + + arch/powerpc/perf/power8-pmu.c | 41 +- + arch/powerpc/platforms/Kconfig.cputype | 11 +- + arch/powerpc/platforms/cell/spu_base.c | 9 +- + arch/powerpc/platforms/cell/spufs/fault.c | 4 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 69 +- + arch/powerpc/platforms/powernv/npu-dma.c | 283 +++--- + arch/powerpc/platforms/powernv/opal-hmi.c | 8 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 953 +++++++++++++-------- + arch/powerpc/platforms/powernv/pci.c | 19 +- + arch/powerpc/platforms/powernv/pci.h | 72 +- + arch/powerpc/platforms/powernv/setup.c | 5 +- + arch/powerpc/platforms/ps3/htab.c | 2 +- + arch/powerpc/platforms/ps3/spu.c | 4 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 225 ++++- + arch/powerpc/platforms/pseries/iommu.c | 24 +- + arch/powerpc/platforms/pseries/lpar.c | 20 +- + arch/powerpc/platforms/pseries/lparcfg.c | 3 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 4 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 32 - + arch/powerpc/platforms/pseries/reconfig.c | 5 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/powerpc/sysdev/mpic.c | 9 +- + arch/powerpc/xmon/Makefile | 2 +- + arch/powerpc/xmon/spr_access.S | 45 + + arch/powerpc/xmon/xmon.c | 138 +-- + drivers/cpufreq/pmac32-cpufreq.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 5 +- + drivers/infiniband/hw/qib/qib_pcie.c | 6 - + drivers/macintosh/rack-meter.c | 5 +- + drivers/macintosh/via-pmu.c | 4 +- + drivers/misc/cxl/api.c | 28 +- + drivers/misc/cxl/context.c | 3 +- + drivers/misc/cxl/cxl.h | 15 +- + drivers/misc/cxl/fault.c | 10 +- + drivers/misc/cxl/guest.c | 78 +- + drivers/misc/cxl/native.c | 29 +- + drivers/misc/cxl/pci.c | 64 +- + drivers/misc/cxl/sysfs.c | 10 + + drivers/of/base.c | 3 + + drivers/pci/hotplug/rpadlpar_core.c | 8 +- + drivers/pci/hotplug/rpaphp_core.c | 4 +- + drivers/pci/hotplug/rpaphp_pci.c | 4 +- + drivers/pcmcia/electra_cf.c | 2 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 3 +- + include/linux/ftrace.h | 1 + + include/misc/cxl.h | 8 + + kernel/livepatch/core.c | 34 +- + kernel/trace/ftrace.c | 26 +- + tools/perf/arch/powerpc/include/perf_regs.h | 69 ++ + tools/perf/arch/powerpc/util/Build | 2 + + tools/perf/arch/powerpc/util/perf_regs.c | 49 ++ + tools/perf/arch/powerpc/util/unwind-libunwind.c | 96 +++ + tools/perf/config/Makefile | 6 + + tools/perf/util/perf_regs.c | 8 +- + tools/testing/selftests/powerpc/Makefile | 1 + + .../selftests/powerpc/context_switch/.gitignore | 1 + + .../selftests/powerpc/context_switch/Makefile | 10 + + .../selftests/powerpc/context_switch/cp_abort.c | 110 +++ + tools/testing/selftests/powerpc/mm/subpage_prot.c | 18 +- + tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 1 - + .../selftests/powerpc/pmu/ebb/reg_access_test.c | 1 - + .../testing/selftests/powerpc/{pmu/ebb => }/reg.h | 18 +- + tools/testing/selftests/powerpc/tm/.gitignore | 3 + + tools/testing/selftests/powerpc/tm/Makefile | 3 +- + tools/testing/selftests/powerpc/tm/tm-fork.c | 42 + + .../testing/selftests/powerpc/tm/tm-resched-dscr.c | 16 +- + .../testing/selftests/powerpc/tm/tm-signal-stack.c | 4 +- + tools/testing/selftests/powerpc/tm/tm-tar.c | 90 ++ + tools/testing/selftests/powerpc/tm/tm-tmspr.c | 143 ++++ + tools/testing/selftests/powerpc/utils.h | 8 + + 192 files changed, 7063 insertions(+), 3034 deletions(-) + create mode 100644 arch/powerpc/include/asm/book3s/32/pgalloc.h + create mode 100644 arch/powerpc/include/asm/book3s/64/hugetlb-radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/mmu.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgalloc.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgtable-4k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgtable-64k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/radix-4k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/radix-64k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/tlbflush-radix.h + create mode 100644 arch/powerpc/include/asm/book3s/64/tlbflush.h + create mode 100644 arch/powerpc/include/asm/book3s/pgalloc.h + create mode 100644 arch/powerpc/include/asm/livepatch.h + rename arch/powerpc/include/asm/{pgalloc-32.h => nohash/32/pgalloc.h} (100%) + rename arch/powerpc/include/asm/{pgalloc-64.h => nohash/64/pgalloc.h} (68%) + create mode 100644 arch/powerpc/include/asm/nohash/pgalloc.h + create mode 100644 arch/powerpc/include/asm/pgtable-be-types.h + create mode 100644 arch/powerpc/include/uapi/asm/perf_regs.h + create mode 100644 arch/powerpc/mm/hugetlbpage-radix.c + rename arch/powerpc/mm/{mmu_context_hash64.c => mmu_context_book3s64.c} (70%) + create mode 100644 arch/powerpc/mm/pgtable-book3e.c + create mode 100644 arch/powerpc/mm/pgtable-book3s64.c + create mode 100644 arch/powerpc/mm/pgtable-hash64.c + create mode 100644 arch/powerpc/mm/pgtable-radix.c + create mode 100644 arch/powerpc/mm/tlb-radix.c + create mode 100644 arch/powerpc/perf/perf_regs.c + create mode 100644 arch/powerpc/xmon/spr_access.S + create mode 100644 tools/perf/arch/powerpc/include/perf_regs.h + create mode 100644 tools/perf/arch/powerpc/util/perf_regs.c + create mode 100644 tools/perf/arch/powerpc/util/unwind-libunwind.c + create mode 100644 tools/testing/selftests/powerpc/context_switch/.gitignore + create mode 100644 tools/testing/selftests/powerpc/context_switch/Makefile + create mode 100644 tools/testing/selftests/powerpc/context_switch/cp_abort.c + rename tools/testing/selftests/powerpc/{pmu/ebb => }/reg.h (74%) + create mode 100644 tools/testing/selftests/powerpc/tm/tm-fork.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-tar.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-tmspr.c +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (1eef33bec12d powerpc/86xx: Fix PCI interrupt map definition) +$ git merge fsl/next +Merge made by the 'recursive' strategy. + arch/powerpc/Kconfig | 1 - + arch/powerpc/boot/Makefile | 6 ++-- + arch/powerpc/boot/dts/fsl/gef_ppc9a.dts | 4 +++ + arch/powerpc/boot/dts/fsl/gef_sbc310.dts | 22 -------------- + arch/powerpc/boot/dts/fsl/gef_sbc610.dts | 4 +++ + arch/powerpc/boot/dts/fsl/mpc8641_hpcn.dts | 24 +-------------- + arch/powerpc/boot/dts/fsl/mpc8641_hpcn_36b.dts | 24 +-------------- + arch/powerpc/boot/dts/fsl/mpc8641si-post.dtsi | 41 +++++++++++++++++++++----- + arch/powerpc/boot/dts/fsl/mpc8641si-pre.dtsi | 1 + + arch/powerpc/boot/dts/fsl/sbc8641d.dts | 23 --------------- + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t208xrdb.dtsi | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 24 +++++++++++++++ + 15 files changed, 76 insertions(+), 106 deletions(-) +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (c53db5222b92 s390/vmem: remove unused function parameter) +$ git merge s390/features +Auto-merging arch/s390/mm/mmap.c +Auto-merging arch/s390/include/asm/processor.h +Removing arch/s390/crypto/crypt_s390.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 10 + + arch/s390/Kconfig | 3 +- + arch/s390/crypto/aes_s390.c | 117 +++--- + arch/s390/crypto/crypt_s390.h | 493 ------------------------- + arch/s390/crypto/des_s390.c | 72 ++-- + arch/s390/crypto/ghash_s390.c | 16 +- + arch/s390/crypto/prng.c | 60 ++-- + arch/s390/crypto/sha1_s390.c | 10 +- + arch/s390/crypto/sha256_s390.c | 14 +- + arch/s390/crypto/sha512_s390.c | 14 +- + arch/s390/crypto/sha_common.c | 10 +- + arch/s390/include/asm/cpacf.h | 410 +++++++++++++++++++++ + arch/s390/include/asm/fpu/types.h | 10 +- + arch/s390/include/asm/ftrace.h | 4 +- + arch/s390/include/asm/pci.h | 35 +- + arch/s390/include/asm/processor.h | 9 +- + arch/s390/include/asm/sclp.h | 13 + + arch/s390/include/asm/thread_info.h | 1 + + arch/s390/include/uapi/asm/dasd.h | 32 ++ + arch/s390/kernel/cache.c | 2 - + arch/s390/kernel/crash_dump.c | 2 +- + arch/s390/kernel/dumpstack.c | 24 ++ + arch/s390/kernel/entry.h | 4 + + arch/s390/kernel/perf_cpum_cf.c | 9 +- + arch/s390/kernel/perf_cpum_sf.c | 9 +- + arch/s390/kernel/process.c | 24 +- + arch/s390/kernel/processor.c | 16 +- + arch/s390/kernel/setup.c | 17 + + arch/s390/kernel/vtime.c | 2 + + arch/s390/mm/fault.c | 41 ++- + arch/s390/mm/mmap.c | 1 + + arch/s390/mm/vmem.c | 8 +- + arch/s390/pci/pci_debug.c | 61 +++- + arch/s390/pci/pci_sysfs.c | 23 ++ + drivers/s390/block/dasd.c | 92 ++++- + drivers/s390/block/dasd_3990_erp.c | 20 +- + drivers/s390/block/dasd_devmap.c | 27 ++ + drivers/s390/block/dasd_eckd.c | 699 +++++++++++++++++++++++++++++++++++- + drivers/s390/block/dasd_eckd.h | 34 +- + drivers/s390/block/dasd_int.h | 17 +- + drivers/s390/block/dasd_ioctl.c | 61 ++++ + drivers/s390/char/Makefile | 2 + + drivers/s390/char/con3270.c | 3 +- + drivers/s390/char/fs3270.c | 3 +- + drivers/s390/char/raw3270.c | 131 +++---- + drivers/s390/char/raw3270.h | 8 +- + drivers/s390/char/sclp.h | 38 +- + drivers/s390/char/sclp_cmd.c | 61 ---- + drivers/s390/char/sclp_cpi_sys.c | 2 +- + drivers/s390/char/sclp_pci.c | 193 ++++++++++ + drivers/s390/char/tty3270.c | 86 ++++- + drivers/s390/crypto/ap_bus.c | 2 +- + 52 files changed, 2104 insertions(+), 951 deletions(-) + delete mode 100644 arch/s390/crypto/crypt_s390.h + create mode 100644 arch/s390/include/asm/cpacf.h + create mode 100644 drivers/s390/char/sclp_pci.c +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging tile/master (4ef00aa30a3f tile: sort the "select" lines in the TILE/TILEGX configs) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/Kconfig | 67 ++++++++++++++++--------------------- + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + arch/tile/include/asm/atomic_64.h | 17 ++++++++-- + 4 files changed, 43 insertions(+), 43 deletions(-) +Merging uml/linux-next (ad32a1f3c36b um: use %lx format specifiers for unsigned longs) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (c83d8b2fc986 unicore32: mm: Add missing parameter to arch_vma_access_permitted) +$ git merge unicore32/unicore32 +Merge made by the 'recursive' strategy. + arch/unicore32/include/asm/mmu_context.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xtensa/for_next (9da8320bb977 xtensa: add test_kc705_hifi variant) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (bb7ab3b92e46 btrfs: Fix misspellings in comments.) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (a3a7fdf24a89 Merge branch 'for-next-next-4.7-20160512' into for-next-20160512) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/tree-log.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'recursive' strategy. + fs/btrfs/backref.c | 2 +- + fs/btrfs/compression.c | 85 ++- + fs/btrfs/ctree.c | 6 +- + fs/btrfs/ctree.h | 1138 +++----------------------------------- + fs/btrfs/delayed-inode.c | 70 +-- + fs/btrfs/dev-replace.c | 101 ++-- + fs/btrfs/dev-replace.h | 4 +- + fs/btrfs/disk-io.c | 134 ++--- + fs/btrfs/extent-tree.c | 849 +++++++++++++++++++--------- + fs/btrfs/extent_io.c | 166 +++--- + fs/btrfs/extent_io.h | 35 +- + fs/btrfs/file-item.c | 2 +- + fs/btrfs/file.c | 54 +- + fs/btrfs/inode-item.c | 2 +- + fs/btrfs/inode.c | 424 ++++++++++++-- + fs/btrfs/ioctl.c | 200 +++++-- + fs/btrfs/ordered-data.c | 26 +- + fs/btrfs/ordered-data.h | 6 +- + fs/btrfs/qgroup.c | 8 +- + fs/btrfs/relocation.c | 22 +- + fs/btrfs/root-tree.c | 4 +- + fs/btrfs/scrub.c | 27 +- + fs/btrfs/send.c | 62 ++- + fs/btrfs/super.c | 60 +- + fs/btrfs/sysfs.c | 14 +- + fs/btrfs/tests/extent-io-tests.c | 8 +- + fs/btrfs/transaction.c | 140 ++++- + fs/btrfs/tree-log.c | 25 +- + fs/btrfs/volumes.c | 454 ++++++++------- + fs/btrfs/volumes.h | 57 +- + include/trace/events/btrfs.h | 139 ++++- + include/uapi/linux/btrfs.h | 188 ++++++- + include/uapi/linux/btrfs_tree.h | 966 ++++++++++++++++++++++++++++++++ + 33 files changed, 3366 insertions(+), 2112 deletions(-) + create mode 100644 include/uapi/linux/btrfs_tree.h +Merging ceph/master (d3767f0faeda rbd: report unsupported features to syslog) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (897fba1172d6 remove directory incorrectly tries to set delete on close on non-empty directories) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_dfs_ref.c | 6 ++- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/connect.c | 8 ++- + fs/cifs/file.c | 4 +- + fs/cifs/readdir.c | 4 +- + fs/cifs/sess.c | 139 ++++++++++++++++++++++++++++--------------------- + fs/cifs/smb2glob.h | 1 + + fs/cifs/smb2inode.c | 8 ++- + fs/cifs/smb2pdu.c | 16 ++++++ + fs/cifs/smb2proto.h | 2 + + 10 files changed, 121 insertions(+), 69 deletions(-) +Merging configfs/for-next (96c22a329351 configfs: fix CONFIGFS_BIN_ATTR_[RW]O definitions) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (2a28900be206 udf: Export superblock magic to userspace) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/udf/super.c | 67 +++++++++++++++++++++++++++++----------------- + fs/udf/udf_sb.h | 4 +-- + include/uapi/linux/magic.h | 2 ++ + 3 files changed, 46 insertions(+), 27 deletions(-) +Merging ext4/dev (12735f881952 ext4: pre-zero allocated blocks for DAX IO) +$ git merge ext4/dev +Auto-merging fs/readdir.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/dir.c +Auto-merging fs/compat.c +Merge made by the 'recursive' strategy. + fs/compat.c | 4 + + fs/dax.c | 2 +- + fs/ext4/balloc.c | 3 +- + fs/ext4/dir.c | 5 + + fs/ext4/ext4.h | 21 ++- + fs/ext4/ext4_jbd2.h | 15 +- + fs/ext4/extents.c | 20 ++- + fs/ext4/extents_status.c | 2 +- + fs/ext4/file.c | 6 +- + fs/ext4/ialloc.c | 59 ++++---- + fs/ext4/indirect.c | 127 ---------------- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 326 ++++++++++++++++++++++++++++-------------- + fs/ext4/ioctl.c | 2 +- + fs/ext4/mballoc.c | 12 +- + fs/ext4/mmp.c | 4 +- + fs/ext4/move_extent.c | 2 +- + fs/ext4/namei.c | 9 +- + fs/ext4/page-io.c | 2 - + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 4 + + fs/jbd2/commit.c | 4 + + fs/jbd2/journal.c | 3 +- + fs/jbd2/transaction.c | 22 ++- + fs/ocfs2/journal.h | 2 +- + fs/readdir.c | 4 + + include/linux/jbd2.h | 16 ++- + kernel/locking/percpu-rwsem.c | 1 + + 28 files changed, 366 insertions(+), 315 deletions(-) +Merging f2fs/dev (f1d934769e09 f2fs: use percpu_counter for total_valid_inode_count) +$ git merge f2fs/dev +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/f2fs/dir.c +Auto-merging fs/f2fs/acl.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + fs/crypto/keyinfo.c | 120 ++++++++++------- + fs/f2fs/Kconfig | 8 ++ + fs/f2fs/acl.c | 4 +- + fs/f2fs/checkpoint.c | 55 ++++---- + fs/f2fs/data.c | 169 +++++++++++++++++------- + fs/f2fs/debug.c | 21 +-- + fs/f2fs/dir.c | 128 +++++++++--------- + fs/f2fs/extent_cache.c | 3 +- + fs/f2fs/f2fs.h | 189 ++++++++++++++++++++------- + fs/f2fs/file.c | 301 ++++++++++++++++++++++++++++++------------ + fs/f2fs/gc.c | 27 +--- + fs/f2fs/inline.c | 111 ++++++++++++++-- + fs/f2fs/inode.c | 64 ++++----- + fs/f2fs/node.c | 309 ++++++++++++++++++++++++++++++++++---------- + fs/f2fs/recovery.c | 145 ++++++++++++--------- + fs/f2fs/segment.c | 8 +- + fs/f2fs/segment.h | 9 +- + fs/f2fs/super.c | 282 ++++++++++++++++++++++++++++++++++------ + fs/f2fs/xattr.c | 3 +- + include/linux/f2fs_fs.h | 2 + + include/linux/fscrypto.h | 1 + + include/trace/events/f2fs.h | 24 ++-- + 23 files changed, 1405 insertions(+), 580 deletions(-) +Merging fscache/fscache (b00c2ae2ed3c FS-Cache: Don't override netfs's primary_index if registering failed) +$ git merge fscache/fscache +Merge made by the 'recursive' strategy. +Merging fuse/for-next (4441f63ab7e5 fuse: update mailing list in MAINTAINERS) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (68cd4ce2caf2 GFS2: Refactor gfs2_remove_from_journal) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/rgrp.c +Auto-merging fs/gfs2/meta_io.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/aops.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 5 +++-- + fs/gfs2/file.c | 31 ++++++++++++++++++++++++++++--- + fs/gfs2/glock.c | 11 +++++++++-- + fs/gfs2/glops.c | 7 ------- + fs/gfs2/inode.c | 6 +++--- + fs/gfs2/meta_io.c | 7 ++++--- + fs/gfs2/meta_io.h | 8 ++++++-- + fs/gfs2/rgrp.c | 16 ++++++---------- + fs/gfs2/util.c | 1 + + 9 files changed, 60 insertions(+), 32 deletions(-) +Merging jfs/jfs-next (6ed71e9819ac jfs: Coalesce some formats) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Auto-merging fs/jfs/namei.c +Merge made by the 'recursive' strategy. + fs/jfs/inode.c | 4 ++-- + fs/jfs/jfs_discard.c | 6 ++---- + fs/jfs/jfs_dtree.c | 10 ++++------ + fs/jfs/jfs_imap.c | 3 +-- + fs/jfs/jfs_inode.c | 2 +- + fs/jfs/jfs_logmgr.c | 14 ++++++-------- + fs/jfs/jfs_txnmgr.c | 21 +++++++++------------ + fs/jfs/namei.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 9 files changed, 29 insertions(+), 39 deletions(-) +Merging nfs/linux-next (44549e8f5eea Linux 4.6-rc7) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (d9e4084f6c97 svcrdma: Generalize svc_rdma_xdr_decode_req()) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs3xdr.c +Merge made by the 'recursive' strategy. + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4state.c | 8 +------- + fs/nfsd/state.h | 5 +++++ + include/linux/sunrpc/svc_rdma.h | 2 +- + net/sunrpc/auth_gss/svcauth_gss.c | 5 ++--- + net/sunrpc/xprtrdma/svc_rdma_marshal.c | 32 ++++++++++++++++++++---------- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 34 ++++++++------------------------ + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 28 ++++++++++++-------------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 17 ++++++++++++++-- + 10 files changed, 69 insertions(+), 66 deletions(-) +Merging orangefs/for-next (e56f49814250 orangefs: remove unused variable) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (41523ff335f4 ovl: override creds with the ones from the superblock mounter) +$ git merge overlayfs/overlayfs-next +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/readdir.c +Auto-merging fs/overlayfs/overlayfs.h +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 26 +------------------ + fs/overlayfs/dir.c | 67 ++++-------------------------------------------- + fs/overlayfs/overlayfs.h | 1 + + fs/overlayfs/readdir.c | 14 +++------- + fs/overlayfs/super.c | 18 ++++++++++++- + 5 files changed, 27 insertions(+), 99 deletions(-) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (c27cb97218b3 ubifs: Remove unused header) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (d8bdd04e309b Merge branch 'xfs-4.7-misc-fixes' into for-next) +$ git merge xfs/for-next +Auto-merging fs/xfs/xfs_xattr.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_pnfs.c +Auto-merging fs/xfs/xfs_mount.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/xfs/libxfs/xfs_bmap.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/namei.c | 1 - + fs/xfs/kmem.c | 26 +-- + fs/xfs/kmem.h | 2 +- + fs/xfs/libxfs/xfs_attr.c | 58 ++----- + fs/xfs/libxfs/xfs_bmap.c | 22 ++- + fs/xfs/libxfs/xfs_dir2_sf.c | 9 +- + fs/xfs/libxfs/xfs_inode_fork.c | 72 ++++++--- + fs/xfs/libxfs/xfs_inode_fork.h | 1 + + fs/xfs/libxfs/xfs_log_format.h | 5 + + fs/xfs/libxfs/xfs_sb.c | 8 +- + fs/xfs/libxfs/xfs_shared.h | 102 +----------- + fs/xfs/xfs_aops.c | 354 ++++++++++++++++++++--------------------- + fs/xfs/xfs_aops.h | 15 +- + fs/xfs/xfs_attr.h | 4 +- + fs/xfs/xfs_attr_inactive.c | 16 +- + fs/xfs/xfs_attr_list.c | 85 +++------- + fs/xfs/xfs_bmap_util.c | 45 ++---- + fs/xfs/xfs_dquot.c | 9 +- + fs/xfs/xfs_file.c | 8 +- + fs/xfs/xfs_fsops.c | 14 +- + fs/xfs/xfs_inode.c | 63 +++----- + fs/xfs/xfs_inode.h | 5 +- + fs/xfs/xfs_inode_item.c | 6 +- + fs/xfs/xfs_ioctl.c | 31 +--- + fs/xfs/xfs_iomap.c | 53 ++---- + fs/xfs/xfs_iops.c | 117 +++++++++----- + fs/xfs/xfs_log.c | 62 +------- + fs/xfs/xfs_log.h | 3 +- + fs/xfs/xfs_log_cil.c | 1 - + fs/xfs/xfs_log_priv.h | 1 - + fs/xfs/xfs_log_recover.c | 12 +- + fs/xfs/xfs_mount.c | 1 - + fs/xfs/xfs_pnfs.c | 7 +- + fs/xfs/xfs_qm.c | 9 +- + fs/xfs/xfs_qm_syscalls.c | 26 +-- + fs/xfs/xfs_rtalloc.c | 21 ++- + fs/xfs/xfs_super.c | 37 ++--- + fs/xfs/xfs_symlink.c | 37 ++--- + fs/xfs/xfs_trace.h | 15 +- + fs/xfs/xfs_trans.c | 88 +++++----- + fs/xfs/xfs_trans.h | 8 +- + fs/xfs/xfs_xattr.c | 17 +- + 42 files changed, 594 insertions(+), 882 deletions(-) +Merging file-locks/linux-next (5af9c2e19da6 Merge branch 'akpm' (patches from Andrew)) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (16a9fad4ef80 Merge branch 'sendmsg.cifs' into for-next) +$ git merge vfs/for-next +Resolved 'fs/ext4/ext4.h' using previous resolution. +Resolved 'fs/ext4/indirect.c' using previous resolution. +Resolved 'fs/ext4/inode.c' using previous resolution. +Resolved 'fs/f2fs/data.c' using previous resolution. +Auto-merging security/security.c +Auto-merging include/linux/security.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/namei.c +Auto-merging fs/jfs/namei.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging fs/ext4/inode.c +CONFLICT (content): Merge conflict in fs/ext4/inode.c +Auto-merging fs/ext4/indirect.c +CONFLICT (content): Merge conflict in fs/ext4/indirect.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/ext4.h +CONFLICT (content): Merge conflict in fs/ext4/ext4.h +Auto-merging fs/ecryptfs/inode.c +Auto-merging fs/dax.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/cifsfs.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 840dc2421554] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 2 +- + Documentation/filesystems/vfs.txt | 2 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 5 +- + drivers/mtd/ubi/build.c | 13 +- + drivers/mtd/ubi/kapi.c | 19 +- + drivers/staging/lustre/lustre/llite/rw26.c | 4 +- + drivers/target/iscsi/iscsi_target_util.c | 5 +- + fs/9p/vfs_addr.c | 3 +- + fs/affs/file.c | 5 +- + fs/aio.c | 2 - + fs/binfmt_elf.c | 2 +- + fs/binfmt_elf_fdpic.c | 2 +- + fs/block_dev.c | 14 +- + fs/btrfs/file.c | 16 +- + fs/btrfs/inode.c | 22 +- + fs/btrfs/xattr.c | 22 +- + fs/btrfs/xattr.h | 3 - + fs/ceph/acl.c | 14 +- + fs/ceph/addr.c | 3 +- + fs/ceph/dir.c | 7 +- + fs/ceph/file.c | 11 +- + fs/ceph/inode.c | 29 ++- + fs/ceph/super.h | 8 +- + fs/ceph/xattr.c | 192 ++------------- + fs/cifs/Makefile | 3 +- + fs/cifs/cifsencrypt.c | 97 ++++---- + fs/cifs/cifsfs.c | 26 +- + fs/cifs/cifsfs.h | 12 +- + fs/cifs/cifsglob.h | 2 - + fs/cifs/cifsproto.h | 12 +- + fs/cifs/cifssmb.c | 15 +- + fs/cifs/connect.c | 127 +++------- + fs/cifs/file.c | 62 ++--- + fs/cifs/smb2transport.c | 107 +-------- + fs/cifs/transport.c | 141 ++++------- + fs/cifs/xattr.c | 342 +++++++++++---------------- + fs/coredump.c | 5 +- + fs/dax.c | 4 +- + fs/dcache.c | 13 +- + fs/direct-io.c | 34 +-- + fs/ecryptfs/inode.c | 85 +++---- + fs/exofs/inode.c | 3 +- + fs/ext2/inode.c | 8 +- + fs/ext4/file.c | 9 +- + fs/ext4/inode.c | 24 +- + fs/f2fs/data.c | 6 +- + fs/f2fs/file.c | 9 +- + fs/fat/inode.c | 6 +- + fs/fuse/file.c | 5 +- + fs/gfs2/acl.c | 58 ++++- + fs/gfs2/acl.h | 1 + + fs/gfs2/aops.c | 6 +- + fs/gfs2/file.c | 5 +- + fs/gfs2/inode.c | 82 +------ + fs/gfs2/xattr.c | 46 +++- + fs/hfs/inode.c | 7 +- + fs/hfsplus/inode.c | 7 +- + fs/jfs/file.c | 6 +- + fs/jfs/inode.c | 7 +- + fs/jfs/jfs_xattr.h | 6 +- + fs/jfs/namei.c | 6 +- + fs/jfs/symlink.c | 12 +- + fs/jfs/xattr.c | 224 +++++++----------- + fs/namei.c | 2 +- + fs/nfs/direct.c | 21 +- + fs/nfs/file.c | 2 +- + fs/nfsd/vfs.c | 18 +- + fs/nilfs2/inode.c | 4 +- + fs/ntfs/file.c | 7 +- + fs/ocfs2/aops.c | 9 +- + fs/open.c | 6 +- + fs/read_write.c | 39 ++- + fs/reiserfs/inode.c | 7 +- + fs/ubifs/dir.c | 6 +- + fs/ubifs/file.c | 12 +- + fs/ubifs/super.c | 1 + + fs/ubifs/ubifs.h | 7 +- + fs/ubifs/xattr.c | 143 ++++++----- + fs/udf/file.c | 7 +- + fs/udf/inode.c | 7 +- + fs/xfs/xfs_aops.c | 7 +- + fs/xfs/xfs_file.c | 23 +- + include/linux/dax.h | 2 +- + include/linux/fs.h | 43 +++- + include/linux/lsm_hooks.h | 28 +-- + include/linux/net.h | 3 +- + include/linux/nfs_fs.h | 5 +- + include/linux/security.h | 58 ++--- + include/uapi/linux/fs.h | 2 + + kernel/bpf/inode.c | 37 +-- + lib/iov_iter.c | 104 +++----- + mm/filemap.c | 30 +-- + mm/page_io.c | 2 +- + net/socket.c | 23 +- + net/unix/af_unix.c | 2 +- + security/apparmor/file.c | 4 +- + security/apparmor/include/file.h | 4 +- + security/apparmor/include/path.h | 2 +- + security/apparmor/lsm.c | 83 +++---- + security/apparmor/path.c | 8 +- + security/integrity/ima/ima.h | 2 +- + security/integrity/ima/ima_api.c | 2 +- + security/security.c | 28 +-- + security/selinux/hooks.c | 2 +- + security/tomoyo/common.h | 12 +- + security/tomoyo/file.c | 10 +- + security/tomoyo/mount.c | 4 +- + security/tomoyo/tomoyo.c | 28 +-- + 108 files changed, 1132 insertions(+), 1759 deletions(-) +Merging pci/next (e257ef55ce51 Merge branches 'pci/arm64' and 'pci/host-hv' into next) +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging include/linux/mfd/syscon/imx6q-iomuxc-gpr.h +Auto-merging drivers/pci/pci-sysfs.c +Removing drivers/pci/host/pci-host-common.h +Auto-merging drivers/pci/host/Makefile +Auto-merging drivers/pci/host/Kconfig +Auto-merging drivers/iommu/iommu.c +Auto-merging arch/arm/boot/dts/imx6q-apalis-ixora.dts +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/fsl,imx6q-pcie.txt | 18 +- + .../devicetree/bindings/pci/pci-armada8k.txt | 38 +++ + .../devicetree/bindings/pci/pci-keystone.txt | 1 + + arch/alpha/kernel/pci-sysfs.c | 4 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 5 +- + arch/arm/boot/dts/imx6qp.dtsi | 3 + + arch/x86/pci/common.c | 2 +- + arch/x86/pci/fixup.c | 7 + + drivers/iommu/iommu.c | 10 +- + drivers/of/address.c | 116 +-------- + drivers/pci/Kconfig | 3 + + drivers/pci/Makefile | 2 + + drivers/pci/ecam.c | 164 +++++++++++++ + drivers/pci/ecam.h | 67 ++++++ + drivers/pci/host/Kconfig | 14 ++ + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-dra7xx.c | 4 +- + drivers/pci/host/pci-host-common.c | 114 ++++----- + drivers/pci/host/pci-host-common.h | 47 ---- + drivers/pci/host/pci-host-generic.c | 52 +--- + drivers/pci/host/pci-hyperv.c | 24 +- + drivers/pci/host/pci-imx6.c | 213 +++++++++++++---- + drivers/pci/host/pci-keystone-dw.c | 38 +++ + drivers/pci/host/pci-keystone.c | 52 +++- + drivers/pci/host/pci-keystone.h | 6 + + drivers/pci/host/pci-mvebu.c | 7 +- + drivers/pci/host/pci-thunder-ecam.c | 39 +-- + drivers/pci/host/pci-thunder-pem.c | 134 ++++++----- + drivers/pci/host/pcie-armada8k.c | 262 +++++++++++++++++++++ + drivers/pci/host/pcie-designware.c | 47 ++-- + drivers/pci/host/pcie-xilinx-nwl.c | 2 +- + drivers/pci/hotplug/acpiphp_ibm.c | 2 + + drivers/pci/pci-sysfs.c | 7 +- + drivers/pci/pci.c | 160 ++++++++++++- + drivers/pci/pcie/Kconfig | 14 ++ + drivers/pci/pcie/Makefile | 2 + + drivers/pci/pcie/pcie-dpc.c | 163 +++++++++++++ + drivers/pci/pcie/portdrv.h | 15 +- + drivers/pci/pcie/portdrv_acpi.c | 12 +- + drivers/pci/pcie/portdrv_core.c | 36 ++- + drivers/pci/probe.c | 7 +- + drivers/pci/quirks.c | 196 +++++++++++++-- + drivers/pci/search.c | 14 +- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/eeprom.c | 8 +- + drivers/thunderbolt/nhi.c | 19 +- + drivers/thunderbolt/switch.c | 20 +- + drivers/thunderbolt/tb.c | 2 +- + drivers/thunderbolt/tb.h | 2 +- + drivers/thunderbolt/tb_regs.h | 2 +- + include/linux/ioport.h | 4 + + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 1 + + include/linux/of_address.h | 9 - + include/linux/pci.h | 18 +- + include/linux/pci_ids.h | 18 ++ + include/linux/pcieport_if.h | 2 + + include/uapi/linux/pci_regs.h | 20 +- + 57 files changed, 1664 insertions(+), 587 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/pci-armada8k.txt + create mode 100644 drivers/pci/ecam.c + create mode 100644 drivers/pci/ecam.h + delete mode 100644 drivers/pci/host/pci-host-common.h + create mode 100644 drivers/pci/host/pcie-armada8k.c + create mode 100644 drivers/pci/pcie/pcie-dpc.c +$ git am -3 ../patches/0001-iommu-amd-fix-up-for-aliases-API-change.patch +Applying: iommu/amd: fix up for aliases API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/amd_iommu.c +$ git add -A . +$ git commit -v -a --amend +[master 0e5c011d7b86] Merge remote-tracking branch 'pci/next' + Date: Wed May 18 09:13:07 2016 +1000 +Merging hid/for-next (185a9cac5b1e Merge branch 'for-4.6/upstream-fixes' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 10 ++++++++ + drivers/hid/Makefile | 1 + + drivers/hid/hid-asus.c | 52 +++++++++++++++++++++++++++++++++++++++++ + drivers/hid/hid-core.c | 34 +++++++++++++-------------- + drivers/hid/hid-ids.h | 8 +++++++ + drivers/hid/hid-roccat.c | 5 ++-- + drivers/hid/hid-thingm.c | 49 +++++++++++++------------------------- + drivers/hid/hidraw.c | 18 +++++--------- + drivers/hid/usbhid/hid-quirks.c | 5 ++++ + 9 files changed, 116 insertions(+), 66 deletions(-) + create mode 100644 drivers/hid/hid-asus.c +Merging i2c/i2c/for-next (d3e47ff44331 Merge branch 'i2c/for-4.7' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-octeon.txt | 6 + + Documentation/i2c/i2c-topology | 370 ++++++++ + MAINTAINERS | 1 + + drivers/i2c/algos/i2c-algo-bit.c | 2 +- + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 2 +- + drivers/i2c/busses/i2c-bcm-kona.c | 5 +- + drivers/i2c/busses/i2c-brcmstb.c | 4 +- + drivers/i2c/busses/i2c-cpm.c | 4 +- + drivers/i2c/busses/i2c-dln2.c | 2 + + drivers/i2c/busses/i2c-exynos5.c | 10 +- + drivers/i2c/busses/i2c-i801.c | 52 +- + drivers/i2c/busses/i2c-ibm_iic.c | 2 +- + drivers/i2c/busses/i2c-img-scb.c | 4 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-iop3xx.c | 5 +- + drivers/i2c/busses/i2c-lpc2k.c | 4 +- + drivers/i2c/busses/i2c-mt65xx.c | 5 +- + drivers/i2c/busses/i2c-mv64xxx.c | 45 +- + drivers/i2c/busses/i2c-nforce2.c | 2 +- + drivers/i2c/busses/i2c-ocores.c | 5 +- + drivers/i2c/busses/i2c-octeon.c | 998 +++++++++++++++++---- + drivers/i2c/busses/i2c-omap.c | 12 +- + drivers/i2c/busses/i2c-powermac.c | 4 +- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-rk3x.c | 87 +- + drivers/i2c/busses/i2c-s3c2410.c | 244 +++-- + drivers/i2c/busses/i2c-sh_mobile.c | 3 +- + drivers/i2c/busses/i2c-sirf.c | 4 +- + drivers/i2c/busses/i2c-st.c | 48 +- + drivers/i2c/busses/i2c-tegra.c | 81 +- + drivers/i2c/busses/i2c-uniphier-f.c | 2 +- + drivers/i2c/busses/i2c-uniphier.c | 2 +- + drivers/i2c/i2c-core.c | 72 +- + drivers/i2c/i2c-mux.c | 300 +++++-- + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 47 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 73 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 58 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 61 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 135 +-- + drivers/i2c/muxes/i2c-mux-reg.c | 69 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 1 - + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 79 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 3 +- + drivers/media/dvb-frontends/m88ds3103.c | 19 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 20 +- + drivers/media/dvb-frontends/rtl2830_priv.h | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 243 +---- + drivers/media/dvb-frontends/rtl2832.h | 4 +- + drivers/media/dvb-frontends/rtl2832_priv.h | 3 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 303 +++---- + drivers/media/dvb-frontends/rtl2832_sdr.h | 5 +- + drivers/media/dvb-frontends/si2168.c | 106 +-- + drivers/media/dvb-frontends/si2168_priv.h | 3 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 47 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 5 +- + drivers/misc/eeprom/at24.c | 9 +- + drivers/of/unittest.c | 37 +- + include/linux/i2c-mux.h | 55 +- + include/linux/i2c.h | 50 +- + include/uapi/linux/i2c.h | 13 +- + 65 files changed, 2416 insertions(+), 1441 deletions(-) + create mode 100644 Documentation/i2c/i2c-topology +Merging jdelvare-hwmon/master (f02de116250d Documentation/hwmon: Update links in max34440) +$ git merge jdelvare-hwmon/master +Auto-merging Documentation/hwmon/max34440 +Merge made by the 'recursive' strategy. + Documentation/hwmon/max34440 | 6 +++--- + drivers/hwmon/emc2103.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging dmi/master (c3db05ecf8ac firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (d6a442df63b2 hwmon: (sch5636) trivial fix of spelling mistake on revision) +$ git merge hwmon-staging/hwmon-next +Already up-to-date. +Merging v4l-dvb/master (73dfb701d254 Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb/master +Auto-merging samples/v4l/v4l2-pci-skeleton.c +Auto-merging include/media/v4l2-tpg.h +Auto-merging include/media/v4l2-tpg-colors.h +Auto-merging drivers/media/usb/cx231xx/cx231xx-core.c +Auto-merging drivers/media/dvb-frontends/m88ds3103_priv.h +Auto-merging drivers/media/common/v4l2-tpg/v4l2-tpg-core.c +Auto-merging drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/DocBook/device-drivers.tmpl | 1 + + Documentation/DocBook/media/dvb/net.xml | 2 +- + Documentation/DocBook/media/v4l/compat.xml | 38 - + Documentation/DocBook/media/v4l/controls.xml | 31 - + Documentation/DocBook/media/v4l/dev-sdr.xml | 6 - + Documentation/DocBook/media/v4l/dev-subdev.xml | 6 - + Documentation/DocBook/media/v4l/io.xml | 6 - + Documentation/DocBook/media/v4l/selection-api.xml | 9 +- + Documentation/DocBook/media/v4l/subdev-formats.xml | 6 - + .../DocBook/media/v4l/vidioc-create-bufs.xml | 6 - + .../DocBook/media/v4l/vidioc-dv-timings-cap.xml | 18 +- + .../DocBook/media/v4l/vidioc-enum-dv-timings.xml | 11 +- + .../DocBook/media/v4l/vidioc-enum-freq-bands.xml | 6 - + Documentation/DocBook/media/v4l/vidioc-expbuf.xml | 6 - + Documentation/DocBook/media/v4l/vidioc-g-edid.xml | 10 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 6 - + .../DocBook/media/v4l/vidioc-prepare-buf.xml | 6 - + .../DocBook/media/v4l/vidioc-query-dv-timings.xml | 6 - + .../DocBook/media/v4l/vidioc-streamon.xml | 8 + + .../v4l/vidioc-subdev-enum-frame-interval.xml | 6 - + .../media/v4l/vidioc-subdev-enum-frame-size.xml | 6 - + .../media/v4l/vidioc-subdev-enum-mbus-code.xml | 6 - + .../DocBook/media/v4l/vidioc-subdev-g-fmt.xml | 6 - + .../media/v4l/vidioc-subdev-g-frame-interval.xml | 6 - + .../media/v4l/vidioc-subdev-g-selection.xml | 6 - + Documentation/Makefile | 3 +- + .../devicetree/bindings/media/i2c/adv7180.txt | 29 + + .../devicetree/bindings/media/rcar_vin.txt | 12 +- + .../devicetree/bindings/media/xilinx/video.txt | 2 +- + Documentation/video4linux/CARDLIST.cx23885 | 2 + + Documentation/video4linux/CARDLIST.em28xx | 12 +- + Documentation/video4linux/v4l2-framework.txt | 2 +- + Documentation/video4linux/vivid.txt | 6 +- + MAINTAINERS | 8 + + drivers/media/common/Kconfig | 1 + + drivers/media/common/Makefile | 2 +- + drivers/media/common/v4l2-tpg/Kconfig | 2 + + drivers/media/common/v4l2-tpg/Makefile | 3 + + .../v4l2-tpg/v4l2-tpg-colors.c} | 7 +- + .../v4l2-tpg/v4l2-tpg-core.c} | 25 +- + drivers/media/dvb-core/dvb-usb-ids.h | 14 + + drivers/media/dvb-core/dvbdev.c | 4 +- + drivers/media/dvb-frontends/dib0090.c | 2 +- + drivers/media/dvb-frontends/ds3000.c | 14 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 2 +- + drivers/media/dvb-frontends/zl10353.c | 6 +- + drivers/media/i2c/ad9389b.c | 8 - + drivers/media/i2c/adp1653.c | 4 +- + drivers/media/i2c/adv7180.c | 160 +++- + drivers/media/i2c/adv7511.c | 6 - + drivers/media/i2c/adv7604.c | 8 - + drivers/media/i2c/adv7842.c | 6 - + drivers/media/i2c/m5mols/m5mols_controls.c | 2 +- + drivers/media/i2c/saa7115.c | 15 + + drivers/media/i2c/smiapp/smiapp-core.c | 12 + + drivers/media/i2c/smiapp/smiapp.h | 1 + + drivers/media/i2c/tc358743.c | 5 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/tvp5150.c | 9 +- + drivers/media/media-device.c | 50 +- + drivers/media/media-devnode.c | 6 +- + drivers/media/media-entity.c | 18 +- + drivers/media/pci/Kconfig | 1 + + drivers/media/pci/Makefile | 1 + + drivers/media/pci/cobalt/Kconfig | 1 + + drivers/media/pci/cx18/cx18-driver.h | 13 +- + drivers/media/pci/cx23885/cx23885-av.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.h | 13 +- + drivers/media/pci/smipcie/smipcie-ir.c | 2 +- + drivers/media/pci/smipcie/smipcie-main.c | 17 +- + drivers/media/pci/smipcie/smipcie.h | 2 + + drivers/media/pci/sta2x11/sta2x11_vip.c | 28 +- + drivers/media/pci/tw686x/Kconfig | 18 + + drivers/media/pci/tw686x/Makefile | 3 + + drivers/media/pci/tw686x/tw686x-audio.c | 386 +++++++++ + drivers/media/pci/tw686x/tw686x-core.c | 415 +++++++++ + drivers/media/pci/tw686x/tw686x-regs.h | 122 +++ + drivers/media/pci/tw686x/tw686x-video.c | 937 +++++++++++++++++++++ + drivers/media/pci/tw686x/tw686x.h | 158 ++++ + drivers/media/pci/zoran/videocodec.c | 5 +- + drivers/media/platform/Kconfig | 4 +- + drivers/media/platform/am437x/am437x-vpfe.c | 4 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 35 +- + drivers/media/platform/exynos-gsc/gsc-core.h | 1 - + drivers/media/platform/exynos4-is/fimc-core.c | 50 -- + drivers/media/platform/exynos4-is/media-dev.c | 8 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 6 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 27 +- + drivers/media/platform/s5p-g2d/g2d.h | 5 - + drivers/media/platform/s5p-jpeg/jpeg-core.c | 7 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 37 +- + drivers/media/platform/s5p-tv/mixer.h | 2 +- + drivers/media/platform/s5p-tv/mixer_grp_layer.c | 2 +- + drivers/media/platform/s5p-tv/mixer_video.c | 2 +- + drivers/media/platform/s5p-tv/mixer_vp_layer.c | 2 +- + drivers/media/platform/soc_camera/Kconfig | 4 +- + drivers/media/platform/soc_camera/rcar_vin.c | 2 + + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 69 +- + drivers/media/platform/vivid/Kconfig | 1 + + drivers/media/platform/vivid/Makefile | 2 +- + drivers/media/platform/vivid/vivid-core.c | 22 +- + drivers/media/platform/vivid/vivid-core.h | 2 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 13 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 19 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 101 +-- + drivers/media/platform/vivid/vivid-vid-common.c | 97 --- + drivers/media/platform/vivid/vivid-vid-common.h | 9 - + drivers/media/platform/vivid/vivid-vid-out.c | 103 +-- + drivers/media/platform/vsp1/vsp1.h | 14 +- + drivers/media/platform/vsp1/vsp1_bru.c | 359 ++++---- + drivers/media/platform/vsp1/vsp1_bru.h | 3 +- + drivers/media/platform/vsp1/vsp1_dl.c | 567 ++++++++++--- + drivers/media/platform/vsp1/vsp1_dl.h | 49 +- + drivers/media/platform/vsp1/vsp1_drm.c | 234 ++--- + drivers/media/platform/vsp1/vsp1_drm.h | 27 +- + drivers/media/platform/vsp1/vsp1_drv.c | 34 +- + drivers/media/platform/vsp1/vsp1_entity.c | 288 +++++-- + drivers/media/platform/vsp1/vsp1_entity.h | 63 +- + drivers/media/platform/vsp1/vsp1_hsit.c | 130 +-- + drivers/media/platform/vsp1/vsp1_lif.c | 179 ++-- + drivers/media/platform/vsp1/vsp1_lut.c | 172 ++-- + drivers/media/platform/vsp1/vsp1_lut.h | 6 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 71 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 19 +- + drivers/media/platform/vsp1/vsp1_regs.h | 10 + + drivers/media/platform/vsp1/vsp1_rpf.c | 275 +++--- + drivers/media/platform/vsp1/vsp1_rwpf.c | 171 ++-- + drivers/media/platform/vsp1/vsp1_rwpf.h | 64 +- + drivers/media/platform/vsp1/vsp1_sru.c | 214 ++--- + drivers/media/platform/vsp1/vsp1_sru.h | 2 + + drivers/media/platform/vsp1/vsp1_uds.c | 223 +++-- + drivers/media/platform/vsp1/vsp1_uds.h | 3 +- + drivers/media/platform/vsp1/vsp1_video.c | 493 ++++++----- + drivers/media/platform/vsp1/vsp1_video.h | 2 - + drivers/media/platform/vsp1/vsp1_wpf.c | 279 +++--- + drivers/media/platform/xilinx/xilinx-vipp.c | 8 +- + drivers/media/rc/ati_remote.c | 11 +- + drivers/media/rc/mceusb.c | 6 + + drivers/media/rc/rc-main.c | 9 +- + drivers/media/tuners/qm1d1c0042.c | 38 +- + drivers/media/tuners/si2157.c | 19 +- + drivers/media/tuners/si2157_priv.h | 1 - + drivers/media/usb/au0828/au0828-core.c | 38 +- + drivers/media/usb/au0828/au0828-video.c | 4 - + drivers/media/usb/au0828/au0828.h | 1 - + drivers/media/usb/cx231xx/cx231xx-417.c | 31 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 3 +- + drivers/media/usb/dvb-usb-v2/af9035.h | 24 +- + drivers/media/usb/dvb-usb/az6027.c | 7 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 4 +- + drivers/media/usb/dvb-usb/dibusb-common.c | 4 +- + drivers/media/usb/dvb-usb/dw2102.c | 63 +- + drivers/media/usb/dvb-usb/pctv452e.c | 4 +- + drivers/media/usb/em28xx/Kconfig | 2 + + drivers/media/usb/em28xx/em28xx-cards.c | 88 ++ + drivers/media/usb/em28xx/em28xx-dvb.c | 185 ++++ + drivers/media/usb/em28xx/em28xx-reg.h | 13 + + drivers/media/usb/em28xx/em28xx.h | 3 + + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 9 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 3 +- + drivers/media/v4l2-core/v4l2-dev.c | 1 + + drivers/media/v4l2-core/v4l2-ioctl.c | 73 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 44 +- + drivers/staging/media/Kconfig | 2 + + drivers/staging/media/Makefile | 1 + + drivers/staging/media/bcm2048/radio-bcm2048.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 2 +- + drivers/staging/media/omap4iss/iss_video.c | 2 +- + drivers/staging/media/tw686x-kh/Kconfig | 17 + + drivers/staging/media/tw686x-kh/Makefile | 3 + + drivers/staging/media/tw686x-kh/TODO | 6 + + drivers/staging/media/tw686x-kh/tw686x-kh-core.c | 140 +++ + drivers/staging/media/tw686x-kh/tw686x-kh-regs.h | 103 +++ + drivers/staging/media/tw686x-kh/tw686x-kh-video.c | 821 ++++++++++++++++++ + drivers/staging/media/tw686x-kh/tw686x-kh.h | 118 +++ + include/media/media-device.h | 13 +- + include/media/media-entity.h | 81 +- + include/media/rc-core.h | 18 +- + include/media/v4l2-dev.h | 3 + + include/media/v4l2-device.h | 55 +- + include/media/v4l2-rect.h | 173 ++++ + include/media/v4l2-subdev.h | 8 + + .../media/v4l2-tpg-colors.h | 6 +- + .../vivid/vivid-tpg.h => include/media/v4l2-tpg.h | 9 +- + include/media/vsp1.h | 23 +- + include/uapi/linux/videodev2.h | 38 +- + samples/Makefile | 2 +- + .../video4linux => samples/v4l}/Makefile | 0 + .../v4l}/v4l2-pci-skeleton.c | 5 +- + 192 files changed, 6757 insertions(+), 3001 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/adv7180.txt + create mode 100644 drivers/media/common/v4l2-tpg/Kconfig + create mode 100644 drivers/media/common/v4l2-tpg/Makefile + rename drivers/media/{platform/vivid/vivid-tpg-colors.c => common/v4l2-tpg/v4l2-tpg-colors.c} (99%) + rename drivers/media/{platform/vivid/vivid-tpg.c => common/v4l2-tpg/v4l2-tpg-core.c} (98%) + create mode 100644 drivers/media/pci/tw686x/Kconfig + create mode 100644 drivers/media/pci/tw686x/Makefile + create mode 100644 drivers/media/pci/tw686x/tw686x-audio.c + create mode 100644 drivers/media/pci/tw686x/tw686x-core.c + create mode 100644 drivers/media/pci/tw686x/tw686x-regs.h + create mode 100644 drivers/media/pci/tw686x/tw686x-video.c + create mode 100644 drivers/media/pci/tw686x/tw686x.h + create mode 100644 drivers/staging/media/tw686x-kh/Kconfig + create mode 100644 drivers/staging/media/tw686x-kh/Makefile + create mode 100644 drivers/staging/media/tw686x-kh/TODO + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-core.c + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-regs.h + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh-video.c + create mode 100644 drivers/staging/media/tw686x-kh/tw686x-kh.h + create mode 100644 include/media/v4l2-rect.h + rename drivers/media/platform/vivid/vivid-tpg-colors.h => include/media/v4l2-tpg-colors.h (93%) + rename drivers/media/platform/vivid/vivid-tpg.h => include/media/v4l2-tpg.h (99%) + rename {Documentation/video4linux => samples/v4l}/Makefile (100%) + rename {Documentation/video4linux => samples/v4l}/v4l2-pci-skeleton.c (99%) +Merging pm/linux-next (16490980e396 Merge tag 'device-properties-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up-to-date. +Merging idle/next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge idle/next +Already up-to-date. +Merging thermal/next (f1ba9eb85b5e thermal: int340x: processor_thermal: support acpi notification) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../int340x_thermal/processor_thermal_device.c | 108 +++++++++++++++------ + drivers/thermal/intel_powerclamp.c | 47 ++------- + 2 files changed, 86 insertions(+), 69 deletions(-) +Merging thermal-soc/next (ddc8fdc6e2f0 Merge branch 'work-fixes' into work-next) +$ git merge thermal-soc/next +Removing drivers/thermal/tegra_soctherm.c +Auto-merging drivers/thermal/Kconfig +Auto-merging drivers/cpufreq/mt8173-cpufreq.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/rcar-thermal.txt | 1 - + .../devicetree/bindings/thermal/tango-thermal.txt | 17 + + .../devicetree/bindings/thermal/tegra-soctherm.txt | 12 + + .../bindings/thermal/thermal-generic-adc.txt | 89 +++ + Documentation/thermal/sysfs-api.txt | 44 +- + MAINTAINERS | 1 + + drivers/cpufreq/mt8173-cpufreq.c | 11 +- + drivers/hwmon/lm75.c | 10 +- + drivers/hwmon/ntc_thermistor.c | 12 +- + drivers/hwmon/scpi-hwmon.c | 48 +- + drivers/hwmon/tmp102.c | 8 +- + drivers/input/touchscreen/sun4i-ts.c | 9 +- + drivers/thermal/Kconfig | 31 +- + drivers/thermal/Makefile | 4 +- + drivers/thermal/hisi_thermal.c | 45 +- + drivers/thermal/mtk_thermal.c | 12 +- + drivers/thermal/of-thermal.c | 10 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 3 +- + drivers/thermal/rcar_thermal.c | 2 +- + drivers/thermal/rockchip_thermal.c | 280 ++++++--- + drivers/thermal/tango_thermal.c | 108 ++++ + drivers/thermal/tegra/Kconfig | 13 + + drivers/thermal/tegra/Makefile | 6 + + drivers/thermal/tegra/soctherm-fuse.c | 169 +++++ + drivers/thermal/tegra/soctherm.c | 685 +++++++++++++++++++++ + drivers/thermal/tegra/soctherm.h | 127 ++++ + drivers/thermal/tegra/tegra124-soctherm.c | 196 ++++++ + drivers/thermal/tegra/tegra132-soctherm.c | 196 ++++++ + drivers/thermal/tegra/tegra210-soctherm.c | 197 ++++++ + drivers/thermal/tegra_soctherm.c | 476 -------------- + drivers/thermal/thermal-generic-adc.c | 182 ++++++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 5 +- + include/dt-bindings/thermal/tegra124-soctherm.h | 1 + + include/linux/thermal.h | 1 + + 34 files changed, 2319 insertions(+), 692 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/tango-thermal.txt + create mode 100644 Documentation/devicetree/bindings/thermal/thermal-generic-adc.txt + create mode 100644 drivers/thermal/tango_thermal.c + create mode 100644 drivers/thermal/tegra/Kconfig + create mode 100644 drivers/thermal/tegra/Makefile + create mode 100644 drivers/thermal/tegra/soctherm-fuse.c + create mode 100644 drivers/thermal/tegra/soctherm.c + create mode 100644 drivers/thermal/tegra/soctherm.h + create mode 100644 drivers/thermal/tegra/tegra124-soctherm.c + create mode 100644 drivers/thermal/tegra/tegra132-soctherm.c + create mode 100644 drivers/thermal/tegra/tegra210-soctherm.c + delete mode 100644 drivers/thermal/tegra_soctherm.c + create mode 100644 drivers/thermal/thermal-generic-adc.c +Merging ieee1394/for-next (384fbb96f926 firewire: nosy: Replace timeval with timespec64) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (82c7d823cc31 dlm: config: Fix ENOMEM failures in make_cluster()) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (386744425e35 swiotlb: Make linux/swiotlb.h standalone includible) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (628b5139c906 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging arch/arm/boot/dts/bcm283x.dtsi +Auto-merging arch/arc/boot/dts/abilis_tb10x.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-platform-hidma | 9 + + .../devicetree/bindings/dma/brcm,bcm2835-dma.txt | 26 + + Documentation/devicetree/bindings/dma/mv-xor.txt | 5 +- + .../bindings/dma/nvidia,tegra210-adma.txt | 55 + + .../devicetree/bindings/dma/qcom_bam_dma.txt | 2 + + Documentation/devicetree/bindings/dma/snps-dma.txt | 11 +- + .../devicetree/bindings/dma/xilinx/xilinx_vdma.txt | 36 +- + MAINTAINERS | 5 +- + arch/arc/boot/dts/abilis_tb10x.dtsi | 2 +- + arch/arm/boot/dts/bcm283x.dtsi | 22 +- + arch/arm/boot/dts/spear13xx.dtsi | 4 +- + arch/avr32/mach-at32ap/at32ap700x.c | 16 +- + drivers/ata/sata_dwc_460ex.c | 6 +- + drivers/dma/Kconfig | 18 +- + drivers/dma/Makefile | 1 + + drivers/dma/amba-pl08x.c | 86 +- + drivers/dma/bcm2835-dma.c | 604 +++++-- + drivers/dma/dmaengine.c | 37 +- + drivers/dma/dw/core.c | 495 +++--- + drivers/dma/dw/pci.c | 5 +- + drivers/dma/dw/platform.c | 40 +- + drivers/dma/dw/regs.h | 56 +- + drivers/dma/edma.c | 11 +- + drivers/dma/fsldma.c | 3 +- + drivers/dma/hsu/hsu.c | 8 +- + drivers/dma/hsu/hsu.h | 4 + + drivers/dma/ioat/init.c | 17 +- + drivers/dma/ioat/registers.h | 7 + + drivers/dma/mmp_pdma.c | 3 +- + drivers/dma/mpc512x_dma.c | 174 +- + drivers/dma/mv_xor.c | 98 +- + drivers/dma/mv_xor.h | 1 + + drivers/dma/of-dma.c | 12 +- + drivers/dma/pxa_dma.c | 16 +- + drivers/dma/qcom/Makefile | 2 + + drivers/dma/qcom/bam_dma.c | 38 +- + drivers/dma/qcom/hidma.c | 52 +- + drivers/dma/qcom/hidma.h | 40 +- + drivers/dma/qcom/hidma_dbg.c | 217 +++ + drivers/dma/qcom/hidma_ll.c | 872 ++++++++++ + drivers/dma/qcom/hidma_mgmt.c | 113 +- + drivers/dma/sun6i-dma.c | 254 ++- + drivers/dma/tegra20-apb-dma.c | 16 +- + drivers/dma/tegra210-adma.c | 840 ++++++++++ + drivers/dma/xilinx/xilinx_vdma.c | 1663 +++++++++++++++----- + drivers/spi/spi-pxa2xx-pci.c | 8 +- + drivers/tty/serial/8250/8250_pci.c | 8 +- + include/linux/amba/pl08x.h | 2 +- + include/linux/dma/dw.h | 5 +- + include/linux/dma/xilinx_dma.h | 14 + + include/linux/dmaengine.h | 20 +- + include/linux/platform_data/dma-dw.h | 12 +- + sound/soc/intel/common/sst-firmware.c | 2 +- + 53 files changed, 4959 insertions(+), 1114 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-hidma + create mode 100644 Documentation/devicetree/bindings/dma/nvidia,tegra210-adma.txt + create mode 100644 drivers/dma/qcom/hidma_dbg.c + create mode 100644 drivers/dma/qcom/hidma_ll.c + create mode 100644 drivers/dma/tegra210-adma.c +Merging net-next/master (917fa5353da0 Revert "phy dp83867: Fix compilation with CONFIG_OF_MDIO=m") +$ git merge net-next/master +Resolved 'arch/arm64/Kconfig' using previous resolution. +Auto-merging net/socket.c +Auto-merging kernel/trace/trace_event_perf.c +Auto-merging kernel/events/core.c +Auto-merging kernel/bpf/stackmap.c +Auto-merging include/linux/perf_event.h +Auto-merging fs/gfs2/glock.c +Auto-merging fs/cifs/connect.c +Auto-merging drivers/nfc/pn533/pn533.c +Removing drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c +Removing drivers/net/irda/sh_irda.c +Auto-merging drivers/net/hamradio/baycom_epp.c +Removing drivers/net/ethernet/intel/fm10k/fm10k_ptp.c +Removing drivers/net/dsa/mv88e6352.c +Removing drivers/net/dsa/mv88e6171.c +Removing drivers/net/dsa/mv88e6131.c +Removing drivers/net/dsa/mv88e6123.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/configs/tilepro_defconfig +Auto-merging arch/tile/configs/tilegx_defconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/arm64/boot/dts/apm/apm-shadowcat.dtsi +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm/configs/mvebu_v7_defconfig +Auto-merging arch/arm/configs/multi_v5_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/btmrvl.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 586cf328ff7e] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/80211.tmpl | 2 +- + Documentation/accounting/getdelays.c | 5 +- + Documentation/devicetree/bindings/btmrvl.txt | 29 - + .../devicetree/bindings/net/apm-xgene-enet.txt | 2 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 2 - + .../devicetree/bindings/net/dsa/marvell.txt | 35 + + .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 57 +- + .../devicetree/bindings/net/hisilicon-hns-nic.txt | 30 +- + .../devicetree/bindings/net/marvell-bt-sd8xxx.txt | 56 + + .../devicetree/bindings/net/microchip,enc28j60.txt | 59 + + .../devicetree/bindings/net/nfc/pn533-i2c.txt | 31 + + Documentation/devicetree/bindings/net/phy.txt | 3 + + Documentation/devicetree/bindings/net/stmmac.txt | 2 + + .../bindings/net/wireless/marvell-sd8xxx.txt | 63 + + .../bindings/net/wireless/qcom,ath10k.txt | 23 +- + Documentation/networking/bonding.txt | 4 +- + Documentation/networking/dsa/bcm_sf2.txt | 2 +- + Documentation/networking/dsa/dsa.txt | 20 +- + Documentation/networking/filter.txt | 101 +- + Documentation/networking/gen_stats.txt | 6 +- + Documentation/networking/ip-sysctl.txt | 10 + + Documentation/networking/mac80211-injection.txt | 17 +- + Documentation/networking/netdev-features.txt | 10 +- + Documentation/networking/netdevices.txt | 9 +- + Documentation/networking/segmentation-offloads.txt | 130 + + Documentation/networking/stmmac.txt | 44 +- + Documentation/networking/switchdev.txt | 28 +- + Documentation/networking/timestamping.txt | 48 +- + Documentation/sysctl/net.txt | 11 + + MAINTAINERS | 15 +- + arch/arm/Kconfig | 2 +- + arch/arm/configs/multi_v5_defconfig | 5 +- + arch/arm/configs/mvebu_v7_defconfig | 2 +- + arch/arm/configs/orion5x_defconfig | 3 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 1 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 1 + + arch/arm64/boot/dts/hisilicon/hip05_hns.dtsi | 74 +- + arch/arm64/net/bpf_jit_comp.c | 90 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/s390/Kconfig | 2 +- + arch/s390/net/bpf_jit_comp.c | 77 +- + arch/sparc/Kconfig | 2 +- + arch/tile/configs/tilegx_defconfig | 3 +- + arch/tile/configs/tilepro_defconfig | 3 +- + arch/um/drivers/net_kern.c | 4 +- + arch/x86/Kconfig | 2 +- + arch/x86/net/bpf_jit_comp.c | 70 +- + arch/xtensa/platforms/iss/network.c | 2 +- + drivers/block/drbd/drbd_nl.c | 28 +- + drivers/bluetooth/ath3k.c | 8 +- + drivers/bluetooth/btmrvl_drv.h | 11 + + drivers/bluetooth/btmrvl_main.c | 35 +- + drivers/bluetooth/btmrvl_sdio.c | 79 + + drivers/bluetooth/btmrvl_sdio.h | 6 + + drivers/bluetooth/btusb.c | 12 +- + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_bcsp.c | 57 +- + drivers/bluetooth/hci_intel.c | 6 +- + drivers/bluetooth/hci_ldisc.c | 11 +- + drivers/bluetooth/hci_uart.h | 1 + + drivers/bluetooth/hci_vhci.c | 28 +- + drivers/char/pcmcia/synclink_cs.c | 4 +- + drivers/firewire/net.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 27 +- + drivers/infiniband/hw/mlx5/main.c | 3 +- + drivers/infiniband/hw/nes/nes_nic.c | 16 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/isdn/hardware/eicon/message.c | 21 +- + drivers/isdn/hysdn/hysdn_net.c | 2 +- + drivers/isdn/i4l/isdn_net.c | 4 +- + drivers/isdn/i4l/isdn_x25iface.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/net/Kconfig | 17 + + drivers/net/Makefile | 1 + + drivers/net/appletalk/cops.c | 2 +- + drivers/net/arcnet/com90xx.c | 2 +- + drivers/net/can/dev.c | 56 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 187 +- + drivers/net/can/janz-ican3.c | 104 +- + drivers/net/can/m_can/m_can.c | 2 +- + drivers/net/can/mscan/mscan.c | 4 +- + drivers/net/can/sja1000/plx_pci.c | 64 +- + drivers/net/can/sja1000/sja1000.c | 6 +- + drivers/net/can/spi/mcp251x.c | 3 +- + drivers/net/can/usb/ems_usb.c | 4 +- + drivers/net/can/usb/esd_usb2.c | 4 +- + drivers/net/can/usb/gs_usb.c | 3 +- + drivers/net/can/usb/peak_usb/pcan_usb_core.c | 4 +- + drivers/net/cris/eth_v10.c | 2 +- + drivers/net/dsa/Kconfig | 45 +- + drivers/net/dsa/Makefile | 15 +- + drivers/net/dsa/bcm_sf2.c | 62 +- + drivers/net/dsa/mv88e6060.c | 47 +- + drivers/net/dsa/mv88e6060.h | 11 + + drivers/net/dsa/mv88e6123.c | 124 - + drivers/net/dsa/mv88e6131.c | 177 - + drivers/net/dsa/mv88e6171.c | 123 - + drivers/net/dsa/mv88e6352.c | 345 -- + drivers/net/dsa/mv88e6xxx.c | 2280 +++++++----- + drivers/net/dsa/mv88e6xxx.h | 381 ++- + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c515.c | 2 +- + drivers/net/ethernet/3com/3c574_cs.c | 2 +- + drivers/net/ethernet/3com/3c589_cs.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 2 +- + drivers/net/ethernet/8390/axnet_cs.c | 6 +- + drivers/net/ethernet/8390/lib8390.c | 4 +- + drivers/net/ethernet/adaptec/starfire.c | 2 +- + drivers/net/ethernet/adi/bfin_mac.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 4 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 6 +- + drivers/net/ethernet/amd/7990.c | 12 +- + drivers/net/ethernet/amd/a2065.c | 9 +- + drivers/net/ethernet/amd/atarilance.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 2 +- + drivers/net/ethernet/amd/declance.c | 2 +- + drivers/net/ethernet/amd/lance.c | 2 +- + drivers/net/ethernet/amd/ni65.c | 4 +- + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pcnet32.c | 4 +- + drivers/net/ethernet/amd/sunlance.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_cle.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_cle.h | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 2 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 15 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 11 - + drivers/net/ethernet/atheros/atl1e/atl1e.h | 1 - + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 12 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 349 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 35 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 300 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.h | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_fw_hdr.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 467 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_nvm_defs.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 44 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 3 +- + drivers/net/ethernet/broadcom/cnic.c | 5 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 54 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/cadence/macb.c | 152 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 4 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/sge.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 40 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_dcb.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 100 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 147 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 330 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 7 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 5 + + drivers/net/ethernet/chelsio/cxgb4vf/adapter.h | 4 + + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 115 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 29 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 72 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 1 + + drivers/net/ethernet/davicom/dm9000.c | 15 +- + drivers/net/ethernet/dec/tulip/de4x5.c | 11 +- + drivers/net/ethernet/dec/tulip/dmfe.c | 45 +- + drivers/net/ethernet/dec/tulip/pnic.c | 6 +- + drivers/net/ethernet/dec/tulip/tulip_core.c | 2 +- + drivers/net/ethernet/dec/tulip/uli526x.c | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + drivers/net/ethernet/dlink/dl2k.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 10 +- + drivers/net/ethernet/faraday/ftgmac100.c | 36 +- + drivers/net/ethernet/fealnx.c | 2 +- + drivers/net/ethernet/freescale/fec.h | 1 - + drivers/net/ethernet/freescale/fec_main.c | 71 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 57 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 45 +- + drivers/net/ethernet/freescale/fs_enet/fs_enet.h | 1 - + drivers/net/ethernet/freescale/fs_enet/mac-fcc.c | 4 +- + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 6 +- + drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 2 +- + drivers/net/ethernet/freescale/gianfar.c | 44 +- + drivers/net/ethernet/freescale/gianfar.h | 1 - + drivers/net/ethernet/freescale/gianfar_ethtool.c | 52 +- + drivers/net/ethernet/freescale/ucc_geth_ethtool.c | 17 +- + drivers/net/ethernet/fujitsu/fmvj18x_cs.c | 2 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 93 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 260 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 12 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 209 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 21 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 171 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 67 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 1 - + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 187 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 44 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 23 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 3 + + drivers/net/ethernet/hp/hp100.c | 2 +- + drivers/net/ethernet/i825xx/82596.c | 2 +- + drivers/net/ethernet/i825xx/lib82596.c | 2 +- + drivers/net/ethernet/i825xx/sun3_82586.c | 4 +- + drivers/net/ethernet/ibm/emac/core.c | 4 +- + drivers/net/ethernet/ibm/emac/phy.c | 26 + + drivers/net/ethernet/ibm/ibmvnic.c | 251 +- + drivers/net/ethernet/ibm/ibmvnic.h | 4 + + drivers/net/ethernet/intel/Kconfig | 80 +- + drivers/net/ethernet/intel/e1000/e1000.h | 2 + + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 4 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 8 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 12 +- + drivers/net/ethernet/intel/e1000e/82571.c | 30 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 111 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 61 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 44 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 8 +- + drivers/net/ethernet/intel/e1000e/mac.c | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 163 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 2 +- + drivers/net/ethernet/intel/e1000e/phy.c | 4 +- + drivers/net/ethernet/intel/e1000e/phy.h | 10 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 2 + + drivers/net/ethernet/intel/fm10k/Makefile | 7 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 51 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.h | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 352 +- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 150 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.h | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 50 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 226 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 141 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 21 +- + drivers/net/ethernet/intel/fm10k/fm10k_ptp.c | 462 --- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 44 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.h | 4 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 28 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 63 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.h | 14 +- + drivers/net/ethernet/intel/i40e/i40e.h | 33 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 37 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 82 +- + drivers/net/ethernet/intel/i40e/i40e_client.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 168 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 36 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 386 ++- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 284 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 86 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 20 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 7 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 1065 +++--- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 114 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 42 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 45 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 509 ++- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 11 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 1 - + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 70 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 2 + + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 2 + + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 1021 +++--- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 114 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 51 +- + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 45 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 49 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 329 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 503 ++- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 145 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 8 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 30 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 108 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 10 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 4 +- + drivers/net/ethernet/intel/igb/e1000_nvm.c | 2 +- + drivers/net/ethernet/intel/igb/e1000_phy.h | 6 +- + drivers/net/ethernet/intel/igb/igb.h | 40 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 21 +- + drivers/net/ethernet/intel/igb/igb_main.c | 221 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 42 +- + drivers/net/ethernet/intel/igbvf/defines.h | 2 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 3 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 4 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 196 +- + drivers/net/ethernet/intel/igbvf/vf.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 99 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 18 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 161 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 9 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 50 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 1052 +++--- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 46 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 4 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 14 + + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 117 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 302 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 35 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h | 1 + + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 693 +++- + drivers/net/ethernet/intel/ixgbevf/defines.h | 29 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 230 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 37 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 298 +- + drivers/net/ethernet/intel/ixgbevf/mbx.c | 11 + + drivers/net/ethernet/intel/ixgbevf/vf.c | 224 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 6 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/korina.c | 8 +- + drivers/net/ethernet/lantiq_etop.c | 4 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 16 +- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 106 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 +- + drivers/net/ethernet/mellanox/mlx4/alloc.c | 93 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 42 +- + drivers/net/ethernet/mellanox/mlx4/en_resources.c | 31 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 11 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 29 +- + drivers/net/ethernet/mellanox/mlx4/mcg.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 - + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 7 - + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 309 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 580 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 752 ++++ + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 6 + + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 341 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 1060 +++--- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1238 +++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 736 +++- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 367 ++ + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 113 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 59 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 978 +++++- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 43 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 135 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 7 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 289 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 35 +- + .../net/ethernet/mellanox/mlx5/core/fs_counters.c | 226 ++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 18 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 138 + + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 68 + + drivers/net/ethernet/mellanox/mlx5/core/vxlan.h | 8 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 8 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 736 ++-- + drivers/net/ethernet/mellanox/mlxsw/core.h | 82 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 667 +++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 392 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 134 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 1001 ++++-- + drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c | 480 +++ + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 45 +- + drivers/net/ethernet/micrel/ks8695net.c | 7 +- + drivers/net/ethernet/micrel/ksz884x.c | 4 +- + drivers/net/ethernet/microchip/enc28j60.c | 34 +- + drivers/net/ethernet/microchip/encx24j600.c | 4 +- + drivers/net/ethernet/moxa/moxart_ether.c | 2 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/natsemi/sonic.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 9 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 22 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1101 ++++-- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 10 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 24 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 30 +- + drivers/net/ethernet/netx-eth.c | 12 +- + drivers/net/ethernet/nuvoton/w90p910_ether.c | 4 +- + drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe.h | 2 - + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 12 +- + drivers/net/ethernet/packetengines/hamachi.c | 2 +- + drivers/net/ethernet/packetengines/yellowfin.c | 2 +- + drivers/net/ethernet/qlogic/Kconfig | 31 + + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 +- + drivers/net/ethernet/qlogic/qed/Makefile | 4 +- + drivers/net/ethernet/qlogic/qed/qed.h | 84 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 186 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 13 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 562 +++ + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 80 + + drivers/net/ethernet/qlogic/qed/qed_dev.c | 740 +++- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 33 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 147 +- + drivers/net/ethernet/qlogic/qed/qed_hw.c | 67 +- + drivers/net/ethernet/qlogic/qed/qed_hw.h | 10 + + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 167 + + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 4 + + drivers/net/ethernet/qlogic/qed/qed_int.c | 160 +- + drivers/net/ethernet/qlogic/qed/qed_int.h | 36 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 717 ++-- + drivers/net/ethernet/qlogic/qed/qed_l2.h | 239 ++ + drivers/net/ethernet/qlogic/qed/qed_main.c | 282 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 356 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 80 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 53 + + drivers/net/ethernet/qlogic/qed/qed_selftest.c | 76 + + drivers/net/ethernet/qlogic/qed/qed_selftest.h | 40 + + drivers/net/ethernet/qlogic/qed/qed_sp.h | 36 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 322 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 19 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 3613 ++++++++++++++++++++ + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 386 +++ + drivers/net/ethernet/qlogic/qed/qed_vf.c | 1102 ++++++ + drivers/net/ethernet/qlogic/qed/qed_vf.h | 990 ++++++ + drivers/net/ethernet/qlogic/qede/qede.h | 45 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 625 +++- + drivers/net/ethernet/qlogic/qede/qede_main.c | 501 ++- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 10 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 2 +- + drivers/net/ethernet/qualcomm/qca_spi.c | 4 +- + drivers/net/ethernet/realtek/atp.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 44 +- + drivers/net/ethernet/renesas/ravb.h | 206 +- + drivers/net/ethernet/renesas/ravb_main.c | 289 +- + drivers/net/ethernet/renesas/ravb_ptp.c | 26 +- + drivers/net/ethernet/renesas/sh_eth.c | 39 +- + drivers/net/ethernet/renesas/sh_eth.h | 2 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 4 +- + drivers/net/ethernet/seeq/sgiseeq.c | 4 +- + drivers/net/ethernet/sgi/meth.c | 4 +- + drivers/net/ethernet/sis/sis900.c | 2 +- + drivers/net/ethernet/smsc/epic100.c | 2 +- + drivers/net/ethernet/smsc/smc911x.c | 6 +- + drivers/net/ethernet/smsc/smc9194.c | 4 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 4 +- + drivers/net/ethernet/smsc/smc91x.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 64 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 113 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 35 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 5 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 255 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 407 +++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 389 +++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h | 129 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 354 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 202 ++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 225 ++ + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 21 + + drivers/net/ethernet/stmicro/stmmac/mmc.h | 4 + + drivers/net/ethernet/stmicro/stmmac/mmc_core.c | 349 +- + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 21 + + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 13 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 653 +++- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 102 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 24 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 13 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 4 +- + drivers/net/ethernet/tehuti/tehuti.c | 10 +- + drivers/net/ethernet/ti/cpsw.c | 54 +- + drivers/net/ethernet/ti/netcp_core.c | 4 +- + drivers/net/ethernet/ti/tlan.c | 2 +- + drivers/net/ethernet/tile/tilepro.c | 4 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 3 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/wiznet/Kconfig | 14 + + drivers/net/ethernet/wiznet/Makefile | 1 + + drivers/net/ethernet/wiznet/w5100-spi.c | 466 +++ + drivers/net/ethernet/wiznet/w5100.c | 1076 ++++-- + drivers/net/ethernet/wiznet/w5100.h | 37 + + drivers/net/ethernet/wiznet/w5300.c | 2 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 4 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 2 +- + drivers/net/fjes/fjes_hw.c | 30 +- + drivers/net/fjes/fjes_hw.h | 9 +- + drivers/net/fjes/fjes_main.c | 137 +- + drivers/net/geneve.c | 91 +- + drivers/net/gtp.c | 1375 ++++++++ + drivers/net/hamradio/baycom_epp.c | 6 +- + drivers/net/hamradio/hdlcdrv.c | 6 +- + drivers/net/hamradio/mkiss.c | 4 +- + drivers/net/hamradio/scc.c | 2 +- + drivers/net/hamradio/yam.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 29 +- + drivers/net/hyperv/netvsc.c | 161 +- + drivers/net/hyperv/netvsc_drv.c | 428 ++- + drivers/net/hyperv/rndis_filter.c | 88 +- + drivers/net/ieee802154/adf7242.c | 2 + + drivers/net/ieee802154/at86rf230.c | 6 +- + drivers/net/ieee802154/atusb.c | 91 +- + drivers/net/ieee802154/mrf24j40.c | 14 +- + drivers/net/ifb.c | 3 + + drivers/net/ipvlan/ipvlan_main.c | 19 +- + drivers/net/irda/Kconfig | 7 - + drivers/net/irda/Makefile | 1 - + drivers/net/irda/ali-ircc.c | 8 +- + drivers/net/irda/bfin_sir.c | 2 +- + drivers/net/irda/irda-usb.c | 4 +- + drivers/net/irda/nsc-ircc.c | 8 +- + drivers/net/irda/sh_irda.c | 875 ----- + drivers/net/irda/smsc-ircc2.c | 2 +- + drivers/net/irda/stir4200.c | 2 +- + drivers/net/irda/via-ircc.c | 8 +- + drivers/net/macsec.c | 117 +- + drivers/net/macvlan.c | 10 +- + drivers/net/macvtap.c | 39 +- + drivers/net/phy/fixed_phy.c | 2 +- + drivers/net/phy/lxt.c | 22 +- + drivers/net/phy/mdio-mux.c | 10 +- + drivers/net/phy/mdio_bus.c | 10 +- + drivers/net/phy/micrel.c | 34 +- + drivers/net/phy/phy.c | 105 + + drivers/net/phy/phy_device.c | 13 +- + drivers/net/ppp/ppp_generic.c | 315 +- + drivers/net/rionet.c | 6 +- + drivers/net/slip/slip.c | 2 +- + drivers/net/tun.c | 118 +- + drivers/net/usb/asix_common.c | 2 +- + drivers/net/usb/catc.c | 4 +- + drivers/net/usb/kaweth.c | 2 +- + drivers/net/usb/lan78xx.c | 4 +- + drivers/net/usb/pegasus.c | 2 +- + drivers/net/usb/r8152.c | 3 +- + drivers/net/usb/rtl8150.c | 4 +- + drivers/net/usb/smsc75xx.c | 4 +- + drivers/net/usb/smsc95xx.c | 4 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/veth.c | 7 +- + drivers/net/vrf.c | 272 +- + drivers/net/vxlan.c | 297 +- + drivers/net/wan/cosa.c | 2 +- + drivers/net/wan/farsync.c | 6 +- + drivers/net/wan/lmc/lmc_main.c | 2 +- + drivers/net/wan/sbni.c | 8 +- + drivers/net/wimax/i2400m/netdev.c | 2 +- + drivers/net/wireless/admtek/adm8211.c | 4 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 4 +- + drivers/net/wireless/ath/ath.h | 2 +- + drivers/net/wireless/ath/ath10k/ce.c | 50 +- + drivers/net/wireless/ath/ath10k/ce.h | 17 +- + drivers/net/wireless/ath/ath10k/core.c | 472 +-- + drivers/net/wireless/ath/ath10k/core.h | 114 +- + drivers/net/wireless/ath/ath10k/debug.c | 136 +- + drivers/net/wireless/ath/ath10k/debug.h | 2 +- + drivers/net/wireless/ath/ath10k/htc.h | 4 +- + drivers/net/wireless/ath/ath10k/htt.c | 6 +- + drivers/net/wireless/ath/ath10k/htt.h | 60 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 718 ++-- + drivers/net/wireless/ath/ath10k/htt_tx.c | 300 +- + drivers/net/wireless/ath/ath10k/hw.h | 18 +- + drivers/net/wireless/ath/ath10k/mac.c | 702 +++- + drivers/net/wireless/ath/ath10k/mac.h | 7 + + drivers/net/wireless/ath/ath10k/pci.c | 271 +- + drivers/net/wireless/ath/ath10k/pci.h | 17 +- + drivers/net/wireless/ath/ath10k/swap.c | 44 +- + drivers/net/wireless/ath/ath10k/swap.h | 9 +- + drivers/net/wireless/ath/ath10k/targaddrs.h | 2 +- + drivers/net/wireless/ath/ath10k/testmode.c | 197 +- + drivers/net/wireless/ath/ath10k/thermal.h | 2 +- + drivers/net/wireless/ath/ath10k/txrx.c | 55 +- + drivers/net/wireless/ath/ath10k/txrx.h | 4 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 23 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 1 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 4 +- + drivers/net/wireless/ath/ath10k/wmi.c | 162 +- + drivers/net/wireless/ath/ath10k/wmi.h | 102 +- + drivers/net/wireless/ath/ath10k/wow.c | 7 +- + drivers/net/wireless/ath/ath5k/ani.c | 2 +- + drivers/net/wireless/ath/ath5k/ath5k.h | 10 +- + drivers/net/wireless/ath/ath5k/attach.c | 8 +- + drivers/net/wireless/ath/ath5k/base.c | 32 +- + drivers/net/wireless/ath/ath5k/debug.c | 6 +- + drivers/net/wireless/ath/ath5k/led.c | 2 +- + drivers/net/wireless/ath/ath5k/pcu.c | 6 +- + drivers/net/wireless/ath/ath5k/phy.c | 32 +- + drivers/net/wireless/ath/ath5k/qcu.c | 8 +- + drivers/net/wireless/ath/ath5k/reset.c | 10 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 22 +- + drivers/net/wireless/ath/ath6kl/core.h | 2 +- + drivers/net/wireless/ath/ath6kl/wmi.c | 27 +- + drivers/net/wireless/ath/ath6kl/wmi.h | 2 +- + .../net/wireless/ath/ath9k/ar9003_2p2_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 44 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_mci.c | 39 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 10 +- + .../net/wireless/ath/ath9k/ar9330_1p1_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar9330_1p2_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9340_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar9462_2p0_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar9462_2p1_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar9485_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ar953x_initvals.h | 4 +- + .../net/wireless/ath/ath9k/ar955x_1p0_initvals.h | 2 +- + .../net/wireless/ath/ath9k/ar9565_1p0_initvals.h | 2 +- + drivers/net/wireless/ath/ath9k/ar956x_initvals.h | 2 +- + .../net/wireless/ath/ath9k/ar9580_1p0_initvals.h | 4 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 4 - + drivers/net/wireless/ath/ath9k/btcoex.c | 138 +- + drivers/net/wireless/ath/ath9k/btcoex.h | 2 + + drivers/net/wireless/ath/ath9k/calib.c | 6 +- + drivers/net/wireless/ath/ath9k/channel.c | 8 +- + drivers/net/wireless/ath/ath9k/common-init.c | 28 +- + drivers/net/wireless/ath/ath9k/common.c | 4 +- + drivers/net/wireless/ath/ath9k/debug.c | 24 +- + drivers/net/wireless/ath/ath9k/debug_sta.c | 6 +- + drivers/net/wireless/ath/ath9k/dynack.c | 2 +- + drivers/net/wireless/ath/ath9k/gpio.c | 69 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_gpio.c | 8 +- + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 22 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 19 +- + drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 277 +- + drivers/net/wireless/ath/ath9k/hw.h | 11 +- + drivers/net/wireless/ath/ath9k/init.c | 22 +- + drivers/net/wireless/ath/ath9k/main.c | 13 +- + drivers/net/wireless/ath/ath9k/pci.c | 10 + + drivers/net/wireless/ath/ath9k/reg.h | 90 +- + drivers/net/wireless/ath/ath9k/rng.c | 20 +- + drivers/net/wireless/ath/ath9k/xmit.c | 4 +- + drivers/net/wireless/ath/carl9170/mac.c | 12 +- + drivers/net/wireless/ath/carl9170/main.c | 6 +- + drivers/net/wireless/ath/carl9170/phy.c | 18 +- + drivers/net/wireless/ath/carl9170/rx.c | 2 +- + drivers/net/wireless/ath/carl9170/tx.c | 8 +- + drivers/net/wireless/ath/regd.c | 16 +- + drivers/net/wireless/ath/regd.h | 2 +- + drivers/net/wireless/ath/wcn36xx/debug.c | 12 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 55 +- + drivers/net/wireless/ath/wcn36xx/main.c | 145 +- + drivers/net/wireless/ath/wcn36xx/pmc.c | 4 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 228 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 12 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 12 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 20 +- + drivers/net/wireless/ath/wil6210/Makefile | 1 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 336 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 59 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 6 +- + drivers/net/wireless/ath/wil6210/ioctl.c | 11 +- + drivers/net/wireless/ath/wil6210/main.c | 81 +- + drivers/net/wireless/ath/wil6210/netdev.c | 9 +- + drivers/net/wireless/ath/wil6210/p2p.c | 253 ++ + drivers/net/wireless/ath/wil6210/pcie_bus.c | 1 + + drivers/net/wireless/ath/wil6210/rx_reorder.c | 204 +- + drivers/net/wireless/ath/wil6210/trace.h | 19 +- + drivers/net/wireless/ath/wil6210/txrx.c | 67 +- + drivers/net/wireless/ath/wil6210/txrx.h | 12 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 110 +- + drivers/net/wireless/ath/wil6210/wil_platform.h | 8 +- + drivers/net/wireless/ath/wil6210/wmi.c | 136 +- + drivers/net/wireless/ath/wil6210/wmi.h | 1264 ++++--- + drivers/net/wireless/atmel/at76c50x-usb.c | 6 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + drivers/net/wireless/broadcom/b43/b43.h | 4 +- + drivers/net/wireless/broadcom/b43/main.c | 34 +- + drivers/net/wireless/broadcom/b43/phy_ac.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_common.c | 2 +- + drivers/net/wireless/broadcom/b43/phy_ht.c | 16 +- + drivers/net/wireless/broadcom/b43/phy_lcn.c | 10 +- + drivers/net/wireless/broadcom/b43/phy_lp.c | 30 +- + drivers/net/wireless/broadcom/b43/phy_n.c | 176 +- + drivers/net/wireless/broadcom/b43/tables_lpphy.c | 14 +- + drivers/net/wireless/broadcom/b43/tables_nphy.c | 16 +- + drivers/net/wireless/broadcom/b43/tables_phy_lcn.c | 2 +- + drivers/net/wireless/broadcom/b43/xmit.c | 8 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 12 +- + drivers/net/wireless/broadcom/b43legacy/xmit.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 141 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 38 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 247 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 5 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 30 +- + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 1 + + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 209 ++ + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 46 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 16 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 37 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 6 +- + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 10 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 16 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 4 +- + drivers/net/wireless/cisco/airo.c | 12 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 10 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 18 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 30 +- + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 22 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 20 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 41 +- + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 22 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 6 +- + drivers/net/wireless/intel/iwlegacy/4965.h | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 92 +- + drivers/net/wireless/intel/iwlegacy/common.h | 30 +- + drivers/net/wireless/intel/iwlegacy/debug.c | 4 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 10 - + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 22 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/rxon.c | 10 +- + drivers/net/wireless/intel/iwlwifi/dvm/scan.c | 38 +- + drivers/net/wireless/intel/iwlwifi/dvm/sta.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-1000.c | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-2000.c | 20 +- + drivers/net/wireless/intel/iwlwifi/iwl-5000.c | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 22 +- + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 30 +- + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 15 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 19 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 82 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 38 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 6 +- + .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 41 +- + drivers/net/wireless/intel/iwlwifi/iwl-fw.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 12 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 52 +- + .../net/wireless/intel/iwlwifi/mvm/coex_legacy.c | 1315 ------- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 169 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h | 35 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 108 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 140 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 56 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 57 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 34 +- + drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 58 +- + drivers/net/wireless/intel/iwlwifi/mvm/sf.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 262 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 87 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 15 - + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 201 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 165 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 16 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 35 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 80 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 2 +- + drivers/net/wireless/intersil/orinoco/cfg.c | 6 +- + drivers/net/wireless/intersil/orinoco/hw.c | 2 +- + drivers/net/wireless/intersil/orinoco/main.c | 2 +- + .../net/wireless/intersil/orinoco/orinoco_usb.c | 2 +- + drivers/net/wireless/intersil/orinoco/scan.c | 4 +- + drivers/net/wireless/intersil/p54/eeprom.c | 32 +- + drivers/net/wireless/intersil/p54/main.c | 4 +- + drivers/net/wireless/intersil/p54/p54.h | 2 +- + drivers/net/wireless/intersil/p54/txrx.c | 4 +- + drivers/net/wireless/intersil/prism54/isl_38xx.c | 35 +- + drivers/net/wireless/mac80211_hwsim.c | 21 +- + drivers/net/wireless/mac80211_hwsim.h | 1 + + drivers/net/wireless/marvell/libertas/cfg.c | 10 +- + drivers/net/wireless/marvell/libertas/cmd.c | 4 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 4 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 5 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 74 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 12 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 127 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 11 + + drivers/net/wireless/marvell/mwifiex/init.c | 2 +- + drivers/net/wireless/marvell/mwifiex/main.c | 24 +- + drivers/net/wireless/marvell/mwifiex/main.h | 20 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 115 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 21 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 202 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 87 +- + drivers/net/wireless/marvell/mwifiex/sdio.h | 7 + + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 42 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 15 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 3 + + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 47 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 2 +- + drivers/net/wireless/marvell/mwifiex/txrx.c | 13 +- + drivers/net/wireless/marvell/mwifiex/uap_cmd.c | 4 +- + drivers/net/wireless/marvell/mwifiex/uap_txrx.c | 96 + + drivers/net/wireless/marvell/mwifiex/usb.c | 11 +- + drivers/net/wireless/marvell/mwl8k.c | 88 +- + drivers/net/wireless/mediatek/mt7601u/init.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 34 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 43 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 21 +- + drivers/net/wireless/ralink/rt2x00/rt61pci.c | 22 +- + drivers/net/wireless/ralink/rt2x00/rt73usb.c | 22 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 16 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 4 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 2761 +++++++++++---- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 220 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 46 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 44 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 847 +++-- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 611 ++-- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 865 +++-- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 652 ++-- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 851 +++-- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 31 +- + .../realtek/rtlwifi/btcoexist/halbtcoutsrc.h | 19 +- + .../wireless/realtek/rtlwifi/btcoexist/rtl_btc.c | 5 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 39 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 3 +- + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 2 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 5 + + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/rf.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 3 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 8 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 7 +- + drivers/net/wireless/rndis_wlan.c | 4 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 100 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_pkt.c | 24 +- + drivers/net/wireless/rsi/rsi_main.h | 2 +- + drivers/net/wireless/st/cw1200/main.c | 10 +- + drivers/net/wireless/st/cw1200/scan.c | 2 +- + drivers/net/wireless/st/cw1200/sta.c | 6 +- + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + drivers/net/wireless/st/cw1200/wsm.c | 4 +- + drivers/net/wireless/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wl1251/ps.c | 2 +- + drivers/net/wireless/ti/wl1251/rx.c | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 8 +- + drivers/net/wireless/ti/wl12xx/scan.c | 22 +- + drivers/net/wireless/ti/wl18xx/cmd.c | 6 +- + drivers/net/wireless/ti/wl18xx/event.c | 6 +- + drivers/net/wireless/ti/wl18xx/main.c | 22 +- + drivers/net/wireless/ti/wl18xx/scan.c | 8 +- + drivers/net/wireless/ti/wl18xx/tx.c | 2 +- + drivers/net/wireless/ti/wlcore/cmd.c | 36 +- + drivers/net/wireless/ti/wlcore/cmd.h | 6 +- + drivers/net/wireless/ti/wlcore/main.c | 42 +- + drivers/net/wireless/ti/wlcore/ps.c | 6 +- + drivers/net/wireless/ti/wlcore/rx.c | 4 +- + drivers/net/wireless/ti/wlcore/rx.h | 2 +- + drivers/net/wireless/ti/wlcore/scan.c | 16 +- + drivers/net/wireless/ti/wlcore/tx.c | 2 +- + drivers/net/wireless/ti/wlcore/tx.h | 4 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 4 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 2 +- + drivers/net/wireless/wl3501_cs.c | 4 +- + drivers/net/wireless/zydas/zd1201.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 4 +- + drivers/net/xen-netback/Makefile | 2 +- + drivers/net/xen-netback/common.h | 74 +- + drivers/net/xen-netback/hash.c | 384 +++ + drivers/net/xen-netback/interface.c | 134 +- + drivers/net/xen-netback/netback.c | 249 +- + drivers/net/xen-netback/xenbus.c | 79 +- + drivers/nfc/Kconfig | 11 +- + drivers/nfc/Makefile | 2 +- + drivers/nfc/fdp/fdp.c | 3 +- + drivers/nfc/nxp-nci/i2c.c | 1 - + drivers/nfc/pn533/Kconfig | 27 + + drivers/nfc/pn533/Makefile | 9 + + drivers/nfc/pn533/i2c.c | 281 ++ + drivers/nfc/{ => pn533}/pn533.c | 1220 ++----- + drivers/nfc/pn533/pn533.h | 238 ++ + drivers/nfc/pn533/usb.c | 597 ++++ + drivers/nfc/pn544/i2c.c | 1 - + drivers/nfc/st-nci/i2c.c | 33 +- + drivers/nfc/st-nci/se.c | 28 +- + drivers/nfc/st-nci/spi.c | 32 +- + drivers/nfc/st-nci/st-nci.h | 14 +- + drivers/nfc/st-nci/vendor_cmds.c | 62 +- + drivers/nfc/st21nfca/core.c | 13 +- + drivers/nfc/st21nfca/i2c.c | 39 +- + drivers/nfc/st21nfca/se.c | 2 - + drivers/of/of_mdio.c | 27 +- + drivers/s390/net/ctcm_main.c | 6 +- + drivers/s390/net/ctcm_mpc.c | 2 +- + drivers/s390/net/netiucv.c | 2 +- + drivers/s390/net/qeth_core_main.c | 2 +- + drivers/staging/rtl8188eu/os_dep/mon.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 8 +- + drivers/staging/rtl8192u/r8192U_core.c | 4 +- + drivers/staging/rtl8723au/core/rtw_mlme_ext.c | 4 +- + drivers/staging/rtl8723au/include/ieee80211.h | 2 +- + drivers/staging/rtl8723au/os_dep/ioctl_cfg80211.c | 54 +- + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device_main.c | 4 +- + drivers/staging/vt6655/rxtx.c | 2 +- + drivers/staging/vt6656/channel.c | 4 +- + drivers/staging/vt6656/int.c | 2 +- + drivers/staging/vt6656/main_usb.c | 2 +- + drivers/staging/vt6656/rxtx.c | 2 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 10 +- + drivers/staging/wlan-ng/cfg80211.c | 6 +- + drivers/staging/wlan-ng/p80211netdev.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/synclink.c | 4 +- + drivers/tty/synclink_gt.c | 4 +- + drivers/tty/synclinkmp.c | 4 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + fs/afs/rxrpc.c | 30 +- + fs/cifs/connect.c | 4 +- + fs/gfs2/glock.c | 4 +- + fs/quota/netlink.c | 12 +- + include/linux/ath9k_platform.h | 4 + + include/linux/bpf.h | 9 + + include/linux/can/dev.h | 22 +- + include/linux/ethtool.h | 7 + + include/linux/filter.h | 72 +- + include/linux/genl_magic_struct.h | 7 +- + include/linux/ieee80211.h | 24 + + include/linux/ieee802154.h | 45 +- + include/linux/ipv6.h | 20 +- + include/linux/mdio.h | 11 + + include/linux/mlx4/device.h | 4 +- + include/linux/mlx5/device.h | 104 +- + include/linux/mlx5/driver.h | 28 +- + include/linux/mlx5/fs.h | 23 +- + include/linux/mlx5/mlx5_ifc.h | 354 +- + include/linux/mlx5/port.h | 25 + + include/linux/mlx5/qp.h | 6 + + include/linux/netdev_features.h | 17 +- + include/linux/netdevice.h | 87 +- + include/linux/netfilter/ipset/ip_set.h | 9 +- + include/linux/netfilter/x_tables.h | 18 +- + include/linux/nl802154.h | 2 + + include/linux/perf_event.h | 4 +- + include/linux/phy.h | 8 + + include/linux/qed/common_hsi.h | 62 + + include/linux/qed/qed_eth_if.h | 22 +- + include/linux/qed/qed_if.h | 117 +- + include/linux/qed/qed_iov_if.h | 34 + + include/linux/rculist.h | 36 + + include/linux/rhashtable.h | 3 +- + include/linux/sctp.h | 67 + + include/linux/skbuff.h | 52 +- + include/linux/soc/qcom/smd.h | 58 +- + include/linux/socket.h | 4 +- + include/linux/stmmac.h | 2 + + include/linux/trace_events.h | 14 +- + include/linux/u64_stats_sync.h | 14 + + include/linux/udp.h | 16 +- + include/net/6lowpan.h | 37 +- + include/net/act_api.h | 12 + + include/net/af_rxrpc.h | 4 +- + include/net/bluetooth/hci.h | 2 + + include/net/cfg80211.h | 158 +- + include/net/codel.h | 217 +- + include/net/codel_impl.h | 255 ++ + include/net/codel_qdisc.h | 73 + + include/net/devlink.h | 61 + + include/net/dsa.h | 48 +- + include/net/dst.h | 5 +- + include/net/fq.h | 95 + + include/net/fq_impl.h | 277 ++ + include/net/gen_stats.h | 6 +- + include/net/geneve.h | 6 +- + include/net/gre.h | 104 + + include/net/gtp.h | 34 + + include/net/icmp.h | 4 +- + include/net/inet6_hashtables.h | 12 +- + include/net/inet_hashtables.h | 47 +- + include/net/ip.h | 16 +- + include/net/ip6_tunnel.h | 11 +- + include/net/ip_tunnels.h | 21 +- + include/net/ip_vs.h | 17 + + include/net/ipv6.h | 68 +- + include/net/l3mdev.h | 68 +- + include/net/mac80211.h | 94 +- + include/net/mac802154.h | 10 + + include/net/netfilter/nf_conntrack.h | 2 - + include/net/netfilter/nf_conntrack_core.h | 1 + + include/net/netfilter/nf_conntrack_ecache.h | 108 +- + include/net/netfilter/nf_conntrack_expect.h | 1 + + include/net/netfilter/nf_conntrack_l4proto.h | 3 + + include/net/netfilter/nf_conntrack_labels.h | 5 +- + include/net/netfilter/nf_tables.h | 2 +- + include/net/netlink.h | 121 +- + include/net/netns/conntrack.h | 10 - + include/net/netns/ipv4.h | 3 + + include/net/nfc/nci_core.h | 17 +- + include/net/nl802154.h | 6 + + include/net/pkt_cls.h | 21 +- + include/net/protocol.h | 3 - + include/net/request_sock.h | 31 +- + include/net/route.h | 7 +- + include/net/rtnetlink.h | 7 + + include/net/sch_generic.h | 20 +- + include/net/sctp/sctp.h | 38 +- + include/net/sctp/structs.h | 13 +- + include/net/snmp.h | 40 +- + include/net/sock.h | 161 +- + include/net/switchdev.h | 2 +- + include/net/tc_act/tc_mirred.h | 15 + + include/net/tcp.h | 81 +- + include/net/transp_v6.h | 4 +- + include/net/udp.h | 56 +- + include/net/udp_tunnel.h | 10 +- + include/net/vxlan.h | 77 +- + include/net/xfrm.h | 4 - + include/rxrpc/packet.h | 2 - + include/trace/perf.h | 16 +- + include/trace/trace_events.h | 3 - + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/bpf.h | 7 + + include/uapi/linux/devlink.h | 63 + + include/uapi/linux/fib_rules.h | 1 + + include/uapi/linux/gen_stats.h | 1 + + include/uapi/linux/gtp.h | 33 + + include/uapi/linux/if_bridge.h | 18 + + include/uapi/linux/if_ether.h | 1 + + include/uapi/linux/if_link.h | 62 + + include/uapi/linux/if_macsec.h | 6 + + include/uapi/linux/ila.h | 8 + + include/uapi/linux/inet_diag.h | 6 +- + include/uapi/linux/ip_vs.h | 1 + + include/uapi/linux/l2tp.h | 2 + + include/uapi/linux/lwtunnel.h | 2 + + include/uapi/linux/neighbour.h | 2 + + include/uapi/linux/net_tstamp.h | 10 + + include/uapi/linux/netfilter/ipset/ip_set.h | 1 + + include/uapi/linux/netfilter/nf_tables.h | 9 + + include/uapi/linux/netfilter/nfnetlink_acct.h | 1 + + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 3 + + include/uapi/linux/netfilter/nfnetlink_queue.h | 10 + + include/uapi/linux/nl80211.h | 110 +- + include/uapi/linux/openvswitch.h | 4 + + include/uapi/linux/pkt_cls.h | 6 + + include/uapi/linux/pkt_sched.h | 7 + + include/uapi/linux/qrtr.h | 12 + + include/uapi/linux/quota.h | 1 + + include/uapi/linux/rtnetlink.h | 7 + + include/uapi/linux/sock_diag.h | 1 + + include/uapi/linux/tc_act/tc_bpf.h | 1 + + include/uapi/linux/tc_act/tc_connmark.h | 1 + + include/uapi/linux/tc_act/tc_csum.h | 1 + + include/uapi/linux/tc_act/tc_defact.h | 1 + + include/uapi/linux/tc_act/tc_gact.h | 1 + + include/uapi/linux/tc_act/tc_ife.h | 1 + + include/uapi/linux/tc_act/tc_ipt.h | 1 + + include/uapi/linux/tc_act/tc_mirred.h | 1 + + include/uapi/linux/tc_act/tc_nat.h | 1 + + include/uapi/linux/tc_act/tc_pedit.h | 1 + + include/uapi/linux/tc_act/tc_skbedit.h | 1 + + include/uapi/linux/tc_act/tc_vlan.h | 1 + + include/uapi/linux/tcp_metrics.h | 1 + + include/uapi/linux/udp.h | 3 +- + include/uapi/linux/xfrm.h | 1 + + kernel/bpf/core.c | 306 +- + kernel/bpf/helpers.c | 17 +- + kernel/bpf/stackmap.c | 2 +- + kernel/bpf/syscall.c | 2 +- + kernel/bpf/verifier.c | 729 +++- + kernel/events/core.c | 45 +- + kernel/taskstats.c | 37 +- + kernel/trace/bpf_trace.c | 129 +- + kernel/trace/trace_event_perf.c | 40 +- + kernel/trace/trace_events.c | 18 + + kernel/trace/trace_kprobe.c | 10 +- + kernel/trace/trace_syscalls.c | 13 +- + kernel/trace/trace_uprobe.c | 5 +- + lib/nlattr.c | 103 + + lib/rhashtable.c | 6 +- + lib/test_bpf.c | 5 +- + lib/test_rhashtable.c | 2 +- + net/6lowpan/6lowpan_i.h | 9 + + net/6lowpan/core.c | 8 +- + net/6lowpan/debugfs.c | 22 +- + net/6lowpan/iphc.c | 122 +- + net/6lowpan/nhc_udp.c | 2 +- + net/Kconfig | 22 +- + net/Makefile | 1 + + net/atm/lec.c | 4 +- + net/batman-adv/bat_iv_ogm.c | 171 +- + net/batman-adv/bat_v.c | 9 +- + net/batman-adv/bat_v_ogm.c | 219 +- + net/batman-adv/bitarray.c | 16 +- + net/batman-adv/bitarray.h | 15 +- + net/batman-adv/bridge_loop_avoidance.c | 333 +- + net/batman-adv/bridge_loop_avoidance.h | 43 +- + net/batman-adv/debugfs.c | 21 +- + net/batman-adv/distributed-arp-table.c | 14 +- + net/batman-adv/fragmentation.c | 12 +- + net/batman-adv/gateway_client.c | 12 +- + net/batman-adv/hard-interface.c | 34 +- + net/batman-adv/hard-interface.h | 3 +- + net/batman-adv/hash.h | 6 +- + net/batman-adv/icmp_socket.c | 24 +- + net/batman-adv/main.c | 26 +- + net/batman-adv/main.h | 11 +- + net/batman-adv/multicast.c | 11 +- + net/batman-adv/network-coding.c | 45 +- + net/batman-adv/originator.c | 43 +- + net/batman-adv/originator.h | 2 +- + net/batman-adv/packet.h | 3 +- + net/batman-adv/routing.c | 50 +- + net/batman-adv/routing.h | 6 +- + net/batman-adv/send.c | 10 +- + net/batman-adv/soft-interface.c | 52 +- + net/batman-adv/soft-interface.h | 10 +- + net/batman-adv/sysfs.c | 9 +- + net/batman-adv/translation-table.c | 46 +- + net/batman-adv/types.h | 8 + + net/bluetooth/6lowpan.c | 93 +- + net/bluetooth/af_bluetooth.c | 2 +- + net/bluetooth/bnep/netdev.c | 2 +- + net/bluetooth/hci_core.c | 4 +- + net/bluetooth/hci_event.c | 13 + + net/bluetooth/hci_request.c | 6 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/bridge/br_ioctl.c | 40 +- + net/bridge/br_netfilter_hooks.c | 6 +- + net/bridge/br_netfilter_ipv6.c | 10 +- + net/bridge/br_netlink.c | 140 +- + net/bridge/br_private.h | 18 + + net/bridge/br_sysfs_br.c | 101 +- + net/bridge/br_sysfs_if.c | 5 +- + net/bridge/br_vlan.c | 135 +- + net/bridge/netfilter/nf_tables_bridge.c | 47 +- + net/can/raw.c | 2 +- + net/core/datagram.c | 9 +- + net/core/dev.c | 112 +- + net/core/devlink.c | 1250 ++++++- + net/core/ethtool.c | 25 +- + net/core/fib_rules.c | 4 +- + net/core/filter.c | 185 +- + net/core/gen_stats.c | 35 +- + net/core/neighbour.c | 22 +- + net/core/net-procfs.c | 3 +- + net/core/pktgen.c | 1 - + net/core/rtnetlink.c | 264 +- + net/core/skbuff.c | 272 +- + net/core/sock.c | 150 +- + net/core/sock_diag.c | 3 +- + net/core/sysctl_net_core.c | 9 + + net/dccp/dccp.h | 6 +- + net/dccp/input.c | 2 +- + net/dccp/ipv4.c | 33 +- + net/dccp/ipv6.c | 33 +- + net/dccp/minisocks.c | 2 +- + net/dccp/options.c | 2 +- + net/dccp/timer.c | 8 +- + net/dsa/dsa.c | 62 +- + net/dsa/dsa_priv.h | 5 - + net/dsa/slave.c | 168 +- + net/hsr/Kconfig | 5 +- + net/hsr/hsr_device.c | 91 +- + net/hsr/hsr_device.h | 2 +- + net/hsr/hsr_forward.c | 43 +- + net/hsr/hsr_framereg.c | 30 +- + net/hsr/hsr_main.h | 13 +- + net/hsr/hsr_netlink.c | 17 +- + net/hsr/hsr_slave.c | 4 +- + net/ieee802154/6lowpan/6lowpan_i.h | 14 +- + net/ieee802154/6lowpan/core.c | 6 +- + net/ieee802154/6lowpan/tx.c | 14 +- + net/ieee802154/nl-mac.c | 17 +- + net/ieee802154/nl802154.c | 26 +- + net/ipv4/af_inet.c | 73 +- + net/ipv4/arp.c | 2 +- + net/ipv4/cipso_ipv4.c | 3 +- + net/ipv4/fib_frontend.c | 1 + + net/ipv4/fib_semantics.c | 34 +- + net/ipv4/fou.c | 64 +- + net/ipv4/gre_demux.c | 61 + + net/ipv4/gre_offload.c | 41 +- + net/ipv4/icmp.c | 18 +- + net/ipv4/inet_connection_sock.c | 9 +- + net/ipv4/inet_diag.c | 98 +- + net/ipv4/inet_hashtables.c | 86 +- + net/ipv4/inet_timewait_sock.c | 10 +- + net/ipv4/ip_forward.c | 6 +- + net/ipv4/ip_fragment.c | 14 +- + net/ipv4/ip_gre.c | 259 +- + net/ipv4/ip_input.c | 42 +- + net/ipv4/ip_sockglue.c | 34 +- + net/ipv4/ip_tunnel_core.c | 41 +- + net/ipv4/ipip.c | 7 +- + net/ipv4/ipmr.c | 4 +- + net/ipv4/netfilter/arp_tables.c | 522 +-- + net/ipv4/netfilter/ip_tables.c | 573 +--- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + .../netfilter/nf_conntrack_l3proto_ipv4_compat.c | 47 +- + net/ipv4/ping.c | 7 +- + net/ipv4/raw.c | 13 +- + net/ipv4/route.c | 10 +- + net/ipv4/syncookies.c | 4 +- + net/ipv4/sysctl_net_ipv4.c | 11 + + net/ipv4/tcp.c | 65 +- + net/ipv4/tcp_bic.c | 6 +- + net/ipv4/tcp_cdg.c | 34 +- + net/ipv4/tcp_cubic.c | 26 +- + net/ipv4/tcp_fastopen.c | 14 +- + net/ipv4/tcp_htcp.c | 10 +- + net/ipv4/tcp_illinois.c | 21 +- + net/ipv4/tcp_input.c | 249 +- + net/ipv4/tcp_ipv4.c | 144 +- + net/ipv4/tcp_lp.c | 6 +- + net/ipv4/tcp_metrics.c | 6 +- + net/ipv4/tcp_minisocks.c | 19 +- + net/ipv4/tcp_offload.c | 30 +- + net/ipv4/tcp_output.c | 165 +- + net/ipv4/tcp_recovery.c | 4 +- + net/ipv4/tcp_timer.c | 28 +- + net/ipv4/tcp_vegas.c | 6 +- + net/ipv4/tcp_vegas.h | 2 +- + net/ipv4/tcp_veno.c | 7 +- + net/ipv4/tcp_westwood.c | 7 +- + net/ipv4/tcp_yeah.c | 7 +- + net/ipv4/udp.c | 428 +-- + net/ipv4/udp_diag.c | 18 +- + net/ipv4/udp_offload.c | 140 +- + net/ipv4/udp_tunnel.c | 2 + + net/ipv6/Kconfig | 1 + + net/ipv6/Makefile | 5 +- + net/ipv6/addrconf.c | 667 ++-- + net/ipv6/af_inet6.c | 9 + + net/ipv6/datagram.c | 29 +- + net/ipv6/exthdrs.c | 66 +- + net/ipv6/icmp.c | 42 +- + net/ipv6/ila/ila.h | 79 +- + net/ipv6/ila/ila_common.c | 81 +- + net/ipv6/ila/ila_lwt.c | 54 +- + net/ipv6/ila/ila_xlat.c | 167 +- + net/ipv6/inet6_hashtables.c | 64 +- + net/ipv6/ip6_fib.c | 1 + + net/ipv6/ip6_flowlabel.c | 7 +- + net/ipv6/ip6_gre.c | 450 +-- + net/ipv6/ip6_input.c | 39 +- + net/ipv6/ip6_offload.c | 23 +- + net/ipv6/ip6_offload.h | 3 +- + net/ipv6/ip6_output.c | 79 +- + net/ipv6/ip6_tunnel.c | 268 +- + net/ipv6/ip6mr.c | 12 +- + net/ipv6/ipv6_sockglue.c | 13 +- + net/ipv6/netfilter/ip6_tables.c | 551 +-- + net/ipv6/netfilter/ip6t_SYNPROXY.c | 58 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 2 +- + net/ipv6/ping.c | 13 +- + net/ipv6/raw.c | 34 +- + net/ipv6/reassembly.c | 32 +- + net/ipv6/route.c | 42 +- + net/ipv6/sit.c | 14 +- + net/ipv6/syncookies.c | 4 +- + net/ipv6/tcp_ipv6.c | 78 +- + net/ipv6/udp.c | 358 +- + net/ipv6/udp_offload.c | 11 +- + net/irda/irlan/irlan_eth.c | 2 +- + net/l2tp/l2tp_ip6.c | 31 +- + net/l2tp/l2tp_netlink.c | 83 +- + net/l3mdev/l3mdev.c | 63 + + net/llc/llc_proc.c | 2 +- + net/mac80211/agg-tx.c | 5 + + net/mac80211/cfg.c | 32 +- + net/mac80211/debugfs.c | 3 + + net/mac80211/debugfs_netdev.c | 12 +- + net/mac80211/debugfs_sta.c | 134 +- + net/mac80211/driver-ops.h | 15 + + net/mac80211/ibss.c | 27 +- + net/mac80211/ieee80211_i.h | 45 +- + net/mac80211/iface.c | 4 +- + net/mac80211/key.c | 1 + + net/mac80211/main.c | 10 +- + net/mac80211/mesh.c | 48 +- + net/mac80211/mesh.h | 71 +- + net/mac80211/mesh_hwmp.c | 4 + + net/mac80211/mesh_pathtbl.c | 965 ++---- + net/mac80211/mesh_plink.c | 23 +- + net/mac80211/mlme.c | 35 +- + net/mac80211/ocb.c | 2 - + net/mac80211/rate.c | 2 +- + net/mac80211/rate.h | 4 +- + net/mac80211/rc80211_minstrel.c | 6 +- + net/mac80211/rc80211_minstrel_ht.c | 81 +- + net/mac80211/rx.c | 555 ++- + net/mac80211/scan.c | 20 +- + net/mac80211/spectmgmt.c | 4 +- + net/mac80211/sta_info.c | 289 +- + net/mac80211/sta_info.h | 130 +- + net/mac80211/status.c | 4 +- + net/mac80211/tdls.c | 18 +- + net/mac80211/trace.h | 18 +- + net/mac80211/tx.c | 211 +- + net/mac80211/util.c | 29 +- + net/mac80211/vht.c | 4 +- + net/mac80211/wpa.c | 42 +- + net/mpls/mpls_gso.c | 1 + + net/netfilter/ipvs/ip_vs_conn.c | 51 +- + net/netfilter/ipvs/ip_vs_core.c | 162 +- + net/netfilter/ipvs/ip_vs_ctl.c | 82 +- + net/netfilter/ipvs/ip_vs_nfct.c | 4 + + net/netfilter/ipvs/ip_vs_pe_sip.c | 15 + + net/netfilter/ipvs/ip_vs_xmit.c | 6 +- + net/netfilter/nf_conntrack_core.c | 432 +-- + net/netfilter/nf_conntrack_ecache.c | 84 + + net/netfilter/nf_conntrack_expect.c | 83 +- + net/netfilter/nf_conntrack_helper.c | 12 +- + net/netfilter/nf_conntrack_labels.c | 44 +- + net/netfilter/nf_conntrack_netlink.c | 166 +- + net/netfilter/nf_conntrack_proto_dccp.c | 4 +- + net/netfilter/nf_conntrack_proto_sctp.c | 8 +- + net/netfilter/nf_conntrack_proto_tcp.c | 8 +- + net/netfilter/nf_conntrack_proto_udp.c | 2 + + net/netfilter/nf_conntrack_proto_udplite.c | 2 + + net/netfilter/nf_conntrack_standalone.c | 13 +- + net/netfilter/nf_nat_core.c | 39 +- + net/netfilter/nf_tables_api.c | 102 +- + net/netfilter/nf_tables_trace.c | 5 +- + net/netfilter/nfnetlink_acct.c | 9 +- + net/netfilter/nfnetlink_cttimeout.c | 6 +- + net/netfilter/nfnetlink_queue.c | 105 + + net/netfilter/nft_counter.c | 6 +- + net/netfilter/nft_ct.c | 32 + + net/netfilter/nft_dynset.c | 3 +- + net/netfilter/nft_hash.c | 4 +- + net/netfilter/nft_limit.c | 6 +- + net/netfilter/nft_rbtree.c | 49 +- + net/netfilter/x_tables.c | 245 +- + net/netfilter/xt_connlabel.c | 14 +- + net/netfilter/xt_socket.c | 6 +- + net/netlink/af_netlink.c | 10 +- + net/nfc/nci/core.c | 117 +- + net/nfc/nci/ntf.c | 2 +- + net/nfc/nci/rsp.c | 23 +- + net/openvswitch/conntrack.c | 10 +- + net/openvswitch/datapath.c | 30 +- + net/openvswitch/flow_netlink.c | 5 +- + net/openvswitch/vport-internal_dev.c | 3 +- + net/packet/af_packet.c | 44 +- + net/qrtr/Kconfig | 24 + + net/qrtr/Makefile | 4 + + net/qrtr/qrtr.c | 1007 ++++++ + net/qrtr/qrtr.h | 31 + + net/qrtr/smd.c | 120 + + net/rds/tcp_recv.c | 14 +- + net/rfkill/core.c | 36 +- + net/rxrpc/Kconfig | 2 +- + net/rxrpc/Makefile | 7 +- + net/rxrpc/af_rxrpc.c | 9 + + net/rxrpc/ar-accept.c | 4 +- + net/rxrpc/ar-ack.c | 81 +- + net/rxrpc/ar-call.c | 11 +- + net/rxrpc/ar-connection.c | 14 +- + net/rxrpc/ar-connevent.c | 27 +- + net/rxrpc/ar-input.c | 22 +- + net/rxrpc/ar-internal.h | 70 +- + net/rxrpc/ar-output.c | 6 +- + net/rxrpc/ar-proc.c | 2 +- + net/rxrpc/ar-recvmsg.c | 18 +- + net/rxrpc/ar-security.c | 166 +- + net/rxrpc/insecure.c | 83 + + net/rxrpc/misc.c | 89 + + net/rxrpc/rxkad.c | 61 +- + net/sched/act_api.c | 7 +- + net/sched/act_bpf.c | 5 +- + net/sched/act_connmark.c | 3 +- + net/sched/act_csum.c | 2 +- + net/sched/act_gact.c | 17 +- + net/sched/act_ife.c | 2 +- + net/sched/act_ipt.c | 2 +- + net/sched/act_mirred.c | 7 +- + net/sched/act_nat.c | 2 +- + net/sched/act_pedit.c | 2 +- + net/sched/act_simple.c | 2 +- + net/sched/act_skbedit.c | 2 +- + net/sched/act_vlan.c | 2 +- + net/sched/cls_bpf.c | 2 + + net/sched/cls_flower.c | 21 + + net/sched/cls_u32.c | 52 +- + net/sched/em_meta.c | 8 +- + net/sched/sch_api.c | 6 +- + net/sched/sch_codel.c | 22 +- + net/sched/sch_fq_codel.c | 111 +- + net/sched/sch_generic.c | 44 +- + net/sched/sch_htb.c | 6 +- + net/sched/sch_netem.c | 3 +- + net/sched/sch_tbf.c | 6 +- + net/sctp/Kconfig | 4 + + net/sctp/Makefile | 1 + + net/sctp/chunk.c | 2 +- + net/sctp/input.c | 16 +- + net/sctp/inqueue.c | 5 + + net/sctp/ipv6.c | 2 +- + net/sctp/proc.c | 104 +- + net/sctp/sctp_diag.c | 500 +++ + net/sctp/sm_sideeffect.c | 6 + + net/sctp/socket.c | 223 +- + net/sctp/ulpqueue.c | 26 +- + net/socket.c | 13 +- + net/sunrpc/socklib.c | 2 +- + net/sunrpc/svcsock.c | 8 +- + net/sunrpc/xprtsock.c | 15 +- + net/switchdev/Kconfig | 2 +- + net/switchdev/switchdev.c | 6 +- + net/tipc/bearer.c | 101 +- + net/tipc/bearer.h | 15 - + net/tipc/core.c | 8 +- + net/tipc/discover.c | 7 +- + net/tipc/discover.h | 2 +- + net/tipc/link.c | 52 +- + net/tipc/link.h | 2 +- + net/tipc/msg.h | 29 +- + net/tipc/netlink_compat.c | 2 +- + net/tipc/node.c | 33 +- + net/tipc/node.h | 6 +- + net/tipc/server.c | 19 +- + net/tipc/server.h | 4 +- + net/tipc/socket.c | 147 +- + net/tipc/socket.h | 17 +- + net/tipc/subscr.c | 7 +- + net/vmw_vsock/vmci_transport.c | 2 +- + net/wireless/chan.c | 4 +- + net/wireless/core.c | 32 +- + net/wireless/core.h | 6 +- + net/wireless/debugfs.c | 4 +- + net/wireless/ibss.c | 6 +- + net/wireless/mesh.c | 4 +- + net/wireless/mlme.c | 2 +- + net/wireless/nl80211.c | 342 +- + net/wireless/rdev-ops.h | 2 +- + net/wireless/reg.c | 32 +- + net/wireless/reg.h | 2 +- + net/wireless/scan.c | 24 +- + net/wireless/sme.c | 54 +- + net/wireless/sysfs.c | 2 +- + net/wireless/trace.h | 26 +- + net/wireless/util.c | 46 +- + net/wireless/wext-compat.c | 45 +- + net/wireless/wext-core.c | 5 +- + net/xfrm/xfrm_user.c | 10 +- + samples/bpf/Makefile | 44 +- + samples/bpf/README.rst | 66 + + samples/bpf/bpf_load.c | 26 +- + samples/bpf/offwaketime_kern.c | 36 +- + samples/bpf/parse_ldabs.c | 41 + + samples/bpf/parse_simple.c | 48 + + samples/bpf/parse_varlen.c | 153 + + samples/bpf/test_cls_bpf.sh | 37 + + samples/bpf/test_overhead_kprobe_kern.c | 41 + + samples/bpf/test_overhead_tp_kern.c | 36 + + samples/bpf/test_overhead_user.c | 162 + + samples/bpf/test_verifier.c | 348 ++ + samples/bpf/tracex1_kern.c | 4 +- + samples/bpf/tracex2_kern.c | 4 +- + samples/bpf/tracex5_kern.c | 6 +- + security/selinux/nlmsgtab.c | 4 +- + 1508 files changed, 76287 insertions(+), 34211 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/btmrvl.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/marvell.txt + create mode 100644 Documentation/devicetree/bindings/net/marvell-bt-sd8xxx.txt + create mode 100644 Documentation/devicetree/bindings/net/microchip,enc28j60.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/pn533-i2c.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/marvell-sd8xxx.txt + create mode 100644 Documentation/networking/segmentation-offloads.txt + delete mode 100644 drivers/net/dsa/mv88e6123.c + delete mode 100644 drivers/net/dsa/mv88e6131.c + delete mode 100644 drivers/net/dsa/mv88e6171.c + delete mode 100644 drivers/net/dsa/mv88e6352.c + delete mode 100644 drivers/net/ethernet/intel/fm10k/fm10k_ptp.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_stats.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_counters.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_dcb.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dcbx.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_dcbx.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_l2.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_selftest.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_selftest.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sriov.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_sriov.h + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_vf.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_vf.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c + create mode 100644 drivers/net/ethernet/wiznet/w5100-spi.c + create mode 100644 drivers/net/ethernet/wiznet/w5100.h + create mode 100644 drivers/net/gtp.c + delete mode 100644 drivers/net/irda/sh_irda.c + create mode 100644 drivers/net/wireless/ath/wil6210/p2p.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c + create mode 100644 drivers/net/xen-netback/hash.c + create mode 100644 drivers/nfc/pn533/Kconfig + create mode 100644 drivers/nfc/pn533/Makefile + create mode 100644 drivers/nfc/pn533/i2c.c + rename drivers/nfc/{ => pn533}/pn533.c (67%) + create mode 100644 drivers/nfc/pn533/pn533.h + create mode 100644 drivers/nfc/pn533/usb.c + create mode 100644 include/linux/qed/qed_iov_if.h + create mode 100644 include/net/codel_impl.h + create mode 100644 include/net/codel_qdisc.h + create mode 100644 include/net/fq.h + create mode 100644 include/net/fq_impl.h + create mode 100644 include/net/gtp.h + create mode 100644 include/uapi/linux/gtp.h + create mode 100644 include/uapi/linux/qrtr.h + create mode 100644 net/qrtr/Kconfig + create mode 100644 net/qrtr/Makefile + create mode 100644 net/qrtr/qrtr.c + create mode 100644 net/qrtr/qrtr.h + create mode 100644 net/qrtr/smd.c + create mode 100644 net/rxrpc/insecure.c + create mode 100644 net/rxrpc/misc.c + create mode 100644 net/sctp/sctp_diag.c + create mode 100644 samples/bpf/README.rst + create mode 100644 samples/bpf/parse_ldabs.c + create mode 100644 samples/bpf/parse_simple.c + create mode 100644 samples/bpf/parse_varlen.c + create mode 100755 samples/bpf/test_cls_bpf.sh + create mode 100644 samples/bpf/test_overhead_kprobe_kern.c + create mode 100644 samples/bpf/test_overhead_tp_kern.c + create mode 100644 samples/bpf/test_overhead_user.c +Merging ipsec-next/master (cb866e3298cd xfrm: Increment statistic counter on inner mode error) +$ git merge ipsec-next/master +Already up-to-date. +Merging ipvs-next/master (698e2a8dca98 ipvs: make drop_entry protection effective for SIP-pe) +$ git merge ipvs-next/master +Already up-to-date. +Merging wireless-drivers-next/master (52776a700b53 Merge ath-next from ath.git) +$ git merge wireless-drivers-next/master +Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/tx.c' using previous resolution. +Auto-merging drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/cisco/airo.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 99e721777f37] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + drivers/net/wireless/ath/ath10k/core.c | 18 +- + drivers/net/wireless/ath/ath10k/core.h | 4 +- + drivers/net/wireless/ath/ath10k/mac.c | 40 +- + drivers/net/wireless/ath/ath10k/wmi-ops.h | 21 + + drivers/net/wireless/ath/ath10k/wmi.c | 88 +- + drivers/net/wireless/ath/ath10k/wmi.h | 26 + + drivers/net/wireless/ath/ath6kl/core.c | 3 + + drivers/net/wireless/ath/ath6kl/core.h | 1 + + drivers/net/wireless/ath/ath6kl/init.c | 9 + + drivers/net/wireless/ath/ath9k/Kconfig | 40 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_eeprom.h | 1 + + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 72 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 5 +- + drivers/net/wireless/ath/wil6210/debug.c | 22 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 137 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 93 +- + drivers/net/wireless/ath/wil6210/main.c | 95 +- + drivers/net/wireless/ath/wil6210/p2p.c | 6 + + drivers/net/wireless/ath/wil6210/txrx.c | 2 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 67 +- + drivers/net/wireless/ath/wil6210/wmi.c | 97 +- + drivers/net/wireless/ath/wil6210/wmi.h | 61 + + drivers/net/wireless/atmel/atmel.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 4 +- + drivers/net/wireless/cisco/airo.c | 2 +- + drivers/net/wireless/intel/iwlwifi/Kconfig | 6 - + drivers/net/wireless/intel/iwlwifi/iwl-1000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-2000.c | 2 - + drivers/net/wireless/intel/iwlwifi/iwl-5000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-6000.c | 3 - + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 15 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 34 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 122 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 15 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 39 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 16 +- + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c | 68 +- + drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 8 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h | 9 +- + .../net/wireless/intel/iwlwifi/mvm/fw-api-sta.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 60 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 22 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 74 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 106 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 21 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 356 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 410 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 62 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 45 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 31 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 3 - + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 111 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 29 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 21 +- + drivers/net/wireless/marvell/mwifiex/pcie.h | 3 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 5 +- + .../net/wireless/realtek/rtl818x/rtl8187/rtl8187.h | 99 +- + .../net/wireless/realtek/rtl818x/rtl8187/rtl8225.c | 93 + + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 3 + + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 81 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 586 +++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1525 ++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 397 ++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 1682 ++++++ + .../rtl8xxxu/{rtl8xxxu.c => rtl8xxxu_core.c} | 5334 +++----------------- + drivers/net/wireless/realtek/rtlwifi/base.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/pci.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/ps.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/rf.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 4 +- + drivers/net/wireless/ti/wlcore/io.c | 17 +- + drivers/net/wireless/ti/wlcore/io.h | 3 +- + include/linux/mmc/sdio_ids.h | 1 + + 95 files changed, 7276 insertions(+), 5290 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c + create mode 100644 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu.c => rtl8xxxu_core.c} (56%) +Merging bluetooth/master (27896c83fe94 r8169: default to 64-bit DMA on recent PCIe chips) +$ git merge bluetooth/master +Already up-to-date. +Merging mac80211-next/master (4f45bb3e8a8f mac80211_hwsim: Allow managing radios from non-initial namespaces) +$ git merge mac80211-next/master +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 97 +++++++++++++++++++++- + net/wireless/nl80211.c | 152 +++++++++++++++++----------------- + 2 files changed, 170 insertions(+), 79 deletions(-) +Merging rdma/for-next (94d7f1a255db Merge branches 'hfi1' and 'iw_cxgb4' into k.o/for-4.7) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/i40iw/i40iw_main.c +Merge made by the 'recursive' strategy. + drivers/infiniband/hw/cxgb4/cm.c | 252 +++++++---- + drivers/infiniband/hw/i40iw/i40iw.h | 7 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 148 +++--- + drivers/infiniband/hw/i40iw/i40iw_cm.h | 10 +- + drivers/infiniband/hw/i40iw/i40iw_ctrl.c | 185 ++++++-- + drivers/infiniband/hw/i40iw/i40iw_d.h | 4 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 14 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 55 ++- + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 1 + + drivers/infiniband/hw/i40iw/i40iw_pble.c | 9 +- + drivers/infiniband/hw/i40iw/i40iw_puda.c | 2 +- + drivers/infiniband/hw/i40iw/i40iw_status.h | 1 + + drivers/infiniband/hw/i40iw/i40iw_type.h | 12 +- + drivers/infiniband/hw/i40iw/i40iw_uk.c | 106 ++--- + drivers/infiniband/hw/i40iw/i40iw_user.h | 36 +- + drivers/infiniband/hw/i40iw/i40iw_utils.c | 47 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 293 ++++++++++-- + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 3 + + drivers/infiniband/hw/i40iw/i40iw_virtchnl.c | 96 ++-- + drivers/infiniband/hw/qib/qib_init.c | 4 +- + drivers/infiniband/hw/qib/qib_rc.c | 2 +- + drivers/infiniband/hw/qib/qib_ruc.c | 4 +- + drivers/infiniband/hw/qib/qib_uc.c | 2 +- + drivers/infiniband/hw/qib/qib_ud.c | 10 +- + drivers/infiniband/hw/qib/qib_verbs.h | 6 +- + drivers/infiniband/sw/rdmavt/qp.c | 6 +- + drivers/infiniband/sw/rdmavt/vt.c | 13 + + drivers/staging/rdma/hfi1/affinity.c | 93 ++-- + drivers/staging/rdma/hfi1/affinity.h | 19 +- + drivers/staging/rdma/hfi1/chip.c | 647 +++++++++++++++++++-------- + drivers/staging/rdma/hfi1/chip.h | 7 +- + drivers/staging/rdma/hfi1/chip_registers.h | 1 + + drivers/staging/rdma/hfi1/diag.c | 3 +- + drivers/staging/rdma/hfi1/driver.c | 3 +- + drivers/staging/rdma/hfi1/firmware.c | 9 +- + drivers/staging/rdma/hfi1/hfi.h | 11 +- + drivers/staging/rdma/hfi1/init.c | 25 +- + drivers/staging/rdma/hfi1/mad.c | 16 +- + drivers/staging/rdma/hfi1/mmu_rb.c | 35 +- + drivers/staging/rdma/hfi1/mmu_rb.h | 2 + + drivers/staging/rdma/hfi1/pio.c | 52 ++- + drivers/staging/rdma/hfi1/pio.h | 4 +- + drivers/staging/rdma/hfi1/platform.c | 99 ++-- + drivers/staging/rdma/hfi1/qp.c | 6 +- + drivers/staging/rdma/hfi1/qsfp.c | 58 ++- + drivers/staging/rdma/hfi1/qsfp.h | 15 +- + drivers/staging/rdma/hfi1/rc.c | 9 +- + drivers/staging/rdma/hfi1/ruc.c | 20 +- + drivers/staging/rdma/hfi1/sysfs.c | 4 +- + drivers/staging/rdma/hfi1/ud.c | 8 +- + drivers/staging/rdma/hfi1/user_exp_rcv.c | 7 +- + drivers/staging/rdma/hfi1/user_sdma.c | 97 ++-- + drivers/staging/rdma/hfi1/verbs.c | 108 +++-- + drivers/staging/rdma/hfi1/verbs.h | 4 +- + include/rdma/rdma_vt.h | 1 + + include/rdma/rdmavt_qp.h | 5 +- + 56 files changed, 1838 insertions(+), 858 deletions(-) +Merging rdma-leon/rdma-next (2dcd0af568b0 Linux 4.6) +$ git merge rdma-leon/rdma-next +Already up-to-date. +Merging rdma-leon-test/testing/rdma-next (2dcd0af568b0 Linux 4.6) +$ git merge rdma-leon-test/testing/rdma-next +Already up-to-date. +Merging mtd/master (20c07a5bf094 mtd: nand: Drop mtd.owner requirement in nand_scan) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (e5366a266a8c mtd: spi-nor: support GigaDevice gd25lq64c) +$ git merge l2-mtd/master +Removing include/linux/of_mtd.h +Removing drivers/of/of_mtd.c +Auto-merging drivers/of/Makefile +Auto-merging drivers/mtd/nand/nandsim.c +Auto-merging drivers/memory/Kconfig +Auto-merging arch/mips/jz4740/board-qi_lb60.c +Auto-merging Documentation/devicetree/bindings/memory-controllers/omap-gpmc.txt +Merge made by the 'recursive' strategy. + .../omap-gpmc.txt} | 17 + + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 1 + + .../devicetree/bindings/mtd/gpmc-nand.txt | 19 +- + Documentation/devicetree/bindings/mtd/nand.txt | 45 +- + arch/arm/mach-omap2/gpmc-nand.c | 7 +- + arch/arm/mach-pxa/spitz.c | 55 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 1 + + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 1 + + arch/mips/include/asm/mach-jz4740/jz4740_nand.h | 2 +- + arch/mips/jz4740/board-qi_lb60.c | 87 +-- + drivers/bcma/driver_chipcommon_sflash.c | 1 - + drivers/memory/Kconfig | 1 + + drivers/memory/fsl_ifc.c | 36 +- + drivers/memory/omap-gpmc.c | 657 +++++++++++++-------- + drivers/mtd/chips/Kconfig | 1 + + drivers/mtd/devices/bcm47xxsflash.c | 29 +- + drivers/mtd/devices/bcm47xxsflash.h | 3 +- + drivers/mtd/devices/docg3.c | 46 +- + drivers/mtd/devices/m25p80.c | 22 + + drivers/mtd/devices/pmc551.c | 2 +- + drivers/mtd/maps/ck804xrom.c | 4 +- + drivers/mtd/maps/esb2rom.c | 4 +- + drivers/mtd/maps/ichxrom.c | 4 +- + drivers/mtd/maps/uclinux.c | 27 +- + drivers/mtd/mtdchar.c | 123 +++- + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 360 +++++++++++ + drivers/mtd/mtdpart.c | 23 +- + drivers/mtd/nand/ams-delta.c | 1 + + drivers/mtd/nand/atmel_nand.c | 315 +++++----- + drivers/mtd/nand/au1550nd.c | 1 + + drivers/mtd/nand/bf5xx_nand.c | 52 +- + drivers/mtd/nand/brcmnand/brcmnand.c | 290 +++++---- + drivers/mtd/nand/cafe_nand.c | 44 +- + drivers/mtd/nand/cmx270_nand.c | 1 + + drivers/mtd/nand/davinci_nand.c | 210 +++---- + drivers/mtd/nand/denali.c | 50 +- + drivers/mtd/nand/diskonchip.c | 60 +- + drivers/mtd/nand/docg4.c | 33 +- + drivers/mtd/nand/fsl_elbc_nand.c | 84 +-- + drivers/mtd/nand/fsl_ifc_nand.c | 317 ++++------ + drivers/mtd/nand/fsl_upm.c | 1 + + drivers/mtd/nand/fsmc_nand.c | 332 +++-------- + drivers/mtd/nand/gpio.c | 1 + + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 161 ++++- + drivers/mtd/nand/hisi504_nand.c | 40 +- + drivers/mtd/nand/jz4740_nand.c | 3 +- + drivers/mtd/nand/jz4780_bch.c | 1 - + drivers/mtd/nand/jz4780_nand.c | 21 +- + drivers/mtd/nand/lpc32xx_mlc.c | 51 +- + drivers/mtd/nand/lpc32xx_slc.c | 83 ++- + drivers/mtd/nand/mpc5121_nfc.c | 1 + + drivers/mtd/nand/mxc_nand.c | 257 ++++---- + drivers/mtd/nand/nand_base.c | 637 ++++++++++++-------- + drivers/mtd/nand/nand_bch.c | 48 +- + drivers/mtd/nand/nandsim.c | 10 +- + drivers/mtd/nand/nuc900_nand.c | 1 + + drivers/mtd/nand/omap2.c | 448 +++++++++----- + drivers/mtd/nand/orion_nand.c | 1 + + drivers/mtd/nand/pasemi_nand.c | 16 +- + drivers/mtd/nand/plat_nand.c | 1 + + drivers/mtd/nand/pxa3xx_nand.c | 132 +++-- + drivers/mtd/nand/qcom_nandc.c | 88 ++- + drivers/mtd/nand/s3c2410.c | 36 +- + drivers/mtd/nand/sh_flctl.c | 115 ++-- + drivers/mtd/nand/sharpsl.c | 2 +- + drivers/mtd/nand/sm_common.c | 93 ++- + drivers/mtd/nand/socrates_nand.c | 1 + + drivers/mtd/nand/sunxi_nand.c | 600 ++++++++++++------- + drivers/mtd/nand/vf610_nfc.c | 35 +- + drivers/mtd/onenand/onenand_base.c | 235 ++++---- + drivers/mtd/spi-nor/spi-nor.c | 1 + + drivers/of/Makefile | 1 - + drivers/of/of_mtd.c | 119 ---- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 49 +- + include/linux/bcma/bcma_driver_chipcommon.h | 1 - + include/linux/fsl_ifc.h | 45 +- + include/linux/mtd/fsmc.h | 18 - + include/linux/mtd/map.h | 19 +- + include/linux/mtd/mtd.h | 63 +- + include/linux/mtd/nand.h | 28 +- + include/linux/mtd/onenand.h | 2 - + include/linux/mtd/sharpsl.h | 2 +- + include/linux/mtd/spi-nor.h | 1 + + include/linux/of_mtd.h | 50 -- + include/linux/omap-gpmc.h | 172 +----- + include/linux/platform_data/gpmc-omap.h | 172 ++++++ + include/linux/platform_data/mtd-nand-omap2.h | 12 +- + include/uapi/mtd/mtd-abi.h | 2 +- + 89 files changed, 4338 insertions(+), 2908 deletions(-) + rename Documentation/devicetree/bindings/{bus/ti-gpmc.txt => memory-controllers/omap-gpmc.txt} (89%) + delete mode 100644 drivers/of/of_mtd.c + delete mode 100644 include/linux/of_mtd.h + create mode 100644 include/linux/platform_data/gpmc-omap.h +Merging nand/nand/next (666b65683dad mtd: brcmnand: respect ECC algorithm set by NAND subsystem) +$ git merge nand/nand/next +Already up-to-date. +Merging crypto/master (256b1cfb9a34 crypto: qat - change the adf_ctl_stop_devices to void) +$ git merge crypto/master +Already up-to-date. +Merging drm/drm-next (7c10ddf87472 Merge branch 'drm-uapi-extern-c-fixes' of https://github.com/evelikov/linux into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/radeon/atombios_crtc.c +Auto-merging drivers/gpu/drm/i915/intel_pm.c +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Auto-merging drivers/gpu/drm/i915/intel_drv.h +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/intel_crt.c +Auto-merging drivers/gpu/drm/i915/intel_audio.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_debugfs.c +Removing drivers/gpu/drm/exynos/exynos_dp_reg.c +Removing drivers/gpu/drm/exynos/exynos_dp_core.h +Removing drivers/gpu/drm/exynos/exynos_dp_core.c +Auto-merging drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h +Auto-merging arch/arm/boot/dts/exynos5800-peach-pi.dts +Auto-merging arch/arm/boot/dts/exynos5420-smdk5420.dts +Auto-merging arch/arm/boot/dts/exynos5420-peach-pit.dts +Auto-merging arch/arm/boot/dts/exynos5250-spring.dts +Auto-merging arch/arm/boot/dts/exynos5250-snow-common.dtsi +Auto-merging arch/arm/boot/dts/exynos5250-smdk5250.dts +Auto-merging arch/arm/boot/dts/exynos5250-arndale.dts +Auto-merging arch/arc/boot/dts/axs10x_mb.dtsi +Auto-merging arch/arc/boot/dts/axc003_idu.dtsi +Auto-merging arch/arc/boot/dts/axc003.dtsi +Auto-merging arch/arc/boot/dts/axc001.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 47 +- + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 36 + + .../bindings/display/bridge/analogix_dp.txt | 52 + + .../bindings/display/exynos/exynos5433-decon.txt | 5 +- + .../bindings/display/exynos/exynos_dp.txt | 93 +- + .../bindings/display/exynos/exynos_hdmi.txt | 27 +- + .../devicetree/bindings/display/fsl,dcu.txt | 15 +- + .../devicetree/bindings/display/fsl,tcon.txt | 18 + + .../bindings/display/hisilicon/dw-dsi.txt | 72 + + .../bindings/display/hisilicon/hisi-ade.txt | 64 + + .../bindings/display/mediatek/mediatek,disp.txt | 203 + + .../bindings/display/mediatek/mediatek,dpi.txt | 35 + + .../bindings/display/mediatek/mediatek,dsi.txt | 60 + + .../bindings/display/panel/innolux,at070tn92.txt | 7 + + .../display/panel/olimex,lcd-olinuxino-43-ts.txt | 7 + + .../bindings/display/panel/ontat,yx700wv03.txt | 7 + + .../bindings/display/panel/tpk,f07a-0102.txt | 8 + + .../bindings/display/panel/tpk,f10a-0102.txt | 8 + + .../display/rockchip/analogix_dp-rockchip.txt | 92 + + .../devicetree/bindings/display/snps,arcpgu.txt | 35 + + .../bindings/display/sunxi/sun4i-drm.txt | 258 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../devicetree/bindings/video/bridge/anx7814.txt | 40 + + MAINTAINERS | 150 +- + arch/arc/boot/dts/axc001.dtsi | 22 +- + arch/arc/boot/dts/axc003.dtsi | 14 + + arch/arc/boot/dts/axc003_idu.dtsi | 14 + + arch/arc/boot/dts/axs10x_mb.dtsi | 61 + + arch/arm/boot/dts/exynos5250-arndale.dts | 2 - + arch/arm/boot/dts/exynos5250-smdk5250.dts | 2 - + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 4 +- + arch/arm/boot/dts/exynos5250-spring.dts | 4 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 2 - + arch/arm/boot/dts/exynos5800-peach-pi.dts | 2 - + drivers/clk/mediatek/clk-mt8173.c | 12 +- + drivers/clk/mediatek/clk-mtk.h | 15 +- + drivers/gpu/drm/Kconfig | 9 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/acp/acp_hw.c | 2 +- + drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 2 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 209 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 160 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 144 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 281 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gds.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 95 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 105 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 110 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 342 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 98 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.h | 2 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 93 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 224 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 10 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 66 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 4 +- + drivers/gpu/drm/amd/amdgpu/cz_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 37 +- + drivers/gpu/drm/amd/amdgpu/cz_smumgr.h | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 233 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 329 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1624 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 114 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 154 +- + drivers/gpu/drm/amd/amdgpu/iceland_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 35 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 68 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 64 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 246 +- + drivers/gpu/drm/amd/amdgpu/smu_ucode_xfer_vi.h | 1 + + drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 35 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 123 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 241 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 420 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 98 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 85 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 199 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 12 +- + drivers/gpu/drm/amd/include/amd_shared.h | 7 +- + .../gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h | 10075 ++++++++++ + .../drm/amd/include/asic_reg/dce/dce_11_2_enum.h | 6813 +++++++ + .../amd/include/asic_reg/dce/dce_11_2_sh_mask.h | 18687 +++++++++++++++++++ + .../gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h | 2 + + .../gpu/drm/amd/include/asic_reg/uvd/uvd_6_0_d.h | 1 + + drivers/gpu/drm/amd/include/atombios.h | 663 +- + drivers/gpu/drm/amd/include/cgs_common.h | 78 +- + drivers/gpu/drm/amd/include/cgs_linux.h | 6 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 276 +- + .../drm/amd/powerplay/eventmgr/eventactionchains.c | 34 +- + .../drm/amd/powerplay/eventmgr/eventmanagement.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 4 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 4 +- + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 3 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 26 +- + .../amd/powerplay/hwmgr/fiji_clockpowergating.c | 11 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 128 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 10 +- + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c | 12 +- + .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 5 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h | 2 + + .../powerplay/hwmgr/polaris10_clockpowergating.c | 430 + + .../powerplay/hwmgr/polaris10_clockpowergating.h | 40 + + .../amd/powerplay/hwmgr/polaris10_dyn_defaults.h | 62 + + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 4995 +++++ + .../gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h | 357 + + .../drm/amd/powerplay/hwmgr/polaris10_powertune.c | 398 + + .../drm/amd/powerplay/hwmgr/polaris10_powertune.h | 70 + + .../drm/amd/powerplay/hwmgr/polaris10_thermal.c | 712 + + .../drm/amd/powerplay/hwmgr/polaris10_thermal.h | 62 + + drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 23 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 115 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 40 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 8 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 171 +- + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 20 +- + .../gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h | 14 + + .../amd/powerplay/hwmgr/tonga_processpptables.c | 116 +- + .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 12 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 5 +- + drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h | 2 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 10 +- + .../gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h | 409 + + .../gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h | 10088 ++++++++++ + drivers/gpu/drm/amd/powerplay/inc/smu74.h | 774 + + drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h | 828 + + .../gpu/drm/amd/powerplay/inc/smu_ucode_xfer_cz.h | 22 + + .../gpu/drm/amd/powerplay/inc/smu_ucode_xfer_vi.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 6 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 984 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 68 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 5 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 121 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 42 +- + drivers/gpu/drm/amd/scheduler/sched_fence.c | 10 + + drivers/gpu/drm/arc/Kconfig | 10 + + drivers/gpu/drm/arc/Makefile | 2 + + drivers/gpu/drm/arc/arcpgu.h | 50 + + drivers/gpu/drm/arc/arcpgu_crtc.c | 257 + + drivers/gpu/drm/arc/arcpgu_drv.c | 288 + + drivers/gpu/drm/arc/arcpgu_hdmi.c | 201 + + drivers/gpu/drm/arc/arcpgu_regs.h | 40 + + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.c | 2 - + drivers/gpu/drm/ast/ast_drv.h | 2 +- + drivers/gpu/drm/ast/ast_ttm.c | 2 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 158 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 155 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 15 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 249 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 95 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 17 +- + drivers/gpu/drm/bochs/bochs_kms.c | 11 +- + drivers/gpu/drm/bochs/bochs_mm.c | 2 + + drivers/gpu/drm/bridge/Kconfig | 12 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/analogix-anx78xx.c | 1514 ++ + drivers/gpu/drm/bridge/analogix-anx78xx.h | 719 + + drivers/gpu/drm/bridge/analogix/Kconfig | 3 + + drivers/gpu/drm/bridge/analogix/Makefile | 2 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 1430 ++ + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 281 + + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 1320 ++ + .../analogix/analogix_dp_reg.h} | 270 +- + drivers/gpu/drm/bridge/dw-hdmi.c | 7 - + drivers/gpu/drm/cirrus/cirrus_drv.c | 2 - + drivers/gpu/drm/cirrus/cirrus_drv.h | 2 +- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 2 + + drivers/gpu/drm/drm_agpsupport.c | 4 +- + drivers/gpu/drm/drm_atomic.c | 51 +- + drivers/gpu/drm/drm_atomic_helper.c | 121 +- + drivers/gpu/drm/drm_bufs.c | 91 +- + drivers/gpu/drm/drm_crtc.c | 605 +- + drivers/gpu/drm/drm_crtc_helper.c | 68 +- + drivers/gpu/drm/drm_crtc_internal.h | 4 +- + drivers/gpu/drm/drm_dp_aux_dev.c | 12 + + drivers/gpu/drm/drm_dp_helper.c | 66 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 29 +- + drivers/gpu/drm/drm_drv.c | 31 +- + drivers/gpu/drm/drm_edid.c | 51 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 176 +- + drivers/gpu/drm/drm_fb_helper.c | 147 +- + drivers/gpu/drm/drm_fops.c | 51 +- + drivers/gpu/drm/drm_gem.c | 90 +- + drivers/gpu/drm/drm_info.c | 4 +- + drivers/gpu/drm/drm_internal.h | 4 +- + drivers/gpu/drm/drm_ioctl.c | 54 +- + drivers/gpu/drm/drm_irq.c | 5 +- + drivers/gpu/drm/drm_legacy.h | 2 + + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_panel.c | 61 + + drivers/gpu/drm/drm_pci.c | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 2 - + drivers/gpu/drm/drm_sysfs.c | 167 +- + drivers/gpu/drm/drm_vm.c | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 17 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/gpu/drm/exynos/Kconfig | 3 +- + drivers/gpu/drm/exynos/Makefile | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 92 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 1 - + drivers/gpu/drm/exynos/exynos_dp.c | 311 + + drivers/gpu/drm/exynos/exynos_dp_core.c | 1499 -- + drivers/gpu/drm/exynos/exynos_dp_core.h | 282 - + drivers/gpu/drm/exynos/exynos_dp_reg.c | 1263 -- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 25 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 69 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 30 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 84 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 11 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 109 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 89 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 12 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 11 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 801 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 69 +- + drivers/gpu/drm/exynos/regs-hdmi.h | 9 +- + drivers/gpu/drm/fsl-dcu/Kconfig | 2 +- + drivers/gpu/drm/fsl-dcu/Makefile | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 12 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 127 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 6 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 38 +- + drivers/gpu/drm/fsl-dcu/fsl_tcon.c | 111 + + drivers/gpu/drm/fsl-dcu/fsl_tcon.h | 33 + + drivers/gpu/drm/gma500/framebuffer.c | 13 +- + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 6 +- + drivers/gpu/drm/gma500/mdfld_dsi_pkg_sender.c | 2 +- + drivers/gpu/drm/hisilicon/Kconfig | 5 + + drivers/gpu/drm/hisilicon/Makefile | 5 + + drivers/gpu/drm/hisilicon/kirin/Kconfig | 18 + + drivers/gpu/drm/hisilicon/kirin/Makefile | 6 + + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 858 + + drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h | 103 + + drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 230 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 1057 ++ + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 343 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h | 31 + + drivers/gpu/drm/i915/Kconfig | 6 + + drivers/gpu/drm/i915/Kconfig.debug | 41 + + drivers/gpu/drm/i915/Makefile | 4 + + drivers/gpu/drm/i915/i915_cmd_parser.c | 211 +- + drivers/gpu/drm/i915/i915_debugfs.c | 454 +- + drivers/gpu/drm/i915/i915_dma.c | 515 +- + drivers/gpu/drm/i915/i915_drv.c | 199 +- + drivers/gpu/drm/i915/i915_drv.h | 502 +- + drivers/gpu/drm/i915/i915_gem.c | 729 +- + drivers/gpu/drm/i915/i915_gem.h | 34 + + drivers/gpu/drm/i915/i915_gem_context.c | 340 +- + drivers/gpu/drm/i915/i915_gem_debug.c | 16 +- + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 53 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 159 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 568 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 28 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 12 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 2 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 125 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 112 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 84 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 210 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 11 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 165 +- + drivers/gpu/drm/i915/i915_irq.c | 851 +- + drivers/gpu/drm/i915/i915_params.c | 9 + + drivers/gpu/drm/i915/i915_params.h | 2 + + drivers/gpu/drm/i915/i915_reg.h | 267 +- + drivers/gpu/drm/i915/i915_sysfs.c | 10 + + drivers/gpu/drm/i915/i915_trace.h | 52 +- + drivers/gpu/drm/i915/i915_vgpu.c | 36 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 4 +- + drivers/gpu/drm/i915/intel_audio.c | 18 +- + drivers/gpu/drm/i915/intel_bios.c | 315 +- + drivers/gpu/drm/i915/intel_bios.h | 861 +- + drivers/gpu/drm/i915/intel_color.c | 553 + + drivers/gpu/drm/i915/intel_crt.c | 40 +- + drivers/gpu/drm/i915/intel_csr.c | 148 +- + drivers/gpu/drm/i915/intel_ddi.c | 1381 +- + drivers/gpu/drm/i915/intel_display.c | 3425 ++-- + drivers/gpu/drm/i915/intel_dp.c | 569 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 47 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 1783 ++ + drivers/gpu/drm/i915/intel_dpll_mgr.h | 164 + + drivers/gpu/drm/i915/intel_drv.h | 200 +- + drivers/gpu/drm/i915/intel_dsi.c | 327 +- + drivers/gpu/drm/i915/intel_dsi.h | 30 +- + drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 177 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 282 +- + drivers/gpu/drm/i915/intel_fbc.c | 5 +- + drivers/gpu/drm/i915/intel_fbdev.c | 20 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 10 +- + drivers/gpu/drm/i915/intel_guc.h | 29 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 73 +- + drivers/gpu/drm/i915/intel_hdmi.c | 5 +- + drivers/gpu/drm/i915/intel_i2c.c | 25 +- + drivers/gpu/drm/i915/intel_lrc.c | 1156 +- + drivers/gpu/drm/i915/intel_lrc.h | 25 +- + drivers/gpu/drm/i915/intel_lvds.c | 65 +- + drivers/gpu/drm/i915/intel_mocs.c | 157 +- + drivers/gpu/drm/i915/intel_mocs.h | 2 + + drivers/gpu/drm/i915/intel_opregion.c | 58 +- + drivers/gpu/drm/i915/intel_overlay.c | 78 +- + drivers/gpu/drm/i915/intel_panel.c | 56 +- + drivers/gpu/drm/i915/intel_pm.c | 556 +- + drivers/gpu/drm/i915/intel_psr.c | 8 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1566 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 128 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 519 +- + drivers/gpu/drm/i915/intel_sdvo.c | 20 +- + drivers/gpu/drm/i915/intel_sprite.c | 61 +- + drivers/gpu/drm/i915/intel_tv.c | 58 +- + drivers/gpu/drm/i915/intel_uncore.c | 672 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 832 + + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/mediatek/Kconfig | 16 + + drivers/gpu/drm/mediatek/Makefile | 14 + + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 302 + + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 240 + + drivers/gpu/drm/mediatek/mtk_dpi.c | 769 + + drivers/gpu/drm/mediatek/mtk_dpi_regs.h | 228 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 582 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 32 + + drivers/gpu/drm/mediatek/mtk_drm_ddp.c | 353 + + drivers/gpu/drm/mediatek/mtk_drm_ddp.h | 41 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 225 + + drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h | 150 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 567 + + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 60 + + drivers/gpu/drm/mediatek/mtk_drm_fb.c | 165 + + drivers/gpu/drm/mediatek/mtk_drm_fb.h | 23 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 269 + + drivers/gpu/drm/mediatek/mtk_drm_gem.h | 59 + + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 240 + + drivers/gpu/drm/mediatek/mtk_drm_plane.h | 59 + + drivers/gpu/drm/mediatek/mtk_dsi.c | 913 + + drivers/gpu/drm/mediatek/mtk_mipi_tx.c | 463 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 2 - + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 2 + + drivers/gpu/drm/msm/Kconfig | 7 + + drivers/gpu/drm/msm/Makefile | 5 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 16 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 - + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 34 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 12 - + drivers/gpu/drm/msm/dsi/dsi_manager.c | 27 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 13 - + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 4 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 2 +- + drivers/gpu/drm/msm/edp/edp_connector.c | 20 +- + drivers/gpu/drm/msm/edp/edp_ctrl.c | 29 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 11 + + drivers/gpu/drm/msm/hdmi/hdmi_connector.c | 26 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 34 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 2 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 16 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp_format.c | 6 + + drivers/gpu/drm/msm/msm_atomic.c | 56 +- + drivers/gpu/drm/msm/msm_debugfs.c | 168 + + drivers/gpu/drm/msm/msm_debugfs.h | 26 + + drivers/gpu/drm/msm/msm_drv.c | 401 +- + drivers/gpu/drm/msm/msm_drv.h | 64 +- + drivers/gpu/drm/msm/msm_fb.c | 2 +- + drivers/gpu/drm/msm/msm_fence.c | 163 + + drivers/gpu/drm/msm/msm_fence.h | 46 + + drivers/gpu/drm/msm/msm_gem.c | 136 +- + drivers/gpu/drm/msm/msm_gem.h | 19 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 125 +- + drivers/gpu/drm/msm/msm_gpu.c | 123 +- + drivers/gpu/drm/msm/msm_gpu.h | 9 +- + drivers/gpu/drm/msm/msm_rd.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 2 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 10 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 156 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 9 +- + drivers/gpu/drm/qxl/qxl_drv.c | 2 - + drivers/gpu/drm/qxl/qxl_drv.h | 7 +- + drivers/gpu/drm/qxl/qxl_fb.c | 227 +- + drivers/gpu/drm/qxl/qxl_kms.c | 4 - + drivers/gpu/drm/qxl/qxl_object.h | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 2 + + drivers/gpu/drm/radeon/atombios_crtc.c | 24 +- + drivers/gpu/drm/radeon/cik.c | 252 +- + drivers/gpu/drm/radeon/cikd.h | 1 + + drivers/gpu/drm/radeon/evergreen.c | 120 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 66 + + drivers/gpu/drm/radeon/evergreend.h | 43 + + drivers/gpu/drm/radeon/ni.c | 246 +- + drivers/gpu/drm/radeon/r100.c | 10 +- + drivers/gpu/drm/radeon/r300.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 112 +- + drivers/gpu/drm/radeon/radeon.h | 26 +- + drivers/gpu/drm/radeon/radeon_asic.c | 16 +- + drivers/gpu/drm/radeon/radeon_asic.h | 25 +- + drivers/gpu/drm/radeon/radeon_device.c | 10 +- + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_drv.c | 25 +- + drivers/gpu/drm/radeon/radeon_object.c | 4 +- + drivers/gpu/drm/radeon/radeon_object.h | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 2 + + drivers/gpu/drm/radeon/radeon_uvd.c | 88 +- + drivers/gpu/drm/radeon/rs600.c | 12 +- + drivers/gpu/drm/radeon/rv770.c | 106 +- + drivers/gpu/drm/radeon/si.c | 250 +- + drivers/gpu/drm/radeon/uvd_v1_0.c | 5 +- + drivers/gpu/drm/radeon/uvd_v2_2.c | 5 +- + drivers/gpu/drm/radeon/uvd_v4_2.c | 16 +- + drivers/gpu/drm/rcar-du/Kconfig | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 5 +- + drivers/gpu/drm/rockchip/Kconfig | 9 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 390 + + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 38 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 17 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 66 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 95 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 + + drivers/gpu/drm/sti/sti_drv.c | 6 +- + drivers/gpu/drm/sti/sti_gdp.c | 1 + + drivers/gpu/drm/sti/sti_hda.c | 1 + + drivers/gpu/drm/sti/sti_hqvdp.c | 1 + + drivers/gpu/drm/sti/sti_mixer.c | 1 + + drivers/gpu/drm/sti/sti_tvout.c | 1 + + drivers/gpu/drm/sti/sti_vid.c | 1 + + drivers/gpu/drm/sun4i/Kconfig | 14 + + drivers/gpu/drm/sun4i/Makefile | 13 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 364 + + drivers/gpu/drm/sun4i/sun4i_backend.h | 165 + + drivers/gpu/drm/sun4i/sun4i_crtc.c | 120 + + drivers/gpu/drm/sun4i/sun4i_crtc.h | 30 + + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 160 + + drivers/gpu/drm/sun4i/sun4i_dotclock.h | 21 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 358 + + drivers/gpu/drm/sun4i/sun4i_drv.h | 30 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 54 + + drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 19 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 161 + + drivers/gpu/drm/sun4i/sun4i_layer.h | 30 + + drivers/gpu/drm/sun4i/sun4i_rgb.c | 250 + + drivers/gpu/drm/sun4i/sun4i_rgb.h | 18 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 561 + + drivers/gpu/drm/sun4i/sun4i_tcon.h | 186 + + drivers/gpu/drm/sun4i/sun4i_tv.c | 708 + + drivers/gpu/drm/tegra/dc.c | 1 - + drivers/gpu/drm/tegra/drm.c | 10 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/ttm/Makefile | 3 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 3 - + drivers/gpu/drm/ttm/ttm_bo.c | 86 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 8 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 3 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 8 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 2 - + drivers/gpu/drm/udl/udl_fb.c | 140 +- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/Makefile | 1 + + drivers/gpu/drm/vc4/vc4_crtc.c | 58 + + drivers/gpu/drm/vc4/vc4_debugfs.c | 1 + + drivers/gpu/drm/vc4/vc4_dpi.c | 520 + + drivers/gpu/drm/vc4/vc4_drv.c | 2 + + drivers/gpu/drm/vc4/vc4_drv.h | 5 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 6 +- + drivers/gpu/drm/vc4/vc4_regs.h | 6 + + drivers/gpu/drm/vgem/vgem_drv.c | 37 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 9 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 2 +- + drivers/memory/mtk-smi.c | 2 + + drivers/video/fbdev/core/fb_defio.c | 3 +- + include/drm/bridge/analogix_dp.h | 41 + + include/drm/drmP.h | 18 +- + include/drm/drm_agpsupport.h | 4 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_atomic_helper.h | 6 +- + include/drm/drm_crtc.h | 116 +- + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_edid.h | 8 + + include/drm/drm_fb_cma_helper.h | 16 + + include/drm/drm_fb_helper.h | 15 + + include/drm/drm_gem.h | 48 +- + include/drm/drm_legacy.h | 4 +- + include/drm/drm_mem_util.h | 19 + + include/drm/drm_modeset_helper_vtables.h | 2 +- + include/drm/drm_panel.h | 59 + + include/drm/drm_vma_manager.h | 15 +- + include/drm/ttm/ttm_bo_api.h | 2 +- + include/drm/ttm/ttm_bo_driver.h | 34 +- + include/dt-bindings/clock/mt8173-clk.h | 3 +- + include/linux/console.h | 2 + + include/linux/fb.h | 1 + + include/linux/reservation.h | 18 + + include/linux/timer.h | 2 + + include/linux/vmalloc.h | 4 + + include/uapi/drm/amdgpu_drm.h | 8 + + include/uapi/drm/armada_drm.h | 8 + + include/uapi/drm/drm.h | 34 +- + include/uapi/drm/drm_fourcc.h | 8 + + include/uapi/drm/drm_mode.h | 20 + + include/uapi/drm/drm_sarea.h | 8 + + include/uapi/drm/etnaviv_drm.h | 8 + + include/uapi/drm/exynos_drm.h | 8 + + include/uapi/drm/i810_drm.h | 8 + + include/uapi/drm/i915_drm.h | 8 + + include/uapi/drm/mga_drm.h | 8 + + include/uapi/drm/msm_drm.h | 8 + + include/uapi/drm/nouveau_drm.h | 10 +- + include/uapi/drm/omap_drm.h | 8 + + include/uapi/drm/qxl_drm.h | 9 +- + include/uapi/drm/r128_drm.h | 8 + + include/uapi/drm/radeon_drm.h | 8 + + include/uapi/drm/savage_drm.h | 8 + + include/uapi/drm/sis_drm.h | 10 + + include/uapi/drm/tegra_drm.h | 8 + + include/uapi/drm/vc4_drm.h | 8 + + include/uapi/drm/via_drm.h | 8 + + include/uapi/drm/virtgpu_drm.h | 8 + + include/uapi/drm/vmwgfx_drm.h | 9 + + include/video/exynos5433_decon.h | 6 +- + include/video/mipi_display.h | 8 + + mm/vmalloc.c | 27 + + 604 files changed, 100525 insertions(+), 19844 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/analogix_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/fsl,tcon.txt + create mode 100644 Documentation/devicetree/bindings/display/hisilicon/dw-dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/hisilicon/hisi-ade.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dpi.txt + create mode 100644 Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,at070tn92.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/olimex,lcd-olinuxino-43-ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ontat,yx700wv03.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f07a-0102.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tpk,f10a-0102.txt + create mode 100644 Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt + create mode 100644 Documentation/devicetree/bindings/display/snps,arcpgu.txt + create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt + create mode 100644 Documentation/devicetree/bindings/video/bridge/anx7814.txt + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_d.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_enum.h + create mode 100755 drivers/gpu/drm/amd/include/asic_reg/dce/dce_11_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_clockpowergating.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_clockpowergating.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_dyn_defaults.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/polaris10_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/polaris10_pwrvirus.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu74.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.h + create mode 100644 drivers/gpu/drm/arc/Kconfig + create mode 100644 drivers/gpu/drm/arc/Makefile + create mode 100644 drivers/gpu/drm/arc/arcpgu.h + create mode 100644 drivers/gpu/drm/arc/arcpgu_crtc.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_drv.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_hdmi.c + create mode 100644 drivers/gpu/drm/arc/arcpgu_regs.h + create mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.c + create mode 100644 drivers/gpu/drm/bridge/analogix-anx78xx.h + create mode 100644 drivers/gpu/drm/bridge/analogix/Kconfig + create mode 100644 drivers/gpu/drm/bridge/analogix/Makefile + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.c + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_core.h + create mode 100644 drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c + rename drivers/gpu/drm/{exynos/exynos_dp_reg.h => bridge/analogix/analogix_dp_reg.h} (62%) + create mode 100644 drivers/gpu/drm/exynos/exynos_dp.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_core.h + delete mode 100644 drivers/gpu/drm/exynos/exynos_dp_reg.c + create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.c + create mode 100644 drivers/gpu/drm/fsl-dcu/fsl_tcon.h + create mode 100644 drivers/gpu/drm/hisilicon/Kconfig + create mode 100644 drivers/gpu/drm/hisilicon/Makefile + create mode 100644 drivers/gpu/drm/hisilicon/kirin/Kconfig + create mode 100644 drivers/gpu/drm/hisilicon/kirin/Makefile + create mode 100644 drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c + create mode 100644 drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c + create mode 100644 drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.h + create mode 100644 drivers/gpu/drm/i915/Kconfig.debug + create mode 100644 drivers/gpu/drm/i915/i915_gem.h + create mode 100644 drivers/gpu/drm/i915/intel_color.c + create mode 100644 drivers/gpu/drm/i915/intel_dpll_mgr.c + create mode 100644 drivers/gpu/drm/i915/intel_dpll_mgr.h + create mode 100644 drivers/gpu/drm/i915/intel_vbt_defs.h + create mode 100644 drivers/gpu/drm/mediatek/Kconfig + create mode 100644 drivers/gpu/drm/mediatek/Makefile + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_ovl.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_disp_rdma.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_dpi_regs.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_drv.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_fb.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_gem.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_drm_plane.h + create mode 100644 drivers/gpu/drm/mediatek/mtk_dsi.c + create mode 100644 drivers/gpu/drm/mediatek/mtk_mipi_tx.c + create mode 100644 drivers/gpu/drm/msm/msm_debugfs.c + create mode 100644 drivers/gpu/drm/msm/msm_debugfs.h + create mode 100644 drivers/gpu/drm/msm/msm_fence.c + create mode 100644 drivers/gpu/drm/msm/msm_fence.h + create mode 100644 drivers/gpu/drm/rockchip/analogix_dp-rockchip.c + create mode 100644 drivers/gpu/drm/sun4i/Kconfig + create mode 100644 drivers/gpu/drm/sun4i/Makefile + create mode 100644 drivers/gpu/drm/sun4i/sun4i_backend.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_backend.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_crtc.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_crtc.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_dotclock.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_dotclock.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_drv.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_drv.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_framebuffer.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_framebuffer.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_layer.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_rgb.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_rgb.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_tcon.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_tcon.h + create mode 100644 drivers/gpu/drm/sun4i/sun4i_tv.c + create mode 100644 drivers/gpu/drm/vc4/vc4_dpi.c + create mode 100644 include/drm/bridge/analogix_dp.h +Merging drm-panel/drm/panel/for-next (227e4f4079e1 drm/panel: simple: Add support for TPK U.S.A. LLC Fusion 7" and 10.1" panels) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (5b4fd5b1111b drm/i915: Update DRIVER_DATE to 20160425) +$ git merge drm-intel/for-linux-next +Already up-to-date. +Merging drm-tegra/drm/tegra/for-next (057eab2013ec MAINTAINERS: Remove Terje Bergström as Tegra DRM maintainer) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (255f0e7c418a drm/fb_helper: Fix references to dev->mode_config.num_connector) +$ git merge drm-misc/topic/drm-misc +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +++---- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/armada/armada_crtc.c | 2 +- + drivers/gpu/drm/armada/armada_fb.c | 2 +- + drivers/gpu/drm/armada/armada_gem.c | 6 ++--- + drivers/gpu/drm/armada/armada_gem.h | 4 +-- + drivers/gpu/drm/ast/ast_main.c | 4 +-- + drivers/gpu/drm/ast/ast_mode.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +-- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +-- + drivers/gpu/drm/drm_atomic_helper.c | 25 +++++++---------- + drivers/gpu/drm/drm_fb_cma_helper.c | 37 +++++++++++++++++++------- + drivers/gpu/drm/drm_fb_helper.c | 5 ++-- + drivers/gpu/drm/drm_gem.c | 14 +++------- + drivers/gpu/drm/drm_gem_cma_helper.c | 2 +- + drivers/gpu/drm/drm_prime.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 8 +++--- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 3 +-- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 10 +++---- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 2 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/gma500/gem.c | 2 +- + drivers/gpu/drm/gma500/gma_display.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 22 +++++++-------- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 +-- + drivers/gpu/drm/i915/intel_display.c | 7 +++-- + drivers/gpu/drm/i915/intel_fbdev.c | 6 ++--- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 2 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_cursor.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 4 +-- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 6 ++--- + drivers/gpu/drm/msm/msm_fb.c | 3 +-- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +-- + drivers/gpu/drm/nouveau/nouveau_gem.c | 8 +++--- + drivers/gpu/drm/nouveau/nv50_display.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 6 ++--- + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +-- + drivers/gpu/drm/omapdrm/omap_fb.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + drivers/gpu/drm/qxl/qxl_display.c | 6 +++-- + drivers/gpu/drm/qxl/qxl_dumb.c | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 3 +++ + drivers/gpu/drm/qxl/qxl_ioctl.c | 11 ++++---- + drivers/gpu/drm/radeon/radeon_cs.c | 2 +- + drivers/gpu/drm/radeon/radeon_cursor.c | 2 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 16 +++++------ + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 3 +-- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 4 +-- + drivers/gpu/drm/tegra/dc.c | 8 +++--- + drivers/gpu/drm/tegra/drm.c | 20 +++++++------- + drivers/gpu/drm/tegra/fb.c | 2 +- + drivers/gpu/drm/tegra/gem.c | 2 +- + drivers/gpu/drm/udl/udl_fb.c | 2 +- + drivers/gpu/drm/udl/udl_gem.c | 2 +- + drivers/gpu/drm/vc4/vc4_bo.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_gem.c | 2 +- + drivers/gpu/drm/vc4/vc4_plane.c | 2 +- + drivers/gpu/drm/vgem/vgem_drv.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 4 +-- + drivers/gpu/drm/virtio/virtgpu_gem.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 11 ++++---- + include/drm/drm_atomic_helper.h | 9 +++---- + include/drm/drm_fb_cma_helper.h | 5 +++- + include/drm/drm_gem.h | 4 +-- + 83 files changed, 203 insertions(+), 202 deletions(-) +Merging drm-exynos/exynos-drm/for-next (25364a9e54fb Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (2b669875332f drm/msm: Drop load/unload drm_driver ops) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (69c2565a3cca drm: ARM HDLCD - fix an error code) +$ git merge hdlcd/for-upstream/hdlcd +Already up-to-date. +Merging drm-vc4/drm-vc4-next (efea172891fc drm/vc4: Return -EBUSY if there's already a pending flip event.) +$ git merge drm-vc4/drm-vc4-next +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/vc4/vc4_crtc.c | 4 ++++ + drivers/gpu/drm/vc4/vc4_drv.c | 2 +- + drivers/gpu/drm/vc4/vc4_kms.c | 16 ++++++++++++---- + 3 files changed, 17 insertions(+), 5 deletions(-) +Merging sunxi/sunxi/for-next (ed490b3ebfa4 Merge branches 'sunxi/drm-fixes-for-4.7' and 'sunxi/dt-for-4.7' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/sunxi.txt | 4 + + drivers/clk/clk-composite.c | 15 ++ + drivers/clk/sunxi/Makefile | 2 + + drivers/clk/sunxi/clk-a10-mod1.c | 2 +- + drivers/clk/sunxi/clk-sun4i-pll3.c | 98 +++++++ + drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 300 ++++++++++++++++++++++ + drivers/clk/sunxi/clk-sun9i-mmc.c | 2 +- + drivers/clk/sunxi/clk-sunxi.c | 79 +++++- + drivers/gpu/drm/sun4i/Kconfig | 2 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 8 +- + include/linux/clk-provider.h | 1 + + 12 files changed, 499 insertions(+), 18 deletions(-) + create mode 100644 drivers/clk/sunxi/clk-sun4i-pll3.c + create mode 100644 drivers/clk/sunxi/clk-sun4i-tcon-ch1.c +Merging kbuild/for-next (9ef4c6a22724 Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Removing scripts/coccinelle/misc/compare_const_fl.cocci +Auto-merging init/Kconfig +Auto-merging arch/x86/boot/compressed/Makefile +Auto-merging arch/arm/boot/Makefile +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.txt | 22 ++-- + Makefile | 66 +++++++--- + arch/arm/boot/Makefile | 1 - + arch/arm/boot/bootp/Makefile | 3 +- + arch/arm/vdso/Makefile | 2 +- + arch/h8300/boot/compressed/Makefile | 1 - + arch/ia64/Makefile | 6 +- + arch/m32r/boot/compressed/Makefile | 1 - + arch/mn10300/boot/compressed/Makefile | 1 - + arch/nios2/boot/compressed/Makefile | 1 - + arch/s390/boot/compressed/Makefile | 1 - + arch/sh/boot/compressed/Makefile | 1 - + arch/sh/boot/romimage/Makefile | 1 - + arch/unicore32/boot/Makefile | 2 +- + arch/unicore32/boot/compressed/Makefile | 1 - + arch/x86/boot/compressed/Makefile | 1 - + arch/x86/entry/vdso/Makefile | 4 +- + arch/x86/purgatory/Makefile | 2 - + arch/x86/realmode/rm/Makefile | 1 - + include/linux/export.h | 33 ++++- + init/Kconfig | 29 +++++ + kernel/gcov/Kconfig | 1 + + scripts/Kbuild.include | 45 ++++++- + scripts/Makefile.build | 44 +++---- + scripts/Makefile.extrawarn | 1 + + scripts/Makefile.lib | 8 +- + scripts/adjust_autoksyms.sh | 101 +++++++++++++++ + scripts/basic/fixdep.c | 61 ++++++--- + scripts/coccinelle/api/setup_timer.cocci | 4 +- + scripts/coccinelle/misc/compare_const_fl.cocci | 171 ------------------------- + scripts/genksyms/genksyms.c | 3 + + scripts/kconfig/confdata.c | 4 +- + scripts/kconfig/symbol.c | 14 ++ + scripts/package/Makefile | 4 +- + scripts/package/builddeb | 5 +- + scripts/package/mkspec | 5 + + tools/build/Makefile.build | 8 +- + 37 files changed, 378 insertions(+), 281 deletions(-) + create mode 100755 scripts/adjust_autoksyms.sh + delete mode 100644 scripts/coccinelle/misc/compare_const_fl.cocci +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Merge made by the 'recursive' strategy. + scripts/kconfig/streamline_config.pl | 44 ++++++++++++++++++++++++++++++++---- + 1 file changed, 39 insertions(+), 5 deletions(-) +Merging regmap/for-next (d4ab78d7076d Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/flat' into regmap-next) +$ git merge regmap/for-next +Already up-to-date. +Merging sound/for-next (6971ce413417 Merge tag 'asoc-v4.7-fix-hdac' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound/for-next +Already up-to-date. +Merging sound-asoc/for-next (02496e5e762f Merge remote-tracking branch 'asoc/fix/hdac' into asoc-linus) +$ git merge sound-asoc/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging modules/modules-next (e2d1248432c4 module: Disable MODULE_FORCE_LOAD when MODULE_SIG_FORCE is enabled) +$ git merge modules/modules-next +Auto-merging init/Kconfig +Merge made by the 'recursive' strategy. + Documentation/module-signing.txt | 6 ++++++ + include/linux/module.h | 4 ++-- + init/Kconfig | 1 + + kernel/module.c | 29 +++++++++++++++++++++-------- + 4 files changed, 30 insertions(+), 10 deletions(-) +Merging input/next (d96caf8c33ca Input: rotary-encoder - fix bare use of 'unsigned') +$ git merge input/next +Already up-to-date. +Merging block/for-next (661806a31989 Merge branch 'for-4.7/core' into for-next) +$ git merge block/for-next +Resolved 'drivers/nvme/host/pci.c' using previous resolution. +Auto-merging drivers/nvme/host/pci.c +CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c +Auto-merging drivers/mmc/card/block.c +Auto-merging drivers/md/md.c +Auto-merging drivers/block/loop.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c8d951e0eeeb] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/block/queue-sysfs.txt | 9 + + Documentation/block/writeback_cache_control.txt | 4 +- + arch/um/drivers/ubd_kern.c | 2 +- + block/bio.c | 11 - + block/blk-core.c | 8 +- + block/blk-flush.c | 11 +- + block/blk-lib.c | 178 ++++-------- + block/blk-mq-tag.c | 17 +- + block/blk-mq.c | 5 +- + block/blk-settings.c | 50 ++-- + block/blk-sysfs.c | 39 +++ + block/blk-throttle.c | 5 +- + drivers/block/drbd/drbd_main.c | 2 +- + drivers/block/loop.c | 2 +- + drivers/block/mtip32xx/mtip32xx.c | 12 +- + drivers/block/nbd.c | 4 +- + drivers/block/osdblk.c | 2 +- + drivers/block/ps3disk.c | 2 +- + drivers/block/skd_main.c | 61 +--- + drivers/block/virtio_blk.c | 6 +- + drivers/block/xen-blkback/xenbus.c | 2 +- + drivers/block/xen-blkfront.c | 3 +- + drivers/ide/ide-disk.c | 6 +- + drivers/lightnvm/core.c | 370 ++++++++++++++++-------- + drivers/lightnvm/gennvm.c | 100 ++++--- + drivers/lightnvm/rrpc.c | 42 ++- + drivers/lightnvm/rrpc.h | 2 +- + drivers/lightnvm/sysblk.c | 284 +++++++++--------- + drivers/md/bcache/super.c | 2 +- + drivers/md/dm-table.c | 20 +- + drivers/md/md.c | 2 +- + drivers/md/raid5-cache.c | 3 +- + drivers/mmc/card/block.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 2 +- + drivers/nvme/host/Kconfig | 2 +- + drivers/nvme/host/core.c | 272 +++++++++++++++-- + drivers/nvme/host/lightnvm.c | 82 ++---- + drivers/nvme/host/nvme.h | 91 ++---- + drivers/nvme/host/pci.c | 248 ++++++---------- + drivers/scsi/sd.c | 10 +- + drivers/target/target_core_iblock.c | 6 +- + include/linux/bio.h | 11 + + include/linux/blk-mq.h | 4 +- + include/linux/blk_types.h | 2 +- + include/linux/blkdev.h | 13 +- + include/linux/blktrace_api.h | 9 + + include/linux/lightnvm.h | 48 ++- + include/linux/nvme.h | 4 +- + kernel/trace/blktrace.c | 2 + + 49 files changed, 1148 insertions(+), 926 deletions(-) +Merging lightnvm/for-next (2a65aee4011b lightnvm: reserved space calculation incorrect) +$ git merge lightnvm/for-next +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (202bae52934d dm thin: unroll issue_discard() to create longer discard bio chains) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/cache-policies.txt | 34 ++- + Documentation/device-mapper/statistics.txt | 2 +- + drivers/md/dm-ioctl.c | 2 +- + drivers/md/dm-mpath.c | 351 ++++++++++++++----------- + drivers/md/dm-raid.c | 7 +- + drivers/md/dm-thin.c | 165 ++++++------ + drivers/md/dm.c | 10 +- + 7 files changed, 298 insertions(+), 273 deletions(-) +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc-uh/next (57da0c042f4a mmc: block: Pause re-tuning while switched to the RPMB partition) +$ git merge mmc-uh/next +Auto-merging drivers/mmc/card/block.c +Merge made by the 'recursive' strategy. + drivers/mmc/card/block.c | 19 ++++++++++++++++++- + drivers/mmc/core/host.c | 24 ++++++++++++++++++++++++ + include/linux/mmc/host.h | 4 ++++ + 3 files changed, 46 insertions(+), 1 deletion(-) +Merging md/for-next (1fa9a1ad0a9d md-cluster: check the return value of process_recvd_msg) +$ git merge md/for-next +Auto-merging drivers/md/raid5-cache.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + Documentation/md-cluster.txt | 6 +++ + drivers/md/bitmap.c | 88 +++++++++++++++++++++++++++++++++++----- + drivers/md/bitmap.h | 3 ++ + drivers/md/md-cluster.c | 96 ++++++++++++++++++++++++++++++++++++-------- + drivers/md/md-cluster.h | 1 + + drivers/md/md.c | 86 ++++++++++++++++++++++++--------------- + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 20 +++++---- + drivers/md/raid5-cache.c | 4 +- + drivers/md/raid5.c | 10 +++-- + include/linux/bitops.h | 16 ++++++++ + 11 files changed, 257 insertions(+), 77 deletions(-) +Merging mfd/for-mfd-next (68b21094ef9b mfd: ab8500-debugfs: Trivial fix of spelling mistake on "between") +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/core.h +Auto-merging drivers/mfd/mfd-core.c +Auto-merging drivers/mfd/intel-lpss.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mfd/axp20x.txt | 31 +- + .../devicetree/bindings/mfd/hisilicon,hi655x.txt | 27 + + Documentation/devicetree/bindings/mfd/max77620.txt | 143 +++++ + Documentation/driver-model/devres.txt | 3 + + MAINTAINERS | 6 + + drivers/mfd/Kconfig | 23 +- + drivers/mfd/Makefile | 1 + + drivers/mfd/ab8500-debugfs.c | 2 +- + drivers/mfd/act8945a.c | 13 +- + drivers/mfd/arizona-core.c | 10 +- + drivers/mfd/arizona-irq.c | 3 + + drivers/mfd/as3711.c | 13 +- + drivers/mfd/as3722.c | 31 +- + drivers/mfd/asic3.c | 10 +- + drivers/mfd/atmel-hlcdc.c | 14 +- + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 90 ++++ + drivers/mfd/bcm590xx.c | 11 +- + drivers/mfd/da9063-irq.c | 8 - + drivers/mfd/dm355evm_msp.c | 10 +- + drivers/mfd/hi6421-pmic-core.c | 12 +- + drivers/mfd/htc-egpio.c | 10 +- + drivers/mfd/htc-i2cpld.c | 15 +- + drivers/mfd/intel-lpss.c | 23 +- + drivers/mfd/intel_quark_i2c_gpio.c | 47 +- + drivers/mfd/intel_soc_pmic_core.c | 1 + + drivers/mfd/lp3943.c | 14 +- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/max77620.c | 590 +++++++++++++++++++++ + drivers/mfd/max77686.c | 46 +- + drivers/mfd/max77693.c | 16 +- + drivers/mfd/menf21bmc.c | 11 +- + drivers/mfd/mfd-core.c | 40 +- + drivers/mfd/mt6397-core.c | 40 +- + drivers/mfd/omap-usb-tll.c | 13 +- + drivers/mfd/rc5t583-irq.c | 11 +- + drivers/mfd/rc5t583.c | 24 +- + drivers/mfd/rdc321x-southbridge.c | 13 +- + drivers/mfd/rk808.c | 7 +- + drivers/mfd/rn5t618.c | 5 +- + drivers/mfd/rt5033.c | 14 +- + drivers/mfd/sec-core.c | 20 +- + drivers/mfd/sec-irq.c | 14 +- + drivers/mfd/sky81452.c | 10 +- + drivers/mfd/sm501.c | 15 +- + drivers/mfd/smsc-ece1099.c | 10 - + drivers/mfd/stw481x.c | 11 +- + drivers/mfd/tc6393xb.c | 14 +- + drivers/mfd/tps6105x.c | 1 - + drivers/mfd/tps65010.c | 8 +- + drivers/mfd/tps6507x.c | 13 +- + drivers/mfd/tps65217.c | 14 +- + drivers/mfd/tps65910.c | 34 +- + drivers/mfd/twl4030-power.c | 1 - + drivers/mfd/twl6040.c | 8 +- + drivers/mfd/ucb1x00-core.c | 14 +- + drivers/mfd/vexpress-sysreg.c | 2 +- + drivers/mfd/wl1273-core.c | 14 +- + drivers/mfd/wm5110-tables.c | 1 + + drivers/mfd/wm8400-core.c | 52 +- + include/dt-bindings/mfd/arizona.h | 5 + + include/dt-bindings/mfd/max77620.h | 39 ++ + include/linux/mfd/axp20x.h | 59 +++ + include/linux/mfd/core.h | 4 + + include/linux/mfd/max77620.h | 346 ++++++++++++ + include/linux/mfd/syscon.h | 1 + + include/linux/mfd/wm8400-private.h | 1 - + 67 files changed, 1629 insertions(+), 486 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/hisilicon,hi655x.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max77620.txt + create mode 100644 drivers/mfd/max77620.c + create mode 100644 include/dt-bindings/mfd/max77620.h + create mode 100644 include/linux/mfd/max77620.h +Merging backlight/for-backlight-next (60d613d6aef4 backlight: pwm_bl: Free PWM requested by legacy API on error path) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/master (4a99fa06a8ca sbs-battery: fix power status when battery charging near dry) +$ git merge battery/master +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/atmel-at91.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 59 +++++ + MAINTAINERS | 5 + + drivers/power/ipaq_micro_battery.c | 2 +- + drivers/power/max8925_power.c | 10 +- + drivers/power/reset/Kconfig | 8 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/at91-sama5d2_shdwc.c | 282 +++++++++++++++++++++ + drivers/power/sbs-battery.c | 4 - + 8 files changed, 361 insertions(+), 10 deletions(-) + create mode 100644 drivers/power/reset/at91-sama5d2_shdwc.c +Merging omap_dss2/for-next (ffe1b6c453ef video: AMBA CLCD: Remove unncessary include in amba-clcd.c) +$ git merge omap_dss2/for-next +Removing include/video/sh_mipi_dsi.h +Removing drivers/video/fbdev/sh_mipi_dsi.c +Auto-merging drivers/video/fbdev/amba-clcd.c +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'recursive' strategy. + Documentation/fb/udlfb.txt | 6 +- + drivers/video/Kconfig | 4 - + drivers/video/fbdev/Kconfig | 1 - + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/amba-clcd.c | 2 - + drivers/video/fbdev/core/fbmem.c | 20 +- + drivers/video/fbdev/imxfb.c | 44 +- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 12 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 12 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 12 +- + drivers/video/fbdev/sh_mipi_dsi.c | 587 --------------------------- + drivers/video/fbdev/ssd1307fb.c | 2 +- + include/video/sh_mipi_dsi.h | 59 --- + 13 files changed, 68 insertions(+), 694 deletions(-) + delete mode 100644 drivers/video/fbdev/sh_mipi_dsi.c + delete mode 100644 include/video/sh_mipi_dsi.h +Merging regulator/for-next (6b3f657e5e3e Merge remote-tracking branch 'regulator/fix/ccv' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + include/linux/regulator/consumer.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging security/next (b937190c40de LSM: LoadPin: provide enablement CONFIG) +$ git merge security/next +Resolved 'crypto/asymmetric_keys/pkcs7_parser.c' using previous resolution. +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +Auto-merging kernel/seccomp.c +Removing include/linux/verify_pefile.h +Auto-merging include/linux/lsm_hooks.h +Auto-merging include/linux/fs.h +Auto-merging fs/namei.c +Auto-merging crypto/asymmetric_keys/pkcs7_parser.c +CONFLICT (content): Merge conflict in crypto/asymmetric_keys/pkcs7_parser.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5ca07b7232ee] Merge remote-tracking branch 'security/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/security/LoadPin.txt | 17 ++ + Documentation/security/keys.txt | 52 ++++++ + MAINTAINERS | 6 + + arch/x86/kernel/kexec-bzimage64.c | 18 +- + certs/Kconfig | 9 + + certs/system_keyring.c | 139 +++++++++++--- + crypto/asymmetric_keys/Kconfig | 6 +- + crypto/asymmetric_keys/Makefile | 5 +- + crypto/asymmetric_keys/asymmetric_keys.h | 2 + + crypto/asymmetric_keys/asymmetric_type.c | 96 +++++++++- + crypto/asymmetric_keys/mscode_parser.c | 21 +-- + crypto/asymmetric_keys/pkcs7_key_type.c | 72 +++----- + crypto/asymmetric_keys/pkcs7_parser.c | 58 +++--- + crypto/asymmetric_keys/pkcs7_parser.h | 11 +- + crypto/asymmetric_keys/pkcs7_trust.c | 43 ++--- + crypto/asymmetric_keys/pkcs7_verify.c | 107 +++++------ + crypto/asymmetric_keys/public_key.c | 20 +- + crypto/asymmetric_keys/restrict.c | 108 +++++++++++ + crypto/asymmetric_keys/signature.c | 18 ++ + crypto/asymmetric_keys/verify_pefile.c | 40 +--- + crypto/asymmetric_keys/verify_pefile.h | 5 +- + crypto/asymmetric_keys/x509_cert_parser.c | 52 +++--- + crypto/asymmetric_keys/x509_parser.h | 12 +- + crypto/asymmetric_keys/x509_public_key.c | 297 +++++++++--------------------- + fs/cifs/cifsacl.c | 2 +- + fs/exec.c | 29 ++- + fs/namei.c | 2 + + fs/nfs/nfs4idmap.c | 2 +- + include/crypto/pkcs7.h | 6 +- + include/crypto/public_key.h | 33 ++-- + include/keys/asymmetric-subtype.h | 2 +- + include/keys/asymmetric-type.h | 13 +- + include/keys/system_keyring.h | 41 ++--- + include/linux/fs.h | 31 +++- + include/linux/ima.h | 6 + + include/linux/key-type.h | 1 - + include/linux/key.h | 44 +++-- + include/linux/lsm_hooks.h | 6 +- + include/linux/string_helpers.h | 6 + + include/linux/verification.h | 49 +++++ + include/linux/verify_pefile.h | 22 --- + include/uapi/linux/keyctl.h | 10 + + kernel/module_signing.c | 7 +- + kernel/seccomp.c | 2 +- + lib/string_helpers.c | 92 +++++++++ + net/dns_resolver/dns_key.c | 2 +- + net/netlabel/netlabel_kapi.c | 2 +- + net/rxrpc/ar-key.c | 4 +- + security/Kconfig | 1 + + security/Makefile | 2 + + security/integrity/Kconfig | 1 - + security/integrity/digsig.c | 15 +- + security/integrity/ima/Kconfig | 36 ++-- + security/integrity/ima/Makefile | 2 +- + security/integrity/ima/ima_appraise.c | 7 +- + security/integrity/ima/ima_main.c | 25 ++- + security/integrity/ima/ima_mok.c | 23 +-- + security/integrity/integrity.h | 1 + + security/keys/Kconfig | 15 ++ + security/keys/Makefile | 1 + + security/keys/big_key.c | 198 ++++++++++++++++++-- + security/keys/compat.c | 4 + + security/keys/dh.c | 160 ++++++++++++++++ + security/keys/internal.h | 12 ++ + security/keys/key.c | 42 ++++- + security/keys/keyctl.c | 5 + + security/keys/keyring.c | 46 ++++- + security/keys/persistent.c | 4 +- + security/keys/process_keys.c | 16 +- + security/keys/request_key.c | 4 +- + security/keys/request_key_auth.c | 2 +- + security/keys/user_defined.c | 42 ++--- + security/loadpin/Kconfig | 19 ++ + security/loadpin/Makefile | 1 + + security/loadpin/loadpin.c | 190 +++++++++++++++++++ + security/security.c | 2 +- + security/selinux/hooks.c | 144 ++++++++++----- + security/selinux/include/classmap.h | 30 +-- + security/selinux/include/conditional.h | 2 +- + security/selinux/include/objsec.h | 5 +- + security/selinux/ss/services.c | 6 +- + security/yama/yama_lsm.c | 31 +++- + 82 files changed, 1915 insertions(+), 807 deletions(-) + create mode 100644 Documentation/security/LoadPin.txt + create mode 100644 crypto/asymmetric_keys/restrict.c + create mode 100644 include/linux/verification.h + delete mode 100644 include/linux/verify_pefile.h + create mode 100644 security/keys/dh.c + create mode 100644 security/loadpin/Kconfig + create mode 100644 security/loadpin/Makefile + create mode 100644 security/loadpin/loadpin.c +Merging integrity/next (05d1a717ec04 ima: add support for creating files using the mknodat syscall) +$ git merge integrity/next +Already up-to-date. +Merging keys/keys-next (75aeddd12f20 MAINTAINERS: Update keyrings record and add asymmetric keys record) +$ git merge keys/keys-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 12 ++++++++++++ + crypto/asymmetric_keys/pkcs7_key_type.c | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) +Merging selinux/next (b937190c40de LSM: LoadPin: provide enablement CONFIG) +$ git merge selinux/next +Already up-to-date. +Merging tpmdd/next (e8f2f45a4402 tpm: Fix suspend regression) +$ git merge tpmdd/next +Auto-merging include/uapi/linux/Kbuild +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tpm/tpm_vtpm_proxy.txt | 71 ++++ + drivers/char/tpm/Kconfig | 11 + + drivers/char/tpm/Makefile | 1 + + drivers/char/tpm/st33zp24/Kconfig | 11 +- + drivers/char/tpm/st33zp24/i2c.c | 70 +++- + drivers/char/tpm/st33zp24/spi.c | 184 ++++++---- + drivers/char/tpm/st33zp24/st33zp24.c | 125 +++---- + drivers/char/tpm/st33zp24/st33zp24.h | 14 +- + drivers/char/tpm/tpm-chip.c | 284 ++++++++++----- + drivers/char/tpm/tpm-dev.c | 15 +- + drivers/char/tpm/tpm-interface.c | 105 +++--- + drivers/char/tpm/tpm-sysfs.c | 78 ++-- + drivers/char/tpm/tpm.h | 73 ++-- + drivers/char/tpm/tpm2-cmd.c | 11 +- + drivers/char/tpm/tpm_atmel.c | 63 ++-- + drivers/char/tpm/tpm_atmel.h | 16 +- + drivers/char/tpm/tpm_crb.c | 73 ++-- + drivers/char/tpm/tpm_eventlog.c | 2 +- + drivers/char/tpm/tpm_eventlog.h | 4 +- + drivers/char/tpm/tpm_i2c_atmel.c | 39 +- + drivers/char/tpm/tpm_i2c_infineon.c | 55 ++- + drivers/char/tpm/tpm_i2c_nuvoton.c | 98 ++--- + drivers/char/tpm/tpm_ibmvtpm.c | 38 +- + drivers/char/tpm/tpm_infineon.c | 22 +- + drivers/char/tpm/tpm_nsc.c | 84 +++-- + drivers/char/tpm/tpm_tis.c | 266 +++++++------- + drivers/char/tpm/tpm_vtpm_proxy.c | 644 +++++++++++++++++++++++++++++++++ + drivers/char/tpm/xen-tpmfront.c | 36 +- + include/linux/platform_data/st33zp24.h | 2 +- + include/uapi/linux/Kbuild | 1 + + include/uapi/linux/vtpm_proxy.h | 36 ++ + 32 files changed, 1768 insertions(+), 765 deletions(-) + create mode 100644 Documentation/tpm/tpm_vtpm_proxy.txt + create mode 100644 drivers/char/tpm/tpm_vtpm_proxy.c + create mode 100644 include/uapi/linux/vtpm_proxy.h +Merging watchdog/master (ae67643edc6e Documentation: Add ebc-c384_wdt watchdog-parameters.txt entry) +$ git merge watchdog/master +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/fsl-imx-wdt.txt | 4 +- + .../devicetree/bindings/watchdog/renesas-wdt.txt | 25 +++ + Documentation/watchdog/hpwdt.txt | 57 +++--- + Documentation/watchdog/watchdog-parameters.txt | 4 + + arch/arm64/configs/defconfig | 2 + + drivers/watchdog/Kconfig | 8 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/cpwd.c | 4 +- + drivers/watchdog/f71808e_wdt.c | 30 ++- + drivers/watchdog/imx2_wdt.c | 19 +- + drivers/watchdog/jz4740_wdt.c | 4 +- + drivers/watchdog/octeon-wdt-main.c | 2 +- + drivers/watchdog/qcom-wdt.c | 7 +- + drivers/watchdog/renesas_wdt.c | 213 +++++++++++++++++++++ + drivers/watchdog/shwdt.c | 4 +- + drivers/watchdog/sp5100_tco.c | 15 +- + drivers/watchdog/watchdog_core.c | 2 +- + drivers/watchdog/watchdog_dev.c | 1 - + 18 files changed, 348 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/renesas-wdt.txt + create mode 100644 drivers/watchdog/renesas_wdt.c +Merging iommu/next (6c0b43df74f9 Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/include/asm/dma-mapping.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/arm64/silicon-errata.txt | 2 + + .../devicetree/bindings/iommu/arm,smmu.txt | 1 + + Documentation/kernel-parameters.txt | 7 + + arch/arm/include/asm/dma-mapping.h | 2 +- + arch/arm/mm/dma-mapping.c | 6 +- + arch/arm64/include/asm/dma-mapping.h | 2 +- + arch/arm64/mm/dma-mapping.c | 8 +- + drivers/iommu/Kconfig | 13 +- + drivers/iommu/amd_iommu.c | 267 +++++++++-------- + drivers/iommu/amd_iommu_init.c | 329 ++++++++++++++++++--- + drivers/iommu/amd_iommu_types.h | 40 +-- + drivers/iommu/arm-smmu-v3.c | 19 +- + drivers/iommu/arm-smmu.c | 308 +++++++++++++------ + drivers/iommu/dma-iommu.c | 146 ++++++--- + drivers/iommu/dmar.c | 47 +-- + drivers/iommu/intel-iommu.c | 2 +- + drivers/iommu/io-pgtable-arm-v7s.c | 29 +- + drivers/iommu/io-pgtable-arm.c | 9 +- + drivers/iommu/io-pgtable.c | 3 +- + drivers/iommu/io-pgtable.h | 6 + + drivers/iommu/iommu.c | 22 +- + drivers/iommu/mtk_iommu.c | 16 +- + drivers/iommu/of_iommu.c | 14 +- + drivers/iommu/omap-iommu-debug.c | 2 +- + drivers/iommu/omap-iommu.c | 10 +- + drivers/iommu/rockchip-iommu.c | 2 + + drivers/of/device.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + include/asm-generic/io.h | 4 +- + include/linux/dma-iommu.h | 4 +- + include/linux/dma-mapping.h | 2 +- + include/linux/io-64-nonatomic-hi-lo.h | 25 ++ + include/linux/io-64-nonatomic-lo-hi.h | 25 ++ + include/linux/iommu.h | 6 +- + include/linux/of_iommu.h | 8 +- + 35 files changed, 974 insertions(+), 416 deletions(-) +Merging dwmw2-iommu/master (22e2f9fa63b0 iommu/vt-d: Use per-cpu IOVA caching) +$ git merge dwmw2-iommu/master +Auto-merging drivers/iommu/intel-iommu.c +Merge made by the 'recursive' strategy. + drivers/iommu/intel-iommu.c | 318 +++++++++++++++++++++++---------- + drivers/iommu/iova.c | 417 +++++++++++++++++++++++++++++++++++++++++--- + include/linux/iova.h | 23 ++- + 3 files changed, 638 insertions(+), 120 deletions(-) +Merging vfio/next (5ed4aba1265f vfio_iommu_spapr_tce: Remove unneeded iommu_group_get_iommudata) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_spapr_tce.c +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 55 ++++++++++++++++++++++++++++++------- + drivers/vfio/pci/vfio_pci_config.c | 29 +++++++++++++++++-- + drivers/vfio/pci/vfio_pci_private.h | 1 + + drivers/vfio/vfio_iommu_spapr_tce.c | 2 -- + 4 files changed, 73 insertions(+), 14 deletions(-) +Merging jc_docs/docs-next (9f8036643dd9 doc: self-protection: provide initial details) +$ git merge jc_docs/docs-next +Resolved 'samples/Makefile' using previous resolution. +Auto-merging samples/connector/Makefile +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging Documentation/networking/filter.txt +Auto-merging Documentation/driver-model/devres.txt +Auto-merging Documentation/Makefile +Auto-merging Documentation/DocBook/media/v4l/vidioc-g-selection.xml +Auto-merging Documentation/DocBook/media/v4l/controls.xml +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 186427c0b1c4] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/obsolete/sysfs-driver-hid-roccat-savu | 11 +- + .../testing/sysfs-bus-event_source-devices-hv_24x7 | 2 +- + Documentation/ABI/testing/sysfs-driver-hid-picolcd | 2 +- + Documentation/ABI/testing/sysfs-firmware-acpi | 2 +- + Documentation/DocBook/media/v4l/controls.xml | 2 +- + Documentation/DocBook/media/v4l/dev-raw-vbi.xml | 2 +- + .../DocBook/media/v4l/vidioc-g-selection.xml | 2 +- + Documentation/IRQ-domain.txt | 12 + + Documentation/Makefile | 2 +- + Documentation/RCU/RTFP.txt | 6 +- + Documentation/adding-syscalls.txt | 2 +- + Documentation/arm/SA1100/Assabet | 2 +- + Documentation/block/00-INDEX | 4 + + Documentation/cgroup-v1/memory.txt | 14 +- + Documentation/connector/connector.txt | 8 + + Documentation/devicetree/bindings/mfd/arizona.txt | 2 +- + Documentation/driver-model/devres.txt | 3 + + Documentation/filesystems/cifs/README | 2 +- + .../filesystems/pohmelfs/design_notes.txt | 2 +- + Documentation/filesystems/qnx6.txt | 2 +- + Documentation/firmware_class/README | 2 +- + Documentation/hwmon/abituguru | 2 +- + Documentation/infiniband/ipoib.txt | 2 +- + Documentation/ja_JP/HOWTO | 6 - + Documentation/kernel-docs.txt | 29 +- + Documentation/ko_KR/HOWTO | 8 +- + Documentation/laptops/toshiba_haps.txt | 2 +- + Documentation/lzo.txt | 4 +- + Documentation/mmc/00-INDEX | 2 + + Documentation/mmc/mmc-tools.txt | 34 +++ + Documentation/networking/can.txt | 2 +- + Documentation/networking/filter.txt | 2 +- + Documentation/pps/pps.txt | 2 +- + Documentation/robust-futexes.txt | 6 +- + Documentation/scsi/ChangeLog.megaraid_sas | 48 ++-- + Documentation/scsi/bfa.txt | 2 +- + Documentation/security/self-protection.txt | 261 +++++++++++++++++ + Documentation/serial/driver | 54 ++-- + Documentation/sysrq.txt | 2 +- + Documentation/timers/hrtimers.txt | 6 +- + Documentation/video4linux/README.cx88 | 2 +- + Documentation/video4linux/bttv/Sound-FAQ | 2 +- + Documentation/vm/hugetlbpage.txt | 6 +- + Documentation/vm/pagemap.txt | 2 +- + Documentation/x86/intel_mpx.txt | 4 +- + Documentation/xillybus.txt | 2 +- + Documentation/zh_CN/HOWTO | 4 +- + Documentation/zh_CN/arm64/booting.txt | 20 +- + README | 20 +- + samples/Kconfig | 9 + + samples/Makefile | 2 +- + {Documentation => samples}/connector/.gitignore | 0 + {Documentation => samples}/connector/Makefile | 6 +- + {Documentation => samples}/connector/cn_test.c | 0 + {Documentation => samples}/connector/ucon.c | 0 + scripts/docproc.c | 221 +++++++++++---- + scripts/kernel-doc | 315 ++++++++++++++++++--- + 57 files changed, 922 insertions(+), 253 deletions(-) + create mode 100644 Documentation/mmc/mmc-tools.txt + create mode 100644 Documentation/security/self-protection.txt + rename {Documentation => samples}/connector/.gitignore (100%) + rename {Documentation => samples}/connector/Makefile (76%) + rename {Documentation => samples}/connector/cn_test.c (100%) + rename {Documentation => samples}/connector/ucon.c (100%) +Merging trivial/for-next (52bbe141f37f gitignore: fix wording) +$ git merge trivial/for-next +Auto-merging tools/perf/util/session.c +Auto-merging tools/perf/util/parse-events.c +Auto-merging tools/perf/util/machine.c +Auto-merging tools/perf/util/evsel.c +Auto-merging net/tipc/socket.c +Auto-merging fs/jbd2/transaction.c +Auto-merging fs/exofs/super.c +Auto-merging drivers/watchdog/watchdog_core.c +Auto-merging drivers/platform/mips/cpu_hwmon.c +Auto-merging drivers/net/ethernet/broadcom/bgmac.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gpu.c +Auto-merging drivers/edac/amd64_edac.c +Auto-merging arch/powerpc/kernel/mce.c +Auto-merging arch/ia64/kernel/efi.c +Merge made by the 'recursive' strategy. + .gitignore | 2 +- + arch/avr32/include/asm/addrspace.h | 2 +- + arch/blackfin/lib/udivsi3.S | 2 +- + arch/blackfin/mach-bf609/include/mach/defBF60x_base.h | 2 +- + arch/c6x/include/asm/clock.h | 2 +- + arch/c6x/platforms/cache.c | 2 +- + arch/cris/arch-v10/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v32/drivers/axisflashmap.c | 2 +- + arch/cris/arch-v32/drivers/cryptocop.c | 2 +- + arch/cris/arch-v32/mach-a3/dram_init.S | 2 +- + arch/cris/arch-v32/mach-fs/dram_init.S | 2 +- + arch/hexagon/include/asm/hexagon_vm.h | 2 +- + arch/hexagon/include/asm/vm_mmu.h | 2 +- + arch/hexagon/kernel/kgdb.c | 4 ++-- + arch/hexagon/kernel/vm_ops.S | 2 +- + arch/hexagon/lib/memcpy.S | 2 +- + arch/ia64/include/asm/sn/ioc3.h | 2 +- + arch/ia64/include/asm/sn/shubio.h | 4 ++-- + arch/ia64/kernel/efi.c | 2 +- + arch/ia64/lib/idiv32.S | 2 +- + arch/ia64/lib/idiv64.S | 2 +- + arch/metag/include/asm/metag_regs.h | 2 +- + arch/metag/include/asm/tbx.h | 6 +++--- + arch/metag/tbx/tbipcx.S | 2 +- + arch/metag/tbx/tbisoft.S | 6 +++--- + arch/powerpc/kernel/mce.c | 2 +- + arch/x86/kernel/cpu/microcode/intel.c | 2 +- + arch/x86/kvm/iommu.c | 2 +- + block/partitions/efi.c | 4 ++-- + drivers/clk/tegra/clk-tegra20.c | 2 +- + drivers/edac/amd64_edac.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 ++-- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 2 +- + drivers/infiniband/hw/mlx4/main.c | 2 +- + drivers/input/touchscreen/cyttsp4_core.c | 2 +- + drivers/memstick/core/ms_block.c | 16 ++++++++-------- + drivers/memstick/core/ms_block.h | 2 +- + drivers/mtd/sm_ftl.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 2 +- + drivers/net/ethernet/freescale/fman/fman.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 4 ++-- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 4 ++-- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 2 +- + drivers/platform/mips/cpu_hwmon.c | 6 +++--- + drivers/scsi/aic94xx/aic94xx_hwi.c | 2 +- + drivers/scsi/aic94xx/aic94xx_seq.c | 2 +- + drivers/scsi/isci/port.c | 2 +- + drivers/scsi/qla2xxx/qla_sup.c | 2 +- + drivers/target/iscsi/iscsi_target_auth.c | 2 +- + drivers/tty/serial/serial_mctrl_gpio.h | 4 ++-- + drivers/w1/w1_io.c | 2 +- + drivers/watchdog/watchdog_core.c | 2 +- + fs/exofs/super.c | 2 +- + fs/jbd2/recovery.c | 2 +- + fs/jbd2/transaction.c | 6 +++--- + fs/super.c | 2 +- + net/tipc/socket.c | 2 +- + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/util/evsel.c | 2 +- + tools/perf/util/machine.c | 2 +- + tools/perf/util/parse-events.c | 2 +- + tools/perf/util/session.c | 2 +- + 63 files changed, 85 insertions(+), 85 deletions(-) +Merging audit/next (188e3c5cd2b6 tty: provide tty_name() even without CONFIG_TTY) +$ git merge audit/next +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit.c +Auto-merging include/linux/tty.h +Auto-merging include/linux/audit.h +Merge made by the 'recursive' strategy. + include/linux/audit.h | 24 ++++++++++++++++++++++++ + include/linux/tty.h | 4 +++- + kernel/audit.c | 30 ++++++++++-------------------- + kernel/audit_tree.c | 12 +++++------- + kernel/auditsc.c | 8 ++++++-- + 5 files changed, 48 insertions(+), 30 deletions(-) +Merging devicetree/devicetree/next (48a9b733e644 of/irq: Rename "intc_desc" to "of_intc_desc" to fix OF on sh) +$ git merge devicetree/devicetree/next +Already up-to-date. +Merging dt-rh/for-next (4da8d6f6abe7 devicetree: Add Creative Technology vendor id) +$ git merge dt-rh/for-next +Resolved 'Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt' using previous resolution. +Resolved 'drivers/iommu/arm-smmu.c' using previous resolution. +Auto-merging scripts/Makefile.lib +Auto-merging include/linux/of.h +Auto-merging drivers/of/unittest.c +Auto-merging drivers/of/base.c +Auto-merging drivers/iommu/arm-smmu.c +CONFLICT (content): Merge conflict in drivers/iommu/arm-smmu.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/thermal/nvidia,tegra124-soctherm.txt +Auto-merging Documentation/devicetree/bindings/pinctrl/nvidia,tegra124-xusb-padctl.txt +Auto-merging Documentation/devicetree/bindings/net/stmmac.txt +Auto-merging Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt +Auto-merging Documentation/devicetree/bindings/mtd/brcm,brcmnand.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra30-mc.txt +Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra124-emc.txt +Auto-merging Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/gpu/nvidia,gk20a.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a792d9ada267] Merge remote-tracking branch 'dt-rh/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cci.txt | 2 +- + .../devicetree/bindings/arm/omap/crossbar.txt | 3 +- + .../devicetree/bindings/arm/spear-misc.txt | 2 +- + .../devicetree/bindings/arm/ux500/boards.txt | 2 +- + .../{tegra-sata.txt => nvidia,tegra124-ahci.txt} | 0 + .../bindings/clock/nvidia,tegra124-dfll.txt | 2 +- + .../bindings/clock/rockchip,rk3188-cru.txt | 2 +- + .../bindings/clock/rockchip,rk3288-cru.txt | 2 +- + .../devicetree/bindings/clock/st/st,clkgen.txt | 2 +- + ...124-cpufreq.txt => nvidia,tegra124-cpufreq.txt} | 0 + .../bindings/display/exynos/exynos_dsim.txt | 2 +- + ...egra20-apbdma.txt => nvidia,tegra20-apbdma.txt} | 0 + .../devicetree/bindings/dma/xilinx/xilinx_dma.txt | 2 +- + .../devicetree/bindings/gpio/ibm,ppc4xx-gpio.txt | 24 ++ + .../devicetree/bindings/input/ads7846.txt | 2 +- + .../bindings/input/touchscreen/fsl-mx25-tcq.txt | 2 +- + .../interrupt-controller/mediatek,sysirq.txt | 3 +- + ...ia,tegra-ictlr.txt => nvidia,tegra20-ictlr.txt} | 0 + .../interrupt-controller/ti,omap4-wugen-mpu | 4 +- + .../{tegra-emc.txt => nvidia,tegra124-emc.txt} | 4 +- + .../{nvidia,tegra-mc.txt => nvidia,tegra30-mc.txt} | 6 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 4 +- + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.txt | 2 +- + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 2 +- + .../devicetree/bindings/net/hisilicon-hns-nic.txt | 2 +- + Documentation/devicetree/bindings/net/stmmac.txt | 4 +- + .../devicetree/bindings/net/ti,dp83867.txt | 2 +- + Documentation/devicetree/bindings/opp/opp.txt | 2 +- + .../devicetree/bindings/pci/designware-pcie.txt | 2 +- + .../devicetree/bindings/pci/hisilicon-pcie.txt | 12 +- + .../devicetree/bindings/phy/phy-stih41x-usb.txt | 2 +- + .../pinctrl/nvidia,tegra124-xusb-padctl.txt | 6 +- + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 +- + .../bindings/power/qcom,coincell-charger.txt | 2 +- + .../devicetree/bindings/regulator/palmas-pmic.txt | 8 + + .../devicetree/bindings/rtc/rtc-palmas.txt | 6 +- + .../bindings/{tty => }/serial/mvebu-uart.txt | 0 + .../bindings/soc/ti/keystone-navigator-qmss.txt | 6 +- + .../bindings/sound/nvidia,tegra30-hda.txt | 2 +- + Documentation/devicetree/bindings/sram/sram.txt | 2 +- + ...a-soctherm.txt => nvidia,tegra124-soctherm.txt} | 2 +- + .../devicetree/bindings/vendor-prefixes.txt | 4 + + drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c | 2 +- + drivers/iommu/arm-smmu.c | 38 +- + drivers/of/base.c | 209 +++++++---- + drivers/of/dynamic.c | 6 + + drivers/of/fdt.c | 382 +++++++++++++-------- + drivers/of/unittest.c | 3 +- + include/linux/of.h | 56 +++ + include/linux/of_fdt.h | 5 +- + include/linux/of_graph.h | 1 + + scripts/Makefile.lib | 5 + + scripts/dtc/checks.c | 26 ++ + scripts/dtc/flattree.c | 4 +- + scripts/dtc/libfdt/fdt_ro.c | 6 +- + scripts/dtc/version_gen.h | 2 +- + 56 files changed, 595 insertions(+), 290 deletions(-) + rename Documentation/devicetree/bindings/ata/{tegra-sata.txt => nvidia,tegra124-ahci.txt} (100%) + rename Documentation/devicetree/bindings/cpufreq/{tegra124-cpufreq.txt => nvidia,tegra124-cpufreq.txt} (100%) + rename Documentation/devicetree/bindings/dma/{tegra20-apbdma.txt => nvidia,tegra20-apbdma.txt} (100%) + create mode 100644 Documentation/devicetree/bindings/gpio/ibm,ppc4xx-gpio.txt + rename Documentation/devicetree/bindings/interrupt-controller/{nvidia,tegra-ictlr.txt => nvidia,tegra20-ictlr.txt} (100%) + rename Documentation/devicetree/bindings/memory-controllers/{tegra-emc.txt => nvidia,tegra124-emc.txt} (99%) + rename Documentation/devicetree/bindings/memory-controllers/{nvidia,tegra-mc.txt => nvidia,tegra30-mc.txt} (97%) + rename Documentation/devicetree/bindings/{tty => }/serial/mvebu-uart.txt (100%) + rename Documentation/devicetree/bindings/thermal/{tegra-soctherm.txt => nvidia,tegra124-soctherm.txt} (98%) +Merging mailbox/mailbox-for-next (c430cf376fee mailbox: Fix devm_ioremap_resource error detection code) +$ git merge mailbox/mailbox-for-next +Removing include/linux/platform_data/mailbox-omap.h +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-sti.c | 4 +- + drivers/mailbox/omap-mailbox.c | 220 +++++++++++++---------------- + include/linux/omap-mailbox.h | 2 - + include/linux/platform_data/mailbox-omap.h | 58 -------- + 4 files changed, 104 insertions(+), 180 deletions(-) + delete mode 100644 include/linux/platform_data/mailbox-omap.h +Merging spi/for-next (80862e3d2e65 Merge remote-tracking branch 'spi/topic/zynqmp' into spi-next) +$ git merge spi/for-next +Auto-merging drivers/spi/spi-pxa2xx-pci.c +Auto-merging Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt +Merge made by the 'recursive' strategy. + .../bindings/spi/microchip,spi-pic32.txt | 34 + + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 3 +- + .../devicetree/bindings/spi/sqi-pic32.txt | 18 + + drivers/spi/Kconfig | 21 +- + drivers/spi/Makefile | 2 + + drivers/spi/spi-axi-spi-engine.c | 1 - + drivers/spi/spi-bcm53xx.c | 78 +- + drivers/spi/spi-cadence.c | 244 +++--- + drivers/spi/spi-davinci.c | 76 +- + drivers/spi/spi-dln2.c | 2 + + drivers/spi/spi-dw-pci.c | 2 +- + drivers/spi/spi-fsl-dspi.c | 7 + + drivers/spi/spi-fsl-espi.c | 30 +- + drivers/spi/spi-octeon.c | 17 +- + drivers/spi/spi-omap2-mcspi.c | 83 +- + drivers/spi/spi-pic32-sqi.c | 727 +++++++++++++++++ + drivers/spi/spi-pic32.c | 878 +++++++++++++++++++++ + drivers/spi/spi-pxa2xx-dma.c | 28 +- + drivers/spi/spi-pxa2xx-pci.c | 4 +- + drivers/spi/spi-pxa2xx.c | 15 +- + drivers/spi/spi-pxa2xx.h | 3 - + drivers/spi/spi-qup.c | 15 + + drivers/spi/spi-rockchip.c | 9 +- + drivers/spi/spi-st-ssc4.c | 8 +- + drivers/spi/spi-zynqmp-gqspi.c | 3 +- + drivers/spi/spi.c | 7 +- + include/linux/spi/spi.h | 6 +- + 27 files changed, 2033 insertions(+), 288 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/microchip,spi-pic32.txt + create mode 100644 Documentation/devicetree/bindings/spi/sqi-pic32.txt + create mode 100644 drivers/spi/spi-pic32-sqi.c + create mode 100644 drivers/spi/spi-pic32.c +Merging tip/auto-latest (139f278f8e96 Merge branch 'core/urgent') +$ git merge tip/auto-latest +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + arch/x86/include/asm/cpufeature.h | 12 +- + arch/x86/include/asm/disabled-features.h | 6 +- + arch/x86/include/asm/topology.h | 12 +- + arch/x86/include/asm/uaccess.h | 23 +- + arch/x86/kernel/cpu/common.c | 4 + + arch/x86/kernel/cpu/intel.c | 7 +- + arch/x86/kernel/tsc_msr.c | 3 + + arch/x86/platform/efi/efi_stub_64.S | 9 +- + include/linux/futex.h | 12 +- + include/linux/sched.h | 2 + + include/uapi/linux/futex.h | 6 +- + kernel/fork.c | 7 + + kernel/futex.c | 557 ++++++++++++++++++++++++++++++- + tools/objtool/Makefile | 4 + + tools/objtool/elf.h | 5 + + tools/perf/bench/futex-hash.c | 38 ++- + tools/perf/bench/futex.h | 14 + + 17 files changed, 657 insertions(+), 64 deletions(-) +Merging clockevents/clockevents/next (cee77c2c5b57 clocksource/drivers/tango-xtal: Fix incorrect test) +$ git merge clockevents/clockevents/next +Merge made by the 'recursive' strategy. +Merging edac/linux_next (12f0721c5a70 sb_edac: correctly fetch DIMM width on Ivy Bridge and Haswell) +$ git merge edac/linux_next +Already up-to-date. +Merging edac-amd/for-next (3f37a36b6282 EDAC, amd64_edac: Drop pci_register_driver() use) +$ git merge edac-amd/for-next +Already up-to-date. +Merging irqchip/irqchip/for-next (a66ce4b7d9d2 Merge branch 'irqchip/mvebu' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging ftrace/for-next (0fc1b09ff1ff tracing: Use temp buffer when filtering events) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_events.c +Auto-merging include/linux/trace_events.h +Auto-merging Documentation/trace/ftrace.txt +Merge made by the 'recursive' strategy. + Documentation/trace/events.txt | 1555 +++++++++++++++++ + Documentation/trace/ftrace.txt | 34 +- + include/linux/trace_events.h | 120 +- + kernel/trace/Kconfig | 26 + + kernel/trace/Makefile | 2 + + kernel/trace/trace.c | 275 ++- + kernel/trace/trace.h | 190 ++- + kernel/trace/trace_events.c | 329 ++-- + kernel/trace/trace_events_filter.c | 77 +- + kernel/trace/trace_events_hist.c | 1755 ++++++++++++++++++++ + kernel/trace/trace_events_trigger.c | 215 ++- + kernel/trace/tracing_map.c | 1062 ++++++++++++ + kernel/trace/tracing_map.h | 283 ++++ + tools/testing/selftests/ftrace/test.d/functions | 9 + + .../ftrace/test.d/trigger/trigger-eventonoff.tc | 64 + + .../ftrace/test.d/trigger/trigger-filter.tc | 59 + + .../ftrace/test.d/trigger/trigger-hist-mod.tc | 75 + + .../ftrace/test.d/trigger/trigger-hist.tc | 83 + + .../ftrace/test.d/trigger/trigger-multihist.tc | 73 + + .../ftrace/test.d/trigger/trigger-snapshot.tc | 56 + + .../ftrace/test.d/trigger/trigger-stacktrace.tc | 53 + + .../ftrace/test.d/trigger/trigger-traceonoff.tc | 58 + + 22 files changed, 6041 insertions(+), 412 deletions(-) + create mode 100644 kernel/trace/trace_events_hist.c + create mode 100644 kernel/trace/tracing_map.c + create mode 100644 kernel/trace/tracing_map.h + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-eventonoff.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-filter.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-mod.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-multihist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-snapshot.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-stacktrace.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-traceonoff.tc +Merging rcu/rcu/next (d9eccc08671b Merge branch 'rcu/dev' into HEAD) +$ git merge rcu/rcu/next +Auto-merging kernel/sched/fair.c +Auto-merging drivers/base/power/runtime.c +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.html | 35 ++ + Documentation/RCU/stallwarn.txt | 2 +- + Documentation/RCU/whatisRCU.txt | 3 + + arch/arm/kernel/smp.c | 2 +- + arch/arm/mach-omap2/powerdomain.c | 9 +- + drivers/base/power/runtime.c | 14 +- + drivers/clk/clk.c | 8 +- + include/linux/rcupdate.h | 23 +- + include/linux/torture.h | 4 + + kernel/rcu/Makefile | 3 +- + kernel/rcu/rcuperf.c | 7 +- + kernel/rcu/rcutorture.c | 9 +- + kernel/rcu/tree.c | 575 +----------------- + kernel/rcu/tree.h | 18 + + kernel/rcu/tree_exp.h | 654 +++++++++++++++++++++ + kernel/rcu/tree_plugin.h | 95 +-- + kernel/rcu/update.c | 7 +- + kernel/rcu/waketorture.c | 537 +++++++++++++++++ + kernel/sched/fair.c | 2 +- + kernel/torture.c | 176 ++++-- + lib/Kconfig.debug | 51 +- + .../selftests/rcutorture/bin/kvm-recheck-wake.sh | 39 ++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 21 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 +- + .../selftests/rcutorture/configs/wake/CFLIST | 1 + + .../selftests/rcutorture/configs/wake/CFcommon | 2 + + tools/testing/selftests/rcutorture/configs/wake/SH | 19 + + .../selftests/rcutorture/configs/wake/SH.boot | 1 + + .../testing/selftests/rcutorture/configs/wake/STI | 19 + + .../selftests/rcutorture/configs/wake/STI.boot | 1 + + .../rcutorture/configs/wake/ver_functions.sh | 43 ++ + 33 files changed, 1597 insertions(+), 794 deletions(-) + create mode 100644 kernel/rcu/tree_exp.h + create mode 100644 kernel/rcu/waketorture.c + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-recheck-wake.sh + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFLIST + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/CFcommon + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/SH.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/STI.boot + create mode 100644 tools/testing/selftests/rcutorture/configs/wake/ver_functions.sh +Merging kvm/linux-next (c4a8de357ef1 KVM: s390: set halt polling to 80 microseconds) +$ git merge kvm/linux-next +Resolved 'drivers/irqchip/irq-gic-v3.c' using previous resolution. +Resolved 'drivers/irqchip/irq-gic.c' using previous resolution. +Auto-merging drivers/irqchip/irq-gic.c +CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic.c +Auto-merging drivers/irqchip/irq-gic-v3.c +CONFLICT (content): Merge conflict in drivers/irqchip/irq-gic-v3.c +Auto-merging drivers/irqchip/irq-gic-common.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/s390/include/asm/sclp.h +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/mips/kvm/trap_emul.c +Auto-merging arch/mips/kvm/tlb.c +Auto-merging arch/mips/kvm/emulate.c +Auto-merging arch/mips/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/pgtable-hwdef.h +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_arm.h +Auto-merging arch/arm/kvm/mmu.c +Auto-merging arch/arm/kvm/arm.c +Auto-merging arch/arm/include/asm/kvm_mmu.h +Auto-merging arch/arm/include/asm/kvm_host.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5e10831c0c4e] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 18 +- + Documentation/virtual/kvm/devices/s390_flic.txt | 14 +- + arch/arm/include/asm/kvm_host.h | 2 + + arch/arm/include/asm/kvm_mmu.h | 43 +-- + arch/arm/include/asm/stage2_pgtable.h | 61 ++++ + arch/arm/kvm/arm.c | 2 +- + arch/arm/kvm/mmu.c | 408 +++++++++++++----------- + arch/arm64/include/asm/kvm_arm.h | 85 +++-- + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/kvm_mmu.h | 111 ++----- + arch/arm64/include/asm/pgtable-hwdef.h | 80 ++++- + arch/arm64/include/asm/pgtable.h | 15 +- + arch/arm64/include/asm/stage2_pgtable-nopmd.h | 42 +++ + arch/arm64/include/asm/stage2_pgtable-nopud.h | 39 +++ + arch/arm64/include/asm/stage2_pgtable.h | 142 +++++++++ + arch/arm64/kvm/Kconfig | 1 - + arch/arm64/kvm/hyp/s2-setup.c | 8 + + arch/mips/include/asm/kvm_host.h | 4 +- + arch/mips/kvm/emulate.c | 89 +++--- + arch/mips/kvm/mips.c | 9 +- + arch/mips/kvm/tlb.c | 26 +- + arch/mips/kvm/trap_emul.c | 2 +- + arch/powerpc/include/asm/kvm_host.h | 5 + + arch/powerpc/kvm/book3s.c | 1 + + arch/powerpc/kvm/book3s_hv.c | 1 + + arch/powerpc/kvm/book3s_pr.c | 32 +- + arch/powerpc/kvm/book3s_xics.c | 29 +- + arch/powerpc/kvm/book3s_xics.h | 1 + + arch/powerpc/kvm/booke.c | 1 + + arch/powerpc/kvm/powerpc.c | 22 +- + arch/s390/include/asm/kvm_host.h | 11 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/sigp.h | 1 + + arch/s390/include/uapi/asm/kvm.h | 1 + + arch/s390/include/uapi/asm/sie.h | 7 +- + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/interrupt.c | 47 +++ + arch/s390/kvm/kvm-s390.c | 61 +++- + arch/s390/kvm/priv.c | 21 +- + arch/s390/kvm/sigp.c | 6 + + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/include/uapi/asm/kvm.h | 6 +- + arch/x86/kvm/irq_comm.c | 3 - + arch/x86/kvm/mmu.c | 28 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 57 ++-- + drivers/clocksource/arm_arch_timer.c | 11 +- + drivers/irqchip/irq-gic-common.c | 13 + + drivers/irqchip/irq-gic-common.h | 3 + + drivers/irqchip/irq-gic-v3.c | 173 ++++++++-- + drivers/irqchip/irq-gic.c | 87 ++++- + drivers/s390/char/sclp_early.c | 6 +- + include/clocksource/arm_arch_timer.h | 12 +- + include/kvm/arm_vgic.h | 7 +- + include/linux/irqbypass.h | 4 +- + include/linux/irqchip/arm-gic-common.h | 34 ++ + include/linux/kvm_host.h | 38 ++- + include/trace/events/kvm.h | 11 +- + include/uapi/linux/kvm.h | 1 + + virt/kvm/Kconfig | 3 + + virt/kvm/arm/arch_timer.c | 40 +-- + virt/kvm/arm/vgic-v2.c | 61 ++-- + virt/kvm/arm/vgic-v3.c | 47 +-- + virt/kvm/arm/vgic.c | 50 +-- + virt/kvm/eventfd.c | 18 +- + virt/kvm/kvm_main.c | 12 +- + virt/lib/irqbypass.c | 12 +- + 67 files changed, 1484 insertions(+), 710 deletions(-) + create mode 100644 arch/arm/include/asm/stage2_pgtable.h + create mode 100644 arch/arm64/include/asm/stage2_pgtable-nopmd.h + create mode 100644 arch/arm64/include/asm/stage2_pgtable-nopud.h + create mode 100644 arch/arm64/include/asm/stage2_pgtable.h + create mode 100644 include/linux/irqchip/arm-gic-common.h +Merging kvm-arm/next (064850532444 kvm: arm64: Enable hardware updates of the Access Flag for Stage 2 page tables) +$ git merge kvm-arm/next +Already up-to-date. +Merging kvm-ppc/kvm-ppc-next (c63517c2e381 KVM: PPC: Book3S: correct width in XER handling) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvm-ppc-paulus/kvm-ppc-next (b1a4286b8f33 KVM: PPC: Book3S HV: Re-enable XICS fast path for irqfd-generated interrupts) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (60a37709ce60 KVM: s390: Populate mask of non-hypervisor managed facility bits) +$ git merge kvms390/next +Already up-to-date. +Merging xen-tip/linux-next (51c2a7526e54 xen/gntdev: reduce copy batch size to 16) +$ git merge xen-tip/linux-next +Resolved 'arch/arm64/kernel/setup.c' using previous resolution. +Resolved 'drivers/xen/efi.c' using previous resolution. +Auto-merging include/linux/of_fdt.h +Auto-merging drivers/xen/efi.c +CONFLICT (content): Merge conflict in drivers/xen/efi.c +Auto-merging drivers/of/fdt.c +Auto-merging arch/arm64/kernel/setup.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/setup.c +Auto-merging arch/arm/kernel/setup.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master acce3df3139f] Merge remote-tracking branch 'xen-tip/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/xen.txt | 35 +++++ + arch/arm/include/asm/xen/xen-ops.h | 6 + + arch/arm/kernel/setup.c | 2 +- + arch/arm/xen/Makefile | 1 + + arch/arm/xen/efi.c | 40 ++++++ + arch/arm/xen/enlighten.c | 103 ++++++++++---- + arch/arm64/include/asm/xen/xen-ops.h | 6 + + arch/arm64/kernel/setup.c | 3 +- + arch/arm64/xen/Makefile | 1 + + arch/x86/xen/efi.c | 112 +++++++++++++++ + arch/x86/xen/grant-table.c | 57 +------- + arch/x86/xen/time.c | 6 +- + drivers/acpi/scan.c | 74 ++++++++++ + drivers/of/fdt.c | 13 ++ + drivers/xen/Kconfig | 2 +- + drivers/xen/Makefile | 1 + + drivers/xen/arm-device.c | 196 ++++++++++++++++++++++++++ + drivers/xen/efi.c | 173 +++++------------------ + drivers/xen/gntdev.c | 2 +- + drivers/xen/xlate_mmu.c | 77 ++++++++++ + include/linux/of_fdt.h | 2 + + include/xen/interface/hvm/params.h | 40 +++++- + include/xen/interface/memory.h | 1 + + include/xen/xen-ops.h | 32 +++-- + 24 files changed, 749 insertions(+), 236 deletions(-) + create mode 100644 arch/arm/include/asm/xen/xen-ops.h + create mode 100644 arch/arm/xen/efi.c + create mode 100644 arch/arm64/include/asm/xen/xen-ops.h + create mode 100644 drivers/xen/arm-device.c +$ git am -3 ../patches/0001-xen-efi-merge-fix-patch.patch +Applying: xen: efi: merge fix patch +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/xen/efi.c +$ git add -A . +$ git commit -v -a --amend +[master 191535302ac8] Merge remote-tracking branch 'xen-tip/linux-next' + Date: Wed May 18 11:55:18 2016 +1000 +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (f1e89a8f3358 Merge branch 'for-4.6-fixes' into for-next) +$ git merge workqueues/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (9a73a6895fc5 surfacepro3_button: Add a warning when switching to tablet mode) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/intel_telemetry_pltdrv.c +Merge made by the 'recursive' strategy. + arch/x86/include/asm/intel_telemetry.h | 2 +- + drivers/platform/x86/asus-laptop.c | 15 ++++--- + drivers/platform/x86/fujitsu-laptop.c | 63 ++++++++++++++++++++++++--- + drivers/platform/x86/ideapad-laptop.c | 1 + + drivers/platform/x86/intel_telemetry_core.c | 6 +-- + drivers/platform/x86/intel_telemetry_pltdrv.c | 2 +- + drivers/platform/x86/sony-laptop.c | 3 ++ + drivers/platform/x86/surfacepro3_button.c | 9 +++- + 8 files changed, 81 insertions(+), 20 deletions(-) +Merging chrome-platform/for-next (9e96aa70e9ac platform/chrome: chromeos_laptop - Add Elan touchpad for Wolf) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/Kconfig | 10 ++ + drivers/platform/chrome/Makefile | 15 +-- + drivers/platform/chrome/chromeos_laptop.c | 37 ++++++- + drivers/platform/chrome/chromeos_pstore.c | 55 +++++++++- + drivers/platform/chrome/cros_ec_dev.c | 7 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 10 +- + drivers/platform/chrome/cros_ec_proto.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 122 +++++++++++++++++++++++ + include/linux/mfd/cros_ec.h | 6 +- + 9 files changed, 249 insertions(+), 17 deletions(-) + create mode 100644 drivers/platform/chrome/cros_kbd_led_backlight.c +Merging hsi/for-next (c2f90a465df7 HSI: omap-ssi: move omap_ssi_port_update_fclk) +$ git merge hsi/for-next +Auto-merging drivers/hsi/controllers/omap_ssi_core.c +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/Kconfig | 8 +- + drivers/hsi/controllers/Makefile | 4 +- + drivers/hsi/controllers/omap_ssi.h | 12 ++- + .../controllers/{omap_ssi.c => omap_ssi_core.c} | 107 ++++++++++++++++++--- + drivers/hsi/controllers/omap_ssi_port.c | 100 +++++++++---------- + 5 files changed, 157 insertions(+), 74 deletions(-) + rename drivers/hsi/controllers/{omap_ssi.c => omap_ssi_core.c} (86%) +Merging leds/for-next (80d6737b27bb leds: gpio: Support the "panic-indicator" firmware property) +$ git merge leds/for-next +Already up-to-date. +Merging ipmi/for-next (a1b4e31bfabb IPMI: reserve memio regions separately) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. +Merging driver-core/driver-core-next (c6e360a0d9d2 Revert "base: dd: don't remove driver_data in -EPROBE_DEFER case") +$ git merge driver-core/driver-core-next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/kernfs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/device.h +Auto-merging fs/kernfs/inode.c +Auto-merging fs/kernfs/dir.c +Auto-merging drivers/watchdog/Kconfig +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c +Auto-merging drivers/firmware/qemu_fw_cfg.c +Auto-merging arch/x86/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + CREDITS | 1 + + Documentation/devices.txt | 86 ++-- + Documentation/isa.txt | 121 ++++++ + MAINTAINERS | 7 + + arch/x86/Kconfig | 4 +- + drivers/base/devcoredump.c | 83 +++- + drivers/firmware/qemu_fw_cfg.c | 4 +- + drivers/gpio/Kconfig | 38 +- + drivers/gpio/gpio-104-dio-48e.c | 106 ++--- + drivers/gpio/gpio-104-idi-48.c | 86 ++-- + drivers/gpio/gpio-104-idio-16.c | 85 ++-- + drivers/gpio/gpio-ws16c48.c | 88 ++--- + drivers/iio/dac/Kconfig | 2 +- + drivers/iio/dac/stx104.c | 24 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 4 +- + drivers/pnp/pnpbios/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + drivers/watchdog/ebc-c384_wdt.c | 43 +- + fs/char_dev.c | 4 + + fs/debugfs/file.c | 436 +++++++++++++++++---- + fs/debugfs/inode.c | 108 ++++- + fs/debugfs/internal.h | 26 ++ + fs/kernfs/dir.c | 8 +- + fs/kernfs/file.c | 51 +-- + fs/kernfs/inode.c | 15 +- + include/linux/debugfs.h | 49 ++- + include/linux/devcoredump.h | 86 +++- + include/linux/device.h | 7 +- + include/linux/fs.h | 2 + + include/linux/isa.h | 32 ++ + include/linux/kernfs.h | 1 + + lib/Kconfig.debug | 1 + + .../api/debugfs/debugfs_simple_attr.cocci | 67 ++++ + 33 files changed, 1160 insertions(+), 519 deletions(-) + create mode 100644 Documentation/isa.txt + create mode 100644 fs/debugfs/internal.h + create mode 100644 scripts/coccinelle/api/debugfs/debugfs_simple_attr.cocci +Merging tty/tty-next (d20bb59af646 MAINTAINERS: 8250: remove website reference) +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/Makefile' using previous resolution. +Resolved 'include/uapi/linux/serial_core.h' using previous resolution. +Auto-merging include/uapi/linux/serial_core.h +CONFLICT (content): Merge conflict in include/uapi/linux/serial_core.h +Auto-merging include/linux/tty.h +Auto-merging include/linux/console.h +Auto-merging drivers/tty/synclinkmp.c +Auto-merging drivers/tty/synclink_gt.c +Auto-merging drivers/tty/synclink.c +Auto-merging drivers/tty/serial/serial_mctrl_gpio.h +Auto-merging drivers/tty/serial/Makefile +CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/8250/8250_pci.c +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/s390/char/tty3270.c +Auto-merging drivers/char/pcmcia/synclink_cs.c +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 69bf2b19c358] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/serial/arm,mps2-uart.txt | 19 + + .../devicetree/bindings/serial/fsl-imx-uart.txt | 4 +- + .../devicetree/bindings/serial/fsl-mxs-auart.txt | 16 +- + .../devicetree/bindings/serial/serial.txt | 57 ++ + .../devicetree/bindings/serial/sirf-uart.txt | 8 +- + Documentation/kernel-parameters.txt | 6 + + Documentation/serial/tty.txt | 3 - + MAINTAINERS | 1 - + arch/ia64/hp/sim/simserial.c | 2 +- + arch/mips/ath79/early_printk.c | 6 +- + drivers/char/pcmcia/synclink_cs.c | 29 +- + drivers/ipack/devices/ipoctal.c | 5 +- + drivers/isdn/i4l/isdn_tty.c | 44 +- + drivers/mmc/card/sdio_uart.c | 2 +- + drivers/net/usb/hso.c | 2 +- + drivers/s390/char/con3215.c | 22 +- + drivers/s390/char/tty3270.c | 4 +- + drivers/staging/dgnc/dgnc_tty.c | 2 +- + drivers/staging/fwserial/fwserial.c | 2 +- + drivers/staging/speakup/selection.c | 2 +- + drivers/tty/amiserial.c | 39 +- + drivers/tty/cyclades.c | 38 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvcs.c | 2 +- + drivers/tty/hvc/hvsi.c | 2 +- + drivers/tty/ipwireless/hardware.c | 5 + + drivers/tty/isicom.c | 19 +- + drivers/tty/moxa.c | 12 +- + drivers/tty/mxser.c | 35 +- + drivers/tty/n_gsm.c | 12 +- + drivers/tty/n_hdlc.c | 4 +- + drivers/tty/n_tty.c | 70 ++- + drivers/tty/nozomi.c | 2 +- + drivers/tty/pty.c | 6 +- + drivers/tty/rocket.c | 16 +- + drivers/tty/serial/8250/8250.h | 15 +- + drivers/tty/serial/8250/8250_core.c | 3 + + drivers/tty/serial/8250/8250_dma.c | 68 ++- + drivers/tty/serial/8250/8250_dw.c | 8 +- + drivers/tty/serial/8250/8250_fintek.c | 118 +--- + drivers/tty/serial/8250/8250_mid.c | 44 +- + drivers/tty/serial/8250/8250_of.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 93 ++- + drivers/tty/serial/8250/8250_pci.c | 15 + + drivers/tty/serial/8250/8250_port.c | 38 +- + drivers/tty/serial/8250/8250_uniphier.c | 2 +- + drivers/tty/serial/8250/Kconfig | 24 +- + drivers/tty/serial/8250/Makefile | 2 +- + drivers/tty/serial/Kconfig | 20 +- + drivers/tty/serial/Makefile | 1 + + drivers/tty/serial/amba-pl011.c | 1 + + drivers/tty/serial/atmel_serial.c | 14 +- + drivers/tty/serial/crisv10.c | 30 +- + drivers/tty/serial/ifx6x60.c | 2 +- + drivers/tty/serial/imx.c | 174 ++++-- + drivers/tty/serial/meson_uart.c | 42 +- + drivers/tty/serial/mps2-uart.c | 625 ++++++++++++++++++++ + drivers/tty/serial/msm_serial.c | 101 ++-- + drivers/tty/serial/mvebu-uart.c | 29 +- + drivers/tty/serial/mxs-auart.c | 644 +++++++++++++++++---- + drivers/tty/serial/samsung.c | 4 +- + drivers/tty/serial/sc16is7xx.c | 13 +- + drivers/tty/serial/serial-tegra.c | 2 - + drivers/tty/serial/serial_core.c | 430 +++++++++----- + drivers/tty/serial/serial_mctrl_gpio.c | 7 +- + drivers/tty/serial/serial_mctrl_gpio.h | 2 - + drivers/tty/serial/sirfsoc_uart.c | 39 +- + drivers/tty/serial/uartlite.c | 12 +- + drivers/tty/serial/ucc_uart.c | 3 + + drivers/tty/synclink.c | 74 +-- + drivers/tty/synclink_gt.c | 41 +- + drivers/tty/synclinkmp.c | 41 +- + drivers/tty/tty_buffer.c | 34 +- + drivers/tty/tty_io.c | 9 +- + drivers/tty/tty_ioctl.c | 4 +- + drivers/tty/tty_port.c | 27 +- + drivers/tty/vt/selection.c | 2 +- + drivers/tty/vt/vt.c | 115 ++-- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/gadget/function/u_serial.c | 4 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/usb/serial/console.c | 4 +- + drivers/usb/serial/digi_acceleport.c | 3 +- + drivers/usb/serial/generic.c | 6 +- + drivers/usb/serial/mxuport.c | 6 +- + drivers/usb/serial/sierra.c | 4 +- + drivers/usb/serial/usb-serial.c | 2 +- + drivers/usb/serial/usb_wwan.c | 4 +- + drivers/video/console/fbcon.c | 4 +- + drivers/video/console/mdacon.c | 2 +- + drivers/video/console/newport_con.c | 2 +- + drivers/video/console/sticon.c | 2 +- + drivers/video/console/vgacon.c | 5 +- + include/linux/console.h | 2 +- + include/linux/selection.h | 8 +- + include/linux/serial_8250.h | 2 + + include/linux/serial_core.h | 3 + + include/linux/tty.h | 89 ++- + include/uapi/linux/serial_core.h | 5 +- + include/uapi/linux/tty_flags.h | 13 +- + include/uapi/linux/vt.h | 1 - + net/irda/ircomm/ircomm_tty.c | 31 +- + net/irda/ircomm/ircomm_tty_attach.c | 2 +- + net/irda/ircomm/ircomm_tty_ioctl.c | 18 +- + 104 files changed, 2529 insertions(+), 1175 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/arm,mps2-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/serial.txt + create mode 100644 drivers/tty/serial/mps2-uart.c +Merging usb/usb-next (60d5794fe5a5 Merge tag 'usb-serial-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next) +$ git merge usb/usb-next +Auto-merging drivers/usb/serial/usb-serial.c +Auto-merging drivers/usb/serial/mxuport.c +Auto-merging drivers/usb/host/Kconfig +Removing drivers/phy/phy-brcmstb-sata.c +Auto-merging drivers/phy/Makefile +Auto-merging drivers/phy/Kconfig +Auto-merging Documentation/devicetree/bindings/phy/brcm-sata-phy.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-usbip-vudc | 35 ++ + .../devicetree/bindings/phy/bcm-ns-usb2-phy.txt | 21 + + ...brcm,brcmstb-sata-phy.txt => brcm-sata-phy.txt} | 15 +- + .../devicetree/bindings/phy/phy-mt65xx-usb.txt | 4 +- + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 8 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 12 +- + .../devicetree/bindings/phy/samsung-phy.txt | 18 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 6 +- + .../devicetree/bindings/usb/qcom,dwc3.txt | 1 - + Documentation/usb/chipidea.txt | 13 +- + drivers/phy/Kconfig | 33 +- + drivers/phy/Makefile | 3 +- + drivers/phy/phy-bcm-ns-usb2.c | 137 +++++ + drivers/phy/phy-brcm-sata.c | 412 +++++++++++++ + drivers/phy/phy-brcmstb-sata.c | 250 -------- + drivers/phy/phy-exynos-mipi-video.c | 321 ++++++++-- + drivers/phy/phy-mt65xx-usb3.c | 77 ++- + drivers/phy/phy-rcar-gen2.c | 1 + + drivers/phy/phy-rcar-gen3-usb2.c | 88 ++- + drivers/phy/phy-rockchip-usb.c | 2 +- + drivers/usb/Kconfig | 3 +- + drivers/usb/atm/ueagle-atm.c | 10 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 4 - + drivers/usb/common/usb-otg-fsm.c | 10 +- + drivers/usb/core/buffer.c | 3 + + drivers/usb/core/devio.c | 11 +- + drivers/usb/core/driver.c | 40 +- + drivers/usb/core/hcd.c | 16 +- + drivers/usb/core/hub.c | 10 +- + drivers/usb/core/message.c | 48 +- + drivers/usb/core/usb.c | 1 - + drivers/usb/dwc2/gadget.c | 8 +- + drivers/usb/dwc2/hcd.c | 1 + + drivers/usb/dwc2/hcd.h | 1 + + drivers/usb/dwc2/hcd_queue.c | 3 +- + drivers/usb/dwc2/platform.c | 2 +- + drivers/usb/dwc3/core.c | 118 ++-- + drivers/usb/dwc3/core.h | 84 ++- + drivers/usb/dwc3/debug.h | 6 +- + drivers/usb/dwc3/debugfs.c | 358 +++++++++-- + drivers/usb/dwc3/dwc3-omap.c | 9 - + drivers/usb/dwc3/dwc3-pci.c | 18 +- + drivers/usb/dwc3/ep0.c | 43 +- + drivers/usb/dwc3/gadget.c | 427 +++++++------ + drivers/usb/dwc3/gadget.h | 6 +- + drivers/usb/dwc3/platform_data.h | 2 +- + drivers/usb/gadget/Kconfig | 1 + + drivers/usb/gadget/composite.c | 22 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 36 +- + drivers/usb/gadget/function/f_mass_storage.h | 2 - + drivers/usb/gadget/legacy/acm_ms.c | 4 - + drivers/usb/gadget/legacy/mass_storage.c | 4 - + drivers/usb/gadget/legacy/multi.c | 12 - + drivers/usb/gadget/legacy/nokia.c | 7 - + drivers/usb/gadget/udc/at91_udc.c | 5 +- + drivers/usb/gadget/udc/pch_udc.c | 175 ++---- + drivers/usb/gadget/udc/r8a66597-udc.c | 2 +- + drivers/usb/gadget/udc/udc-core.c | 26 +- + drivers/usb/host/Kconfig | 3 +- + drivers/usb/host/bcma-hcd.c | 6 +- + drivers/usb/host/ehci-dbg.c | 86 ++- + drivers/usb/host/ehci-exynos.c | 2 +- + drivers/usb/host/ehci-msm.c | 2 +- + drivers/usb/host/ehci-omap.c | 2 +- + drivers/usb/host/ehci-spear.c | 2 +- + drivers/usb/host/fhci-sched.c | 2 +- + drivers/usb/host/fotg210-hcd.c | 8 +- + drivers/usb/host/whci/hcd.c | 7 +- + drivers/usb/host/whci/qset.c | 8 +- + drivers/usb/host/xhci-mvebu.c | 7 +- + drivers/usb/host/xhci-mvebu.h | 7 +- + drivers/usb/host/xhci-plat.c | 60 +- + drivers/usb/host/xhci-plat.h | 20 +- + drivers/usb/host/xhci-rcar.c | 34 +- + drivers/usb/host/xhci-ring.c | 478 +++++---------- + drivers/usb/host/xhci.c | 41 -- + drivers/usb/host/xhci.h | 14 + + drivers/usb/isp1760/isp1760-if.c | 2 +- + drivers/usb/misc/Kconfig | 26 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/sisusbvga/sisusb.c | 4 +- + drivers/usb/misc/ucsi.c | 478 +++++++++++++++ + drivers/usb/misc/ucsi.h | 215 +++++++ + drivers/usb/misc/usbtest.c | 7 +- + drivers/usb/phy/phy-qcom-8x16-usb.c | 5 +- + drivers/usb/phy/phy-twl6030-usb.c | 10 +- + drivers/usb/renesas_usbhs/fifo.c | 16 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 9 +- + drivers/usb/renesas_usbhs/mod_host.c | 3 +- + drivers/usb/renesas_usbhs/pipe.c | 30 +- + drivers/usb/renesas_usbhs/pipe.h | 6 +- + drivers/usb/serial/cp210x.c | 102 +++- + drivers/usb/serial/ftdi_sio.c | 16 +- + drivers/usb/serial/io_edgeport.c | 56 +- + drivers/usb/serial/keyspan.c | 72 ++- + drivers/usb/serial/mxuport.c | 10 + + drivers/usb/serial/quatech2.c | 1 + + drivers/usb/serial/ti_usb_3410_5052.c | 55 +- + drivers/usb/serial/ti_usb_3410_5052.h | 8 + + drivers/usb/serial/usb-serial.c | 5 +- + drivers/usb/storage/alauda.c | 22 +- + drivers/usb/storage/cypress_atacb.c | 34 +- + drivers/usb/storage/datafab.c | 22 +- + drivers/usb/storage/debug.c | 3 +- + drivers/usb/storage/debug.h | 3 +- + drivers/usb/storage/ene_ub6250.c | 25 +- + drivers/usb/storage/freecom.c | 75 ++- + drivers/usb/storage/initializers.c | 15 +- + drivers/usb/storage/initializers.h | 15 +- + drivers/usb/storage/isd200.c | 51 +- + drivers/usb/storage/jumpshot.c | 22 +- + drivers/usb/storage/karma.c | 3 +- + drivers/usb/storage/option_ms.c | 6 +- + drivers/usb/storage/protocol.c | 12 +- + drivers/usb/storage/protocol.h | 3 +- + drivers/usb/storage/realtek_cr.c | 12 +- + drivers/usb/storage/scsiglue.c | 169 ++++-- + drivers/usb/storage/scsiglue.h | 3 +- + drivers/usb/storage/sddr09.c | 82 ++- + drivers/usb/storage/sddr55.c | 45 +- + drivers/usb/storage/shuttle_usbat.c | 16 +- + drivers/usb/storage/sierra_ms.c | 3 +- + drivers/usb/storage/transport.c | 165 +++-- + drivers/usb/storage/transport.h | 3 +- + drivers/usb/storage/uas.c | 3 +- + drivers/usb/storage/unusual_alauda.h | 3 +- + drivers/usb/storage/unusual_cypress.h | 3 +- + drivers/usb/storage/unusual_datafab.h | 6 +- + drivers/usb/storage/unusual_devs.h | 334 +++++++---- + drivers/usb/storage/unusual_freecom.h | 3 +- + drivers/usb/storage/unusual_isd200.h | 3 +- + drivers/usb/storage/unusual_jumpshot.h | 3 +- + drivers/usb/storage/unusual_karma.h | 3 +- + drivers/usb/storage/unusual_onetouch.h | 6 +- + drivers/usb/storage/unusual_realtek.h | 3 +- + drivers/usb/storage/unusual_sddr09.h | 3 +- + drivers/usb/storage/unusual_sddr55.h | 3 +- + drivers/usb/storage/unusual_uas.h | 3 +- + drivers/usb/storage/unusual_usbat.h | 3 +- + drivers/usb/storage/usb.c | 98 +-- + drivers/usb/storage/usb.h | 14 +- + drivers/usb/storage/usual-tables.c | 3 +- + drivers/usb/usbip/Kconfig | 17 +- + drivers/usb/usbip/Makefile | 3 + + drivers/usb/usbip/stub.h | 1 - + drivers/usb/usbip/stub_dev.c | 7 +- + drivers/usb/usbip/stub_rx.c | 19 +- + drivers/usb/usbip/stub_tx.c | 11 +- + drivers/usb/usbip/usbip_common.c | 17 +- + drivers/usb/usbip/usbip_common.h | 14 +- + drivers/usb/usbip/usbip_event.c | 168 ++++-- + drivers/usb/usbip/vudc.h | 190 ++++++ + drivers/usb/usbip/vudc_dev.c | 661 +++++++++++++++++++++ + drivers/usb/usbip/vudc_main.c | 113 ++++ + drivers/usb/usbip/vudc_rx.c | 234 ++++++++ + drivers/usb/usbip/vudc_sysfs.c | 229 +++++++ + drivers/usb/usbip/vudc_transfer.c | 506 ++++++++++++++++ + drivers/usb/usbip/vudc_tx.c | 289 +++++++++ + drivers/usb/wusbcore/crypto.c | 6 +- + drivers/usb/wusbcore/devconnect.c | 1 - + include/linux/bcma/bcma.h | 1 + + include/linux/bcma/bcma_driver_arm_c9.h | 15 + + include/linux/mfd/syscon/exynos5-pmu.h | 3 + + include/linux/usb.h | 11 +- + include/linux/usb/gadget.h | 4 + + include/linux/usb/hcd.h | 1 + + include/linux/usb/otg-fsm.h | 91 ++- + include/uapi/linux/usb/ch9.h | 121 ++++ + tools/usb/usbip/libsrc/Makefile.am | 4 +- + tools/usb/usbip/libsrc/usbip_common.h | 3 + + tools/usb/usbip/libsrc/usbip_device_driver.c | 163 +++++ + tools/usb/usbip/libsrc/usbip_device_driver.h | 34 ++ + tools/usb/usbip/libsrc/usbip_host_common.c | 273 +++++++++ + tools/usb/usbip/libsrc/usbip_host_common.h | 104 ++++ + tools/usb/usbip/libsrc/usbip_host_driver.c | 269 +-------- + tools/usb/usbip/libsrc/usbip_host_driver.h | 27 +- + tools/usb/usbip/src/usbip_attach.c | 10 +- + tools/usb/usbip/src/usbip_list.c | 96 ++- + tools/usb/usbip/src/usbip_port.c | 13 +- + tools/usb/usbip/src/usbipd.c | 42 +- + 181 files changed, 7482 insertions(+), 2518 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-usbip-vudc + create mode 100644 Documentation/devicetree/bindings/phy/bcm-ns-usb2-phy.txt + rename Documentation/devicetree/bindings/phy/{brcm,brcmstb-sata-phy.txt => brcm-sata-phy.txt} (69%) + create mode 100644 drivers/phy/phy-bcm-ns-usb2.c + create mode 100644 drivers/phy/phy-brcm-sata.c + delete mode 100644 drivers/phy/phy-brcmstb-sata.c + create mode 100644 drivers/usb/misc/ucsi.c + create mode 100644 drivers/usb/misc/ucsi.h + create mode 100644 drivers/usb/usbip/vudc.h + create mode 100644 drivers/usb/usbip/vudc_dev.c + create mode 100644 drivers/usb/usbip/vudc_main.c + create mode 100644 drivers/usb/usbip/vudc_rx.c + create mode 100644 drivers/usb/usbip/vudc_sysfs.c + create mode 100644 drivers/usb/usbip/vudc_transfer.c + create mode 100644 drivers/usb/usbip/vudc_tx.c + create mode 100644 include/linux/bcma/bcma_driver_arm_c9.h + create mode 100644 tools/usb/usbip/libsrc/usbip_device_driver.c + create mode 100644 tools/usb/usbip/libsrc/usbip_device_driver.h + create mode 100644 tools/usb/usbip/libsrc/usbip_host_common.c + create mode 100644 tools/usb/usbip/libsrc/usbip_host_common.h +Merging usb-gadget/next (2a58f9c12bb3 usb: dwc3: gadget: disable automatic calculation of ACK TP NUMP) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (b923c6c62981 USB: serial: ti_usb_3410_5052: add MOXA UPORT 11x0 support) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (764763f0a0c8 doc: usb: chipidea: update the doc for OTG FSM) +$ git merge usb-chipidea-next/ci-for-usb-next +Already up-to-date. +Merging staging/staging-next (ffc83a79b44e Staging: emxx_udc: emxx_udc: fixed coding style issue) +$ git merge staging/staging-next +Resolved 'drivers/staging/lustre/lustre/llite/rw26.c' using previous resolution. +Auto-merging include/uapi/linux/sync_file.h +Auto-merging include/linux/sched.h +Auto-merging drivers/staging/wlan-ng/p80211netdev.c +Auto-merging drivers/staging/wlan-ng/cfg80211.c +Auto-merging drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +Auto-merging drivers/staging/vt6656/main_usb.c +Auto-merging drivers/staging/unisys/visorbus/visorchipset.c +Removing drivers/staging/unisys/Documentation/proc-entries.txt +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Auto-merging drivers/staging/lustre/lustre/llite/xattr.c +Auto-merging drivers/staging/lustre/lustre/llite/rw26.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/rw26.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/lustre/lustre/llite/lcommon_misc.c +Auto-merging drivers/staging/lustre/lustre/llite/glimpse.c +Auto-merging drivers/staging/lustre/lustre/llite/dir.c +Removing drivers/staging/lustre/lustre/lclient/lcommon_cl.c +Removing drivers/staging/lustre/lustre/include/linux/obd.h +Removing drivers/staging/lustre/lustre/include/lclient.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h +Removing drivers/staging/iio/impedance-analyzer/ad5933.h +Removing drivers/staging/iio/accel/adis16220_core.c +Removing drivers/staging/iio/accel/adis16220.h +Removing drivers/staging/iio/accel/adis16204_core.c +Removing drivers/staging/iio/accel/adis16204.h +Auto-merging drivers/staging/fwserial/fwserial.c +Auto-merging drivers/staging/dgnc/dgnc_tty.c +Removing drivers/staging/comedi/drivers/ni_mio_c_common.c +Removing drivers/staging/android/timed_output.h +Removing drivers/staging/android/timed_output.c +Removing drivers/staging/android/timed_gpio.h +Removing drivers/staging/android/timed_gpio.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c +Auto-merging drivers/iio/imu/inv_mpu6050/inv_mpu_core.c +Auto-merging drivers/iio/dac/Kconfig +Auto-merging drivers/gpu/drm/msm/msm_gem_submit.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/DocBook/device-drivers.tmpl +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3265f188ab22] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 68 +- + Documentation/DocBook/device-drivers.tmpl | 2 + + .../devicetree/bindings/iio/accel/mma8452.txt | 3 +- + .../devicetree/bindings/iio/adc/lpc1850-adc.txt | 21 + + .../bindings/{staging => }/iio/adc/mxs-lradc.txt | 0 + .../bindings/iio/adc/rockchip-saradc.txt | 6 +- + .../devicetree/bindings/iio/dac/ad5592r.txt | 155 ++ + .../devicetree/bindings/iio/dac/lpc1850-dac.txt | 20 + + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 13 + + .../bindings/iio/magnetometer/ak8975.txt | 12 + + .../bindings/iio/potentiometer/ds1803.txt | 21 + + .../bindings/iio/potentiometer/mcp4131.txt | 84 + + .../devicetree/bindings/iio/pressure/hp03.txt | 17 + + .../devicetree/bindings/iio/pressure/ms5611.txt | 19 + + .../devicetree/bindings/iio/st-sensors.txt | 6 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/driver-model/devres.txt | 4 + + Documentation/sync_file.txt | 69 + + MAINTAINERS | 12 +- + drivers/Kconfig | 2 + + drivers/dma-buf/Kconfig | 11 + + drivers/dma-buf/Makefile | 1 + + drivers/dma-buf/sync_file.c | 395 ++++ + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 11 +- + drivers/gpu/drm/i915/i915_drv.h | 5 - + drivers/gpu/drm/i915/i915_gem.c | 14 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 14 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 11 +- + drivers/iio/accel/Kconfig | 5 +- + drivers/iio/accel/bmc150-accel-core.c | 127 +- + drivers/iio/accel/bmc150-accel-i2c.c | 7 +- + drivers/iio/accel/bmc150-accel-spi.c | 8 +- + drivers/iio/accel/bmc150-accel.h | 1 + + drivers/iio/accel/kxcjk-1013.c | 25 +- + drivers/iio/accel/mma7455_core.c | 5 +- + drivers/iio/accel/mma8452.c | 188 +- + drivers/iio/accel/mma9553.c | 1 - + drivers/iio/accel/mxc4005.c | 29 - + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 105 + + drivers/iio/accel/st_accel_i2c.c | 4 + + drivers/iio/accel/stk8312.c | 1 - + drivers/iio/accel/stk8ba50.c | 1 - + drivers/iio/adc/Kconfig | 16 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/ad799x.c | 2 +- + drivers/iio/adc/at91-sama5d2_adc.c | 102 +- + drivers/iio/adc/at91_adc.c | 8 +- + drivers/iio/adc/ina2xx-adc.c | 43 +- + drivers/iio/adc/lpc18xx_adc.c | 231 +++ + drivers/iio/adc/mcp3422.c | 6 +- + drivers/iio/adc/mxs-lradc.c | 37 +- + drivers/iio/adc/rockchip_saradc.c | 19 + + drivers/iio/adc/ti-adc081c.c | 118 +- + drivers/iio/adc/vf610_adc.c | 24 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 2 +- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 2 +- + drivers/iio/common/st_sensors/st_sensors_buffer.c | 97 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 20 + + drivers/iio/common/st_sensors/st_sensors_trigger.c | 13 + + drivers/iio/dac/Kconfig | 37 + + drivers/iio/dac/Makefile | 4 + + drivers/iio/dac/ad5592r-base.c | 691 +++++++ + drivers/iio/dac/ad5592r-base.h | 76 + + drivers/iio/dac/ad5592r.c | 164 ++ + drivers/iio/dac/ad5593r.c | 131 ++ + drivers/iio/dac/lpc18xx_dac.c | 210 ++ + drivers/iio/frequency/ad9523.c | 19 +- + drivers/iio/gyro/Kconfig | 2 +- + drivers/iio/gyro/bmg160_core.c | 137 +- + drivers/iio/gyro/st_gyro.h | 1 + + drivers/iio/gyro/st_gyro_core.c | 4 + + drivers/iio/gyro/st_gyro_i2c.c | 5 + + drivers/iio/gyro/st_gyro_spi.c | 1 + + drivers/iio/humidity/Kconfig | 10 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/am2315.c | 303 +++ + drivers/iio/humidity/dht11.c | 40 +- + drivers/iio/imu/Kconfig | 2 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/adis.c | 7 +- + drivers/iio/imu/bmi160/Kconfig | 32 + + drivers/iio/imu/bmi160/Makefile | 6 + + drivers/iio/imu/bmi160/bmi160.h | 10 + + drivers/iio/imu/bmi160/bmi160_core.c | 596 ++++++ + drivers/iio/imu/bmi160/bmi160_i2c.c | 72 + + drivers/iio/imu/bmi160/bmi160_spi.c | 63 + + drivers/iio/imu/inv_mpu6050/Kconfig | 10 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 73 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 3 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 16 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 20 +- + drivers/iio/imu/kmx61.c | 1 - + drivers/iio/industrialio-core.c | 123 ++ + drivers/iio/inkern.c | 86 +- + drivers/iio/light/Kconfig | 32 + + drivers/iio/light/Makefile | 3 + + drivers/iio/light/apds9960.c | 13 +- + drivers/iio/light/bh1780.c | 297 +++ + drivers/iio/light/max44000.c | 639 ++++++ + drivers/iio/light/stk3310.c | 1 - + drivers/iio/light/tsl2563.c | 3 +- + drivers/iio/light/veml6070.c | 218 ++ + drivers/iio/magnetometer/Kconfig | 33 +- + drivers/iio/magnetometer/Makefile | 3 + + drivers/iio/magnetometer/ak8975.c | 232 ++- + drivers/iio/magnetometer/bmc150_magn.c | 156 +- + drivers/iio/magnetometer/bmc150_magn.h | 11 + + drivers/iio/magnetometer/bmc150_magn_i2c.c | 77 + + drivers/iio/magnetometer/bmc150_magn_spi.c | 68 + + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/potentiometer/Kconfig | 28 + + drivers/iio/potentiometer/Makefile | 2 + + drivers/iio/potentiometer/ds1803.c | 173 ++ + drivers/iio/potentiometer/mcp4131.c | 494 +++++ + drivers/iio/potentiometer/mcp4531.c | 13 +- + drivers/iio/potentiometer/tpl0102.c | 2 +- + drivers/iio/pressure/Kconfig | 28 +- + drivers/iio/pressure/Makefile | 2 + + drivers/iio/pressure/bmp280.c | 564 ++++- + drivers/iio/pressure/hp03.c | 312 +++ + drivers/iio/pressure/hp206c.c | 426 ++++ + drivers/iio/pressure/ms5611.h | 23 +- + drivers/iio/pressure/ms5611_core.c | 148 +- + drivers/iio/pressure/ms5611_i2c.c | 25 +- + drivers/iio/pressure/ms5611_spi.c | 34 +- + drivers/iio/pressure/st_pressure_core.c | 10 + + drivers/staging/android/Kconfig | 17 +- + drivers/staging/android/Makefile | 2 - + drivers/staging/android/ion/ion.c | 16 +- + drivers/staging/android/ion/ion_chunk_heap.c | 4 +- + drivers/staging/android/ion/ion_dummy_driver.c | 2 + + drivers/staging/android/ion/ion_test.c | 2 +- + drivers/staging/android/lowmemorykiller.c | 9 +- + drivers/staging/android/sync.c | 356 ---- + drivers/staging/android/sync.h | 91 +- + drivers/staging/android/sync_debug.c | 8 +- + drivers/staging/android/timed_gpio.c | 166 -- + drivers/staging/android/timed_gpio.h | 33 - + drivers/staging/android/timed_output.c | 110 - + drivers/staging/android/timed_output.h | 37 - + drivers/staging/board/armadillo800eva.c | 8 +- + drivers/staging/comedi/comedi_buf.c | 10 +- + drivers/staging/comedi/comedi_fops.c | 54 +- + drivers/staging/comedi/comedidev.h | 4 +- + drivers/staging/comedi/drivers.c | 40 +- + drivers/staging/comedi/drivers/amcc_s5933.h | 24 +- + .../staging/comedi/drivers/amplc_dio200_common.c | 12 +- + drivers/staging/comedi/drivers/amplc_pc263.c | 104 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 71 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 189 +- + drivers/staging/comedi/drivers/amplc_pci263.c | 86 +- + drivers/staging/comedi/drivers/c6xdigio.c | 4 +- + drivers/staging/comedi/drivers/comedi_8254.h | 14 +- + drivers/staging/comedi/drivers/das1800.c | 1385 ++++++------- + drivers/staging/comedi/drivers/dt282x.c | 119 +- + drivers/staging/comedi/drivers/mite.c | 1113 ++++++---- + drivers/staging/comedi/drivers/mite.h | 329 +-- + drivers/staging/comedi/drivers/ni_660x.c | 1174 ++++------- + drivers/staging/comedi/drivers/ni_labpc.h | 33 +- + drivers/staging/comedi/drivers/ni_labpc_common.c | 65 +- + drivers/staging/comedi/drivers/ni_labpc_cs.c | 95 +- + drivers/staging/comedi/drivers/ni_labpc_pci.c | 4 +- + drivers/staging/comedi/drivers/ni_labpc_regs.h | 82 +- + drivers/staging/comedi/drivers/ni_mio_c_common.c | 0 + drivers/staging/comedi/drivers/ni_mio_common.c | 981 ++++----- + drivers/staging/comedi/drivers/ni_pcidio.c | 37 +- + drivers/staging/comedi/drivers/ni_pcimio.c | 36 +- + drivers/staging/comedi/drivers/ni_stc.h | 56 +- + drivers/staging/comedi/drivers/ni_tio.c | 807 +++++--- + drivers/staging/comedi/drivers/ni_tio.h | 66 +- + drivers/staging/comedi/drivers/ni_tio_internal.h | 322 ++- + drivers/staging/comedi/drivers/ni_tiocmd.c | 127 +- + drivers/staging/comedi/drivers/plx9052.h | 122 +- + drivers/staging/comedi/drivers/plx9080.h | 2 +- + drivers/staging/comedi/drivers/z8536.h | 89 +- + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/dgnc/dgnc_driver.c | 52 +- + drivers/staging/dgnc/dgnc_driver.h | 23 +- + drivers/staging/dgnc/dgnc_mgmt.c | 28 +- + drivers/staging/dgnc/dgnc_neo.c | 131 +- + drivers/staging/dgnc/dgnc_sysfs.c | 22 +- + drivers/staging/dgnc/dgnc_tty.c | 277 ++- + drivers/staging/dgnc/digi.h | 4 +- + drivers/staging/emxx_udc/emxx_udc.c | 24 +- + drivers/staging/emxx_udc/emxx_udc.h | 40 +- + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fbtft-io.c | 8 +- + drivers/staging/fbtft/fbtft_device.c | 6 +- + drivers/staging/fsl-mc/README.txt | 138 +- + drivers/staging/fsl-mc/TODO | 13 - + drivers/staging/fsl-mc/bus/dpbp.c | 77 +- + drivers/staging/fsl-mc/bus/dpmcp-cmd.h | 7 +- + drivers/staging/fsl-mc/bus/dpmcp.c | 35 +- + drivers/staging/fsl-mc/bus/dpmcp.h | 10 +- + drivers/staging/fsl-mc/bus/dprc-cmd.h | 6 +- + drivers/staging/fsl-mc/bus/dprc-driver.c | 33 +- + drivers/staging/fsl-mc/bus/dprc.c | 26 +- + drivers/staging/fsl-mc/bus/mc-allocator.c | 79 +- + drivers/staging/fsl-mc/bus/mc-bus.c | 90 +- + drivers/staging/fsl-mc/bus/mc-msi.c | 14 +- + drivers/staging/fsl-mc/include/dpbp-cmd.h | 4 +- + drivers/staging/fsl-mc/include/dpbp.h | 51 +- + drivers/staging/fsl-mc/include/dprc.h | 19 +- + drivers/staging/fsl-mc/include/mc-private.h | 2 + + drivers/staging/fwserial/dma_fifo.c | 8 +- + drivers/staging/fwserial/dma_fifo.h | 16 +- + drivers/staging/fwserial/fwserial.c | 42 +- + drivers/staging/fwserial/fwserial.h | 42 +- + drivers/staging/gdm724x/gdm_mux.c | 5 +- + drivers/staging/gdm724x/gdm_usb.c | 6 +- + drivers/staging/gdm724x/hci_packet.h | 2 +- + drivers/staging/gdm724x/netlink_k.c | 3 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.c | 8 +- + drivers/staging/gs_fpgaboot/gs_fpgaboot.h | 2 +- + drivers/staging/gs_fpgaboot/io.c | 1 - + drivers/staging/i4l/act2000/act2000_isa.c | 24 +- + drivers/staging/i4l/pcbit/capi.h | 2 +- + drivers/staging/i4l/pcbit/drv.c | 8 +- + drivers/staging/i4l/pcbit/edss1.c | 2 +- + drivers/staging/i4l/pcbit/layer2.h | 2 +- + drivers/staging/iio/accel/Kconfig | 23 - + drivers/staging/iio/accel/Makefile | 6 - + drivers/staging/iio/accel/adis16201.h | 156 +- + drivers/staging/iio/accel/adis16201_core.c | 1 + + drivers/staging/iio/accel/adis16203.h | 132 +- + drivers/staging/iio/accel/adis16203_core.c | 1 + + drivers/staging/iio/accel/adis16204.h | 68 - + drivers/staging/iio/accel/adis16204_core.c | 253 --- + drivers/staging/iio/accel/adis16209.h | 39 + + drivers/staging/iio/accel/adis16209_core.c | 1 + + drivers/staging/iio/accel/adis16220.h | 140 -- + drivers/staging/iio/accel/adis16220_core.c | 494 ----- + drivers/staging/iio/accel/adis16240.h | 50 + + drivers/staging/iio/accel/adis16240_core.c | 5 +- + drivers/staging/iio/adc/ad7192.c | 50 +- + drivers/staging/iio/adc/ad7280a.c | 40 +- + drivers/staging/iio/adc/ad7280a.h | 8 +- + drivers/staging/iio/adc/ad7606.h | 28 +- + drivers/staging/iio/adc/ad7606_core.c | 18 +- + drivers/staging/iio/adc/ad7606_spi.c | 5 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 45 +- + drivers/staging/iio/impedance-analyzer/ad5933.h | 28 - + drivers/staging/iio/light/isl29028.c | 55 +- + drivers/staging/iio/light/tsl2x7x_core.c | 211 +- + drivers/staging/iio/meter/ade7753.c | 4 +- + drivers/staging/iio/meter/ade7754.c | 4 +- + drivers/staging/iio/meter/ade7758.h | 16 +- + drivers/staging/iio/meter/ade7758_core.c | 77 +- + drivers/staging/iio/meter/ade7758_ring.c | 4 +- + drivers/staging/iio/meter/ade7759.c | 4 +- + drivers/staging/iio/meter/ade7854.c | 3 +- + drivers/staging/iio/resolver/ad2s1210.h | 8 +- + drivers/staging/iio/trigger/iio-trig-bfin-timer.c | 15 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 51 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 79 + + .../lustre/include/linux/libcfs/libcfs_crypto.h | 136 +- + .../lustre/include/linux/libcfs/libcfs_debug.h | 18 +- + .../lustre/include/linux/libcfs/libcfs_fail.h | 15 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 4 +- + .../lustre/include/linux/libcfs/libcfs_ioctl.h | 161 +- + .../lustre/include/linux/libcfs/libcfs_prim.h | 31 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 75 - + .../lustre/include/linux/libcfs/libcfs_workitem.h | 12 +- + .../lustre/include/linux/libcfs/linux/libcfs.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 2 +- + .../lustre/include/linux/libcfs/linux/linux-mem.h | 80 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 4 +- + .../staging/lustre/include/linux/lnet/lib-dlc.h | 29 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 9 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 2 + + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 405 +++- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 134 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 98 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 139 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 1 - + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 3 - + drivers/staging/lustre/lnet/libcfs/debug.c | 126 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 3 + + drivers/staging/lustre/lnet/libcfs/hash.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 54 +- + drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 28 - + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 9 +- + .../lustre/lnet/libcfs/linux/linux-crypto.c | 283 ++- + .../lustre/lnet/libcfs/linux/linux-module.c | 154 +- + .../staging/lustre/lnet/libcfs/linux/linux-prim.c | 31 - + drivers/staging/lustre/lnet/libcfs/module.c | 132 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 17 +- + drivers/staging/lustre/lnet/libcfs/workitem.c | 12 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 143 +- + drivers/staging/lustre/lnet/lnet/config.c | 3 + + drivers/staging/lustre/lnet/lnet/lib-move.c | 10 +- + drivers/staging/lustre/lnet/lnet/module.c | 7 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 82 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 52 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 215 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 40 +- + drivers/staging/lustre/lnet/selftest/console.c | 282 +-- + drivers/staging/lustre/lnet/selftest/console.h | 47 +- + drivers/staging/lustre/lnet/selftest/framework.c | 270 +-- + drivers/staging/lustre/lnet/selftest/ping_test.c | 44 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 133 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 156 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 204 +- + drivers/staging/lustre/lnet/selftest/timer.c | 12 +- + drivers/staging/lustre/lustre/fid/fid_request.c | 12 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 3 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 9 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 94 +- + drivers/staging/lustre/lustre/include/cl_object.h | 978 ++------- + drivers/staging/lustre/lustre/include/lclient.h | 408 ---- + drivers/staging/lustre/lustre/include/linux/obd.h | 125 -- + drivers/staging/lustre/lustre/include/lu_object.h | 75 +- + .../lustre/lustre/include/lustre/lustre_idl.h | 112 +- + .../lustre/lustre/include/lustre/lustre_user.h | 54 +- + drivers/staging/lustre/lustre/include/lustre_cfg.h | 2 +- + .../staging/lustre/lustre/include/lustre_disk.h | 2 - + drivers/staging/lustre/lustre/include/lustre_dlm.h | 14 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 120 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 22 +- + .../staging/lustre/lustre/include/lustre_import.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_lib.h | 60 +- + drivers/staging/lustre/lustre/include/lustre_mdc.h | 18 + + drivers/staging/lustre/lustre/include/lustre_net.h | 4 +- + .../staging/lustre/lustre/include/lustre_param.h | 1 + + .../lustre/lustre/include/lustre_req_layout.h | 3 +- + drivers/staging/lustre/lustre/include/obd.h | 77 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 1 + + drivers/staging/lustre/lustre/include/obd_class.h | 5 +- + .../staging/lustre/lustre/include/obd_support.h | 4 + + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 1203 ----------- + drivers/staging/lustre/lustre/ldlm/l_lock.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 4 +- + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 30 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 19 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 115 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 28 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 163 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 19 +- + drivers/staging/lustre/lustre/llite/Makefile | 5 +- + drivers/staging/lustre/lustre/llite/dcache.c | 15 +- + drivers/staging/lustre/lustre/llite/dir.c | 95 +- + drivers/staging/lustre/lustre/llite/file.c | 277 +-- + .../lustre/lustre/{lclient => llite}/glimpse.c | 87 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 327 +++ + .../lustre/{lclient => llite}/lcommon_misc.c | 45 +- + drivers/staging/lustre/lustre/llite/llite_close.c | 71 +- + .../staging/lustre/lustre/llite/llite_internal.h | 266 +-- + drivers/staging/lustre/lustre/llite/llite_lib.c | 176 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 48 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 29 +- + drivers/staging/lustre/lustre/llite/lloop.c | 3 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 33 +- + drivers/staging/lustre/lustre/llite/namei.c | 143 +- + drivers/staging/lustre/lustre/llite/rw.c | 367 ++-- + drivers/staging/lustre/lustre/llite/rw26.c | 314 ++- + drivers/staging/lustre/lustre/llite/statahead.c | 17 +- + drivers/staging/lustre/lustre/llite/super25.c | 14 +- + drivers/staging/lustre/lustre/llite/symlink.c | 10 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 270 ++- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 332 ++- + drivers/staging/lustre/lustre/llite/vvp_io.c | 928 +++++---- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 53 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 141 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 211 +- + drivers/staging/lustre/lustre/llite/vvp_req.c | 121 ++ + drivers/staging/lustre/lustre/llite/xattr.c | 33 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 1 - + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 3 - + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 182 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 105 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 15 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 5 - + drivers/staging/lustre/lustre/lov/lov_internal.h | 34 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 246 +-- + drivers/staging/lustre/lustre/lov/lov_lock.c | 996 +-------- + drivers/staging/lustre/lustre/lov/lov_merge.c | 11 + + drivers/staging/lustre/lustre/lov/lov_obd.c | 26 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 54 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 12 + + drivers/staging/lustre/lustre/lov/lov_pack.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 183 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 62 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 11 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 9 +- + drivers/staging/lustre/lustre/lov/lovsub_lock.c | 386 +--- + drivers/staging/lustre/lustre/lov/lovsub_object.c | 7 +- + drivers/staging/lustre/lustre/lov/lovsub_page.c | 4 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 24 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 5 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 26 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 12 +- + drivers/staging/lustre/lustre/obdclass/cl_io.c | 430 ++-- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 2152 +------------------- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 303 ++- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 659 +----- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 5 +- + drivers/staging/lustre/lustre/obdclass/debug.c | 4 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 1 - + .../lustre/lustre/obdclass/linux/linux-module.c | 4 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 1 - + .../lustre/lustre/obdclass/lprocfs_status.c | 72 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 9 +- + .../staging/lustre/lustre/obdclass/lustre_peer.c | 3 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 26 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 15 +- + drivers/staging/lustre/lustre/obdclass/obdo.c | 3 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 173 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 68 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 531 ++++- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 159 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 27 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 283 +-- + drivers/staging/lustre/lustre/osc/osc_lock.c | 1698 ++++++--------- + drivers/staging/lustre/lustre/osc/osc_object.c | 38 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 544 +++-- + drivers/staging/lustre/lustre/osc/osc_request.c | 423 ++-- + drivers/staging/lustre/lustre/ptlrpc/client.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 1 - + drivers/staging/lustre/lustre/ptlrpc/import.c | 12 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 31 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 7 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 3 - + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 21 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 52 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 12 +- + drivers/staging/media/omap1/omap1_camera.c | 68 +- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/most/hdm-dim2/dim2_errors.h | 8 - + drivers/staging/most/hdm-dim2/dim2_hal.h | 14 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 8 - + drivers/staging/netlogic/xlr_net.c | 2 +- + drivers/staging/nvec/nvec.c | 11 +- + drivers/staging/nvec/nvec_power.c | 4 +- + drivers/staging/octeon/ethernet-rx.c | 7 +- + drivers/staging/octeon/ethernet-rx.h | 2 +- + drivers/staging/octeon/ethernet-tx.c | 15 +- + drivers/staging/octeon/ethernet.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 5 - + drivers/staging/rtl8188eu/core/rtw_cmd.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_debug.c | 5 - + drivers/staging/rtl8188eu/core/rtw_efuse.c | 7 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 5 - + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 5 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 13 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 49 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 5 - + drivers/staging/rtl8188eu/core/rtw_recv.c | 5 - + drivers/staging/rtl8188eu/core/rtw_rf.c | 5 - + drivers/staging/rtl8188eu/core/rtw_security.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sreset.c | 5 - + drivers/staging/rtl8188eu/core/rtw_sta_mgt.c | 5 - + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 5 - + drivers/staging/rtl8188eu/core/rtw_xmit.c | 5 - + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- + drivers/staging/rtl8188eu/hal/bb_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/fw.c | 4 - + drivers/staging/rtl8188eu/hal/hal_com.c | 5 - + drivers/staging/rtl8188eu/hal/hal_intf.c | 7 +- + drivers/staging/rtl8188eu/hal/mac_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/odm.c | 5 - + drivers/staging/rtl8188eu/hal/odm_HWConfig.c | 5 - + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 - + drivers/staging/rtl8188eu/hal/phy.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseq.c | 5 - + drivers/staging/rtl8188eu/hal/pwrseqcmd.c | 4 - + drivers/staging/rtl8188eu/hal/rf.c | 4 - + drivers/staging/rtl8188eu/hal/rf_cfg.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188e_rxdesc.c | 9 +- + drivers/staging/rtl8188eu/hal/rtl8188e_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_led.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_recv.c | 5 - + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 5 - + drivers/staging/rtl8188eu/hal/usb_halinit.c | 76 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyCfg.h | 5 - + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 5 - + .../staging/rtl8188eu/include/HalHWImg8188E_FW.h | 5 - + drivers/staging/rtl8188eu/include/HalVerDef.h | 5 - + drivers/staging/rtl8188eu/include/basic_types.h | 5 - + drivers/staging/rtl8188eu/include/drv_types.h | 5 - + drivers/staging/rtl8188eu/include/fw.h | 4 - + drivers/staging/rtl8188eu/include/hal_com.h | 5 - + drivers/staging/rtl8188eu/include/hal_intf.h | 5 - + drivers/staging/rtl8188eu/include/ieee80211.h | 5 - + drivers/staging/rtl8188eu/include/mlme_osdep.h | 5 - + drivers/staging/rtl8188eu/include/mp_custom_oid.h | 5 - + drivers/staging/rtl8188eu/include/odm.h | 5 - + drivers/staging/rtl8188eu/include/odm_HWConfig.h | 4 - + drivers/staging/rtl8188eu/include/odm_RTL8188E.h | 5 - + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 5 - + drivers/staging/rtl8188eu/include/odm_debug.h | 5 - + drivers/staging/rtl8188eu/include/odm_precomp.h | 5 - + drivers/staging/rtl8188eu/include/odm_reg.h | 5 - + drivers/staging/rtl8188eu/include/odm_types.h | 5 - + drivers/staging/rtl8188eu/include/osdep_intf.h | 5 - + drivers/staging/rtl8188eu/include/osdep_service.h | 5 - + drivers/staging/rtl8188eu/include/pwrseq.h | 5 - + drivers/staging/rtl8188eu/include/pwrseqcmd.h | 5 - + drivers/staging/rtl8188eu/include/recv_osdep.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_dm.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_led.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 4 - + drivers/staging/rtl8188eu/include/rtl8188e_xmit.h | 5 - + drivers/staging/rtl8188eu/include/rtw_android.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ap.h | 5 - + drivers/staging/rtl8188eu/include/rtw_cmd.h | 5 - + drivers/staging/rtl8188eu/include/rtw_debug.h | 5 - + drivers/staging/rtl8188eu/include/rtw_eeprom.h | 5 - + drivers/staging/rtl8188eu/include/rtw_efuse.h | 5 - + drivers/staging/rtl8188eu/include/rtw_event.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ht.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_rtl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_ioctl_set.h | 5 - + drivers/staging/rtl8188eu/include/rtw_iol.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme.h | 5 - + drivers/staging/rtl8188eu/include/rtw_mlme_ext.h | 5 - + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 5 - + drivers/staging/rtl8188eu/include/rtw_pwrctrl.h | 5 - + drivers/staging/rtl8188eu/include/rtw_qos.h | 5 - + drivers/staging/rtl8188eu/include/rtw_recv.h | 5 - + drivers/staging/rtl8188eu/include/rtw_rf.h | 5 - + drivers/staging/rtl8188eu/include/rtw_security.h | 5 - + drivers/staging/rtl8188eu/include/rtw_sreset.h | 5 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 5 - + drivers/staging/rtl8188eu/include/sta_info.h | 5 - + drivers/staging/rtl8188eu/include/usb_hal.h | 5 - + drivers/staging/rtl8188eu/include/usb_ops_linux.h | 5 - + drivers/staging/rtl8188eu/include/wifi.h | 5 - + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 5 - + drivers/staging/rtl8188eu/include/xmit_osdep.h | 5 - + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 13 +- + drivers/staging/rtl8188eu/os_dep/mlme_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 5 - + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 5 - + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 5 - + drivers/staging/rtl8188eu/os_dep/rtw_android.c | 5 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 7 +- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 4 - + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 5 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 73 +- + drivers/staging/rtl8192u/r8192U_wx.c | 22 - + drivers/staging/rtl8712/basic_types.h | 4 - + drivers/staging/rtl8712/drv_types.h | 4 - + drivers/staging/rtl8712/ethernet.h | 4 - + drivers/staging/rtl8712/hal_init.c | 25 +- + drivers/staging/rtl8712/ieee80211.c | 4 - + drivers/staging/rtl8712/mlme_linux.c | 2 +- + drivers/staging/rtl8712/os_intfs.c | 4 +- + drivers/staging/rtl8712/osdep_service.h | 3 - + drivers/staging/rtl8712/rtl8712_cmd.c | 18 +- + drivers/staging/rtl8712/rtl8712_recv.c | 10 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 8 +- + drivers/staging/rtl8712/rtl871x_cmd.c | 80 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 16 +- + drivers/staging/rtl8712/rtl871x_ioctl_set.c | 6 - + drivers/staging/rtl8712/rtl871x_mlme.c | 16 +- + drivers/staging/rtl8712/rtl871x_recv.c | 2 +- + drivers/staging/rtl8712/rtl871x_sta_mgt.c | 6 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 2 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8723au/Kconfig | 7 +- + drivers/staging/rtl8723au/core/rtw_ap.c | 3 +- + drivers/staging/rtl8723au/core/rtw_recv.c | 25 - + drivers/staging/rtl8723au/core/rtw_wlan_util.c | 10 - + drivers/staging/rtl8723au/hal/rtl8723a_hal_init.c | 2 - + drivers/staging/rtl8723au/hal/rtl8723a_rf6052.c | 2 +- + drivers/staging/rtl8723au/include/rtw_mlme_ext.h | 2 - + drivers/staging/rtl8723au/include/rtw_recv.h | 2 - + drivers/staging/rtl8723au/os_dep/usb_intf.c | 5 + + drivers/staging/rts5208/ms.c | 16 +- + drivers/staging/rts5208/rtsx_card.c | 21 - + drivers/staging/rts5208/rtsx_card.h | 2 - + drivers/staging/rts5208/rtsx_chip.c | 35 - + drivers/staging/rts5208/rtsx_chip.h | 3 - + drivers/staging/rts5208/sd.c | 16 +- + drivers/staging/skein/skein_api.c | 3 +- + drivers/staging/skein/skein_base.c | 90 +- + drivers/staging/skein/skein_base.h | 45 +- + drivers/staging/skein/skein_block.c | 92 +- + drivers/staging/skein/skein_generic.c | 6 +- + drivers/staging/skein/threefish_api.h | 2 +- + drivers/staging/skein/threefish_block.c | 2144 +++++++++---------- + drivers/staging/slicoss/slicoss.c | 8 +- + drivers/staging/sm750fb/ddk750_chip.c | 2 +- + drivers/staging/speakup/main.c | 6 +- + drivers/staging/speakup/serialio.h | 3 +- + .../Documentation/ABI/sysfs-platform-visorchipset | 14 - + drivers/staging/unisys/Documentation/overview.txt | 19 - + .../staging/unisys/Documentation/proc-entries.txt | 93 - + drivers/staging/unisys/MAINTAINERS | 1 - + drivers/staging/unisys/include/channel.h | 10 +- + drivers/staging/unisys/include/iochannel.h | 42 - + drivers/staging/unisys/include/visorbus.h | 127 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 394 +--- + drivers/staging/unisys/visorbus/visorchannel.c | 5 +- + drivers/staging/unisys/visorbus/visorchipset.c | 442 ++-- + drivers/staging/unisys/visorhba/visorhba_main.c | 114 +- + drivers/staging/unisys/visorinput/visorinput.c | 24 +- + drivers/staging/unisys/visornic/visornic_main.c | 223 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 5 +- + drivers/staging/vt6655/baseband.c | 24 +- + drivers/staging/vt6655/baseband.h | 6 +- + drivers/staging/vt6655/card.c | 95 +- + drivers/staging/vt6655/card.h | 9 +- + drivers/staging/vt6655/desc.h | 3 +- + drivers/staging/vt6655/mac.c | 15 +- + drivers/staging/vt6655/srom.c | 9 +- + drivers/staging/vt6656/baseband.c | 26 +- + drivers/staging/vt6656/main_usb.c | 6 +- + drivers/staging/vt6656/wcmd.c | 8 +- + drivers/staging/wilc1000/Kconfig | 1 - + drivers/staging/wilc1000/host_interface.c | 438 ++-- + drivers/staging/wilc1000/host_interface.h | 8 +- + drivers/staging/wilc1000/linux_mon.c | 24 +- + drivers/staging/wilc1000/linux_wlan.c | 98 +- + drivers/staging/wilc1000/wilc_spi.c | 3 - + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 71 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 15 +- + drivers/staging/wilc1000/wilc_wlan.c | 53 +- + drivers/staging/wilc1000/wilc_wlan.h | 6 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 7 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 21 - + drivers/staging/wlan-ng/cfg80211.c | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 8 +- + drivers/staging/wlan-ng/p80211conv.c | 5 +- + drivers/staging/wlan-ng/p80211netdev.c | 4 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2fw.c | 28 +- + drivers/staging/wlan-ng/prism2usb.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 5 +- + drivers/staging/xgifb/vb_init.c | 16 +- + drivers/staging/xgifb/vb_setmode.c | 22 +- + drivers/staging/xgifb/vb_table.h | 135 +- + drivers/staging/xgifb/vb_util.h | 8 +- + include/dt-bindings/iio/adi,ad5592r.h | 16 + + include/linux/iio/buffer.h | 2 + + include/linux/iio/common/st_sensors.h | 9 + + include/linux/iio/consumer.h | 53 + + include/linux/iio/iio.h | 33 + + include/linux/iio/imu/adis.h | 1 + + include/linux/iio/magnetometer/ak8975.h | 16 + + include/linux/kernel.h | 7 + + include/linux/platform_data/invensense_mpu6050.h | 5 +- + include/linux/platform_data/st_sensors_pdata.h | 2 + + include/linux/sched.h | 4 + + include/linux/sync_file.h | 57 + + include/uapi/linux/iio/types.h | 2 + + .../uapi/sync.h => include/uapi/linux/sync_file.h | 44 +- + tools/iio/generic_buffer.c | 116 +- + tools/iio/iio_event_monitor.c | 18 + + tools/iio/iio_utils.h | 7 + + 668 files changed, 25475 insertions(+), 25049 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/lpc1850-adc.txt + rename Documentation/devicetree/bindings/{staging => }/iio/adc/mxs-lradc.txt (100%) + create mode 100644 Documentation/devicetree/bindings/iio/dac/ad5592r.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/lpc1850-dac.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/ds1803.txt + create mode 100644 Documentation/devicetree/bindings/iio/potentiometer/mcp4131.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/hp03.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/ms5611.txt + create mode 100644 Documentation/sync_file.txt + create mode 100644 drivers/dma-buf/Kconfig + create mode 100644 drivers/dma-buf/sync_file.c + create mode 100644 drivers/iio/adc/lpc18xx_adc.c + create mode 100644 drivers/iio/dac/ad5592r-base.c + create mode 100644 drivers/iio/dac/ad5592r-base.h + create mode 100644 drivers/iio/dac/ad5592r.c + create mode 100644 drivers/iio/dac/ad5593r.c + create mode 100644 drivers/iio/dac/lpc18xx_dac.c + create mode 100644 drivers/iio/humidity/am2315.c + create mode 100644 drivers/iio/imu/bmi160/Kconfig + create mode 100644 drivers/iio/imu/bmi160/Makefile + create mode 100644 drivers/iio/imu/bmi160/bmi160.h + create mode 100644 drivers/iio/imu/bmi160/bmi160_core.c + create mode 100644 drivers/iio/imu/bmi160/bmi160_i2c.c + create mode 100644 drivers/iio/imu/bmi160/bmi160_spi.c + create mode 100644 drivers/iio/light/bh1780.c + create mode 100644 drivers/iio/light/max44000.c + create mode 100644 drivers/iio/light/veml6070.c + create mode 100644 drivers/iio/magnetometer/bmc150_magn.h + create mode 100644 drivers/iio/magnetometer/bmc150_magn_i2c.c + create mode 100644 drivers/iio/magnetometer/bmc150_magn_spi.c + create mode 100644 drivers/iio/potentiometer/ds1803.c + create mode 100644 drivers/iio/potentiometer/mcp4131.c + create mode 100644 drivers/iio/pressure/hp03.c + create mode 100644 drivers/iio/pressure/hp206c.c + delete mode 100644 drivers/staging/android/timed_gpio.c + delete mode 100644 drivers/staging/android/timed_gpio.h + delete mode 100644 drivers/staging/android/timed_output.c + delete mode 100644 drivers/staging/android/timed_output.h + delete mode 100644 drivers/staging/comedi/drivers/ni_mio_c_common.c + delete mode 100644 drivers/staging/iio/accel/adis16204.h + delete mode 100644 drivers/staging/iio/accel/adis16204_core.c + delete mode 100644 drivers/staging/iio/accel/adis16220.h + delete mode 100644 drivers/staging/iio/accel/adis16220_core.c + delete mode 100644 drivers/staging/iio/impedance-analyzer/ad5933.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-mem.h + delete mode 100644 drivers/staging/lustre/lustre/include/lclient.h + delete mode 100644 drivers/staging/lustre/lustre/include/linux/obd.h + delete mode 100644 drivers/staging/lustre/lustre/lclient/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/glimpse.c (80%) + create mode 100644 drivers/staging/lustre/lustre/llite/lcommon_cl.c + rename drivers/staging/lustre/lustre/{lclient => llite}/lcommon_misc.c (88%) + create mode 100644 drivers/staging/lustre/lustre/llite/vvp_req.c + delete mode 100644 drivers/staging/unisys/Documentation/proc-entries.txt + create mode 100644 include/dt-bindings/iio/adi,ad5592r.h + create mode 100644 include/linux/iio/magnetometer/ak8975.h + create mode 100644 include/linux/sync_file.h + rename drivers/staging/android/uapi/sync.h => include/uapi/linux/sync_file.h (64%) +Merging char-misc/char-misc-next (725d0123dfff Merge 4.6-rc7 into char-misc-testing) +$ git merge char-misc/char-misc-next +Auto-merging drivers/pci/host/pci-hyperv.c +Auto-merging drivers/misc/eeprom/at24.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etb10 | 69 +- + .../ABI/testing/sysfs-bus-coresight-devices-etm4x | 13 + + .../ABI/testing/sysfs-bus-coresight-devices-stm | 53 + + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 77 + + Documentation/ABI/testing/sysfs-bus-mcb | 29 + + Documentation/ABI/testing/sysfs-class-stm | 10 + + .../devicetree/bindings/arm/coresight.txt | 28 + + Documentation/trace/coresight.txt | 37 +- + Documentation/w1/slaves/w1_therm | 10 +- + MAINTAINERS | 1 + + drivers/char/Kconfig | 4 +- + drivers/char/xillybus/xillybus_of.c | 11 +- + drivers/char/xillybus/xillybus_pcie.c | 10 +- + drivers/hv/channel_mgmt.c | 58 +- + drivers/hv/connection.c | 1 + + drivers/hv/hv_balloon.c | 5 +- + drivers/hv/hv_kvp.c | 31 + + drivers/hv/hyperv_vmbus.h | 23 +- + drivers/hv/ring_buffer.c | 95 +- + drivers/hv/vmbus_drv.c | 150 +- + drivers/hwtracing/coresight/Kconfig | 11 + + drivers/hwtracing/coresight/Makefile | 13 +- + drivers/hwtracing/coresight/coresight-etb10.c | 107 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 33 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 2126 +++++++++++++++++ + drivers/hwtracing/coresight/coresight-etm4x.c | 2478 +++----------------- + drivers/hwtracing/coresight/coresight-etm4x.h | 222 +- + drivers/hwtracing/coresight/coresight-funnel.c | 1 - + drivers/hwtracing/coresight/coresight-priv.h | 30 + + drivers/hwtracing/coresight/coresight-replicator.c | 1 - + drivers/hwtracing/coresight/coresight-stm.c | 920 ++++++++ + drivers/hwtracing/coresight/coresight-tmc-etf.c | 604 +++++ + drivers/hwtracing/coresight/coresight-tmc-etr.c | 329 +++ + drivers/hwtracing/coresight/coresight-tmc.c | 604 +---- + drivers/hwtracing/coresight/coresight-tmc.h | 140 ++ + drivers/hwtracing/coresight/coresight-tpiu.c | 1 - + drivers/hwtracing/coresight/coresight.c | 142 +- + drivers/hwtracing/intel_th/core.c | 29 +- + drivers/hwtracing/intel_th/intel_th.h | 6 + + drivers/hwtracing/intel_th/msu.c | 116 +- + drivers/hwtracing/intel_th/pci.c | 5 + + drivers/hwtracing/intel_th/pti.c | 6 +- + drivers/hwtracing/stm/core.c | 36 +- + drivers/hwtracing/stm/dummy_stm.c | 14 +- + drivers/hwtracing/stm/heartbeat.c | 14 +- + drivers/hwtracing/stm/policy.c | 5 +- + drivers/mcb/mcb-core.c | 99 +- + drivers/mcb/mcb-internal.h | 1 - + drivers/mcb/mcb-parse.c | 17 +- + drivers/mcb/mcb-pci.c | 23 +- + drivers/memory/of_memory.c | 2 +- + drivers/misc/eeprom/Kconfig | 2 - + drivers/misc/eeprom/at24.c | 103 +- + drivers/misc/eeprom/at25.c | 91 +- + drivers/misc/eeprom/eeprom_93xx46.c | 92 +- + drivers/misc/mei/amthif.c | 4 +- + drivers/misc/mei/bus.c | 42 +- + drivers/misc/mei/client.c | 30 +- + drivers/misc/mei/hbm.c | 26 +- + drivers/misc/mei/interrupt.c | 6 +- + drivers/misc/mei/mei_dev.h | 4 +- + drivers/misc/mic/Kconfig | 1 + + drivers/misc/mic/host/mic_boot.c | 6 +- + drivers/misc/mic/scif/scif_fence.c | 3 +- + drivers/misc/qcom-coincell.c | 3 +- + drivers/misc/sram.c | 4 +- + drivers/misc/ti-st/st_kim.c | 1 - + drivers/nvmem/Kconfig | 5 +- + drivers/nvmem/core.c | 67 +- + drivers/nvmem/imx-ocotp.c | 55 +- + drivers/nvmem/lpc18xx_eeprom.c | 94 +- + drivers/nvmem/qfprom.c | 56 +- + drivers/nvmem/rockchip-efuse.c | 49 +- + drivers/nvmem/sunxi_sid.c | 54 +- + drivers/nvmem/vf610-ocotp.c | 44 +- + drivers/parport/procfs.c | 2 +- + drivers/pci/host/pci-hyperv.c | 14 +- + drivers/spmi/spmi.c | 12 +- + drivers/uio/uio.c | 16 +- + drivers/video/fbdev/hyperv_fb.c | 4 +- + drivers/vme/bridges/vme_ca91cx42.c | 9 +- + drivers/vme/bridges/vme_tsi148.c | 9 +- + drivers/vme/vme.c | 26 +- + drivers/vme/vme_bridge.h | 1 + + drivers/w1/masters/ds2482.c | 18 + + drivers/w1/slaves/w1_therm.c | 218 +- + drivers/w1/w1.c | 2 +- + drivers/w1/w1.h | 2 + + include/linux/coresight-stm.h | 6 + + include/linux/hyperv.h | 170 +- + include/linux/mcb.h | 14 +- + include/linux/nvmem-provider.h | 10 + + include/linux/stm.h | 3 + + include/uapi/linux/coresight-stm.h | 21 + + scripts/checkkconfigsymbols.py | 2 +- + tools/hv/lsvmbus | 1 + + 96 files changed, 6448 insertions(+), 3804 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-stm + create mode 100644 Documentation/ABI/testing/sysfs-bus-mcb + create mode 100644 drivers/hwtracing/coresight/coresight-etm4x-sysfs.c + create mode 100644 drivers/hwtracing/coresight/coresight-stm.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc-etf.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc-etr.c + create mode 100644 drivers/hwtracing/coresight/coresight-tmc.h + create mode 100644 include/linux/coresight-stm.h + create mode 100644 include/uapi/linux/coresight-stm.h +Merging extcon/extcon-next (453fc627c7b5 extcon: usb-gpio: add support for ACPI gpio interface) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-usb-gpio.c | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) +Merging cgroup/for-next (a6b18f07bc86 Merge branch 'for-4.6-fixes' into for-next) +$ git merge cgroup/for-next +Merge made by the 'recursive' strategy. + Documentation/cgroup-v2.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging scsi/for-next (02714f2c73a6 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging lib/Makefile +Auto-merging drivers/usb/storage/scsiglue.c +Removing drivers/scsi/atari_NCR5380.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/scsi/g_NCR5380.txt | 17 +- + Documentation/scsi/scsi-parameters.txt | 11 +- + MAINTAINERS | 2 +- + drivers/ata/pata_icside.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 6 +- + drivers/message/fusion/mptsas.c | 4 +- + drivers/message/fusion/mptspi.c | 2 +- + drivers/s390/scsi/zfcp_unit.c | 3 +- + drivers/scsi/Kconfig | 16 +- + drivers/scsi/NCR5380.c | 657 ++++--- + drivers/scsi/NCR5380.h | 143 +- + drivers/scsi/aacraid/aachba.c | 22 - + drivers/scsi/aacraid/aacraid.h | 9 +- + drivers/scsi/aacraid/comminit.c | 43 +- + drivers/scsi/aacraid/commsup.c | 39 +- + drivers/scsi/aacraid/dpcsup.c | 7 +- + drivers/scsi/aacraid/linit.c | 4 +- + drivers/scsi/aacraid/src.c | 3 +- + drivers/scsi/arm/cumana_1.c | 25 +- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/oak.c | 22 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atari_NCR5380.c | 2676 ------------------------- + drivers/scsi/atari_scsi.c | 144 +- + drivers/scsi/bfa/bfa_fcs.h | 4 +- + drivers/scsi/bfa/bfa_fcs_fcpim.c | 5 +- + drivers/scsi/bfa/bfad_im.c | 5 +- + drivers/scsi/bnx2fc/bnx2fc.h | 3 +- + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 100 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 14 +- + drivers/scsi/bnx2i/bnx2i_iscsi.c | 4 +- + drivers/scsi/constants.c | 859 +------- + drivers/scsi/cxlflash/superpipe.c | 15 + + drivers/scsi/device_handler/scsi_dh_alua.c | 33 +- + drivers/scsi/dmx3191d.c | 10 +- + drivers/scsi/dtc.c | 27 +- + drivers/scsi/dtc.h | 7 +- + drivers/scsi/eata_pio.c | 1 + + drivers/scsi/esas2r/esas2r_main.c | 4 +- + drivers/scsi/fnic/fnic.h | 2 +- + drivers/scsi/fnic/fnic_scsi.c | 91 +- + drivers/scsi/g_NCR5380.c | 141 +- + drivers/scsi/g_NCR5380.h | 26 +- + drivers/scsi/hisi_sas/hisi_sas.h | 7 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 90 +- + drivers/scsi/hpsa.c | 187 +- + drivers/scsi/hpsa.h | 1 + + drivers/scsi/libiscsi.c | 9 +- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 26 +- + drivers/scsi/lpfc/lpfc_ct.c | 6 +- + drivers/scsi/lpfc/lpfc_els.c | 176 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 5 +- + drivers/scsi/lpfc/lpfc_hw.h | 75 +- + drivers/scsi/lpfc/lpfc_hw4.h | 29 +- + drivers/scsi/lpfc/lpfc_init.c | 27 +- + drivers/scsi/lpfc/lpfc_mbox.c | 12 +- + drivers/scsi/lpfc/lpfc_mem.c | 6 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 4 +- + drivers/scsi/lpfc/lpfc_sli.c | 140 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vport.c | 5 +- + drivers/scsi/mac_scsi.c | 241 +-- + drivers/scsi/megaraid/megaraid_sas.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 117 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 7 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 18 +- + drivers/scsi/mpt3sas/mpi/mpi2_init.h | 15 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 40 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 32 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 11 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 37 +- + drivers/scsi/mvsas/mv_init.c | 19 +- + drivers/scsi/pas16.c | 27 +- + drivers/scsi/pas16.h | 5 +- + drivers/scsi/pm8001/pm8001_init.c | 2 - + drivers/scsi/qla2xxx/qla_mr.c | 5 +- + drivers/scsi/qla2xxx/qla_nx.c | 2 +- + drivers/scsi/scsi_debug.c | 2801 ++++++++++++++------------- + drivers/scsi/scsi_lib.c | 188 +- + drivers/scsi/scsi_priv.h | 2 +- + drivers/scsi/scsi_proc.c | 3 +- + drivers/scsi/scsi_scan.c | 45 +- + drivers/scsi/scsi_sysfs.c | 9 +- + drivers/scsi/scsi_trace.c | 161 ++ + drivers/scsi/scsi_transport_fc.c | 9 +- + drivers/scsi/scsi_transport_iscsi.c | 19 +- + drivers/scsi/scsi_transport_sas.c | 7 +- + drivers/scsi/sense_codes.h | 826 ++++++++ + drivers/scsi/snic/snic.h | 5 +- + drivers/scsi/snic/snic_ctl.c | 8 +- + drivers/scsi/snic/snic_debugfs.c | 20 +- + drivers/scsi/snic/snic_disc.c | 19 +- + drivers/scsi/snic/snic_fwint.h | 4 +- + drivers/scsi/snic/snic_io.c | 62 +- + drivers/scsi/snic/snic_isr.c | 6 +- + drivers/scsi/snic/snic_main.c | 44 +- + drivers/scsi/snic/snic_scsi.c | 56 +- + drivers/scsi/snic/snic_stats.h | 12 +- + drivers/scsi/snic/vnic_dev.c | 44 +- + drivers/scsi/st.c | 9 +- + drivers/scsi/sun3_scsi.c | 47 +- + drivers/scsi/t128.c | 19 +- + drivers/scsi/t128.h | 7 +- + drivers/usb/storage/scsiglue.c | 2 +- + include/linux/scatterlist.h | 25 + + include/scsi/scsi.h | 19 - + include/scsi/scsi_device.h | 14 +- + include/scsi/scsi_host.h | 2 +- + include/scsi/scsi_proto.h | 9 + + include/trace/events/scsi.h | 6 +- + lib/Kconfig | 7 + + lib/Makefile | 1 + + lib/sg_pool.c | 172 ++ + 117 files changed, 4839 insertions(+), 6481 deletions(-) + delete mode 100644 drivers/scsi/atari_NCR5380.c + create mode 100644 drivers/scsi/sense_codes.h + create mode 100644 lib/sg_pool.c +Merging target-updates/for-next (8f0dfb3d8b11 iscsi-target: Fix early sk_data_ready LOGIN_FLAGS_READY race) +$ git merge target-updates/for-next +Auto-merging drivers/target/iscsi/iscsi_target_util.c +Merge made by the 'recursive' strategy. + Documentation/scsi/tcm_qla2xxx.txt | 22 + + Documentation/target/tcm_mod_builder.py | 16 - + drivers/infiniband/ulp/isert/ib_isert.c | 11 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 9 - + drivers/scsi/qla2xxx/Kconfig | 9 + + drivers/scsi/qla2xxx/qla_target.c | 56 +- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 59 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.h | 1 + + drivers/target/iscsi/Kconfig | 2 + + drivers/target/iscsi/Makefile | 1 + + drivers/target/iscsi/cxgbit/Kconfig | 7 + + drivers/target/iscsi/cxgbit/Makefile | 6 + + drivers/target/iscsi/cxgbit/cxgbit.h | 353 ++++ + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 2086 +++++++++++++++++++++ + drivers/target/iscsi/cxgbit/cxgbit_ddp.c | 325 ++++ + drivers/target/iscsi/cxgbit/cxgbit_lro.h | 72 + + drivers/target/iscsi/cxgbit/cxgbit_main.c | 702 +++++++ + drivers/target/iscsi/cxgbit/cxgbit_target.c | 1561 +++++++++++++++ + drivers/target/iscsi/iscsi_target.c | 701 +++---- + drivers/target/iscsi/iscsi_target_configfs.c | 158 +- + drivers/target/iscsi/iscsi_target_datain_values.c | 1 + + drivers/target/iscsi/iscsi_target_erl0.c | 2 +- + drivers/target/iscsi/iscsi_target_login.c | 17 +- + drivers/target/iscsi/iscsi_target_nego.c | 19 +- + drivers/target/iscsi/iscsi_target_parameters.c | 1 + + drivers/target/iscsi/iscsi_target_util.c | 5 + + drivers/target/loopback/tcm_loop.c | 12 - + drivers/target/sbp/sbp_target.c | 12 - + drivers/target/target_core_alua.c | 6 +- + drivers/target/target_core_configfs.c | 70 +- + drivers/target/target_core_internal.h | 6 + + drivers/target/target_core_pr.c | 2 +- + drivers/target/target_core_rd.c | 4 - + drivers/target/target_core_tpg.c | 83 +- + drivers/target/target_core_transport.c | 26 +- + drivers/target/tcm_fc/tcm_fc.h | 1 - + drivers/target/tcm_fc/tfc_conf.c | 1 - + drivers/target/tcm_fc/tfc_sess.c | 12 - + drivers/usb/gadget/function/f_tcm.c | 11 - + drivers/vhost/scsi.c | 12 - + drivers/xen/xen-scsiback.c | 11 - + include/target/iscsi/iscsi_target_core.h | 27 + + include/target/iscsi/iscsi_transport.h | 41 + + include/target/target_core_base.h | 2 - + include/target/target_core_fabric.h | 6 - + 46 files changed, 5737 insertions(+), 814 deletions(-) + create mode 100644 Documentation/scsi/tcm_qla2xxx.txt + create mode 100644 drivers/target/iscsi/cxgbit/Kconfig + create mode 100644 drivers/target/iscsi/cxgbit/Makefile + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit.h + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_cm.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_ddp.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_lro.h + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_main.c + create mode 100644 drivers/target/iscsi/cxgbit/cxgbit_target.c +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging libata/for-next (a85742332511 Merge branch 'for-4.7' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + arch/powerpc/boot/dts/canyonlands.dts | 15 +- + drivers/ata/Kconfig | 13 +- + drivers/ata/libahci.c | 4 +- + drivers/ata/libata-core.c | 237 ++++++++-- + drivers/ata/libata-eh.c | 113 ++++- + drivers/ata/libata-scsi.c | 761 +++++++++++++++++++++++++++------ + drivers/ata/libata-trace.c | 72 ++++ + drivers/ata/libata.h | 8 +- + drivers/ata/sata_dwc_460ex.c | 552 ++++++++++++------------ + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 3 + + drivers/scsi/isci/request.c | 5 +- + drivers/scsi/libsas/sas_ata.c | 7 +- + drivers/scsi/mvsas/mv_sas.c | 5 +- + drivers/scsi/pm8001/pm8001_sas.c | 5 +- + drivers/scsi/scsi_common.c | 53 +++ + drivers/scsi/scsi_error.c | 3 +- + include/linux/ata.h | 75 +++- + include/linux/libata.h | 35 +- + include/scsi/scsi_common.h | 1 + + include/scsi/scsi_eh.h | 1 + + include/trace/events/libata.h | 10 +- + 21 files changed, 1505 insertions(+), 473 deletions(-) +Merging pinctrl/for-next (58d73d264a02 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/tegra/pinctrl-tegra-xusb.c +Auto-merging Documentation/driver-model/devres.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 4 +- + Documentation/driver-model/devres.txt | 2 + + drivers/pinctrl/bcm/Kconfig | 13 + + drivers/pinctrl/bcm/Makefile | 1 + + drivers/pinctrl/bcm/pinctrl-bcm281xx.c | 6 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 16 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 4 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 14 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 1117 +++++++++++++ + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 4 +- + drivers/pinctrl/berlin/berlin.c | 5 +- + drivers/pinctrl/core.c | 63 + + drivers/pinctrl/freescale/pinctrl-imx.c | 11 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 1 - + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 11 +- + drivers/pinctrl/freescale/pinctrl-imx1.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx1.h | 1 - + drivers/pinctrl/freescale/pinctrl-imx21.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx25.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx27.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx35.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx50.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx51.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx53.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6q.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 1 - + drivers/pinctrl/freescale/pinctrl-imx7d.c | 1 - + drivers/pinctrl/freescale/pinctrl-vf610.c | 1 - + drivers/pinctrl/intel/Kconfig | 3 + + drivers/pinctrl/intel/pinctrl-baytrail.c | 1707 +++++++++++++++++--- + drivers/pinctrl/intel/pinctrl-cherryview.c | 8 +- + drivers/pinctrl/intel/pinctrl-intel.c | 8 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 21 +- + drivers/pinctrl/meson/Makefile | 2 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 432 +++++ + drivers/pinctrl/meson/pinctrl-meson.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson.h | 2 + + drivers/pinctrl/meson/pinctrl-meson8b.c | 2 +- + drivers/pinctrl/mvebu/pinctrl-armada-370.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-375.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-38x.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-39x.c | 6 - + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 6 - + drivers/pinctrl/mvebu/pinctrl-dove.c | 5 +- + drivers/pinctrl/mvebu/pinctrl-kirkwood.c | 6 - + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 9 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.h | 1 - + drivers/pinctrl/mvebu/pinctrl-orion.c | 6 - + drivers/pinctrl/nomadik/pinctrl-abx500.c | 7 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 168 +- + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-adi2.c | 13 +- + drivers/pinctrl/pinctrl-amd.c | 12 +- + drivers/pinctrl/pinctrl-as3722.c | 11 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 30 +- + drivers/pinctrl/pinctrl-at91.c | 28 +- + drivers/pinctrl/pinctrl-digicolor.c | 15 +- + drivers/pinctrl/pinctrl-lantiq.c | 2 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 5 +- + drivers/pinctrl/pinctrl-palmas.c | 14 +- + drivers/pinctrl/pinctrl-pic32.c | 5 +- + drivers/pinctrl/pinctrl-pistachio.c | 6 +- + drivers/pinctrl/pinctrl-rockchip.c | 192 ++- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinctrl-tb10x.c | 5 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 13 +- + drivers/pinctrl/pinctrl-tz1090.c | 13 +- + drivers/pinctrl/pinctrl-u300.c | 12 +- + drivers/pinctrl/pinctrl-utils.c | 4 +- + drivers/pinctrl/pinctrl-utils.h | 2 +- + drivers/pinctrl/pinctrl-zynq.c | 14 +- + drivers/pinctrl/pxa/Kconfig | 10 +- + drivers/pinctrl/pxa/Makefile | 1 + + drivers/pinctrl/pxa/pinctrl-pxa25x.c | 274 ++++ + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 10 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 9 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 9 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 11 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 11 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 17 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 3 +- + drivers/pinctrl/sh-pfc/core.c | 20 +- + drivers/pinctrl/sh-pfc/core.h | 5 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 54 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 217 +++ + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 218 ++- + drivers/pinctrl/sh-pfc/pinctrl.c | 124 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 19 +- + drivers/pinctrl/spear/pinctrl-spear.c | 11 +- + drivers/pinctrl/spear/pinctrl-spear.h | 1 - + drivers/pinctrl/spear/pinctrl-spear1310.c | 6 - + drivers/pinctrl/spear/pinctrl-spear1340.c | 6 - + drivers/pinctrl/spear/pinctrl-spear300.c | 6 - + drivers/pinctrl/spear/pinctrl-spear310.c | 6 - + drivers/pinctrl/spear/pinctrl-spear320.c | 6 - + drivers/pinctrl/stm32/pinctrl-stm32.c | 185 ++- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 13 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 15 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 36 +- + drivers/pinctrl/tegra/pinctrl-tegra.h | 8 +- + drivers/pinctrl/tegra/pinctrl-tegra114.c | 3 +- + drivers/pinctrl/tegra/pinctrl-tegra124.c | 3 +- + drivers/pinctrl/tegra/pinctrl-tegra20.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra210.c | 5 +- + drivers/pinctrl/tegra/pinctrl-tegra30.c | 3 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 14 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 1 - + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 2 - + drivers/pinctrl/vt8500/pinctrl-wmt.c | 7 +- + include/dt-bindings/gpio/meson-gxbb-gpio.h | 154 ++ + include/linux/pinctrl/pinctrl.h | 6 + + 120 files changed, 4763 insertions(+), 876 deletions(-) + create mode 100644 drivers/pinctrl/bcm/pinctrl-ns2-mux.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-gxbb.c + create mode 100644 drivers/pinctrl/pxa/pinctrl-pxa25x.c + create mode 100644 include/dt-bindings/gpio/meson-gxbb-gpio.h +Merging vhost/linux-next (e00f7bd22129 virtio: Silence uninitialized variable warning) +$ git merge vhost/linux-next +Already up-to-date. +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Merge made by the 'recursive' strategy. +Merging rpmsg/for-next (0259cd1b6496 Merge remote-tracking branches 'remoteproc/rpmsg-next' and 'remoteproc/rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + Documentation/rpmsg.txt | 14 +----------- + drivers/remoteproc/remoteproc_core.c | 39 +++++++++++++++++++++++++------- + drivers/remoteproc/remoteproc_internal.h | 1 + + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 8 ++++--- + include/linux/remoteproc.h | 4 ++++ + include/linux/rpmsg.h | 18 ++++++++++++++- + samples/rpmsg/rpmsg_client_sample.c | 14 +----------- + 8 files changed, 61 insertions(+), 39 deletions(-) +Merging gpio/for-next (d30a2b47d4c2 MIPS: do away with ARCH_[WANT_OPTIONAL|REQUIRE]_GPIOLIB) +$ git merge gpio/for-next +Resolved 'arch/mips/Kconfig' using previous resolution. +Auto-merging sound/soc/codecs/wm8962.c +Auto-merging kernel/irq/irqdomain.c +Removing include/linux/i2c/sx150x.h +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/staging/vme/devices/vme_pio2_gpio.c +Auto-merging drivers/mfd/intel_quark_i2c_gpio.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpio-xgene.c +Auto-merging drivers/gpio/gpio-rcar.c +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpio-mmio.c +Auto-merging drivers/gpio/gpio-menz127.c +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5562c33ca75a] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/gpio-74x164.txt | 4 +- + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 20 +- + .../devicetree/bindings/gpio/gpio-xlp.txt | 3 + + Documentation/devicetree/bindings/gpio/gpio.txt | 26 ++ + .../devicetree/bindings/gpio/wd,mbl-gpio.txt | 38 ++ + .../{gpio => power/reset}/gpio-poweroff.txt | 0 + .../{gpio => power/reset}/gpio-restart.txt | 0 + Documentation/gpio/driver.txt | 97 +++++ + MAINTAINERS | 1 + + arch/alpha/Kconfig | 1 - + arch/arc/plat-axs10x/Kconfig | 2 +- + arch/arc/plat-tb10x/Kconfig | 2 +- + arch/avr32/Kconfig | 2 +- + arch/cris/Kconfig | 2 +- + arch/m68k/Kconfig.cpu | 2 +- + arch/metag/Kconfig.soc | 1 - + arch/mips/Kconfig | 32 +- + arch/mips/alchemy/Kconfig | 2 +- + arch/mips/pic32/Kconfig | 2 +- + arch/nios2/Kconfig | 1 - + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 15 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 6 +- + arch/powerpc/sysdev/cpm1.c | 36 +- + arch/powerpc/sysdev/cpm_common.c | 18 +- + arch/powerpc/sysdev/ppc4xx_gpio.c | 17 +- + arch/powerpc/sysdev/simple_gpio.c | 13 +- + arch/sh/boards/mach-sdk7786/gpio.c | 4 +- + arch/sh/boards/mach-x3proto/gpio.c | 4 +- + arch/sparc/Kconfig | 1 - + arch/unicore32/kernel/gpio.c | 4 +- + arch/xtensa/Kconfig | 1 - + drivers/gpio/Kconfig | 22 +- + drivers/gpio/Makefile | 6 +- + drivers/gpio/gpio-74x164.c | 25 ++ + drivers/gpio/gpio-amdpt.c | 123 +----- + drivers/gpio/gpio-bcm-kona.c | 14 +- + drivers/gpio/gpio-brcmstb.c | 1 + + drivers/gpio/gpio-dwapb.c | 78 ++-- + drivers/gpio/gpio-f7188x.c | 52 ++- + drivers/gpio/gpio-it87.c | 10 + + drivers/gpio/gpio-loongson1.c | 102 +++++ + drivers/gpio/gpio-mb86s7x.c | 10 +- + drivers/gpio/gpio-mc9s08dz60.c | 12 +- + drivers/gpio/gpio-mcp23s08.c | 111 ++--- + drivers/gpio/gpio-menz127.c | 22 +- + drivers/gpio/{gpio-generic.c => gpio-mmio.c} | 2 +- + drivers/gpio/gpio-moxart.c | 7 +- + drivers/gpio/gpio-mvebu.c | 5 +- + drivers/gpio/gpio-octeon.c | 26 +- + drivers/gpio/gpio-omap.c | 42 +- + drivers/gpio/gpio-palmas.c | 13 +- + drivers/gpio/gpio-pca953x.c | 42 +- + drivers/gpio/gpio-pl061.c | 26 +- + drivers/gpio/gpio-rc5t583.c | 12 - + drivers/gpio/gpio-rcar.c | 20 + + drivers/gpio/gpio-sodaville.c | 28 +- + drivers/gpio/gpio-sta2x11.c | 8 +- + drivers/gpio/gpio-stmpe.c | 31 +- + drivers/gpio/gpio-sx150x.c | 100 ++++- + drivers/gpio/gpio-tc3589x.c | 69 ++- + drivers/gpio/gpio-tegra.c | 485 +++++++++++++-------- + drivers/gpio/gpio-timberdale.c | 35 +- + drivers/gpio/gpio-tpic2810.c | 35 +- + drivers/gpio/gpio-tps65218.c | 45 +- + drivers/gpio/gpio-tps6586x.c | 13 +- + drivers/gpio/gpio-tps65910.c | 16 +- + drivers/gpio/gpio-vx855.c | 23 + + drivers/gpio/gpio-wm831x.c | 25 +- + drivers/gpio/gpio-wm8994.c | 25 +- + drivers/gpio/gpio-xgene-sb.c | 15 +- + drivers/gpio/gpio-xgene.c | 30 +- + drivers/gpio/gpio-xlp.c | 25 +- + drivers/gpio/gpio-zevio.c | 21 +- + drivers/gpio/gpio-zx.c | 14 +- + drivers/gpio/gpio-zynq.c | 4 +- + drivers/gpio/gpiolib-of.c | 66 ++- + drivers/gpio/gpiolib.c | 133 ++++-- + drivers/gpio/gpiolib.h | 4 + + drivers/input/keyboard/adp5588-keys.c | 10 +- + drivers/input/keyboard/adp5589-keys.c | 12 +- + drivers/input/touchscreen/ad7879.c | 10 +- + drivers/mfd/intel_quark_i2c_gpio.c | 3 +- + drivers/pinctrl/sh-pfc/gpio.c | 2 +- + drivers/platform/x86/intel_pmic_gpio.c | 6 +- + drivers/soc/fsl/qe/gpio.c | 20 +- + drivers/ssb/driver_gpio.c | 33 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 17 +- + drivers/tty/serial/max310x.c | 12 +- + drivers/tty/serial/sc16is7xx.c | 16 +- + include/linux/gpio/driver.h | 25 +- + include/linux/i2c/sx150x.h | 82 ---- + include/linux/platform_data/gpio-dwapb.h | 3 +- + kernel/irq/irqdomain.c | 1 + + sound/soc/codecs/rt5677.c | 17 +- + sound/soc/codecs/wm5100.c | 16 +- + sound/soc/codecs/wm8903.c | 17 +- + sound/soc/codecs/wm8962.c | 15 +- + sound/soc/codecs/wm8996.c | 16 +- + sound/soc/soc-ac97.c | 8 +- + tools/gpio/Makefile | 2 +- + tools/gpio/lsgpio.c | 2 +- + 101 files changed, 1566 insertions(+), 1169 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/wd,mbl-gpio.txt + rename Documentation/devicetree/bindings/{gpio => power/reset}/gpio-poweroff.txt (100%) + rename Documentation/devicetree/bindings/{gpio => power/reset}/gpio-restart.txt (100%) + create mode 100644 drivers/gpio/gpio-loongson1.c + rename drivers/gpio/{gpio-generic.c => gpio-mmio.c} (99%) + delete mode 100644 include/linux/i2c/sx150x.h +Merging dma-mapping/dma-mapping-next (d770e558e219 Linux 4.2-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (4295ada2fe87 Merge branch 'for-4.7/pwm-atomic' into for-next) +$ git merge pwm/for-next +Auto-merging drivers/video/fbdev/ssd1307fb.c +Auto-merging drivers/input/misc/max8997_haptic.c +Auto-merging drivers/gpu/drm/i915/intel_panel.c +Merge made by the 'recursive' strategy. + Documentation/pwm.txt | 30 +++- + arch/arm/mach-s3c24xx/mach-rx1950.c | 6 + + drivers/clk/clk-pwm.c | 17 +- + drivers/gpu/drm/i915/intel_panel.c | 6 + + drivers/hwmon/pwm-fan.c | 26 ++- + drivers/input/misc/max77693-haptic.c | 17 +- + drivers/input/misc/max8997_haptic.c | 6 + + drivers/input/misc/pwm-beeper.c | 6 + + drivers/leds/leds-pwm.c | 11 +- + drivers/pwm/core.c | 218 +++++++++++++++--------- + drivers/pwm/pwm-crc.c | 2 +- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-omap-dmtimer.c | 2 +- + drivers/pwm/pwm-rcar.c | 2 +- + drivers/pwm/pwm-sun4i.c | 3 +- + drivers/pwm/sysfs.c | 70 ++++++-- + drivers/video/backlight/lm3630a_bl.c | 9 +- + drivers/video/backlight/lp855x_bl.c | 6 + + drivers/video/backlight/lp8788_bl.c | 6 + + drivers/video/backlight/pwm_bl.c | 14 +- + drivers/video/fbdev/ssd1307fb.c | 11 +- + include/linux/pwm.h | 319 ++++++++++++++++++++++++++--------- + 22 files changed, 582 insertions(+), 207 deletions(-) +Merging dma-buf/for-next (12566cc35d0e Merge tag 'pci-v4.6-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge dma-buf/for-next +Already up-to-date. +Merging userns/for-next (f2ca379642d7 namei: permit linking with CAP_FOWNER in userns) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (f55532a0c0b8 Linux 4.6-rc1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (9ffee1c4be7c clk: qcom: mmcc-8996: Remove clocks that should be controlled by RPM) +$ git merge clk/clk-next +Resolved 'drivers/clk/Kconfig' using previous resolution. +Auto-merging drivers/clk/ti/clk-7xx.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +CONFLICT (content): Merge conflict in drivers/clk/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-model/devres.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d217278c0fbb] Merge remote-tracking branch 'clk/clk-next' +$ git diff -M --stat --summary HEAD^.. + .../arm/marvell/ap806-system-controller.txt | 35 + + .../arm/marvell/cp110-system-controller0.txt | 83 ++ + .../devicetree/bindings/clock/artpec6.txt | 41 + + .../bindings/clock/axs10x-i2s-pll-clock.txt | 25 + + .../devicetree/bindings/clock/hi3519-crg.txt | 46 + + .../devicetree/bindings/clock/oxnas,stdclk.txt | 35 + + Documentation/devicetree/bindings/clock/sunxi.txt | 2 + + Documentation/driver-model/devres.txt | 1 + + MAINTAINERS | 2 +- + drivers/clk/Kconfig | 6 + + drivers/clk/Makefile | 5 +- + drivers/clk/at91/clk-h32mx.c | 2 +- + drivers/clk/axis/Makefile | 1 + + drivers/clk/axis/clk-artpec6.c | 242 ++++ + drivers/clk/axs10x/Makefile | 1 + + drivers/clk/axs10x/i2s_pll_clock.c | 228 ++++ + drivers/clk/bcm/clk-bcm2835.c | 1215 ++++++++++++-------- + drivers/clk/bcm/clk-kona-setup.c | 3 +- + drivers/clk/clk-clps711x.c | 19 +- + drivers/clk/clk-composite.c | 78 +- + drivers/clk/clk-divider.c | 91 +- + drivers/clk/clk-fixed-factor.c | 42 +- + drivers/clk/clk-fixed-rate.c | 44 +- + drivers/clk/clk-fractional-divider.c | 40 +- + drivers/clk/clk-gate.c | 43 +- + drivers/clk/clk-gpio.c | 52 +- + drivers/clk/clk-ls1x.c | 3 +- + drivers/clk/clk-mux.c | 57 +- + drivers/clk/clk-nspire.c | 3 +- + drivers/clk/clk-oxnas.c | 195 ++++ + drivers/clk/clk-palmas.c | 4 +- + drivers/clk/clk-qoriq.c | 5 +- + drivers/clk/clk-rk808.c | 1 - + drivers/clk/clk-tango4.c | 73 +- + drivers/clk/clk-twl6040.c | 1 - + drivers/clk/clk-wm831x.c | 1 - + drivers/clk/clk-xgene.c | 2 +- + drivers/clk/clk.c | 217 +++- + drivers/clk/clkdev.c | 75 +- + drivers/clk/hisilicon/Kconfig | 15 + + drivers/clk/hisilicon/Makefile | 2 + + drivers/clk/hisilicon/clk-hi3519.c | 131 +++ + drivers/clk/hisilicon/clk.c | 23 +- + drivers/clk/hisilicon/clk.h | 14 +- + drivers/clk/hisilicon/reset.c | 134 +++ + drivers/clk/hisilicon/reset.h | 36 + + drivers/clk/ingenic/cgu.c | 11 +- + drivers/clk/ingenic/cgu.h | 6 +- + drivers/clk/ingenic/jz4740-cgu.c | 24 +- + drivers/clk/ingenic/jz4780-cgu.c | 40 +- + drivers/clk/meson/meson8b-clkc.c | 6 +- + drivers/clk/mmp/clk-mmp2.c | 14 +- + drivers/clk/mmp/clk-of-mmp2.c | 10 +- + drivers/clk/mmp/clk-of-pxa168.c | 8 +- + drivers/clk/mmp/clk-of-pxa1928.c | 12 +- + drivers/clk/mmp/clk-of-pxa910.c | 8 +- + drivers/clk/mmp/clk-pxa168.c | 8 +- + drivers/clk/mmp/clk-pxa910.c | 8 +- + drivers/clk/mvebu/Kconfig | 6 + + drivers/clk/mvebu/Makefile | 2 + + drivers/clk/mvebu/ap806-system-controller.c | 168 +++ + drivers/clk/mvebu/cp110-system-controller.c | 406 +++++++ + drivers/clk/nxp/clk-lpc18xx-creg.c | 1 + + drivers/clk/qcom/gcc-msm8916.c | 2 + + drivers/clk/qcom/mmcc-msm8996.c | 32 - + drivers/clk/renesas/clk-mstp.c | 3 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 13 + + drivers/clk/renesas/renesas-cpg-mssr.c | 2 +- + drivers/clk/sirf/clk-atlas6.c | 7 +- + drivers/clk/sirf/clk-prima2.c | 7 +- + drivers/clk/sunxi/Makefile | 1 + + drivers/clk/sunxi/clk-a10-hosc.c | 3 +- + drivers/clk/sunxi/clk-sun4i-display.c | 261 +++++ + drivers/clk/ti/clk-54xx.c | 1 + + drivers/clk/ti/clk-7xx.c | 1 + + drivers/clk/ti/clk-dra7-atl.c | 2 + + drivers/clk/ti/clkt_dflt.c | 2 +- + drivers/clk/ti/clkt_dpll.c | 3 + + drivers/clk/ti/dpll.c | 5 + + drivers/clk/zte/clk-zx296702.c | 3 +- + include/dt-bindings/clock/axis,artpec6-clkctrl.h | 38 + + include/dt-bindings/clock/bcm2835.h | 20 +- + include/dt-bindings/clock/hi3519-clock.h | 40 + + include/linux/clk-provider.h | 102 +- + include/linux/clk/ti.h | 2 + + include/linux/clkdev.h | 7 +- + 86 files changed, 3896 insertions(+), 773 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt + create mode 100644 Documentation/devicetree/bindings/arm/marvell/cp110-system-controller0.txt + create mode 100644 Documentation/devicetree/bindings/clock/artpec6.txt + create mode 100644 Documentation/devicetree/bindings/clock/axs10x-i2s-pll-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/hi3519-crg.txt + create mode 100644 Documentation/devicetree/bindings/clock/oxnas,stdclk.txt + create mode 100644 drivers/clk/axis/Makefile + create mode 100644 drivers/clk/axis/clk-artpec6.c + create mode 100644 drivers/clk/axs10x/Makefile + create mode 100644 drivers/clk/axs10x/i2s_pll_clock.c + create mode 100644 drivers/clk/clk-oxnas.c + create mode 100644 drivers/clk/hisilicon/clk-hi3519.c + create mode 100644 drivers/clk/hisilicon/reset.c + create mode 100644 drivers/clk/hisilicon/reset.h + create mode 100644 drivers/clk/mvebu/ap806-system-controller.c + create mode 100644 drivers/clk/mvebu/cp110-system-controller.c + create mode 100644 drivers/clk/sunxi/clk-sun4i-display.c + create mode 100644 include/dt-bindings/clock/axis,artpec6-clkctrl.h + create mode 100644 include/dt-bindings/clock/hi3519-clock.h +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (6eab37daf0ec tools: testing: define the _GNU_SOURCE macro) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + tools/testing/selftests/ftrace/ftracetest | 9 ++- + .../selftests/ftrace/test.d/event/event-pid.tc | 72 ++++++++++++++++++++++ + tools/testing/selftests/intel_pstate/run.sh | 2 +- + 3 files changed, 80 insertions(+), 3 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-pid.tc +Merging y2038/y2038 (4b277763c5b3 vfs: Add support to document max and min inode times) +$ git merge y2038/y2038 +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + fs/afs/main.c | 6 ++---- + include/linux/fs.h | 29 ++++++++++++++++++++++++++++- + 2 files changed, 30 insertions(+), 5 deletions(-) +Merging luto-misc/next (afd2ff9b7e1b Linux 4.4) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (b562e44f507e Linux 4.5) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (6d9122078097 Merge branch 'for-4.7/core' into for-next) +$ git merge livepatching/for-next +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +Removing arch/x86/kernel/livepatch.c +Auto-merging arch/x86/kernel/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/livepatch/livepatch.txt | 394 ++++++++++++++++++++++++++ + Documentation/livepatch/module-elf-format.txt | 311 ++++++++++++++++++++ + MAINTAINERS | 1 + + arch/s390/include/asm/livepatch.h | 7 - + arch/s390/kernel/module.c | 6 +- + arch/x86/include/asm/livepatch.h | 2 - + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/livepatch.c | 70 ----- + include/linux/livepatch.h | 26 +- + include/linux/module.h | 25 ++ + include/uapi/linux/elf.h | 10 +- + kernel/livepatch/core.c | 157 ++++++---- + kernel/module.c | 125 +++++++- + samples/livepatch/livepatch-sample.c | 1 + + 14 files changed, 968 insertions(+), 168 deletions(-) + create mode 100644 Documentation/livepatch/livepatch.txt + create mode 100644 Documentation/livepatch/module-elf-format.txt + delete mode 100644 arch/x86/kernel/livepatch.c +Merging coresight/next (f85f84cd36af coresight: Handle build path error) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight.c +Auto-merging drivers/hwtracing/coresight/coresight-etb10.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 5 +---- + drivers/hwtracing/coresight/coresight.c | 9 ++++++--- + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging rtc/rtc-next (854ec813cc23 rtc: rename so the tps6586x-rtc module can be autoloaded at boot) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-ds1307.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/maxim-ds1302.txt | 46 ++ + .../devicetree/bindings/rtc/sa1100-rtc.txt | 2 +- + drivers/rtc/Kconfig | 52 +- + drivers/rtc/rtc-at91sam9.c | 2 +- + drivers/rtc/rtc-cmos.c | 2 +- + drivers/rtc/rtc-da9052.c | 13 +- + drivers/rtc/rtc-ds1216.c | 3 - + drivers/rtc/rtc-ds1286.c | 3 - + drivers/rtc/rtc-ds1302.c | 348 ++++++------ + drivers/rtc/rtc-ds1307.c | 23 +- + drivers/rtc/rtc-ds1343.c | 2 - + drivers/rtc/rtc-ds1511.c | 3 - + drivers/rtc/rtc-ds1553.c | 3 - + drivers/rtc/rtc-ds1672.c | 5 - + drivers/rtc/rtc-ds1685.c | 4 +- + drivers/rtc/rtc-ds1742.c | 3 - + drivers/rtc/rtc-ds3232.c | 9 +- + drivers/rtc/rtc-ep93xx.c | 3 - + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-hym8563.c | 2 +- + drivers/rtc/rtc-isl12022.c | 5 - + drivers/rtc/rtc-isl1208.c | 6 - + drivers/rtc/rtc-m41t80.c | 447 ++++++++++------ + drivers/rtc/rtc-m48t35.c | 3 - + drivers/rtc/rtc-m48t86.c | 4 - + drivers/rtc/rtc-max6900.c | 5 - + drivers/rtc/rtc-mc13xxx.c | 19 - + drivers/rtc/rtc-mrst.c | 2 +- + drivers/rtc/rtc-mxc.c | 3 - + drivers/rtc/rtc-pcf2123.c | 4 - + drivers/rtc/rtc-pcf8563.c | 7 +- + drivers/rtc/rtc-rs5c313.c | 2 - + drivers/rtc/rtc-rs5c348.c | 4 - + drivers/rtc/rtc-rs5c372.c | 18 +- + drivers/rtc/rtc-rv3029c2.c | 596 +++++++++++++-------- + drivers/rtc/rtc-rx8581.c | 5 - + drivers/rtc/rtc-sh.c | 2 - + drivers/rtc/rtc-snvs.c | 2 +- + drivers/rtc/rtc-stk17ta8.c | 3 - + drivers/rtc/rtc-stmp3xxx.c | 7 +- + drivers/rtc/rtc-tps6586x.c | 2 +- + drivers/rtc/rtc-x1205.c | 5 - + drivers/rtc/rtc-zynqmp.c | 74 ++- + 43 files changed, 1019 insertions(+), 735 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/maxim-ds1302.txt +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (e897b3cc7a5a Merge branch 'for-4.7/acpi6.1' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/huge_memory.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging include/acpi/acpi_bus.h +Auto-merging fs/block_dev.c +Auto-merging drivers/acpi/utils.c +Auto-merging drivers/Kconfig +Merge made by the 'recursive' strategy. + block/ioctl.c | 32 -- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/acpi/nfit.c | 282 ++++++++++++++++-- + drivers/acpi/nfit.h | 31 +- + drivers/acpi/utils.c | 4 +- + drivers/dax/Kconfig | 26 ++ + drivers/dax/Makefile | 4 + + drivers/dax/dax.c | 568 ++++++++++++++++++++++++++++++++++++ + drivers/dax/dax.h | 24 ++ + drivers/dax/pmem.c | 168 +++++++++++ + drivers/nvdimm/Kconfig | 13 + + drivers/nvdimm/Makefile | 1 + + drivers/nvdimm/blk.c | 208 +++++++------ + drivers/nvdimm/btt.c | 26 +- + drivers/nvdimm/btt_devs.c | 24 +- + drivers/nvdimm/bus.c | 54 +++- + drivers/nvdimm/claim.c | 63 ++++ + drivers/nvdimm/core.c | 2 +- + drivers/nvdimm/dax_devs.c | 99 +++++++ + drivers/nvdimm/dimm_devs.c | 18 +- + drivers/nvdimm/namespace_devs.c | 38 ++- + drivers/nvdimm/nd-core.h | 3 +- + drivers/nvdimm/nd.h | 72 ++++- + drivers/nvdimm/pfn.h | 4 +- + drivers/nvdimm/pfn_devs.c | 319 +++++++++++++++++--- + drivers/nvdimm/pmem.c | 492 +++++++------------------------ + drivers/nvdimm/region.c | 2 + + drivers/nvdimm/region_devs.c | 29 ++ + fs/block_dev.c | 96 ++---- + include/acpi/acpi_bus.h | 6 +- + include/linux/fs.h | 8 - + include/linux/libnvdimm.h | 7 +- + include/linux/nd.h | 11 +- + include/uapi/linux/fs.h | 1 - + include/uapi/linux/ndctl.h | 80 ++++- + mm/huge_memory.c | 1 + + mm/hugetlb.c | 1 + + tools/testing/nvdimm/Kbuild | 11 + + tools/testing/nvdimm/config_check.c | 2 + + tools/testing/nvdimm/test/iomap.c | 27 +- + tools/testing/nvdimm/test/nfit.c | 90 +++++- + 42 files changed, 2175 insertions(+), 775 deletions(-) + create mode 100644 drivers/dax/Kconfig + create mode 100644 drivers/dax/Makefile + create mode 100644 drivers/dax/dax.c + create mode 100644 drivers/dax/dax.h + create mode 100644 drivers/dax/pmem.c + create mode 100644 drivers/nvdimm/dax_devs.c +Merging dax-misc/dax-misc (314f3d553c66 dax: fix a comment in dax_zero_page_range and dax_truncate_page) +$ git merge dax-misc/dax-misc +Recorded preimage for 'fs/block_dev.c' +Auto-merging include/linux/fs.h +Auto-merging include/linux/dax.h +Auto-merging include/linux/blkdev.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/dax.c +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/nvdimm/pmem.c +Auto-merging block/ioctl.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/block_dev.c'. +[master 8944e06b0b1a] Merge remote-tracking branch 'dax-misc/dax-misc' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/dax.txt | 32 +++++ + arch/powerpc/sysdev/axonram.c | 2 +- + block/ioctl.c | 1 - + drivers/block/brd.c | 2 +- + drivers/nvdimm/pmem.c | 10 +- + drivers/s390/block/dcssblk.c | 2 +- + fs/block_dev.c | 87 ++++++++++++- + fs/dax.c | 266 +++++++++++--------------------------- + fs/ext2/file.c | 4 +- + fs/ext2/inode.c | 12 +- + fs/ext2/super.c | 11 +- + fs/ext4/file.c | 4 +- + fs/ext4/super.c | 11 +- + fs/xfs/xfs_bmap_util.c | 15 +-- + fs/xfs/xfs_file.c | 7 +- + fs/xfs/xfs_super.c | 12 +- + include/linux/blkdev.h | 15 ++- + include/linux/dax.h | 25 ++-- + include/linux/fs.h | 1 - + include/linux/radix-tree.h | 9 -- + 20 files changed, 254 insertions(+), 274 deletions(-) +Merging akpm-current/current (a758ba862244 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'include/linux/dax.h' +Recorded preimage for 'include/linux/radix-tree.h' +Resolved 'arch/cris/Kconfig' using previous resolution. +Resolved 'arch/mips/Kconfig' using previous resolution. +Resolved 'arch/mips/kernel/process.c' using previous resolution. +Resolved 'arch/powerpc/include/asm/book3s/64/pgtable.h' using previous resolution. +Resolved 'arch/tile/Kconfig' using previous resolution. +Resolved 'include/linux/efi.h' using previous resolution. +Auto-merging net/wireless/util.c +Auto-merging net/socket.c +Auto-merging mm/vmalloc.c +Auto-merging mm/shmem.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/filemap.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/workqueue.c +Auto-merging kernel/time/time.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/rcu/update.c +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/timekeeping.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/radix-tree.h +CONFLICT (content): Merge conflict in include/linux/radix-tree.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/efi.h +CONFLICT (content): Merge conflict in include/linux/efi.h +Auto-merging include/linux/device.h +Auto-merging include/linux/dax.h +CONFLICT (content): Merge conflict in include/linux/dax.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/proc/base.c +Auto-merging fs/nilfs2/namei.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/nilfs2/dir.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/file.c +Auto-merging fs/ext2/file.c +Auto-merging fs/exec.c +Auto-merging fs/dax.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/block_dev.c +Auto-merging fs/befs/linuxvfs.c +Auto-merging fs/befs/datastream.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_main.c +Auto-merging drivers/hwtracing/intel_th/msu.c +Auto-merging arch/xtensa/Kconfig +Auto-merging arch/x86/mm/hugetlbpage.c +Auto-merging arch/x86/include/asm/uaccess.h +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/configs/x86_64_defconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/configs/tilepro_defconfig +Auto-merging arch/tile/configs/tilegx_defconfig +Auto-merging arch/tile/Kconfig +CONFLICT (content): Merge conflict in arch/tile/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/s390/kernel/process.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/nios2/Kconfig +Auto-merging arch/mips/mm/tlb-r4k.c +Auto-merging arch/mips/kernel/process.c +CONFLICT (content): Merge conflict in arch/mips/kernel/process.c +Auto-merging arch/mips/include/asm/pgtable.h +Auto-merging arch/mips/include/asm/cpu-features.h +Auto-merging arch/mips/configs/nlm_xlr_defconfig +Auto-merging arch/mips/configs/nlm_xlp_defconfig +Auto-merging arch/mips/configs/lemote2f_defconfig +Auto-merging arch/mips/configs/bmips_be_defconfig +Auto-merging arch/mips/configs/bcm47xx_defconfig +Auto-merging arch/mips/Kconfig +CONFLICT (content): Merge conflict in arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig.cpu +Auto-merging arch/cris/Kconfig +CONFLICT (content): Merge conflict in arch/cris/Kconfig +Auto-merging arch/avr32/Kconfig +Auto-merging arch/arm64/kernel/process.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/configs/u8500_defconfig +Auto-merging arch/arm/configs/tegra_defconfig +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging arch/arm/configs/mvebu_v7_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/keystone_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/configs/exynos_defconfig +Auto-merging arch/arm/configs/bcm2835_defconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging arch/alpha/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/linux/dax.h'. +Recorded resolution for 'include/linux/radix-tree.h'. +[master 958e00f25191] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/debugobjects.tmpl | 26 +- + Documentation/blockdev/zram.txt | 27 +- + Documentation/filesystems/nilfs2.txt | 5 + + Documentation/filesystems/proc.txt | 1 + + Documentation/gdb-kernel-debugging.txt | 21 + + Documentation/kernel-parameters.txt | 14 +- + Documentation/memory-hotplug.txt | 9 +- + Documentation/sysctl/vm.txt | 14 + + Documentation/vm/transhuge.txt | 18 +- + Documentation/vm/z3fold.txt | 27 + + Kbuild | 10 + + MAINTAINERS | 10 +- + arch/Kconfig | 12 + + arch/alpha/Kconfig | 1 + + arch/alpha/kernel/process.c | 8 - + arch/arc/Kconfig | 1 + + arch/arc/include/asm/hugepage.h | 2 - + arch/arc/kernel/process.c | 7 - + arch/arm/Kconfig | 2 + + arch/arm/configs/axm55xx_defconfig | 2 +- + arch/arm/configs/bcm2835_defconfig | 2 +- + arch/arm/configs/bcm_defconfig | 3 +- + arch/arm/configs/colibri_pxa270_defconfig | 2 +- + arch/arm/configs/colibri_pxa300_defconfig | 2 +- + arch/arm/configs/dove_defconfig | 2 +- + arch/arm/configs/efm32_defconfig | 2 +- + arch/arm/configs/exynos_defconfig | 2 +- + arch/arm/configs/ezx_defconfig | 2 +- + arch/arm/configs/h5000_defconfig | 2 +- + arch/arm/configs/hisi_defconfig | 2 +- + arch/arm/configs/imote2_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/magician_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 +- + arch/arm/configs/pxa168_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm/configs/pxa910_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/raumfeld_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/arm/configs/sunxi_defconfig | 2 +- + arch/arm/configs/tegra_defconfig | 2 +- + arch/arm/configs/u300_defconfig | 2 +- + arch/arm/configs/u8500_defconfig | 2 +- + arch/arm/configs/vt8500_v6_v7_defconfig | 2 +- + arch/arm/configs/xcep_defconfig | 2 +- + arch/arm/configs/zx_defconfig | 3 +- + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 5 - + arch/arm/kernel/process.c | 4 +- + arch/arm/kernel/smp.c | 2 + + arch/arm/mm/Kconfig | 3 + + arch/arm/vfp/vfpmodule.c | 4 - + arch/arm64/configs/defconfig | 2 +- + arch/arm64/include/asm/pgtable.h | 5 - + arch/arm64/kernel/process.c | 7 - + arch/arm64/mm/hugetlbpage.c | 1 + + arch/avr32/Kconfig | 2 + + arch/avr32/kernel/process.c | 4 +- + arch/blackfin/Kconfig | 1 + + arch/blackfin/include/asm/processor.h | 7 - + arch/c6x/kernel/process.c | 4 - + arch/cris/Kconfig | 2 + + arch/cris/arch-v10/kernel/process.c | 9 - + arch/cris/arch-v32/kernel/process.c | 4 +- + arch/frv/include/asm/processor.h | 7 - + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/processor.h | 7 - + arch/hexagon/kernel/process.c | 7 - + arch/ia64/Kconfig | 1 + + arch/ia64/kernel/perfmon.c | 4 +- + arch/ia64/kernel/process.c | 14 +- + arch/m32r/Kconfig | 1 + + arch/m32r/kernel/process.c | 9 - + arch/m68k/Kconfig.cpu | 11 + + arch/m68k/include/asm/processor.h | 7 - + arch/metag/Kconfig | 2 + + arch/metag/include/asm/processor.h | 2 - + arch/metag/kernel/process.c | 6 +- + arch/metag/mm/hugetlbpage.c | 1 + + arch/microblaze/Kconfig | 1 + + arch/microblaze/include/asm/processor.h | 10 - + arch/mips/Kconfig | 3 +- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/bmips_be_defconfig | 2 +- + arch/mips/configs/bmips_stb_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/lemote2f_defconfig | 2 +- + arch/mips/configs/loongson3_defconfig | 3 +- + arch/mips/configs/nlm_xlp_defconfig | 2 +- + arch/mips/configs/nlm_xlr_defconfig | 2 +- + arch/mips/configs/pistachio_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/rt305x_defconfig | 2 +- + arch/mips/configs/xway_defconfig | 2 +- + arch/mips/include/asm/cpu-features.h | 10 + + arch/mips/include/asm/pgtable.h | 1 + + arch/mips/kernel/process.c | 4 - + arch/mips/mm/tlb-r4k.c | 21 +- + arch/mn10300/Kconfig | 1 + + arch/mn10300/configs/asb2364_defconfig | 1 - + arch/mn10300/include/asm/fpu.h | 6 +- + arch/mn10300/kernel/process.c | 4 +- + arch/nios2/Kconfig | 1 + + arch/nios2/include/asm/processor.h | 5 - + arch/openrisc/Kconfig | 1 + + arch/openrisc/include/asm/processor.h | 9 - + arch/parisc/Kconfig | 1 + + arch/parisc/configs/generic-64bit_defconfig | 2 +- + arch/parisc/kernel/process.c | 7 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/configs/40x/virtex_defconfig | 2 +- + arch/powerpc/configs/44x/virtex5_defconfig | 2 +- + arch/powerpc/configs/44x/warp_defconfig | 2 +- + arch/powerpc/configs/52xx/cm5200_defconfig | 2 +- + arch/powerpc/configs/52xx/lite5200b_defconfig | 2 +- + arch/powerpc/configs/52xx/motionpro_defconfig | 2 +- + arch/powerpc/configs/52xx/tqm5200_defconfig | 2 +- + arch/powerpc/configs/gamecube_defconfig | 2 +- + arch/powerpc/configs/mpc5200_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 2 +- + arch/powerpc/configs/wii_defconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 + + arch/powerpc/include/asm/pgtable.h | 1 - + arch/powerpc/kernel/process.c | 4 - + arch/powerpc/mm/hugetlbpage.c | 6 +- + arch/s390/Kconfig | 3 + + arch/s390/configs/default_defconfig | 2 +- + arch/s390/configs/gcov_defconfig | 2 +- + arch/s390/configs/performance_defconfig | 2 +- + arch/s390/configs/zfcpdump_defconfig | 2 +- + arch/s390/include/asm/pgtable.h | 1 + + arch/s390/kernel/machine_kexec.c | 28 +- + arch/s390/kernel/process.c | 5 +- + arch/score/Kconfig | 1 + + arch/score/kernel/process.c | 2 - + arch/sh/Kconfig | 3 + + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/edosk7760_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 3 +- + arch/sh/configs/se7206_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 2 +- + arch/sh/configs/sh7785lcr_32bit_defconfig | 2 +- + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/urquell_defconfig | 3 +- + arch/sh/kernel/process_32.c | 7 - + arch/sh/kernel/process_64.c | 5 +- + arch/sparc/Kconfig | 3 + + arch/sparc/configs/sparc64_defconfig | 2 +- + arch/sparc/include/asm/pgtable_64.h | 2 - + arch/sparc/kernel/process_32.c | 12 +- + arch/sparc/kernel/process_64.c | 4 +- + arch/tile/Kconfig | 2 + + arch/tile/configs/tilegx_defconfig | 1 - + arch/tile/configs/tilepro_defconfig | 1 - + arch/tile/include/asm/pgtable.h | 1 - + arch/tile/kernel/process.c | 4 +- + arch/tile/kernel/setup.c | 4 +- + arch/tile/mm/hugetlbpage.c | 7 +- + arch/tile/mm/init.c | 2 +- + arch/um/configs/i386_defconfig | 1 - + arch/um/configs/x86_64_defconfig | 1 - + arch/um/kernel/process.c | 4 - + arch/unicore32/kernel/process.c | 7 - + arch/x86/Kconfig | 2 + + arch/x86/configs/i386_defconfig | 3 +- + arch/x86/configs/x86_64_defconfig | 3 +- + arch/x86/include/asm/pgtable.h | 1 + + arch/x86/include/asm/uaccess.h | 5 + + arch/x86/include/asm/uaccess_64.h | 7 + + arch/x86/kernel/apic/hw_nmi.c | 1 - + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/process.c | 5 +- + arch/x86/mm/hugetlbpage.c | 1 + + arch/x86/mm/numa.c | 4 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/configs/audio_kc705_defconfig | 2 +- + arch/xtensa/configs/generic_kc705_defconfig | 3 +- + arch/xtensa/configs/nommu_kc705_defconfig | 2 +- + arch/xtensa/configs/smp_lx200_defconfig | 3 +- + arch/xtensa/kernel/process.c | 4 +- + block/genhd.c | 2 +- + block/partitions/ldm.c | 60 +- + drivers/base/memory.c | 28 +- + drivers/block/aoe/aoecmd.c | 2 +- + drivers/block/zram/zcomp.c | 300 ++--- + drivers/block/zram/zcomp.h | 14 +- + drivers/block/zram/zram_drv.c | 83 +- + drivers/block/zram/zram_drv.h | 1 - + drivers/char/random.c | 21 +- + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 2 +- + drivers/memstick/host/rtsx_usb_ms.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 2 +- + drivers/platform/x86/wmi.c | 104 +- + drivers/scsi/bfa/bfi.h | 2 +- + drivers/staging/comedi/drivers/daqboard2000.c | 2 +- + fs/befs/datastream.c | 8 +- + fs/befs/io.c | 4 +- + fs/befs/linuxvfs.c | 8 +- + fs/block_dev.c | 1 + + fs/btrfs/volumes.c | 2 +- + fs/buffer.c | 10 +- + fs/dax.c | 43 + + fs/efivarfs/inode.c | 40 +- + fs/eventpoll.c | 12 +- + fs/exec.c | 9 +- + fs/ext2/file.c | 1 + + fs/ext4/file.c | 1 + + fs/ext4/fsync.c | 5 +- + fs/ext4/ioctl.c | 2 +- + fs/f2fs/file.c | 2 +- + fs/fs-writeback.c | 3 +- + fs/nilfs2/alloc.c | 39 +- + fs/nilfs2/alloc.h | 11 +- + fs/nilfs2/bmap.c | 10 +- + fs/nilfs2/bmap.h | 22 +- + fs/nilfs2/btnode.c | 9 +- + fs/nilfs2/btnode.h | 8 +- + fs/nilfs2/btree.c | 21 +- + fs/nilfs2/btree.h | 6 +- + fs/nilfs2/cpfile.c | 22 +- + fs/nilfs2/cpfile.h | 10 +- + fs/nilfs2/dat.c | 8 +- + fs/nilfs2/dat.h | 8 +- + fs/nilfs2/dir.c | 59 +- + fs/nilfs2/direct.c | 17 +- + fs/nilfs2/direct.h | 6 +- + fs/nilfs2/export.h | 2 +- + fs/nilfs2/file.c | 7 +- + fs/nilfs2/gcinode.c | 9 +- + fs/nilfs2/ifile.c | 14 +- + fs/nilfs2/ifile.h | 9 +- + fs/nilfs2/inode.c | 105 +- + fs/nilfs2/ioctl.c | 17 +- + fs/nilfs2/mdt.c | 63 +- + fs/nilfs2/mdt.h | 21 +- + fs/nilfs2/namei.c | 12 +- + fs/nilfs2/nilfs.h | 33 +- + fs/nilfs2/page.c | 15 +- + fs/nilfs2/page.h | 10 +- + fs/nilfs2/recovery.c | 25 +- + fs/nilfs2/segbuf.c | 10 +- + fs/nilfs2/segbuf.h | 11 +- + fs/nilfs2/segment.c | 125 +- + fs/nilfs2/segment.h | 44 +- + fs/nilfs2/sufile.c | 14 +- + fs/nilfs2/sufile.h | 10 +- + fs/nilfs2/super.c | 21 +- + fs/nilfs2/sysfs.c | 10 +- + fs/nilfs2/sysfs.h | 6 +- + fs/nilfs2/the_nilfs.c | 16 +- + fs/nilfs2/the_nilfs.h | 27 +- + fs/notify/fsnotify.h | 7 + + fs/notify/group.c | 17 +- + fs/notify/mark.c | 78 +- + fs/ocfs2/alloc.c | 3 +- + fs/ocfs2/cluster/heartbeat.c | 185 ++- + fs/ocfs2/ocfs2_fs.h | 2 +- + fs/ocfs2/slot_map.c | 6 +- + fs/proc/array.c | 20 +- + fs/proc/base.c | 42 +- + fs/proc/page.c | 2 +- + fs/ramfs/file-nommu.c | 8 +- + fs/reiserfs/objectid.c | 2 +- + fs/select.c | 67 +- + fs/ubifs/sb.c | 2 +- + fs/xfs/xfs_file.c | 1 + + include/asm-generic/pgtable.h | 8 + + include/linux/bootmem.h | 16 +- + include/linux/compaction.h | 151 ++- + include/linux/compiler-gcc.h | 1 + + include/linux/compiler.h | 4 + + include/linux/cpuset.h | 42 +- + include/linux/crc64_ecma.h | 56 + + include/linux/dax.h | 3 + + include/linux/debugobjects.h | 17 +- + include/linux/device.h | 12 +- + include/linux/efi.h | 14 +- + include/linux/fsnotify_backend.h | 2 - + include/linux/genhd.h | 23 +- + include/linux/hardirq.h | 2 + + include/linux/huge_mm.h | 4 +- + include/linux/hugetlb.h | 11 +- + include/linux/hugetlb_cgroup.h | 4 - + include/linux/hugetlb_inline.h | 6 +- + include/linux/kasan-checks.h | 12 + + include/linux/kasan.h | 13 +- + include/linux/kernel.h | 4 +- + include/linux/kexec.h | 6 +- + include/linux/memcontrol.h | 31 - + include/linux/memory_hotplug.h | 8 +- + include/linux/mempolicy.h | 16 +- + include/linux/mempool.h | 3 +- + include/linux/mm.h | 35 +- + include/linux/mm_inline.h | 24 +- + include/linux/mm_types.h | 16 +- + include/linux/mmzone.h | 51 +- + include/linux/nilfs2_fs.h | 79 +- + include/linux/nodemask.h | 11 +- + include/linux/oom.h | 17 +- + include/linux/padata.h | 5 - + include/linux/page-flags.h | 25 +- + include/linux/page_ref.h | 26 +- + include/linux/pagemap.h | 32 +- + include/linux/percpu.h | 3 - + include/linux/poll.h | 11 +- + include/linux/printk.h | 14 +- + include/linux/radix-tree.h | 171 +-- + include/linux/random.h | 1 - + include/linux/sched.h | 21 +- + include/linux/sem.h | 1 + + include/linux/slab.h | 16 +- + include/linux/slab_def.h | 4 + + include/linux/string.h | 2 +- + include/linux/swap.h | 1 + + include/linux/syscalls.h | 8 +- + include/linux/time64.h | 17 +- + include/linux/timekeeping.h | 1 + + include/linux/types.h | 1 - + include/linux/uuid.h | 21 +- + include/linux/vmalloc.h | 3 +- + include/linux/vmstat.h | 12 +- + include/linux/zsmalloc.h | 4 +- + include/trace/events/compaction.h | 3 +- + include/trace/events/huge_memory.h | 38 +- + include/uapi/linux/uuid.h | 4 - + init/Kconfig | 36 + + init/main.c | 10 +- + ipc/msg.c | 5 +- + ipc/sem.c | 124 +- + kernel/cpuset.c | 22 +- + kernel/exit.c | 34 +- + kernel/fork.c | 54 +- + kernel/futex.c | 2 + + kernel/irq/irqdomain.c | 7 +- + kernel/kexec.c | 109 +- + kernel/kexec_core.c | 12 +- + kernel/kexec_file.c | 8 +- + kernel/padata.c | 138 +-- + kernel/panic.c | 6 +- + kernel/printk/Makefile | 1 + + kernel/printk/internal.h | 57 + + kernel/printk/nmi.c | 260 ++++ + kernel/printk/printk.c | 107 +- + kernel/rcu/update.c | 26 +- + kernel/signal.c | 10 +- + kernel/sysctl.c | 7 + + kernel/sysctl_binary.c | 23 +- + kernel/time/hrtimer.c | 23 +- + kernel/time/time.c | 21 + + kernel/time/timekeeping.c | 13 + + kernel/time/timer.c | 63 +- + kernel/workqueue.c | 52 +- + lib/Kconfig | 10 + + lib/Kconfig.debug | 8 +- + lib/Makefile | 3 +- + lib/crc64_ecma.c | 341 ++++++ + lib/debugobjects.c | 92 +- + lib/gcd.c | 77 +- + lib/nmi_backtrace.c | 89 +- + lib/nodemask.c | 30 + + lib/percpu_counter.c | 6 +- + lib/radix-tree.c | 933 ++++++++------- + lib/strncpy_from_user.c | 2 + + lib/test_kasan.c | 98 ++ + lib/uuid.c | 91 +- + lib/vsprintf.c | 21 +- + mm/Kconfig | 66 +- + mm/Makefile | 1 + + mm/backing-dev.c | 20 +- + mm/compaction.c | 258 ++-- + mm/filemap.c | 33 +- + mm/highmem.c | 12 +- + mm/huge_memory.c | 126 +- + mm/hugetlb.c | 37 +- + mm/hugetlb_cgroup.c | 35 +- + mm/internal.h | 14 +- + mm/kasan/Makefile | 1 + + mm/kasan/kasan.c | 133 ++- + mm/kasan/kasan.h | 21 +- + mm/kasan/quarantine.c | 291 +++++ + mm/kasan/report.c | 1 + + mm/memblock.c | 33 +- + mm/memcontrol.c | 41 +- + mm/memory-failure.c | 72 +- + mm/memory.c | 7 +- + mm/memory_hotplug.c | 91 +- + mm/mempolicy.c | 63 +- + mm/mempool.c | 2 +- + mm/migrate.c | 6 +- + mm/mmap.c | 17 +- + mm/mmzone.c | 2 +- + mm/mremap.c | 47 +- + mm/oom_kill.c | 129 +- + mm/page-writeback.c | 8 +- + mm/page_alloc.c | 1237 ++++++++++++-------- + mm/page_isolation.c | 10 +- + mm/page_owner.c | 5 +- + mm/page_poison.c | 8 +- + mm/rmap.c | 4 +- + mm/shmem.c | 130 +- + mm/slab.c | 785 ++++++++----- + mm/slab.h | 2 + + mm/slab_common.c | 2 + + mm/slub.c | 11 +- + mm/swap.c | 5 +- + mm/swap_state.c | 3 +- + mm/util.c | 29 + + mm/vmalloc.c | 39 +- + mm/vmscan.c | 164 +-- + mm/vmstat.c | 171 +-- + mm/z3fold.c | 792 +++++++++++++ + mm/zsmalloc.c | 175 ++- + mm/zswap.c | 12 +- + net/socket.c | 8 +- + net/wireless/util.c | 2 +- + samples/kprobes/jprobe_example.c | 2 +- + scripts/checkpatch.pl | 142 ++- + scripts/decode_stacktrace.sh | 55 +- + scripts/gdb/linux/Makefile | 12 +- + scripts/gdb/linux/constants.py.in | 59 + + scripts/gdb/linux/cpus.py | 38 + + scripts/gdb/linux/dmesg.py | 11 +- + scripts/gdb/linux/lists.py | 21 + + scripts/gdb/linux/modules.py | 24 +- + scripts/gdb/linux/proc.py | 156 +++ + scripts/gdb/linux/radixtree.py | 97 ++ + scripts/gdb/linux/tasks.py | 19 + + scripts/gdb/linux/utils.py | 32 +- + scripts/gdb/vmlinux-gdb.py | 2 + + scripts/spelling.txt | 1 + + security/integrity/ima/ima_policy.c | 14 +- + tools/testing/radix-tree/Makefile | 4 +- + tools/testing/radix-tree/generated/autoconf.h | 3 + + tools/testing/radix-tree/linux/init.h | 1 + + tools/testing/radix-tree/linux/kernel.h | 15 +- + tools/testing/radix-tree/linux/slab.h | 1 - + tools/testing/radix-tree/linux/types.h | 7 +- + tools/testing/radix-tree/main.c | 84 +- + tools/testing/radix-tree/multiorder.c | 337 ++++++ + tools/testing/radix-tree/regression2.c | 7 - + tools/testing/radix-tree/tag_check.c | 10 + + tools/testing/radix-tree/test.c | 49 +- + tools/testing/radix-tree/test.h | 11 +- + .../selftests/rcutorture/configs/lock/CFcommon | 2 +- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 +- + 460 files changed, 8888 insertions(+), 4604 deletions(-) + create mode 100644 Documentation/vm/z3fold.txt + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/kasan-checks.h + create mode 100644 kernel/printk/internal.h + create mode 100644 kernel/printk/nmi.c + create mode 100644 lib/crc64_ecma.c + create mode 100644 lib/nodemask.c + create mode 100644 mm/kasan/quarantine.c + create mode 100644 mm/z3fold.c + create mode 100644 scripts/gdb/linux/constants.py.in + create mode 100644 scripts/gdb/linux/radixtree.py + create mode 100644 tools/testing/radix-tree/generated/autoconf.h + create mode 100644 tools/testing/radix-tree/linux/init.h + create mode 100644 tools/testing/radix-tree/multiorder.c +$ git am -3 ../patches/0001-mm-rename-_count-field-of-the-struct-page-to-_refcou.patch +Applying: mm-rename-_count-field-of-the-struct-page-to-_refcount-fix6 +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +M drivers/net/ethernet/qlogic/qede/qede_main.c +$ git add -A . +$ git commit -v -a --amend +[master d0a783895690] Merge branch 'akpm-current/current' + Date: Wed May 18 14:01:09 2016 +1000 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: mm: make optimistic check for swapin readahead fix +Applying: drivers/net/wireless/intel/iwlwifi/dvm/calib.c: simplfy min() expression +Applying: mm: make mmap_sem for write waits killable for mm syscalls +Applying: mm: make vm_mmap killable +Applying: mm: make vm_munmap killable +Applying: mm, aout: handle vm_brk failures +Applying: mm, elf: handle vm_brk error +Applying: mm: make vm_brk killable +Applying: mm, proc: make clear_refs killable +Applying: mm, fork: make dup_mmap wait for mmap_sem for write killable +Applying: ipc, shm: make shmem attach/detach wait for mmap_sem killable +Applying: vdso: make arch_setup_additional_pages wait for mmap_sem for write killable +Applying: coredump: make coredump_wait wait for mmap_sem for write killable +Applying: aio: make aio_setup_ring killable +Applying: exec: make exec path waiting for mmap_sem killable +Applying: prctl: make PR_SET_THP_DISABLE wait for mmap_sem killable +Applying: uprobes: wait for mmap_sem for write killable +Applying: drm/i915: make i915_gem_mmap_ioctl wait for mmap_sem killable +Applying: drm/radeon: make radeon_mn_get wait for mmap_sem killable +Applying: drm/amdgpu: make amdgpu_mn_get wait for mmap_sem killable +Applying: drm/amdgpu: use ERR_PTR() to return from amdgpu_mn_get +Applying: kgdb: depends on VT +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 240210845e20...00e984c3a3ea akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (00e984c3a3ea kgdb: depends on VT) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm/kernel/process.c | 3 ++- + arch/arm64/kernel/vdso.c | 6 ++++-- + arch/hexagon/kernel/vdso.c | 3 ++- + arch/mips/kernel/vdso.c | 3 ++- + arch/powerpc/kernel/vdso.c | 3 ++- + arch/s390/kernel/vdso.c | 3 ++- + arch/sh/kernel/vsyscall/vsyscall.c | 4 +++- + arch/x86/entry/vdso/vma.c | 3 ++- + arch/x86/ia32/ia32_aout.c | 22 +++++++++++++++------- + arch/x86/um/vdso/vma.c | 3 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 5 ++++- + drivers/gpu/drm/i915/i915_gem.c | 5 ++++- + drivers/gpu/drm/radeon/radeon_mn.c | 4 +++- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 3 +-- + fs/aio.c | 7 ++++++- + fs/binfmt_aout.c | 11 ++++++++--- + fs/binfmt_elf.c | 7 +++++-- + fs/coredump.c | 4 +++- + fs/exec.c | 10 ++++++++-- + fs/proc/task_mmu.c | 11 +++++++++-- + include/linux/mm.h | 4 ++-- + ipc/shm.c | 9 +++++++-- + kernel/events/uprobes.c | 7 +++++-- + kernel/fork.c | 6 +++++- + kernel/sys.c | 3 ++- + lib/Kconfig.kgdb | 2 +- + mm/huge_memory.c | 3 ++- + mm/internal.h | 2 +- + mm/madvise.c | 8 +++++--- + mm/mlock.c | 16 ++++++++++------ + mm/mmap.c | 24 +++++++++++++++++++----- + mm/mprotect.c | 3 ++- + mm/mremap.c | 3 ++- + mm/util.c | 3 ++- + 34 files changed, 152 insertions(+), 61 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..195163909790 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 4.5-rc2 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.4 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..165681fd4354 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160518 |