diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-01-11 19:34:29 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2016-01-11 19:34:29 +1100 |
| commit | bf976ab690dea9d0ee260fc8881fef511a0e3566 (patch) | |
| tree | 385039f784b2a330ec45861fd9c3e5951d2575c6 | |
| parent | 19f9280e55936b3b4e364da0f65518ac501eb2f5 (diff) | |
| download | linux-next-bf976ab690dea9d0ee260fc8881fef511a0e3566.tar.gz | |
Add linux-next specific files for 20160111next-20160111
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 240 | ||||
| -rw-r--r-- | Next/Trees | 242 | ||||
| -rw-r--r-- | Next/merge.log | 14415 | ||||
| -rw-r--r-- | Next/quilt-import.log | 13 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 14911 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..22cc2943870a --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,240 @@ +Name SHA1 +---- ---- +origin eac6f76ac72c0a7e6f6d4f1640be751a526b5de2 +fixes 25cb62b76430a91cc6195f902e61c2cb84ade622 +kbuild-current 3d1450d54a4fc277fc4598acf2335f74b66b08fc +arc-current 74bf8efb5fa6e958d2d7c7917b8bb672085ec0c6 +arm-current 34bfbae33ae84107d0c257edd6c6a8689a09be26 +m68k-current eb37bc3f85b69f529d2ad06c41fad8dedd654c76 +metag-fixes 0164a711c97b0beeb7994b7d32ccddf586b6d81a +mips-fixes 1795cd9b3a91d4b5473c97f491d63892442212ab +powerpc-fixes 036592fbbe753d236402a0ae68148e7c143a0f0e +powerpc-merge-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +sparc 9c982e86dbdbaa3fb248dfc776dddda32cbc8927 +net 787d7ac308ff2279e4b2ea393ad4d990de486ef2 +ipsec a8a572a6b5f2a79280d6e302cb3c1cb1fbaeb3e8 +ipvs 8e662164abb4a8fde701a46e1431980f9e325742 +wireless-drivers 01d85b9b2b6bec2b0773cf2afc58699dc4b052f8 +mac80211 cf1e05c63642ce65821a6277adfc2157f7334c9d +sound-current 3f37b26f8d57756b591383a9d8ce1cd628bc773c +pci-current 5c3b99d057525fe2befe6a7db9b1309035d93eee +driver-core.current 4ef7675344d687a0ef5b0d7c0cee12da005870c0 +tty.current 4ef7675344d687a0ef5b0d7c0cee12da005870c0 +usb.current 4ef7675344d687a0ef5b0d7c0cee12da005870c0 +usb-gadget-fixes 7d32cdef535622c0aea39807989f62cdddea207e +usb-serial-fixes f7d7f59ab124748156ea551edf789994f05da342 +usb-chipidea-fixes 6f51bc340d2a1c71a2409f80f3e60fe2c44e35ae +staging.current f744c423cacf8f9666d0390e5068813afff756e5 +char-misc.current 9f9499ae8e6415cefc4fe0a96ad0e27864353c89 +input-current dd0d0d4de582a6a61c032332c91f4f4cb2bab569 +crypto-current 9f47e11b9e3169ff4cb35b3cdac0e0f7c2fcfe27 +ide 1b1050cdc5cdde43177b375b5f22dc070d45d8f8 +devicetree-current f76502aa9140ec338a59487218bf70a9c9e92b8f +rr-fixes 275d7d44d802ef271a42dc87ac091a495ba72fc5 +vfio-fixes ae5515d66362b9d96cdcfce504567f0b8b7bd83e +kselftest-fixes 2ce47b44b25d8fb0114ff117813742adbefec8ff +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1b52e50f2a402a266f1ba2281f0a57e87637a047 +drm-intel-fixes 168309855a7d1e16db751e9c647119fe2d2dc878 +asm-generic 79529173266361d8e82a64981c734b76c08c79b8 +arc 4dc0323fd6bd0b87793ef339e8b517610abc2ad0 +arm 4ba1a28869c7e07d2343a9bd132ba6293279e661 +arm-perf 8fcf04067cb57a3cbdbdbe2d22f13c259944cd57 +arm-soc 80f7f7e00215cce0869c9ed00afe92b7dfbde1b9 +at91 f2837af0c89d892f45c403ae80272a01e0d8e2b2 +bcm2835 b2776bf7149bddd1f4161f14f79520f17fc1d71d +bcm2835-dt 53b6084357a44d7c34044504e1bf149d9156934f +bcm2835-soc 5234c34e4cd7695647ccc1cabb50c3e7720dd3fb +bcm2835-drivers a09cd356586d33f64cbe64ee4f5c1a7c4a6abee5 +bcm2835-defconfig b63074fccbeb81e46b2553a200de54ff3bfadd10 +berlin 9a7e0683324926963bcee47058c4f86f4fb6b409 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs c6abe665c94f20367e7308e9c871e4d031c1a6f1 +keystone 99d59777c0896a4b34cd4d10fc88a1c538fc0301 +mvebu 12bd4032ea2f95b38a5610cd6f863f12b12c76e6 +omap 95c5bf2f05524fb3c3eeb15334fa54e9aa9ceda8 +omap-pending 30aa18d3bea5f9470af5aa48ab8df88bde97c795 +qcom e654927c5ff72c6178dee94a1e25856dffc1a221 +renesas 23a0d0a54a30ff2018d47156adba22f7d1d813bc +rockchip 755651cf0f313e40fe1fa1e317a5c07877236913 +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 8005c49d9aea74d382f474ce11afbbc7d7130bec +samsung-krzk 94c286811b3b1bcb7dd015abf606845d1504759e +sunxi 97dd53d76893fce31d04a2a426c10f00220e89d5 +tegra 92b100361a4ea04201a147ab4381771ee67443f9 +arm64 2a803c4db615d85126c5c7afd5849a3cfde71422 +blackfin d91e14b3b9e1d8e1d552f4d6aff45551bbb410b1 +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris f9f3f864b5e8c09d7837d8980edba4ad52969819 +h8300 5e7d4e401029d9cf46f6a8fe9457c70ce4379011 +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 7e26e9ff0a9301398bd7cf8d896536da3a54aa9a +m68k eb37bc3f85b69f529d2ad06c41fad8dedd654c76 +m68knommu 4693c2493a9b2d0c5d407496ea107676a690f1c0 +metag c8b6ad8b3f873ff5b971523f439f4b5a1ac75842 +microblaze b14132797d8041a42e03f4ffa1e722da1425adfb +mips 544f742d0c2abaaffccab88fbcad9b85cb463597 +nios2 8e3d7c834ba0f79f200c155cf0647eacd39f2fbe +parisc-hd 6a13feb9c82803e2b815eca72fa7a9f5561d7861 +powerpc 7b8ad495d59280b634a7b546f4cdf58cf4d65f61 +powerpc-mpe bc0195aad0daa2ad5b0d76cce22b167bc3435590 +fsl 44451d4d8f0e35153b3e7e3d40e198f2cf9ac36a +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 9236b4dd6bfabefcf2063544083a66cd5f3a738d +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +tile 544f7d5a408e4fffe91258e59ffde5f15b42237d +uml 3e46b25376321db119bc8507ce8c8841c580e736 +unicore32 d670878e2c9adb86b37e42b0937b2d4825bd2b39 +xtensa afaa7c542cc9c4d8a99ba252a8ea5e8bc7c897e2 +btrfs 511711af91f21d80b27f18b569352d6896562828 +ceph 583d0fef756a7615e50f0f68ea0892a497d03971 +cifs 181a15048df3efc9b1a8a33aa692661bb1f8617a +configfs 1609bac8af31f4a21bf330583c8a447e6f3d6155 +ecryptfs 933c32fe0e42b86d9bc5779401c3ce93d56bd231 +ext3 bb00c898ad1ce40c4bb422a8207ae562e9aea7ae +ext4 880cec3449e040bc072f4f9c5bd465c6d0afa481 +f2fs 90d43c31be5ae8b1a9a9e75bf38f06646b5f5f1c +fscache b00c2ae2ed3c0c40e0740549fe0e42e234a97dc2 +fuse 0b5da8db145bfd44266ac964a2636a0cf8d7c286 +gfs2 a93a99838248bdab49db2eaac00236847670bc7f +jfs 26456955719b79cc4a011b18221aa68f599f6b6c +nfs 44aab3e09ef947e546ee61c5082c41b86dd15e53 +nfsd ef1954ece840955ef798c1316415fee4b7a51e26 +orangefs 4f20854bf7363cc28d4088f2fa954f1a63b5efce +overlayfs 84889d49335627bc770b32787c1ef9ebad1da232 +squashfs 62421645bb702c077ee5a462815525106cb53bcf +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 4fdd1d51ad5d059548c6539ac9d281f74d24bcbe +xfs 4922be51ef1a95ca6a38694cf0cde5dd0308a24e +file-locks b4d629a39e104a8326d5b281ce07c21240c130c9 +vfs 6f3925248b752402e147776aabb7ec87fb0eb4fe +pci 55c10c538c855ac8f298fd527cb591aef7a7a5ce +hid 0abcb3a84626a0bcafc65a53709888fcccf84cd4 +i2c dd406819271752fa6a46e9572b03527f1afe90e3 +jdelvare-hwmon ef0303d2bba0e6dde90d0755c213937493857b64 +dmi afac06294288349099ca68f15bdecf8eed12407d +hwmon-staging 91918d13eb17b8c11a9b6b76bfdd7cc0efab4f50 +v4l-dvb e27bc2ab8e774738b9c7c0356beab3a9ebdb3903 +kbuild e03445d23fdc32c167841b7dd9c3ff92c4b02d5d +kconfig c0ddc8c745b7f89c50385fd7aa03c78dc543fa7a +libata 44858e07ff879048f8f5cf315715ecc23d1a8462 +pm 859be9b8688cea7488f66548c8245da8511b1abf +idle 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 +apm 53675abbd1e54a30e621a9744bf9cce0712ddd6c +thermal 1d296eb7260a3156666ad1925b82883e92f9eb8a +thermal-soc ce0265dd6f8e83d0bf3e7ee85205e4fb6b394ae5 +ieee1394 100ceb66d5c40cc0c7018e06a9474302470be73c +dlm a6b1533e9a57d76cd3d9b7649d29ac604b1874b8 +swiotlb 9d99c7123c9af5f47a2037933a3ffaec3e37efad +slave-dma 45f29dde4d578a55d07c7d67c069de7b30928335 +net-next 5c721d561dc6cded61e28425b30ca66aef09a14d +ipsec-next cb866e3298cd7412503fc7e2c265753c853fab9d +ipvs-next 4c50a8ce2b632ccbee9faa3edc9fc7f257ba5135 +wireless-drivers-next 42e0ed0d454c6ad7be67f2c18828391ecfdc9a62 +bluetooth 8e69d71996e485b5b8c8dcb5ea3a97a4f021d9f2 +mac80211-next e6a0cd058e1b165e9e17baf8a2d8c517ad7e3745 +rdma 59caaed7a72a0e3750dfb84636dae6b781559310 +mtd a32d5b726ff8cf32bf491522b0ac8ae2545a063e +l2-mtd 9146cbd52b11d4ade62dba8f238ec5e421c3fa2b +crypto 48d627648141479c8be8acd110191072e24eba25 +drm c11b8989635166c5a1e6aac1853a847bd664f8db +drm-panel abf08d5efee4f96c9dec3905770d6b34aa190dd1 +drm-intel d5f384de5bf16aa79095a1af5da65b9ffc3fe71d +drm-tegra ad906599c1919eda6f365ecec8d50198c9232131 +drm-misc d9d8c4cf23e8badfa8d49fe66c6a49970f896689 +drm-exynos 25364a9e54fb8296837061bf684b76d20eec01fb +drm-msm 2abd1c88345e9c10a8f34cf6d3b025bf7267ca85 +hdlcd 2651f437261f00b9f7d399889c8dfcc1867d91ce +drm-vc4 5645e785cea2f33acdc5e5cee62b3ce8a00f1169 +sound 9d9938854efcf2f21381b930bc1324e95640e0c4 +sound-asoc a0232cb4ee2de130b7e37a93828d305c9c6e7359 +modules b3212ec77dd1d267d0f2703ced3cef08108dca9f +input 8679ee4204cfd5cf78b996508ccadc1ec6130f1a +block b02bb788ed41bcfcff4b04cc1a831888c51207cb +device-mapper 385277bfb57faac44e92497104ba542cdd82d5fe +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 11bc9381b277a65ea4b3fe994e658f4a78512139 +mmc-uh 01a999e48995a35faaa513f811c335bce72917d6 +kgdb 2d289f14f00a0da6bae7c8415fc8dd9d030458b8 +md 649ce6e4af6df4ba9cc5df21ddf5a89b6c83d658 +mfd 526c0ab13672fa2ec0fddb7efa9a7797e11fddea +backlight ee65ad0e2a9e5c1a61f86be9365c17f4fddb3818 +battery 6b9140f39c2aaf76791197fbab0839c0e4af56e8 +omap_dss2 caf05780f6ed5eb7fe168dbabd9a8d7cfb45d89b +regulator 9540a8b2f4b21ee9bb549f3b18360cd13f817f67 +security 607259e17b37017e9ec0249a8b0a7d8b76b572aa +integrity 1d6d167c2efcfe9539d9cffb1a1be9c92e39c2c0 +selinux 76319946f321e30872dd72af7de867cb26e7a373 +lblnet b2776bf7149bddd1f4161f14f79520f17fc1d71d +watchdog ab3f09fe16d158cb4f84e558c61ec5d6d601f2e0 +iommu dabc4de141323884f54cbb579d6b2ba0ed667842 +dwmw2-iommu 0bdec95ce52d2705787f813e82c1ff2f1b29af17 +vfio d4f50ee2f5b45fc4d9e4142a52edf8b7935a9275 +jc_docs 9daacf51b428f109bb046bfa72c329f9f9dc05f4 +trivial bcf4299e6215a475259c3ac329d43e776cfe9c0c +audit 09eccd1da92b2cfcd32cc03a98970a1eec830c53 +devicetree 48a9b733e644ab4cc8e2a98950a36ddb12b8c54e +dt-rh fcd71d9cc6e301bdbd71829b79e80168473ca609 +mailbox bfbcfa770b1c316396162f9354872dc00cd572fe +spi 0aa267547b9789674bbf437c877393a435b409ae +tip 5852b88267adcc78722fc5d4f45751fb6e261bd2 +clockevents 1ddca16cc5b37628edca045c4c0db801eeea7406 +edac 12f0721c5a70408e86257c5c99605cf743cd44c6 +edac-amd 1cac5503fbf751f121d0c9f96e69d1fdd3eb1471 +irqchip f290917dc209223d20828a6a1f0a651590db45f4 +tiny f114040e3ea6e07372334ade75d1ee0775c355e1 +ftrace 5156dca34a3e1e1edac2d0dabf43d8632909b7aa +rcu 4bd5655ef9826a64c8823c403c37b7002fe08619 +kvm da3f7ca3e85642627a8db37ba337eb5f424339f1 +kvm-arm c7da6fa43cb1c5e649da0f478a491feb9208cae7 +kvm-ppc c63517c2e3810071359af926f621c1f784388c3f +kvm-ppc-paulus 696066f875bc86d0a9cdcf9cbc4846d89b1f38db +kvms390 c6e5f166373a20a433c38a34bd16f2b62bd0864c +xen-tip b9fcbcf55dc41e84bfa8b84c7ae59a9b2ae29a39 +percpu 18fc93fd64129c96432812cb44f59c963871889b +workqueues 6201171e3b2c02992e62448636631a0dfe4e9d20 +drivers-x86 c9abbe63aa08229aea7cddf818fac5079dcabdc7 +chrome-platform ebaf31c46cce0dc8a6ed690b5456b295aa7586a6 +regmap 6cb07abcc318be8dfbec5d19bc982536d64106a9 +hsi 525e1abc6b5a7d8bd9006de1da6e99722305ea2b +leds 522f17e1214cf112e62cff56150964d8b68b94b2 +ipmi 4193fcd31624f0a830a415c7275a2732584347ef +driver-core 4ef7675344d687a0ef5b0d7c0cee12da005870c0 +tty 041497eb721ddbdc1e690316976dd8ba7bc136a2 +usb 60d77b3d2229eaf29eddf0d7a7947c3c922b1a4d +usb-gadget 5072cfc40a80cea3749fd3413b3896630d8c787e +usb-serial 6ff9d2761b8655991f48f113f7edaefea5c92905 +usb-chipidea-next d0c40d9fda12a60a993d1f2f21e92687d7b3da35 +staging 841e3ed977e0284e3680d6345d880a64e8072573 +char-misc ed6dc538e5a36a331b6256d54f435c80f6715460 +extcon f78bf950aec3279e964b54774f7ae52b1514f97f +cgroup 36ae3fad335f039a1fdddd62ba719939ef3e38f1 +scsi f6817f3450cb9f594e163dadb82b6efb287ad5ff +target-updates 0de1be1c4dd07962775f3e54823c1687b4d6778f +target-merge bc0195aad0daa2ad5b0d76cce22b167bc3435590 +pinctrl 14da0a91bf4ac2a90d64446ddaa39a4869530f8c +vhost 5a6ef8bc4d62ea890bb87a8714a9362723f7a2e4 +remoteproc 7a6271a80cae8f464d38b326fce0266f0448d77e +rpmsg b1b9891441fa33fd0d49b5cb3aa7f04bca1cc1db +gpio de06c1db255fb70301651a0255c6147e0036ea01 +dma-mapping d770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 +pwm 074726402b82f14ca377da0b4a4767674c3d1ff8 +dma-buf 168309855a7d1e16db751e9c647119fe2d2dc878 +userns f2ca379642d7a843be972ea4167abdd3c8c9e5d1 +ktest b953c0d234bc72e8489d3bf51a276c5c4ec85345 +clk b360ada3f1534a37b264274cad55932d2a214ec3 +random 7185ad2672a7d50bc384de0e38d90b75d99f3d82 +aio 6a81013efc4013555c5de34c01530b805f45c92c +llvmlinux 25d4aee23af28a6ef04d70a1028c012665384df1 +kselftest 1b1fe542b6f010cf6bc7e1c92805e1c0e133e007 +y2038 477b8541b31fd4d32168514203a8da8b73884d90 +luto-misc 8735f8e16a70a355db5d0ed173bad75fb000a0fb +borntraeger fc7f9754db6ce0c12281da4055281f731d36bdee +livepatching 5dc5f40893325c3acc455b2aee8478ad0cd26f61 +coresight d2b29c2f35a2357b356f6db01d0486bfc7f870c1 +rtc cab572b82c4bc5f2854fdc1d42402100aa9c9683 +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 4ce7a0ee0c7f334b37160795ba6968b54c163215 +akpm-current 055bd02ec56301388ff1f15d99d43fc26162af17 +akpm 8a6c65654e6ec877982f68805270b7708fe29919 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..088bc117f270 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,242 @@ +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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-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://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/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 git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-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 +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/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 +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 +squashfs git git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next.git#master +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 +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 +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +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 +apm git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git#for-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 +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +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 +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 +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 git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git#mmc-next +mmc-uh git git://git.linaro.org/people/ulf.hansson/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://neil.brown.name/md#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 +selinux git git://git.infradead.org/users/pcmoore/selinux#next +lblnet git git://git.infradead.org/users/pcmoore/lblnet#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 +tiny git git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux.git#tiny/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 +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.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 +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://git.kernel.org/pub/scm/linux/kernel/git/ohad/rpmsg.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 +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +llvmlinux git git://git.linuxfoundation.org/llvmlinux/kernel.git#for-next +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 +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..a812e8afac25 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14415 @@ +$ date -R +Mon, 11 Jan 2016 09:55:07 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 02006f7a7a71 Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux +Merging origin/master (eac6f76ac72c Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge origin/master +Updating 02006f7a7a71..eac6f76ac72c +Fast-forward + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 6 +- + arch/arm/boot/dts/versatile-ab.dts | 10 ++- + arch/arm/boot/dts/versatile-pb.dts | 20 +++++- + arch/arm/boot/dts/wm8650.dtsi | 9 +++ + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/sunxi_defconfig | 1 + + arch/arm/mach-omap2/gpmc-onenand.c | 14 ++-- + arch/x86/entry/common.c | 6 +- + arch/x86/entry/entry_32.S | 7 +- + arch/x86/entry/entry_64_compat.S | 20 +++--- + arch/x86/entry/vdso/vdso32/system_call.S | 54 +++++++++++---- + arch/x86/include/asm/cpufeature.h | 1 + + arch/x86/include/asm/paravirt.h | 6 ++ + arch/x86/include/asm/paravirt_types.h | 5 ++ + arch/x86/include/asm/processor.h | 1 + + arch/x86/kernel/apic/apic_numachip.c | 5 +- + arch/x86/kernel/cpu/mcheck/mce.c | 11 ++++ + arch/x86/kernel/rtc.c | 3 + + arch/x86/kvm/i8254.c | 1 + + arch/x86/kvm/x86.c | 3 +- + arch/x86/lguest/boot.c | 1 + + arch/x86/xen/enlighten.c | 8 ++- + block/blk-merge.c | 2 +- + crypto/async_tx/async_memcpy.c | 2 +- + crypto/async_tx/async_pq.c | 4 +- + crypto/async_tx/async_raid6_recov.c | 4 +- + crypto/async_tx/async_xor.c | 4 +- + drivers/acpi/device_sysfs.c | 2 +- + drivers/dma/mic_x100_dma.c | 15 ++--- + drivers/dma/xgene-dma.c | 4 ++ + drivers/firmware/dmi_scan.c | 6 +- + drivers/pci/host/Kconfig | 1 + + drivers/scsi/sd.c | 9 ++- + include/linux/sched.h | 16 +++-- + include/sound/soc.h | 2 +- + kernel/events/core.c | 35 ++-------- + kernel/fork.c | 1 + + kernel/irq/manage.c | 6 +- + kernel/sched/fair.c | 2 +- + mm/vmstat.c | 2 +- + sound/pci/hda/patch_realtek.c | 101 ++++++++++++++++++++++++----- + sound/soc/codecs/arizona.c | 2 +- + sound/soc/codecs/rt5645.c | 4 ++ + sound/soc/codecs/rt5645.h | 4 ++ + sound/soc/intel/skylake/skl-topology.c | 3 +- + sound/soc/intel/skylake/skl.c | 4 ++ + sound/soc/intel/skylake/skl.h | 2 + + tools/perf/builtin-buildid-list.c | 2 +- + tools/perf/ui/browsers/hists.c | 8 +++ + tools/perf/util/build-id.c | 2 +- + tools/perf/util/parse-events.c | 6 +- + 51 files changed, 316 insertions(+), 132 deletions(-) +Merging fixes/master (25cb62b76430 Linux 4.3-rc5) +$ 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 (74bf8efb5fa6 Linux 4.4-rc7) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (34bfbae33ae8 ARM: 8475/1: SWP emulation: Restore original *data when failed) +$ git merge arm-current/fixes +Already up-to-date. +Merging m68k-current/for-linus (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys()) +$ git merge m68k-current/for-linus +Auto-merging arch/m68k/sun3/config.c +Merge made by the 'recursive' strategy. + arch/m68k/atari/config.c | 4 ++-- + arch/m68k/configs/amiga_defconfig | 4 ++++ + arch/m68k/configs/apollo_defconfig | 5 +++++ + arch/m68k/configs/atari_defconfig | 4 ++++ + arch/m68k/configs/bvme6000_defconfig | 4 ++++ + arch/m68k/configs/hp300_defconfig | 5 +++++ + arch/m68k/configs/mac_defconfig | 5 +++++ + arch/m68k/configs/multi_defconfig | 5 +++++ + arch/m68k/configs/mvme147_defconfig | 4 ++++ + arch/m68k/configs/mvme16x_defconfig | 4 ++++ + arch/m68k/configs/q40_defconfig | 5 +++++ + arch/m68k/configs/sun3_defconfig | 5 +++++ + arch/m68k/configs/sun3x_defconfig | 5 +++++ + arch/m68k/include/asm/mac_psc.h | 1 - + arch/m68k/include/asm/page.h | 3 +++ + arch/m68k/mac/macints.c | 6 +++--- + arch/m68k/mac/psc.c | 7 +++---- + arch/m68k/sun3/config.c | 2 +- + 18 files changed, 67 insertions(+), 11 deletions(-) +Merging metag-fixes/fixes (0164a711c97b metag: Fix ioremap_wc/ioremap_cached build errors) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging mips-fixes/mips-fixes (1795cd9b3a91 Linux 3.16-rc5) +$ git merge mips-fixes/mips-fixes +Already up-to-date. +Merging powerpc-fixes/fixes (036592fbbe75 powerpc/opal-irqchip: Fix deadlock introduced by "Fix double endian conversion") +$ 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 (9c982e86dbdb Merge tag 'pci-v4.4-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci) +$ git merge sparc/master +Already up-to-date. +Merging net/master (787d7ac308ff udp: restrict offloads to one namespace) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/isdn/act2000/module.c | 2 +- + drivers/net/geneve.c | 2 +- + drivers/net/irda/toim3232-sir.c | 10 -------- + drivers/net/phy/micrel.c | 12 +++++++-- + drivers/net/usb/cdc_ether.c | 8 +++++- + drivers/net/usb/lan78xx.c | 55 ++++++++++++++++++++++++++++++++++++++++- + drivers/net/usb/r8152.c | 40 +++++++++++++++++++++++++++++- + drivers/net/vxlan.c | 14 ++++++++--- + include/net/protocol.h | 2 +- + net/batman-adv/bat_iv_ogm.c | 6 +++-- + net/ipv4/fou.c | 2 +- + net/ipv4/udp_offload.c | 10 +++++--- + 12 files changed, 135 insertions(+), 28 deletions(-) +Merging ipsec/master (a8a572a6b5f2 xfrm: dst_entries_init() per-net dst_ops) +$ git merge ipsec/master +Already up-to-date. +Merging ipvs/master (8e662164abb4 netfilter: nfnetlink_queue: avoid harmless unnitialized variable warnings) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (01d85b9b2b6b Merge tag 'iwlwifi-for-kalle-2015-12-16' 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 (cf1e05c63642 mac80211: handle width changes from opmode notification IE in beacon) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (3f37b26f8d57 Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (5c3b99d05752 PCI: dra7xx: Mark driver as broken) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (4ef7675344d6 Linux 4.4-rc6) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (4ef7675344d6 Linux 4.4-rc6) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (4ef7675344d6 Linux 4.4-rc6) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (7d32cdef5356 usb: musb: fail with error when no DMA controller set) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (f7d7f59ab124 USB: cp210x: add ID for ELV Marble Sound Board 1) +$ git merge usb-serial-fixes/usb-linus +Merge made by the 'recursive' strategy. + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) +Merging usb-chipidea-fixes/ci-for-usb-stable (6f51bc340d2a usb: chipidea: imx: fix a possible NULL dereference) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up-to-date. +Merging staging.current/staging-linus (f744c423cacf Merge tag 'iio-fixes-for-4.4c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus) +$ git merge staging.current/staging-linus +Merge made by the 'recursive' strategy. + drivers/iio/imu/adis_buffer.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (9f9499ae8e64 Linux 4.4-rc5) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (dd0d0d4de582 Input: i8042 - add Fujitsu Lifebook U745 to the nomux list) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/serio/i8042-x86ia64io.h | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging crypto-current/master (9f47e11b9e31 crypto: algif_skcipher - Require setkey before accept(2)) +$ git merge crypto-current/master +Auto-merging crypto/algif_skcipher.c +Merge made by the 'recursive' strategy. + crypto/algif_skcipher.c | 48 +++++++++++++++++++++++++++++++++++++++++------- + 1 file changed, 41 insertions(+), 7 deletions(-) +Merging ide/master (1b1050cdc5cd 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 (275d7d44d802 module: Fix locking in symbol_put_addr()) +$ git merge rr-fixes/fixes +Already up-to-date. +Merging vfio-fixes/for-linus (ae5515d66362 Revert: "vfio: Include No-IOMMU mode") +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (2ce47b44b25d selftests/seccomp: Get page size from sysconf) +$ 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 (168309855a7d Linux 4.4-rc8) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up-to-date. +Merging asm-generic/master (795291732663 asm-generic: page.h: Remove useless get_user_page and free_user_page) +$ git merge asm-generic/master +Merge made by the 'recursive' strategy. + arch/arc/include/asm/page.h | 3 - + arch/arm/include/asm/div64.h | 283 ++++++++---------------- + arch/arm/include/asm/page-nommu.h | 3 - + arch/frv/include/asm/page.h | 3 - + arch/m68k/include/asm/page_mm.h | 3 - + arch/m68k/include/asm/page_no.h | 3 - + arch/openrisc/include/asm/page.h | 3 - + drivers/clk/tegra/clk-divider.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.c | 3 +- + drivers/hid/hid-sensor-hub.c | 3 +- + drivers/mtd/sm_ftl.c | 3 +- + include/asm-generic/div64.h | 178 ++++++++++++++- + include/asm-generic/page.h | 3 - + lib/div64.c | 6 +- + 15 files changed, 282 insertions(+), 221 deletions(-) +Merging arc/for-next (4dc0323fd6bd ARCv2: STAR 9000950267: Handle return from intr to Delay Slot #2) +$ git merge arc/for-next +Merge made by the 'recursive' strategy. + arch/arc/kernel/entry-arcv2.S | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) +Merging arm/for-next (4ba1a28869c7 Merge branch 'amba-pl011' into for-next) +$ git merge arm/for-next +Removing arch/arm64/kernel/psci-call.S +Removing arch/arm/kernel/psci-call.S +Auto-merging Documentation/devicetree/bindings/arm/l2c2x0.txt +Merge made by the 'recursive' strategy. + .../bindings/arm/{l2cc.txt => l2c2x0.txt} | 24 +- + arch/arm/Kconfig | 50 ++- + arch/arm/boot/compressed/Makefile | 4 +- + arch/arm/boot/compressed/efi-header.S | 130 ++++++++ + arch/arm/boot/compressed/head.S | 54 +++- + arch/arm/boot/compressed/vmlinux.lds.S | 7 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/bug.h | 5 +- + arch/arm/include/asm/cpuidle.h | 2 +- + arch/arm/include/asm/efi.h | 83 +++++ + arch/arm/include/asm/fixmap.h | 29 +- + arch/arm/include/asm/hardirq.h | 2 +- + arch/arm/include/asm/mach/map.h | 2 + + arch/arm/include/asm/mmu_context.h | 2 +- + arch/arm/include/asm/psci.h | 2 +- + arch/arm/include/asm/setup.h | 6 + + arch/arm/kernel/Makefile | 5 +- + arch/arm/kernel/armksyms.c | 6 + + arch/arm/kernel/atags.h | 6 - + arch/arm/kernel/cpuidle.c | 2 +- + arch/arm/kernel/efi.c | 38 +++ + arch/arm/kernel/entry-v7m.S | 2 +- + arch/arm/kernel/pj4-cp0.c | 4 + + arch/arm/kernel/psci-call.S | 31 -- + arch/arm/kernel/setup.c | 77 ++++- + arch/arm/kernel/smccc-call.S | 62 ++++ + arch/arm/kernel/smp.c | 17 +- + arch/arm/kernel/vdso.c | 2 +- + arch/arm/lib/lib1funcs.S | 8 + + arch/arm/mach-omap2/board-generic.c | 12 +- + arch/arm/mm/cache-l2x0.c | 33 +- + arch/arm/mm/cache-uniphier.c | 13 +- + arch/arm/mm/init.c | 5 +- + arch/arm/mm/ioremap.c | 9 + + arch/arm/mm/mmu.c | 130 +++++--- + arch/arm/mm/proc-v7.S | 23 +- + arch/arm/mm/proc-v7m.S | 14 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/efi.h | 9 + + arch/arm64/kernel/Makefile | 4 +- + arch/arm64/kernel/arm64ksyms.c | 5 + + arch/arm64/kernel/asm-offsets.c | 3 + + arch/arm64/kernel/efi.c | 334 ++------------------ + arch/arm64/kernel/psci-call.S | 28 -- + arch/arm64/kernel/smccc-call.S | 43 +++ + arch/arm64/mm/init.c | 2 +- + arch/arm64/mm/mmu.c | 2 + + drivers/base/component.c | 281 ++++++++--------- + drivers/firmware/Kconfig | 3 + + drivers/firmware/efi/Makefile | 4 + + drivers/firmware/efi/arm-init.c | 209 +++++++++++++ + drivers/firmware/efi/arm-runtime.c | 135 +++++++++ + drivers/firmware/efi/efi.c | 2 + + drivers/firmware/efi/libstub/Makefile | 9 + + drivers/firmware/efi/libstub/arm-stub.c | 4 +- + drivers/firmware/efi/libstub/arm32-stub.c | 85 ++++++ + drivers/firmware/psci.c | 23 +- + drivers/soc/qcom/spm.c | 10 +- + drivers/tty/serial/amba-pl011.c | 335 +++++++++++++-------- + drivers/tty/serial/amba-pl011.h | 34 +++ + include/linux/amba/serial.h | 18 ++ + include/linux/arm-smccc.h | 104 +++++++ + include/linux/component.h | 33 +- + include/linux/memblock.h | 8 + + mm/memblock.c | 28 ++ + 65 files changed, 1885 insertions(+), 773 deletions(-) + rename Documentation/devicetree/bindings/arm/{l2cc.txt => l2c2x0.txt} (77%) + create mode 100644 arch/arm/boot/compressed/efi-header.S + create mode 100644 arch/arm/include/asm/efi.h + create mode 100644 arch/arm/kernel/efi.c + delete mode 100644 arch/arm/kernel/psci-call.S + create mode 100644 arch/arm/kernel/smccc-call.S + delete mode 100644 arch/arm64/kernel/psci-call.S + create mode 100644 arch/arm64/kernel/smccc-call.S + create mode 100644 drivers/firmware/efi/arm-init.c + create mode 100644 drivers/firmware/efi/arm-runtime.c + create mode 100644 drivers/firmware/efi/libstub/arm32-stub.c + create mode 100644 drivers/tty/serial/amba-pl011.h + create mode 100644 include/linux/arm-smccc.h +Merging arm-perf/for-next/perf (8fcf04067cb5 Revert "arm64: kernel: enforce pmuserenr_el0 initialization and restore") +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/pmu.txt | 5 +- + arch/arm/kernel/perf_event_v7.c | 321 ++++++++++++++++++-------- + arch/arm64/kernel/perf_event.c | 260 +++++++++++++++++---- + drivers/perf/arm_pmu.c | 15 +- + include/linux/perf/arm_pmu.h | 2 - + 5 files changed, 438 insertions(+), 165 deletions(-) +Merging arm-soc/for-next (80f7f7e00215 arm-soc: document merges) +$ git merge arm-soc/for-next +Removing include/linux/clksrc-dbx500-prcmu.h +Auto-merging drivers/clk/mmp/clk-pxa910.c +Auto-merging drivers/clk/mmp/clk-pxa168.c +Auto-merging drivers/clk/mmp/clk-mmp2.c +Auto-merging arch/arm/plat-samsung/gpio-samsung.c +Auto-merging arch/arm/mm/mmu.c +Removing arch/arm/mach-versatile/versatile_pb.c +Removing arch/arm/mach-versatile/versatile_ab.c +Removing arch/arm/mach-versatile/pci.c +Removing arch/arm/mach-versatile/include/mach/uncompress.h +Removing arch/arm/mach-versatile/include/mach/platform.h +Removing arch/arm/mach-versatile/include/mach/irqs.h +Removing arch/arm/mach-versatile/include/mach/hardware.h +Removing arch/arm/mach-versatile/include/mach/clkdev.h +Removing arch/arm/mach-versatile/core.h +Removing arch/arm/mach-versatile/core.c +Removing arch/arm/mach-versatile/Makefile.boot +Removing arch/arm/mach-ux500/timer.c +Removing arch/arm/mach-shmobile/irqs.h +Removing arch/arm/mach-shmobile/include/mach/irqs.h +Removing arch/arm/mach-s3c64xx/include/mach/debug-macro.S +Auto-merging arch/arm/mach-realview/platform.h +Auto-merging arch/arm/mach-realview/irqs-pbx.h +Auto-merging arch/arm/mach-realview/irqs-pba8.h +Auto-merging arch/arm/mach-realview/irqs-pb11mp.h +Auto-merging arch/arm/mach-realview/irqs-pb1176.h +Auto-merging arch/arm/mach-realview/irqs-eb.h +Removing arch/arm/mach-realview/include/mach/uncompress.h +Removing arch/arm/mach-realview/include/mach/memory.h +Removing arch/arm/mach-realview/include/mach/irqs.h +Removing arch/arm/mach-realview/include/mach/barriers.h +Auto-merging arch/arm/mach-realview/hardware.h +Auto-merging arch/arm/mach-realview/board-pbx.h +Auto-merging arch/arm/mach-realview/board-pba8.h +Auto-merging arch/arm/mach-realview/board-pb11mp.h +Auto-merging arch/arm/mach-realview/board-pb1176.h +Auto-merging arch/arm/mach-realview/board-eb.h +Auto-merging arch/arm/mach-pxa/pxa930.h +Auto-merging arch/arm/mach-pxa/pxa320.h +Auto-merging arch/arm/mach-pxa/pxa300.h +Auto-merging arch/arm/mach-pxa/pxa27x.h +Auto-merging arch/arm/mach-pxa/pxa25x.h +Auto-merging arch/arm/mach-pxa/pcm990_baseboard.h +Auto-merging arch/arm/mach-pxa/pcm027.h +Auto-merging arch/arm/mach-pxa/palmt5.h +Auto-merging arch/arm/mach-pxa/mfp-pxa930.h +Auto-merging arch/arm/mach-pxa/mfp-pxa320.h +Auto-merging arch/arm/mach-pxa/mfp-pxa300.h +Auto-merging arch/arm/mach-pxa/mfp-pxa27x.h +Auto-merging arch/arm/mach-pxa/mfp-pxa25x.h +Auto-merging arch/arm/mach-pxa/idp.h +Auto-merging arch/arm/mach-pxa/h5000.h +Auto-merging arch/arm/mach-pxa/gumstix.h +Auto-merging arch/arm/mach-pxa/csb726.h +Auto-merging arch/arm/mach-orion5x/orion5x.h +Auto-merging arch/arm/mach-orion5x/irqs.h +Removing arch/arm/mach-orion5x/include/mach/uncompress.h +Removing arch/arm/mach-orion5x/include/mach/hardware.h +Removing arch/arm/mach-orion5x/include/mach/entry-macro.S +Auto-merging arch/arm/mach-orion5x/bridge-regs.h +Removing arch/arm/mach-omap2/omap-iommu.c +Removing arch/arm/mach-mvebu/include/mach/gpio.h +Auto-merging arch/arm/mach-mv78xx0/mv78xx0.h +Auto-merging arch/arm/mach-mv78xx0/irqs.h +Removing arch/arm/mach-mv78xx0/include/mach/uncompress.h +Removing arch/arm/mach-mv78xx0/include/mach/hardware.h +Removing arch/arm/mach-mv78xx0/include/mach/entry-macro.S +Auto-merging arch/arm/mach-mv78xx0/bridge-regs.h +Auto-merging arch/arm/mach-mmp/teton_bga.h +Auto-merging arch/arm/mach-mmp/regs-timers.h +Auto-merging arch/arm/mach-mmp/regs-icu.h +Auto-merging arch/arm/mach-mmp/regs-apmu.h +Auto-merging arch/arm/mach-mmp/regs-apbc.h +Auto-merging arch/arm/mach-mmp/pxa910.h +Auto-merging arch/arm/mach-mmp/pxa168.h +Auto-merging arch/arm/mach-mmp/pm-mmp2.h +Auto-merging arch/arm/mach-mmp/mmp2.h +Auto-merging arch/arm/mach-mmp/mfp-pxa910.h +Auto-merging arch/arm/mach-mmp/mfp-pxa168.h +Auto-merging arch/arm/mach-mmp/mfp-mmp2.h +Removing arch/arm/mach-mmp/include/mach/uncompress.h +Removing arch/arm/mach-mmp/include/mach/regs-smc.h +Removing arch/arm/mach-mmp/include/mach/hardware.h +Removing arch/arm/mach-mmp/include/mach/dma.h +Auto-merging arch/arm/mach-mmp/addr-map.h +Removing arch/arm/mach-iop13xx/include/mach/pci.h +Removing arch/arm/mach-dove/include/mach/entry-macro.S +Auto-merging arch/arm/mach-bcm/platsmp.c +Auto-merging arch/arm/include/asm/psci.h +Removing arch/arm/boot/dts/tps65217.dtsi +Removing arch/arm/boot/dts/r8a7791-henninger.dts +Auto-merging arch/arm/boot/dts/mt2701-evb.dts +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/meson-wdt.txt +Merge made by the 'recursive' strategy. + Documentation/arm/pxa/mfp.txt | 26 +- + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + .../devicetree/bindings/arm/bcm/brcm,bcm4708.txt | 7 + + .../bindings/arm/bcm/brcm,nsp-cpu-method.txt | 39 + + .../devicetree/bindings/arm/compulab-boards.txt | 25 + + Documentation/devicetree/bindings/arm/cpus.txt | 3 + + Documentation/devicetree/bindings/arm/fsl.txt | 4 + + .../devicetree/bindings/arm/marvell,kirkwood.txt | 2 + + Documentation/devicetree/bindings/arm/mediatek.txt | 4 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 2 +- + .../bindings/arm/mediatek/mediatek,pericfg.txt | 2 +- + .../devicetree/bindings/arm/omap/omap.txt | 18 + + Documentation/devicetree/bindings/arm/rockchip.txt | 26 + + .../devicetree/bindings/arm/samsung/exynos-adc.txt | 3 + + Documentation/devicetree/bindings/arm/scu.txt | 3 + + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../devicetree/bindings/arm/technologic.txt | 6 + + .../bindings/bus/uniphier-system-bus.txt | 66 ++ + .../devicetree/bindings/clock/arm-syscon-icst.txt | 40 + + .../bindings/clock/brcm,iproc-clocks.txt | 5 + + .../bindings/clock/dove-divider-clock.txt | 28 + + .../bindings/display/exynos/exynos_hdmi.txt | 7 +- + .../display/panel/startek,startek-kd050c.txt | 4 + + .../interrupt-controller/mediatek,sysirq.txt | 1 + + .../devicetree/bindings/regulator/tps65217.txt | 10 + + .../bindings/reset/hisilicon,hi6220-reset.txt | 34 + + .../devicetree/bindings/serial/mtk-uart.txt | 14 +- + .../bindings/soc/bcm/raspberrypi,bcm2835-power.txt | 47 ++ + Documentation/devicetree/bindings/soc/dove/pmu.txt | 56 ++ + .../devicetree/bindings/soc/mediatek/scpsys.txt | 12 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 104 +++ + .../devicetree/bindings/soc/qcom/qcom,smsm.txt | 104 +++ + .../devicetree/bindings/soc/ti/wkup_m3_ipc.txt | 57 ++ + Documentation/devicetree/bindings/spi/ti_qspi.txt | 22 +- + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + .../watchdog/{meson6-wdt.txt => meson-wdt.txt} | 2 +- + .../devicetree/bindings/watchdog/mtk-wdt.txt | 6 +- + .../devicetree/bindings/watchdog/sp805-wdt.txt | 31 + + MAINTAINERS | 31 +- + arch/arm/Kconfig | 112 +-- + arch/arm/Kconfig.debug | 401 ++++++---- + arch/arm/Makefile | 6 +- + arch/arm/arm-soc-for-next-contents.txt | 335 +++++++++ + arch/arm/boot/dts/Makefile | 63 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 186 +++-- + arch/arm/boot/dts/am335x-bone-common.dtsi | 118 +-- + arch/arm/boot/dts/am335x-boneblack.dts | 44 +- + arch/arm/boot/dts/am335x-bonegreen.dts | 4 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 20 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 94 +-- + arch/arm/boot/dts/am335x-cm-t335.dts | 396 ++++++++++ + arch/arm/boot/dts/am335x-evm.dts | 233 +++--- + arch/arm/boot/dts/am335x-evmsk.dts | 280 +++---- + arch/arm/boot/dts/am335x-lxm.dts | 120 +-- + arch/arm/boot/dts/am335x-nano.dts | 154 ++-- + arch/arm/boot/dts/am335x-pepper.dts | 231 +++--- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 60 +- + arch/arm/boot/dts/am335x-sbc-t335.dts | 219 ++++++ + arch/arm/boot/dts/am335x-shc.dts | 577 +++++++++++++++ + arch/arm/boot/dts/am335x-sl50.dts | 13 +- + arch/arm/boot/dts/am335x-wega.dtsi | 58 +- + arch/arm/boot/dts/am33xx.dtsi | 96 ++- + arch/arm/boot/dts/am3517-craneboard.dts | 2 +- + arch/arm/boot/dts/am4372.dtsi | 87 ++- + arch/arm/boot/dts/am437x-cm-t43.dts | 422 +++++++++++ + arch/arm/boot/dts/am437x-gp-evm.dts | 389 +++++----- + arch/arm/boot/dts/am437x-idk-evm.dts | 128 ++-- + arch/arm/boot/dts/am437x-sbc-t43.dts | 180 +++++ + arch/arm/boot/dts/am437x-sk-evm.dts | 298 ++++---- + arch/arm/boot/dts/am43x-epos-evm.dts | 246 +++---- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 198 ++--- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 617 ++++++++++++++++ + arch/arm/boot/dts/am57xx-sbc-am57x.dts | 179 +++++ + arch/arm/boot/dts/arm-realview-pb11mp.dts | 681 +++++++++++++++++ + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-388-clearfog.dts | 456 ++++++++++++ + arch/arm/boot/dts/armada-388-gp.dts | 10 - + .../arm/boot/dts/armada-38x-solidrun-microsom.dtsi | 115 +++ + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 72 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 21 + + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 127 ++++ + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 170 +++++ + arch/arm/boot/dts/at91-vinco.dts | 256 +++++++ + arch/arm/boot/dts/bcm-cygnus.dtsi | 101 ++- + arch/arm/boot/dts/bcm-nsp.dtsi | 232 +++++- + arch/arm/boot/dts/bcm11351.dtsi | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 2 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 1 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 - + arch/arm/boot/dts/bcm2835.dtsi | 194 +---- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 35 + + arch/arm/boot/dts/bcm2836.dtsi | 78 ++ + arch/arm/boot/dts/bcm283x.dtsi | 212 ++++++ + arch/arm/boot/dts/bcm4708.dtsi | 2 + + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 30 + + arch/arm/boot/dts/bcm5301x.dtsi | 92 ++- + arch/arm/boot/dts/bcm63138.dtsi | 36 +- + arch/arm/boot/dts/bcm94708.dts | 56 ++ + arch/arm/boot/dts/bcm94709.dts | 56 ++ + arch/arm/boot/dts/bcm953012k.dts | 63 ++ + arch/arm/boot/dts/bcm958625k.dts | 59 ++ + arch/arm/boot/dts/berlin2.dtsi | 23 + + arch/arm/boot/dts/berlin2cd.dtsi | 23 + + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 38 +- + arch/arm/boot/dts/berlin2q.dtsi | 34 +- + arch/arm/boot/dts/compulab-sb-som.dtsi | 49 ++ + arch/arm/boot/dts/da850-enbw-cmc.dts | 8 + + arch/arm/boot/dts/da850-evm.dts | 8 + + arch/arm/boot/dts/da850.dtsi | 58 +- + arch/arm/boot/dts/dm8148-evm.dts | 55 ++ + arch/arm/boot/dts/dm8148-t410.dts | 70 ++ + arch/arm/boot/dts/dm814x-clocks.dtsi | 109 ++- + arch/arm/boot/dts/dm814x.dtsi | 259 ++++++- + arch/arm/boot/dts/dm816x.dtsi | 14 +- + arch/arm/boot/dts/dove-cubox.dts | 8 + + arch/arm/boot/dts/dove.dtsi | 22 + + arch/arm/boot/dts/dra62x-clocks.dtsi | 23 + + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 80 ++ + arch/arm/boot/dts/dra62x.dtsi | 23 + + arch/arm/boot/dts/dra7-evm.dts | 255 +++---- + arch/arm/boot/dts/dra7.dtsi | 7 +- + arch/arm/boot/dts/dra72-evm.dts | 204 +++--- + arch/arm/boot/dts/ea3250.dts | 41 +- + arch/arm/boot/dts/emev2.dtsi | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 14 + + arch/arm/boot/dts/exynos4.dtsi | 32 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 - + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 - + arch/arm/boot/dts/exynos4210-universal_c210.dts | 8 + + arch/arm/boot/dts/exynos4210.dtsi | 14 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 - + arch/arm/boot/dts/exynos4412-odroidu3.dts | 1 - + arch/arm/boot/dts/exynos4412-origen.dts | 4 - + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 - + arch/arm/boot/dts/exynos4412-trats2.dts | 4 + + arch/arm/boot/dts/exynos4x12.dtsi | 5 +- + arch/arm/boot/dts/exynos5.dtsi | 14 + + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 6 +- + arch/arm/boot/dts/exynos5250.dtsi | 9 + + arch/arm/boot/dts/exynos5410.dtsi | 14 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5420.dtsi | 19 + + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 5 - + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 2 +- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 5 +- + arch/arm/boot/dts/imx25-pinfunc.h | 3 + + arch/arm/boot/dts/imx25.dtsi | 4 + + arch/arm/boot/dts/imx28-cfa10057.dts | 4 +- + arch/arm/boot/dts/imx28.dtsi | 11 + + arch/arm/boot/dts/imx51-ts4800.dts | 302 ++++++++ + arch/arm/boot/dts/imx6dl.dtsi | 7 +- + arch/arm/boot/dts/imx6q-novena.dts | 785 ++++++++++++++++++++ + arch/arm/boot/dts/imx6q.dtsi | 52 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 36 + + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 48 ++ + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 33 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 47 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 24 + + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 24 + + arch/arm/boot/dts/imx6qdl.dtsi | 61 +- + arch/arm/boot/dts/imx6sl.dtsi | 11 +- + arch/arm/boot/dts/imx6sx.dtsi | 19 +- + arch/arm/boot/dts/imx6ul.dtsi | 18 + + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 286 ++++++++ + arch/arm/boot/dts/imx7d-sbc-imx7.dts | 42 ++ + arch/arm/boot/dts/imx7d-sdb.dts | 10 + + arch/arm/boot/dts/imx7d.dtsi | 22 +- + arch/arm/boot/dts/kirkwood-nsa325.dts | 238 ++++++ + arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts | 178 +++++ + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 155 +++- + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 44 ++ + arch/arm/boot/dts/lpc18xx.dtsi | 11 + + arch/arm/boot/dts/lpc32xx.dtsi | 142 +++- + arch/arm/boot/dts/lpc4337-ciaa.dts | 34 + + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 5 + + arch/arm/boot/dts/lpc4357.dtsi | 4 + + arch/arm/boot/dts/ls1021a-qds.dts | 4 + + arch/arm/boot/dts/ls1021a-twr.dts | 13 + + arch/arm/boot/dts/ls1021a.dtsi | 21 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 11 + + arch/arm/boot/dts/meson8b.dtsi | 6 + + .../mach/param.h => boot/dts/mt2701-evb.dts} | 29 +- + arch/arm/boot/dts/mt2701.dtsi | 146 ++++ + arch/arm/boot/dts/mt8135.dtsi | 2 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 20 +- + arch/arm/boot/dts/omap3-beagle.dts | 66 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 2 +- + arch/arm/boot/dts/omap3-evm-37xx.dts | 54 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/omap3-igep0020.dts | 24 +- + arch/arm/boot/dts/omap3-igep0030.dts | 24 +- + arch/arm/boot/dts/omap3-ldp.dts | 60 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 2 +- + arch/arm/boot/dts/omap3-n900.dts | 116 +-- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 12 +- + arch/arm/boot/dts/omap3-overo-alto35-common.dtsi | 2 +- + .../boot/dts/omap3-overo-chestnut43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-common-lcd35.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-common-lcd43.dtsi | 2 +- + arch/arm/boot/dts/omap3-overo-gallop43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo35-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-overo-palo43-common.dtsi | 4 +- + arch/arm/boot/dts/omap3-pandora-common.dtsi | 34 +- + .../boot/dts/omap3-panel-sharp-ls037v7dw01.dtsi | 2 +- + arch/arm/boot/dts/omap3-zoom3.dts | 60 +- + arch/arm/boot/dts/omap3.dtsi | 2 + + arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 +- + arch/arm/boot/dts/omap4-panda-a4.dts | 6 +- + arch/arm/boot/dts/omap4-panda-common.dtsi | 164 ++--- + arch/arm/boot/dts/omap4-panda-es.dts | 10 +- + arch/arm/boot/dts/omap4-sdp-es23plus.dts | 6 +- + arch/arm/boot/dts/omap4-sdp.dts | 110 +-- + arch/arm/boot/dts/omap4-var-om44customboard.dtsi | 2 +- + arch/arm/boot/dts/omap4.dtsi | 10 + + arch/arm/boot/dts/omap5-board-common.dtsi | 94 +-- + arch/arm/boot/dts/omap5-cm-t54.dts | 4 +- + arch/arm/boot/dts/omap5-uevm.dts | 4 +- + arch/arm/boot/dts/omap5.dtsi | 2 + + arch/arm/boot/dts/phy3250.dts | 41 +- + arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts | 16 +- + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 22 +- + .../arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts | 436 +++++++++++ + arch/arm/boot/dts/qcom-apq8064.dtsi | 130 +++- + arch/arm/boot/dts/qcom-apq8074-dragonboard.dts | 2 + + arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 3 +- + arch/arm/boot/dts/qcom-apq8084-mtp.dts | 1 + + arch/arm/boot/dts/qcom-apq8084.dtsi | 108 +++ + arch/arm/boot/dts/qcom-msm8960.dtsi | 23 + + .../boot/dts/qcom-msm8974-sony-xperia-honami.dts | 382 ++++++++++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/boot/dts/qcom-pm8841.dtsi | 10 +- + arch/arm/boot/dts/qcom-pm8941.dtsi | 21 +- + arch/arm/boot/dts/qcom-pma8084.dtsi | 12 +- + arch/arm/boot/dts/r7s72100.dtsi | 2 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 2 +- + arch/arm/boot/dts/r8a7740.dtsi | 15 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 32 +- + arch/arm/boot/dts/r8a7778.dtsi | 9 +- + arch/arm/boot/dts/r8a7790-lager.dts | 55 +- + arch/arm/boot/dts/r8a7790.dtsi | 32 +- + arch/arm/boot/dts/r8a7791-henninger.dts | 320 -------- + arch/arm/boot/dts/r8a7791-koelsch.dts | 59 +- + arch/arm/boot/dts/r8a7791-porter.dts | 55 +- + arch/arm/boot/dts/r8a7791.dtsi | 65 +- + arch/arm/boot/dts/r8a7793-gose.dts | 76 +- + arch/arm/boot/dts/r8a7793.dtsi | 534 ++++++++++++++ + arch/arm/boot/dts/r8a7794-alt.dts | 140 +++- + arch/arm/boot/dts/r8a7794-silk.dts | 75 +- + arch/arm/boot/dts/r8a7794.dtsi | 68 +- + arch/arm/boot/dts/rk3036-evb.dts | 64 ++ + arch/arm/boot/dts/rk3036-kylin.dts | 300 ++++++++ + arch/arm/boot/dts/rk3036.dtsi | 622 ++++++++++++++++ + arch/arm/boot/dts/rk3066a.dtsi | 19 + + arch/arm/boot/dts/rk3188.dtsi | 15 + + arch/arm/boot/dts/rk3228-evb.dts | 66 ++ + arch/arm/boot/dts/rk3228.dtsi | 442 +++++++++++ + arch/arm/boot/dts/rk3288-evb-act8846.dts | 44 +- + arch/arm/boot/dts/rk3288-evb-rk808.dts | 27 - + arch/arm/boot/dts/rk3288-evb.dtsi | 37 +- + arch/arm/boot/dts/rk3288-r89.dts | 13 + + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-rock2-square.dts | 13 + + arch/arm/boot/dts/rk3288-thermal.dtsi | 14 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 139 ++++ + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 250 +++++++ + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 12 + + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 8 + + arch/arm/boot/dts/rk3288-veyron.dtsi | 5 + + arch/arm/boot/dts/rk3288.dtsi | 30 +- + arch/arm/boot/dts/rk3xxx.dtsi | 1 + + arch/arm/boot/dts/sama5d2.dtsi | 31 + + arch/arm/boot/dts/sama5d4.dtsi | 26 +- + arch/arm/boot/dts/sh73a0-kzm9g.dts | 2 +- + arch/arm/boot/dts/sh73a0.dtsi | 86 ++- + arch/arm/boot/dts/socfpga.dtsi | 1 + + arch/arm/boot/dts/socfpga_arria5_socdk.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi | 34 + + arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts | 94 +++ + arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 1 + + arch/arm/boot/dts/socfpga_cyclone5_sockit.dts | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 33 - + arch/arm/boot/dts/ste-href-stuib.dtsi | 23 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 52 +- + arch/arm/boot/dts/ste-hrefv60plus.dtsi | 18 - + arch/arm/boot/dts/ste-nomadik-s8815.dts | 2 +- + arch/arm/boot/dts/ste-snowball.dts | 7 +- + arch/arm/boot/dts/ste-u300.dts | 10 - + arch/arm/boot/dts/sun4i-a10-gemei-g9.dts | 54 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 48 ++ + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 164 +++++ + arch/arm/boot/dts/sun4i-a10-mk802.dts | 4 + + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 61 ++ + arch/arm/boot/dts/sun4i-a10.dtsi | 45 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 14 + + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 241 ++++++ + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 30 + + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 85 ++- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 4 + + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 169 +++++ + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 4 + + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 77 ++ + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 4 + + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 57 ++ + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 12 + + arch/arm/boot/dts/sun7i-a20.dtsi | 41 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 2 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 77 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 497 +++++++++++++ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 30 + + arch/arm/boot/dts/sun9i-a80-optimus.dts | 24 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 159 +++- + arch/arm/boot/dts/tango4-common.dtsi | 130 ++++ + arch/arm/boot/dts/tango4-smp8758.dtsi | 31 + + arch/arm/boot/dts/tango4-vantage-1172.dts | 37 + + arch/arm/boot/dts/tps65217.dtsi | 56 -- + arch/arm/boot/dts/twl4030_omap3.dtsi | 2 +- + arch/arm/boot/dts/twl6030_omap4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-common32.dtsi | 135 ++++ + arch/arm/boot/dts/uniphier-ph1-ld4.dtsi | 265 +++---- + arch/arm/boot/dts/uniphier-ph1-ld6b.dtsi | 2 +- + arch/arm/boot/dts/uniphier-ph1-pro4.dtsi | 288 +++----- + arch/arm/boot/dts/uniphier-ph1-pro5.dtsi | 274 +++---- + arch/arm/boot/dts/uniphier-ph1-sld8.dtsi | 266 +++---- + arch/arm/boot/dts/uniphier-proxstream2.dtsi | 269 +++---- + arch/arm/boot/dts/versatile-ab.dts | 62 +- + arch/arm/boot/dts/vf-colibri.dtsi | 26 + + arch/arm/boot/dts/vf610m4-cosmic.dts | 90 +++ + arch/arm/boot/dts/vfxxx.dtsi | 24 + + arch/arm/boot/dts/wm8505.dtsi | 4 +- + arch/arm/boot/dts/zynq-7000.dtsi | 8 +- + arch/arm/boot/dts/zynq-zc702.dts | 4 +- + arch/arm/common/mcpm_platsmp.c | 2 +- + arch/arm/common/scoop.c | 2 +- + arch/arm/configs/bcm2835_defconfig | 29 +- + arch/arm/configs/ep93xx_defconfig | 1 - + arch/arm/configs/exynos_defconfig | 18 +- + arch/arm/configs/imx_v6_v7_defconfig | 5 +- + arch/arm/configs/lpc18xx_defconfig | 5 + + arch/arm/configs/lpc32xx_defconfig | 1 - + arch/arm/configs/multi_v5_defconfig | 43 +- + arch/arm/configs/multi_v7_defconfig | 100 ++- + arch/arm/configs/mv78xx0_defconfig | 4 +- + arch/arm/configs/mvebu_v5_defconfig | 40 +- + arch/arm/configs/orion5x_defconfig | 4 +- + arch/arm/configs/pxa_defconfig | 783 ++++++++++++++++++++ + arch/arm/configs/qcom_defconfig | 16 +- + arch/arm/configs/realview-smp_defconfig | 38 +- + arch/arm/configs/realview_defconfig | 34 +- + arch/arm/configs/s3c6400_defconfig | 2 + + arch/arm/configs/sama5_defconfig | 3 + + arch/arm/configs/shmobile_defconfig | 14 +- + arch/arm/configs/socfpga_defconfig | 6 +- + arch/arm/configs/sunxi_defconfig | 14 +- + arch/arm/configs/versatile_defconfig | 14 +- + arch/arm/configs/zx_defconfig | 1 - + arch/arm/include/asm/cputype.h | 22 +- + arch/arm/include/asm/psci.h | 2 +- + .../mach/debug-macro.S => include/debug/dc21285.S} | 0 + arch/arm/kernel/devtree.c | 2 +- + arch/arm/kernel/psci_smp.c | 2 +- + arch/arm/kernel/xscale-cp0.c | 7 + + arch/arm/mach-alpine/Kconfig | 3 +- + arch/arm/mach-alpine/platsmp.c | 2 +- + arch/arm/mach-at91/Kconfig | 15 +- + arch/arm/mach-axxia/Kconfig | 3 +- + arch/arm/mach-axxia/platsmp.c | 2 +- + arch/arm/mach-bcm/Kconfig | 41 +- + arch/arm/mach-bcm/Makefile | 11 +- + arch/arm/mach-bcm/bcm63xx_smp.c | 2 +- + arch/arm/mach-bcm/bcm_5301x.c | 35 - + arch/arm/mach-bcm/board_bcm2835.c | 5 + + arch/arm/mach-bcm/platsmp-brcmstb.c | 2 +- + arch/arm/mach-bcm/{kona_smp.c => platsmp.c} | 146 +++- + arch/arm/mach-berlin/Kconfig | 3 +- + arch/arm/mach-berlin/platsmp.c | 2 +- + arch/arm/mach-cns3xxx/Kconfig | 3 +- + arch/arm/mach-davinci/Kconfig | 3 +- + arch/arm/mach-davinci/board-da830-evm.c | 2 +- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-leopard.c | 4 +- + arch/arm/mach-davinci/board-mityomapl138.c | 2 +- + arch/arm/mach-davinci/board-omapl138-hawk.c | 2 +- + arch/arm/mach-davinci/clock.c | 2 +- + arch/arm/mach-davinci/cp_intc.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/cp_intc.h | 0 + arch/arm/mach-davinci/cpuidle.c | 4 +- + arch/arm/mach-davinci/{include/mach => }/cpuidle.h | 0 + arch/arm/mach-davinci/da830.c | 2 +- + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/da8xx-dt.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/ddr2.h | 0 + arch/arm/mach-davinci/devices-da8xx.c | 4 +- + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm365.c | 2 +- + arch/arm/mach-davinci/dm644x.c | 2 +- + arch/arm/mach-davinci/dm646x.c | 2 +- + arch/arm/mach-davinci/pm.c | 2 +- + arch/arm/mach-davinci/psc.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/psc.h | 0 + arch/arm/mach-davinci/sleep.S | 4 +- + arch/arm/mach-davinci/sram.c | 2 +- + arch/arm/mach-davinci/{include/mach => }/sram.h | 0 + arch/arm/mach-dove/cm-a510.c | 1 + + arch/arm/mach-dove/common.c | 43 ++ + arch/arm/mach-dove/dove-db-setup.c | 1 + + arch/arm/mach-dove/include/mach/dove.h | 2 + + arch/arm/mach-dove/include/mach/entry-macro.S | 33 - + arch/arm/mach-dove/include/mach/irqs.h | 2 +- + arch/arm/mach-dove/include/mach/pm.h | 20 +- + arch/arm/mach-dove/irq.c | 100 +-- + arch/arm/mach-ep93xx/snappercl15.c | 4 +- + arch/arm/mach-ep93xx/ts72xx.c | 4 +- + arch/arm/mach-exynos/Kconfig | 6 +- + arch/arm/mach-exynos/common.h | 2 +- + arch/arm/mach-exynos/platsmp.c | 2 +- + arch/arm/mach-exynos/pmu.c | 45 +- + arch/arm/mach-exynos/regs-pmu.h | 9 - + arch/arm/mach-highbank/Kconfig | 3 +- + arch/arm/mach-hisi/Kconfig | 12 +- + arch/arm/mach-hisi/core.h | 3 - + arch/arm/mach-hisi/platmcpm.c | 2 +- + arch/arm/mach-hisi/platsmp.c | 6 +- + arch/arm/mach-imx/Kconfig | 7 +- + arch/arm/mach-imx/common.h | 4 +- + arch/arm/mach-imx/iomux-imx31.c | 2 +- + arch/arm/mach-imx/mach-imx6ul.c | 2 +- + arch/arm/mach-imx/mach-imx7d.c | 6 + + arch/arm/mach-imx/mach-qong.c | 2 +- + arch/arm/mach-imx/platsmp.c | 4 +- + arch/arm/mach-integrator/Kconfig | 135 +++- + arch/arm/mach-iop13xx/include/mach/pci.h | 57 -- + arch/arm/mach-iop13xx/iq81340mc.c | 2 +- + arch/arm/mach-iop13xx/iq81340sc.c | 2 +- + arch/arm/mach-iop13xx/irq.c | 2 +- + arch/arm/mach-iop13xx/{include/mach => }/msi.h | 0 + arch/arm/mach-iop13xx/pci.c | 2 +- + arch/arm/mach-iop13xx/pci.h | 58 ++ + arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 +- + arch/arm/mach-keystone/keystone.h | 2 +- + arch/arm/mach-keystone/platsmp.c | 2 +- + arch/arm/mach-ks8695/board-acs5k.c | 2 +- + arch/arm/mach-ks8695/board-dsm320.c | 2 +- + arch/arm/mach-ks8695/board-micrel.c | 2 +- + arch/arm/mach-ks8695/board-og.c | 2 +- + arch/arm/mach-ks8695/board-sg.c | 2 +- + arch/arm/mach-ks8695/cpu.c | 2 +- + arch/arm/mach-ks8695/devices.c | 6 +- + arch/arm/mach-ks8695/{include/mach => }/devices.h | 0 + arch/arm/mach-ks8695/pci.c | 4 +- + .../arm/mach-ks8695/{include/mach => }/regs-hpna.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-lan.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-mem.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-pci.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-sys.h | 0 + arch/arm/mach-ks8695/{include/mach => }/regs-wan.h | 0 + arch/arm/mach-mediatek/Kconfig | 3 +- + arch/arm/mach-mediatek/mediatek.c | 1 + + arch/arm/mach-mediatek/platsmp.c | 4 +- + arch/arm/mach-meson/Kconfig | 3 +- + arch/arm/mach-mmp/Kconfig | 34 +- + arch/arm/mach-mmp/Makefile | 1 + + arch/arm/mach-mmp/{include/mach => }/addr-map.h | 2 - + arch/arm/mach-mmp/aspenite.c | 8 +- + arch/arm/mach-mmp/avengers_lite.c | 8 +- + arch/arm/mach-mmp/brownstone.c | 8 +- + arch/arm/mach-mmp/clock-mmp2.c | 6 +- + arch/arm/mach-mmp/clock-pxa168.c | 6 +- + arch/arm/mach-mmp/clock-pxa910.c | 6 +- + arch/arm/mach-mmp/clock.c | 2 +- + arch/arm/mach-mmp/clock.h | 2 - + arch/arm/mach-mmp/common.c | 4 +- + arch/arm/mach-mmp/common.h | 3 - + arch/arm/mach-mmp/{include/mach => }/cputype.h | 0 + arch/arm/mach-mmp/devices.c | 13 +- + arch/arm/mach-mmp/{include/mach => }/devices.h | 0 + arch/arm/mach-mmp/flint.c | 8 +- + arch/arm/mach-mmp/gplugd.c | 6 +- + arch/arm/mach-mmp/include/mach/dma.h | 13 - + arch/arm/mach-mmp/include/mach/hardware.h | 4 - + arch/arm/mach-mmp/include/mach/regs-smc.h | 37 - + arch/arm/mach-mmp/include/mach/uncompress.h | 45 -- + arch/arm/mach-mmp/{include/mach => }/irqs.h | 0 + arch/arm/mach-mmp/jasper.c | 8 +- + arch/arm/mach-mmp/{include/mach => }/mfp-mmp2.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp-pxa168.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp-pxa910.h | 2 +- + arch/arm/mach-mmp/{include/mach => }/mfp.h | 0 + arch/arm/mach-mmp/mmp2.c | 23 +- + arch/arm/mach-mmp/{include/mach => }/mmp2.h | 3 +- + arch/arm/mach-mmp/pm-mmp2.c | 12 +- + arch/arm/mach-mmp/{include/mach => }/pm-mmp2.h | 2 +- + arch/arm/mach-mmp/pm-pxa910.c | 12 +- + arch/arm/mach-mmp/{include/mach => }/pm-pxa910.h | 0 + arch/arm/mach-mmp/pxa168.c | 29 +- + arch/arm/mach-mmp/{include/mach => }/pxa168.h | 5 +- + arch/arm/mach-mmp/pxa910.c | 24 +- + arch/arm/mach-mmp/{include/mach => }/pxa910.h | 3 +- + arch/arm/mach-mmp/{include/mach => }/regs-apbc.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-apmu.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-icu.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-timers.h | 4 +- + arch/arm/mach-mmp/{include/mach => }/regs-usb.h | 0 + arch/arm/mach-mmp/tavorevb.c | 8 +- + arch/arm/mach-mmp/teton_bga.c | 10 +- + arch/arm/mach-mmp/{include/mach => }/teton_bga.h | 2 - + arch/arm/mach-mmp/time.c | 11 +- + arch/arm/mach-mmp/ttc_dkb.c | 10 +- + arch/arm/mach-moxart/Kconfig | 3 +- + arch/arm/mach-mv78xx0/Kconfig | 15 +- + arch/arm/mach-mv78xx0/Makefile | 2 + + .../mach-mv78xx0/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-mv78xx0/buffalo-wxl-setup.c | 3 +- + arch/arm/mach-mv78xx0/common.c | 4 +- + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 3 +- + arch/arm/mach-mv78xx0/include/mach/entry-macro.S | 41 -- + arch/arm/mach-mv78xx0/include/mach/hardware.h | 14 - + arch/arm/mach-mv78xx0/include/mach/uncompress.h | 46 -- + arch/arm/mach-mv78xx0/irq.c | 35 +- + arch/arm/mach-mv78xx0/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-mv78xx0/mpp.c | 2 +- + arch/arm/mach-mv78xx0/{include/mach => }/mv78xx0.h | 4 +- + arch/arm/mach-mv78xx0/pcie.c | 2 +- + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 3 +- + arch/arm/mach-mvebu/Kconfig | 24 +- + arch/arm/mach-mvebu/armada-370-xp.h | 2 +- + arch/arm/mach-mvebu/include/mach/gpio.h | 1 - + arch/arm/mach-mvebu/platsmp-a9.c | 4 +- + arch/arm/mach-mvebu/platsmp.c | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 2 +- + arch/arm/mach-omap1/board-h2.c | 2 +- + arch/arm/mach-omap1/board-h3.c | 2 +- + arch/arm/mach-omap1/board-innovator.c | 2 +- + arch/arm/mach-omap1/board-nand.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 2 +- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 2 +- + arch/arm/mach-omap1/board-palmz71.c | 2 +- + arch/arm/mach-omap1/board-perseus2.c | 2 +- + arch/arm/mach-omap1/board-sx1-mmc.c | 2 +- + arch/arm/mach-omap1/board-sx1.c | 4 +- + arch/arm/mach-omap1/{include/mach => }/board-sx1.h | 0 + arch/arm/mach-omap1/{include/mach => }/camera.h | 0 + arch/arm/mach-omap1/devices.c | 21 +- + arch/arm/mach-omap1/flash.c | 2 +- + arch/arm/mach-omap1/{include/mach => }/flash.h | 0 + arch/arm/mach-omap2/Makefile | 2 - + arch/arm/mach-omap2/board-rx51-peripherals.c | 2 +- + arch/arm/mach-omap2/clockdomains81xx_data.c | 29 +- + arch/arm/mach-omap2/cm81xx.h | 6 +- + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/devices.c | 25 +- + arch/arm/mach-omap2/id.c | 4 +- + arch/arm/mach-omap2/io.c | 3 +- + arch/arm/mach-omap2/omap-iommu.c | 66 -- + arch/arm/mach-omap2/omap-smp.c | 2 +- + arch/arm/mach-omap2/omap2-restart.c | 2 +- + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 42 -- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 41 -- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 178 ++++- + arch/arm/mach-omap2/pdata-quirks.c | 26 +- + arch/arm/mach-omap2/powerdomains3xxx_data.c | 10 +- + arch/arm/mach-omap2/prm_common.c | 8 + + arch/arm/mach-omap2/serial.c | 2 +- + arch/arm/mach-omap2/timer.c | 6 +- + arch/arm/mach-orion5x/Kconfig | 18 +- + arch/arm/mach-orion5x/Makefile | 2 + + arch/arm/mach-orion5x/board-d2net.c | 2 +- + arch/arm/mach-orion5x/board-dt.c | 4 +- + arch/arm/mach-orion5x/board-mss2.c | 4 +- + arch/arm/mach-orion5x/board-rd88f5182.c | 2 +- + .../mach-orion5x/{include/mach => }/bridge-regs.h | 4 +- + arch/arm/mach-orion5x/common.c | 20 +- + arch/arm/mach-orion5x/db88f5281-setup.c | 3 +- + arch/arm/mach-orion5x/dns323-setup.c | 3 +- + arch/arm/mach-orion5x/include/mach/entry-macro.S | 25 - + arch/arm/mach-orion5x/include/mach/hardware.h | 14 - + arch/arm/mach-orion5x/include/mach/uncompress.h | 48 -- + arch/arm/mach-orion5x/irq.c | 13 +- + arch/arm/mach-orion5x/{include/mach => }/irqs.h | 4 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 4 +- + arch/arm/mach-orion5x/ls-chl-setup.c | 3 +- + arch/arm/mach-orion5x/ls_hgl-setup.c | 3 +- + arch/arm/mach-orion5x/mpp.c | 2 +- + arch/arm/mach-orion5x/mv2120-setup.c | 3 +- + arch/arm/mach-orion5x/net2big-setup.c | 3 +- + arch/arm/mach-orion5x/{include/mach => }/orion5x.h | 4 +- + arch/arm/mach-orion5x/pci.c | 2 +- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f5182-setup.c | 3 +- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 3 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 3 +- + arch/arm/mach-orion5x/ts209-setup.c | 3 +- + arch/arm/mach-orion5x/ts409-setup.c | 3 +- + arch/arm/mach-orion5x/ts78xx-setup.c | 9 +- + arch/arm/mach-orion5x/tsx09-common.c | 2 +- + arch/arm/mach-orion5x/wnr854t-setup.c | 3 +- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 3 +- + arch/arm/mach-picoxcell/Kconfig | 3 +- + arch/arm/mach-prima2/Kconfig | 3 +- + arch/arm/mach-prima2/common.h | 2 +- + arch/arm/mach-prima2/platsmp.c | 2 +- + arch/arm/mach-pxa/am200epd.c | 4 +- + arch/arm/mach-pxa/am300epd.c | 4 +- + arch/arm/mach-pxa/balloon3.c | 8 +- + arch/arm/mach-pxa/capc7117.c | 4 +- + arch/arm/mach-pxa/cm-x255.c | 2 +- + arch/arm/mach-pxa/cm-x270.c | 2 +- + arch/arm/mach-pxa/cm-x2xx.c | 13 +- + arch/arm/mach-pxa/cm-x300.c | 4 +- + arch/arm/mach-pxa/colibri-evalboard.c | 6 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 4 +- + arch/arm/mach-pxa/colibri-pxa270.c | 4 +- + arch/arm/mach-pxa/colibri-pxa300.c | 4 +- + arch/arm/mach-pxa/colibri-pxa320.c | 8 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/colibri.h | 0 + arch/arm/mach-pxa/corgi.c | 6 +- + arch/arm/mach-pxa/corgi_pm.c | 2 +- + arch/arm/mach-pxa/csb726.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/csb726.h | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/eseries-irq.h | 0 + arch/arm/mach-pxa/eseries.c | 6 +- + arch/arm/mach-pxa/ezx.c | 12 +- + arch/arm/mach-pxa/gumstix.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/gumstix.h | 2 +- + arch/arm/mach-pxa/h5000.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/h5000.h | 2 +- + arch/arm/mach-pxa/himalaya.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/icontrol.c | 4 +- + arch/arm/mach-pxa/idp.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/idp.h | 2 +- + arch/arm/mach-pxa/littleton.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/littleton.h | 0 + arch/arm/mach-pxa/lpd270.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/lpd270.h | 0 + arch/arm/mach-pxa/lubbock.c | 6 +- + arch/arm/mach-pxa/magician.c | 6 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa25x.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa27x.h | 2 +- + arch/arm/mach-pxa/mfp-pxa2xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa2xx.h | 0 + arch/arm/mach-pxa/{include/mach => }/mfp-pxa300.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa320.h | 2 +- + arch/arm/mach-pxa/mfp-pxa3xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/mfp-pxa3xx.h | 0 + arch/arm/mach-pxa/{include/mach => }/mfp-pxa930.h | 2 +- + arch/arm/mach-pxa/mioa701.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/mioa701.h | 0 + arch/arm/mach-pxa/mp900.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/mxm8x10.h | 0 + arch/arm/mach-pxa/palm27x.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/palm27x.h | 0 + arch/arm/mach-pxa/palmld.c | 4 +- + arch/arm/mach-pxa/palmt5.c | 8 +- + arch/arm/mach-pxa/{include/mach => }/palmt5.h | 2 +- + arch/arm/mach-pxa/palmtc.c | 4 +- + arch/arm/mach-pxa/palmte2.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/palmte2.h | 0 + arch/arm/mach-pxa/palmtreo.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/palmtreo.h | 0 + arch/arm/mach-pxa/palmtx.c | 8 +- + arch/arm/mach-pxa/palmz72.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/palmz72.h | 0 + arch/arm/mach-pxa/pcm027.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pcm027.h | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + .../mach-pxa/{include/mach => }/pcm990_baseboard.h | 4 +- + arch/arm/mach-pxa/pm.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pm.h | 0 + arch/arm/mach-pxa/poodle.c | 4 +- + arch/arm/mach-pxa/pxa25x.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pxa25x.h | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa27x-udc.h | 0 + arch/arm/mach-pxa/pxa27x.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/pxa27x.h | 2 +- + arch/arm/mach-pxa/pxa2xx.c | 2 +- + arch/arm/mach-pxa/pxa300.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa300.h | 4 +- + arch/arm/mach-pxa/pxa320.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa320.h | 4 +- + arch/arm/mach-pxa/pxa3xx-ulpi.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa3xx.h | 0 + arch/arm/mach-pxa/pxa930.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/pxa930.h | 4 +- + arch/arm/mach-pxa/raumfeld.c | 8 +- + arch/arm/mach-pxa/{include/mach => }/regs-rtc.h | 0 + arch/arm/mach-pxa/{include/mach => }/regs-u2d.h | 0 + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/sharpsl_pm.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/sharpsl_pm.h | 0 + arch/arm/mach-pxa/spitz.c | 6 +- + arch/arm/mach-pxa/spitz_pm.c | 4 +- + arch/arm/mach-pxa/stargate2.c | 6 +- + arch/arm/mach-pxa/tavorevb.c | 2 +- + arch/arm/mach-pxa/tosa-bt.c | 2 +- + arch/arm/mach-pxa/tosa.c | 6 +- + arch/arm/mach-pxa/{include/mach => }/tosa_bt.h | 0 + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/{include/mach => }/udc.h | 0 + arch/arm/mach-pxa/viper.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/viper.h | 0 + arch/arm/mach-pxa/vpac270.c | 6 +- + arch/arm/mach-pxa/xcep.c | 2 +- + arch/arm/mach-pxa/z2.c | 6 +- + arch/arm/mach-pxa/zeus.c | 10 +- + arch/arm/mach-pxa/{include/mach => }/zeus.h | 0 + arch/arm/mach-pxa/zylonite.c | 4 +- + arch/arm/mach-pxa/{include/mach => }/zylonite.h | 0 + arch/arm/mach-pxa/zylonite_pxa300.c | 4 +- + arch/arm/mach-pxa/zylonite_pxa320.c | 4 +- + arch/arm/mach-qcom/Kconfig | 3 +- + arch/arm/mach-qcom/platsmp.c | 6 +- + arch/arm/mach-realview/Kconfig | 66 +- + arch/arm/mach-realview/Makefile | 9 +- + .../mach-realview/{include/mach => }/board-eb.h | 4 +- + .../{include/mach => }/board-pb1176.h | 4 +- + .../{include/mach => }/board-pb11mp.h | 4 +- + .../mach-realview/{include/mach => }/board-pba8.h | 4 +- + .../mach-realview/{include/mach => }/board-pbx.h | 4 +- + arch/arm/mach-realview/core.c | 6 +- + arch/arm/mach-realview/core.h | 4 +- + .../mach-realview/{include/mach => }/hardware.h | 2 - + arch/arm/mach-realview/include/mach/barriers.h | 8 - + arch/arm/mach-realview/include/mach/irqs.h | 40 - + arch/arm/mach-realview/include/mach/memory.h | 64 -- + arch/arm/mach-realview/include/mach/uncompress.h | 77 -- + .../arm/mach-realview/{include/mach => }/irqs-eb.h | 20 +- + .../mach-realview/{include/mach => }/irqs-pb1176.h | 23 - + .../mach-realview/{include/mach => }/irqs-pb11mp.h | 27 +- + .../mach-realview/{include/mach => }/irqs-pba8.h | 23 - + .../mach-realview/{include/mach => }/irqs-pbx.h | 24 +- + .../mach-realview/{include/mach => }/platform.h | 2 - + arch/arm/mach-realview/platsmp-dt.c | 91 +++ + arch/arm/mach-realview/platsmp.c | 10 +- + arch/arm/mach-realview/realview-dt.c | 1 - + arch/arm/mach-realview/realview_eb.c | 13 +- + arch/arm/mach-realview/realview_pb1176.c | 6 +- + arch/arm/mach-realview/realview_pb11mp.c | 12 +- + arch/arm/mach-realview/realview_pba8.c | 14 +- + arch/arm/mach-realview/realview_pbx.c | 14 +- + arch/arm/mach-rockchip/Kconfig | 3 +- + arch/arm/mach-rockchip/platsmp.c | 47 +- + arch/arm/mach-rockchip/rockchip.c | 1 + + arch/arm/mach-s3c24xx/include/mach/pm-core.h | 14 + + arch/arm/mach-s3c24xx/irq-pm.c | 11 +- + arch/arm/mach-s3c64xx/Kconfig | 31 +- + arch/arm/mach-s3c64xx/Makefile | 24 +- + arch/arm/mach-s3c64xx/common.c | 5 +- + arch/arm/mach-s3c64xx/cpuidle.c | 5 +- + arch/arm/mach-s3c64xx/dev-uart.c | 1 + + arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 38 - + arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h | 3 + + arch/arm/mach-s3c64xx/include/mach/irqs.h | 20 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 9 +- + arch/arm/mach-s3c64xx/irq-pm.c | 2 +- + arch/arm/mach-s3c64xx/mach-anw6410.c | 3 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 6 + + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 + + arch/arm/mach-s3c64xx/mach-hmt.c | 2 + + arch/arm/mach-s3c64xx/mach-mini6410.c | 5 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 2 + + arch/arm/mach-s3c64xx/mach-real6410.c | 6 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 16 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 2 + + arch/arm/mach-s3c64xx/mach-smartq7.c | 2 + + arch/arm/mach-s3c64xx/mach-smdk6400.c | 3 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 6 +- + arch/arm/mach-s3c64xx/pl080.c | 4 + + arch/arm/mach-s3c64xx/pm.c | 4 + + arch/arm/mach-s3c64xx/s3c6400.c | 2 +- + arch/arm/mach-s3c64xx/s3c6410.c | 2 +- + arch/arm/mach-s5pv210/Kconfig | 3 +- + arch/arm/mach-sa1100/simpad.c | 4 +- + arch/arm/mach-shmobile/Kconfig | 14 +- + arch/arm/mach-shmobile/include/mach/irqs.h | 10 - + arch/arm/mach-shmobile/irqs.h | 15 - + arch/arm/mach-shmobile/r8a7779.h | 2 +- + arch/arm/mach-shmobile/r8a7790.h | 2 +- + arch/arm/mach-shmobile/r8a7791.h | 2 +- + arch/arm/mach-shmobile/setup-emev2.c | 2 +- + arch/arm/mach-shmobile/setup-r8a7778.c | 1 - + arch/arm/mach-shmobile/sh73a0.h | 2 +- + arch/arm/mach-shmobile/smp-emev2.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7779.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7790.c | 2 +- + arch/arm/mach-shmobile/smp-r8a7791.c | 2 +- + arch/arm/mach-shmobile/smp-sh73a0.c | 2 +- + arch/arm/mach-socfpga/Kconfig | 3 +- + arch/arm/mach-socfpga/platsmp.c | 4 +- + arch/arm/mach-spear/Kconfig | 3 +- + arch/arm/mach-spear/generic.h | 2 +- + arch/arm/mach-spear/platsmp.c | 2 +- + arch/arm/mach-sti/Kconfig | 3 +- + arch/arm/mach-sti/platsmp.c | 2 +- + arch/arm/mach-sti/smp.h | 2 +- + arch/arm/mach-sunxi/Kconfig | 3 +- + arch/arm/mach-sunxi/platsmp.c | 4 +- + arch/arm/mach-tango/Kconfig | 12 + + arch/arm/mach-tango/Makefile | 5 + + arch/arm/mach-tango/platsmp.c | 16 + + arch/arm/mach-tango/setup.c | 17 + + arch/arm/mach-tango/smc.S | 9 + + arch/arm/mach-tango/smc.h | 5 + + arch/arm/mach-tegra/Kconfig | 3 +- + arch/arm/mach-tegra/common.h | 2 +- + arch/arm/mach-tegra/platsmp.c | 2 +- + arch/arm/mach-u300/Kconfig | 4 +- + arch/arm/mach-uniphier/Kconfig | 1 + + arch/arm/mach-uniphier/platsmp.c | 2 +- + arch/arm/mach-ux500/Kconfig | 4 +- + arch/arm/mach-ux500/Makefile | 2 +- + arch/arm/mach-ux500/cpu-db8500.c | 2 - + arch/arm/mach-ux500/cpu.c | 1 - + arch/arm/mach-ux500/platsmp.c | 2 +- + arch/arm/mach-ux500/setup.h | 3 - + arch/arm/mach-ux500/timer.c | 48 -- + arch/arm/mach-versatile/Kconfig | 41 +- + arch/arm/mach-versatile/Makefile | 6 +- + arch/arm/mach-versatile/Makefile.boot | 4 - + arch/arm/mach-versatile/core.c | 808 --------------------- + arch/arm/mach-versatile/core.h | 46 -- + arch/arm/mach-versatile/include/mach/clkdev.h | 16 - + arch/arm/mach-versatile/include/mach/hardware.h | 38 - + arch/arm/mach-versatile/include/mach/irqs.h | 134 ---- + arch/arm/mach-versatile/include/mach/platform.h | 416 ----------- + arch/arm/mach-versatile/include/mach/uncompress.h | 45 -- + arch/arm/mach-versatile/pci.c | 368 ---------- + arch/arm/mach-versatile/versatile_ab.c | 44 -- + arch/arm/mach-versatile/versatile_dt.c | 376 +++++++++- + arch/arm/mach-versatile/versatile_pb.c | 91 --- + arch/arm/mach-vexpress/Kconfig | 3 +- + arch/arm/mach-vexpress/core.h | 2 +- + arch/arm/mach-vexpress/platsmp.c | 2 +- + arch/arm/mach-w90x900/cpu.c | 4 +- + .../arm/mach-w90x900/{include/mach => }/regs-ebi.h | 0 + .../arm/mach-w90x900/{include/mach => }/regs-gcr.h | 0 + .../mach-w90x900/{include/mach => }/regs-timer.h | 0 + .../arm/mach-w90x900/{include/mach => }/regs-usb.h | 0 + arch/arm/mach-w90x900/time.c | 2 +- + arch/arm/mach-zx/Kconfig | 3 +- + arch/arm/mach-zx/platsmp.c | 2 +- + arch/arm/mach-zynq/Kconfig | 4 +- + arch/arm/mach-zynq/common.h | 2 +- + arch/arm/mach-zynq/platsmp.c | 2 +- + arch/arm/mm/Kconfig | 32 +- + arch/arm/mm/idmap.c | 2 +- + arch/arm/mm/mmu.c | 2 +- + arch/arm/mm/proc-mohawk.S | 2 + + arch/arm/plat-omap/dmtimer.c | 42 +- + arch/arm/plat-orion/common.c | 21 - + arch/arm/plat-orion/include/plat/common.h | 2 - + arch/arm/plat-orion/irq.c | 1 - + arch/arm/plat-orion/mpp.c | 1 - + arch/arm/plat-pxa/Makefile | 3 +- + arch/arm/plat-pxa/ssp.c | 1 - + arch/arm/plat-samsung/Kconfig | 5 +- + arch/arm/plat-samsung/Makefile | 5 +- + arch/arm/plat-samsung/devs.c | 22 +- + .../gpio => arch/arm/plat-samsung}/gpio-samsung.c | 12 +- + arch/arm/plat-samsung/include/plat/pm.h | 8 - + arch/arm/plat-samsung/init.c | 5 + + arch/arm/plat-samsung/pm.c | 4 - + arch/arm64/Kconfig.platforms | 25 + + arch/arm64/boot/dts/Makefile | 2 + + arch/arm64/boot/dts/apm/apm-merlin.dts | 12 + + arch/arm64/boot/dts/apm/apm-mustang.dts | 4 + + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 391 +++++++++- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 114 ++- + arch/arm64/boot/dts/arm/juno-r1.dts | 28 + + arch/arm64/boot/dts/arm/juno.dts | 28 + + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 26 +- + arch/arm64/boot/dts/broadcom/ns2.dtsi | 200 ++++- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 282 ++++++- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 7 + + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 116 +++ + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 527 ++++++++++++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 68 ++ + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 + + arch/arm64/boot/dts/hisilicon/hi6220.dtsi | 1 + + arch/arm64/boot/dts/marvell/berlin4ct.dtsi | 63 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 13 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 35 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 18 + + arch/arm64/boot/dts/qcom/msm8916-mtp.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8916-mtp.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 19 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 107 +++ + arch/arm64/boot/dts/qcom/pm8916.dtsi | 6 +- + arch/arm64/boot/dts/renesas/Makefile | 4 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 251 +++++++ + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 779 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../arm64/boot/dts/rockchip/rk3368-evb-act8846.dts | 176 +++++ + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 281 +++++++ + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 6 + + arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi | 112 +++ + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 105 ++- + arch/arm64/boot/dts/socionext/Makefile | 4 + + .../boot/dts/socionext/uniphier-ph1-ld10-ref.dts | 95 +++ + .../boot/dts/socionext/uniphier-ph1-ld10.dtsi | 280 +++++++ + .../arm64/boot/dts/socionext/uniphier-pinctrl.dtsi | 1 + + .../boot/dts/socionext/uniphier-support-card.dtsi | 1 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 + + arch/arm64/configs/defconfig | 27 +- + drivers/bus/Kconfig | 8 + + drivers/bus/Makefile | 1 + + drivers/bus/uniphier-system-bus.c | 281 +++++++ + drivers/clk/bcm/Kconfig | 10 + + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm63xx.c | 22 + + drivers/clk/imx/clk-imx25.c | 18 +- + drivers/clk/imx/clk-imx51-imx53.c | 8 +- + drivers/clk/imx/clk-imx6q.c | 3 +- + drivers/clk/imx/clk-imx6ul.c | 4 +- + drivers/clk/imx/clk-imx7d.c | 11 +- + drivers/clk/imx/clk-pllv3.c | 14 + + drivers/clk/mmp/clk-mmp2.c | 11 +- + drivers/clk/mmp/clk-pxa168.c | 11 +- + drivers/clk/mmp/clk-pxa910.c | 13 +- + drivers/clk/pxa/clk-pxa25x.c | 1 - + drivers/clk/samsung/clk-exynos4.c | 1 + + drivers/clk/ti/clk-814x.c | 4 + + drivers/clk/versatile/Kconfig | 5 +- + drivers/clk/versatile/clk-icst.c | 194 ++++- + drivers/clk/versatile/clk-realview.c | 10 +- + drivers/clocksource/clksrc-dbx500-prcmu.c | 9 +- + drivers/gpio/Kconfig | 7 - + drivers/gpio/Makefile | 1 - + drivers/iio/adc/exynos_adc.c | 224 +++++- + drivers/input/touchscreen/Kconfig | 2 +- + drivers/irqchip/irq-versatile-fpga.c | 5 - + drivers/memory/tegra/tegra124.c | 1 + + drivers/reset/Kconfig | 1 + + drivers/reset/Makefile | 3 +- + drivers/reset/core.c | 60 +- + drivers/reset/hisilicon/Kconfig | 5 + + drivers/reset/hisilicon/Makefile | 1 + + drivers/reset/hisilicon/hi6220_reset.c | 109 +++ + drivers/reset/reset-ath79.c | 30 +- + drivers/reset/reset-berlin.c | 4 +- + drivers/reset/reset-socfpga.c | 3 +- + drivers/reset/reset-sunxi.c | 5 +- + drivers/reset/reset-zynq.c | 3 +- + drivers/reset/sti/reset-stih407.c | 5 + + drivers/reset/sti/reset-syscfg.c | 27 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 2 + + drivers/soc/bcm/Kconfig | 9 + + drivers/soc/bcm/Makefile | 1 + + drivers/soc/bcm/raspberrypi-power.c | 247 +++++++ + drivers/soc/dove/pmu.c | 43 ++ + drivers/soc/mediatek/mtk-scpsys.c | 32 +- + drivers/soc/qcom/Kconfig | 27 + + drivers/soc/qcom/Makefile | 4 + + drivers/soc/qcom/smd-rpm.c | 2 + + drivers/soc/qcom/smem_state.c | 201 +++++ + drivers/soc/qcom/smp2p.c | 578 +++++++++++++++ + drivers/soc/qcom/smsm.c | 625 ++++++++++++++++ + drivers/soc/qcom/wcnss_ctrl.c | 272 +++++++ + drivers/soc/ti/Kconfig | 10 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/wkup_m3_ipc.c | 508 +++++++++++++ + drivers/soc/versatile/soc-realview.c | 4 + + drivers/staging/board/armadillo800eva.c | 2 +- + drivers/staging/board/kzm9d.c | 2 +- + drivers/tty/serial/Kconfig | 2 +- + include/dt-bindings/clock/exynos4.h | 1 + + include/dt-bindings/clock/imx7d-clock.h | 3 +- + include/dt-bindings/clock/r8a7791-clock.h | 1 + + include/dt-bindings/clock/r8a7794-clock.h | 1 + + include/dt-bindings/clock/rk3036-cru.h | 193 +++++ + include/dt-bindings/clock/rk3228-cru.h | 220 ++++++ + include/dt-bindings/clock/rk3288-cru.h | 4 + + include/dt-bindings/clock/sh73a0-clock.h | 6 +- + include/dt-bindings/pinctrl/am43xx.h | 6 + + include/dt-bindings/pinctrl/dm814x.h | 48 ++ + include/dt-bindings/pinctrl/dra.h | 6 + + include/dt-bindings/pinctrl/omap.h | 3 +- + include/dt-bindings/power/raspberrypi-power.h | 41 ++ + include/dt-bindings/reset/hisi,hi6220-resets.h | 67 ++ + .../{reset-controller => reset}/mt8135-resets.h | 0 + .../{reset-controller => reset}/mt8173-resets.h | 0 + include/dt-bindings/reset/stih407-resets.h | 4 + + include/linux/clk/mmp.h | 17 + + include/linux/clk/ti.h | 1 + + include/linux/clksrc-dbx500-prcmu.h | 20 - + include/linux/mtd/nand.h | 5 + + include/linux/platform_data/iommu-omap.h | 9 - + include/linux/platform_data/touchscreen-s3c2410.h | 1 + + include/linux/reset.h | 17 +- + include/linux/soc/dove/pmu.h | 19 + + include/linux/soc/qcom/smem_state.h | 18 + + include/linux/wkup_m3_ipc.h | 55 ++ + include/soc/bcm2835/raspberrypi-firmware.h | 2 + + sound/soc/samsung/smartq_wm8987.c | 76 +- + 1021 files changed, 32372 insertions(+), 9266 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/bcm/brcm,nsp-cpu-method.txt + create mode 100644 Documentation/devicetree/bindings/arm/compulab-boards.txt + create mode 100644 Documentation/devicetree/bindings/arm/technologic.txt + create mode 100644 Documentation/devicetree/bindings/bus/uniphier-system-bus.txt + create mode 100644 Documentation/devicetree/bindings/clock/arm-syscon-icst.txt + create mode 100644 Documentation/devicetree/bindings/clock/dove-divider-clock.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/startek,startek-kd050c.txt + create mode 100644 Documentation/devicetree/bindings/reset/hisilicon,hi6220-reset.txt + create mode 100644 Documentation/devicetree/bindings/soc/bcm/raspberrypi,bcm2835-power.txt + create mode 100644 Documentation/devicetree/bindings/soc/dove/pmu.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smp2p.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smsm.txt + create mode 100644 Documentation/devicetree/bindings/soc/ti/wkup_m3_ipc.txt + rename Documentation/devicetree/bindings/watchdog/{meson6-wdt.txt => meson-wdt.txt} (75%) + create mode 100644 Documentation/devicetree/bindings/watchdog/sp805-wdt.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-cm-t335.dts + create mode 100644 arch/arm/boot/dts/am335x-sbc-t335.dts + create mode 100644 arch/arm/boot/dts/am335x-shc.dts + create mode 100644 arch/arm/boot/dts/am437x-cm-t43.dts + create mode 100644 arch/arm/boot/dts/am437x-sbc-t43.dts + create mode 100644 arch/arm/boot/dts/am57xx-cl-som-am57x.dts + create mode 100644 arch/arm/boot/dts/am57xx-sbc-am57x.dts + create mode 100644 arch/arm/boot/dts/arm-realview-pb11mp.dts + create mode 100644 arch/arm/boot/dts/armada-388-clearfog.dts + create mode 100644 arch/arm/boot/dts/armada-38x-solidrun-microsom.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi + create mode 100644 arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts + create mode 100644 arch/arm/boot/dts/at91-vinco.dts + create mode 100644 arch/arm/boot/dts/bcm2836-rpi-2-b.dts + create mode 100644 arch/arm/boot/dts/bcm2836.dtsi + create mode 100644 arch/arm/boot/dts/bcm283x.dtsi + create mode 100644 arch/arm/boot/dts/bcm94708.dts + create mode 100644 arch/arm/boot/dts/bcm94709.dts + create mode 100644 arch/arm/boot/dts/bcm953012k.dts + create mode 100644 arch/arm/boot/dts/compulab-sb-som.dtsi + create mode 100644 arch/arm/boot/dts/dra62x-clocks.dtsi + create mode 100644 arch/arm/boot/dts/dra62x-j5eco-evm.dts + create mode 100644 arch/arm/boot/dts/dra62x.dtsi + create mode 100644 arch/arm/boot/dts/imx51-ts4800.dts + create mode 100644 arch/arm/boot/dts/imx6q-novena.dts + create mode 100644 arch/arm/boot/dts/imx7d-cl-som-imx7.dts + create mode 100644 arch/arm/boot/dts/imx7d-sbc-imx7.dts + create mode 100644 arch/arm/boot/dts/kirkwood-nsa325.dts + create mode 100644 arch/arm/boot/dts/kirkwood-pogoplug-series-4.dts + rename arch/arm/{mach-netx/include/mach/param.h => boot/dts/mt2701-evb.dts} (50%) + create mode 100644 arch/arm/boot/dts/mt2701.dtsi + create mode 100644 arch/arm/boot/dts/qcom-apq8064-sony-xperia-yuga.dts + delete mode 100644 arch/arm/boot/dts/r8a7791-henninger.dts + create mode 100644 arch/arm/boot/dts/rk3036-evb.dts + create mode 100644 arch/arm/boot/dts/rk3036-kylin.dts + create mode 100644 arch/arm/boot/dts/rk3036.dtsi + create mode 100644 arch/arm/boot/dts/rk3228-evb.dts + create mode 100644 arch/arm/boot/dts/rk3228.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron-brain.dts + create mode 100644 arch/arm/boot/dts/rk3288-veyron-mickey.dts + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_mcv.dtsi + create mode 100644 arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts + create mode 100644 arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts + create mode 100644 arch/arm/boot/dts/sun7i-a20-icnova-swac.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3.dtsi + create mode 100644 arch/arm/boot/dts/tango4-common.dtsi + create mode 100644 arch/arm/boot/dts/tango4-smp8758.dtsi + create mode 100644 arch/arm/boot/dts/tango4-vantage-1172.dts + delete mode 100644 arch/arm/boot/dts/tps65217.dtsi + create mode 100644 arch/arm/boot/dts/uniphier-common32.dtsi + create mode 100644 arch/arm/boot/dts/vf610m4-cosmic.dts + create mode 100644 arch/arm/configs/pxa_defconfig + rename arch/arm/{mach-footbridge/include/mach/debug-macro.S => include/debug/dc21285.S} (100%) + rename arch/arm/mach-bcm/{kona_smp.c => platsmp.c} (62%) + rename arch/arm/mach-davinci/{include/mach => }/cp_intc.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/cpuidle.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/ddr2.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/psc.h (100%) + rename arch/arm/mach-davinci/{include/mach => }/sram.h (100%) + delete mode 100644 arch/arm/mach-dove/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-iop13xx/include/mach/pci.h + rename arch/arm/mach-iop13xx/{include/mach => }/msi.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/devices.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-hpna.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-lan.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-mem.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-pci.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-sys.h (100%) + rename arch/arm/mach-ks8695/{include/mach => }/regs-wan.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/addr-map.h (96%) + rename arch/arm/mach-mmp/{include/mach => }/cputype.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/devices.h (100%) + delete mode 100644 arch/arm/mach-mmp/include/mach/dma.h + delete mode 100644 arch/arm/mach-mmp/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mmp/include/mach/regs-smc.h + delete mode 100644 arch/arm/mach-mmp/include/mach/uncompress.h + rename arch/arm/mach-mmp/{include/mach => }/irqs.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-mmp2.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-pxa168.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp-pxa910.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/mfp.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/mmp2.h (99%) + rename arch/arm/mach-mmp/{include/mach => }/pm-mmp2.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/pm-pxa910.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/pxa168.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/pxa910.h (98%) + rename arch/arm/mach-mmp/{include/mach => }/regs-apbc.h (88%) + rename arch/arm/mach-mmp/{include/mach => }/regs-apmu.h (91%) + rename arch/arm/mach-mmp/{include/mach => }/regs-icu.h (96%) + rename arch/arm/mach-mmp/{include/mach => }/regs-timers.h (93%) + rename arch/arm/mach-mmp/{include/mach => }/regs-usb.h (100%) + rename arch/arm/mach-mmp/{include/mach => }/teton_bga.h (92%) + rename arch/arm/mach-mv78xx0/{include/mach => }/bridge-regs.h (92%) + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/hardware.h + delete mode 100644 arch/arm/mach-mv78xx0/include/mach/uncompress.h + rename arch/arm/mach-mv78xx0/{include/mach => }/irqs.h (95%) + rename arch/arm/mach-mv78xx0/{include/mach => }/mv78xx0.h (98%) + delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h + rename arch/arm/mach-omap1/{include/mach => }/board-sx1.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/camera.h (100%) + rename arch/arm/mach-omap1/{include/mach => }/flash.h (100%) + delete mode 100644 arch/arm/mach-omap2/omap-iommu.c + rename arch/arm/mach-orion5x/{include/mach => }/bridge-regs.h (92%) + delete mode 100644 arch/arm/mach-orion5x/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-orion5x/include/mach/hardware.h + delete mode 100644 arch/arm/mach-orion5x/include/mach/uncompress.h + rename arch/arm/mach-orion5x/{include/mach => }/irqs.h (94%) + rename arch/arm/mach-orion5x/{include/mach => }/orion5x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/colibri.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/csb726.h (93%) + rename arch/arm/mach-pxa/{include/mach => }/eseries-irq.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/gumstix.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/h5000.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/idp.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/littleton.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/lpd270.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa25x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa27x.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa2xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa300.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa320.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa3xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mfp-pxa930.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/mioa701.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/mxm8x10.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palm27x.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmt5.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/palmte2.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmtreo.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/palmz72.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pcm027.h (98%) + rename arch/arm/mach-pxa/{include/mach => }/pcm990_baseboard.h (99%) + rename arch/arm/mach-pxa/{include/mach => }/pm.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa25x.h (84%) + rename arch/arm/mach-pxa/{include/mach => }/pxa27x-udc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa27x.h (97%) + rename arch/arm/mach-pxa/{include/mach => }/pxa300.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/pxa320.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/pxa3xx.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/pxa930.h (59%) + rename arch/arm/mach-pxa/{include/mach => }/regs-rtc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/regs-u2d.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/sharpsl_pm.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/tosa_bt.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/udc.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/viper.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/zeus.h (100%) + rename arch/arm/mach-pxa/{include/mach => }/zylonite.h (100%) + rename arch/arm/mach-realview/{include/mach => }/board-eb.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pb1176.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pb11mp.h (98%) + rename arch/arm/mach-realview/{include/mach => }/board-pba8.h (97%) + rename arch/arm/mach-realview/{include/mach => }/board-pbx.h (98%) + rename arch/arm/mach-realview/{include/mach => }/hardware.h (95%) + delete mode 100644 arch/arm/mach-realview/include/mach/barriers.h + delete mode 100644 arch/arm/mach-realview/include/mach/irqs.h + delete mode 100644 arch/arm/mach-realview/include/mach/memory.h + delete mode 100644 arch/arm/mach-realview/include/mach/uncompress.h + rename arch/arm/mach-realview/{include/mach => }/irqs-eb.h (91%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pb1176.h (87%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pb11mp.h (90%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pba8.h (87%) + rename arch/arm/mach-realview/{include/mach => }/irqs-pbx.h (90%) + rename arch/arm/mach-realview/{include/mach => }/platform.h (99%) + create mode 100644 arch/arm/mach-realview/platsmp-dt.c + delete mode 100644 arch/arm/mach-s3c64xx/include/mach/debug-macro.S + delete mode 100644 arch/arm/mach-shmobile/include/mach/irqs.h + delete mode 100644 arch/arm/mach-shmobile/irqs.h + create mode 100644 arch/arm/mach-tango/Kconfig + create mode 100644 arch/arm/mach-tango/Makefile + create mode 100644 arch/arm/mach-tango/platsmp.c + create mode 100644 arch/arm/mach-tango/setup.c + create mode 100644 arch/arm/mach-tango/smc.S + create mode 100644 arch/arm/mach-tango/smc.h + delete mode 100644 arch/arm/mach-ux500/timer.c + delete mode 100644 arch/arm/mach-versatile/Makefile.boot + delete mode 100644 arch/arm/mach-versatile/core.c + delete mode 100644 arch/arm/mach-versatile/core.h + delete mode 100644 arch/arm/mach-versatile/include/mach/clkdev.h + delete mode 100644 arch/arm/mach-versatile/include/mach/hardware.h + delete mode 100644 arch/arm/mach-versatile/include/mach/irqs.h + delete mode 100644 arch/arm/mach-versatile/include/mach/platform.h + delete mode 100644 arch/arm/mach-versatile/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-versatile/pci.c + delete mode 100644 arch/arm/mach-versatile/versatile_ab.c + delete mode 100644 arch/arm/mach-versatile/versatile_pb.c + rename arch/arm/mach-w90x900/{include/mach => }/regs-ebi.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-gcr.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-timer.h (100%) + rename arch/arm/mach-w90x900/{include/mach => }/regs-usb.h (100%) + rename {drivers/gpio => arch/arm/plat-samsung}/gpio-samsung.c (99%) + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/Makefile + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a7795.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-thermal.dtsi + create mode 100644 arch/arm64/boot/dts/socionext/Makefile + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ph1-ld10-ref.dts + create mode 100644 arch/arm64/boot/dts/socionext/uniphier-ph1-ld10.dtsi + create mode 120000 arch/arm64/boot/dts/socionext/uniphier-pinctrl.dtsi + create mode 120000 arch/arm64/boot/dts/socionext/uniphier-support-card.dtsi + create mode 100644 drivers/bus/uniphier-system-bus.c + create mode 100644 drivers/clk/bcm/clk-bcm63xx.c + create mode 100644 drivers/reset/hisilicon/Kconfig + create mode 100644 drivers/reset/hisilicon/Makefile + create mode 100644 drivers/reset/hisilicon/hi6220_reset.c + create mode 100644 drivers/soc/bcm/Kconfig + create mode 100644 drivers/soc/bcm/Makefile + create mode 100644 drivers/soc/bcm/raspberrypi-power.c + create mode 100644 drivers/soc/qcom/smem_state.c + create mode 100644 drivers/soc/qcom/smp2p.c + create mode 100644 drivers/soc/qcom/smsm.c + create mode 100644 drivers/soc/qcom/wcnss_ctrl.c + create mode 100644 drivers/soc/ti/wkup_m3_ipc.c + create mode 100644 include/dt-bindings/clock/rk3036-cru.h + create mode 100644 include/dt-bindings/clock/rk3228-cru.h + create mode 100644 include/dt-bindings/pinctrl/dm814x.h + create mode 100644 include/dt-bindings/power/raspberrypi-power.h + create mode 100644 include/dt-bindings/reset/hisi,hi6220-resets.h + rename include/dt-bindings/{reset-controller => reset}/mt8135-resets.h (100%) + rename include/dt-bindings/{reset-controller => reset}/mt8173-resets.h (100%) + create mode 100644 include/linux/clk/mmp.h + delete mode 100644 include/linux/clksrc-dbx500-prcmu.h + create mode 100644 include/linux/soc/qcom/smem_state.h + create mode 100644 include/linux/wkup_m3_ipc.h +Merging at91/at91-next (f2837af0c89d Merge branch 'at91-4.5-defconfig' into at91-next) +$ git merge at91/at91-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (b2776bf7149b Linux 3.18) +$ git merge bcm2835/for-next +Already up-to-date. +Merging bcm2835-dt/bcm2835-dt-next (53b6084357a4 ARM: bcm2835: Add the auxiliary clocks to the device tree.) +$ git merge bcm2835-dt/bcm2835-dt-next +Merge made by the 'recursive' strategy. +Merging bcm2835-soc/bcm2835-soc-next (5234c34e4cd7 ARM: bcm2835: Add Kconfig support for bcm2836) +$ git merge bcm2835-soc/bcm2835-soc-next +Already up-to-date. +Merging bcm2835-drivers/bcm2835-drivers-next (a09cd356586d ARM: bcm2835: add rpi power domain driver) +$ git merge bcm2835-drivers/bcm2835-drivers-next +Already up-to-date. +Merging bcm2835-defconfig/bcm2835-defconfig-next (b63074fccbeb ARM: bcm2835: enable auxiliary spi driver in defconfig) +$ git merge bcm2835-defconfig/bcm2835-defconfig-next +Merge made by the 'recursive' strategy. +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 (c6abe665c94f Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging keystone/next (99d59777c089 Merge branch 'for_4.4-rcx/drivers-soc' into next) +$ git merge keystone/next +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (12bd4032ea2f Merge branch 'mvebu/defconfig' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + .../pinctrl/marvell,armada-370-pinctrl.txt | 5 ++- + arch/arm/boot/dts/armada-370-mirabox.dts | 2 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 2 +- + arch/arm/boot/dts/armada-370-synology-ds213j.dts | 2 +- + arch/arm/boot/dts/armada-388-gp.dts | 36 +++++++++++----------- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 1 + + 6 files changed, 26 insertions(+), 22 deletions(-) +Merging omap/for-next (95c5bf2f0552 Merge branch 'omap-for-v4.4/fixes' into for-next) +$ git merge omap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging omap-pending/for-next (30aa18d3bea5 MAINTAINERS: add maintainer for OMAP hwmod data) +$ git merge omap-pending/for-next +Resolved 'arch/arm/mach-omap2/omap_hwmod_43xx_data.c' using previous resolution. +Resolved 'arch/arm/mach-omap2/omap_hwmod_7xx_data.c' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_43xx_data.c +CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_43xx_data.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 032f733ca4e6] Merge remote-tracking branch 'omap-pending/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging qcom/for-next (e654927c5ff7 ARM: qcom: Drop ARCH_MSM* configs) +$ git merge qcom/for-next +Auto-merging arch/arm/mach-qcom/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../devicetree/bindings/clock/qcom,gcc.txt | 1 + + .../devicetree/bindings/clock/qcom,mmcc.txt | 1 + + .../devicetree/bindings/firmware/qcom,scm.txt | 25 + + arch/arm/Makefile | 3 +- + arch/arm/boot/dts/qcom-msm8974.dtsi | 11 + + arch/arm/mach-qcom/Kconfig | 17 +- + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/msm8996-mtp.dts | 21 + + arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi | 30 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 267 ++ + arch/arm64/boot/dts/qcom/pm8004.dtsi | 19 + + arch/arm64/boot/dts/qcom/pm8994.dtsi | 62 + + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 19 + + drivers/clk/clk-divider.c | 9 +- + drivers/clk/qcom/Kconfig | 17 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 355 ++ + drivers/clk/qcom/clk-alpha-pll.h | 57 + + drivers/clk/qcom/clk-rcg.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 87 + + drivers/clk/qcom/gcc-msm8996.c | 3422 ++++++++++++++++++++ + drivers/clk/qcom/mmcc-msm8996.c | 3217 ++++++++++++++++++ + 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/dt-bindings/clock/qcom,gcc-msm8996.h | 339 ++ + include/dt-bindings/clock/qcom,mmcc-msm8996.h | 285 ++ + include/linux/qcom_scm.h | 6 + + 30 files changed, 8644 insertions(+), 22 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/qcom,scm.txt + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8996-mtp.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8996.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8004.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8994.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmi8994.dtsi + create mode 100644 drivers/clk/qcom/clk-alpha-pll.c + create mode 100644 drivers/clk/qcom/clk-alpha-pll.h + create mode 100644 drivers/clk/qcom/gcc-msm8996.c + create mode 100644 drivers/clk/qcom/mmcc-msm8996.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8996.h + create mode 100644 include/dt-bindings/clock/qcom,mmcc-msm8996.h +Merging renesas/next (23a0d0a54a30 Merge branch 'heads/dt-fixes-for-v4.5' into next) +$ git merge renesas/next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r8a7778-bockw.dts | 1 + + arch/arm/boot/dts/r8a7790-lager.dts | 1 + + arch/arm/boot/dts/r8a7791-koelsch.dts | 1 + + arch/arm/boot/dts/r8a7791-porter.dts | 1 + + arch/arm/boot/dts/r8a7793-gose.dts | 1 + + arch/arm/boot/dts/r8a7794-silk.dts | 1 + + drivers/sh/clk/core.c | 100 ++++------------------------------ + include/linux/sh_clk.h | 4 -- + 8 files changed, 18 insertions(+), 92 deletions(-) +Merging rockchip/for-next (755651cf0f31 Merge tag 'v4.4-rc5' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../bindings/clock/rockchip,rk3036-cru.txt | 56 ++ + .../bindings/clock/rockchip,rk3228-cru.txt | 58 ++ + arch/arm/mach-rockchip/rockchip.c | 44 +- + drivers/clk/rockchip/Makefile | 2 + + drivers/clk/rockchip/clk-cpu.c | 4 +- + drivers/clk/rockchip/clk-pll.c | 258 +++++++- + drivers/clk/rockchip/clk-rk3036.c | 478 +++++++++++++++ + drivers/clk/rockchip/clk-rk3188.c | 2 +- + drivers/clk/rockchip/clk-rk3228.c | 678 +++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3288.c | 42 +- + drivers/clk/rockchip/clk-rk3368.c | 13 +- + drivers/clk/rockchip/clk.c | 7 +- + drivers/clk/rockchip/clk.h | 43 +- + 13 files changed, 1635 insertions(+), 50 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.txt + create mode 100644 drivers/clk/rockchip/clk-rk3036.c + create mode 100644 drivers/clk/rockchip/clk-rk3228.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 (8005c49d9aea Linux 4.4-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (94c286811b3b Merge branch 'next/defconfig' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/samsung-pinctrl.txt | 1 + + arch/arm64/Kconfig.platforms | 11 +-- + arch/arm64/boot/dts/exynos/Makefile | 2 +- + arch/arm64/configs/defconfig | 2 +- + drivers/clk/samsung/Kconfig | 6 ++ + drivers/clk/samsung/Makefile | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 103 +++++++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 + + drivers/pinctrl/samsung/pinctrl-samsung.h | 1 + + 9 files changed, 119 insertions(+), 13 deletions(-) +Merging sunxi/sunxi/for-next (97dd53d76893 Merge branches 'sunxi/clocks-for-4.5' and 'sunxi/dt-for-4.5' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/clock/sunxi.txt | 10 + + drivers/clk/sunxi/Makefile | 5 + + drivers/clk/sunxi/clk-a10-ve.c | 171 +++++++++++++++ + drivers/clk/sunxi/clk-simple-gates.c | 14 ++ + drivers/clk/sunxi/clk-sun8i-apb0.c | 80 ++++++-- + drivers/clk/sunxi/clk-sun8i-bus-gates.c | 112 ++++++++++ + drivers/clk/sunxi/clk-sun9i-cpus.c | 240 ++++++++++++++++++++++ + drivers/clk/sunxi/clk-sunxi.c | 6 + + drivers/clk/sunxi/clk-usb.c | 12 ++ + 9 files changed, 638 insertions(+), 12 deletions(-) + create mode 100644 drivers/clk/sunxi/clk-a10-ve.c + create mode 100644 drivers/clk/sunxi/clk-sun8i-bus-gates.c + create mode 100644 drivers/clk/sunxi/clk-sun9i-cpus.c +Merging tegra/for-next (92b100361a4e Merge branch for-4.5/defconfig into for-next) +$ git merge tegra/for-next +Resolved 'arch/arm/mach-tegra/Kconfig' using previous resolution. +Auto-merging drivers/soc/Kconfig +Auto-merging arch/arm64/boot/dts/Makefile +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/mach-tegra/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-tegra/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5b781c58d4a5] Merge remote-tracking branch 'tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/nvidia,tegra210-car.txt | 56 + + arch/arm/mach-tegra/Kconfig | 54 +- + arch/arm/mach-tegra/sleep-tegra20.S | 3 + + arch/arm/mach-tegra/sleep-tegra30.S | 3 + + arch/arm64/Kconfig.platforms | 12 - + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/nvidia/Makefile | 7 + + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 1130 ++++++++ + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 990 +++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 45 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 9 + + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 50 + + arch/arm64/boot/dts/nvidia/tegra210-p2571.dts | 1302 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 1272 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 1270 +++++++++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 805 ++++++ + drivers/amba/Kconfig | 2 +- + drivers/clk/tegra/Makefile | 1 + + drivers/clk/tegra/clk-id.h | 75 +- + drivers/clk/tegra/clk-pll.c | 838 ++++-- + drivers/clk/tegra/clk-tegra-periph.c | 371 ++- + drivers/clk/tegra/clk-tegra-super-gen4.c | 142 +- + drivers/clk/tegra/clk-tegra114.c | 339 +-- + drivers/clk/tegra/clk-tegra124.c | 453 ++-- + drivers/clk/tegra/clk-tegra20.c | 314 ++- + drivers/clk/tegra/clk-tegra210.c | 2852 ++++++++++++++++++++ + drivers/clk/tegra/clk-tegra30.c | 426 +-- + drivers/clk/tegra/clk.h | 101 +- + drivers/soc/Kconfig | 1 + + drivers/soc/tegra/Kconfig | 83 + + drivers/usb/host/Kconfig | 2 + + include/dt-bindings/clock/tegra210-car.h | 401 +++ + 33 files changed, 12423 insertions(+), 996 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nvidia,tegra210-car.txt + create mode 100644 arch/arm64/boot/dts/nvidia/Makefile + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132-norrin.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra132.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-0000.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2571.dts + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210.dtsi + create mode 100644 drivers/clk/tegra/clk-tegra210.c + create mode 100644 drivers/soc/tegra/Kconfig + create mode 100644 include/dt-bindings/clock/tegra210-car.h +Merging arm64/for-next/core (2a803c4db615 arm64: head.S: use memset to clear BSS) +$ git merge arm64/for-next/core +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging arch/arm64/kernel/vmlinux.lds.S +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/Kconfig +Merge made by the 'recursive' strategy. + Documentation/arm64/silicon-errata.txt | 58 +++++ + .../features/time/irq-time-acct/arch-support.txt | 2 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/include/asm/alternative.h | 1 - + arch/arm64/include/asm/assembler.h | 11 + + arch/arm64/include/asm/cacheflush.h | 1 + + arch/arm64/include/asm/cmpxchg.h | 1 - + arch/arm64/include/asm/ftrace.h | 2 + + arch/arm64/include/asm/hugetlb.h | 44 ++-- + arch/arm64/include/asm/irq.h | 45 ++++ + arch/arm64/include/asm/pgtable-hwdef.h | 18 +- + arch/arm64/include/asm/pgtable.h | 23 +- + arch/arm64/include/asm/shmparam.h | 2 +- + arch/arm64/include/asm/spinlock.h | 23 +- + arch/arm64/include/asm/stacktrace.h | 9 +- + arch/arm64/include/asm/thread_info.h | 10 +- + arch/arm64/kernel/alternative.c | 6 - + arch/arm64/kernel/armv8_deprecated.c | 6 +- + arch/arm64/kernel/cpufeature.c | 9 +- + arch/arm64/kernel/entry.S | 69 +++++- + arch/arm64/kernel/fpsimd.c | 2 +- + arch/arm64/kernel/ftrace.c | 27 +- + arch/arm64/kernel/head.S | 20 +- + arch/arm64/kernel/irq.c | 3 + + arch/arm64/kernel/module.c | 71 ++---- + arch/arm64/kernel/perf_callchain.c | 5 +- + arch/arm64/kernel/process.c | 5 +- + arch/arm64/kernel/ptrace.c | 6 + + arch/arm64/kernel/return_address.c | 5 +- + arch/arm64/kernel/sleep.S | 3 + + arch/arm64/kernel/stacktrace.c | 75 +++++- + arch/arm64/kernel/time.c | 5 +- + arch/arm64/kernel/traps.c | 52 +++- + arch/arm64/kernel/vmlinux.lds.S | 7 +- + arch/arm64/mm/cache.S | 28 ++- + arch/arm64/mm/copypage.c | 3 +- + arch/arm64/mm/dma-mapping.c | 4 +- + arch/arm64/mm/flush.c | 33 +-- + arch/arm64/mm/hugetlbpage.c | 274 ++++++++++++++++++++- + arch/arm64/mm/init.c | 7 +- + arch/arm64/mm/mmu.c | 15 +- + arch/arm64/mm/pgd.c | 12 +- + arch/arm64/mm/proc-macros.S | 22 ++ + arch/arm64/mm/proc.S | 2 - + drivers/firmware/efi/libstub/Makefile | 4 +- + include/linux/hugetlb.h | 2 - + 46 files changed, 820 insertions(+), 216 deletions(-) + create mode 100644 Documentation/arm64/silicon-errata.txt +Merging blackfin/for-linus (d91e14b3b9e1 eth: bf609 eth clock: add pclk clock for stmmac driver probe) +$ git merge blackfin/for-linus +Already up-to-date. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Removing arch/c6x/include/asm/clkdev.h +Auto-merging arch/c6x/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/clkdev.h | 22 ---------------------- + 2 files changed, 1 insertion(+), 22 deletions(-) + delete mode 100644 arch/c6x/include/asm/clkdev.h +Merging cris/for-next (f9f3f864b5e8 cris: Fix section mismatches in architecture startup code) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + arch/cris/arch-v10/kernel/debugport.c | 22 +++++++++++----------- + arch/cris/arch-v10/kernel/head.S | 6 ++++-- + arch/cris/arch-v32/kernel/head.S | 6 ++++-- + arch/cris/kernel/vmlinux.lds.S | 1 + + 4 files changed, 20 insertions(+), 15 deletions(-) +Merging h8300/h8300-next (5e7d4e401029 Merge remote-tracking branch 'origin/master' into h8300-next) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. + .../bindings/clock/renesas,h8300-div-clock.txt | 2 +- + arch/h8300/Kconfig | 2 + + arch/h8300/boot/compressed/Makefile | 11 +- + arch/h8300/boot/compressed/misc.c | 6 + + arch/h8300/boot/compressed/vmlinux.lds | 4 +- + arch/h8300/include/asm/kgdb.h | 45 +++++++ + arch/h8300/kernel/Makefile | 2 + + arch/h8300/kernel/entry.S | 18 +++ + arch/h8300/kernel/kgdb.c | 135 +++++++++++++++++++++ + arch/h8300/kernel/signal.c | 8 +- + drivers/irqchip/irq-renesas-h8s.c | 10 +- + 11 files changed, 229 insertions(+), 14 deletions(-) + create mode 100644 arch/h8300/include/asm/kgdb.h + create mode 100644 arch/h8300/kernel/kgdb.c +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (7e26e9ff0a93 pstore: Fix return type of pstore_is_mounted()) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (eb37bc3f85b6 m68k: Provide __phys_to_pfn() and __pfn_to_phys()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (4693c2493a9b m68k: coldfire/gpio: Be sure to clamp return value) +$ git merge m68knommu/for-next +Merge made by the 'recursive' strategy. + arch/m68k/coldfire/gpio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging metag/for-next (c8b6ad8b3f87 metag: ftrace: remove the misleading comment for ftrace_dyn_arch_init) +$ git merge metag/for-next +Merge made by the 'recursive' strategy. + arch/metag/kernel/ftrace.c | 1 - + 1 file changed, 1 deletion(-) +Merging microblaze/next (b14132797d80 elf-em.h: move EM_MICROBLAZE to the common header) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (544f742d0c2a Merge branch '4.4-fixes' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/net/mediatek,mt7620-gsw.txt | 26 ++ + .../devicetree/bindings/net/ralink,rt2880-net.txt | 61 +++ + .../devicetree/bindings/net/ralink,rt3050-esw.txt | 32 ++ + .../devicetree/bindings/phy/phy-ath79-usb.txt | 18 + + MAINTAINERS | 12 + + arch/mips/ath79/common.h | 1 - + arch/mips/ath79/irq.c | 61 ++- + arch/mips/ath79/setup.c | 11 +- + arch/mips/bcm47xx/sprom.c | 12 +- + arch/mips/bmips/setup.c | 1 + + arch/mips/boot/dts/ingenic/ci20.dts | 127 ++++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 52 +++ + arch/mips/boot/dts/qca/ar9132.dtsi | 26 ++ + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 8 + + arch/mips/include/asm/mach-ath79/ath79.h | 1 + + arch/mips/include/asm/mach-ralink/irq.h | 9 + + arch/mips/include/asm/mach-ralink/mt7621.h | 38 ++ + .../asm/mach-ralink/mt7621/cpu-feature-overrides.h | 65 ++++ + arch/mips/pci/Makefile | 1 + + arch/mips/pci/pci-mt7620.c | 426 +++++++++++++++++++++ + arch/mips/ralink/Kconfig | 16 + + arch/mips/ralink/Makefile | 10 +- + arch/mips/ralink/Platform | 5 + + arch/mips/ralink/irq-gic.c | 25 ++ + arch/mips/ralink/mt7620.c | 87 +++-- + arch/mips/ralink/mt7621.c | 226 +++++++++++ + arch/mips/ralink/rt288x.c | 2 +- + arch/mips/ralink/rt305x.c | 1 + + arch/mips/ralink/rt3883.c | 1 + + arch/mips/ralink/timer-gic.c | 24 ++ + arch/mips/vdso/Makefile | 2 +- + scripts/ld-version.sh | 4 +- + 32 files changed, 1308 insertions(+), 83 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/mediatek,mt7620-gsw.txt + create mode 100644 Documentation/devicetree/bindings/net/ralink,rt2880-net.txt + create mode 100644 Documentation/devicetree/bindings/net/ralink,rt3050-esw.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-ath79-usb.txt + create mode 100644 arch/mips/include/asm/mach-ralink/irq.h + create mode 100644 arch/mips/include/asm/mach-ralink/mt7621.h + create mode 100644 arch/mips/include/asm/mach-ralink/mt7621/cpu-feature-overrides.h + create mode 100644 arch/mips/pci/pci-mt7620.c + create mode 100644 arch/mips/ralink/irq-gic.c + create mode 100644 arch/mips/ralink/mt7621.c + create mode 100644 arch/mips/ralink/timer-gic.c +Merging nios2/for-next (8e3d7c834ba0 nios2: fix cache coherency) +$ git merge nios2/for-next +Already up-to-date. +Merging parisc-hd/for-next (43122681dd75 Fix __ARCH_SI_PREAMBLE_SIZE on parisc) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/include/uapi/asm/siginfo.h | 4 ++++ + kernel/signal.c | 10 ++++++++++ + 2 files changed, 14 insertions(+) +$ git reset --hard HEAD^ +HEAD is now at 37ba17e39342 Merge remote-tracking branch 'mips/mips-for-linux-next' +Merging next-20160108 version of parisc-hd +$ git merge -m next-20160108/parisc-hd 6a13feb9c82803e2b815eca72fa7a9f5561d7861 +Already up-to-date. +Merging powerpc/next (7b8ad495d592 cxl: Fix DSI misses when the context owning task exits) +$ git merge powerpc/next +Auto-merging arch/powerpc/platforms/powernv/opal.c +Removing arch/powerpc/platforms/cell/qpace_setup.c +Removing arch/powerpc/mm/hash_low_64.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Removing arch/powerpc/include/asm/pte-hash64.h +Removing arch/powerpc/include/asm/pte-hash64-64k.h +Removing arch/powerpc/include/asm/pte-hash64-4k.h +Auto-merging arch/powerpc/include/asm/nohash/pte-book3e.h +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable-64k.h +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable-4k.h +Auto-merging arch/powerpc/include/asm/nohash/32/pte-fsl-booke.h +Auto-merging arch/powerpc/include/asm/nohash/32/pte-8xx.h +Auto-merging arch/powerpc/include/asm/nohash/32/pte-44x.h +Auto-merging arch/powerpc/include/asm/nohash/32/pte-40x.h +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Auto-merging arch/powerpc/include/asm/book3s/32/hash.h +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/serial/8250.txt | 1 - + Documentation/kernel-parameters.txt | 6 + + arch/powerpc/Kconfig | 2 + + arch/powerpc/Kconfig.debug | 6 +- + arch/powerpc/boot/Makefile | 2 - + arch/powerpc/boot/wrapper | 2 +- + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/crypto/aes-spe-glue.c | 1 + + arch/powerpc/crypto/sha1-spe-glue.c | 1 + + arch/powerpc/crypto/sha256-spe-glue.c | 1 + + .../include/asm/{pte-hash32.h => book3s/32/hash.h} | 6 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 482 ++++++++++ + arch/powerpc/include/asm/book3s/64/hash-4k.h | 132 +++ + arch/powerpc/include/asm/book3s/64/hash-64k.h | 312 ++++++ + arch/powerpc/include/asm/book3s/64/hash.h | 546 +++++++++++ + arch/powerpc/include/asm/book3s/64/pgtable.h | 292 ++++++ + arch/powerpc/include/asm/book3s/pgtable.h | 29 + + arch/powerpc/include/asm/cmpxchg.h | 16 +- + arch/powerpc/include/asm/exception-64s.h | 40 +- + arch/powerpc/include/asm/firmware.h | 5 +- + arch/powerpc/include/asm/io.h | 11 + + arch/powerpc/include/asm/mmu-hash64.h | 2 +- + .../asm/{pgtable-ppc32.h => nohash/32/pgtable.h} | 25 +- + arch/powerpc/include/asm/{ => nohash/32}/pte-40x.h | 6 +- + arch/powerpc/include/asm/{ => nohash/32}/pte-44x.h | 6 +- + arch/powerpc/include/asm/{ => nohash/32}/pte-8xx.h | 6 +- + .../include/asm/{ => nohash/32}/pte-fsl-booke.h | 6 +- + .../{pgtable-ppc64-4k.h => nohash/64/pgtable-4k.h} | 12 +- + .../64/pgtable-64k.h} | 27 +- + .../asm/{pgtable-ppc64.h => nohash/64/pgtable.h} | 336 +------ + arch/powerpc/include/asm/nohash/pgtable.h | 252 +++++ + arch/powerpc/include/asm/{ => nohash}/pte-book3e.h | 6 +- + arch/powerpc/include/asm/opal-api.h | 3 +- + arch/powerpc/include/asm/opal.h | 3 + + arch/powerpc/include/asm/paca.h | 27 +- + arch/powerpc/include/asm/page.h | 86 +- + arch/powerpc/include/asm/pci-bridge.h | 1 + + arch/powerpc/include/asm/pci.h | 4 + + arch/powerpc/include/asm/pgalloc-32.h | 34 +- + arch/powerpc/include/asm/pgalloc-64.h | 27 +- + arch/powerpc/include/asm/pgtable.h | 200 +--- + arch/powerpc/include/asm/plpar_wrappers.h | 17 + + arch/powerpc/include/asm/ppc_asm.h | 18 - + arch/powerpc/include/asm/processor.h | 9 +- + arch/powerpc/include/asm/pte-common.h | 5 + + arch/powerpc/include/asm/pte-hash64-4k.h | 17 - + arch/powerpc/include/asm/pte-hash64-64k.h | 102 -- + arch/powerpc/include/asm/pte-hash64.h | 54 -- + arch/powerpc/include/asm/reg.h | 17 + + arch/powerpc/include/asm/rtas.h | 3 +- + arch/powerpc/include/asm/switch_to.h | 65 +- + arch/powerpc/include/asm/synch.h | 2 +- + arch/powerpc/include/asm/time.h | 1 - + arch/powerpc/include/asm/unistd.h | 3 +- + arch/powerpc/include/asm/vdso_datapage.h | 2 +- + arch/powerpc/kernel/align.c | 2 + + arch/powerpc/kernel/asm-offsets.c | 10 +- + arch/powerpc/kernel/entry_64.S | 89 +- + arch/powerpc/kernel/exceptions-64s.S | 77 +- + arch/powerpc/kernel/fpu.S | 73 +- + arch/powerpc/kernel/head_fsl_booke.S | 42 +- + arch/powerpc/kernel/idle_power7.S | 7 - + arch/powerpc/kernel/misc_32.S | 2 + + arch/powerpc/kernel/ppc_ksyms.c | 6 - + arch/powerpc/kernel/process.c | 541 +++++++---- + arch/powerpc/kernel/prom_init.c | 1 + + arch/powerpc/kernel/ptrace.c | 1 + + arch/powerpc/kernel/rtas.c | 59 +- + arch/powerpc/kernel/signal_32.c | 22 +- + arch/powerpc/kernel/signal_64.c | 22 +- + arch/powerpc/kernel/swsusp.c | 4 +- + arch/powerpc/kernel/systbl_chk.c | 2 +- + arch/powerpc/kernel/systbl_chk.sh | 2 +- + arch/powerpc/kernel/time.c | 36 +- + arch/powerpc/kernel/traps.c | 7 - + arch/powerpc/kernel/vdso.c | 2 +- + arch/powerpc/kernel/vdso32/datapage.S | 2 +- + arch/powerpc/kernel/vdso64/datapage.S | 2 +- + arch/powerpc/kernel/vector.S | 112 +-- + arch/powerpc/kvm/book3s_hv.c | 5 +- + arch/powerpc/kvm/book3s_paired_singles.c | 1 + + arch/powerpc/kvm/book3s_pr.c | 21 +- + arch/powerpc/kvm/booke.c | 4 + + arch/powerpc/lib/vmx-helper.c | 2 + + arch/powerpc/lib/xor_vmx.c | 4 + + arch/powerpc/mm/40x_mmu.c | 10 +- + arch/powerpc/mm/Makefile | 9 +- + arch/powerpc/mm/hash64_4k.c | 123 +++ + arch/powerpc/mm/hash64_64k.c | 322 +++++++ + arch/powerpc/mm/hash_low_64.S | 1003 -------------------- + arch/powerpc/mm/hash_native_64.c | 10 + + arch/powerpc/mm/hash_utils_64.c | 117 +-- + arch/powerpc/mm/hugepage-hash64.c | 22 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 33 +- + arch/powerpc/mm/hugetlbpage.c | 76 +- + arch/powerpc/mm/init_64.c | 4 - + arch/powerpc/mm/pgtable.c | 4 + + arch/powerpc/mm/pgtable_64.c | 28 +- + arch/powerpc/mm/slb.c | 2 +- + arch/powerpc/mm/slice.c | 3 +- + arch/powerpc/platforms/cell/Kconfig | 5 - + arch/powerpc/platforms/cell/Makefile | 4 - + arch/powerpc/platforms/cell/qpace_setup.c | 148 --- + arch/powerpc/platforms/cell/spufs/run.c | 2 +- + arch/powerpc/platforms/maple/time.c | 2 +- + arch/powerpc/platforms/powermac/bootx_init.c | 1 + + arch/powerpc/platforms/powermac/pic.c | 3 +- + arch/powerpc/platforms/powernv/Makefile | 3 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 4 +- + arch/powerpc/platforms/powernv/idle.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 348 +++++++ + arch/powerpc/platforms/powernv/opal-kmsg.c | 68 ++ + arch/powerpc/platforms/powernv/opal-prd.c | 1 - + arch/powerpc/platforms/powernv/opal-rtc.c | 5 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 1 + + arch/powerpc/platforms/powernv/opal-xscom.c | 2 +- + arch/powerpc/platforms/powernv/opal.c | 41 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 152 ++- + arch/powerpc/platforms/powernv/pci.c | 4 + + arch/powerpc/platforms/powernv/pci.h | 19 + + arch/powerpc/platforms/powernv/setup.c | 12 +- + arch/powerpc/platforms/powernv/smp.c | 74 +- + arch/powerpc/platforms/pseries/dlpar.c | 197 +--- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 550 ++++++++++- + arch/powerpc/platforms/pseries/lpar.c | 64 +- + arch/powerpc/platforms/pseries/pseries.h | 9 + + arch/powerpc/platforms/pseries/ras.c | 55 +- + arch/powerpc/sysdev/axonram.c | 1 + + arch/powerpc/xmon/xmon.c | 18 +- + drivers/cpufreq/powernv-cpufreq.c | 2 +- + drivers/cpuidle/cpuidle-powernv.c | 2 +- + drivers/crypto/vmx/aes.c | 6 +- + drivers/crypto/vmx/aes_cbc.c | 6 +- + drivers/crypto/vmx/aes_ctr.c | 6 +- + drivers/crypto/vmx/ghash.c | 12 +- + drivers/macintosh/rack-meter.c | 1 + + drivers/macintosh/via-pmu.c | 5 +- + drivers/misc/cxl/api.c | 6 +- + drivers/misc/cxl/context.c | 15 +- + drivers/misc/cxl/cxl.h | 15 + + drivers/misc/cxl/fault.c | 129 ++- + drivers/misc/cxl/file.c | 25 +- + drivers/misc/cxl/vphb.c | 2 +- + drivers/rtc/rtc-opal.c | 2 +- + lib/raid6/altivec.uc | 1 + + .../selftests/powerpc/benchmarks/.gitignore | 1 + + .../testing/selftests/powerpc/benchmarks/Makefile | 5 +- + .../selftests/powerpc/benchmarks/context_switch.c | 466 +++++++++ + .../powerpc/dscr/dscr_inherit_exec_test.c | 8 - + .../selftests/powerpc/dscr/dscr_inherit_test.c | 8 - + tools/testing/selftests/powerpc/harness.c | 43 - + tools/testing/selftests/powerpc/pmu/Makefile | 4 +- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 3 +- + tools/testing/selftests/powerpc/pmu/ebb/ebb.c | 3 +- + tools/testing/selftests/powerpc/pmu/lib.c | 26 - + tools/testing/selftests/powerpc/pmu/lib.h | 1 - + tools/testing/selftests/powerpc/scripts/hmi.sh | 89 ++ + tools/testing/selftests/powerpc/tm/.gitignore | 3 + + tools/testing/selftests/powerpc/tm/Makefile | 4 +- + .../testing/selftests/powerpc/tm/tm-resched-dscr.c | 3 + + .../selftests/powerpc/tm/tm-signal-msr-resv.c | 74 ++ + .../testing/selftests/powerpc/tm/tm-signal-stack.c | 76 ++ + tools/testing/selftests/powerpc/tm/tm-syscall.c | 13 +- + tools/testing/selftests/powerpc/tm/tm-vmxcopy.c | 103 ++ + tools/testing/selftests/powerpc/tm/tm.h | 34 + + tools/testing/selftests/powerpc/utils.c | 87 ++ + tools/testing/selftests/powerpc/utils.h | 7 + + 167 files changed, 5790 insertions(+), 3505 deletions(-) + rename arch/powerpc/include/asm/{pte-hash32.h => book3s/32/hash.h} (93%) + create mode 100644 arch/powerpc/include/asm/book3s/32/pgtable.h + create mode 100644 arch/powerpc/include/asm/book3s/64/hash-4k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/hash-64k.h + create mode 100644 arch/powerpc/include/asm/book3s/64/hash.h + create mode 100644 arch/powerpc/include/asm/book3s/64/pgtable.h + create mode 100644 arch/powerpc/include/asm/book3s/pgtable.h + rename arch/powerpc/include/asm/{pgtable-ppc32.h => nohash/32/pgtable.h} (96%) + rename arch/powerpc/include/asm/{ => nohash/32}/pte-40x.h (95%) + rename arch/powerpc/include/asm/{ => nohash/32}/pte-44x.h (96%) + rename arch/powerpc/include/asm/{ => nohash/32}/pte-8xx.h (95%) + rename arch/powerpc/include/asm/{ => nohash/32}/pte-fsl-booke.h (88%) + rename arch/powerpc/include/asm/{pgtable-ppc64-4k.h => nohash/64/pgtable-4k.h} (92%) + rename arch/powerpc/include/asm/{pgtable-ppc64-64k.h => nohash/64/pgtable-64k.h} (64%) + rename arch/powerpc/include/asm/{pgtable-ppc64.h => nohash/64/pgtable.h} (51%) + create mode 100644 arch/powerpc/include/asm/nohash/pgtable.h + rename arch/powerpc/include/asm/{ => nohash}/pte-book3e.h (95%) + delete mode 100644 arch/powerpc/include/asm/pte-hash64-4k.h + delete mode 100644 arch/powerpc/include/asm/pte-hash64-64k.h + delete mode 100644 arch/powerpc/include/asm/pte-hash64.h + create mode 100644 arch/powerpc/mm/hash64_4k.c + create mode 100644 arch/powerpc/mm/hash64_64k.c + delete mode 100644 arch/powerpc/mm/hash_low_64.S + delete mode 100644 arch/powerpc/platforms/cell/qpace_setup.c + create mode 100644 arch/powerpc/platforms/powernv/npu-dma.c + create mode 100644 arch/powerpc/platforms/powernv/opal-kmsg.c + create mode 100644 tools/testing/selftests/powerpc/benchmarks/context_switch.c + create mode 100755 tools/testing/selftests/powerpc/scripts/hmi.sh + create mode 100644 tools/testing/selftests/powerpc/tm/tm-signal-msr-resv.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-signal-stack.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-vmxcopy.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm.h + create mode 100644 tools/testing/selftests/powerpc/utils.c +$ git am -3 ../patches/0001-powerpc-restore-the-user_psize-member-of-the-mm_cont.patch +Applying: powerpc: restore the user_psize member of the mm_context_t in the paca +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/paca.h +M arch/powerpc/mm/hash_utils_64.c +$ git add -A . +$ git commit -v -a --amend +[master d7f9911c4796] Merge remote-tracking branch 'powerpc/next' + Date: Mon Jan 11 10:48:45 2016 +1100 +Merging powerpc-mpe/next (bc0195aad0da Linux 4.2-rc2) +$ git merge powerpc-mpe/next +Already up-to-date. +Merging fsl/next (44451d4d8f0e MAINTAINERS: Update Scott Wood's e-mail address) +$ git merge fsl/next +Auto-merging include/soc/fsl/qe/ucc_slow.h +Auto-merging include/soc/fsl/qe/ucc_fast.h +Auto-merging include/soc/fsl/qe/ucc.h +Auto-merging include/soc/fsl/qe/qe.h +Auto-merging drivers/soc/fsl/qe/usb.c +Auto-merging drivers/soc/fsl/qe/ucc_slow.c +Auto-merging drivers/soc/fsl/qe/ucc_fast.c +Auto-merging drivers/soc/fsl/qe/ucc.c +Auto-merging drivers/soc/fsl/qe/qe_io.c +Auto-merging drivers/soc/fsl/qe/qe_ic.h +Auto-merging drivers/soc/fsl/qe/qe_ic.c +Auto-merging drivers/soc/fsl/qe/qe.c +Auto-merging drivers/soc/fsl/qe/gpio.c +Auto-merging drivers/soc/fsl/qe/Makefile +Auto-merging drivers/soc/fsl/qe/Kconfig +Auto-merging drivers/soc/Makefile +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/net/ethernet/freescale/fsl_pq_mdio.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/qoriq-thermal.txt | 63 ++++++ + MAINTAINERS | 7 +- + arch/powerpc/Kconfig | 2 - + arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 5 + + arch/powerpc/boot/dts/fsl/bsc9132qds.dts | 15 ++ + arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi | 28 +++ + arch/powerpc/boot/dts/fsl/bsc9132si-pre.dtsi | 1 + + arch/powerpc/boot/dts/fsl/p1010rdb.dtsi | 16 ++ + arch/powerpc/boot/dts/fsl/t1023rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 86 ++++++++ + arch/powerpc/boot/dts/fsl/t1024qds.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1024rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1024si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t102xsi-pre.dtsi | 2 + + arch/powerpc/boot/dts/fsl/t1040d4rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1040qds.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1040rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 94 +++++++++ + arch/powerpc/boot/dts/fsl/t1042d4rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1042qds.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1042rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1042si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t104xsi-pre.dtsi | 4 + + arch/powerpc/configs/mpc85xx_basic_defconfig | 1 + + arch/powerpc/include/asm/cpm.h | 44 +--- + arch/powerpc/mm/hugetlbpage-book3e.c | 46 ++++ + arch/powerpc/platforms/83xx/km83xx.c | 6 +- + arch/powerpc/platforms/83xx/misc.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 6 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 6 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 6 +- + arch/powerpc/platforms/83xx/mpc836x_rdk.c | 7 +- + arch/powerpc/platforms/85xx/bsc913x_qds.c | 8 +- + arch/powerpc/platforms/85xx/common.c | 3 +- + arch/powerpc/platforms/85xx/corenet_generic.c | 2 +- + arch/powerpc/platforms/85xx/mpc85xx_ads.c | 15 -- + arch/powerpc/platforms/85xx/mpc85xx_mds.c | 4 +- + arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 4 +- + arch/powerpc/platforms/85xx/twr_p102x.c | 4 +- + arch/powerpc/platforms/Kconfig | 13 +- + arch/powerpc/sysdev/Makefile | 1 - + arch/powerpc/sysdev/cpm_common.c | 158 +------------- + arch/powerpc/sysdev/fsl_lbc.c | 2 - + arch/powerpc/sysdev/fsl_pci.c | 13 ++ + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 +- + drivers/net/ethernet/freescale/ucc_geth.c | 8 +- + drivers/net/ethernet/freescale/ucc_geth.h | 8 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/fsl/Makefile | 6 + + .../sysdev/qe_lib => drivers/soc/fsl/qe}/Kconfig | 11 + + .../sysdev/qe_lib => drivers/soc/fsl/qe}/Makefile | 4 +- + .../sysdev/qe_lib => drivers/soc/fsl/qe}/gpio.c | 2 +- + .../sysdev/qe_lib => drivers/soc/fsl/qe}/qe.c | 17 +- + drivers/soc/fsl/qe/qe_common.c | 235 +++++++++++++++++++++ + .../sysdev/qe_lib => drivers/soc/fsl/qe}/qe_ic.c | 5 +- + .../sysdev/qe_lib => drivers/soc/fsl/qe}/qe_ic.h | 4 +- + .../sysdev/qe_lib => drivers/soc/fsl/qe}/qe_io.c | 2 +- + .../sysdev/qe_lib => drivers/soc/fsl/qe}/ucc.c | 6 +- + .../qe_lib => drivers/soc/fsl/qe}/ucc_fast.c | 8 +- + .../qe_lib => drivers/soc/fsl/qe}/ucc_slow.c | 8 +- + .../sysdev/qe_lib => drivers/soc/fsl/qe}/usb.c | 4 +- + drivers/spi/spi-fsl-cpm.c | 2 +- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/fhci-hub.c | 2 +- + drivers/usb/host/fhci-sched.c | 2 +- + drivers/usb/host/fhci.h | 4 +- + include/linux/genalloc.h | 38 +++- + .../include/asm => include/soc/fsl/qe}/immap_qe.h | 0 + .../include/asm => include/soc/fsl/qe}/qe.h | 52 ++++- + .../include/asm => include/soc/fsl/qe}/qe_ic.h | 0 + .../include/asm => include/soc/fsl/qe}/ucc.h | 4 +- + .../include/asm => include/soc/fsl/qe}/ucc_fast.h | 6 +- + .../include/asm => include/soc/fsl/qe}/ucc_slow.h | 6 +- + lib/genalloc.c | 93 +++++++- + 78 files changed, 907 insertions(+), 338 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/qoriq-thermal.txt + create mode 100644 drivers/soc/fsl/Makefile + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/Kconfig (54%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/Makefile (69%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/gpio.c (99%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/qe.c (98%) + create mode 100644 drivers/soc/fsl/qe/qe_common.c + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/qe_ic.c (99%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/qe_ic.h (97%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/qe_io.c (99%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc.c (98%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc_fast.c (98%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/ucc_slow.c (98%) + rename {arch/powerpc/sysdev/qe_lib => drivers/soc/fsl/qe}/usb.c (96%) + rename {arch/powerpc/include/asm => include/soc/fsl/qe}/immap_qe.h (100%) + rename {arch/powerpc/include/asm => include/soc/fsl/qe}/qe.h (95%) + rename {arch/powerpc/include/asm => include/soc/fsl/qe}/qe_ic.h (100%) + rename {arch/powerpc/include/asm => include/soc/fsl/qe}/ucc.h (96%) + rename {arch/powerpc/include/asm => include/soc/fsl/qe}/ucc_fast.h (98%) + rename {arch/powerpc/include/asm => include/soc/fsl/qe}/ucc_slow.h (99%) +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 (9236b4dd6bfa s390: get rid of CONFIG_SCHED_MC and CONFIG_SCHED_BOOK) +$ git merge s390/features +Removing drivers/s390/char/sclp_cpi.c +Auto-merging arch/s390/kernel/dis.c +Merge made by the 'recursive' strategy. + Documentation/s390/zfcpdump.txt | 22 +- + arch/s390/Kconfig | 11 +- + arch/s390/Makefile | 9 + + arch/s390/include/asm/compat.h | 2 +- + arch/s390/include/asm/crw.h | 14 - + arch/s390/include/asm/elf.h | 11 +- + arch/s390/include/asm/facilities_src.h | 58 +++++ + arch/s390/include/asm/facility.h | 17 +- + arch/s390/include/asm/fpu/internal.h | 10 +- + arch/s390/include/asm/ipl.h | 14 +- + arch/s390/include/asm/lowcore.h | 21 -- + arch/s390/include/asm/os_info.h | 2 +- + arch/s390/include/asm/pci_dma.h | 2 + + arch/s390/include/asm/processor.h | 12 + + arch/s390/include/asm/reset.h | 3 +- + arch/s390/include/asm/sclp.h | 5 +- + arch/s390/include/asm/setup.h | 31 +-- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/thread_info.h | 2 - + arch/s390/include/asm/topology.h | 6 +- + arch/s390/kernel/Makefile | 8 +- + arch/s390/kernel/asm-offsets.c | 3 +- + arch/s390/kernel/crash_dump.c | 454 ++++++++++++++------------------ + arch/s390/kernel/dis.c | 4 +- + arch/s390/kernel/early.c | 9 + + arch/s390/kernel/entry.S | 2 + + arch/s390/kernel/head.S | 47 ++-- + arch/s390/kernel/head64.S | 2 +- + arch/s390/kernel/ipl.c | 17 +- + arch/s390/kernel/machine_kexec.c | 110 ++++---- + arch/s390/kernel/os_info.c | 7 +- + arch/s390/kernel/reipl.S | 94 ++++--- + arch/s390/kernel/sclp.c | 65 +++-- + arch/s390/kernel/setup.c | 17 +- + arch/s390/kernel/smp.c | 145 +++++------ + arch/s390/kernel/sysinfo.c | 5 +- + arch/s390/kernel/traps.c | 3 - + arch/s390/kvm/kvm-s390.c | 30 +-- + arch/s390/lib/spinlock.c | 45 +++- + arch/s390/mm/extmem.c | 4 +- + arch/s390/mm/fault.c | 2 - + arch/s390/mm/gup.c | 1 + + arch/s390/pci/pci.c | 3 +- + arch/s390/pci/pci_dma.c | 19 +- + arch/s390/tools/.gitignore | 1 + + arch/s390/tools/Makefile | 15 ++ + arch/s390/tools/gen_facilities.c | 67 +++++ + drivers/s390/block/dasd.c | 8 +- + drivers/s390/char/Kconfig | 21 +- + drivers/s390/char/Makefile | 5 +- + drivers/s390/char/con3215.c | 2 + + drivers/s390/char/con3270.c | 2 + + drivers/s390/char/hmcdrv_ftp.c | 6 +- + drivers/s390/char/sclp_config.c | 102 +++++++- + drivers/s390/char/sclp_cpi.c | 40 --- + drivers/s390/char/zcore.c | 461 ++++----------------------------- + drivers/s390/cio/Makefile | 5 +- + drivers/s390/cio/airq.c | 1 + + drivers/s390/cio/chsc_sch.c | 5 +- + drivers/s390/cio/cio.c | 37 ++- + drivers/s390/cio/cio.h | 12 + + drivers/s390/cio/crw.c | 1 + + drivers/s390/cio/css.c | 2 +- + drivers/s390/cio/device_fsm.c | 2 +- + drivers/s390/cio/io_sch.h | 45 ---- + drivers/s390/cio/ioasm.c | 224 ++++++++++++++++ + drivers/s390/cio/ioasm.h | 169 ++---------- + drivers/s390/cio/qdio_debug.c | 6 +- + drivers/s390/cio/trace.c | 24 ++ + drivers/s390/cio/trace.h | 363 ++++++++++++++++++++++++++ + drivers/s390/crypto/zcrypt_api.c | 6 +- + scripts/Makefile.lib | 3 +- + 72 files changed, 1621 insertions(+), 1364 deletions(-) + create mode 100644 arch/s390/include/asm/facilities_src.h + create mode 100644 arch/s390/tools/.gitignore + create mode 100644 arch/s390/tools/Makefile + create mode 100644 arch/s390/tools/gen_facilities.c + delete mode 100644 drivers/s390/char/sclp_cpi.c + create mode 100644 drivers/s390/cio/ioasm.c + create mode 100644 drivers/s390/cio/trace.c + create mode 100644 drivers/s390/cio/trace.h +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 (544f7d5a408e numa: remove stale node_has_online_mem() define) +$ git merge tile/master +Auto-merging arch/tile/include/asm/page.h +Auto-merging arch/tile/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/tile/Kconfig | 1 + + arch/tile/include/asm/insn.h | 59 +++++++++++++++++++++++++++ + arch/tile/include/asm/io.h | 16 ++++---- + arch/tile/include/asm/jump_label.h | 58 +++++++++++++++++++++++++++ + arch/tile/include/asm/page.h | 10 +++++ + arch/tile/include/asm/processor.h | 2 +- + arch/tile/include/asm/thread_info.h | 8 +++- + arch/tile/include/asm/topology.h | 3 -- + arch/tile/kernel/Makefile | 1 + + arch/tile/kernel/ftrace.c | 13 +----- + arch/tile/kernel/intvec_32.S | 51 +++++++++--------------- + arch/tile/kernel/intvec_64.S | 56 ++++++++++---------------- + arch/tile/kernel/jump_label.c | 64 ++++++++++++++++++++++++++++++ + arch/tile/kernel/kgdb.c | 2 +- + arch/tile/kernel/kprobes.c | 4 +- + arch/tile/kernel/process.c | 79 +++++++++++++++++++------------------ + arch/tile/kernel/ptrace.c | 15 ------- + arch/tile/kernel/setup.c | 2 +- + arch/tile/kernel/single_step.c | 3 -- + arch/tile/kernel/stack.c | 17 ++++---- + arch/tile/kernel/time.c | 1 + + arch/tile/kernel/traps.c | 13 ++---- + arch/tile/kernel/unaligned.c | 13 ++---- + arch/tile/mm/fault.c | 3 -- + include/linux/topology.h | 4 -- + 26 files changed, 311 insertions(+), 188 deletions(-) + create mode 100644 arch/tile/include/asm/insn.h + create mode 100644 arch/tile/include/asm/jump_label.h + create mode 100644 arch/tile/kernel/jump_label.c +Merging uml/linux-next (3e46b2537632 um: Use race-free temporary file creation) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + .../seccomp/seccomp-filter/arch-support.txt | 2 +- + arch/um/Kconfig.common | 1 + + arch/um/Kconfig.um | 16 +++ + arch/um/drivers/ubd_kern.c | 27 +--- + arch/um/include/asm/hardirq.h | 23 ++++ + arch/um/include/asm/syscall-generic.h | 138 +++++++++++++++++++++ + arch/um/include/asm/thread_info.h | 2 + + arch/um/include/shared/os.h | 3 +- + arch/um/kernel/skas/syscall.c | 31 +++-- + arch/um/os-Linux/file.c | 19 +++ + arch/um/os-Linux/mem.c | 17 ++- + arch/um/os-Linux/signal.c | 16 ++- + arch/um/os-Linux/skas/process.c | 7 -- + arch/um/os-Linux/start_up.c | 2 + + arch/x86/um/Makefile | 2 +- + arch/x86/um/asm/syscall.h | 1 + + arch/x86/um/ptrace_32.c | 8 +- + fs/hostfs/hostfs_kern.c | 4 +- + scripts/link-vmlinux.sh | 2 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 27 +++- + 20 files changed, 285 insertions(+), 63 deletions(-) + create mode 100644 arch/um/include/asm/hardirq.h + create mode 100644 arch/um/include/asm/syscall-generic.h +Merging unicore32/unicore32 (d670878e2c9a unicore32: Remove ARCH_HAS_CPUFREQ config option) +$ git merge unicore32/unicore32 +Already up-to-date. +Merging xtensa/for_next (afaa7c542cc9 Merge tag 'xtensa-for-next-20151109' of git://github.com/jcmvbkbc/linux-xtensa) +$ git merge xtensa/for_next +Already up-to-date. +Merging btrfs/next (511711af91f2 btrfs: don't run delayed references while we are creating the free space tree) +$ git merge btrfs/next +Merge made by the 'recursive' strategy. + fs/btrfs/Makefile | 5 +- + fs/btrfs/acl.c | 4 +- + fs/btrfs/async-thread.c | 4 +- + fs/btrfs/ctree.h | 162 +++- + fs/btrfs/disk-io.c | 45 +- + fs/btrfs/disk-io.h | 1 - + fs/btrfs/extent-tree.c | 127 ++- + fs/btrfs/extent_io.c | 308 ++++--- + fs/btrfs/extent_io.h | 136 ++- + fs/btrfs/file.c | 8 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/free-space-tree.c | 1591 ++++++++++++++++++++++++++++++++ + fs/btrfs/free-space-tree.h | 72 ++ + fs/btrfs/inode.c | 162 ++-- + fs/btrfs/ioctl.c | 16 +- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/super.c | 56 +- + fs/btrfs/tests/btrfs-tests.c | 58 ++ + fs/btrfs/tests/btrfs-tests.h | 10 + + fs/btrfs/tests/extent-io-tests.c | 138 ++- + fs/btrfs/tests/free-space-tests.c | 41 +- + fs/btrfs/tests/free-space-tree-tests.c | 571 ++++++++++++ + fs/btrfs/tests/qgroup-tests.c | 20 +- + fs/btrfs/transaction.c | 17 + + fs/btrfs/tree-defrag.c | 27 +- + fs/btrfs/volumes.c | 26 +- + fs/btrfs/volumes.h | 1 - + fs/btrfs/xattr.c | 2 +- + include/trace/events/btrfs.h | 3 +- + 29 files changed, 3252 insertions(+), 363 deletions(-) + create mode 100644 fs/btrfs/free-space-tree.c + create mode 100644 fs/btrfs/free-space-tree.h + create mode 100644 fs/btrfs/tests/free-space-tree-tests.c +Merging ceph/master (583d0fef756a libceph: clear msg->con in ceph_msg_release() only) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (181a15048df3 [SMB3] Prepare for encryption support (first part). Add decryption and encryption key generation. Thanks to Metze for helping with this.) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 2 +- + fs/cifs/cifs_debug.h | 9 ++--- + fs/cifs/cifsfs.c | 17 ++++++++ + fs/cifs/cifsglob.h | 16 ++++++-- + fs/cifs/cifsproto.h | 5 ++- + fs/cifs/connect.c | 34 ++++++++++++---- + fs/cifs/inode.c | 24 +++++++++++- + fs/cifs/misc.c | 2 +- + fs/cifs/netmisc.c | 2 +- + fs/cifs/smb2maperror.c | 2 +- + fs/cifs/smb2misc.c | 36 ++++++++++++++--- + fs/cifs/smb2ops.c | 13 ++++-- + fs/cifs/smb2pdu.c | 10 ++--- + fs/cifs/smb2pdu.h | 8 ++-- + fs/cifs/smb2proto.h | 3 +- + fs/cifs/smb2transport.c | 102 +++++++++++++++++++++++++++++++++++++++++++++--- + 16 files changed, 234 insertions(+), 51 deletions(-) +Merging configfs/for-next (1609bac8af31 configfs: add myself as co-maintainer, updated git tree) +$ git merge configfs/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/filesystems/configfs/configfs.txt | 57 +++++- + MAINTAINERS | 3 +- + fs/configfs/configfs_internal.h | 14 +- + fs/configfs/dir.c | 18 +- + fs/configfs/file.c | 255 +++++++++++++++++++++++- + fs/configfs/inode.c | 2 +- + include/linux/configfs.h | 50 +++++ + 7 files changed, 376 insertions(+), 23 deletions(-) +Merging ecryptfs/next (933c32fe0e42 ecryptfs: drop null test before destroy functions) +$ git merge ecryptfs/next +Merge made by the 'recursive' strategy. + fs/ecryptfs/main.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging ext3/for_next (bb00c898ad1c udf: Check output buffer length when converting name to CS0) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/ocfs2/quota.h | 2 +- + fs/ocfs2/quota_global.c | 2 +- + fs/quota/dquot.c | 2 +- + fs/quota/netlink.c | 5 +- + fs/quota/quota_v2.c | 4 +- + fs/udf/balloc.c | 98 +----------------- + fs/udf/inode.c | 243 +++++++++++++++++++++++++++----------------- + fs/udf/super.c | 14 +++ + fs/udf/udfdecl.h | 4 + + fs/udf/unicode.c | 21 +++- + include/linux/dqblk_qtree.h | 2 +- + 11 files changed, 196 insertions(+), 201 deletions(-) +Merging ext4/dev (880cec3449e0 fs: clean up the flags definition in uapi/linux/fs.h) +$ git merge ext4/dev +Merge made by the 'recursive' strategy. + fs/ext4/crypto.c | 6 +- + fs/ext4/crypto_key.c | 129 +++++++++++- + fs/ext4/crypto_policy.c | 10 + + fs/ext4/ext4.h | 88 ++++++-- + fs/ext4/ext4_crypto.h | 14 ++ + fs/ext4/extents.c | 153 +++++++------- + fs/ext4/file.c | 87 +++++--- + fs/ext4/ialloc.c | 12 +- + fs/ext4/indirect.c | 5 +- + fs/ext4/inline.c | 10 +- + fs/ext4/inode.c | 285 ++++++++++++++++++++------ + fs/ext4/ioctl.c | 488 ++++++++++++++++++++++++++++++++++++-------- + fs/ext4/namei.c | 335 +++++++++++++++++++++++++++--- + fs/ext4/super.c | 102 ++++++++- + fs/ext4/truncate.h | 2 + + fs/xfs/libxfs/xfs_fs.h | 47 ++--- + include/trace/events/ext4.h | 2 +- + include/uapi/linux/fs.h | 63 +++++- + 18 files changed, 1494 insertions(+), 344 deletions(-) +Merging f2fs/dev (90d43c31be5a f2fs: read isize while holding i_mutex in fiemap) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + Documentation/filesystems/f2fs.txt | 10 +- + fs/f2fs/checkpoint.c | 175 +++++++++--------- + fs/f2fs/data.c | 368 ++++++++++++++++++++++--------------- + fs/f2fs/debug.c | 26 ++- + fs/f2fs/dir.c | 34 ++-- + fs/f2fs/extent_cache.c | 100 +++++----- + fs/f2fs/f2fs.h | 94 ++++++---- + fs/f2fs/file.c | 322 +++++++++++++++++++++++++------- + fs/f2fs/gc.c | 8 +- + fs/f2fs/inline.c | 10 +- + fs/f2fs/inode.c | 9 +- + fs/f2fs/namei.c | 57 ++++-- + fs/f2fs/node.c | 83 +++++---- + fs/f2fs/node.h | 2 +- + fs/f2fs/recovery.c | 40 +++- + fs/f2fs/segment.c | 115 +++++------- + fs/f2fs/shrinker.c | 3 +- + fs/f2fs/super.c | 240 ++++++++++++++++++------ + include/linux/f2fs_fs.h | 3 +- + include/trace/events/f2fs.h | 38 ++++ + 20 files changed, 1117 insertions(+), 620 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 (0b5da8db145b fuse: add support for SEEK_HOLE and SEEK_DATA in lseek) +$ git merge fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'recursive' strategy. + fs/fuse/file.c | 73 +++++++++++++++++++++++++++++++++++++++++------ + fs/fuse/fuse_i.h | 3 ++ + include/uapi/linux/fuse.h | 17 ++++++++++- + 3 files changed, 84 insertions(+), 9 deletions(-) +Merging gfs2/for-next (a93a99838248 gfs2: fix flock panic issue) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/xattr.c +Merge made by the 'recursive' strategy. + fs/gfs2/aops.c | 2 +- + fs/gfs2/bmap.c | 13 +-- + fs/gfs2/dir.c | 175 ++++++++++++++++++++++++++++++--------- + fs/gfs2/file.c | 34 ++++---- + fs/gfs2/glock.c | 18 ++-- + fs/gfs2/glock.h | 26 +++--- + fs/gfs2/incore.h | 23 +++-- + fs/gfs2/inode.c | 48 +++++------ + fs/gfs2/log.c | 3 + + fs/gfs2/main.c | 16 ++-- + fs/gfs2/meta_io.c | 82 ++++++++++++++++-- + fs/gfs2/meta_io.h | 2 +- + fs/gfs2/ops_fstype.c | 6 +- + fs/gfs2/quota.c | 117 +++++++++++++++++--------- + fs/gfs2/quota.h | 2 + + fs/gfs2/rgrp.c | 57 +++++-------- + fs/gfs2/rgrp.h | 6 +- + fs/gfs2/super.c | 43 ++++++---- + fs/gfs2/util.c | 2 +- + fs/gfs2/util.h | 2 +- + fs/gfs2/xattr.c | 10 +-- + include/uapi/linux/gfs2_ondisk.h | 9 +- + 22 files changed, 452 insertions(+), 244 deletions(-) +Merging jfs/jfs-next (26456955719b jfs: clean up jfs_rename and fix out of order unlock) +$ git merge jfs/jfs-next +Already up-to-date. +Merging nfs/linux-next (44aab3e09ef9 NFS: Fix a compile warning about unused variable in nfs_generic_pg_pgios()) +$ git merge nfs/linux-next +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 52 +++- + fs/nfs/dir.c | 21 +- + fs/nfs/direct.c | 48 +++- + fs/nfs/file.c | 6 +- + fs/nfs/filelayout/filelayout.c | 18 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 205 ++++++++++---- + fs/nfs/flexfilelayout/flexfilelayout.h | 1 + + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 16 +- + fs/nfs/inode.c | 78 ++++-- + fs/nfs/internal.h | 39 ++- + fs/nfs/nfs42proc.c | 29 +- + fs/nfs/nfs4file.c | 2 +- + fs/nfs/nfs4proc.c | 71 +++-- + fs/nfs/nfs4sysctl.c | 2 +- + fs/nfs/nfs4trace.c | 1 + + fs/nfs/nfs4trace.h | 431 ++++++++++++++++++++++++++++-- + fs/nfs/nfstrace.h | 1 - + fs/nfs/pagelist.c | 126 ++++----- + fs/nfs/pnfs.c | 180 ++++++++----- + fs/nfs/pnfs.h | 54 ++-- + fs/nfs/pnfs_nfs.c | 10 +- + fs/nfs/read.c | 43 +-- + fs/nfs/write.c | 133 +++++---- + include/linux/nfs4.h | 14 + + include/linux/nfs_fs.h | 23 +- + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 6 +- + net/sunrpc/clnt.c | 1 + + net/sunrpc/xprtrdma/backchannel.c | 26 +- + net/sunrpc/xprtrdma/fmr_ops.c | 64 +++++ + net/sunrpc/xprtrdma/frwr_ops.c | 174 ++++++++++-- + net/sunrpc/xprtrdma/physical_ops.c | 13 + + net/sunrpc/xprtrdma/rpc_rdma.c | 16 ++ + net/sunrpc/xprtrdma/transport.c | 3 + + net/sunrpc/xprtrdma/verbs.c | 16 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 14 +- + net/sunrpc/xprtsock.c | 63 ++--- + 37 files changed, 1481 insertions(+), 520 deletions(-) +Merging nfsd/nfsd-next (ef1954ece840 NFSv4: fix getacl ERANGE for some ACL buffer sizes) +$ git merge nfsd/nfsd-next +Auto-merging fs/nfsd/nfs4layouts.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/namei.c +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 79 +++++++++++++++++++++++++++++++++--- + fs/namei.c | 74 +++++++++++++++++++++++++++++++++ + fs/nfs/nfs4proc.c | 40 +++++++----------- + fs/nfsd/lockd.c | 2 +- + fs/nfsd/netns.h | 2 +- + fs/nfsd/nfs3xdr.c | 2 +- + fs/nfsd/nfs4callback.c | 6 ++- + fs/nfsd/nfs4layouts.c | 39 ++++++++++++------ + fs/nfsd/nfs4recover.c | 6 +-- + fs/nfsd/nfs4state.c | 65 +++++++++++++++++++++-------- + fs/nfsd/nfs4xdr.c | 8 ++-- + fs/nfsd/nfssvc.c | 75 ++++++++++++++++++++++++++++++++-- + fs/nfsd/state.h | 4 +- + fs/nfsd/vfs.c | 23 ++++------- + include/linux/lockd/bind.h | 2 +- + include/linux/namei.h | 1 + + include/linux/sunrpc/svc_xprt.h | 1 + + include/linux/sunrpc/svcauth.h | 9 +++- + net/sunrpc/auth_gss/gss_rpc_upcall.c | 3 ++ + net/sunrpc/svc_xprt.c | 45 ++++++++++++++++++++ + net/sunrpc/svcauth.c | 2 + + net/sunrpc/svcauth_unix.c | 8 ---- + 22 files changed, 395 insertions(+), 101 deletions(-) +Merging orangefs/for-next (4f20854bf736 Orangefs: don't change EXTRAVERSION) +$ git merge orangefs/for-next +Auto-merging fs/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-fs-orangefs | 87 ++ + Documentation/filesystems/orangefs.txt | 137 +++ + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/orangefs/Kconfig | 6 + + fs/orangefs/Makefile | 10 + + fs/orangefs/acl.c | 175 +++ + fs/orangefs/dcache.c | 142 +++ + fs/orangefs/devorangefs-req.c | 1057 ++++++++++++++++ + fs/orangefs/dir.c | 373 ++++++ + fs/orangefs/downcall.h | 133 +++ + fs/orangefs/file.c | 712 +++++++++++ + fs/orangefs/inode.c | 466 ++++++++ + fs/orangefs/namei.c | 446 +++++++ + fs/orangefs/orangefs-bufmap.c | 579 +++++++++ + fs/orangefs/orangefs-bufmap.h | 47 + + fs/orangefs/orangefs-cache.c | 246 ++++ + fs/orangefs/orangefs-debug.h | 92 ++ + fs/orangefs/orangefs-debugfs.c | 457 +++++++ + fs/orangefs/orangefs-debugfs.h | 3 + + fs/orangefs/orangefs-dev-proto.h | 85 ++ + fs/orangefs/orangefs-kernel.h | 792 ++++++++++++ + fs/orangefs/orangefs-mod.c | 315 +++++ + fs/orangefs/orangefs-sysfs.c | 1787 ++++++++++++++++++++++++++++ + fs/orangefs/orangefs-sysfs.h | 2 + + fs/orangefs/orangefs-utils.c | 1156 ++++++++++++++++++ + fs/orangefs/protocol.h | 443 +++++++ + fs/orangefs/super.c | 541 +++++++++ + fs/orangefs/symlink.c | 31 + + fs/orangefs/upcall.h | 246 ++++ + fs/orangefs/waitqueue.c | 514 ++++++++ + fs/orangefs/xattr.c | 540 +++++++++ + 32 files changed, 11622 insertions(+) + create mode 100644 Documentation/ABI/stable/sysfs-fs-orangefs + create mode 100644 Documentation/filesystems/orangefs.txt + create mode 100644 fs/orangefs/Kconfig + create mode 100644 fs/orangefs/Makefile + create mode 100644 fs/orangefs/acl.c + create mode 100644 fs/orangefs/dcache.c + create mode 100644 fs/orangefs/devorangefs-req.c + create mode 100644 fs/orangefs/dir.c + create mode 100644 fs/orangefs/downcall.h + create mode 100644 fs/orangefs/file.c + create mode 100644 fs/orangefs/inode.c + create mode 100644 fs/orangefs/namei.c + create mode 100644 fs/orangefs/orangefs-bufmap.c + create mode 100644 fs/orangefs/orangefs-bufmap.h + create mode 100644 fs/orangefs/orangefs-cache.c + create mode 100644 fs/orangefs/orangefs-debug.h + create mode 100644 fs/orangefs/orangefs-debugfs.c + create mode 100644 fs/orangefs/orangefs-debugfs.h + create mode 100644 fs/orangefs/orangefs-dev-proto.h + create mode 100644 fs/orangefs/orangefs-kernel.h + create mode 100644 fs/orangefs/orangefs-mod.c + create mode 100644 fs/orangefs/orangefs-sysfs.c + create mode 100644 fs/orangefs/orangefs-sysfs.h + create mode 100644 fs/orangefs/orangefs-utils.c + create mode 100644 fs/orangefs/protocol.h + create mode 100644 fs/orangefs/super.c + create mode 100644 fs/orangefs/symlink.c + create mode 100644 fs/orangefs/upcall.h + create mode 100644 fs/orangefs/waitqueue.c + create mode 100644 fs/orangefs/xattr.c +Merging overlayfs/overlayfs-next (84889d493356 ovl: check dentry positiveness in ovl_cleanup_whiteouts()) +$ git merge overlayfs/overlayfs-next +Auto-merging include/uapi/linux/magic.h +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/overlayfs.h +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/copy_up.c +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 41 ++++++++++++++++++++++++++--------------- + fs/overlayfs/inode.c | 36 ++++++++++++++++++++++++++++++++++++ + fs/overlayfs/overlayfs.h | 3 +++ + fs/overlayfs/readdir.c | 3 ++- + fs/overlayfs/super.c | 35 +++++++++++++++++++++++++++++++++-- + include/uapi/linux/magic.h | 1 + + 6 files changed, 101 insertions(+), 18 deletions(-) +Merging squashfs/master (62421645bb70 Squashfs: Add LZ4 compression configuration option) +$ git merge squashfs/master +Already up-to-date. +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Auto-merging fs/9p/vfs_inode.c +Merge made by the 'recursive' strategy. + fs/9p/cache.c | 8 ++--- + fs/9p/v9fs.h | 2 +- + fs/9p/vfs_inode.c | 2 +- + net/9p/trans_fd.c | 88 +++++++++++++++++++++++++++------------------------ + net/9p/trans_virtio.c | 2 +- + 5 files changed, 53 insertions(+), 49 deletions(-) +Merging ubifs/linux-next (4fdd1d51ad5d ubifs: Use XATTR_*_PREFIX_LEN) +$ git merge ubifs/linux-next +Merge made by the 'recursive' strategy. + drivers/mtd/ubi/wl.c | 21 ++++++++++++++++++--- + fs/ubifs/key.h | 6 ++++++ + fs/ubifs/xattr.c | 4 ++-- + 3 files changed, 26 insertions(+), 5 deletions(-) +Merging xfs/for-next (4922be51ef1a Merge branch 'xfs-dax-fixes-for-4.5' into for-next) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_alloc.c | 4 +- + fs/xfs/libxfs/xfs_alloc.h | 1 + + fs/xfs/libxfs/xfs_alloc_btree.c | 35 +-- + fs/xfs/libxfs/xfs_attr_leaf.c | 1 + + fs/xfs/libxfs/xfs_attr_remote.c | 1 + + fs/xfs/libxfs/xfs_bit.c | 6 +- + fs/xfs/libxfs/xfs_bmap.c | 27 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 1 + + fs/xfs/libxfs/xfs_btree.c | 58 ++++ + fs/xfs/libxfs/xfs_btree.h | 3 + + fs/xfs/libxfs/xfs_da_btree.c | 1 + + fs/xfs/libxfs/xfs_dir2_block.c | 1 + + fs/xfs/libxfs/xfs_dir2_data.c | 2 + + fs/xfs/libxfs/xfs_dir2_leaf.c | 2 + + fs/xfs/libxfs/xfs_dir2_node.c | 1 + + fs/xfs/libxfs/xfs_dquot_buf.c | 1 + + fs/xfs/libxfs/xfs_format.h | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 1 + + fs/xfs/libxfs/xfs_ialloc_btree.c | 27 +- + fs/xfs/libxfs/xfs_inode_buf.c | 2 + + fs/xfs/libxfs/xfs_log_recover.h | 1 + + fs/xfs/libxfs/xfs_sb.c | 2 + + fs/xfs/libxfs/xfs_symlink_remote.c | 1 + + fs/xfs/xfs_buf.c | 2 +- + fs/xfs/xfs_buf.h | 1 + + fs/xfs/xfs_error.c | 4 +- + fs/xfs/xfs_file.c | 25 +- + fs/xfs/xfs_iomap.c | 11 +- + fs/xfs/xfs_log.c | 51 +++- + fs/xfs/xfs_log_priv.h | 3 + + fs/xfs/xfs_log_recover.c | 572 ++++++++++++++++++++++++++++++------- + fs/xfs/xfs_super.c | 2 +- + fs/xfs/xfs_sysfs.c | 36 +++ + fs/xfs/xfs_trans_dquot.c | 14 +- + 34 files changed, 693 insertions(+), 209 deletions(-) +Merging file-locks/linux-next (b4d629a39e10 locks: rename __posix_lock_file to posix_lock_inode) +$ git merge file-locks/linux-next +Auto-merging fs/Kconfig +Merge made by the 'recursive' strategy. + fs/Kconfig | 10 +++ + fs/inode.c | 2 +- + fs/locks.c | 138 ++++++++++++++++++++++++++-------------- + fs/namespace.c | 10 +++ + include/linux/fs.h | 78 ++++++++++++----------- + include/trace/events/filelock.h | 77 ++++++++++++++++++++++ + 6 files changed, 232 insertions(+), 83 deletions(-) +Merging vfs/for-next (6f3925248b75 Merge branches 'work.iov_iter', 'work.copy_file_range', 'work.xattr' and 'work.symlinks' into for-next) +$ git merge vfs/for-next +Recorded preimage for 'fs/namei.c' +Recorded preimage for 'fs/nfs/nfs4file.c' +Resolved 'drivers/s390/char/zcore.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Auto-merging net/9p/trans_virtio.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/nfs4.h +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging fs/xfs/xfs_buf.c +Removing fs/ufs/symlink.c +Auto-merging fs/udf/udfdecl.h +Auto-merging fs/udf/inode.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/nfsd/state.h +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/nfs4file.c +CONFLICT (content): Merge conflict in fs/nfs/nfs4file.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +CONFLICT (content): Merge conflict in fs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/gfs2/xattr.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/debug.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/btrfs/xattr.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/acl.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging drivers/s390/char/zcore.c +CONFLICT (content): Merge conflict in drivers/s390/char/zcore.c +Auto-merging arch/s390/pci/pci_dma.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/namei.c'. +Recorded resolution for 'fs/nfs/nfs4file.c'. +[master f2c2633d2550] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 6 +- + Documentation/filesystems/porting | 17 + + Documentation/filesystems/vfs.txt | 21 +- + Documentation/printk-formats.txt | 6 + + arch/blackfin/include/asm/uaccess.h | 6 - + arch/m68k/include/asm/uaccess_no.h | 4 - + arch/mips/lasat/picvue_proc.c | 18 +- + arch/mn10300/include/asm/uaccess.h | 15 - + arch/powerpc/include/asm/uaccess.h | 15 - + arch/powerpc/kernel/nvram_64.c | 19 +- + arch/s390/pci/pci_dma.c | 3 +- + arch/sparc/include/asm/uaccess_32.h | 65 ---- + arch/sparc/include/asm/uaccess_64.h | 40 --- + arch/sparc/kernel/mdesc.c | 20 +- + arch/um/drivers/hostaudio_kern.c | 10 +- + arch/um/drivers/mconsole_kern.c | 14 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/kernel/cpuid.c | 24 +- + arch/x86/kernel/msr.c | 24 +- + arch/xtensa/platforms/iss/simdisk.c | 12 +- + drivers/block/cciss.c | 14 +- + drivers/block/mtip32xx/mtip32xx.c | 23 +- + drivers/block/nbd.c | 1 + + drivers/block/rsxx/core.c | 11 +- + drivers/cdrom/cdrom.c | 10 +- + drivers/char/generic_nvram.c | 21 +- + drivers/char/mbcs.c | 28 +- + drivers/char/nvram.c | 18 +- + drivers/char/nwflash.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 33 +- + drivers/gpu/vga/vgaarb.c | 7 - + drivers/md/bcache/util.c | 2 +- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-io.c | 4 +- + drivers/mtd/maps/pcmciamtd.c | 28 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 12 +- + drivers/net/wireless/libertas/debugfs.c | 181 ++++------- + drivers/net/wireless/mwifiex/debugfs.c | 82 ++--- + drivers/net/wireless/ti/wlcore/debugfs.c | 17 +- + drivers/s390/char/vmcp.c | 11 +- + drivers/s390/char/vmur.c | 15 +- + drivers/sbus/char/openprom.c | 13 +- + drivers/staging/lustre/lustre/llite/file.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 4 +- + drivers/staging/lustre/lustre/llite/namei.c | 4 +- + drivers/staging/lustre/lustre/llite/symlink.c | 26 +- + drivers/staging/lustre/lustre/llite/xattr.c | 4 +- + drivers/usb/core/devices.c | 26 +- + drivers/usb/core/devio.c | 26 +- + drivers/usb/host/uhci-debug.c | 23 +- + drivers/usb/misc/sisusbvga/sisusb.c | 16 +- + fs/9p/acl.c | 24 +- + fs/9p/vfs_inode.c | 24 +- + fs/9p/vfs_inode_dotl.c | 21 +- + fs/9p/xattr.c | 4 - + fs/adfs/adfs.h | 6 +- + fs/adfs/dir.c | 6 +- + fs/adfs/dir_f.c | 2 +- + fs/adfs/dir_fplus.c | 2 +- + fs/affs/affs.h | 2 +- + fs/affs/amigaffs.c | 13 +- + fs/affs/inode.c | 1 + + fs/affs/namei.c | 1 + + fs/affs/super.c | 2 +- + fs/affs/symlink.c | 9 +- + fs/afs/inode.c | 1 + + fs/afs/proc.c | 25 +- + fs/autofs4/symlink.c | 14 +- + fs/bad_inode.c | 2 +- + fs/befs/linuxvfs.c | 40 +-- + fs/block_dev.c | 12 +- + fs/btrfs/acl.c | 8 +- + fs/btrfs/ctree.h | 8 +- + fs/btrfs/file.c | 3 + + fs/btrfs/inode.c | 21 +- + fs/btrfs/ioctl.c | 186 +++-------- + fs/btrfs/super.c | 4 +- + fs/btrfs/xattr.c | 166 ++++------ + fs/btrfs/xattr.h | 2 - + fs/buffer.c | 21 +- + fs/cachefiles/daemon.c | 12 +- + fs/ceph/acl.c | 16 +- + fs/ceph/inode.c | 2 +- + fs/cifs/cifsfs.c | 64 +++- + fs/cifs/cifsfs.h | 6 +- + fs/cifs/ioctl.c | 126 ++++---- + fs/cifs/link.c | 10 +- + fs/cifs/xattr.c | 16 +- + fs/coda/cnode.c | 5 +- + fs/coda/symlink.c | 4 +- + fs/compat.c | 21 +- + fs/compat_ioctl.c | 269 ++++++++-------- + fs/configfs/symlink.c | 22 +- + fs/coredump.c | 8 +- + fs/cramfs/inode.c | 1 + + fs/dcache.c | 16 +- + fs/dlm/user.c | 11 +- + fs/ecryptfs/inode.c | 21 +- + fs/efs/inode.c | 1 + + fs/efs/symlink.c | 4 +- + fs/exec.c | 4 +- + fs/exofs/inode.c | 1 + + fs/exofs/namei.c | 1 + + fs/ext2/inode.c | 1 + + fs/ext2/namei.c | 1 + + fs/ext2/symlink.c | 5 +- + fs/ext2/xattr.c | 21 +- + fs/ext2/xattr_security.c | 21 -- + fs/ext2/xattr_trusted.c | 23 +- + fs/ext2/xattr_user.c | 23 +- + fs/ext4/inode.c | 1 + + fs/ext4/namei.c | 1 + + fs/ext4/page-io.c | 5 +- + fs/ext4/symlink.c | 29 +- + fs/ext4/xattr.c | 23 +- + fs/ext4/xattr_security.c | 22 -- + fs/ext4/xattr_trusted.c | 23 +- + fs/ext4/xattr_user.c | 23 +- + fs/f2fs/debug.c | 6 +- + fs/f2fs/f2fs.h | 6 +- + fs/f2fs/inode.c | 1 + + fs/f2fs/namei.c | 31 +- + fs/f2fs/xattr.c | 92 ++---- + fs/f2fs/xattr.h | 2 +- + fs/fcntl.c | 3 +- + fs/file.c | 6 +- + fs/freevxfs/vxfs_inode.c | 1 + + fs/fuse/dir.c | 17 +- + fs/gfs2/acl.c | 4 +- + fs/gfs2/acl.h | 2 - + fs/gfs2/inode.c | 19 +- + fs/gfs2/ops_fstype.c | 4 +- + fs/gfs2/xattr.c | 50 --- + fs/gfs2/xattr.h | 1 - + fs/hfs/mdb.c | 4 +- + fs/hfsplus/inode.c | 2 + + fs/hfsplus/posix_acl.c | 8 +- + fs/hfsplus/xattr.c | 12 - + fs/hostfs/hostfs_kern.c | 22 +- + fs/hpfs/inode.c | 1 + + fs/hpfs/map.c | 2 +- + fs/hpfs/namei.c | 5 +- + fs/hugetlbfs/inode.c | 1 + + fs/inode.c | 6 + + fs/internal.h | 9 +- + fs/ioctl.c | 71 ++++- + fs/isofs/inode.c | 1 + + fs/isofs/rock.c | 4 +- + fs/jbd2/transaction.c | 6 +- + fs/jffs2/security.c | 22 -- + fs/jffs2/symlink.c | 2 +- + fs/jffs2/xattr.c | 26 +- + fs/jffs2/xattr_trusted.c | 21 +- + fs/jffs2/xattr_user.c | 20 -- + fs/jfs/acl.c | 8 +- + fs/jfs/inode.c | 1 + + fs/jfs/jfs_logmgr.c | 9 +- + fs/jfs/namei.c | 1 + + fs/jfs/symlink.c | 5 +- + fs/kernfs/inode.c | 4 +- + fs/kernfs/symlink.c | 24 +- + fs/libfs.c | 22 +- + fs/locks.c | 22 +- + fs/logfs/dir.c | 9 +- + fs/logfs/inode.c | 3 +- + fs/logfs/logfs.h | 5 +- + fs/logfs/readwrite.c | 4 +- + fs/logfs/segment.c | 2 +- + fs/minix/inode.c | 4 +- + fs/minix/itree_v1.c | 9 +- + fs/minix/itree_v2.c | 9 +- + fs/namei.c | 260 ++++++++-------- + fs/namespace.c | 39 ++- + fs/ncpfs/inode.c | 4 +- + fs/nfs/inode.c | 26 +- + fs/nfs/nfs3acl.c | 4 +- + fs/nfs/nfs4file.c | 87 +----- + fs/nfs/nfs4proc.c | 75 ++--- + fs/nfs/symlink.c | 39 ++- + fs/nfsd/nfs4proc.c | 63 +++- + fs/nfsd/nfs4state.c | 5 +- + fs/nfsd/nfs4xdr.c | 21 ++ + fs/nfsd/state.h | 4 +- + fs/nfsd/vfs.c | 8 + + fs/nfsd/vfs.h | 2 + + fs/nfsd/xdr4.h | 10 + + fs/nilfs2/inode.c | 1 + + fs/nilfs2/namei.c | 4 +- + fs/nilfs2/super.c | 6 +- + fs/ocfs2/inode.c | 1 + + fs/ocfs2/namei.c | 1 + + fs/ocfs2/symlink.c | 3 +- + fs/ocfs2/xattr.c | 168 ++++------ + fs/open.c | 5 +- + fs/overlayfs/inode.c | 53 +--- + fs/posix_acl.c | 25 +- + fs/proc/base.c | 41 +-- + fs/proc/fd.c | 1 + + fs/proc/inode.c | 21 +- + fs/proc/namespaces.c | 10 +- + fs/proc/self.c | 18 +- + fs/proc/thread_self.c | 19 +- + fs/proc_namespace.c | 27 +- + fs/qnx4/inode.c | 1 + + fs/qnx6/inode.c | 1 + + fs/ramfs/inode.c | 1 + + fs/read_write.c | 341 ++++++++++++++++++++- + fs/reiserfs/inode.c | 1 + + fs/reiserfs/journal.c | 24 +- + fs/reiserfs/namei.c | 4 +- + fs/reiserfs/prints.c | 9 +- + fs/reiserfs/procfs.c | 5 +- + fs/reiserfs/xattr.c | 16 +- + fs/reiserfs/xattr_acl.c | 8 +- + fs/reiserfs/xattr_security.c | 16 +- + fs/reiserfs/xattr_trusted.c | 15 +- + fs/reiserfs/xattr_user.c | 14 +- + fs/romfs/super.c | 1 + + fs/select.c | 6 +- + fs/splice.c | 8 +- + fs/squashfs/inode.c | 2 + + fs/squashfs/super.c | 7 +- + fs/squashfs/symlink.c | 3 +- + fs/squashfs/xattr.c | 38 +-- + fs/super.c | 4 +- + fs/sysv/inode.c | 4 +- + fs/ubifs/file.c | 2 +- + fs/udf/inode.c | 3 +- + fs/udf/namei.c | 8 +- + fs/udf/symlink.c | 4 +- + fs/udf/udfdecl.h | 1 - + fs/ufs/Makefile | 2 +- + fs/ufs/inode.c | 5 +- + fs/ufs/namei.c | 5 +- + fs/ufs/symlink.c | 42 --- + fs/ufs/ufs.h | 4 - + fs/xattr.c | 203 ++++++------ + fs/xfs/xfs_acl.c | 23 -- + fs/xfs/xfs_acl.h | 4 - + fs/xfs/xfs_buf.c | 8 +- + fs/xfs/xfs_iops.c | 14 +- + fs/xfs/xfs_xattr.c | 143 ++++----- + include/linux/delayed_call.h | 34 ++ + include/linux/fs.h | 74 +++-- + include/linux/nfs4.h | 4 +- + include/linux/nfs_fs.h | 1 + + include/linux/posix_acl_xattr.h | 6 +- + include/linux/string.h | 1 + + include/linux/syscalls.h | 3 + + include/linux/uio.h | 4 +- + include/linux/xattr.h | 20 +- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/fs.h | 39 +++ + kernel/sys_ni.c | 1 + + kernel/sysctl.c | 79 ++--- + kernel/trace/blktrace.c | 12 +- + kernel/trace/trace_events.c | 28 +- + kernel/trace/trace_events_trigger.c | 15 +- + kernel/user_namespace.c | 21 +- + lib/dynamic_debug.c | 11 +- + lib/iov_iter.c | 11 +- + lib/vsprintf.c | 29 ++ + mm/shmem.c | 181 +++++------ + mm/util.c | 31 ++ + net/9p/trans_virtio.c | 16 +- + net/rxrpc/ar-key.c | 24 +- + security/integrity/iint.c | 11 +- + security/selinux/selinuxfs.c | 114 +++---- + security/smack/smack_lsm.c | 2 - + security/smack/smackfs.c | 114 ++----- + security/tomoyo/securityfs_if.c | 11 +- + 272 files changed, 2673 insertions(+), 3439 deletions(-) + delete mode 100644 fs/ufs/symlink.c + create mode 100644 include/linux/delayed_call.h +$ git am -3 ../patches/0001-orangfs-update-for-follow_link-to-get_link-change.patch +Applying: orangfs: update for follow_link to get_link change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/orangefs/symlink.c +$ git add -A . +$ git commit -v -a --amend +[master 98996debf5e5] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Jan 11 12:14:56 2016 +1100 +Merging pci/next (55c10c538c85 Merge branch 'pci/trivial' into next) +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci-sysfs.c +Auto-merging drivers/pci/msi.c +Auto-merging drivers/pci/host/pcie-hisi.c +Auto-merging drivers/pci/host/pcie-designware.c +Auto-merging drivers/pci/host/Kconfig +Auto-merging arch/powerpc/kernel/eeh_driver.c +Auto-merging arch/arm/boot/dts/qcom-apq8064.dtsi +Auto-merging arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/brcm,iproc-pcie.txt | 40 +- + .../devicetree/bindings/pci/hisilicon-pcie.txt | 8 +- + .../devicetree/bindings/pci/pci-rcar-gen2.txt | 17 +- + .../devicetree/bindings/pci/qcom,pcie.txt | 233 +++++++ + Documentation/devicetree/bindings/pci/rcar-pci.txt | 14 +- + MAINTAINERS | 8 + + arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 26 + + arch/arm/boot/dts/qcom-apq8064.dtsi | 36 + + arch/powerpc/kernel/eeh_driver.c | 2 +- + arch/powerpc/kernel/pci_of_scan.c | 3 - + arch/x86/include/asm/pci_x86.h | 10 +- + arch/x86/pci/pcbios.c | 108 ++- + drivers/pci/access.c | 8 +- + drivers/pci/bus.c | 6 +- + drivers/pci/host/Kconfig | 36 +- + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-dra7xx.c | 13 +- + drivers/pci/host/pci-exynos.c | 3 +- + drivers/pci/host/pci-host-generic.c | 9 - + drivers/pci/host/pci-imx6.c | 25 +- + drivers/pci/host/pci-rcar-gen2.c | 77 ++- + drivers/pci/host/pci-tegra.c | 2 +- + drivers/pci/host/pci-versatile.c | 5 +- + drivers/pci/host/pcie-designware.c | 61 +- + drivers/pci/host/pcie-hisi.c | 76 ++- + drivers/pci/host/pcie-iproc-bcma.c | 1 + + drivers/pci/host/pcie-iproc-msi.c | 675 +++++++++++++++++++ + drivers/pci/host/pcie-iproc-platform.c | 25 +- + drivers/pci/host/pcie-iproc.c | 230 ++++++- + drivers/pci/host/pcie-iproc.h | 42 +- + drivers/pci/host/pcie-qcom.c | 616 +++++++++++++++++ + drivers/pci/host/pcie-rcar.c | 237 +++++-- + drivers/pci/host/pcie-spear13xx.c | 3 +- + drivers/pci/host/pcie-xilinx.c | 3 +- + drivers/pci/hotplug/acpi_pcihp.c | 10 +- + drivers/pci/hotplug/acpiphp.h | 2 +- + drivers/pci/hotplug/acpiphp_core.c | 14 +- + drivers/pci/hotplug/acpiphp_glue.c | 2 +- + drivers/pci/hotplug/acpiphp_ibm.c | 19 +- + drivers/pci/hotplug/cpci_hotplug.h | 14 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 16 +- + drivers/pci/hotplug/cpci_hotplug_pci.c | 10 +- + drivers/pci/hotplug/cpcihp_generic.c | 12 +- + drivers/pci/hotplug/cpcihp_zt5550.c | 14 +- + drivers/pci/hotplug/cpqphp.h | 14 +- + drivers/pci/hotplug/cpqphp_core.c | 32 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 200 +++--- + drivers/pci/hotplug/cpqphp_nvram.c | 92 +-- + drivers/pci/hotplug/cpqphp_pci.c | 84 +-- + drivers/pci/hotplug/cpqphp_sysfs.c | 6 +- + drivers/pci/hotplug/ibmphp.h | 12 +- + drivers/pci/hotplug/ibmphp_core.c | 51 +- + drivers/pci/hotplug/ibmphp_ebda.c | 532 ++++++++------- + drivers/pci/hotplug/ibmphp_hpc.c | 388 ++++++----- + drivers/pci/hotplug/ibmphp_pci.c | 730 ++++++++++----------- + drivers/pci/hotplug/ibmphp_res.c | 514 +++++++-------- + drivers/pci/hotplug/pci_hotplug_core.c | 14 +- + drivers/pci/hotplug/pciehp.h | 8 +- + drivers/pci/hotplug/pciehp_core.c | 16 +- + drivers/pci/hotplug/pciehp_ctrl.c | 2 + + drivers/pci/hotplug/pcihp_skeleton.c | 31 +- + drivers/pci/hotplug/rpadlpar_core.c | 7 +- + drivers/pci/hotplug/rpaphp.h | 8 +- + drivers/pci/hotplug/rpaphp_core.c | 9 +- + drivers/pci/hotplug/rpaphp_pci.c | 2 +- + drivers/pci/hotplug/rpaphp_slot.c | 2 +- + drivers/pci/hotplug/s390_pci_hpc.c | 7 +- + drivers/pci/hotplug/sgi_hotplug.c | 6 +- + drivers/pci/hotplug/shpchp.h | 14 +- + drivers/pci/hotplug/shpchp_core.c | 35 +- + drivers/pci/hotplug/shpchp_hpc.c | 4 +- + drivers/pci/hotplug/shpchp_sysfs.c | 10 +- + drivers/pci/msi.c | 4 - + drivers/pci/pci-label.c | 4 +- + drivers/pci/pci-sysfs.c | 58 +- + drivers/pci/pci.c | 4 +- + drivers/pci/pci.h | 2 - + drivers/pci/pcie/aer/aerdrv_core.c | 10 +- + drivers/pci/pcie/aspm.c | 16 +- + drivers/pci/probe.c | 33 +- + drivers/pci/quirks.c | 11 + + drivers/pci/rom.c | 23 +- + drivers/pci/setup-bus.c | 2 +- + include/linux/msi.h | 4 +- + include/linux/of_pci.h | 7 + + include/linux/pci.h | 2 - + include/linux/pci_ids.h | 6 + + 87 files changed, 3908 insertions(+), 1881 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie.txt + create mode 100644 drivers/pci/host/pcie-iproc-msi.c + create mode 100644 drivers/pci/host/pcie-qcom.c +$ git am -3 ../patches/0001-PCI-qcom-the-Qualcomm-PCIe-controller-driver-should-.patch +Applying: PCI: qcom: the Qualcomm PCIe controller driver should not depend on COMPILE_TEST +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/pci/host/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 50826040eba3] Merge remote-tracking branch 'pci/next' + Date: Mon Jan 11 12:23:32 2016 +1100 +Merging hid/for-next (0abcb3a84626 Merge branch 'for-4.4/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-sensor-hub.c +Auto-merging drivers/hid/hid-ids.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/hid/hid-core.c | 49 +-- + drivers/hid/hid-corsair.c | 13 +- + drivers/hid/hid-cp2112.c | 8 +- + drivers/hid/hid-debug.c | 4 +- + drivers/hid/hid-gt683r.c | 8 +- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-input.c | 21 +- + drivers/hid/hid-lenovo.c | 36 +-- + drivers/hid/hid-lg4ff.c | 6 +- + drivers/hid/hid-logitech-hidpp.c | 286 ++++++++++++++++-- + drivers/hid/hid-multitouch.c | 24 +- + drivers/hid/hid-ntrig.c | 32 +- + drivers/hid/hid-picolcd_leds.c | 4 +- + drivers/hid/hid-prodikeys.c | 12 +- + drivers/hid/hid-roccat-arvo.c | 6 +- + drivers/hid/hid-roccat-common.c | 6 +- + drivers/hid/hid-roccat-isku.c | 6 +- + drivers/hid/hid-roccat-kone.c | 12 +- + drivers/hid/hid-roccat-koneplus.c | 12 +- + drivers/hid/hid-roccat-kovaplus.c | 12 +- + drivers/hid/hid-roccat-lua.c | 4 +- + drivers/hid/hid-roccat-pyra.c | 15 +- + drivers/hid/hid-sensor-hub.c | 3 + + drivers/hid/hid-sony.c | 107 +++++-- + drivers/hid/hid-steelseries.c | 8 +- + drivers/hid/hid-wiimote-modules.c | 8 +- + drivers/hid/hid-wiimote.h | 3 +- + drivers/hid/i2c-hid/i2c-hid.c | 22 +- + drivers/hid/usbhid/hid-core.c | 6 +- + drivers/hid/usbhid/usbhid.h | 2 +- + drivers/hid/wacom_sys.c | 23 +- + drivers/hid/wacom_wac.c | 617 +++++++++++++++++--------------------- + drivers/hid/wacom_wac.h | 5 +- + drivers/input/joystick/xpad.c | 16 + + include/linux/hid.h | 8 + + 36 files changed, 835 insertions(+), 574 deletions(-) +Merging i2c/i2c/for-next (dd4068192717 Merge branch 'i2c/for-4.5' into i2c/for-next) +$ git merge i2c/i2c/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/eeprom/eeprom.txt | 21 +- + Documentation/devicetree/bindings/i2c/i2c-at91.txt | 5 +- + .../devicetree/bindings/i2c/i2c-brcmstb.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 4 + + Documentation/devicetree/bindings/i2c/i2c.txt | 36 ++- + .../devicetree/bindings/i2c/trivial-devices.txt | 15 +- + drivers/i2c/algos/i2c-algo-bit.c | 6 + + drivers/i2c/busses/Kconfig | 9 +- + drivers/i2c/busses/i2c-at91.c | 53 +++- + drivers/i2c/busses/i2c-bcm2835.c | 10 + + drivers/i2c/busses/i2c-brcmstb.c | 80 ++++-- + drivers/i2c/busses/i2c-cadence.c | 73 +++-- + drivers/i2c/busses/i2c-designware-core.c | 23 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 4 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 32 ++- + drivers/i2c/busses/i2c-eg20t.c | 1 + + drivers/i2c/busses/i2c-emev2.c | 112 +++++++- + drivers/i2c/busses/i2c-ibm_iic.c | 4 +- + drivers/i2c/busses/i2c-img-scb.c | 92 ++++-- + drivers/i2c/busses/i2c-imx.c | 109 +++++-- + drivers/i2c/busses/i2c-mt65xx.c | 54 +++- + drivers/i2c/busses/i2c-piix4.c | 202 +++++++++++-- + drivers/i2c/busses/i2c-rcar.c | 319 ++++++++++----------- + drivers/i2c/busses/i2c-s3c2410.c | 6 - + drivers/i2c/busses/i2c-st.c | 3 +- + drivers/i2c/busses/i2c-taos-evm.c | 8 +- + drivers/i2c/busses/i2c-uniphier-f.c | 11 +- + drivers/i2c/busses/i2c-uniphier.c | 11 +- + drivers/i2c/busses/i2c-xiic.c | 12 +- + drivers/i2c/busses/i2c-xlr.c | 250 ++++++++++++++-- + drivers/i2c/i2c-core.c | 56 ++++ + include/linux/i2c.h | 34 +++ + 32 files changed, 1240 insertions(+), 417 deletions(-) +Merging jdelvare-hwmon/master (ef0303d2bba0 hwmon: (emc2103) Fix typo in MODULE_PARM_DESC) +$ git merge jdelvare-hwmon/master +Merge made by the 'recursive' strategy. + drivers/hwmon/emc2103.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dmi/master (afac06294288 firmware: dmi_scan: Save SMBIOS Type 9 System Slots) +$ git merge dmi/master +Auto-merging drivers/firmware/dmi_scan.c +Merge made by the 'recursive' strategy. + drivers/firmware/dmi_scan.c | 62 ++++++++++++++++++++++++++++++--------------- + include/linux/dmi.h | 1 + + 2 files changed, 43 insertions(+), 20 deletions(-) +Merging hwmon-staging/hwmon-next (91918d13eb17 hwmon: (nct6683) Add basic support for NCT6683 on Mitac boards) +$ git merge hwmon-staging/hwmon-next +Removing drivers/hwmon/htu21.c +Auto-merging MAINTAINERS +Removing Documentation/hwmon/htu21 +Merge made by the 'recursive' strategy. + CREDITS | 8 ++ + Documentation/hwmon/htu21 | 46 --------- + Documentation/hwmon/ltc3815 | 61 ++++++++++++ + MAINTAINERS | 4 +- + drivers/hwmon/Kconfig | 10 -- + drivers/hwmon/Makefile | 1 - + drivers/hwmon/fam15h_power.c | 7 +- + drivers/hwmon/htu21.c | 174 ---------------------------------- + drivers/hwmon/ibmaem.c | 12 +-- + drivers/hwmon/nct6683.c | 89 ++++++++++++----- + drivers/hwmon/nct6775.c | 11 ++- + drivers/hwmon/pmbus/Kconfig | 10 ++ + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc3815.c | 215 ++++++++++++++++++++++++++++++++++++++++++ + 14 files changed, 381 insertions(+), 268 deletions(-) + delete mode 100644 Documentation/hwmon/htu21 + create mode 100644 Documentation/hwmon/ltc3815 + delete mode 100644 drivers/hwmon/htu21.c + create mode 100644 drivers/hwmon/pmbus/ltc3815.c +Merging v4l-dvb/master (e27bc2ab8e77 Merge ../mc_dvb into to_next) +$ git merge v4l-dvb/master +Resolved 'arch/arm/mach-pxa/mioa701.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/palmtreo.c' using previous resolution. +Resolved 'arch/arm/mach-pxa/palmz72.c' using previous resolution. +Auto-merging include/media/i2c/tvp5150.h +Auto-merging include/media/i2c/smiapp.h +Auto-merging include/media/i2c/saa7127.h +Auto-merging include/media/i2c/saa7115.h +Auto-merging include/media/i2c/lm3646.h +Auto-merging include/media/i2c/lm3560.h +Auto-merging include/media/i2c/as3645a.h +Auto-merging include/media/i2c/adp1653.h +Auto-merging include/media/drv-intf/tea575x.h +Auto-merging include/media/drv-intf/si476x.h +Auto-merging include/media/drv-intf/saa7146_vv.h +Auto-merging include/media/drv-intf/msp3400.h +Auto-merging include/linux/platform_data/media/si4713.h +Auto-merging include/linux/platform_data/media/s5p_hdmi.h +Auto-merging include/linux/platform_data/media/gpio-ir-recv.h +Removing include/linux/platform_data/camera-rcar.h +Removing drivers/media/v4l2-core/videobuf2-internal.h +Auto-merging drivers/media/usb/hackrf/hackrf.c +Auto-merging drivers/media/usb/airspy/airspy.c +Auto-merging drivers/media/pci/ivtv/ivtv-driver.c +Auto-merging arch/arm/plat-samsung/devs.c +Auto-merging arch/arm/mach-pxa/pcm990-baseboard.c +Auto-merging arch/arm/mach-pxa/palmz72.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmz72.c +Auto-merging arch/arm/mach-pxa/palmtreo.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/palmtreo.c +Auto-merging arch/arm/mach-pxa/mioa701.c +CONFLICT (content): Merge conflict in arch/arm/mach-pxa/mioa701.c +Auto-merging arch/arm/mach-pxa/ezx.c +Auto-merging arch/arm/mach-pxa/em-x270.c +Auto-merging arch/arm/mach-pxa/devices.c +Auto-merging arch/arm/mach-omap2/board-rx51-peripherals.c +Auto-merging arch/arm/mach-omap1/camera.h +Auto-merging arch/arm/mach-davinci/board-dm355-evm.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging MAINTAINERS +Removing Documentation/media-framework.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 17540820ff74] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/device-drivers.tmpl | 85 +- + Documentation/DocBook/media/Makefile | 6 +- + Documentation/DocBook/media/dvb/dvbproperty.xml | 2 +- + Documentation/DocBook/media/dvb/examples.xml | 2 +- + Documentation/DocBook/media/dvb/intro.xml | 2 +- + Documentation/DocBook/media/v4l/capture.c.xml | 2 +- + Documentation/DocBook/media/v4l/compat.xml | 2 +- + Documentation/DocBook/media/v4l/io.xml | 10 +- + .../DocBook/media/v4l/media-controller.xml | 44 +- + .../DocBook/media/v4l/media-ioc-enum-entities.xml | 104 +-- + .../DocBook/media/v4l/media-ioc-enum-links.xml | 56 -- + .../DocBook/media/v4l/media-ioc-g-topology.xml | 391 +++++++++ + Documentation/DocBook/media/v4l/media-types.xml | 240 ++++++ + Documentation/DocBook/media/v4l/v4l2.xml | 10 + + .../DocBook/media/v4l/vidioc-create-bufs.xml | 30 +- + .../DocBook/media/v4l/vidioc-dbg-g-chip-info.xml | 2 +- + .../DocBook/media/v4l/vidioc-dbg-g-register.xml | 2 +- + Documentation/DocBook/media/v4l/vidioc-enumstd.xml | 2 +- + .../DocBook/media/v4l/vidioc-g-ext-ctrls.xml | 28 +- + Documentation/DocBook/media_api.tmpl | 6 +- + .../bindings/media/stih407-c8sectpfe.txt | 20 +- + Documentation/dvb/README.dvb-usb | 4 +- + Documentation/dvb/faq.txt | 2 +- + Documentation/dvb/get_dvb_firmware | 22 +- + Documentation/dvb/readme.txt | 10 +- + Documentation/media-framework.txt | 372 --------- + Documentation/video4linux/API.html | 2 +- + Documentation/video4linux/CARDLIST.em28xx | 4 +- + Documentation/video4linux/fimc.txt | 6 +- + Documentation/video4linux/omap4_camera.txt | 2 +- + Documentation/video4linux/si4713.txt | 2 +- + Documentation/video4linux/v4l2-framework.txt | 12 +- + Documentation/video4linux/v4l2-pci-skeleton.c | 13 +- + Documentation/zh_CN/video4linux/v4l2-framework.txt | 8 +- + MAINTAINERS | 226 ++--- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 46 +- + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-evm.c | 2 +- + arch/arm/mach-davinci/board-dm365-evm.c | 4 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 2 +- + arch/arm/mach-davinci/board-dm646x-evm.c | 4 +- + arch/arm/mach-imx/devices/devices-common.h | 4 +- + arch/arm/mach-omap1/camera.h | 2 +- + arch/arm/mach-omap2/board-rx51-peripherals.c | 4 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/palmtreo.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 4 +- + arch/arm/plat-samsung/devs.c | 2 +- + arch/blackfin/mach-bf561/boards/ezkit.c | 2 +- + arch/blackfin/mach-bf609/boards/ezkit.c | 6 +- + arch/sh/boards/mach-ap325rxa/setup.c | 6 +- + arch/sh/boards/mach-ecovec24/setup.c | 10 +- + arch/sh/boards/mach-kfr2r09/setup.c | 4 +- + arch/sh/boards/mach-migor/setup.c | 6 +- + arch/sh/boards/mach-se/7724/setup.c | 6 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 2 +- + drivers/input/touchscreen/sur40.c | 13 +- + drivers/media/Kconfig | 5 +- + drivers/media/common/cx2341x.c | 2 +- + drivers/media/common/saa7146/saa7146_core.c | 2 +- + drivers/media/common/saa7146/saa7146_fops.c | 2 +- + drivers/media/common/saa7146/saa7146_hlp.c | 2 +- + drivers/media/common/saa7146/saa7146_i2c.c | 2 +- + drivers/media/common/saa7146/saa7146_vbi.c | 2 +- + drivers/media/common/saa7146/saa7146_video.c | 2 +- + drivers/media/common/siano/smsdvb-main.c | 7 +- + drivers/media/common/siano/smsir.h | 2 - + drivers/media/dvb-core/demux.h | 67 +- + drivers/media/dvb-core/dmxdev.c | 4 +- + drivers/media/dvb-core/dvb-usb-ids.h | 1 + + drivers/media/dvb-core/dvb_ca_en50221.c | 2 +- + drivers/media/dvb-core/dvb_frontend.c | 38 +- + drivers/media/dvb-core/dvb_frontend.h | 221 +++-- + drivers/media/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 488 +++++++++-- + drivers/media/dvb-core/dvbdev.h | 58 +- + drivers/media/dvb-frontends/Kconfig | 2 +- + drivers/media/dvb-frontends/au8522_common.c | 10 +- + drivers/media/dvb-frontends/au8522_decoder.c | 31 +- + drivers/media/dvb-frontends/au8522_dig.c | 16 +- + drivers/media/dvb-frontends/au8522_priv.h | 14 +- + drivers/media/dvb-frontends/bsbe1-d01a.h | 2 +- + drivers/media/dvb-frontends/bsbe1.h | 2 +- + drivers/media/dvb-frontends/bsru6.h | 2 +- + drivers/media/dvb-frontends/isl6405.c | 2 +- + drivers/media/dvb-frontends/isl6405.h | 2 +- + drivers/media/dvb-frontends/isl6421.c | 2 +- + drivers/media/dvb-frontends/isl6421.h | 2 +- + drivers/media/dvb-frontends/lnbp21.c | 2 +- + drivers/media/dvb-frontends/lnbp21.h | 2 +- + drivers/media/dvb-frontends/lnbp22.c | 2 +- + drivers/media/dvb-frontends/lnbp22.h | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 21 +- + drivers/media/dvb-frontends/rtl2832_sdr.c | 4 +- + drivers/media/dvb-frontends/si2165.c | 351 +++++--- + drivers/media/dvb-frontends/stb6100.c | 76 +- + drivers/media/dvb-frontends/stb6100.h | 1 - + drivers/media/dvb-frontends/stb6100_cfg.h | 37 +- + drivers/media/dvb-frontends/stb6100_proc.h | 43 +- + drivers/media/dvb-frontends/tda665x.c | 183 ++-- + drivers/media/dvb-frontends/tda8261.c | 125 ++- + drivers/media/dvb-frontends/tda8261_cfg.h | 37 +- + drivers/media/dvb-frontends/tdhd1.h | 2 +- + drivers/media/firewire/firedtv-ci.c | 2 +- + drivers/media/i2c/Kconfig | 10 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/ad9389b.c | 4 +- + drivers/media/i2c/adp1653.c | 6 +- + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv7183.c | 2 +- + drivers/media/i2c/adv7343.c | 2 +- + drivers/media/i2c/adv7393.c | 2 +- + drivers/media/i2c/adv7511.c | 6 +- + drivers/media/i2c/adv7604.c | 12 +- + drivers/media/i2c/adv7842.c | 10 +- + drivers/media/i2c/ak881x.c | 2 +- + drivers/media/i2c/as3645a.c | 6 +- + drivers/media/i2c/bt819.c | 2 +- + drivers/media/i2c/cs3308.c | 138 +++ + drivers/media/i2c/cx25840/cx25840-audio.c | 2 +- + drivers/media/i2c/cx25840/cx25840-core.c | 123 +-- + drivers/media/i2c/cx25840/cx25840-core.h | 1 + + drivers/media/i2c/cx25840/cx25840-firmware.c | 2 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 2 +- + drivers/media/i2c/cx25840/cx25840-vbi.c | 34 +- + drivers/media/i2c/ir-kbd-i2c.c | 2 +- + drivers/media/i2c/lm3560.c | 6 +- + drivers/media/i2c/lm3646.c | 6 +- + drivers/media/i2c/m52790.c | 2 +- + drivers/media/i2c/m5mols/m5mols_capture.c | 4 +- + drivers/media/i2c/m5mols/m5mols_core.c | 6 +- + drivers/media/i2c/msp3400-driver.c | 4 +- + drivers/media/i2c/msp3400-driver.h | 2 +- + drivers/media/i2c/msp3400-kthreads.c | 2 +- + drivers/media/i2c/mt9m032.c | 6 +- + drivers/media/i2c/mt9p031.c | 6 +- + drivers/media/i2c/mt9t001.c | 6 +- + drivers/media/i2c/mt9v011.c | 4 +- + drivers/media/i2c/mt9v032.c | 6 +- + drivers/media/i2c/noon010pc30.c | 6 +- + drivers/media/i2c/ov2659.c | 8 +- + drivers/media/i2c/ov7670.c | 2 +- + drivers/media/i2c/ov9650.c | 6 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 18 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-spi.c | 1 + + drivers/media/i2c/s5c73m3/s5c73m3.h | 2 +- + drivers/media/i2c/s5k4ecgx.c | 6 +- + drivers/media/i2c/s5k5baf.c | 12 +- + drivers/media/i2c/s5k6a3.c | 2 +- + drivers/media/i2c/s5k6aa.c | 6 +- + drivers/media/i2c/saa6588.c | 2 +- + drivers/media/i2c/saa7115.c | 2 +- + drivers/media/i2c/saa7127.c | 2 +- + drivers/media/i2c/smiapp/smiapp-core.c | 32 +- + drivers/media/i2c/smiapp/smiapp.h | 2 +- + drivers/media/i2c/soc_camera/mt9m001.c | 2 +- + drivers/media/i2c/soc_camera/mt9t112.c | 2 +- + drivers/media/i2c/soc_camera/mt9v022.c | 4 +- + drivers/media/i2c/soc_camera/ov772x.c | 2 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 2 +- + drivers/media/i2c/soc_camera/tw9910.c | 2 +- + drivers/media/i2c/sr030pc30.c | 2 +- + drivers/media/i2c/tc358743.c | 8 +- + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/tvp5150.c | 2 +- + drivers/media/i2c/tvp7002.c | 6 +- + drivers/media/i2c/uda1342.c | 2 +- + drivers/media/i2c/upd64031a.c | 2 +- + drivers/media/i2c/upd64083.c | 2 +- + drivers/media/i2c/wm8775.c | 2 +- + drivers/media/media-device.c | 436 ++++++++-- + drivers/media/media-devnode.c | 24 - + drivers/media/media-entity.c | 724 +++++++++++----- + drivers/media/pci/bt8xx/bttv-cards.c | 4 +- + drivers/media/pci/bt8xx/bttv-driver.c | 6 +- + drivers/media/pci/bt8xx/bttvp.h | 4 +- + drivers/media/pci/bt8xx/dst_ca.c | 3 +- + drivers/media/pci/cobalt/cobalt-driver.c | 6 +- + drivers/media/pci/cobalt/cobalt-irq.c | 4 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 18 +- + drivers/media/pci/cx18/cx18-cards.c | 2 +- + drivers/media/pci/cx18/cx18-controls.c | 2 +- + drivers/media/pci/cx18/cx18-controls.h | 2 +- + drivers/media/pci/cx18/cx18-driver.h | 2 +- + drivers/media/pci/cx18/cx18-ioctl.c | 4 +- + drivers/media/pci/cx18/cx23418.h | 2 +- + drivers/media/pci/cx23885/Kconfig | 1 + + drivers/media/pci/cx23885/cx23885-417.c | 4 +- + drivers/media/pci/cx23885/cx23885-cards.c | 116 ++- + drivers/media/pci/cx23885/cx23885-core.c | 12 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 8 +- + drivers/media/pci/cx23885/cx23885-i2c.c | 2 + + drivers/media/pci/cx23885/cx23885-input.c | 2 +- + drivers/media/pci/cx23885/cx23885-vbi.c | 5 +- + drivers/media/pci/cx23885/cx23885-video.c | 49 +- + drivers/media/pci/cx23885/cx23885.h | 9 +- + drivers/media/pci/cx25821/cx25821-video.c | 14 +- + drivers/media/pci/cx88/cx88-alsa.c | 2 +- + drivers/media/pci/cx88/cx88-blackbird.c | 4 +- + drivers/media/pci/cx88/cx88-core.c | 2 +- + drivers/media/pci/cx88/cx88-dvb.c | 2 +- + drivers/media/pci/cx88/cx88-vbi.c | 2 +- + drivers/media/pci/cx88/cx88-video.c | 4 +- + drivers/media/pci/cx88/cx88.h | 6 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 6 +- + drivers/media/pci/dm1105/dm1105.c | 1 - + drivers/media/pci/dt3155/dt3155.c | 13 +- + drivers/media/pci/ivtv/ivtv-cards.c | 12 +- + drivers/media/pci/ivtv/ivtv-controls.c | 2 +- + drivers/media/pci/ivtv/ivtv-controls.h | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 4 +- + drivers/media/pci/ivtv/ivtv-driver.h | 4 +- + drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- + drivers/media/pci/ivtv/ivtv-firmware.c | 2 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 10 +- + drivers/media/pci/ivtv/ivtv-routing.c | 8 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 3 +- + drivers/media/pci/ngene/ngene-core.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + drivers/media/pci/saa7134/saa7134-ts.c | 2 +- + drivers/media/pci/saa7134/saa7134-vbi.c | 2 +- + drivers/media/pci/saa7134/saa7134-video.c | 4 +- + drivers/media/pci/saa7134/saa7134.h | 4 +- + drivers/media/pci/saa7146/hexium_gemini.c | 2 +- + drivers/media/pci/saa7146/hexium_orion.c | 2 +- + drivers/media/pci/saa7146/mxb.c | 4 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 4 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 4 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 4 +- + drivers/media/pci/ttpci/av7110.c | 8 +- + drivers/media/pci/ttpci/av7110.h | 2 +- + drivers/media/pci/ttpci/av7110_av.c | 15 +- + drivers/media/pci/ttpci/av7110_av.h | 3 +- + drivers/media/pci/ttpci/av7110_ca.c | 4 +- + drivers/media/pci/ttpci/av7110_hw.c | 2 +- + drivers/media/pci/ttpci/av7110_v4l.c | 2 +- + drivers/media/pci/ttpci/budget-av.c | 4 +- + drivers/media/pci/ttpci/budget-ci.c | 2 +- + drivers/media/pci/ttpci/budget-core.c | 2 +- + drivers/media/pci/ttpci/budget-patch.c | 2 +- + drivers/media/pci/ttpci/budget.c | 2 +- + drivers/media/pci/ttpci/budget.h | 2 +- + drivers/media/pci/tw68/tw68-video.c | 22 +- + drivers/media/pci/zoran/zoran_card.c | 2 +- + drivers/media/platform/Kconfig | 2 +- + drivers/media/platform/am437x/am437x-vpfe.c | 19 +- + drivers/media/platform/blackfin/bfin_capture.c | 14 +- + drivers/media/platform/coda/coda-bit.c | 8 +- + drivers/media/platform/coda/coda-common.c | 25 +- + drivers/media/platform/coda/coda-jpeg.c | 26 +- + drivers/media/platform/coda/coda.h | 4 +- + drivers/media/platform/davinci/Kconfig | 6 + + drivers/media/platform/davinci/vpbe_display.c | 15 +- + drivers/media/platform/davinci/vpif_capture.c | 19 +- + drivers/media/platform/davinci/vpif_display.c | 19 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 5 +- + drivers/media/platform/exynos4-is/common.c | 5 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 44 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/platform/exynos4-is/fimc-isp-video.c | 46 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 4 +- + drivers/media/platform/exynos4-is/fimc-isp.h | 2 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 59 +- + drivers/media/platform/exynos4-is/fimc-lite.h | 2 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 6 +- + drivers/media/platform/exynos4-is/fimc-reg.c | 2 +- + drivers/media/platform/exynos4-is/media-dev.c | 75 +- + drivers/media/platform/exynos4-is/media-dev.h | 11 +- + drivers/media/platform/exynos4-is/mipi-csis.c | 6 +- + drivers/media/platform/m2m-deinterlace.c | 3 +- + drivers/media/platform/marvell-ccic/mcam-core.c | 17 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- + drivers/media/platform/mx2_emmaprp.c | 3 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 10 +- + drivers/media/platform/omap3isp/isp.c | 306 ++++--- + drivers/media/platform/omap3isp/isp.h | 9 +- + drivers/media/platform/omap3isp/ispccdc.c | 31 +- + drivers/media/platform/omap3isp/ispccp2.c | 27 +- + drivers/media/platform/omap3isp/ispcsi2.c | 21 +- + drivers/media/platform/omap3isp/isppreview.c | 30 +- + drivers/media/platform/omap3isp/ispresizer.c | 28 +- + drivers/media/platform/omap3isp/ispstat.c | 2 +- + drivers/media/platform/omap3isp/ispvideo.c | 52 +- + drivers/media/platform/omap3isp/ispvideo.h | 5 +- + drivers/media/platform/rcar_jpu.c | 40 +- + drivers/media/platform/s3c-camif/camif-capture.c | 43 +- + drivers/media/platform/s3c-camif/camif-core.c | 21 +- + drivers/media/platform/s3c-camif/camif-core.h | 2 +- + drivers/media/platform/s3c-camif/camif-regs.h | 2 +- + drivers/media/platform/s5p-g2d/g2d.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 5 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 103 ++- + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 14 +- + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 16 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 39 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 47 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.h | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc_opr.h | 507 ++++++----- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v5.c | 94 --- + drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c | 121 +-- + drivers/media/platform/s5p-tv/hdmi_drv.c | 4 +- + drivers/media/platform/s5p-tv/mixer_video.c | 2 +- + drivers/media/platform/s5p-tv/sii9234_drv.c | 2 +- + drivers/media/platform/sh_veu.c | 33 +- + drivers/media/platform/sh_vou.c | 15 +- + drivers/media/platform/soc_camera/atmel-isi.c | 168 +++- + drivers/media/platform/soc_camera/atmel-isi.h | 10 + + drivers/media/platform/soc_camera/mx2_camera.c | 12 +- + drivers/media/platform/soc_camera/mx3_camera.c | 44 +- + drivers/media/platform/soc_camera/omap1_camera.c | 4 +- + drivers/media/platform/soc_camera/pxa_camera.c | 4 +- + drivers/media/platform/soc_camera/rcar_vin.c | 119 +-- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 45 +- + drivers/media/platform/soc_camera/sh_mobile_csi2.c | 6 +- + drivers/media/platform/soc_camera/soc_camera.c | 25 +- + .../platform/soc_camera/soc_camera_platform.c | 2 +- + drivers/media/platform/soc_camera/soc_mediabus.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 14 +- + .../platform/sti/c8sectpfe/c8sectpfe-common.c | 16 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 2 +- + drivers/media/platform/ti-vpe/vpe.c | 3 +- + drivers/media/platform/timblogiw.c | 2 +- + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/vim2m.c | 15 +- + drivers/media/platform/vivid/vivid-core.h | 3 +- + drivers/media/platform/vivid/vivid-ctrls.c | 35 +- + drivers/media/platform/vivid/vivid-kthread-cap.c | 6 +- + drivers/media/platform/vivid/vivid-kthread-out.c | 8 +- + drivers/media/platform/vivid/vivid-sdr-cap.c | 6 +- + drivers/media/platform/vivid/vivid-vbi-cap.c | 8 +- + drivers/media/platform/vivid/vivid-vbi-out.c | 2 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 34 +- + drivers/media/platform/vivid/vivid-vid-out.c | 30 +- + drivers/media/platform/vsp1/vsp1_drv.c | 50 +- + drivers/media/platform/vsp1/vsp1_entity.c | 4 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 29 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 5 + + drivers/media/platform/vsp1/vsp1_video.c | 117 ++- + drivers/media/platform/vsp1/vsp1_wpf.c | 40 +- + drivers/media/platform/xilinx/xilinx-dma.c | 35 +- + drivers/media/platform/xilinx/xilinx-tpg.c | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 20 +- + drivers/media/radio/radio-maxiradio.c | 4 +- + drivers/media/radio/radio-sf16fmr2.c | 4 +- + drivers/media/radio/radio-shark.c | 4 +- + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/radio/radio-si476x.c | 2 +- + drivers/media/radio/radio-tea5777.h | 2 +- + drivers/media/radio/radio-timb.c | 2 +- + drivers/media/radio/si4713/radio-usb-si4713.c | 2 +- + drivers/media/radio/si4713/si4713.h | 2 +- + drivers/media/radio/tea575x.c | 2 +- + drivers/media/rc/Kconfig | 3 +- + drivers/media/rc/gpio-ir-recv.c | 24 +- + drivers/media/rc/ir-jvc-decoder.c | 3 - + drivers/media/rc/ir-lirc-codec.c | 1 + + drivers/media/rc/ir-mce_kbd-decoder.c | 3 - + drivers/media/rc/ir-nec-decoder.c | 3 - + drivers/media/rc/ir-rc5-decoder.c | 3 - + drivers/media/rc/ir-rc6-decoder.c | 5 - + drivers/media/rc/ir-rx51.c | 2 +- + drivers/media/rc/ir-sanyo-decoder.c | 3 - + drivers/media/rc/ir-sharp-decoder.c | 7 +- + drivers/media/rc/ir-sony-decoder.c | 4 - + drivers/media/rc/ir-xmp-decoder.c | 3 - + drivers/media/rc/nuvoton-cir.c | 156 ++-- + drivers/media/rc/nuvoton-cir.h | 28 +- + drivers/media/rc/rc-core-priv.h | 71 -- + drivers/media/rc/rc-ir-raw.c | 41 +- + drivers/media/rc/rc-main.c | 88 +- + drivers/media/rc/st_rc.c | 14 +- + drivers/media/rc/streamzap.c | 19 +- + drivers/media/rc/sunxi-cir.c | 2 + + drivers/media/tuners/max2165.c | 2 +- + drivers/media/tuners/mt2063.c | 1 - + drivers/media/tuners/si2157.c | 1 + + drivers/media/usb/airspy/airspy.c | 4 +- + drivers/media/usb/as102/as102_fw.c | 1 + + drivers/media/usb/au0828/au0828-cards.c | 4 + + drivers/media/usb/au0828/au0828-core.c | 171 ++++ + drivers/media/usb/au0828/au0828-dvb.c | 12 + + drivers/media/usb/au0828/au0828-vbi.c | 14 +- + drivers/media/usb/au0828/au0828-video.c | 140 +++- + drivers/media/usb/au0828/au0828.h | 10 +- + drivers/media/usb/cpia2/cpia2_usb.c | 3 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 26 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 91 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 15 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 14 +- + drivers/media/usb/cx231xx/cx231xx-vbi.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 21 +- + drivers/media/usb/cx231xx/cx231xx.h | 4 +- + drivers/media/usb/dvb-usb-v2/Kconfig | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb_core.c | 42 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 4 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 26 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.h | 5 + + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 16 +- + drivers/media/usb/dvb-usb/Kconfig | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 43 +- + drivers/media/usb/em28xx/em28xx-camera.c | 4 +- + drivers/media/usb/em28xx/em28xx-cards.c | 18 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 15 + + drivers/media/usb/em28xx/em28xx-vbi.c | 20 +- + drivers/media/usb/em28xx/em28xx-video.c | 23 +- + drivers/media/usb/em28xx/em28xx.h | 2 +- + drivers/media/usb/go7007/go7007-driver.c | 2 +- + drivers/media/usb/go7007/go7007-usb.c | 6 +- + drivers/media/usb/go7007/go7007-v4l2.c | 3 +- + drivers/media/usb/gspca/ov534.c | 9 +- + drivers/media/usb/gspca/topro.c | 6 +- + drivers/media/usb/hackrf/hackrf.c | 6 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 2 +- + drivers/media/usb/hdpvr/hdpvr.h | 2 +- + drivers/media/usb/msi2500/msi2500.c | 1 - + drivers/media/usb/pvrusb2/pvrusb2-audio.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw-internal.h | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 16 +- + drivers/media/usb/pvrusb2/pvrusb2-video-v4l.c | 2 +- + drivers/media/usb/pwc/pwc-if.c | 5 +- + drivers/media/usb/s2255/s2255drv.c | 4 +- + drivers/media/usb/siano/smsusb.c | 5 +- + drivers/media/usb/stk1160/stk1160-core.c | 2 +- + drivers/media/usb/stk1160/stk1160-v4l.c | 4 +- + drivers/media/usb/stk1160/stk1160-video.c | 2 +- + drivers/media/usb/tm6000/tm6000-cards.c | 2 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 2 +- + drivers/media/usb/usbtv/usbtv-video.c | 11 +- + drivers/media/usb/usbvision/usbvision-core.c | 2 +- + drivers/media/usb/usbvision/usbvision-video.c | 25 +- + drivers/media/usb/uvc/uvc_ctrl.c | 3 +- + drivers/media/usb/uvc/uvc_driver.c | 14 +- + drivers/media/usb/uvc/uvc_entity.c | 38 +- + drivers/media/usb/uvc/uvc_queue.c | 14 +- + drivers/media/usb/uvc/uvc_v4l2.c | 20 + + drivers/media/usb/uvc/uvc_video.c | 17 +- + drivers/media/v4l2-core/tuner-core.c | 10 +- + drivers/media/v4l2-core/v4l2-clk.c | 9 + + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 6 +- + drivers/media/v4l2-core/v4l2-ctrls.c | 77 +- + drivers/media/v4l2-core/v4l2-dev.c | 111 ++- + drivers/media/v4l2-core/v4l2-device.c | 60 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 16 +- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 4 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 14 +- + drivers/media/v4l2-core/v4l2-subdev.c | 8 +- + drivers/media/v4l2-core/videobuf2-core.c | 926 +++++++++++++++++++-- + drivers/media/v4l2-core/videobuf2-internal.h | 161 ---- + drivers/media/v4l2-core/videobuf2-v4l2.c | 703 ++-------------- + drivers/mfd/timberdale.c | 4 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- + drivers/staging/media/davinci_vpfe/Kconfig | 2 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 16 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 2 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 17 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 17 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 46 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 12 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 62 +- + drivers/staging/media/davinci_vpfe/vpfe_video.h | 1 + + drivers/staging/media/lirc/lirc_imon.c | 2 + + drivers/staging/media/lirc/lirc_parallel.c | 35 +- + drivers/staging/media/lirc/lirc_sasem.c | 20 +- + drivers/staging/media/lirc/lirc_serial.c | 50 +- + drivers/staging/media/omap4iss/Kconfig | 2 +- + drivers/staging/media/omap4iss/iss.c | 203 +++-- + drivers/staging/media/omap4iss/iss.h | 10 +- + drivers/staging/media/omap4iss/iss_csi2.c | 54 +- + drivers/staging/media/omap4iss/iss_csi2.h | 1 + + drivers/staging/media/omap4iss/iss_csiphy.h | 2 +- + drivers/staging/media/omap4iss/iss_ipipe.c | 11 +- + drivers/staging/media/omap4iss/iss_ipipeif.c | 44 +- + drivers/staging/media/omap4iss/iss_ipipeif.h | 1 + + drivers/staging/media/omap4iss/iss_resizer.c | 46 +- + drivers/staging/media/omap4iss/iss_resizer.h | 1 + + drivers/staging/media/omap4iss/iss_video.c | 64 +- + drivers/staging/media/omap4iss/iss_video.h | 5 +- + drivers/usb/gadget/function/uvc_queue.c | 4 +- + firmware/WHENCE | 2 +- + include/linux/platform_data/camera-rcar.h | 25 - + .../linux/platform_data/{ => media}/camera-mx2.h | 0 + .../linux/platform_data/{ => media}/camera-mx3.h | 0 + .../linux/platform_data/{ => media}/camera-pxa.h | 0 + include/linux/platform_data/{ => media}/coda.h | 0 + .../{ => linux/platform_data}/media/gpio-ir-recv.h | 1 - + include/{ => linux/platform_data}/media/ir-rx51.h | 0 + .../{ => linux/platform_data}/media/mmp-camera.h | 0 + .../{ => linux/platform_data}/media/omap1_camera.h | 0 + include/{ => linux/platform_data}/media/omap4iss.h | 0 + include/{ => linux/platform_data}/media/s5p_hdmi.h | 1 - + include/{ => linux/platform_data}/media/si4713.h | 2 +- + include/{ => linux/platform_data}/media/sii9234.h | 0 + .../platform_data}/media/soc_camera_platform.h | 0 + .../{ => linux/platform_data}/media/timb_radio.h | 0 + .../{ => linux/platform_data}/media/timb_video.h | 0 + include/linux/videodev2.h | 2 +- + include/media/{ => drv-intf}/cx2341x.h | 0 + include/media/{ => drv-intf}/cx25840.h | 0 + include/media/{ => drv-intf}/exynos-fimc.h | 0 + include/media/{ => drv-intf}/msp3400.h | 1 - + include/media/{ => drv-intf}/s3c_camif.h | 0 + include/media/{ => drv-intf}/saa7146.h | 0 + include/media/{ => drv-intf}/saa7146_vv.h | 2 +- + include/media/{ => drv-intf}/sh_mobile_ceu.h | 0 + include/media/{ => drv-intf}/sh_mobile_csi2.h | 0 + include/media/{ => drv-intf}/sh_vou.h | 0 + include/media/{ => drv-intf}/si476x.h | 2 +- + include/media/{ => drv-intf}/soc_mediabus.h | 0 + include/media/{ => drv-intf}/tea575x.h | 2 +- + include/media/{ => i2c}/ad9389b.h | 0 + include/media/{ => i2c}/adp1653.h | 2 +- + include/media/{ => i2c}/adv7183.h | 0 + include/media/{ => i2c}/adv7343.h | 0 + include/media/{ => i2c}/adv7393.h | 0 + include/media/{ => i2c}/adv7511.h | 0 + include/media/{ => i2c}/adv7604.h | 0 + include/media/{ => i2c}/adv7842.h | 0 + include/media/{ => i2c}/ak881x.h | 0 + include/media/{ => i2c}/as3645a.h | 2 +- + include/media/{ => i2c}/bt819.h | 0 + include/media/{ => i2c}/cs5345.h | 0 + include/media/{ => i2c}/cs53l32a.h | 0 + include/media/{ => i2c}/ir-kbd-i2c.h | 0 + include/media/{ => i2c}/lm3560.h | 2 +- + include/media/{ => i2c}/lm3646.h | 2 +- + include/media/{ => i2c}/m52790.h | 0 + include/media/{ => i2c}/m5mols.h | 0 + include/media/{ => i2c}/mt9m032.h | 0 + include/media/{ => i2c}/mt9p031.h | 0 + include/media/{ => i2c}/mt9t001.h | 0 + include/media/{ => i2c}/mt9t112.h | 0 + include/media/{ => i2c}/mt9v011.h | 0 + include/media/{ => i2c}/mt9v022.h | 0 + include/media/{ => i2c}/mt9v032.h | 0 + include/media/{ => i2c}/noon010pc30.h | 0 + include/media/{ => i2c}/ov2659.h | 0 + include/media/{ => i2c}/ov7670.h | 0 + include/media/{ => i2c}/ov772x.h | 0 + include/media/{ => i2c}/ov9650.h | 0 + include/media/{ => i2c}/rj54n1cb0c.h | 0 + include/media/{ => i2c}/s5c73m3.h | 0 + include/media/{ => i2c}/s5k4ecgx.h | 0 + include/media/{ => i2c}/s5k6aa.h | 0 + include/media/{ => i2c}/saa6588.h | 0 + include/media/{ => i2c}/saa7115.h | 1 - + include/media/{ => i2c}/saa7127.h | 1 - + include/media/{ => i2c}/smiapp.h | 2 +- + include/media/{ => i2c}/sr030pc30.h | 0 + include/media/{ => i2c}/tc358743.h | 0 + include/media/{ => i2c}/ths7303.h | 0 + include/media/{ => i2c}/tvaudio.h | 0 + include/media/{ => i2c}/tvp514x.h | 0 + include/media/{ => i2c}/tvp5150.h | 1 - + include/media/{ => i2c}/tvp7002.h | 0 + include/media/{ => i2c}/tw9910.h | 0 + include/media/{ => i2c}/uda1342.h | 0 + include/media/{ => i2c}/upd64031a.h | 0 + include/media/{ => i2c}/upd64083.h | 0 + include/media/{ => i2c}/wm8775.h | 0 + include/media/lirc.h | 169 +--- + include/media/media-device.h | 469 ++++++++++- + include/media/media-devnode.h | 54 +- + include/media/media-entity.h | 904 ++++++++++++++++++-- + include/media/rc-core.h | 1 + + include/media/rc-map.h | 40 +- + include/media/tuner.h | 8 + + include/media/v4l2-clk.h | 5 + + include/media/v4l2-dev.h | 1 + + include/media/v4l2-dv-timings.h | 25 +- + include/media/videobuf2-core.h | 108 ++- + include/media/videobuf2-v4l2.h | 40 +- + include/trace/events/v4l2.h | 4 +- + include/trace/events/vb2.h | 7 +- + include/uapi/drm/drm_fourcc.h | 2 +- + include/uapi/linux/dvb/video.h | 1 - + include/uapi/linux/lirc.h | 168 ++++ + include/uapi/linux/media.h | 224 ++++- + include/uapi/linux/usb/video.h | 1 + + include/uapi/linux/v4l2-controls.h | 6 +- + include/uapi/linux/videodev2.h | 14 +- + sound/pci/es1968.c | 4 +- + sound/pci/fm801.c | 4 +- + 595 files changed, 9765 insertions(+), 5945 deletions(-) + create mode 100644 Documentation/DocBook/media/v4l/media-ioc-g-topology.xml + create mode 100644 Documentation/DocBook/media/v4l/media-types.xml + delete mode 100644 Documentation/media-framework.txt + create mode 100644 drivers/media/i2c/cs3308.c + delete mode 100644 drivers/media/v4l2-core/videobuf2-internal.h + delete mode 100644 include/linux/platform_data/camera-rcar.h + rename include/linux/platform_data/{ => media}/camera-mx2.h (100%) + rename include/linux/platform_data/{ => media}/camera-mx3.h (100%) + rename include/linux/platform_data/{ => media}/camera-pxa.h (100%) + rename include/linux/platform_data/{ => media}/coda.h (100%) + rename include/{ => linux/platform_data}/media/gpio-ir-recv.h (99%) + rename include/{ => linux/platform_data}/media/ir-rx51.h (100%) + rename include/{ => linux/platform_data}/media/mmp-camera.h (100%) + rename include/{ => linux/platform_data}/media/omap1_camera.h (100%) + rename include/{ => linux/platform_data}/media/omap4iss.h (100%) + rename include/{ => linux/platform_data}/media/s5p_hdmi.h (99%) + rename include/{ => linux/platform_data}/media/si4713.h (96%) + rename include/{ => linux/platform_data}/media/sii9234.h (100%) + rename include/{ => linux/platform_data}/media/soc_camera_platform.h (100%) + rename include/{ => linux/platform_data}/media/timb_radio.h (100%) + rename include/{ => linux/platform_data}/media/timb_video.h (100%) + rename include/media/{ => drv-intf}/cx2341x.h (100%) + rename include/media/{ => drv-intf}/cx25840.h (100%) + rename include/media/{ => drv-intf}/exynos-fimc.h (100%) + rename include/media/{ => drv-intf}/msp3400.h (99%) + rename include/media/{ => drv-intf}/s3c_camif.h (100%) + rename include/media/{ => drv-intf}/saa7146.h (100%) + rename include/media/{ => drv-intf}/saa7146_vv.h (99%) + rename include/media/{ => drv-intf}/sh_mobile_ceu.h (100%) + rename include/media/{ => drv-intf}/sh_mobile_csi2.h (100%) + rename include/media/{ => drv-intf}/sh_vou.h (100%) + rename include/media/{ => drv-intf}/si476x.h (94%) + rename include/media/{ => drv-intf}/soc_mediabus.h (100%) + rename include/media/{ => drv-intf}/tea575x.h (98%) + rename include/media/{ => i2c}/ad9389b.h (100%) + rename include/media/{ => i2c}/adp1653.h (99%) + rename include/media/{ => i2c}/adv7183.h (100%) + rename include/media/{ => i2c}/adv7343.h (100%) + rename include/media/{ => i2c}/adv7393.h (100%) + rename include/media/{ => i2c}/adv7511.h (100%) + rename include/media/{ => i2c}/adv7604.h (100%) + rename include/media/{ => i2c}/adv7842.h (100%) + rename include/media/{ => i2c}/ak881x.h (100%) + rename include/media/{ => i2c}/as3645a.h (98%) + rename include/media/{ => i2c}/bt819.h (100%) + rename include/media/{ => i2c}/cs5345.h (100%) + rename include/media/{ => i2c}/cs53l32a.h (100%) + rename include/media/{ => i2c}/ir-kbd-i2c.h (100%) + rename include/media/{ => i2c}/lm3560.h (98%) + rename include/media/{ => i2c}/lm3646.h (98%) + rename include/media/{ => i2c}/m52790.h (100%) + rename include/media/{ => i2c}/m5mols.h (100%) + rename include/media/{ => i2c}/mt9m032.h (100%) + rename include/media/{ => i2c}/mt9p031.h (100%) + rename include/media/{ => i2c}/mt9t001.h (100%) + rename include/media/{ => i2c}/mt9t112.h (100%) + rename include/media/{ => i2c}/mt9v011.h (100%) + rename include/media/{ => i2c}/mt9v022.h (100%) + rename include/media/{ => i2c}/mt9v032.h (100%) + rename include/media/{ => i2c}/noon010pc30.h (100%) + rename include/media/{ => i2c}/ov2659.h (100%) + rename include/media/{ => i2c}/ov7670.h (100%) + rename include/media/{ => i2c}/ov772x.h (100%) + rename include/media/{ => i2c}/ov9650.h (100%) + rename include/media/{ => i2c}/rj54n1cb0c.h (100%) + rename include/media/{ => i2c}/s5c73m3.h (100%) + rename include/media/{ => i2c}/s5k4ecgx.h (100%) + rename include/media/{ => i2c}/s5k6aa.h (100%) + rename include/media/{ => i2c}/saa6588.h (100%) + rename include/media/{ => i2c}/saa7115.h (99%) + rename include/media/{ => i2c}/saa7127.h (99%) + rename include/media/{ => i2c}/smiapp.h (98%) + rename include/media/{ => i2c}/sr030pc30.h (100%) + rename include/media/{ => i2c}/tc358743.h (100%) + rename include/media/{ => i2c}/ths7303.h (100%) + rename include/media/{ => i2c}/tvaudio.h (100%) + rename include/media/{ => i2c}/tvp514x.h (100%) + rename include/media/{ => i2c}/tvp5150.h (99%) + rename include/media/{ => i2c}/tvp7002.h (100%) + rename include/media/{ => i2c}/tw9910.h (100%) + rename include/media/{ => i2c}/uda1342.h (100%) + rename include/media/{ => i2c}/upd64031a.h (100%) + rename include/media/{ => i2c}/upd64083.h (100%) + rename include/media/{ => i2c}/wm8775.h (100%) + create mode 100644 include/uapi/linux/lirc.h +Merging kbuild/for-next (e03445d23fdc Merge branch 'kbuild/misc' into kbuild/for-next) +$ git merge kbuild/for-next +Auto-merging scripts/link-vmlinux.sh +Auto-merging scripts/Makefile.lib +Auto-merging init/Kconfig +Auto-merging fs/logfs/logfs.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Documentation/lto-build | 173 ++++++++++++++++++++++++ + Makefile | 27 +++- + arch/x86/Kconfig | 2 +- + drivers/gpu/drm/Makefile | 2 - + drivers/misc/ibmasm/ibmasm.h | 2 +- + drivers/net/wireless/ath/ath10k/thermal.h | 2 +- + drivers/scsi/aic7xxx/aic79xx.h | 4 +- + drivers/scsi/aic7xxx/aic79xx_osm.h | 5 - + drivers/scsi/aic7xxx/aic7xxx.h | 2 +- + drivers/scsi/aic7xxx/aic7xxx_osm.h | 5 - + drivers/scsi/aic7xxx/queue.h | 2 +- + drivers/staging/iio/adc/Kconfig | 4 +- + drivers/staging/iio/adc/Makefile | 7 +- + drivers/staging/iio/adc/ad7606_core.c | 4 + + drivers/usb/chipidea/otg_fsm.h | 2 +- + fs/logfs/logfs.h | 2 +- + init/Kconfig | 73 ++++++++++ + kernel/gcov/Kconfig | 2 +- + lib/Kconfig.debug | 2 +- + scripts/Makefile.build | 8 +- + scripts/Makefile.lib | 4 +- + scripts/Makefile.lto | 84 ++++++++++++ + scripts/Makefile.modpost | 7 +- + scripts/basic/fixdep.c | 2 +- + scripts/genksyms/genksyms.c | 6 +- + scripts/kconfig/conf.c | 7 +- + scripts/kconfig/menu.c | 2 +- + scripts/link-vmlinux.sh | 2 +- + scripts/package/Makefile | 4 +- + scripts/tags.sh | 218 +++++++++++++++--------------- + 30 files changed, 508 insertions(+), 158 deletions(-) + create mode 100644 Documentation/lto-build + create mode 100644 scripts/Makefile.lto +Merging kconfig/for-next (c0ddc8c745b7 localmodconfig: Use Kbuild files too) +$ git merge kconfig/for-next +Already up-to-date. +Merging libata/for-next (44858e07ff87 Merge branch 'for-4.5' into for-next) +$ git merge libata/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/brcm,sata-brcmstb.txt | 4 +- + .../devicetree/bindings/ata/sata_rcar.txt | 1 + + drivers/ata/Kconfig | 2 +- + drivers/ata/ahci.c | 67 +++++++++++++++------- + drivers/ata/ahci.h | 27 ++++++++- + drivers/ata/ahci_brcmstb.c | 61 +++++++++++++++++++- + drivers/ata/ahci_qoriq.c | 31 +++++++--- + drivers/ata/libahci.c | 46 ++++++--------- + drivers/ata/libata-core.c | 20 ++++++- + drivers/ata/sata_rcar.c | 19 +++--- + drivers/ata/sata_sx4.c | 2 + + include/linux/libata.h | 1 + + 12 files changed, 198 insertions(+), 83 deletions(-) +Merging pm/linux-next (859be9b8688c Merge branch 'pm-core' into linux-next) +$ git merge pm/linux-next +Resolved 'drivers/i2c/busses/i2c-designware-platdrv.c' using previous resolution. +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-designware-platdrv.c +Removing drivers/acpi/acpica/utfileio.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm/mach-omap2/omap_device.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 995bfc729f91] Merge remote-tracking branch 'pm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/cpu-freq/intel-pstate.txt | 241 ++++-- + Documentation/cpu-freq/pcc-cpufreq.txt | 4 +- + Documentation/devicetree/bindings/arm/cpus.txt | 17 + + .../devicetree/bindings/cpufreq/cpufreq-st.txt | 91 +++ + Documentation/devicetree/bindings/opp/opp.txt | 132 +++- + Documentation/power/pci.txt | 2 +- + Documentation/power/runtime_pm.txt | 6 + + MAINTAINERS | 11 + + arch/arm/boot/dts/exynos4412.dtsi | 28 +- + arch/arm/mach-omap2/omap_device.c | 7 +- + arch/x86/Kconfig | 3 +- + arch/x86/include/asm/iosf_mbi.h | 51 +- + arch/x86/platform/atom/punit_atom_debug.c | 7 +- + arch/x86/platform/intel-quark/imr.c | 28 +- + drivers/acpi/Kconfig | 17 +- + drivers/acpi/Makefile | 9 +- + drivers/acpi/acpi_apd.c | 16 +- + drivers/acpi/acpi_dbg.c | 804 +++++++++++++++++++++ + drivers/acpi/acpi_lpss.c | 216 +++++- + drivers/acpi/acpi_pnp.c | 2 +- + drivers/acpi/acpi_video.c | 76 +- + drivers/acpi/acpica/Makefile | 4 +- + drivers/acpi/acpica/acapps.h | 58 +- + drivers/acpi/acpica/acdebug.h | 41 +- + drivers/acpi/acpica/acevents.h | 11 +- + drivers/acpi/acpica/acglobal.h | 8 +- + drivers/acpi/acpica/aclocal.h | 12 +- + drivers/acpi/acpica/acmacros.h | 11 - + drivers/acpi/acpica/acnamesp.h | 12 +- + drivers/acpi/acpica/acobject.h | 7 +- + drivers/acpi/acpica/acopcode.h | 10 +- + drivers/acpi/acpica/acparser.h | 8 +- + drivers/acpi/acpica/acutils.h | 26 +- + drivers/acpi/acpica/amlcode.h | 5 +- + drivers/acpi/acpica/dbcmds.c | 11 +- + drivers/acpi/acpica/dbdisply.c | 96 ++- + drivers/acpi/acpica/dbfileio.c | 123 +--- + drivers/acpi/acpica/dbinput.c | 122 +--- + drivers/acpi/acpica/dbnames.c | 2 +- + drivers/acpi/acpica/dbstats.c | 1 + + drivers/acpi/acpica/dbtest.c | 2 +- + drivers/acpi/acpica/dbutils.c | 1 + + drivers/acpi/acpica/dbxface.c | 93 +-- + drivers/acpi/acpica/dsargs.c | 7 +- + drivers/acpi/acpica/dscontrol.c | 10 +- + drivers/acpi/acpica/dsdebug.c | 5 +- + drivers/acpi/acpica/dsfield.c | 39 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/dsmethod.c | 39 +- + drivers/acpi/acpica/dsmthdat.c | 20 +- + drivers/acpi/acpica/dsobject.c | 19 +- + drivers/acpi/acpica/dsopcode.c | 21 +- + drivers/acpi/acpica/dsutils.c | 45 +- + drivers/acpi/acpica/dswexec.c | 35 +- + drivers/acpi/acpica/dswload.c | 10 +- + drivers/acpi/acpica/dswload2.c | 10 +- + drivers/acpi/acpica/dswscope.c | 1 + + drivers/acpi/acpica/evgpe.c | 2 +- + drivers/acpi/acpica/evgpeblk.c | 1 + + drivers/acpi/acpica/evgpeutil.c | 1 + + drivers/acpi/acpica/evhandler.c | 165 +++-- + drivers/acpi/acpica/evmisc.c | 5 +- + drivers/acpi/acpica/evregion.c | 114 ++- + drivers/acpi/acpica/evrgnini.c | 115 +-- + drivers/acpi/acpica/evxface.c | 9 +- + drivers/acpi/acpica/evxfregn.c | 38 +- + drivers/acpi/acpica/exconfig.c | 8 +- + drivers/acpi/acpica/exconvrt.c | 9 +- + drivers/acpi/acpica/excreate.c | 20 +- + drivers/acpi/acpica/exdebug.c | 403 ++--------- + drivers/acpi/acpica/exdump.c | 6 +- + drivers/acpi/acpica/exfield.c | 74 +- + drivers/acpi/acpica/exfldio.c | 35 +- + drivers/acpi/acpica/exmisc.c | 49 +- + drivers/acpi/acpica/exmutex.c | 82 ++- + drivers/acpi/acpica/exnames.c | 4 +- + drivers/acpi/acpica/exoparg1.c | 33 +- + drivers/acpi/acpica/exoparg2.c | 12 +- + drivers/acpi/acpica/exoparg3.c | 25 +- + drivers/acpi/acpica/exoparg6.c | 1 + + drivers/acpi/acpica/exprep.c | 25 +- + drivers/acpi/acpica/exregion.c | 13 +- + drivers/acpi/acpica/exresnte.c | 2 +- + drivers/acpi/acpica/exresolv.c | 10 +- + drivers/acpi/acpica/exresop.c | 43 +- + drivers/acpi/acpica/exstore.c | 17 +- + drivers/acpi/acpica/exstorob.c | 7 +- + drivers/acpi/acpica/exsystem.c | 6 +- + drivers/acpi/acpica/extrace.c | 377 ++++++++++ + drivers/acpi/acpica/exutils.c | 7 +- + drivers/acpi/acpica/hwesleep.c | 4 +- + drivers/acpi/acpica/hwgpe.c | 6 +- + drivers/acpi/acpica/hwsleep.c | 4 +- + drivers/acpi/acpica/hwxface.c | 24 +- + drivers/acpi/acpica/hwxfsleep.c | 97 +-- + drivers/acpi/acpica/nsconvert.c | 105 ++- + drivers/acpi/acpica/nsdump.c | 5 +- + drivers/acpi/acpica/nseval.c | 2 +- + drivers/acpi/acpica/nsinit.c | 3 +- + drivers/acpi/acpica/nsload.c | 18 +- + drivers/acpi/acpica/nsnames.c | 6 +- + drivers/acpi/acpica/nsparse.c | 5 +- + drivers/acpi/acpica/nsprepkg.c | 10 +- + drivers/acpi/acpica/nsrepair.c | 19 +- + drivers/acpi/acpica/nsrepair2.c | 24 +- + drivers/acpi/acpica/nssearch.c | 2 +- + drivers/acpi/acpica/nsutils.c | 8 +- + drivers/acpi/acpica/nsxfeval.c | 4 +- + drivers/acpi/acpica/nsxfname.c | 39 +- + drivers/acpi/acpica/nsxfobj.c | 6 +- + drivers/acpi/acpica/psargs.c | 19 +- + drivers/acpi/acpica/psloop.c | 12 +- + drivers/acpi/acpica/psopcode.c | 606 ++++++++-------- + drivers/acpi/acpica/psparse.c | 8 +- + drivers/acpi/acpica/psutils.c | 4 +- + drivers/acpi/acpica/pswalk.c | 1 + + drivers/acpi/acpica/rsaddr.c | 4 +- + drivers/acpi/acpica/rscalc.c | 81 ++- + drivers/acpi/acpica/rscreate.c | 32 +- + drivers/acpi/acpica/rsdump.c | 6 + + drivers/acpi/acpica/rslist.c | 9 +- + drivers/acpi/acpica/rsmisc.c | 22 +- + drivers/acpi/acpica/rsutils.c | 42 +- + drivers/acpi/acpica/rsxface.c | 2 +- + drivers/acpi/acpica/tbdata.c | 1 + + drivers/acpi/acpica/tbinstal.c | 4 +- + drivers/acpi/acpica/tbprint.c | 1 + + drivers/acpi/acpica/tbutils.c | 10 +- + drivers/acpi/acpica/tbxfload.c | 3 +- + drivers/acpi/acpica/utaddress.c | 5 +- + drivers/acpi/acpica/utcopy.c | 23 +- + drivers/acpi/acpica/utdecode.c | 32 +- + drivers/acpi/acpica/utdelete.c | 5 +- + drivers/acpi/acpica/uterror.c | 10 +- + drivers/acpi/acpica/utfileio.c | 334 --------- + drivers/acpi/acpica/uthex.c | 2 +- + drivers/acpi/acpica/utids.c | 67 -- + drivers/acpi/acpica/utinit.c | 1 - + drivers/acpi/acpica/utmath.c | 10 +- + drivers/acpi/acpica/utmisc.c | 11 +- + drivers/acpi/acpica/utmutex.c | 22 +- + drivers/acpi/acpica/utnonansi.c | 4 +- + drivers/acpi/acpica/utobject.c | 24 +- + drivers/acpi/acpica/utosi.c | 11 +- + drivers/acpi/acpica/utownerid.c | 12 +- + drivers/acpi/acpica/utpredef.c | 6 +- + drivers/acpi/acpica/utprint.c | 15 +- + drivers/acpi/acpica/utresrc.c | 8 +- + drivers/acpi/acpica/utstate.c | 3 + + drivers/acpi/acpica/utstring.c | 9 + + drivers/acpi/acpica/uttrack.c | 50 +- + drivers/acpi/acpica/utxface.c | 2 - + drivers/acpi/acpica/utxferror.c | 1 + + drivers/acpi/acpica/utxfinit.c | 47 +- + drivers/acpi/acpica/utxfmutex.c | 6 +- + drivers/acpi/bus.c | 10 +- + drivers/acpi/device_pm.c | 5 +- + drivers/acpi/gsi.c | 21 +- + drivers/acpi/internal.h | 8 + + drivers/acpi/osl.c | 277 ++++++- + drivers/acpi/pci_irq.c | 3 - + drivers/acpi/pci_link.c | 132 +++- + drivers/acpi/property.c | 10 +- + drivers/acpi/resource.c | 26 + + drivers/acpi/sbs.c | 6 +- + drivers/acpi/scan.c | 24 +- + drivers/acpi/sleep.c | 4 +- + drivers/acpi/sleep.h | 6 + + drivers/acpi/utils.c | 31 + + drivers/acpi/video_detect.c | 17 + + drivers/base/base.h | 2 + + drivers/base/core.c | 5 +- + drivers/base/dd.c | 81 ++- + drivers/base/platform.c | 25 + + drivers/base/power/clock_ops.c | 6 +- + drivers/base/power/common.c | 26 +- + drivers/base/power/domain.c | 10 +- + drivers/base/power/main.c | 52 ++ + drivers/base/power/opp/Makefile | 1 + + drivers/base/power/opp/core.c | 336 ++++++++- + drivers/base/power/opp/cpu.c | 3 +- + drivers/base/power/opp/debugfs.c | 219 ++++++ + drivers/base/power/opp/opp.h | 53 +- + drivers/base/power/power.h | 5 + + drivers/base/power/runtime.c | 50 +- + drivers/base/property.c | 495 ++++++++++--- + drivers/cpufreq/Kconfig.arm | 12 + + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/acpi-cpufreq.c | 24 +- + drivers/cpufreq/arm_big_little.c | 41 ++ + drivers/cpufreq/blackfin-cpufreq.c | 2 +- + drivers/cpufreq/cpufreq-dt.c | 14 +- + drivers/cpufreq/cpufreq.c | 28 +- + drivers/cpufreq/cpufreq_conservative.c | 6 +- + drivers/cpufreq/cpufreq_governor.c | 146 ++-- + drivers/cpufreq/cpufreq_governor.h | 18 +- + drivers/cpufreq/cpufreq_ondemand.c | 61 +- + drivers/cpufreq/intel_pstate.c | 73 +- + drivers/cpufreq/mt8173-cpufreq.c | 135 +++- + drivers/cpufreq/pcc-cpufreq.c | 2 + + drivers/cpufreq/qoriq-cpufreq.c | 24 + + drivers/cpufreq/sti-cpufreq.c | 294 ++++++++ + drivers/cpuidle/cpuidle-clps711x.c | 8 +- + drivers/cpuidle/cpuidle-exynos.c | 5 +- + drivers/cpuidle/cpuidle-ux500.c | 5 +- + drivers/cpuidle/governors/menu.c | 6 +- + drivers/dma/dw/core.c | 9 +- + drivers/dma/dw/platform.c | 29 +- + drivers/gpio/gpiolib-acpi.c | 33 +- + drivers/gpio/gpiolib.c | 4 +- + drivers/gpio/gpiolib.h | 3 +- + drivers/gpu/vga/vga_switcheroo.c | 11 +- + drivers/i2c/busses/i2c-designware-baytrail.c | 17 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 51 +- + drivers/mfd/intel-lpss-acpi.c | 19 +- + drivers/mfd/intel-lpss-pci.c | 44 +- + drivers/mfd/intel-lpss.c | 16 +- + drivers/mfd/intel-lpss.h | 2 + + drivers/mfd/mfd-core.c | 7 + + drivers/misc/mei/pci-me.c | 5 +- + drivers/misc/mei/pci-txe.c | 5 +- + drivers/pci/pci-acpi.c | 2 +- + drivers/pci/pci.c | 4 +- + drivers/pci/pci.h | 2 +- + drivers/platform/x86/dell-wmi.c | 6 +- + drivers/platform/x86/thinkpad_acpi.c | 2 +- + drivers/pnp/driver.c | 6 +- + drivers/pnp/quirks.c | 1 + + drivers/powercap/intel_rapl.c | 14 +- + drivers/powercap/powercap_sys.c | 18 +- + drivers/spi/spi.c | 3 + + drivers/thermal/intel_quark_dts_thermal.c | 61 +- + drivers/thermal/intel_soc_dts_iosf.c | 43 +- + drivers/usb/core/port.c | 6 + + drivers/usb/core/usb.c | 8 +- + include/acpi/acexcep.h | 6 +- + include/acpi/acpi_bus.h | 6 +- + include/acpi/acpiosxf.h | 18 +- + include/acpi/acpixf.h | 55 +- + include/acpi/actypes.h | 6 +- + include/acpi/platform/aclinux.h | 2 + + include/acpi/platform/aclinuxex.h | 10 + + include/acpi/video.h | 6 + + include/linux/acpi.h | 72 ++ + include/linux/cpufreq.h | 6 - + include/linux/device.h | 3 + + include/linux/mfd/core.h | 5 + + include/linux/platform_device.h | 5 + + include/linux/pm.h | 1 + + include/linux/pm_domain.h | 3 + + include/linux/pm_opp.h | 22 + + include/linux/pm_runtime.h | 5 + + include/linux/powercap.h | 4 +- + include/linux/property.h | 107 ++- + kernel/power/main.c | 17 +- + kernel/power/power.h | 9 + + tools/power/acpi/Makefile | 16 +- + tools/power/acpi/common/getopt.c | 2 + + .../acpi/os_specific/service_layers/oslibcfs.c | 3 + + tools/power/acpi/tools/acpidbg/Makefile | 27 + + tools/power/acpi/tools/acpidbg/acpidbg.c | 438 +++++++++++ + tools/power/acpi/tools/acpidump/apfiles.c | 13 + + tools/power/cpupower/Makefile | 19 + + tools/power/cpupower/bench/Makefile | 8 +- + tools/power/cpupower/utils/cpufreq-info.c | 246 +++---- + tools/power/cpupower/utils/cpuidle-info.c | 16 +- + tools/power/cpupower/utils/cpupower-info.c | 9 +- + tools/power/cpupower/utils/cpupower-set.c | 10 +- + tools/power/cpupower/utils/helpers/topology.c | 2 +- + 269 files changed, 7443 insertions(+), 3410 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/cpufreq-st.txt + create mode 100644 drivers/acpi/acpi_dbg.c + create mode 100644 drivers/acpi/acpica/extrace.c + delete mode 100644 drivers/acpi/acpica/utfileio.c + create mode 100644 drivers/base/power/opp/debugfs.c + create mode 100644 drivers/cpufreq/sti-cpufreq.c + create mode 100644 tools/power/acpi/tools/acpidbg/Makefile + create mode 100644 tools/power/acpi/tools/acpidbg/acpidbg.c +Merging idle/next (31ade3b83e18 Linux 4.4-rc3) +$ git merge idle/next +Already up-to-date. +Merging apm/for-next (53675abbd1e5 x86, apm: Remove unused variable) +$ git merge apm/for-next +Already up-to-date. +Merging thermal/next (1d296eb7260a Merge branches 'thermal-core' and 'thermal-intel' of .git into next) +$ git merge thermal/next +Auto-merging drivers/thermal/intel_soc_dts_iosf.c +Merge made by the 'recursive' strategy. + Documentation/thermal/sysfs-api.txt | 10 + + drivers/acpi/thermal.c | 2 +- + drivers/platform/x86/acerhdf.c | 2 +- + drivers/thermal/Kconfig | 12 + + drivers/thermal/Makefile | 1 + + drivers/thermal/db8500_thermal.c | 2 +- + drivers/thermal/hisi_thermal.c | 3 +- + drivers/thermal/imx_thermal.c | 4 +- + .../thermal/int340x_thermal/int340x_thermal_zone.h | 2 +- + .../int340x_thermal/processor_thermal_device.c | 10 + + drivers/thermal/intel_pch_thermal.c | 2 +- + drivers/thermal/intel_powerclamp.c | 45 ++- + drivers/thermal/intel_soc_dts_iosf.c | 3 +- + drivers/thermal/of-thermal.c | 2 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 2 +- + drivers/thermal/rcar_thermal.c | 3 +- + drivers/thermal/rockchip_thermal.c | 3 +- + drivers/thermal/samsung/exynos_tmu.c | 2 +- + drivers/thermal/st/st_thermal_memmap.c | 3 +- + drivers/thermal/step_wise.c | 17 +- + drivers/thermal/thermal_core.c | 189 ++++++++-- + drivers/thermal/thermal_core.h | 1 + + drivers/thermal/thermal_iio.c | 383 +++++++++++++++++++++ + drivers/thermal/thermal_iio.h | 45 +++ + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 4 +- + drivers/thermal/x86_pkg_temp_thermal.c | 11 +- + include/linux/thermal.h | 31 +- + 27 files changed, 722 insertions(+), 72 deletions(-) + create mode 100644 drivers/thermal/thermal_iio.c + create mode 100644 drivers/thermal/thermal_iio.h +Merging thermal-soc/next (ce0265dd6f8e thermal: trip_point_temp_store() calls thermal_zone_device_update()) +$ git merge thermal-soc/next +Auto-merging drivers/thermal/thermal_core.c +Auto-merging drivers/thermal/rockchip_thermal.c +Auto-merging drivers/thermal/rcar_thermal.c +Merge made by the 'recursive' strategy. + .../bindings/thermal/rockchip-thermal.txt | 2 + + drivers/thermal/rcar_thermal.c | 53 ++++--- + drivers/thermal/rockchip_thermal.c | 172 +++++++++++++++++++-- + drivers/thermal/thermal_core.c | 6 +- + 4 files changed, 200 insertions(+), 33 deletions(-) +$ git am -3 ../patches/0001-thermal-fix-for-thermal_zone_device_update-API-chang.patch +Applying: thermal: fix for thermal_zone_device_update() API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/thermal/thermal_core.c +$ git add -A . +$ git commit -v -a --amend +[master 7e8f891fe962] Merge remote-tracking branch 'thermal-soc/next' + Date: Mon Jan 11 13:08:12 2016 +1100 +Merging ieee1394/for-next (100ceb66d5c4 firewire: ohci: fix JMicron JMB38x IT context discovery) +$ git merge ieee1394/for-next +Already up-to-date. +Merging dlm/next (a6b1533e9a57 dlm: make posix locks interruptible) +$ git merge dlm/next +Already up-to-date. +Merging swiotlb/linux-next (9d99c7123c9a swiotlb: Enable it under x86 PAE) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging slave-dma/next (45f29dde4d57 Merge branch 'fixes' into next) +$ git merge slave-dma/next +Removing include/linux/platform_data/dma-rcar-hpbdma.h +Removing drivers/dma/sh/rcar-hpbdma.c +Auto-merging drivers/dma/dw/platform.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 10 +- + .../devicetree/bindings/dma/stm32-dma.txt | 82 ++ + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 6 + + Documentation/dmaengine/client.txt | 59 +- + Documentation/dmaengine/provider.txt | 20 +- + arch/arm/configs/stm32_defconfig | 2 + + drivers/dca/dca-core.c | 3 +- + drivers/dma/Kconfig | 12 + + drivers/dma/Makefile | 1 + + drivers/dma/acpi-dma.c | 5 +- + drivers/dma/at_xdmac.c | 20 +- + drivers/dma/dma-axi-dmac.c | 8 + + drivers/dma/dmaengine.c | 178 ++- + drivers/dma/dw/platform.c | 7 +- + drivers/dma/edma.c | 10 + + drivers/dma/fsl-edma.c | 85 +- + drivers/dma/hsu/hsu.c | 17 +- + drivers/dma/hsu/hsu.h | 1 + + drivers/dma/idma64.c | 22 +- + drivers/dma/idma64.h | 3 +- + drivers/dma/img-mdc-dma.c | 78 +- + drivers/dma/ioat/dca.c | 2 +- + drivers/dma/ioat/dma.h | 34 +- + drivers/dma/ioat/registers.h | 16 +- + drivers/dma/mv_xor.c | 95 +- + drivers/dma/mv_xor.h | 2 +- + drivers/dma/omap-dma.c | 82 +- + drivers/dma/pxa_dma.c | 1 + + drivers/dma/sh/Kconfig | 6 - + drivers/dma/sh/Makefile | 1 - + drivers/dma/sh/rcar-hpbdma.c | 669 ------------ + drivers/dma/sh/usb-dmac.c | 4 +- + drivers/dma/ste_dma40.c | 87 +- + drivers/dma/stm32-dma.c | 1141 ++++++++++++++++++++ + drivers/dma/tegra20-apb-dma.c | 73 +- + drivers/dma/ti-dma-crossbar.c | 81 +- + drivers/dma/virt-dma.c | 46 +- + drivers/dma/virt-dma.h | 25 + + include/linux/dca.h | 5 +- + include/linux/dmaengine.h | 145 ++- + include/linux/omap-dma.h | 6 + + include/linux/platform_data/dma-rcar-hpbdma.h | 103 -- + include/linux/platform_data/edma.h | 7 + + sound/core/pcm_dmaengine.c | 9 +- + 44 files changed, 2088 insertions(+), 1181 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/stm32-dma.txt + delete mode 100644 drivers/dma/sh/rcar-hpbdma.c + create mode 100644 drivers/dma/stm32-dma.c + delete mode 100644 include/linux/platform_data/dma-rcar-hpbdma.h +Merging net-next/master (5c721d561dc6 Merge branch 'mdio-device-fixes') +$ git merge net-next/master +Resolved 'include/linux/pci_ids.h' using previous resolution. +Auto-merging net/ipv6/ila/ila_lwt.c +Auto-merging net/ipv4/udp_offload.c +Auto-merging net/batman-adv/bat_iv_ogm.c +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Auto-merging drivers/net/wireless/ti/wlcore/debugfs.c +Auto-merging drivers/net/wireless/st/cw1200/sta.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2500usb.c +Auto-merging drivers/net/wireless/marvell/mwifiex/uap_txrx.c +Auto-merging drivers/net/wireless/marvell/mwifiex/uap_cmd.c +Auto-merging drivers/net/wireless/marvell/mwifiex/sta_rx.c +Auto-merging drivers/net/wireless/marvell/mwifiex/sta_ioctl.c +Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.h +Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.c +Auto-merging drivers/net/wireless/marvell/mwifiex/main.h +Auto-merging drivers/net/wireless/marvell/mwifiex/join.c +Auto-merging drivers/net/wireless/marvell/mwifiex/init.c +Auto-merging drivers/net/wireless/marvell/mwifiex/ie.c +Auto-merging drivers/net/wireless/marvell/mwifiex/fw.h +Auto-merging drivers/net/wireless/marvell/mwifiex/decl.h +Auto-merging drivers/net/wireless/marvell/mwifiex/debugfs.c +Auto-merging drivers/net/wireless/marvell/mwifiex/cmdevt.c +Auto-merging drivers/net/wireless/marvell/mwifiex/cfp.c +Auto-merging drivers/net/wireless/marvell/mwifiex/cfg80211.c +Auto-merging drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c +Auto-merging drivers/net/wireless/marvell/mwifiex/11n_aggr.c +Auto-merging drivers/net/wireless/marvell/libertas/if_sdio.c +Auto-merging drivers/net/wireless/marvell/libertas/cfg.c +Auto-merging drivers/net/wireless/intersil/prism54/oid_mgt.c +Auto-merging drivers/net/wireless/intersil/prism54/islpci_mgt.c +Auto-merging drivers/net/wireless/intersil/prism54/islpci_eth.c +Auto-merging drivers/net/wireless/intersil/prism54/islpci_dev.c +Auto-merging drivers/net/wireless/intersil/prism54/isl_ioctl.c +Auto-merging drivers/net/wireless/intersil/hostap/hostap_cs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/rx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/internal.h +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/utils.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tt.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tof.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tof.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/time-event.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/time-event.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/testmode.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/tdls.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/sf.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/scan.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/quota.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/power.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/offloading.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/nvm.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/led.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tx.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-tof.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-stats.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-sta.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-scan.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rx.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-power.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-mac.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-d3.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw-api-coex.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/d3.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/constants.h +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/coex_legacy.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/coex.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/binding.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/Makefile +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-scd.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-prph.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-phy-db.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-phy-db.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-notif-wait.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-modparams.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-io.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-io.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-fw.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-fw-error-dump.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-fh.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-drv.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-drv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace-ucode.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace-msg.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace-io.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-devtrace-data.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-debug.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-debug.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-csr.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-config.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-agn-hw.h +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-8000.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-7000.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-6000.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-5000.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-2000.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-1000.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/ucode.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/tx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/tt.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/tt.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/sta.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/scan.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/rxon.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/rx.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/rs.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/rs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/power.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/power.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/main.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/lib.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/led.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/led.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/devices.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/dev.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/commands.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/calib.h +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/calib.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/agn.h +Auto-merging drivers/net/wireless/intel/iwlwifi/Makefile +Auto-merging drivers/net/wireless/intel/iwlwifi/Kconfig +Auto-merging drivers/net/wireless/intel/iwlegacy/common.c +Auto-merging drivers/net/wireless/cisco/airo.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmutil/Makefile +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmsmac/channel.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmsmac/Makefile +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmfmac/Makefile +Auto-merging drivers/net/vxlan.c +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/net/usb/lan78xx.c +Auto-merging drivers/net/phy/micrel.c +Auto-merging drivers/net/geneve.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h +Removing drivers/net/ethernet/mellanox/mlx5/core/flow_table.c +Removing drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c +Auto-merging drivers/net/ethernet/freescale/ucc_geth.c +Auto-merging drivers/net/ethernet/freescale/fsl_pq_mdio.c +Removing drivers/isdn/sc/timer.c +Removing drivers/isdn/sc/shmem.c +Removing drivers/isdn/sc/scioc.h +Removing drivers/isdn/sc/packet.c +Removing drivers/isdn/sc/message.h +Removing drivers/isdn/sc/message.c +Removing drivers/isdn/sc/ioctl.c +Removing drivers/isdn/sc/interrupt.c +Removing drivers/isdn/sc/init.c +Removing drivers/isdn/sc/includes.h +Removing drivers/isdn/sc/hardware.h +Removing drivers/isdn/sc/event.c +Removing drivers/isdn/sc/command.c +Removing drivers/isdn/sc/card.h +Removing drivers/isdn/sc/Makefile +Removing drivers/isdn/sc/Kconfig +Auto-merging crypto/algif_skcipher.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master e621dc483611] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-cdc_ncm | 19 + + Documentation/ABI/testing/sysfs-class-net-mesh | 4 +- + Documentation/ABI/testing/sysfs-class-net-qmi | 23 + + Documentation/devicetree/bindings/net/dsa/dsa.txt | 3 + + .../devicetree/bindings/net/hisilicon-hns-mdio.txt | 7 +- + .../devicetree/bindings/net/ieee802154/adf7242.txt | 18 + + Documentation/devicetree/bindings/net/macb.txt | 8 + + .../devicetree/bindings/net/micrel-ksz90x1.txt | 17 +- + .../devicetree/bindings/net/nfc/st95hf.txt | 50 + + .../devicetree/bindings/net/renesas,ravb.txt | 12 +- + .../devicetree/bindings/net/socfpga-dwmac.txt | 2 + + Documentation/devicetree/bindings/net/stmmac.txt | 25 +- + .../fault-injection/notifier-error-inject.txt | 25 + + Documentation/networking/batman-adv.txt | 9 +- + Documentation/networking/ip-sysctl.txt | 31 +- + Documentation/networking/switchdev.txt | 8 +- + MAINTAINERS | 87 +- + arch/alpha/include/uapi/asm/socket.h | 3 + + arch/arm64/net/bpf_jit_comp.c | 6 - + arch/avr32/include/uapi/asm/socket.h | 3 + + arch/frv/include/uapi/asm/socket.h | 3 + + arch/ia64/include/uapi/asm/socket.h | 3 + + arch/m32r/include/uapi/asm/socket.h | 3 + + arch/mips/bcm47xx/setup.c | 39 +- + arch/mips/include/uapi/asm/socket.h | 3 + + arch/mn10300/include/uapi/asm/socket.h | 3 + + arch/parisc/include/uapi/asm/socket.h | 3 + + arch/powerpc/include/asm/hvcall.h | 20 + + arch/powerpc/include/uapi/asm/socket.h | 3 + + arch/powerpc/platforms/82xx/ep8248e.c | 10 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 3 - + arch/s390/include/uapi/asm/socket.h | 3 + + arch/s390/net/bpf_jit_comp.c | 13 +- + arch/sparc/include/uapi/asm/socket.h | 3 + + arch/sparc/kernel/idprom.c | 7 + + arch/x86/net/bpf_jit_comp.c | 40 +- + arch/xtensa/include/uapi/asm/socket.h | 3 + + crypto/algif_aead.c | 4 +- + crypto/algif_skcipher.c | 4 +- + drivers/atm/solos-pci.c | 34 +- + drivers/bcma/main.c | 29 +- + drivers/bluetooth/bcm203x.c | 4 +- + drivers/bluetooth/bfusb.c | 15 +- + drivers/bluetooth/bluecard_cs.c | 25 +- + drivers/bluetooth/bpa10x.c | 4 +- + drivers/bluetooth/bt3c_cs.c | 11 +- + drivers/bluetooth/btintel.c | 129 +- + drivers/bluetooth/btintel.h | 19 + + drivers/bluetooth/btmrvl_drv.h | 1 + + drivers/bluetooth/btmrvl_main.c | 21 +- + drivers/bluetooth/btmrvl_sdio.c | 10 +- + drivers/bluetooth/btsdio.c | 6 +- + drivers/bluetooth/btuart_cs.c | 11 +- + drivers/bluetooth/btusb.c | 186 +- + drivers/bluetooth/btwilink.c | 8 +- + drivers/bluetooth/dtl1_cs.c | 11 +- + drivers/bluetooth/hci_ath.c | 6 +- + drivers/bluetooth/hci_bcm.c | 10 +- + drivers/bluetooth/hci_bcsp.c | 25 +- + drivers/bluetooth/hci_h4.c | 16 +- + drivers/bluetooth/hci_h5.c | 28 +- + drivers/bluetooth/hci_intel.c | 66 +- + drivers/bluetooth/hci_ldisc.c | 13 +- + drivers/bluetooth/hci_ll.c | 4 +- + drivers/bluetooth/hci_qca.c | 4 +- + drivers/bluetooth/hci_vhci.c | 8 +- + drivers/infiniband/hw/mlx4/mad.c | 17 +- + drivers/isdn/Makefile | 1 - + drivers/isdn/i4l/Kconfig | 2 - + drivers/isdn/sc/Kconfig | 8 - + drivers/isdn/sc/Makefile | 10 - + drivers/isdn/sc/card.h | 131 - + drivers/isdn/sc/command.c | 363 -- + drivers/isdn/sc/event.c | 68 - + drivers/isdn/sc/hardware.h | 110 - + drivers/isdn/sc/includes.h | 16 - + drivers/isdn/sc/init.c | 549 --- + drivers/isdn/sc/interrupt.c | 247 -- + drivers/isdn/sc/ioctl.c | 582 ---- + drivers/isdn/sc/message.c | 230 -- + drivers/isdn/sc/message.h | 245 -- + drivers/isdn/sc/packet.c | 204 -- + drivers/isdn/sc/scioc.h | 110 - + drivers/isdn/sc/shmem.c | 138 - + drivers/isdn/sc/timer.c | 122 - + drivers/net/bonding/bond_3ad.c | 11 +- + drivers/net/bonding/bond_main.c | 120 +- + drivers/net/bonding/bond_sysfs.c | 1 - + drivers/net/can/xilinx_can.c | 176 +- + drivers/net/dsa/mv88e6xxx.c | 240 +- + drivers/net/dsa/mv88e6xxx.h | 8 + + drivers/net/ethernet/3com/3c509.c | 2 +- + drivers/net/ethernet/3com/3c59x.c | 2 +- + drivers/net/ethernet/8390/ax88796.c | 17 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adi/bfin_mac.c | 33 +- + drivers/net/ethernet/aeroflex/greth.c | 5 - + drivers/net/ethernet/aeroflex/greth.h | 1 - + drivers/net/ethernet/agere/et131x.c | 49 +- + drivers/net/ethernet/altera/altera_tse_main.c | 15 +- + drivers/net/ethernet/amd/au1000_eth.c | 22 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 - + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 33 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.c | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_sgmac.h | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 4 +- + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 4 +- + drivers/net/ethernet/atheros/alx/hw.c | 10 +- + drivers/net/ethernet/atheros/alx/hw.h | 9 +- + drivers/net/ethernet/atheros/alx/main.c | 8 +- + drivers/net/ethernet/broadcom/b44.c | 21 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 40 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.c | 15 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 115 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 109 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 7 - + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 124 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 43 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 3 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 721 ++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 28 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 64 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 865 ++--- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 62 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 14 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 15 +- + drivers/net/ethernet/broadcom/tg3.c | 46 +- + drivers/net/ethernet/broadcom/tg3.h | 1 - + drivers/net/ethernet/cadence/macb.c | 67 +- + drivers/net/ethernet/cadence/macb.h | 2 + + drivers/net/ethernet/cavium/thunder/nic.h | 6 + + drivers/net/ethernet/cavium/thunder/nic_main.c | 11 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 15 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 211 +- + drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 12 +- + drivers/net/ethernet/cavium/thunder/q_struct.h | 30 +- + drivers/net/ethernet/chelsio/Kconfig | 17 +- + drivers/net/ethernet/chelsio/cxgb/cphy.h | 2 +- + drivers/net/ethernet/chelsio/cxgb/mv88e1xxx.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/mv88x201x.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/my3126.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/pm3393.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/vsc7326.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/ael1002.c | 12 +- + drivers/net/ethernet/chelsio/cxgb3/aq100x.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/common.h | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 14 +- + drivers/net/ethernet/chelsio/cxgb3/t3_hw.c | 28 +- + drivers/net/ethernet/chelsio/cxgb3/vsc8211.c | 4 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 11 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 19 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 144 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 148 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 232 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 179 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.h | 10 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 187 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 162 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 31 + + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 3 + + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 11 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_defs.h | 1 + + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 11 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 2 - + drivers/net/ethernet/dec/tulip/de4x5.c | 2 +- + drivers/net/ethernet/dlink/dl2k.c | 314 +- + drivers/net/ethernet/dnet.c | 28 +- + drivers/net/ethernet/emulex/benet/be.h | 13 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 756 ++++- + drivers/net/ethernet/emulex/benet/be_cmds.h | 178 +- + drivers/net/ethernet/emulex/benet/be_ethtool.c | 88 +- + drivers/net/ethernet/emulex/benet/be_main.c | 592 +--- + drivers/net/ethernet/ethoc.c | 18 +- + drivers/net/ethernet/faraday/ftgmac100.c | 10 +- + drivers/net/ethernet/freescale/Kconfig | 1 + + drivers/net/ethernet/freescale/Makefile | 2 + + drivers/net/ethernet/freescale/fec_main.c | 36 +- + drivers/net/ethernet/freescale/fec_mpc52xx.c | 22 +- + drivers/net/ethernet/freescale/fec_mpc52xx_phy.c | 4 - + drivers/net/ethernet/freescale/fman/Kconfig | 9 + + drivers/net/ethernet/freescale/fman/Makefile | 7 + + drivers/net/ethernet/freescale/fman/fman.c | 2871 ++++++++++++++++ + drivers/net/ethernet/freescale/fman/fman.h | 325 ++ + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 1453 ++++++++ + drivers/net/ethernet/freescale/fman/fman_dtsec.h | 59 + + drivers/net/ethernet/freescale/fman/fman_mac.h | 278 ++ + drivers/net/ethernet/freescale/fman/fman_memac.c | 1170 +++++++ + drivers/net/ethernet/freescale/fman/fman_memac.h | 60 + + drivers/net/ethernet/freescale/fman/fman_muram.c | 158 + + drivers/net/ethernet/freescale/fman/fman_muram.h | 51 + + drivers/net/ethernet/freescale/fman/fman_port.c | 1778 ++++++++++ + drivers/net/ethernet/freescale/fman/fman_port.h | 151 + + drivers/net/ethernet/freescale/fman/fman_sp.c | 166 + + drivers/net/ethernet/freescale/fman/fman_sp.h | 103 + + drivers/net/ethernet/freescale/fman/fman_tgec.c | 786 +++++ + drivers/net/ethernet/freescale/fman/fman_tgec.h | 55 + + drivers/net/ethernet/freescale/fman/mac.c | 977 ++++++ + drivers/net/ethernet/freescale/fman/mac.h | 97 + + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 2 +- + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 2 +- + .../net/ethernet/freescale/fs_enet/mii-bitbang.c | 10 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 10 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 2 - + drivers/net/ethernet/freescale/gianfar.c | 13 +- + drivers/net/ethernet/freescale/ucc_geth.c | 4 +- + drivers/net/ethernet/hisilicon/hns/hnae.h | 63 +- + drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c | 99 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 14 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.h | 4 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 213 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 24 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 72 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 32 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 75 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 8 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_reg.h | 188 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 553 ++- + drivers/net/ethernet/hisilicon/hns/hns_enet.h | 12 + + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 201 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 5 - + drivers/net/ethernet/hp/hp100.c | 2 +- + drivers/net/ethernet/ibm/Kconfig | 10 + + drivers/net/ethernet/ibm/Makefile | 1 + + drivers/net/ethernet/ibm/ibmveth.c | 9 +- + drivers/net/ethernet/ibm/ibmvnic.c | 3585 ++++++++++++++++++++ + drivers/net/ethernet/ibm/ibmvnic.h | 1046 ++++++ + drivers/net/ethernet/intel/Kconfig | 10 + + drivers/net/ethernet/intel/e1000/e1000.h | 7 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 216 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 133 +- + drivers/net/ethernet/intel/e1000e/defines.h | 3 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 2 +- + drivers/net/ethernet/intel/e1000e/hw.h | 1 + + drivers/net/ethernet/intel/e1000e/ich8lan.c | 45 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 92 +- + drivers/net/ethernet/intel/fm10k/Makefile | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 23 +- + 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 | 30 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 80 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 57 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.h | 8 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 75 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 211 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 151 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_tlv.h | 11 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 43 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 81 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e.h | 46 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 23 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 28 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 1 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 108 +- + drivers/net/ethernet/intel/i40e/i40e_fcoe.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 1004 ++++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 110 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 100 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 23 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 1 - + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 1 - + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 226 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 18 + + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 1 + + drivers/net/ethernet/intel/i40evf/i40evf.h | 19 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 79 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 435 ++- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 86 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 21 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 6 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 1 + + drivers/net/ethernet/intel/igb/e1000_i210.c | 32 +- + drivers/net/ethernet/intel/igb/e1000_i210.h | 3 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 229 +- + drivers/net/ethernet/intel/igb/e1000_phy.h | 16 +- + drivers/net/ethernet/intel/igb/e1000_regs.h | 4 +- + drivers/net/ethernet/intel/igb/igb.h | 2 + + drivers/net/ethernet/intel/igb/igb_ethtool.c | 38 +- + drivers/net/ethernet/intel/igb/igb_main.c | 26 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 50 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 8 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 13 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 250 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 6 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 70 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 553 ++- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 3 + + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 720 ++-- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 237 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 17 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 16 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 220 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 2 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 3 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 104 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 4 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 30 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 21 +- + drivers/net/ethernet/marvell/mvmdio.c | 10 +- + drivers/net/ethernet/marvell/mvneta.c | 429 ++- + drivers/net/ethernet/marvell/sky2.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 10 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 17 - + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 40 - + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 18 +- + drivers/net/ethernet/mellanox/mlx4/eq.c | 24 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 12 +- + drivers/net/ethernet/mellanox/mlx4/fw.h | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 107 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 8 + + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 126 - + drivers/net/ethernet/mellanox/mlx4/port.c | 598 +++- + .../net/ethernet/mellanox/mlx4/resource_tracker.c | 193 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 57 +- + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 287 ++ + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 30 + + .../ethernet/mellanox/mlx5/core/en_flow_table.c | 907 ----- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 1224 +++++++ + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 120 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 24 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 85 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 13 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 1097 ++++++ + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 147 + + .../net/ethernet/mellanox/mlx5/core/flow_table.c | 422 --- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 239 ++ + .../net/ethernet/mellanox/mlx5/core/fs_cmd.h | 49 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1047 ++++++ + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 155 + + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 24 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 119 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 9 + + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 38 + + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 233 ++ + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 435 ++- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 10 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 1 + + drivers/net/ethernet/mellanox/mlxsw/core.c | 85 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 34 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 372 ++ + drivers/net/ethernet/mellanox/mlxsw/pci.c | 19 +- + drivers/net/ethernet/mellanox/mlxsw/pci.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 790 ++++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1210 ++++++- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 153 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 760 ++++- + drivers/net/ethernet/microchip/encx24j600.c | 24 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 3 +- + drivers/net/ethernet/netronome/Kconfig | 36 + + drivers/net/ethernet/netronome/Makefile | 5 + + drivers/net/ethernet/netronome/nfp/Makefile | 8 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 748 ++++ + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2435 +++++++++++++ + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 323 ++ + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 235 ++ + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 640 ++++ + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 385 +++ + drivers/net/ethernet/nxp/lpc_eth.c | 20 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 6 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 18 + + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 27 + + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 13 + + drivers/net/ethernet/qlogic/qede/qede.h | 5 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 211 ++ + drivers/net/ethernet/qlogic/qede/qede_main.c | 7 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_io.c | 4 +- + drivers/net/ethernet/rdc/r6040.c | 20 +- + drivers/net/ethernet/realtek/r8169.c | 29 +- + drivers/net/ethernet/renesas/ravb.h | 4 + + drivers/net/ethernet/renesas/ravb_main.c | 108 +- + drivers/net/ethernet/renesas/sh_eth.c | 393 +-- + drivers/net/ethernet/renesas/sh_eth.h | 1 - + drivers/net/ethernet/rocker/rocker.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c | 4 +- + drivers/net/ethernet/sfc/ef10.c | 96 +- + drivers/net/ethernet/sfc/efx.c | 18 +- + drivers/net/ethernet/sfc/mcdi.c | 250 +- + drivers/net/ethernet/sfc/mcdi.h | 10 + + drivers/net/ethernet/sfc/net_driver.h | 5 +- + drivers/net/ethernet/sfc/rx.c | 1 - + drivers/net/ethernet/sfc/tx.c | 8 +- + drivers/net/ethernet/smsc/smsc911x.c | 21 +- + drivers/net/ethernet/smsc/smsc9420.c | 23 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 28 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 24 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 9 + + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 42 + + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 75 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 30 + + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 23 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 46 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 2 +- + drivers/net/ethernet/synopsys/dwc_eth_qos.c | 27 +- + drivers/net/ethernet/ti/cpmac.c | 3 - + drivers/net/ethernet/ti/cpsw.c | 9 +- + drivers/net/ethernet/ti/davinci_emac.c | 5 +- + drivers/net/ethernet/ti/davinci_mdio.c | 4 +- + drivers/net/ethernet/ti/netcp.h | 2 +- + drivers/net/ethernet/ti/netcp_core.c | 134 +- + drivers/net/ethernet/ti/netcp_ethss.c | 4 +- + drivers/net/ethernet/tile/tilepro.c | 3 +- + drivers/net/ethernet/toshiba/tc35815.c | 22 +- + drivers/net/ethernet/xilinx/ll_temac.h | 1 - + drivers/net/ethernet/xilinx/ll_temac_mdio.c | 2 - + drivers/net/ethernet/xilinx/xilinx_axienet.h | 2 - + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 2 - + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 6 +- + drivers/net/geneve.c | 151 +- + drivers/net/hyperv/hyperv_net.h | 62 +- + drivers/net/hyperv/netvsc.c | 111 +- + drivers/net/hyperv/netvsc_drv.c | 235 +- + drivers/net/hyperv/rndis_filter.c | 66 +- + drivers/net/ieee802154/Kconfig | 11 + + drivers/net/ieee802154/Makefile | 1 + + drivers/net/ieee802154/adf7242.c | 1285 +++++++ + drivers/net/ieee802154/atusb.c | 3 +- + drivers/net/ieee802154/cc2520.c | 145 +- + drivers/net/ipvlan/ipvlan_main.c | 2 +- + drivers/net/loopback.c | 2 +- + drivers/net/macvlan.c | 4 +- + drivers/net/macvtap.c | 2 +- + drivers/net/phy/Makefile | 2 +- + drivers/net/phy/amd.c | 1 - + drivers/net/phy/aquantia.c | 4 - + drivers/net/phy/at803x.c | 15 +- + drivers/net/phy/bcm-phy-lib.c | 8 +- + drivers/net/phy/bcm63xx.c | 2 - + drivers/net/phy/bcm7xxx.c | 20 +- + drivers/net/phy/bcm87xx.c | 11 +- + drivers/net/phy/broadcom.c | 12 - + drivers/net/phy/cicada.c | 2 - + drivers/net/phy/davicom.c | 4 - + drivers/net/phy/dp83640.c | 25 +- + drivers/net/phy/dp83848.c | 2 - + drivers/net/phy/dp83867.c | 17 +- + drivers/net/phy/et1011c.c | 1 - + drivers/net/phy/fixed_phy.c | 14 +- + drivers/net/phy/icplus.c | 21 +- + drivers/net/phy/lxt.c | 4 - + drivers/net/phy/marvell.c | 153 +- + drivers/net/phy/mdio-bcm-unimac.c | 11 +- + drivers/net/phy/mdio-gpio.c | 2 +- + drivers/net/phy/mdio-moxart.c | 7 - + drivers/net/phy/mdio-mux.c | 3 +- + drivers/net/phy/mdio-octeon.c | 14 +- + drivers/net/phy/mdio-sun4i.c | 12 +- + drivers/net/phy/mdio_bus.c | 283 +- + drivers/net/phy/mdio_device.c | 171 + + drivers/net/phy/micrel.c | 137 +- + drivers/net/phy/microchip.c | 11 +- + drivers/net/phy/national.c | 1 - + drivers/net/phy/phy.c | 62 +- + drivers/net/phy/phy_device.c | 334 +- + drivers/net/phy/qsemi.c | 1 - + drivers/net/phy/realtek.c | 5 - + drivers/net/phy/smsc.c | 12 +- + drivers/net/phy/ste10Xp.c | 2 - + drivers/net/phy/teranetics.c | 1 - + drivers/net/phy/vitesse.c | 8 - + drivers/net/plip/plip.c | 36 +- + drivers/net/ppp/ppp_generic.c | 9 +- + drivers/net/ppp/pppoe.c | 28 +- + drivers/net/ppp/pppox.c | 5 +- + drivers/net/ppp/pptp.c | 1 + + drivers/net/team/team.c | 69 +- + drivers/net/team/team_mode_activebackup.c | 1 + + drivers/net/team/team_mode_broadcast.c | 1 + + drivers/net/team/team_mode_loadbalance.c | 1 + + drivers/net/team/team_mode_random.c | 1 + + drivers/net/team/team_mode_roundrobin.c | 1 + + drivers/net/tun.c | 3 + + drivers/net/usb/asix_common.c | 2 +- + drivers/net/usb/ax88172a.c | 14 +- + drivers/net/usb/cdc_ncm.c | 43 + + drivers/net/usb/lan78xx.c | 11 +- + drivers/net/usb/qmi_wwan.c | 151 +- + drivers/net/usb/r8152.c | 94 +- + drivers/net/usb/usbnet.c | 5 +- + drivers/net/virtio_net.c | 3 - + drivers/net/vrf.c | 70 +- + drivers/net/vxlan.c | 9 +- + drivers/net/wan/hdlc.c | 21 +- + drivers/net/wan/hdlc_cisco.c | 1 + + drivers/net/wan/hdlc_fr.c | 1 + + drivers/net/wan/hdlc_ppp.c | 1 + + drivers/net/wan/hdlc_raw.c | 1 + + drivers/net/wan/hdlc_raw_eth.c | 1 + + drivers/net/wan/hdlc_x25.c | 1 + + drivers/net/wan/wanxl.c | 1 + + drivers/net/wireless/Kconfig | 238 +- + drivers/net/wireless/Makefile | 65 +- + drivers/net/wireless/admtek/Kconfig | 41 + + drivers/net/wireless/admtek/Makefile | 1 + + drivers/net/wireless/{ => admtek}/adm8211.c | 0 + drivers/net/wireless/{ => admtek}/adm8211.h | 0 + drivers/net/wireless/ath/Kconfig | 17 +- + drivers/net/wireless/ath/ath10k/Kconfig | 1 + + drivers/net/wireless/ath/ath10k/core.c | 16 +- + drivers/net/wireless/ath/ath10k/core.h | 38 +- + drivers/net/wireless/ath/ath10k/debug.c | 199 +- + drivers/net/wireless/ath/ath10k/debug.h | 4 + + drivers/net/wireless/ath/ath10k/htt.h | 15 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 33 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 130 +- + drivers/net/wireless/ath/ath10k/hw.h | 15 + + drivers/net/wireless/ath/ath10k/mac.c | 207 +- + drivers/net/wireless/ath/ath10k/mac.h | 3 +- + drivers/net/wireless/ath/ath10k/pci.c | 11 + + drivers/net/wireless/ath/ath10k/thermal.c | 2 +- + drivers/net/wireless/ath/ath10k/txrx.c | 15 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 19 + + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 18 + + drivers/net/wireless/ath/ath10k/wmi.c | 208 +- + drivers/net/wireless/ath/ath10k/wmi.h | 130 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 4 +- + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 5 +- + drivers/net/wireless/ath/ath6kl/init.c | 16 +- + drivers/net/wireless/ath/ath9k/Kconfig | 11 + + drivers/net/wireless/ath/ath9k/Makefile | 1 + + drivers/net/wireless/ath/ath9k/ath9k.h | 23 + + drivers/net/wireless/ath/ath9k/beacon.c | 3 +- + drivers/net/wireless/ath/ath9k/channel.c | 56 +- + drivers/net/wireless/ath/ath9k/common-beacon.c | 22 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 74 + + drivers/net/wireless/ath/ath9k/eeprom.h | 3 + + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 76 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 68 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 61 +- + drivers/net/wireless/ath/ath9k/htc_hst.c | 2 +- + drivers/net/wireless/ath/ath9k/hw.c | 11 +- + drivers/net/wireless/ath/ath9k/main.c | 4 + + drivers/net/wireless/ath/ath9k/recv.c | 3 + + drivers/net/wireless/ath/ath9k/rng.c | 107 + + drivers/net/wireless/ath/ath9k/xmit.c | 23 +- + drivers/net/wireless/ath/wcn36xx/hal.h | 2 + + drivers/net/wireless/ath/wcn36xx/smd.c | 27 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 9 + + drivers/net/wireless/ath/wil6210/main.c | 22 +- + drivers/net/wireless/ath/wil6210/netdev.c | 2 +- + drivers/net/wireless/ath/wil6210/txrx.c | 5 +- + drivers/net/wireless/ath/wil6210/wmi.c | 4 + + drivers/net/wireless/atmel/Kconfig | 57 + + drivers/net/wireless/atmel/Makefile | 5 + + drivers/net/wireless/{ => atmel}/at76c50x-usb.c | 0 + drivers/net/wireless/{ => atmel}/at76c50x-usb.h | 0 + drivers/net/wireless/{ => atmel}/atmel.c | 0 + drivers/net/wireless/{ => atmel}/atmel.h | 0 + drivers/net/wireless/{ => atmel}/atmel_cs.c | 0 + drivers/net/wireless/{ => atmel}/atmel_pci.c | 0 + drivers/net/wireless/broadcom/Kconfig | 18 + + drivers/net/wireless/broadcom/Makefile | 5 + + drivers/net/wireless/{ => broadcom}/b43/Kconfig | 0 + drivers/net/wireless/{ => broadcom}/b43/Makefile | 0 + drivers/net/wireless/{ => broadcom}/b43/b43.h | 0 + drivers/net/wireless/{ => broadcom}/b43/bus.c | 0 + drivers/net/wireless/{ => broadcom}/b43/bus.h | 0 + drivers/net/wireless/{ => broadcom}/b43/debugfs.c | 0 + drivers/net/wireless/{ => broadcom}/b43/debugfs.h | 0 + drivers/net/wireless/{ => broadcom}/b43/dma.c | 0 + drivers/net/wireless/{ => broadcom}/b43/dma.h | 0 + drivers/net/wireless/{ => broadcom}/b43/leds.c | 0 + drivers/net/wireless/{ => broadcom}/b43/leds.h | 0 + drivers/net/wireless/{ => broadcom}/b43/lo.c | 0 + drivers/net/wireless/{ => broadcom}/b43/lo.h | 0 + drivers/net/wireless/{ => broadcom}/b43/main.c | 0 + drivers/net/wireless/{ => broadcom}/b43/main.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_a.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_a.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ac.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ac.h | 0 + .../net/wireless/{ => broadcom}/b43/phy_common.c | 0 + .../net/wireless/{ => broadcom}/b43/phy_common.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_g.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_g.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ht.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_ht.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lp.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_lp.h | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_n.c | 0 + drivers/net/wireless/{ => broadcom}/b43/phy_n.h | 0 + drivers/net/wireless/{ => broadcom}/b43/pio.c | 0 + drivers/net/wireless/{ => broadcom}/b43/pio.h | 0 + drivers/net/wireless/{ => broadcom}/b43/ppr.c | 0 + drivers/net/wireless/{ => broadcom}/b43/ppr.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2055.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2055.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2056.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2056.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2057.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2057.h | 0 + .../net/wireless/{ => broadcom}/b43/radio_2059.c | 0 + .../net/wireless/{ => broadcom}/b43/radio_2059.h | 0 + drivers/net/wireless/{ => broadcom}/b43/rfkill.c | 0 + drivers/net/wireless/{ => broadcom}/b43/rfkill.h | 0 + drivers/net/wireless/{ => broadcom}/b43/sdio.c | 0 + drivers/net/wireless/{ => broadcom}/b43/sdio.h | 0 + drivers/net/wireless/{ => broadcom}/b43/sysfs.c | 0 + drivers/net/wireless/{ => broadcom}/b43/sysfs.h | 0 + drivers/net/wireless/{ => broadcom}/b43/tables.c | 0 + drivers/net/wireless/{ => broadcom}/b43/tables.h | 0 + .../net/wireless/{ => broadcom}/b43/tables_lpphy.c | 0 + .../net/wireless/{ => broadcom}/b43/tables_lpphy.h | 0 + .../net/wireless/{ => broadcom}/b43/tables_nphy.c | 0 + .../net/wireless/{ => broadcom}/b43/tables_nphy.h | 0 + .../wireless/{ => broadcom}/b43/tables_phy_ht.c | 0 + .../wireless/{ => broadcom}/b43/tables_phy_ht.h | 0 + .../wireless/{ => broadcom}/b43/tables_phy_lcn.c | 0 + .../wireless/{ => broadcom}/b43/tables_phy_lcn.h | 0 + drivers/net/wireless/{ => broadcom}/b43/wa.c | 0 + drivers/net/wireless/{ => broadcom}/b43/wa.h | 0 + drivers/net/wireless/{ => broadcom}/b43/xmit.c | 0 + drivers/net/wireless/{ => broadcom}/b43/xmit.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/Kconfig | 0 + .../net/wireless/{ => broadcom}/b43legacy/Makefile | 0 + .../wireless/{ => broadcom}/b43legacy/b43legacy.h | 0 + .../wireless/{ => broadcom}/b43legacy/debugfs.c | 0 + .../wireless/{ => broadcom}/b43legacy/debugfs.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/dma.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/dma.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/ilt.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/ilt.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/leds.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/leds.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/main.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/main.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/phy.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/phy.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/pio.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/pio.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/radio.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/radio.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/rfkill.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/rfkill.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/sysfs.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/sysfs.h | 0 + .../net/wireless/{ => broadcom}/b43legacy/xmit.c | 0 + .../net/wireless/{ => broadcom}/b43legacy/xmit.h | 0 + .../net/wireless/{ => broadcom}/brcm80211/Kconfig | 0 + .../net/wireless/{ => broadcom}/brcm80211/Makefile | 0 + .../{ => broadcom}/brcm80211/brcmfmac/Makefile | 4 +- + .../{ => broadcom}/brcm80211/brcmfmac/bcdc.c | 10 +- + .../{ => broadcom}/brcm80211/brcmfmac/bcdc.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/btcoex.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/btcoex.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/bus.h | 2 +- + .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.c | 444 ++- + .../{ => broadcom}/brcm80211/brcmfmac/cfg80211.h | 121 +- + .../{ => broadcom}/brcm80211/brcmfmac/chip.c | 1 + + .../{ => broadcom}/brcm80211/brcmfmac/chip.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/common.c | 24 +- + .../{ => broadcom}/brcm80211/brcmfmac/common.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/commonring.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/commonring.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/core.c | 114 +- + .../{ => broadcom}/brcm80211/brcmfmac/core.h | 8 +- + .../{ => broadcom}/brcm80211/brcmfmac/debug.c | 2 +- + .../{ => broadcom}/brcm80211/brcmfmac/debug.h | 2 + + .../{ => broadcom}/brcm80211/brcmfmac/feature.c | 2 + + .../{ => broadcom}/brcm80211/brcmfmac/feature.h | 7 +- + .../{ => broadcom}/brcm80211/brcmfmac/firmware.c | 47 +- + .../{ => broadcom}/brcm80211/brcmfmac/firmware.h | 46 +- + .../{ => broadcom}/brcm80211/brcmfmac/flowring.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/flowring.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fweh.c | 8 +- + .../{ => broadcom}/brcm80211/brcmfmac/fweh.h | 2 +- + .../{ => broadcom}/brcm80211/brcmfmac/fwil.c | 31 +- + .../{ => broadcom}/brcm80211/brcmfmac/fwil.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/fwil_types.h | 131 +- + .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.c | 11 +- + .../{ => broadcom}/brcm80211/brcmfmac/fwsignal.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.c | 3 +- + .../{ => broadcom}/brcm80211/brcmfmac/msgbuf.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/of.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/of.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/p2p.c | 39 +- + .../{ => broadcom}/brcm80211/brcmfmac/p2p.h | 2 - + .../{ => broadcom}/brcm80211/brcmfmac/pcie.c | 245 +- + .../{ => broadcom}/brcm80211/brcmfmac/pcie.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/proto.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/proto.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/sdio.c | 204 +- + .../{ => broadcom}/brcm80211/brcmfmac/sdio.h | 4 +- + .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/tracepoint.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/usb.c | 93 +- + .../{ => broadcom}/brcm80211/brcmfmac/usb.h | 0 + .../{ => broadcom}/brcm80211/brcmfmac/vendor.c | 0 + .../{ => broadcom}/brcm80211/brcmfmac/vendor.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/Makefile | 6 +- + .../{ => broadcom}/brcm80211/brcmsmac/aiutils.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/aiutils.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/ampdu.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/ampdu.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/antsel.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/antsel.h | 0 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac.h | 0 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h | 0 + .../brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h | 0 + .../brcm80211/brcmsmac/brcms_trace_events.c | 0 + .../brcm80211/brcmsmac/brcms_trace_events.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/channel.c | 4 +- + .../{ => broadcom}/brcm80211/brcmsmac/channel.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/d11.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/debug.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/debug.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/dma.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/dma.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/led.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/led.h | 0 + .../brcm80211/brcmsmac/mac80211_if.c | 0 + .../brcm80211/brcmsmac/mac80211_if.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/main.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/main.h | 0 + .../brcm80211/brcmsmac/phy/phy_cmn.c | 0 + .../brcm80211/brcmsmac/phy/phy_hal.h | 0 + .../brcm80211/brcmsmac/phy/phy_int.h | 0 + .../brcm80211/brcmsmac/phy/phy_lcn.c | 0 + .../brcm80211/brcmsmac/phy/phy_lcn.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c | 0 + .../brcm80211/brcmsmac/phy/phy_qmath.c | 0 + .../brcm80211/brcmsmac/phy/phy_qmath.h | 0 + .../brcm80211/brcmsmac/phy/phy_radio.h | 0 + .../brcm80211/brcmsmac/phy/phyreg_n.h | 0 + .../brcm80211/brcmsmac/phy/phytbl_lcn.c | 0 + .../brcm80211/brcmsmac/phy/phytbl_lcn.h | 0 + .../brcm80211/brcmsmac/phy/phytbl_n.c | 0 + .../brcm80211/brcmsmac/phy/phytbl_n.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/phy_shim.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/pmu.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/pmu.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/pub.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/rate.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/rate.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/scb.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/stf.c | 0 + .../{ => broadcom}/brcm80211/brcmsmac/stf.h | 0 + .../{ => broadcom}/brcm80211/brcmsmac/types.h | 0 + .../brcm80211/brcmsmac/ucode_loader.c | 0 + .../brcm80211/brcmsmac/ucode_loader.h | 0 + .../{ => broadcom}/brcm80211/brcmutil/Makefile | 4 +- + .../{ => broadcom}/brcm80211/brcmutil/d11.c | 0 + .../{ => broadcom}/brcm80211/brcmutil/utils.c | 0 + .../{ => broadcom}/brcm80211/include/brcm_hw_ids.h | 4 + + .../{ => broadcom}/brcm80211/include/brcmu_d11.h | 0 + .../{ => broadcom}/brcm80211/include/brcmu_utils.h | 0 + .../{ => broadcom}/brcm80211/include/brcmu_wifi.h | 23 - + .../{ => broadcom}/brcm80211/include/chipcommon.h | 0 + .../{ => broadcom}/brcm80211/include/defs.h | 0 + .../{ => broadcom}/brcm80211/include/soc.h | 0 + drivers/net/wireless/cisco/Kconfig | 56 + + drivers/net/wireless/cisco/Makefile | 2 + + drivers/net/wireless/{ => cisco}/airo.c | 18 +- + drivers/net/wireless/{ => cisco}/airo.h | 0 + drivers/net/wireless/{ => cisco}/airo_cs.c | 0 + drivers/net/wireless/intel/Kconfig | 18 + + drivers/net/wireless/intel/Makefile | 6 + + drivers/net/wireless/{ => intel}/ipw2x00/Kconfig | 0 + drivers/net/wireless/{ => intel}/ipw2x00/Makefile | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw.h | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c | 0 + drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h | 0 + drivers/net/wireless/{ => intel}/ipw2x00/libipw.h | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_geo.c | 0 + .../wireless/{ => intel}/ipw2x00/libipw_module.c | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_rx.c | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_tx.c | 0 + .../net/wireless/{ => intel}/ipw2x00/libipw_wx.c | 0 + .../net/wireless/{ => intel}/iwlegacy/3945-debug.c | 0 + .../net/wireless/{ => intel}/iwlegacy/3945-mac.c | 0 + .../net/wireless/{ => intel}/iwlegacy/3945-rs.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/3945.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/3945.h | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-calib.c | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-debug.c | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-mac.c | 0 + .../net/wireless/{ => intel}/iwlegacy/4965-rs.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/4965.c | 0 + drivers/net/wireless/{ => intel}/iwlegacy/4965.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/Kconfig | 0 + drivers/net/wireless/{ => intel}/iwlegacy/Makefile | 0 + .../net/wireless/{ => intel}/iwlegacy/commands.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/common.c | 14 +- + drivers/net/wireless/{ => intel}/iwlegacy/common.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/csr.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/debug.c | 0 + .../wireless/{ => intel}/iwlegacy/iwl-spectrum.h | 0 + drivers/net/wireless/{ => intel}/iwlegacy/prph.h | 0 + drivers/net/wireless/{ => intel}/iwlwifi/Kconfig | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/Makefile | 2 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/Makefile | 0 + drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h | 11 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/calib.c | 4 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/calib.h | 2 +- + .../wireless/{ => intel}/iwlwifi/dvm/commands.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c | 6 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/devices.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c | 4 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c | 4 +- + .../wireless/{ => intel}/iwlwifi/dvm/mac80211.c | 13 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/main.c | 116 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/power.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/power.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c | 89 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/rxon.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/scan.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c | 4 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c | 3 +- + .../net/wireless/{ => intel}/iwlwifi/dvm/ucode.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-1000.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-2000.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-5000.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-6000.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-7000.c | 15 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-8000.c | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 163 + + .../net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-config.h | 9 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-debug.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-debug.h | 4 +- + .../{ => intel}/iwlwifi/iwl-devtrace-data.h | 19 +- + .../wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h | 2 +- + .../{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h | 2 +- + .../{ => intel}/iwlwifi/iwl-devtrace-msg.h | 2 +- + .../{ => intel}/iwlwifi/iwl-devtrace-ucode.h | 2 +- + .../wireless/{ => intel}/iwlwifi/iwl-devtrace.c | 2 +- + .../wireless/{ => intel}/iwlwifi/iwl-devtrace.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c | 32 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h | 4 +- + .../{ => intel}/iwlwifi/iwl-eeprom-parse.c | 8 +- + .../{ => intel}/iwlwifi/iwl-eeprom-parse.h | 2 +- + .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c | 2 +- + .../wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h | 2 +- + .../{ => intel}/iwlwifi/iwl-fw-error-dump.h | 7 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h | 17 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h | 16 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c | 41 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h | 6 +- + .../wireless/{ => intel}/iwlwifi/iwl-modparams.h | 15 +- + .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.c | 2 +- + .../wireless/{ => intel}/iwlwifi/iwl-notif-wait.h | 2 +- + .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c | 30 +- + .../wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h | 4 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h | 13 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-prph.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-trans.c | 93 +- + .../net/wireless/{ => intel}/iwlwifi/iwl-trans.h | 230 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/Makefile | 6 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/binding.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/coex.c | 43 +- + .../wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/constants.h | 3 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c | 341 +- + .../wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c | 68 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h | 19 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h | 2 +- + .../{ => intel}/iwlwifi/mvm/fw-api-power.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h | 136 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h | 24 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h | 2 +- + .../{ => intel}/iwlwifi/mvm/fw-api-stats.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h | 2 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h | 29 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 783 +++++ + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | 150 + + drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c | 134 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c | 19 +- + .../wireless/{ => intel}/iwlwifi/mvm/mac80211.c | 595 +--- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h | 145 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c | 55 +- + .../wireless/{ => intel}/iwlwifi/mvm/offloading.c | 76 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c | 359 +- + .../wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/power.c | 2 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/quota.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c | 84 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c | 46 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 378 +++ + .../net/wireless/{ => intel}/iwlwifi/mvm/scan.c | 96 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c | 118 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h | 14 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/tdls.c | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/testmode.h | 2 +- + .../wireless/{ => intel}/iwlwifi/mvm/time-event.c | 41 +- + .../wireless/{ => intel}/iwlwifi/mvm/time-event.h | 3 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c | 2 +- + drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c | 113 +- + .../net/wireless/{ => intel}/iwlwifi/mvm/utils.c | 4 +- + .../net/wireless/{ => intel}/iwlwifi/pcie/drv.c | 24 +- + .../wireless/{ => intel}/iwlwifi/pcie/internal.h | 43 +- + drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c | 30 +- + .../net/wireless/{ => intel}/iwlwifi/pcie/trans.c | 273 +- + drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c | 447 ++- + drivers/net/wireless/intersil/Kconfig | 38 + + drivers/net/wireless/intersil/Makefile | 4 + + drivers/net/wireless/{ => intersil}/hostap/Kconfig | 0 + .../net/wireless/{ => intersil}/hostap/Makefile | 0 + .../net/wireless/{ => intersil}/hostap/hostap.h | 0 + .../wireless/{ => intersil}/hostap/hostap_80211.h | 0 + .../{ => intersil}/hostap/hostap_80211_rx.c | 0 + .../{ => intersil}/hostap/hostap_80211_tx.c | 0 + .../net/wireless/{ => intersil}/hostap/hostap_ap.c | 0 + .../net/wireless/{ => intersil}/hostap/hostap_ap.h | 0 + .../wireless/{ => intersil}/hostap/hostap_common.h | 0 + .../wireless/{ => intersil}/hostap/hostap_config.h | 0 + .../net/wireless/{ => intersil}/hostap/hostap_cs.c | 6 +- + .../{ => intersil}/hostap/hostap_download.c | 0 + .../net/wireless/{ => intersil}/hostap/hostap_hw.c | 0 + .../wireless/{ => intersil}/hostap/hostap_info.c | 0 + .../wireless/{ => intersil}/hostap/hostap_ioctl.c | 0 + .../wireless/{ => intersil}/hostap/hostap_main.c | 0 + .../wireless/{ => intersil}/hostap/hostap_pci.c | 0 + .../wireless/{ => intersil}/hostap/hostap_plx.c | 0 + .../wireless/{ => intersil}/hostap/hostap_proc.c | 0 + .../wireless/{ => intersil}/hostap/hostap_wlan.h | 0 + .../net/wireless/{ => intersil}/orinoco/Kconfig | 0 + .../net/wireless/{ => intersil}/orinoco/Makefile | 0 + .../net/wireless/{ => intersil}/orinoco/airport.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/cfg.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/cfg.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/fw.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/fw.h | 0 + .../net/wireless/{ => intersil}/orinoco/hermes.c | 0 + .../net/wireless/{ => intersil}/orinoco/hermes.h | 0 + .../wireless/{ => intersil}/orinoco/hermes_dld.c | 0 + .../wireless/{ => intersil}/orinoco/hermes_dld.h | 0 + .../wireless/{ => intersil}/orinoco/hermes_rid.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/hw.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/hw.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/main.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/main.h | 0 + drivers/net/wireless/{ => intersil}/orinoco/mic.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/mic.h | 0 + .../net/wireless/{ => intersil}/orinoco/orinoco.h | 0 + .../wireless/{ => intersil}/orinoco/orinoco_cs.c | 0 + .../{ => intersil}/orinoco/orinoco_nortel.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_pci.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_pci.h | 0 + .../wireless/{ => intersil}/orinoco/orinoco_plx.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_tmd.c | 0 + .../wireless/{ => intersil}/orinoco/orinoco_usb.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/scan.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/scan.h | 0 + .../wireless/{ => intersil}/orinoco/spectrum_cs.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/wext.c | 0 + drivers/net/wireless/{ => intersil}/orinoco/wext.h | 0 + drivers/net/wireless/{ => intersil}/p54/Kconfig | 0 + drivers/net/wireless/{ => intersil}/p54/Makefile | 0 + drivers/net/wireless/{ => intersil}/p54/eeprom.c | 0 + drivers/net/wireless/{ => intersil}/p54/eeprom.h | 0 + drivers/net/wireless/{ => intersil}/p54/fwio.c | 0 + drivers/net/wireless/{ => intersil}/p54/led.c | 0 + drivers/net/wireless/{ => intersil}/p54/lmac.h | 0 + drivers/net/wireless/{ => intersil}/p54/main.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54.h | 0 + drivers/net/wireless/{ => intersil}/p54/p54pci.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54pci.h | 0 + drivers/net/wireless/{ => intersil}/p54/p54spi.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54spi.h | 0 + .../wireless/{ => intersil}/p54/p54spi_eeprom.h | 0 + drivers/net/wireless/{ => intersil}/p54/p54usb.c | 0 + drivers/net/wireless/{ => intersil}/p54/p54usb.h | 0 + drivers/net/wireless/{ => intersil}/p54/txrx.c | 0 + .../net/wireless/{ => intersil}/prism54/Makefile | 0 + .../net/wireless/{ => intersil}/prism54/isl_38xx.c | 0 + .../net/wireless/{ => intersil}/prism54/isl_38xx.h | 0 + .../wireless/{ => intersil}/prism54/isl_ioctl.c | 2 +- + .../wireless/{ => intersil}/prism54/isl_ioctl.h | 0 + .../net/wireless/{ => intersil}/prism54/isl_oid.h | 0 + .../wireless/{ => intersil}/prism54/islpci_dev.c | 4 +- + .../wireless/{ => intersil}/prism54/islpci_dev.h | 0 + .../wireless/{ => intersil}/prism54/islpci_eth.c | 5 +- + .../wireless/{ => intersil}/prism54/islpci_eth.h | 0 + .../{ => intersil}/prism54/islpci_hotplug.c | 0 + .../wireless/{ => intersil}/prism54/islpci_mgt.c | 4 +- + .../wireless/{ => intersil}/prism54/islpci_mgt.h | 0 + .../net/wireless/{ => intersil}/prism54/oid_mgt.c | 10 +- + .../net/wireless/{ => intersil}/prism54/oid_mgt.h | 0 + .../wireless/{ => intersil}/prism54/prismcompat.h | 0 + drivers/net/wireless/mac80211_hwsim.c | 95 +- + drivers/net/wireless/marvell/Kconfig | 27 + + drivers/net/wireless/marvell/Makefile | 6 + + .../net/wireless/{ => marvell}/libertas/Kconfig | 0 + .../net/wireless/{ => marvell}/libertas/LICENSE | 0 + .../net/wireless/{ => marvell}/libertas/Makefile | 0 + drivers/net/wireless/{ => marvell}/libertas/README | 0 + drivers/net/wireless/{ => marvell}/libertas/cfg.c | 3 +- + drivers/net/wireless/{ => marvell}/libertas/cfg.h | 0 + drivers/net/wireless/{ => marvell}/libertas/cmd.c | 0 + drivers/net/wireless/{ => marvell}/libertas/cmd.h | 0 + .../net/wireless/{ => marvell}/libertas/cmdresp.c | 0 + .../net/wireless/{ => marvell}/libertas/debugfs.c | 0 + .../net/wireless/{ => marvell}/libertas/debugfs.h | 0 + drivers/net/wireless/{ => marvell}/libertas/decl.h | 0 + drivers/net/wireless/{ => marvell}/libertas/defs.h | 0 + drivers/net/wireless/{ => marvell}/libertas/dev.h | 0 + .../net/wireless/{ => marvell}/libertas/ethtool.c | 0 + .../net/wireless/{ => marvell}/libertas/firmware.c | 0 + drivers/net/wireless/{ => marvell}/libertas/host.h | 0 + .../net/wireless/{ => marvell}/libertas/if_cs.c | 0 + .../net/wireless/{ => marvell}/libertas/if_sdio.c | 2 +- + .../net/wireless/{ => marvell}/libertas/if_sdio.h | 0 + .../net/wireless/{ => marvell}/libertas/if_spi.c | 0 + .../net/wireless/{ => marvell}/libertas/if_spi.h | 0 + .../net/wireless/{ => marvell}/libertas/if_usb.c | 0 + .../net/wireless/{ => marvell}/libertas/if_usb.h | 0 + drivers/net/wireless/{ => marvell}/libertas/main.c | 0 + drivers/net/wireless/{ => marvell}/libertas/mesh.c | 0 + drivers/net/wireless/{ => marvell}/libertas/mesh.h | 0 + .../net/wireless/{ => marvell}/libertas/radiotap.h | 0 + drivers/net/wireless/{ => marvell}/libertas/rx.c | 0 + drivers/net/wireless/{ => marvell}/libertas/tx.c | 0 + .../net/wireless/{ => marvell}/libertas/types.h | 0 + drivers/net/wireless/marvell/libertas_tf/Kconfig | 18 + + .../wireless/{ => marvell}/libertas_tf/Makefile | 0 + .../net/wireless/{ => marvell}/libertas_tf/cmd.c | 0 + .../wireless/{ => marvell}/libertas_tf/deb_defs.h | 0 + .../wireless/{ => marvell}/libertas_tf/if_usb.c | 0 + .../wireless/{ => marvell}/libertas_tf/if_usb.h | 0 + .../{ => marvell}/libertas_tf/libertas_tf.h | 0 + .../net/wireless/{ => marvell}/libertas_tf/main.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11ac.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11ac.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11h.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11n.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/11n.h | 0 + .../net/wireless/{ => marvell}/mwifiex/11n_aggr.c | 2 - + .../net/wireless/{ => marvell}/mwifiex/11n_aggr.h | 0 + .../wireless/{ => marvell}/mwifiex/11n_rxreorder.c | 10 + + .../wireless/{ => marvell}/mwifiex/11n_rxreorder.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/Kconfig | 0 + .../net/wireless/{ => marvell}/mwifiex/Makefile | 0 + drivers/net/wireless/{ => marvell}/mwifiex/README | 0 + .../net/wireless/{ => marvell}/mwifiex/cfg80211.c | 62 +- + .../net/wireless/{ => marvell}/mwifiex/cfg80211.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/cfp.c | 6 +- + .../net/wireless/{ => marvell}/mwifiex/cmdevt.c | 4 +- + .../net/wireless/{ => marvell}/mwifiex/debugfs.c | 30 + + drivers/net/wireless/{ => marvell}/mwifiex/decl.h | 6 +- + .../net/wireless/{ => marvell}/mwifiex/ethtool.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/fw.h | 13 +- + drivers/net/wireless/{ => marvell}/mwifiex/ie.c | 2 +- + drivers/net/wireless/{ => marvell}/mwifiex/init.c | 2 +- + drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/join.c | 20 +- + drivers/net/wireless/{ => marvell}/mwifiex/main.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/main.h | 50 +- + drivers/net/wireless/{ => marvell}/mwifiex/pcie.c | 33 +- + drivers/net/wireless/{ => marvell}/mwifiex/pcie.h | 10 +- + drivers/net/wireless/{ => marvell}/mwifiex/scan.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/sdio.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/sdio.h | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_cmd.c | 0 + .../wireless/{ => marvell}/mwifiex/sta_cmdresp.c | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_event.c | 0 + .../net/wireless/{ => marvell}/mwifiex/sta_ioctl.c | 85 +- + .../net/wireless/{ => marvell}/mwifiex/sta_rx.c | 2 +- + .../net/wireless/{ => marvell}/mwifiex/sta_tx.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/tdls.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/txrx.c | 0 + .../net/wireless/{ => marvell}/mwifiex/uap_cmd.c | 6 +- + .../net/wireless/{ => marvell}/mwifiex/uap_event.c | 0 + .../net/wireless/{ => marvell}/mwifiex/uap_txrx.c | 3 +- + drivers/net/wireless/{ => marvell}/mwifiex/usb.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/usb.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/util.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/util.h | 0 + drivers/net/wireless/{ => marvell}/mwifiex/wmm.c | 0 + drivers/net/wireless/{ => marvell}/mwifiex/wmm.h | 0 + drivers/net/wireless/{ => marvell}/mwl8k.c | 0 + drivers/net/wireless/mediatek/Kconfig | 16 +- + drivers/net/wireless/ralink/Kconfig | 16 + + drivers/net/wireless/ralink/Makefile | 1 + + drivers/net/wireless/{ => ralink}/rt2x00/Kconfig | 0 + drivers/net/wireless/{ => ralink}/rt2x00/Makefile | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2400pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2400pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2500usb.c | 5 +- + .../net/wireless/{ => ralink}/rt2x00/rt2500usb.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800lib.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800lib.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800mmio.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800soc.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800usb.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2800usb.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h | 0 + .../wireless/{ => ralink}/rt2x00/rt2x00config.c | 0 + .../wireless/{ => ralink}/rt2x00/rt2x00crypto.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00debug.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00dev.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00dump.h | 0 + .../wireless/{ => ralink}/rt2x00/rt2x00firmware.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00leds.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00lib.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00link.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00mac.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00pci.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00queue.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00reg.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00soc.h | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.c | 0 + .../net/wireless/{ => ralink}/rt2x00/rt2x00usb.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c | 0 + drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h | 0 + drivers/net/wireless/realtek/Kconfig | 18 + + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 23 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 21 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 22 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 23 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 21 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 3 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 11 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/sw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/sw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 9 + + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 8 +- + .../realtek/rtlwifi/rtl8723com/fw_common.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 9 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 + + drivers/net/wireless/rsi/Kconfig | 15 + + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 5 +- + drivers/net/wireless/st/Kconfig | 16 + + drivers/net/wireless/st/Makefile | 1 + + drivers/net/wireless/{ => st}/cw1200/Kconfig | 0 + drivers/net/wireless/{ => st}/cw1200/Makefile | 0 + drivers/net/wireless/{ => st}/cw1200/bh.c | 0 + drivers/net/wireless/{ => st}/cw1200/bh.h | 0 + drivers/net/wireless/{ => st}/cw1200/cw1200.h | 0 + drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c | 0 + drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c | 0 + drivers/net/wireless/{ => st}/cw1200/debug.c | 0 + drivers/net/wireless/{ => st}/cw1200/debug.h | 0 + drivers/net/wireless/{ => st}/cw1200/fwio.c | 0 + drivers/net/wireless/{ => st}/cw1200/fwio.h | 0 + drivers/net/wireless/{ => st}/cw1200/hwbus.h | 0 + drivers/net/wireless/{ => st}/cw1200/hwio.c | 0 + drivers/net/wireless/{ => st}/cw1200/hwio.h | 0 + drivers/net/wireless/{ => st}/cw1200/main.c | 0 + drivers/net/wireless/{ => st}/cw1200/pm.c | 0 + drivers/net/wireless/{ => st}/cw1200/pm.h | 0 + drivers/net/wireless/{ => st}/cw1200/queue.c | 0 + drivers/net/wireless/{ => st}/cw1200/queue.h | 0 + drivers/net/wireless/{ => st}/cw1200/scan.c | 0 + drivers/net/wireless/{ => st}/cw1200/scan.h | 0 + drivers/net/wireless/{ => st}/cw1200/sta.c | 6 - + drivers/net/wireless/{ => st}/cw1200/sta.h | 0 + drivers/net/wireless/{ => st}/cw1200/txrx.c | 0 + drivers/net/wireless/{ => st}/cw1200/txrx.h | 0 + drivers/net/wireless/{ => st}/cw1200/wsm.c | 0 + drivers/net/wireless/{ => st}/cw1200/wsm.h | 0 + drivers/net/wireless/ti/Kconfig | 18 +- + drivers/net/wireless/ti/wl1251/Kconfig | 2 +- + drivers/net/wireless/ti/wl12xx/conf.h | 233 ++ + drivers/net/wireless/ti/wl12xx/main.c | 116 +- + drivers/net/wireless/ti/wl18xx/conf.h | 90 + + drivers/net/wireless/ti/wl18xx/event.c | 2 + + drivers/net/wireless/ti/wl18xx/event.h | 1 + + drivers/net/wireless/ti/wl18xx/main.c | 147 +- + drivers/net/wireless/ti/wlcore/Kconfig | 2 +- + drivers/net/wireless/ti/wlcore/acx.c | 4 +- + drivers/net/wireless/ti/wlcore/acx.h | 2 +- + drivers/net/wireless/ti/wlcore/cmd.h | 1 - + drivers/net/wireless/ti/wlcore/conf.h | 237 +- + drivers/net/wireless/ti/wlcore/debugfs.c | 60 + + drivers/net/wireless/ti/wlcore/event.c | 82 + + drivers/net/wireless/ti/wlcore/event.h | 9 + + drivers/net/wireless/ti/wlcore/io.c | 11 +- + drivers/net/wireless/ti/wlcore/io.h | 14 +- + drivers/net/wireless/ti/wlcore/main.c | 96 +- + drivers/net/wireless/ti/wlcore/rx.c | 1 - + drivers/net/wireless/ti/wlcore/spi.c | 10 +- + drivers/net/wireless/ti/wlcore/sysfs.c | 26 - + drivers/net/wireless/ti/wlcore/wlcore.h | 3 - + drivers/net/wireless/zydas/Kconfig | 35 + + drivers/net/wireless/zydas/Makefile | 3 + + drivers/net/wireless/{ => zydas}/zd1201.c | 0 + drivers/net/wireless/{ => zydas}/zd1201.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/Makefile | 0 + .../net/wireless/{ => zydas}/zd1211rw/zd_chip.c | 0 + .../net/wireless/{ => zydas}/zd1211rw/zd_chip.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c | 0 + .../wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c | 0 + drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h | 0 + drivers/nfc/Kconfig | 1 + + drivers/nfc/Makefile | 1 + + drivers/nfc/fdp/i2c.c | 12 +- + drivers/nfc/microread/i2c.c | 2 - + drivers/nfc/nfcsim.c | 10 +- + drivers/nfc/nxp-nci/i2c.c | 34 +- + drivers/nfc/pn544/i2c.c | 46 +- + drivers/nfc/s3fwrn5/core.c | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 2 +- + drivers/nfc/s3fwrn5/s3fwrn5.h | 4 +- + drivers/nfc/st-nci/Kconfig | 18 +- + drivers/nfc/st-nci/i2c.c | 80 +- + drivers/nfc/st-nci/ndlc.c | 1 - + drivers/nfc/st-nci/se.c | 3 +- + drivers/nfc/st-nci/spi.c | 81 +- + drivers/nfc/st21nfca/Kconfig | 13 +- + drivers/nfc/st21nfca/i2c.c | 80 +- + drivers/nfc/st21nfca/se.c | 5 +- + drivers/nfc/st95hf/Kconfig | 10 + + drivers/nfc/st95hf/Makefile | 6 + + drivers/nfc/st95hf/core.c | 1273 +++++++ + drivers/nfc/st95hf/spi.c | 167 + + drivers/nfc/st95hf/spi.h | 64 + + drivers/nfc/trf7970a.c | 8 +- + drivers/of/of_mdio.c | 89 +- + drivers/s390/net/ctcm_main.c | 7 +- + drivers/s390/net/qeth_core.h | 4 + + drivers/s390/net/qeth_core_main.c | 11 +- + drivers/s390/net/qeth_l2_main.c | 1 + + drivers/s390/net/qeth_l3_main.c | 40 +- + drivers/scsi/fcoe/fcoe.c | 2 +- + drivers/ssb/Kconfig | 2 +- + drivers/ssb/host_soc.c | 37 + + drivers/ssb/main.c | 5 +- + drivers/ssb/ssb_private.h | 3 + + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 +- + drivers/staging/netlogic/xlr_net.c | 7 +- + drivers/staging/octeon/ethernet-rgmii.c | 6 +- + fs/kernfs/dir.c | 46 + + include/linux/brcmphy.h | 1 + + include/linux/cgroup-defs.h | 126 + + include/linux/cgroup.h | 66 +- + include/linux/etherdevice.h | 3 + + include/linux/filter.h | 41 +- + include/linux/hashtable.h | 4 + + include/linux/hdlc.h | 2 +- + include/linux/if_pppox.h | 1 - + include/linux/if_team.h | 1 + + include/linux/if_vlan.h | 4 +- + include/linux/inet_diag.h | 9 + + include/linux/kernfs.h | 12 + + include/linux/mdio.h | 78 + + include/linux/mlx4/driver.h | 5 + + include/linux/mlx5/device.h | 64 +- + include/linux/mlx5/driver.h | 30 + + include/linux/mlx5/fs.h | 93 + + include/linux/mlx5/mlx5_ifc.h | 208 +- + include/linux/mlx5/vport.h | 37 +- + include/linux/mroute.h | 76 +- + include/linux/netdev_features.h | 14 +- + include/linux/netdevice.h | 278 +- + include/linux/netfilter/nf_conntrack_sctp.h | 13 + + include/linux/netfilter/nfnetlink.h | 12 +- + include/linux/netlink.h | 2 + + include/linux/phy.h | 80 +- + include/linux/pim.h | 5 + + include/linux/platform_data/microread.h | 2 +- + include/linux/qed/qed_if.h | 17 + + include/linux/rhashtable.h | 82 + + include/linux/sh_eth.h | 2 +- + include/linux/skbuff.h | 171 +- + include/linux/soc/ti/knav_dma.h | 22 +- + include/linux/sock_diag.h | 2 + + include/linux/ssb/ssb.h | 10 +- + include/linux/wait.h | 21 + + include/net/6lowpan.h | 10 +- + include/net/addrconf.h | 3 +- + include/net/bluetooth/bluetooth.h | 25 +- + include/net/bluetooth/hci.h | 4 +- + include/net/bluetooth/hci_core.h | 62 +- + include/net/bluetooth/hci_mon.h | 2 + + include/net/bluetooth/hci_sock.h | 1 + + include/net/bluetooth/mgmt.h | 15 + + include/net/bonding.h | 39 +- + include/net/busy_poll.h | 45 +- + include/net/cfg80211.h | 10 +- + include/net/checksum.h | 3 +- + include/net/cls_cgroup.h | 11 +- + include/net/dsa.h | 20 +- + include/net/genetlink.h | 2 + + include/net/geneve.h | 8 + + include/net/ieee802154_netdev.h | 2 +- + include/net/ila.h | 18 + + include/net/inet_frag.h | 1 - + include/net/inet_sock.h | 14 + + include/net/ip6_tunnel.h | 19 +- + include/net/ip_fib.h | 3 +- + include/net/ip_tunnels.h | 28 +- + include/net/ipv6.h | 15 + + include/net/l3mdev.h | 23 + + include/net/mac80211.h | 56 + + include/net/net_namespace.h | 3 + + include/net/netfilter/ipv6/nf_defrag_ipv6.h | 3 +- + include/net/netfilter/nf_conntrack_timeout.h | 2 +- + include/net/netfilter/nf_dup_netdev.h | 6 + + include/net/netfilter/nf_tables.h | 45 +- + include/net/netfilter/nf_tables_core.h | 10 + + include/net/netfilter/nft_meta.h | 3 + + include/net/netns/ipv4.h | 7 + + include/net/netns/sctp.h | 7 + + include/net/netprio_cgroup.h | 16 +- + include/net/nfc/nfc.h | 1 + + include/net/request_sock.h | 2 +- + include/net/sch_generic.h | 9 + + include/net/sctp/sctp.h | 32 +- + include/net/sctp/structs.h | 10 +- + include/net/sock.h | 44 +- + include/net/sock_reuseport.h | 28 + + include/net/switchdev.h | 15 + + include/net/tcp.h | 29 +- + include/net/udp.h | 7 +- + include/net/udp_tunnel.h | 8 +- + include/net/vxlan.h | 2 +- + include/trace/events/fib6.h | 76 + + include/uapi/asm-generic/socket.h | 3 + + include/uapi/linux/bpf.h | 1 + + include/uapi/linux/ethtool.h | 3 + + include/uapi/linux/if_link.h | 4 + + include/uapi/linux/ila.h | 22 + + include/uapi/linux/in6.h | 1 + + include/uapi/linux/mroute.h | 59 +- + include/uapi/linux/netfilter/ipset/ip_set_bitmap.h | 2 + + include/uapi/linux/netfilter/ipset/ip_set_hash.h | 2 + + include/uapi/linux/netfilter/ipset/ip_set_list.h | 2 + + include/uapi/linux/netfilter/nf_conntrack_sctp.h | 12 +- + .../linux/netfilter/nf_conntrack_tuple_common.h | 3 + + include/uapi/linux/netfilter/nf_tables.h | 91 + + include/uapi/linux/netfilter/nfnetlink.h | 2 + + include/uapi/linux/netfilter/xt_HMARK.h | 1 + + include/uapi/linux/netfilter/xt_RATEEST.h | 1 + + include/uapi/linux/netfilter/xt_TEE.h | 2 + + include/uapi/linux/netfilter/xt_TPROXY.h | 1 + + include/uapi/linux/netfilter/xt_cgroup.h | 15 +- + include/uapi/linux/netfilter/xt_hashlimit.h | 1 + + include/uapi/linux/netfilter/xt_ipvs.h | 1 + + include/uapi/linux/netfilter/xt_mac.h | 2 + + include/uapi/linux/netfilter/xt_osf.h | 2 + + include/uapi/linux/netfilter/xt_physdev.h | 2 +- + include/uapi/linux/netfilter/xt_policy.h | 2 + + include/uapi/linux/netfilter/xt_rateest.h | 1 + + include/uapi/linux/netfilter/xt_recent.h | 1 + + include/uapi/linux/netfilter/xt_sctp.h | 12 +- + include/uapi/linux/netfilter_arp/arp_tables.h | 1 + + include/uapi/linux/netfilter_bridge.h | 1 + + include/uapi/linux/netfilter_bridge/ebt_arp.h | 1 + + include/uapi/linux/netfilter_bridge/ebt_arpreply.h | 2 + + include/uapi/linux/netfilter_bridge/ebt_ip6.h | 1 + + include/uapi/linux/netfilter_bridge/ebt_nat.h | 2 + + include/uapi/linux/netfilter_bridge/ebtables.h | 6 +- + include/uapi/linux/netfilter_ipv4/ip_tables.h | 1 + + include/uapi/linux/netfilter_ipv6/ip6_tables.h | 1 + + include/uapi/linux/netfilter_ipv6/ip6t_rt.h | 2 +- + include/uapi/linux/nl80211.h | 11 +- + include/uapi/linux/rtnetlink.h | 1 + + include/uapi/linux/sock_diag.h | 1 + + include/uapi/linux/sockios.h | 2 +- + kernel/bpf/core.c | 4 - + kernel/bpf/hashtab.c | 64 +- + kernel/bpf/inode.c | 20 + + kernel/bpf/syscall.c | 22 +- + kernel/cgroup.c | 126 +- + lib/Kconfig.debug | 23 + + lib/Makefile | 1 + + lib/netdev-notifier-error-inject.c | 55 + + lib/rhashtable.c | 3 - + lib/test_bpf.c | 120 + + lib/test_rhashtable.c | 76 +- + net/6lowpan/6lowpan_i.h | 28 + + net/6lowpan/Kconfig | 47 +- + net/6lowpan/Makefile | 9 + + net/6lowpan/core.c | 59 +- + net/6lowpan/debugfs.c | 53 + + net/6lowpan/nhc_ghc_ext_dest.c | 27 + + net/6lowpan/nhc_ghc_ext_frag.c | 28 + + net/6lowpan/nhc_ghc_ext_hop.c | 27 + + net/6lowpan/nhc_ghc_ext_route.c | 27 + + net/6lowpan/nhc_ghc_icmpv6.c | 27 + + net/6lowpan/nhc_ghc_udp.c | 27 + + net/8021q/vlan_dev.c | 11 +- + net/Kconfig | 6 + + net/atm/common.c | 4 +- + net/atm/mpc.h | 4 +- + net/atm/mpoa_caches.c | 4 +- + net/batman-adv/bat_iv_ogm.c | 74 +- + net/batman-adv/bridge_loop_avoidance.c | 55 +- + net/batman-adv/bridge_loop_avoidance.h | 2 + + net/batman-adv/debugfs.c | 9 + + net/batman-adv/fragmentation.c | 8 +- + net/batman-adv/gateway_common.c | 117 +- + net/batman-adv/hard-interface.c | 11 +- + net/batman-adv/main.c | 23 +- + net/batman-adv/main.h | 4 +- + net/batman-adv/network-coding.c | 4 +- + net/batman-adv/originator.c | 195 ++ + net/batman-adv/originator.h | 7 + + net/batman-adv/packet.h | 3 +- + net/batman-adv/routing.c | 6 +- + net/batman-adv/send.c | 3 +- + net/batman-adv/sysfs.c | 16 +- + net/batman-adv/translation-table.c | 24 +- + net/batman-adv/types.h | 66 +- + net/bluetooth/6lowpan.c | 8 +- + net/bluetooth/af_bluetooth.c | 26 +- + net/bluetooth/bnep/core.c | 7 +- + net/bluetooth/cmtp/capi.c | 8 +- + net/bluetooth/cmtp/core.c | 3 +- + net/bluetooth/hci_conn.c | 123 +- + net/bluetooth/hci_core.c | 647 +--- + net/bluetooth/hci_event.c | 14 +- + net/bluetooth/hci_request.c | 1928 ++++++++++- + net/bluetooth/hci_request.h | 53 +- + net/bluetooth/hci_sock.c | 209 +- + net/bluetooth/l2cap_core.c | 19 +- + net/bluetooth/mgmt.c | 1923 ++--------- + net/bluetooth/rfcomm/core.c | 46 +- + net/bridge/br_fdb.c | 1 + + net/bridge/br_if.c | 13 +- + net/bridge/br_mdb.c | 23 + + net/bridge/br_stp.c | 2 + + net/bridge/br_stp_if.c | 1 + + net/bridge/br_sysfs_br.c | 3 +- + net/bridge/br_vlan.c | 31 +- + net/bridge/netfilter/ebt_ip6.c | 4 +- + net/bridge/netfilter/ebt_log.c | 9 +- + net/bridge/netfilter/ebt_stp.c | 2 +- + net/bridge/netfilter/ebt_vlan.c | 15 +- + net/bridge/netfilter/ebtable_filter.c | 2 +- + net/bridge/netfilter/ebtable_nat.c | 2 +- + net/bridge/netfilter/ebtables.c | 139 +- + net/bridge/netfilter/nf_tables_bridge.c | 2 +- + net/bridge/netfilter/nft_meta_bridge.c | 1 + + net/core/Makefile | 2 +- + net/core/datagram.c | 77 +- + net/core/dev.c | 332 +- + net/core/ethtool.c | 85 +- + net/core/filter.c | 198 +- + net/core/net-sysfs.c | 5 +- + net/core/net-traces.c | 4 + + net/core/netclassid_cgroup.c | 11 +- + net/core/netprio_cgroup.c | 19 +- + net/core/pktgen.c | 4 +- + net/core/rtnetlink.c | 18 +- + net/core/scm.c | 4 +- + net/core/sock.c | 54 +- + net/core/sock_diag.c | 23 +- + net/core/sock_reuseport.c | 251 ++ + net/core/stream.c | 2 +- + net/dccp/output.c | 2 +- + net/dsa/dsa.c | 80 +- + net/dsa/dsa_priv.h | 1 + + net/dsa/slave.c | 33 +- + net/ethernet/eth.c | 31 + + net/ieee802154/6lowpan/core.c | 6 +- + net/ieee802154/6lowpan/reassembly.c | 1 - + net/ipv4/Kconfig | 13 + + net/ipv4/inet_diag.c | 65 +- + net/ipv4/inet_fragment.c | 10 +- + net/ipv4/ip_fragment.c | 1 - + net/ipv4/ip_gre.c | 8 +- + net/ipv4/ip_output.c | 3 +- + net/ipv4/ip_tunnel.c | 8 +- + net/ipv4/ip_tunnel_core.c | 26 +- + net/ipv4/ip_vti.c | 3 +- + net/ipv4/ipconfig.c | 62 +- + net/ipv4/ipip.c | 1 - + net/ipv4/ipmr.c | 741 ++-- + net/ipv4/netfilter/arp_tables.c | 6 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 2 +- + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 3 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 22 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 1 - + net/ipv4/netfilter/nf_tables_arp.c | 2 +- + net/ipv4/netfilter/nf_tables_ipv4.c | 2 +- + net/ipv4/ping.c | 2 + + net/ipv4/syncookies.c | 4 +- + net/ipv4/sysctl_net_ipv4.c | 53 +- + net/ipv4/tcp.c | 50 +- + net/ipv4/tcp_diag.c | 19 + + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_ipv4.c | 27 +- + net/ipv4/tcp_minisocks.c | 7 +- + net/ipv4/tcp_output.c | 14 +- + net/ipv4/tcp_timer.c | 3 - + net/ipv4/udp.c | 144 +- + net/ipv4/udp_diag.c | 4 +- + net/ipv4/udp_offload.c | 5 +- + net/ipv4/udp_tunnel.c | 11 +- + net/ipv6/Kconfig | 1 + + net/ipv6/Makefile | 2 +- + net/ipv6/addrconf.c | 72 +- + net/ipv6/ila/Makefile | 7 + + net/ipv6/ila/ila.h | 48 + + net/ipv6/ila/ila_common.c | 103 + + net/ipv6/{ila.c => ila/ila_lwt.c} | 83 +- + net/ipv6/ila/ila_xlat.c | 680 ++++ + net/ipv6/inet6_connection_sock.c | 4 +- + net/ipv6/ip6_gre.c | 1 - + net/ipv6/ip6_output.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 167 +- + net/ipv6/netfilter/nf_defrag_ipv6_hooks.c | 20 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 3 +- + net/ipv6/netfilter/nf_reject_ipv6.c | 1 - + net/ipv6/netfilter/nf_tables_ipv6.c | 2 +- + net/ipv6/raw.c | 20 +- + net/ipv6/reassembly.c | 1 - + net/ipv6/route.c | 20 + + net/ipv6/sit.c | 7 +- + net/ipv6/syncookies.c | 4 +- + net/ipv6/tcp_ipv6.c | 17 +- + net/ipv6/udp.c | 70 +- + net/iucv/af_iucv.c | 24 +- + net/l2tp/l2tp_ppp.c | 19 +- + net/mac80211/cfg.c | 532 +-- + net/mac80211/debugfs.c | 1 + + net/mac80211/ibss.c | 1 + + net/mac80211/ieee80211_i.h | 25 +- + net/mac80211/key.c | 56 +- + net/mac80211/main.c | 4 +- + net/mac80211/mesh_pathtbl.c | 4 +- + net/mac80211/mlme.c | 6 +- + net/mac80211/offchannel.c | 829 ++++- + net/mac80211/rx.c | 3 +- + net/mac80211/sta_info.c | 163 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/trace.h | 25 + + net/mac80211/tx.c | 2 +- + net/mac80211/util.c | 7 +- + net/mac802154/driver-ops.h | 3 - + net/mac802154/mac_cmd.c | 2 +- + net/mac802154/rx.c | 3 +- + net/mac802154/tx.c | 9 - + net/mpls/af_mpls.c | 185 +- + net/mpls/internal.h | 2 + + net/mpls/mpls_iptunnel.c | 2 +- + net/netfilter/Kconfig | 22 + + net/netfilter/Makefile | 9 +- + net/netfilter/ipset/ip_set_core.c | 108 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- + net/netfilter/nf_conntrack_expect.c | 7 + + net/netfilter/nf_conntrack_ftp.c | 17 +- + net/netfilter/nf_conntrack_irc.c | 7 +- + net/netfilter/nf_conntrack_netlink.c | 96 +- + net/netfilter/nf_conntrack_sane.c | 19 +- + net/netfilter/nf_conntrack_sip.c | 5 +- + net/netfilter/nf_conntrack_standalone.c | 7 + + net/netfilter/nf_conntrack_tftp.c | 7 +- + net/netfilter/nf_conntrack_timeout.c | 2 +- + net/netfilter/nf_dup_netdev.c | 40 + + net/netfilter/nf_tables_api.c | 176 +- + net/netfilter/nf_tables_core.c | 62 +- + net/netfilter/nf_tables_inet.c | 2 +- + net/netfilter/nf_tables_netdev.c | 47 +- + net/netfilter/nf_tables_trace.c | 275 ++ + net/netfilter/nfnetlink.c | 26 +- + net/netfilter/nfnetlink_acct.c | 21 +- + net/netfilter/nfnetlink_cthelper.c | 18 +- + net/netfilter/nfnetlink_cttimeout.c | 120 +- + net/netfilter/nfnetlink_log.c | 40 +- + net/netfilter/nfnetlink_queue.c | 123 +- + net/netfilter/nft_byteorder.c | 23 + + net/netfilter/nft_compat.c | 6 +- + net/netfilter/nft_ct.c | 38 + + net/netfilter/nft_dup_netdev.c | 97 + + net/netfilter/nft_fwd_netdev.c | 98 + + net/netfilter/nft_limit.c | 16 +- + net/netfilter/nft_meta.c | 56 +- + net/netfilter/nft_payload.c | 135 +- + net/netfilter/x_tables.c | 12 + + net/netfilter/xt_CT.c | 2 +- + net/netfilter/xt_cgroup.c | 108 +- + net/netfilter/xt_osf.c | 7 +- + net/netlink/af_netlink.c | 4 + + net/netlink/genetlink.c | 16 + + net/nfc/core.c | 13 + + net/nfc/digital_core.c | 3 +- + net/nfc/nci/core.c | 6 +- + net/nfc/nci/hci.c | 2 +- + net/nfc/netlink.c | 37 + + net/nfc/nfc.h | 1 + + net/openvswitch/conntrack.c | 25 +- + net/openvswitch/vport-netdev.c | 2 +- + net/rds/page.c | 31 +- + net/rfkill/rfkill-gpio.c | 4 - + net/rxrpc/af_rxrpc.c | 2 +- + net/sched/cls_bpf.c | 6 +- + net/sctp/associola.c | 5 + + net/sctp/endpointola.c | 52 +- + net/sctp/input.c | 187 +- + net/sctp/output.c | 2 +- + net/sctp/proc.c | 316 +- + net/sctp/protocol.c | 41 +- + net/sctp/sm_sideeffect.c | 7 +- + net/sctp/socket.c | 8 +- + net/sctp/sysctl.c | 7 + + net/switchdev/switchdev.c | 14 + + net/tipc/bcast.c | 126 +- + net/tipc/bcast.h | 1 + + net/tipc/bearer.c | 140 +- + net/tipc/bearer.h | 8 +- + net/tipc/core.h | 5 + + net/tipc/discover.c | 38 +- + net/tipc/link.c | 626 ++-- + net/tipc/link.h | 175 +- + net/tipc/name_distr.c | 68 +- + net/tipc/name_distr.h | 1 - + net/tipc/name_table.c | 5 +- + net/tipc/netlink.c | 8 +- + net/tipc/netlink_compat.c | 8 +- + net/tipc/node.c | 875 ++++- + net/tipc/node.h | 127 +- + net/tipc/socket.c | 4 +- + net/tipc/udp_media.c | 17 +- + net/unix/af_unix.c | 43 +- + net/vmw_vsock/vmci_transport.h | 2 +- + net/vmw_vsock/vmci_transport_notify.c | 2 +- + net/vmw_vsock/vmci_transport_notify.h | 5 +- + net/vmw_vsock/vmci_transport_notify_qstate.c | 2 +- + net/wireless/core.h | 7 - + net/wireless/lib80211_crypt_ccmp.c | 4 +- + net/wireless/lib80211_crypt_tkip.c | 4 +- + net/wireless/nl80211.c | 62 +- + net/wireless/ocb.c | 3 + + net/wireless/rdev-ops.h | 51 + + net/wireless/reg.c | 98 +- + net/wireless/trace.h | 103 + + net/wireless/util.c | 121 - + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/reuseport_bpf.c | 514 +++ + 1704 files changed, 67327 insertions(+), 24741 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-net-qmi + create mode 100644 Documentation/devicetree/bindings/net/ieee802154/adf7242.txt + create mode 100644 Documentation/devicetree/bindings/net/nfc/st95hf.txt + delete mode 100644 drivers/isdn/sc/Kconfig + delete mode 100644 drivers/isdn/sc/Makefile + delete mode 100644 drivers/isdn/sc/card.h + delete mode 100644 drivers/isdn/sc/command.c + delete mode 100644 drivers/isdn/sc/event.c + delete mode 100644 drivers/isdn/sc/hardware.h + delete mode 100644 drivers/isdn/sc/includes.h + delete mode 100644 drivers/isdn/sc/init.c + delete mode 100644 drivers/isdn/sc/interrupt.c + delete mode 100644 drivers/isdn/sc/ioctl.c + delete mode 100644 drivers/isdn/sc/message.c + delete mode 100644 drivers/isdn/sc/message.h + delete mode 100644 drivers/isdn/sc/packet.c + delete mode 100644 drivers/isdn/sc/scioc.h + delete mode 100644 drivers/isdn/sc/shmem.c + delete mode 100644 drivers/isdn/sc/timer.c + create mode 100644 drivers/net/ethernet/freescale/fman/Kconfig + create mode 100644 drivers/net/ethernet/freescale/fman/Makefile + create mode 100644 drivers/net/ethernet/freescale/fman/fman.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_dtsec.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman_dtsec.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_mac.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_memac.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman_memac.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_muram.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman_muram.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_port.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman_port.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_sp.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman_sp.h + create mode 100644 drivers/net/ethernet/freescale/fman/fman_tgec.c + create mode 100644 drivers/net/ethernet/freescale/fman/fman_tgec.h + create mode 100644 drivers/net/ethernet/freescale/fman/mac.c + create mode 100644 drivers/net/ethernet/freescale/fman/mac.h + create mode 100644 drivers/net/ethernet/ibm/ibmvnic.c + create mode 100644 drivers/net/ethernet/ibm/ibmvnic.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_clock.c + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_flow_table.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_fs.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/eswitch.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/eswitch.h + delete mode 100644 drivers/net/ethernet/mellanox/mlx5/core/flow_table.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c + rename include/linux/mlx5/flow_table.h => drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h (57%) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_core.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fs_core.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/sriov.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c + create mode 100644 drivers/net/ethernet/netronome/Kconfig + create mode 100644 drivers/net/ethernet/netronome/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/Makefile + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_common.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_debugfs.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_netvf_main.c + create mode 100644 drivers/net/ieee802154/adf7242.c + create mode 100644 drivers/net/phy/mdio_device.c + create mode 100644 drivers/net/wireless/admtek/Kconfig + create mode 100644 drivers/net/wireless/admtek/Makefile + rename drivers/net/wireless/{ => admtek}/adm8211.c (100%) + rename drivers/net/wireless/{ => admtek}/adm8211.h (100%) + create mode 100644 drivers/net/wireless/ath/ath9k/rng.c + create mode 100644 drivers/net/wireless/atmel/Kconfig + create mode 100644 drivers/net/wireless/atmel/Makefile + rename drivers/net/wireless/{ => atmel}/at76c50x-usb.c (100%) + rename drivers/net/wireless/{ => atmel}/at76c50x-usb.h (100%) + rename drivers/net/wireless/{ => atmel}/atmel.c (100%) + rename drivers/net/wireless/{ => atmel}/atmel.h (100%) + rename drivers/net/wireless/{ => atmel}/atmel_cs.c (100%) + rename drivers/net/wireless/{ => atmel}/atmel_pci.c (100%) + create mode 100644 drivers/net/wireless/broadcom/Kconfig + create mode 100644 drivers/net/wireless/broadcom/Makefile + rename drivers/net/wireless/{ => broadcom}/b43/Kconfig (100%) + rename drivers/net/wireless/{ => broadcom}/b43/Makefile (100%) + rename drivers/net/wireless/{ => broadcom}/b43/b43.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/bus.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/bus.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/debugfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/debugfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/dma.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/dma.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/leds.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/leds.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/lo.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/lo.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/main.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/main.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_a.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_a.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ac.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_common.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_common.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_g.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_g.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_ht.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_lp.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_n.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/phy_n.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/pio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/pio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/ppr.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/ppr.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2055.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2056.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2057.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/radio_2059.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/rfkill.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/rfkill.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sdio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sdio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sysfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/sysfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_lpphy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_nphy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_ht.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/tables_phy_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/wa.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/wa.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43/xmit.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43/xmit.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/Kconfig (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/Makefile (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/b43legacy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/debugfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/dma.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/ilt.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/leds.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/main.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/main.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/phy.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/pio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/radio.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/rfkill.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/sysfs.h (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.c (100%) + rename drivers/net/wireless/{ => broadcom}/b43legacy/xmit.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/Kconfig (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/Makefile (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/Makefile (93%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.c (98%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcdc.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bcmsdh.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/btcoex.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/bus.h (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.c (94%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/cfg80211.h (80%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.c (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/chip.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.c (91%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/common.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/commonring.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.c (92%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/core.h (96%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.c (97%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/debug.h (98%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.c (97%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/feature.h (94%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.c (91%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/firmware.h (53%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/flowring.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.c (98%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fweh.h (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.c (93%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwil_types.h (86%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.c (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/fwsignal.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.c (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/msgbuf.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/of.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.c (98%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/p2p.h (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.c (89%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/pcie.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/proto.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.c (94%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/sdio.h (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/tracepoint.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.c (95%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/usb.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmfmac/vendor.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/Makefile (88%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/aiutils.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ampdu.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/antsel.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_msg.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_brcmsmac_tx.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/brcms_trace_events.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.c (99%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/channel.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/d11.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/debug.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/dma.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/led.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/mac80211_if.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/main.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_cmn.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_hal.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_int.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_n.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_qmath.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phy_radio.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phyreg_n.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_lcn.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy/phytbl_n.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/phy_shim.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pmu.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/pub.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/rate.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/scb.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/stf.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/types.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmsmac/ucode_loader.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/Makefile (89%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/d11.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/brcmutil/utils.c (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcm_hw_ids.h (95%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_d11.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_utils.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/brcmu_wifi.h (96%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/chipcommon.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/defs.h (100%) + rename drivers/net/wireless/{ => broadcom}/brcm80211/include/soc.h (100%) + create mode 100644 drivers/net/wireless/cisco/Kconfig + create mode 100644 drivers/net/wireless/cisco/Makefile + rename drivers/net/wireless/{ => cisco}/airo.c (99%) + rename drivers/net/wireless/{ => cisco}/airo.h (100%) + rename drivers/net/wireless/{ => cisco}/airo_cs.c (100%) + create mode 100644 drivers/net/wireless/intel/Kconfig + create mode 100644 drivers/net/wireless/intel/Makefile + rename drivers/net/wireless/{ => intel}/ipw2x00/Kconfig (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/Makefile (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2100.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/ipw2200.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw.h (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_geo.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_module.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_rx.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_tx.c (100%) + rename drivers/net/wireless/{ => intel}/ipw2x00/libipw_wx.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945-debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945-mac.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945-rs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/3945.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-calib.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-mac.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965-rs.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/4965.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/Kconfig (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/Makefile (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/commands.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/common.c (99%) + rename drivers/net/wireless/{ => intel}/iwlegacy/common.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/csr.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/debug.c (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/iwl-spectrum.h (100%) + rename drivers/net/wireless/{ => intel}/iwlegacy/prph.h (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/Kconfig (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/Makefile (91%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/Makefile (100%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/agn.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/calib.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/commands.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/debugfs.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/dev.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/devices.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.c (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/led.h (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/lib.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/mac80211.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/main.c (94%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/power.h (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rs.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rx.c (91%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/rxon.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/scan.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/sta.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tt.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/tx.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/dvm/ucode.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-1000.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-2000.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-5000.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-6000.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-7000.c (96%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-8000.c (95%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-9000.c + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-agn-hw.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-config.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-csr.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-debug.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-data.h (84%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-io.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-iwlwifi.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-msg.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace-ucode.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.c (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-devtrace.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-drv.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-parse.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-eeprom-read.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fh.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-error-dump.h (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw-file.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-fw.h (96%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.c (86%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-io.h (93%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-modparams.h (92%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-notif-wait.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-nvm-parse.h (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-op-mode.h (95%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-phy-db.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-prph.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-scd.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.c (63%) + rename drivers/net/wireless/{ => intel}/iwlwifi/iwl-trans.h (84%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/Makefile (74%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/binding.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex.c (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/coex_legacy.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/constants.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/d3.c (90%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs-vif.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.c (95%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/debugfs.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-coex.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-d3.h (96%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-mac.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-power.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rs.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-rx.h (71%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-scan.h (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-sta.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-stats.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tof.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api-tx.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw-api.h (98%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/fw.c (90%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/led.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac-ctxt.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mac80211.c (88%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/mvm.h (95%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/nvm.c (94%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/offloading.c (83%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/ops.c (84%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/phy-ctxt.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/power.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/quota.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rs.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/rx.c (95%) + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/scan.c (95%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sf.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.c (95%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/sta.h (96%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tdls.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/testmode.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.c (97%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/time-event.h (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tof.h (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tt.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/tx.c (92%) + rename drivers/net/wireless/{ => intel}/iwlwifi/mvm/utils.c (99%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/drv.c (96%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/internal.h (96%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/rx.c (98%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/trans.c (91%) + rename drivers/net/wireless/{ => intel}/iwlwifi/pcie/tx.c (85%) + create mode 100644 drivers/net/wireless/intersil/Kconfig + create mode 100644 drivers/net/wireless/intersil/Makefile + rename drivers/net/wireless/{ => intersil}/hostap/Kconfig (100%) + rename drivers/net/wireless/{ => intersil}/hostap/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_rx.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_80211_tx.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_ap.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_common.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_config.h (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_cs.c (99%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_download.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_hw.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_info.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_ioctl.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_main.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_pci.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_plx.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_proc.c (100%) + rename drivers/net/wireless/{ => intersil}/hostap/hostap_wlan.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/Kconfig (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/airport.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/cfg.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/cfg.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/fw.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/fw.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes_dld.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hermes_rid.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hw.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/hw.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/main.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/main.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/mic.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/mic.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_cs.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_nortel.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_pci.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_plx.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_tmd.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/orinoco_usb.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/scan.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/scan.h (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/spectrum_cs.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/wext.c (100%) + rename drivers/net/wireless/{ => intersil}/orinoco/wext.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/Kconfig (100%) + rename drivers/net/wireless/{ => intersil}/p54/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/p54/eeprom.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/eeprom.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/fwio.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/led.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/lmac.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/main.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54pci.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54pci.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54spi.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54spi.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54spi_eeprom.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54usb.c (100%) + rename drivers/net/wireless/{ => intersil}/p54/p54usb.h (100%) + rename drivers/net/wireless/{ => intersil}/p54/txrx.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/Makefile (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_38xx.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.c (99%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_ioctl.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/isl_oid.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.c (99%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_dev.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.c (99%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_eth.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_hotplug.c (100%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.c (99%) + rename drivers/net/wireless/{ => intersil}/prism54/islpci_mgt.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.c (99%) + rename drivers/net/wireless/{ => intersil}/prism54/oid_mgt.h (100%) + rename drivers/net/wireless/{ => intersil}/prism54/prismcompat.h (100%) + create mode 100644 drivers/net/wireless/marvell/Kconfig + create mode 100644 drivers/net/wireless/marvell/Makefile + rename drivers/net/wireless/{ => marvell}/libertas/Kconfig (100%) + rename drivers/net/wireless/{ => marvell}/libertas/LICENSE (100%) + rename drivers/net/wireless/{ => marvell}/libertas/Makefile (100%) + rename drivers/net/wireless/{ => marvell}/libertas/README (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cfg.c (99%) + rename drivers/net/wireless/{ => marvell}/libertas/cfg.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cmd.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/cmdresp.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/debugfs.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/debugfs.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/decl.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/defs.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/dev.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/ethtool.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/firmware.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/host.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_cs.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.c (99%) + rename drivers/net/wireless/{ => marvell}/libertas/if_sdio.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_spi.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_spi.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_usb.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/if_usb.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/main.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/mesh.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/mesh.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/radiotap.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas/rx.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/tx.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas/types.h (100%) + create mode 100644 drivers/net/wireless/marvell/libertas_tf/Kconfig + rename drivers/net/wireless/{ => marvell}/libertas_tf/Makefile (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/deb_defs.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.c (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/if_usb.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/libertas_tf.h (100%) + rename drivers/net/wireless/{ => marvell}/libertas_tf/main.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11ac.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11h.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_aggr.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.c (98%) + rename drivers/net/wireless/{ => marvell}/mwifiex/11n_rxreorder.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/Kconfig (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/Makefile (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/README (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.c (98%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cfg80211.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cfp.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/cmdevt.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/debugfs.c (97%) + rename drivers/net/wireless/{ => marvell}/mwifiex/decl.h (98%) + rename drivers/net/wireless/{ => marvell}/mwifiex/ethtool.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/fw.h (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/ie.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/init.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/ioctl.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/join.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/main.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/main.h (97%) + rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/pcie.h (98%) + rename drivers/net/wireless/{ => marvell}/mwifiex/scan.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sdio.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmd.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_cmdresp.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_event.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_ioctl.c (96%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_rx.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/sta_tx.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/tdls.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/txrx.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/uap_cmd.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/uap_event.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/uap_txrx.c (99%) + rename drivers/net/wireless/{ => marvell}/mwifiex/usb.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/usb.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/util.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/util.h (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.c (100%) + rename drivers/net/wireless/{ => marvell}/mwifiex/wmm.h (100%) + rename drivers/net/wireless/{ => marvell}/mwl8k.c (100%) + create mode 100644 drivers/net/wireless/ralink/Kconfig + create mode 100644 drivers/net/wireless/ralink/Makefile + rename drivers/net/wireless/{ => ralink}/rt2x00/Kconfig (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/Makefile (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2400pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.c (99%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2500usb.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800lib.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800mmio.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800soc.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2800usb.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00config.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00crypto.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00debug.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dev.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00dump.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00firmware.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00leds.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00lib.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00link.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mac.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00mmio.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00queue.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00reg.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00soc.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt2x00usb.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt61pci.h (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.c (100%) + rename drivers/net/wireless/{ => ralink}/rt2x00/rt73usb.h (100%) + create mode 100644 drivers/net/wireless/realtek/Kconfig + create mode 100644 drivers/net/wireless/st/Kconfig + create mode 100644 drivers/net/wireless/st/Makefile + rename drivers/net/wireless/{ => st}/cw1200/Kconfig (100%) + rename drivers/net/wireless/{ => st}/cw1200/Makefile (100%) + rename drivers/net/wireless/{ => st}/cw1200/bh.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/bh.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/cw1200.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/cw1200_sdio.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/cw1200_spi.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/debug.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/debug.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/fwio.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/fwio.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/hwbus.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/hwio.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/hwio.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/main.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/pm.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/pm.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/queue.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/queue.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/scan.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/scan.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/sta.c (99%) + rename drivers/net/wireless/{ => st}/cw1200/sta.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/txrx.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/txrx.h (100%) + rename drivers/net/wireless/{ => st}/cw1200/wsm.c (100%) + rename drivers/net/wireless/{ => st}/cw1200/wsm.h (100%) + create mode 100644 drivers/net/wireless/zydas/Kconfig + create mode 100644 drivers/net/wireless/zydas/Makefile + rename drivers/net/wireless/{ => zydas}/zd1201.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1201.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/Kconfig (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/Makefile (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_chip.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_def.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_mac.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf.h (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al2230.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_al7230b.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_rf2959.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_rf_uw2453.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.c (100%) + rename drivers/net/wireless/{ => zydas}/zd1211rw/zd_usb.h (100%) + create mode 100644 drivers/nfc/st95hf/Kconfig + create mode 100644 drivers/nfc/st95hf/Makefile + create mode 100644 drivers/nfc/st95hf/core.c + create mode 100644 drivers/nfc/st95hf/spi.c + create mode 100644 drivers/nfc/st95hf/spi.h + create mode 100644 include/linux/mlx5/fs.h + create mode 100644 include/linux/netfilter/nf_conntrack_sctp.h + create mode 100644 include/net/ila.h + create mode 100644 include/net/netfilter/nf_dup_netdev.h + create mode 100644 include/net/sock_reuseport.h + create mode 100644 include/trace/events/fib6.h + create mode 100644 lib/netdev-notifier-error-inject.c + create mode 100644 net/6lowpan/6lowpan_i.h + create mode 100644 net/6lowpan/debugfs.c + create mode 100644 net/6lowpan/nhc_ghc_ext_dest.c + create mode 100644 net/6lowpan/nhc_ghc_ext_frag.c + create mode 100644 net/6lowpan/nhc_ghc_ext_hop.c + create mode 100644 net/6lowpan/nhc_ghc_ext_route.c + create mode 100644 net/6lowpan/nhc_ghc_icmpv6.c + create mode 100644 net/6lowpan/nhc_ghc_udp.c + create mode 100644 net/core/sock_reuseport.c + create mode 100644 net/ipv6/ila/Makefile + create mode 100644 net/ipv6/ila/ila.h + create mode 100644 net/ipv6/ila/ila_common.c + rename net/ipv6/{ila.c => ila/ila_lwt.c} (62%) + create mode 100644 net/ipv6/ila/ila_xlat.c + create mode 100644 net/netfilter/nf_dup_netdev.c + create mode 100644 net/netfilter/nf_tables_trace.c + create mode 100644 net/netfilter/nft_dup_netdev.c + create mode 100644 net/netfilter/nft_fwd_netdev.c + create mode 100644 tools/testing/selftests/net/reuseport_bpf.c +$ git am -3 ../patches/0001-phy-micrel-fix-up-for-phy-Add-an-mdio_device-structu.patch +Applying: phy: micrel: fix up for "phy: Add an mdio_device structure" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/phy/micrel.c +$ git add -A . +$ git commit -v -a --amend +[master ba76775ca7f6] Merge remote-tracking branch 'net-next/master' + Date: Mon Jan 11 13:14:03 2016 +1100 +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 (4c50a8ce2b63 netfilter: ipvs: avoid unused variable warning) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_app.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging wireless-drivers-next/master (42e0ed0d454c brcmfmac: Do not handle link downs for ibss.) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath10k/pci.c | 38 +- + drivers/net/wireless/ath/ath9k/eeprom.c | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/init.c | 1 + + drivers/net/wireless/ath/wcn36xx/dxe.c | 43 +- + drivers/net/wireless/ath/wil6210/interrupt.c | 8 +- + drivers/net/wireless/ath/wil6210/main.c | 2 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 30 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 12 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 1 + + drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 3 +- + drivers/net/wireless/ath/wil6210/wil_platform.c | 3 +- + drivers/net/wireless/ath/wil6210/wil_platform.h | 38 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 12 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 12 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 1173 ++++++++++++-------- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 29 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 72 ++ + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 56 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 136 ++- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 76 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 16 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwil.h | 1 + + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 36 + + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 9 +- + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 4 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 18 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 51 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.h | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 5 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 11 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 3 + + drivers/net/wireless/intel/iwlwifi/iwl-7000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-8000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-9000.c | 2 +- + .../net/wireless/intel/iwlwifi/iwl-fw-error-dump.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h | 12 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 6 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 115 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h | 60 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c | 62 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 49 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 55 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 2 - + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 106 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 12 + + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 17 +- + drivers/net/wireless/marvell/mwifiex/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 32 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 15 +- + drivers/net/wireless/ralink/rt2x00/rt2x00pci.c | 2 + + 64 files changed, 1783 insertions(+), 823 deletions(-) +Merging bluetooth/master (8e69d71996e4 Bluetooth: add LED trigger for indicating HCI is powered up) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + include/net/bluetooth/hci_core.h | 3 ++ + net/bluetooth/Kconfig | 9 +++++ + net/bluetooth/Makefile | 1 + + net/bluetooth/hci_core.c | 8 ++++ + net/bluetooth/leds.c | 80 ++++++++++++++++++++++++++++++++++++++++ + net/bluetooth/leds.h | 18 +++++++++ + 6 files changed, 119 insertions(+) + create mode 100644 net/bluetooth/leds.c + create mode 100644 net/bluetooth/leds.h +Merging mac80211-next/master (e6a0cd058e1b mac80211: Don't buffer non-bufferable MMPDUs) +$ git merge mac80211-next/master +Auto-merging net/wireless/reg.c +Auto-merging net/mac80211/vht.c +Auto-merging net/mac80211/util.c +Auto-merging net/mac80211/rx.c +Auto-merging net/mac80211/mlme.c +Auto-merging net/mac80211/ieee80211_i.h +Auto-merging net/mac80211/cfg.c +Auto-merging drivers/net/wireless/ti/wlcore/main.c +Auto-merging drivers/net/wireless/st/cw1200/sta.h +Auto-merging drivers/net/wireless/st/cw1200/sta.c +Auto-merging drivers/net/wireless/realtek/rtlwifi/core.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2800lib.h +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2800lib.c +Auto-merging drivers/net/wireless/marvell/mwl8k.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c +Auto-merging drivers/net/wireless/intel/iwlegacy/4965.h +Auto-merging drivers/net/wireless/intel/iwlegacy/4965-mac.c +Auto-merging drivers/net/wireless/broadcom/brcm80211/brcmsmac/mac80211_if.c +Auto-merging drivers/net/wireless/ath/ath9k/main.c +Auto-merging drivers/net/wireless/ath/ath9k/htc_drv_main.c +Auto-merging drivers/net/wireless/ath/ath10k/mac.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/ath/ath10k/mac.c | 7 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 7 +- + drivers/net/wireless/ath/ath9k/main.c | 8 +- + drivers/net/wireless/ath/carl9170/main.c | 8 +- + drivers/net/wireless/ath/wcn36xx/main.c | 8 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 8 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 8 +- + drivers/net/wireless/intel/iwlegacy/4965.h | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 9 +- + drivers/net/wireless/mac80211_hwsim.c | 13 +- + drivers/net/wireless/marvell/mwl8k.c | 10 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 4 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.c | 6 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 8 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 19 +-- + drivers/net/wireless/st/cw1200/sta.c | 4 +- + drivers/net/wireless/st/cw1200/sta.h | 4 +- + drivers/net/wireless/ti/wlcore/main.c | 8 +- + include/linux/ieee80211.h | 26 ++++ + include/net/mac80211.h | 98 ++++++++++-- + net/mac80211/agg-rx.c | 49 +++++- + net/mac80211/agg-tx.c | 53 ++++--- + net/mac80211/cfg.c | 29 ++++ + net/mac80211/chan.c | 2 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/driver-ops.c | 10 +- + net/mac80211/driver-ops.h | 4 +- + net/mac80211/ht.c | 5 + + net/mac80211/ibss.c | 10 +- + net/mac80211/ieee80211_i.h | 12 +- + net/mac80211/iface.c | 10 ++ + net/mac80211/main.c | 6 + + net/mac80211/mesh.c | 9 +- + net/mac80211/mlme.c | 51 ++----- + net/mac80211/offchannel.c | 16 +- + net/mac80211/rx.c | 13 +- + net/mac80211/scan.c | 8 + + net/mac80211/sta_info.c | 11 +- + net/mac80211/sta_info.h | 21 +-- + net/mac80211/status.c | 5 + + net/mac80211/trace.h | 43 +++--- + net/mac80211/util.c | 73 +++++---- + net/mac80211/vht.c | 42 ++++++ + net/wireless/Kconfig | 13 -- + net/wireless/core.c | 10 ++ + net/wireless/mlme.c | 3 +- + net/wireless/reg.c | 167 ++++++++------------- + 50 files changed, 593 insertions(+), 374 deletions(-) +Merging rdma/for-next (59caaed7a72a IB/iser: Support the remote invalidation exception) +$ git merge rdma/for-next +Resolved 'drivers/net/ethernet/mellanox/mlx5/core/vport.c' using previous resolution. +Resolved 'include/linux/mlx5/device.h' using previous resolution. +Resolved 'include/linux/mlx5/mlx5_ifc.h' using previous resolution. +Resolved 'include/linux/mlx5/vport.h' using previous resolution. +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging lib/irq_poll.c +Auto-merging lib/Makefile +Auto-merging include/linux/mlx5/vport.h +CONFLICT (content): Merge conflict in include/linux/mlx5/vport.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +CONFLICT (content): Merge conflict in include/linux/mlx5/device.h +Removing include/linux/blk-iopoll.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/vport.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/mellanox/mlx5/core/vport.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Removing drivers/infiniband/ulp/isert/isert_proto.h +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_verbs.c +Auto-merging drivers/infiniband/hw/ocrdma/ocrdma_main.c +Auto-merging drivers/infiniband/hw/mlx4/srq.c +Auto-merging drivers/infiniband/core/cma.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b8dce8ce9f2c] Merge remote-tracking branch 'rdma/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-rdma_cm | 22 + + Documentation/ABI/testing/sysfs-class-infiniband | 16 + + Documentation/infiniband/core_locking.txt | 2 - + Documentation/kernel-per-CPU-kthreads.txt | 2 +- + MAINTAINERS | 32 +- + block/Makefile | 2 +- + drivers/infiniband/Kconfig | 10 + + drivers/infiniband/core/Makefile | 4 +- + drivers/infiniband/core/addr.c | 185 +++++--- + drivers/infiniband/core/cache.c | 344 ++++++++++----- + drivers/infiniband/core/cm.c | 43 +- + drivers/infiniband/core/cma.c | 267 ++++++++++-- + drivers/infiniband/core/cma_configfs.c | 322 ++++++++++++++ + drivers/infiniband/core/core_priv.h | 45 ++ + drivers/infiniband/core/cq.c | 209 +++++++++ + drivers/infiniband/core/device.c | 51 ++- + drivers/infiniband/core/fmr_pool.c | 20 +- + drivers/infiniband/core/mad.c | 18 + + drivers/infiniband/core/multicast.c | 17 +- + drivers/infiniband/core/roce_gid_mgmt.c | 81 ++-- + drivers/infiniband/core/sa_query.c | 76 +++- + drivers/infiniband/core/sysfs.c | 375 ++++++++++++++-- + drivers/infiniband/core/ud_header.c | 155 ++++++- + drivers/infiniband/core/umem_odp.c | 2 +- + drivers/infiniband/core/uverbs.h | 2 + + drivers/infiniband/core/uverbs_cmd.c | 38 +- + drivers/infiniband/core/uverbs_main.c | 13 +- + drivers/infiniband/core/uverbs_marshall.c | 1 + + drivers/infiniband/core/verbs.c | 229 ++++++---- + drivers/infiniband/hw/cxgb3/iwch_cm.c | 4 +- + drivers/infiniband/hw/cxgb3/iwch_cq.c | 4 - + drivers/infiniband/hw/cxgb3/iwch_mem.c | 102 ----- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 146 ++----- + drivers/infiniband/hw/cxgb3/iwch_provider.h | 15 - + drivers/infiniband/hw/cxgb3/iwch_qp.c | 82 ---- + drivers/infiniband/hw/cxgb4/cq.c | 3 - + drivers/infiniband/hw/cxgb4/device.c | 4 + + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 13 - + drivers/infiniband/hw/cxgb4/mem.c | 251 ----------- + drivers/infiniband/hw/cxgb4/provider.c | 3 - + drivers/infiniband/hw/cxgb4/qp.c | 5 - + drivers/infiniband/hw/cxgb4/t4.h | 7 + + drivers/infiniband/hw/cxgb4/user.h | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 3 - + drivers/infiniband/hw/mlx4/main.c | 1 - + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 - + drivers/infiniband/hw/mlx4/mr.c | 22 - + drivers/infiniband/hw/mlx4/qp.c | 40 +- + drivers/infiniband/hw/mlx4/srq.c | 3 +- + drivers/infiniband/hw/mlx5/ah.c | 32 +- + drivers/infiniband/hw/mlx5/cq.c | 34 +- + drivers/infiniband/hw/mlx5/main.c | 420 ++++++++++++++++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 38 +- + drivers/infiniband/hw/mlx5/qp.c | 96 ++++- + drivers/infiniband/hw/mlx5/user.h | 12 +- + drivers/infiniband/hw/mthca/mthca_cq.c | 3 - + drivers/infiniband/hw/mthca/mthca_provider.c | 84 ---- + drivers/infiniband/hw/mthca/mthca_qp.c | 2 +- + drivers/infiniband/hw/nes/nes_cm.c | 13 +- + drivers/infiniband/hw/nes/nes_cm.h | 2 +- + drivers/infiniband/hw/nes/nes_verbs.c | 216 ++-------- + drivers/infiniband/hw/nes/nes_verbs.h | 4 + + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 2 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 1 - + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 163 ------- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 3 - + drivers/infiniband/hw/qib/qib_mr.c | 51 +-- + drivers/infiniband/hw/qib/qib_verbs.c | 1 - + drivers/infiniband/hw/qib/qib_verbs.h | 4 - + drivers/infiniband/hw/usnic/usnic_debugfs.c | 5 +- + drivers/infiniband/hw/usnic/usnic_ib_qp_grp.c | 4 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 24 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 2 - + drivers/infiniband/hw/usnic/usnic_vnic.c | 54 +-- + drivers/infiniband/ulp/ipoib/ipoib.h | 6 +- + drivers/infiniband/ulp/ipoib/ipoib_cm.c | 21 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 14 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 39 +- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 45 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 13 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 156 +++---- + drivers/infiniband/ulp/iser/iser_initiator.c | 323 +++++++++----- + drivers/infiniband/ulp/iser/iser_memory.c | 179 +++----- + drivers/infiniband/ulp/iser/iser_verbs.c | 337 +++++---------- + drivers/infiniband/ulp/isert/ib_isert.c | 118 ++--- + drivers/infiniband/ulp/isert/ib_isert.h | 41 +- + drivers/infiniband/ulp/isert/isert_proto.h | 47 -- + drivers/infiniband/ulp/srp/ib_srp.c | 205 ++++----- + drivers/infiniband/ulp/srp/ib_srp.h | 7 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 442 ++++++------------- + drivers/infiniband/ulp/srpt/ib_srpt.h | 51 +-- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 57 ++- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 103 +++++ + drivers/scsi/Kconfig | 1 + + drivers/scsi/be2iscsi/Kconfig | 1 + + drivers/scsi/be2iscsi/be.h | 4 +- + drivers/scsi/be2iscsi/be_iscsi.c | 4 +- + drivers/scsi/be2iscsi/be_main.c | 20 +- + drivers/scsi/ipr.c | 25 +- + drivers/scsi/ipr.h | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 21 +- + drivers/staging/rdma/amso1100/c2_cq.c | 3 - + drivers/staging/rdma/amso1100/c2_provider.c | 72 +--- + drivers/staging/rdma/ehca/ehca_classes.h | 5 +- + drivers/staging/rdma/ehca/ehca_iverbs.h | 16 - + drivers/staging/rdma/ehca/ehca_main.c | 4 - + drivers/staging/rdma/ehca/ehca_mrmw.c | 477 ++------------------- + drivers/staging/rdma/ehca/ehca_mrmw.h | 5 - + drivers/staging/rdma/ehca/ehca_reqs.c | 1 - + drivers/staging/rdma/hfi1/mr.c | 51 +-- + drivers/staging/rdma/hfi1/verbs.c | 1 - + drivers/staging/rdma/hfi1/verbs.h | 4 - + drivers/staging/rdma/ipath/ipath_mr.c | 55 --- + drivers/staging/rdma/ipath/ipath_verbs.c | 1 - + drivers/staging/rdma/ipath/ipath_verbs.h | 4 - + include/linux/blk-iopoll.h | 46 -- + include/linux/interrupt.h | 2 +- + include/linux/irq_poll.h | 25 ++ + include/linux/mlx5/device.h | 28 +- + include/linux/mlx5/driver.h | 12 +- + include/linux/mlx5/mlx5_ifc.h | 47 +- + include/linux/mlx5/qp.h | 24 +- + include/linux/mlx5/vport.h | 8 + + include/rdma/ib_addr.h | 11 +- + include/rdma/ib_cache.h | 4 + + include/rdma/ib_pack.h | 45 +- + include/rdma/ib_pma.h | 1 + + include/rdma/ib_sa.h | 3 + + include/rdma/ib_verbs.h | 355 ++++++++------- + include/scsi/iser.h | 78 ++++ + include/trace/events/irq.h | 2 +- + lib/Kconfig | 5 + + lib/Makefile | 1 + + block/blk-iopoll.c => lib/irq_poll.c | 108 +++-- + net/rds/ib.c | 34 +- + net/rds/iw.c | 23 +- + net/sunrpc/xprtrdma/frwr_ops.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 48 +-- + net/sunrpc/xprtrdma/verbs.c | 24 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 1 - + tools/lib/traceevent/event-parse.c | 2 +- + tools/perf/util/trace-event-parse.c | 2 +- + 142 files changed, 4516 insertions(+), 3978 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-rdma_cm + create mode 100644 Documentation/ABI/testing/sysfs-class-infiniband + create mode 100644 drivers/infiniband/core/cma_configfs.c + create mode 100644 drivers/infiniband/core/cq.c + delete mode 100644 drivers/infiniband/ulp/isert/isert_proto.h + delete mode 100644 include/linux/blk-iopoll.h + create mode 100644 include/linux/irq_poll.h + create mode 100644 include/scsi/iser.h + rename block/blk-iopoll.c => lib/irq_poll.c (55%) +$ git am -3 ../patches/0001-fixup-Merge-remote-tracking-branch-gerrit-ib-next-in.patch +Applying: fixup! Merge remote-tracking branch 'gerrit/ib-next' into HEAD +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/mellanox/mlx5/core/vport.c +$ git add -A . +$ git commit -v -a --amend +[master 60b651a28bcc] Merge remote-tracking branch 'rdma/for-next' + Date: Mon Jan 11 13:51:10 2016 +1100 +Merging mtd/master (a32d5b726ff8 mtd: spi-nor: fix stm_is_locked_sr() parameters) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (9146cbd52b11 mtd: jz4780_nand: replace if/else blocks with switch/case) +$ git merge l2-mtd/master +Auto-merging arch/sh/boards/mach-migor/setup.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/mtdnand.tmpl | 35 +- + .../devicetree/bindings/mtd/brcm,brcmnand.txt | 32 ++ + .../bindings/mtd/ingenic,jz4780-nand.txt | 86 ++++ + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 56 ++- + .../devicetree/bindings/mtd/mtk-quadspi.txt | 41 ++ + .../devicetree/bindings/mtd/partition.txt | 2 + + Documentation/mtd/nand_ecc.txt | 58 +-- + arch/arm/mach-ixp4xx/ixdp425-setup.c | 4 +- + arch/blackfin/mach-bf537/boards/stamp.c | 2 +- + arch/blackfin/mach-bf561/boards/acvilon.c | 2 +- + arch/cris/arch-v32/drivers/mach-a3/nandflash.c | 8 +- + arch/cris/arch-v32/drivers/mach-fs/nandflash.c | 8 +- + arch/mips/alchemy/devboards/db1200.c | 2 +- + arch/mips/alchemy/devboards/db1300.c | 2 +- + arch/mips/alchemy/devboards/db1550.c | 2 +- + arch/mips/pnx833x/common/platform.c | 2 +- + arch/mips/rb532/devices.c | 2 +- + arch/sh/boards/mach-migor/setup.c | 2 +- + drivers/mtd/Kconfig | 2 +- + drivers/mtd/afs.c | 82 ++-- + drivers/mtd/ar7part.c | 18 +- + drivers/mtd/bcm47xxpart.c | 18 +- + drivers/mtd/bcm63xxpart.c | 18 +- + drivers/mtd/chips/Kconfig | 4 + + drivers/mtd/chips/cfi_cmdset_0001.c | 8 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 6 +- + drivers/mtd/cmdlinepart.c | 3 +- + drivers/mtd/devices/m25p80.c | 44 +- + drivers/mtd/devices/mtd_dataflash.c | 5 +- + drivers/mtd/devices/spear_smi.c | 6 +- + drivers/mtd/devices/st_spi_fsm.c | 5 +- + drivers/mtd/ftl.c | 8 +- + drivers/mtd/maps/lantiq-flash.c | 5 +- + drivers/mtd/maps/physmap_of.c | 6 +- + drivers/mtd/mtdcore.c | 40 +- + drivers/mtd/mtdcore.h | 7 +- + drivers/mtd/mtdpart.c | 133 ++++-- + drivers/mtd/nand/Kconfig | 11 +- + drivers/mtd/nand/Makefile | 1 + + drivers/mtd/nand/ams-delta.c | 26 +- + drivers/mtd/nand/atmel_nand.c | 134 +++--- + drivers/mtd/nand/au1550nd.c | 40 +- + drivers/mtd/nand/bcm47xxnflash/bcm47xxnflash.h | 1 - + drivers/mtd/nand/bcm47xxnflash/main.c | 16 +- + drivers/mtd/nand/bcm47xxnflash/ops_bcm4706.c | 34 +- + drivers/mtd/nand/bf5xx_nand.c | 45 +- + drivers/mtd/nand/brcmnand/Makefile | 1 + + drivers/mtd/nand/brcmnand/bcm6368_nand.c | 142 ++++++ + drivers/mtd/nand/brcmnand/brcmnand.c | 166 ++++--- + drivers/mtd/nand/cafe_nand.c | 43 +- + drivers/mtd/nand/cmx270_nand.c | 23 +- + drivers/mtd/nand/cs553x_nand.c | 34 +- + drivers/mtd/nand/davinci_nand.c | 60 ++- + drivers/mtd/nand/denali.c | 75 ++-- + drivers/mtd/nand/denali.h | 1 - + drivers/mtd/nand/diskonchip.c | 189 ++++---- + drivers/mtd/nand/docg4.c | 102 +++-- + drivers/mtd/nand/fsl_elbc_nand.c | 64 +-- + drivers/mtd/nand/fsl_ifc_nand.c | 74 ++-- + drivers/mtd/nand/fsl_upm.c | 35 +- + drivers/mtd/nand/fsmc_nand.c | 69 ++- + drivers/mtd/nand/gpio.c | 26 +- + drivers/mtd/nand/gpmi-nand/gpmi-lib.c | 2 +- + drivers/mtd/nand/gpmi-nand/gpmi-nand.c | 71 ++- + drivers/mtd/nand/gpmi-nand/gpmi-nand.h | 1 - + drivers/mtd/nand/hisi504_nand.c | 53 ++- + drivers/mtd/nand/jz4740_nand.c | 37 +- + drivers/mtd/nand/jz4780_bch.c | 381 ++++++++++++++++ + drivers/mtd/nand/jz4780_bch.h | 43 ++ + drivers/mtd/nand/jz4780_nand.c | 428 ++++++++++++++++++ + drivers/mtd/nand/lpc32xx_mlc.c | 40 +- + drivers/mtd/nand/lpc32xx_slc.c | 49 +-- + drivers/mtd/nand/mpc5121_nfc.c | 57 ++- + drivers/mtd/nand/mxc_nand.c | 88 ++-- + drivers/mtd/nand/nand_base.c | 157 ++++--- + drivers/mtd/nand/nand_bbt.c | 32 +- + drivers/mtd/nand/nand_bch.c | 6 +- + drivers/mtd/nand/nand_ecc.c | 6 +- + drivers/mtd/nand/nandsim.c | 41 +- + drivers/mtd/nand/ndfc.c | 55 ++- + drivers/mtd/nand/nuc900_nand.c | 40 +- + drivers/mtd/nand/omap2.c | 92 ++-- + drivers/mtd/nand/omap_elm.c | 2 +- + drivers/mtd/nand/orion_nand.c | 19 +- + drivers/mtd/nand/pasemi_nand.c | 21 +- + drivers/mtd/nand/plat_nand.c | 18 +- + drivers/mtd/nand/pxa3xx_nand.c | 169 ++++--- + drivers/mtd/nand/r852.c | 46 +- + drivers/mtd/nand/r852.h | 1 - + drivers/mtd/nand/s3c2410.c | 31 +- + drivers/mtd/nand/sh_flctl.c | 20 +- + drivers/mtd/nand/sharpsl.c | 23 +- + drivers/mtd/nand/sm_common.c | 2 +- + drivers/mtd/nand/socrates_nand.c | 30 +- + drivers/mtd/nand/sunxi_nand.c | 50 +-- + drivers/mtd/nand/tmio_nand.c | 13 +- + drivers/mtd/nand/txx9ndfmc.c | 25 +- + drivers/mtd/nand/vf610_nfc.c | 23 +- + drivers/mtd/nand/xway_nand.c | 4 +- + drivers/mtd/ofpart.c | 53 ++- + drivers/mtd/onenand/omap2.c | 8 +- + drivers/mtd/redboot.c | 19 +- + drivers/mtd/spi-nor/Kconfig | 7 + + drivers/mtd/spi-nor/Makefile | 1 + + drivers/mtd/spi-nor/fsl-quadspi.c | 14 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 485 +++++++++++++++++++++ + drivers/mtd/spi-nor/nxp-spifi.c | 6 +- + drivers/mtd/spi-nor/spi-nor.c | 77 +++- + drivers/mtd/tests/pagetest.c | 3 +- + drivers/staging/mt29f_spinand/mt29f_spinand.c | 24 +- + fs/jffs2/wbuf.c | 2 +- + include/linux/bcma/bcma_driver_chipcommon.h | 6 +- + include/linux/mtd/map.h | 2 + + include/linux/mtd/mtd.h | 11 + + include/linux/mtd/nand.h | 68 ++- + include/linux/mtd/nand_bch.h | 2 +- + include/linux/mtd/partitions.h | 27 +- + include/linux/mtd/sh_flctl.h | 4 +- + include/linux/mtd/spi-nor.h | 19 +- + 119 files changed, 3450 insertions(+), 1740 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/ingenic,jz4780-nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/mtk-quadspi.txt + create mode 100644 drivers/mtd/nand/brcmnand/bcm6368_nand.c + create mode 100644 drivers/mtd/nand/jz4780_bch.c + create mode 100644 drivers/mtd/nand/jz4780_bch.h + create mode 100644 drivers/mtd/nand/jz4780_nand.c + create mode 100644 drivers/mtd/spi-nor/mtk-quadspi.c +Merging crypto/master (48d627648141 crypto: hifn_795x, picoxcell - use ablkcipher_request_cast) +$ git merge crypto/master +Auto-merging drivers/crypto/vmx/aes_ctr.c +Auto-merging drivers/crypto/vmx/aes_cbc.c +Auto-merging drivers/crypto/qat/qat_common/adf_vf_isr.c +Auto-merging drivers/crypto/qat/qat_common/adf_isr.c +Auto-merging drivers/crypto/qat/qat_common/adf_ctl_drv.c +Auto-merging drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.h +Auto-merging drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.h +Auto-merging crypto/algif_skcipher.c +Auto-merging crypto/algif_aead.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/crypto/rockchip-crypto.txt | 29 + + arch/powerpc/include/asm/icswx.h | 1 + + arch/x86/crypto/ghash-clmulni-intel_glue.c | 26 + + crypto/Makefile | 1 + + crypto/akcipher.c | 34 +- + crypto/algapi.c | 9 +- + crypto/algif_aead.c | 6 +- + crypto/algif_skcipher.c | 10 +- + crypto/asymmetric_keys/signature.c | 2 +- + crypto/chacha20poly1305.c | 8 + + crypto/cryptd.c | 4 +- + crypto/drbg.c | 6 +- + crypto/mcryptd.c | 8 +- + crypto/md5.c | 6 + + crypto/rsa-pkcs1pad.c | 628 +++++++ + crypto/rsa.c | 40 +- + crypto/sha1_generic.c | 7 + + crypto/sha256_generic.c | 16 + + crypto/tcrypt.c | 2 +- + drivers/char/hw_random/core.c | 6 +- + drivers/char/hw_random/omap3-rom-rng.c | 13 +- + drivers/crypto/Kconfig | 18 +- + drivers/crypto/Makefile | 1 + + drivers/crypto/amcc/crypto4xx_core.c | 4 + + drivers/crypto/atmel-aes-regs.h | 10 + + drivers/crypto/atmel-aes.c | 1843 ++++++++++++++------ + drivers/crypto/atmel-sha.c | 3 +- + drivers/crypto/caam/caamhash.c | 26 +- + drivers/crypto/ccp/Kconfig | 2 + + drivers/crypto/ccp/ccp-ops.c | 39 +- + drivers/crypto/ccp/ccp-pci.c | 8 +- + drivers/crypto/ccp/ccp-platform.c | 6 +- + drivers/crypto/hifn_795x.c | 512 +++--- + drivers/crypto/ixp4xx_crypto.c | 6 +- + drivers/crypto/marvell/cipher.c | 8 + + drivers/crypto/marvell/hash.c | 4 + + drivers/crypto/n2_core.c | 50 +- + drivers/crypto/nx/nx-842-powernv.c | 23 +- + drivers/crypto/omap-aes.c | 4 +- + drivers/crypto/omap-des.c | 5 +- + drivers/crypto/padlock-aes.c | 4 +- + drivers/crypto/picoxcell_crypto.c | 56 +- + drivers/crypto/qat/Kconfig | 46 + + drivers/crypto/qat/Makefile | 4 + + drivers/crypto/qat/qat_c3xxx/Makefile | 3 + + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 238 +++ + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h | 83 + + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 335 ++++ + drivers/crypto/qat/qat_c3xxxvf/Makefile | 3 + + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 173 ++ + .../adf_c3xxxvf_hw_data.h} | 31 +- + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 305 ++++ + drivers/crypto/qat/qat_c62x/Makefile | 3 + + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 248 +++ + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h | 84 + + drivers/crypto/qat/qat_c62x/adf_drv.c | 335 ++++ + drivers/crypto/qat/qat_c62xvf/Makefile | 3 + + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 173 ++ + .../adf_drv.h => qat_c62xvf/adf_c62xvf_hw_data.h} | 32 +- + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 305 ++++ + drivers/crypto/qat/qat_common/Makefile | 4 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 16 +- + drivers/crypto/qat/qat_common/adf_accel_engine.c | 9 +- + drivers/crypto/qat/qat_common/adf_admin.c | 4 +- + drivers/crypto/qat/qat_common/adf_aer.c | 4 +- + drivers/crypto/qat/qat_common/adf_cfg_common.h | 8 +- + drivers/crypto/qat/qat_common/adf_common_drv.h | 31 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 19 +- + drivers/crypto/qat/qat_common/adf_dev_mgr.c | 36 +- + drivers/crypto/qat/qat_common/adf_hw_arbiter.c | 8 +- + drivers/crypto/qat/qat_common/adf_init.c | 21 +- + .../qat/{qat_dh895xcc => qat_common}/adf_isr.c | 44 +- + drivers/crypto/qat/qat_common/adf_pf2vf_msg.c | 23 - + drivers/crypto/qat/qat_common/adf_transport.c | 28 +- + .../qat/qat_common/adf_transport_access_macros.h | 5 + + .../crypto/qat/qat_common/adf_transport_internal.h | 2 +- + .../adf_isr.c => qat_common/adf_vf_isr.c} | 64 +- + .../qat/qat_common/icp_qat_fw_loader_handle.h | 10 + + drivers/crypto/qat/qat_common/icp_qat_hal.h | 37 +- + drivers/crypto/qat/qat_common/icp_qat_uclo.h | 165 +- + drivers/crypto/qat/qat_common/qat_crypto.c | 136 +- + drivers/crypto/qat/qat_common/qat_hal.c | 124 +- + drivers/crypto/qat/qat_common/qat_uclo.c | 555 +++++- + drivers/crypto/qat/qat_dh895xcc/Makefile | 4 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 5 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.h | 9 +- + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 103 +- + drivers/crypto/qat/qat_dh895xccvf/Makefile | 4 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 5 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.h | 10 +- + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 96 +- + drivers/crypto/qce/ablkcipher.c | 8 + + drivers/crypto/qce/sha.c | 5 + + drivers/crypto/rockchip/Makefile | 3 + + drivers/crypto/rockchip/rk3288_crypto.c | 394 +++++ + drivers/crypto/rockchip/rk3288_crypto.h | 216 +++ + drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 505 ++++++ + drivers/crypto/sahara.c | 42 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 2 + + drivers/crypto/talitos.c | 124 +- + drivers/crypto/talitos.h | 1 + + drivers/crypto/ux500/Kconfig | 2 + + drivers/crypto/ux500/hash/hash_core.c | 20 +- + drivers/crypto/vmx/aes_cbc.c | 2 +- + drivers/crypto/vmx/aes_ctr.c | 2 +- + include/crypto/aead.h | 1 + + include/crypto/akcipher.h | 10 +- + include/crypto/internal/akcipher.h | 78 + + include/crypto/internal/rsa.h | 2 + + include/crypto/md5.h | 2 + + include/crypto/sha.h | 6 + + lib/842/842_decompress.c | 14 +- + lib/mpi/mpicoder.c | 21 +- + 113 files changed, 7343 insertions(+), 1604 deletions(-) + create mode 100644 Documentation/devicetree/bindings/crypto/rockchip-crypto.txt + create mode 100644 crypto/rsa-pkcs1pad.c + create mode 100644 drivers/crypto/qat/qat_c3xxx/Makefile + create mode 100644 drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c + create mode 100644 drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h + create mode 100644 drivers/crypto/qat/qat_c3xxx/adf_drv.c + create mode 100644 drivers/crypto/qat/qat_c3xxxvf/Makefile + create mode 100644 drivers/crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c + rename drivers/crypto/qat/{qat_dh895xccvf/adf_drv.h => qat_c3xxxvf/adf_c3xxxvf_hw_data.h} (75%) + create mode 100644 drivers/crypto/qat/qat_c3xxxvf/adf_drv.c + create mode 100644 drivers/crypto/qat/qat_c62x/Makefile + create mode 100644 drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c + create mode 100644 drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h + create mode 100644 drivers/crypto/qat/qat_c62x/adf_drv.c + create mode 100644 drivers/crypto/qat/qat_c62xvf/Makefile + create mode 100644 drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c + rename drivers/crypto/qat/{qat_dh895xcc/adf_drv.h => qat_c62xvf/adf_c62xvf_hw_data.h} (75%) + create mode 100644 drivers/crypto/qat/qat_c62xvf/adf_drv.c + rename drivers/crypto/qat/{qat_dh895xcc => qat_common}/adf_isr.c (90%) + rename drivers/crypto/qat/{qat_dh895xccvf/adf_isr.c => qat_common/adf_vf_isr.c} (82%) + create mode 100644 drivers/crypto/rockchip/Makefile + create mode 100644 drivers/crypto/rockchip/rk3288_crypto.c + create mode 100644 drivers/crypto/rockchip/rk3288_crypto.h + create mode 100644 drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c +Merging drm/drm-next (c11b89896351 Merge tag 'omapdrm-4.5-resolved' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux into drm-next) +$ git merge drm/drm-next +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging drivers/pci/quirks.c +Removing drivers/gpu/drm/radeon/radeon_state.c +Removing drivers/gpu/drm/radeon/radeon_mem.c +Removing drivers/gpu/drm/radeon/radeon_irq.c +Removing drivers/gpu/drm/radeon/radeon_cp.c +Removing drivers/gpu/drm/radeon/r600_cp.c +Removing drivers/gpu/drm/radeon/r600_blit.c +Removing drivers/gpu/drm/radeon/r300_cmdbuf.c +Removing drivers/gpu/drm/radeon/drm_buffer.h +Removing drivers/gpu/drm/radeon/drm_buffer.c +Auto-merging drivers/gpu/drm/mgag200/mgag200_mode.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/bridge/dw-hdmi.c +Auto-merging drivers/gpu/drm/bridge/dw-hdmi-ahb-audio.c +Auto-merging drivers/gpu/drm/amd/powerplay/inc/smu8_fusion.h +Auto-merging drivers/gpu/drm/amd/powerplay/inc/cz_ppsmc.h +Auto-merging drivers/gpu/drm/amd/include/amd_acpi.h +Removing drivers/gpu/drm/amd/amdgpu/tonga_ppsmc.h +Removing drivers/gpu/drm/amd/amdgpu/fiji_ppsmc.h +Auto-merging drivers/gpu/drm/Makefile +Auto-merging arch/arm/boot/dts/exynos5800-peach-pi.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d0d163a9e8e9] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/gpu.tmpl | 755 +- + .../bindings/display/etnaviv/etnaviv-drm.txt | 54 + + .../bindings/display/exynos/exynos_dp.txt | 41 +- + .../devicetree/bindings/display/msm/dsi.txt | 12 +- + .../devicetree/bindings/display/msm/mdp.txt | 26 +- + .../bindings/display/panel/boe,tv080wum-nl0.txt | 7 + + .../bindings/display/panel/innolux,g121x1-l03.txt | 7 + + .../bindings/display/panel/kyo,tcg121xglp.txt | 7 + + .../display/panel/panasonic,vvx10f034n00.txt | 20 + + .../display/panel/qiaodian,qd43003c0-40.txt | 7 + + .../bindings/display/panel/sharp,ls043t1le01.txt | 22 + + .../bindings/display/rockchip/rockchip-vop.txt | 1 + + .../devicetree/bindings/media/exynos5-gsc.txt | 4 + + .../devicetree/bindings/vendor-prefixes.txt | 4 + + MAINTAINERS | 9 + + arch/arm/boot/dts/exynos5800-peach-pi.dts | 15 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/gpu/drm/Kconfig | 3 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 138 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 292 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 163 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 233 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 317 + + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h | 33 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 91 +- + drivers/gpu/drm/amd/amdgpu/atombios_dp.c | 96 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 67 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/fiji_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/fiji_ppsmc.h | 182 - + drivers/gpu/drm/amd/amdgpu/fiji_smc.c | 2 +- + .../drm/amd/amdgpu/{fiji_smumgr.h => fiji_smum.h} | 0 + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2987 +++--- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 4 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 176 + + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 129 +- + drivers/gpu/drm/amd/amdgpu/tonga_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/tonga_ppsmc.h | 198 - + drivers/gpu/drm/amd/amdgpu/tonga_smc.c | 2 +- + .../amd/amdgpu/{tonga_smumgr.h => tonga_smum.h} | 0 + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 261 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 149 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 153 +- + .../{amdgpu/amdgpu_acpi.h => include/amd_acpi.h} | 61 +- + drivers/gpu/drm/amd/include/amd_pcie.h | 50 + + drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 141 + + drivers/gpu/drm/amd/include/amd_shared.h | 21 + + .../gpu/drm/amd/include/asic_reg/bif/bif_5_0_d.h | 1 + + .../gpu/drm/amd/include/asic_reg/gca/gfx_8_0_d.h | 13 + + drivers/gpu/drm/amd/include/atombios.h | 79 + + drivers/gpu/drm/amd/include/cgs_common.h | 90 +- + drivers/gpu/drm/amd/powerplay/Kconfig | 6 + + drivers/gpu/drm/amd/powerplay/Makefile | 22 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 634 ++ + drivers/gpu/drm/amd/powerplay/eventmgr/Makefile | 11 + + .../drm/amd/powerplay/eventmgr/eventactionchains.c | 288 + + .../drm/amd/powerplay/eventmgr/eventactionchains.h | 62 + + drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c | 195 + + drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.h | 34 + + .../drm/amd/powerplay/eventmgr/eventmanagement.c | 215 + + .../drm/amd/powerplay/eventmgr/eventmanagement.h | 59 + + drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c | 114 + + .../drm/amd/powerplay/eventmgr/eventsubchains.c | 410 + + .../drm/amd/powerplay/eventmgr/eventsubchains.h | 100 + + .../gpu/drm/amd/powerplay/eventmgr/eventtasks.c | 437 + + .../gpu/drm/amd/powerplay/eventmgr/eventtasks.h | 88 + + drivers/gpu/drm/amd/powerplay/eventmgr/psm.c | 118 + + drivers/gpu/drm/amd/powerplay/eventmgr/psm.h | 38 + + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 15 + + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.c | 252 + + .../drm/amd/powerplay/hwmgr/cz_clockpowergating.h | 37 + + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 1682 +++ + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h | 326 + + .../amd/powerplay/hwmgr/fiji_clockpowergating.c | 114 + + .../amd/powerplay/hwmgr/fiji_clockpowergating.h | 35 + + .../drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h | 105 + + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c | 5117 +++++++++ + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h | 361 + + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c | 553 + + .../gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h | 66 + + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c | 687 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h | 62 + + .../gpu/drm/amd/powerplay/hwmgr/functiontables.c | 154 + + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 320 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 560 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h | 105 + + drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c | 76 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 1207 +++ + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 246 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h | 617 ++ + drivers/gpu/drm/amd/powerplay/hwmgr/pppcielanes.c | 64 + + drivers/gpu/drm/amd/powerplay/hwmgr/pppcielanes.h | 31 + + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 1679 +++ + .../gpu/drm/amd/powerplay/hwmgr/processpptables.h | 47 + + .../amd/powerplay/hwmgr/tonga_clockpowergating.c | 350 + + .../amd/powerplay/hwmgr/tonga_clockpowergating.h | 36 + + .../drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h | 107 + + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c | 6069 +++++++++++ + drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h | 408 + + .../gpu/drm/amd/powerplay/hwmgr/tonga_powertune.h | 66 + + .../gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h | 406 + + .../amd/powerplay/hwmgr/tonga_processpptables.c | 1142 ++ + .../amd/powerplay/hwmgr/tonga_processpptables.h | 35 + + .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c | 590 ++ + .../gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h | 61 + + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 299 + + .../drm/amd/{amdgpu => powerplay/inc}/cz_ppsmc.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/eventmanager.h | 109 + + drivers/gpu/drm/amd/powerplay/inc/eventmgr.h | 125 + + drivers/gpu/drm/amd/powerplay/inc/fiji_ppsmc.h | 412 + + drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h | 10299 +++++++++++++++++++ + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 383 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 799 ++ + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 200 + + drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h | 28 + + drivers/gpu/drm/amd/powerplay/inc/pp_asicblocks.h | 47 + + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 47 + + drivers/gpu/drm/amd/powerplay/inc/pp_feature.h | 67 + + drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 36 + + .../gpu/drm/amd/powerplay/inc/pp_power_source.h | 36 + + drivers/gpu/drm/amd/powerplay/inc/ppinterrupt.h | 46 + + .../gpu/drm/amd/{amdgpu => powerplay/inc}/smu7.h | 0 + drivers/gpu/drm/amd/powerplay/inc/smu72.h | 664 ++ + drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h | 760 ++ + drivers/gpu/drm/amd/powerplay/inc/smu73.h | 720 ++ + drivers/gpu/drm/amd/powerplay/inc/smu73_discrete.h | 799 ++ + .../amd/{amdgpu => powerplay/inc}/smu7_discrete.h | 0 + .../amd/{amdgpu => powerplay/inc}/smu7_fusion.h | 0 + .../gpu/drm/amd/{amdgpu => powerplay/inc}/smu8.h | 0 + .../amd/{amdgpu => powerplay/inc}/smu8_fusion.h | 8 + + .../{amdgpu => powerplay/inc}/smu_ucode_xfer_cz.h | 0 + .../gpu/drm/amd/powerplay/inc/smu_ucode_xfer_vi.h | 100 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 182 + + drivers/gpu/drm/amd/powerplay/inc/tonga_ppsmc.h | 420 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 9 + + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 858 ++ + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h | 102 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 1042 ++ + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 77 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 263 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 819 ++ + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h | 53 + + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 27 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 9 +- + drivers/gpu/drm/armada/armada_crtc.c | 15 +- + drivers/gpu/drm/armada/armada_debugfs.c | 4 +- + drivers/gpu/drm/armada/armada_drm.h | 3 +- + drivers/gpu/drm/armada/armada_drv.c | 1 + + drivers/gpu/drm/armada/armada_fb.c | 4 +- + drivers/gpu/drm/armada/armada_fb.h | 2 +- + drivers/gpu/drm/armada/armada_gem.c | 29 +- + drivers/gpu/drm/armada/armada_overlay.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 3 +- + drivers/gpu/drm/ast/ast_fb.c | 2 +- + 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/atmel-hlcdc/atmel_hlcdc_dc.c | 11 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_output.c | 6 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 2 +- + drivers/gpu/drm/bochs/bochs.h | 2 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- + drivers/gpu/drm/bochs/bochs_kms.c | 10 +- + drivers/gpu/drm/bochs/bochs_mm.c | 4 +- + drivers/gpu/drm/bridge/Kconfig | 1 - + drivers/gpu/drm/bridge/Makefile | 4 +- + .../{dw_hdmi-ahb-audio.c => dw-hdmi-ahb-audio.c} | 2 +- + .../bridge/{dw_hdmi-audio.h => dw-hdmi-audio.h} | 0 + drivers/gpu/drm/bridge/{dw_hdmi.c => dw-hdmi.c} | 33 +- + drivers/gpu/drm/bridge/{dw_hdmi.h => dw-hdmi.h} | 0 + drivers/gpu/drm/bridge/nxp-ptn3460.c | 6 +- + drivers/gpu/drm/cirrus/cirrus_drv.h | 3 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_main.c | 4 +- + drivers/gpu/drm/cirrus/cirrus_mode.c | 6 +- + drivers/gpu/drm/drm_atomic.c | 104 +- + drivers/gpu/drm/drm_atomic_helper.c | 323 +- + drivers/gpu/drm/drm_bridge.c | 69 +- + drivers/gpu/drm/drm_crtc.c | 99 +- + drivers/gpu/drm/drm_crtc_helper.c | 101 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 42 +- + drivers/gpu/drm/drm_drv.c | 26 +- + drivers/gpu/drm/drm_edid.c | 62 +- + drivers/gpu/drm/drm_encoder_slave.c | 2 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 10 +- + drivers/gpu/drm/drm_fops.c | 58 +- + drivers/gpu/drm/drm_gem.c | 35 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 14 +- + drivers/gpu/drm/drm_mipi_dsi.c | 38 + + drivers/gpu/drm/drm_modes.c | 90 +- + drivers/gpu/drm/drm_modeset_lock.c | 103 +- + drivers/gpu/drm/drm_pci.c | 20 + + drivers/gpu/drm/drm_plane_helper.c | 13 +- + drivers/gpu/drm/drm_prime.c | 16 +- + drivers/gpu/drm/drm_probe_helper.c | 174 +- + drivers/gpu/drm/drm_rect.c | 7 +- + drivers/gpu/drm/drm_sysfs.c | 54 +- + drivers/gpu/drm/etnaviv/Kconfig | 20 + + drivers/gpu/drm/etnaviv/Makefile | 14 + + drivers/gpu/drm/etnaviv/cmdstream.xml.h | 218 + + drivers/gpu/drm/etnaviv/common.xml.h | 249 + + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 268 + + drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 209 + + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 707 ++ + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 161 + + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 227 + + drivers/gpu/drm/etnaviv/etnaviv_dump.h | 54 + + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 897 ++ + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 117 + + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 122 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 443 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1644 +++ + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 209 + + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 240 + + drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 28 + + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 33 + + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.h | 25 + + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 299 + + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 71 + + drivers/gpu/drm/etnaviv/state.xml.h | 351 + + drivers/gpu/drm/etnaviv/state_hi.xml.h | 407 + + drivers/gpu/drm/exynos/Kconfig | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 104 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 161 +- + drivers/gpu/drm/exynos/exynos_dp_core.c | 189 +- + drivers/gpu/drm/exynos/exynos_dp_core.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 76 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 81 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 161 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_fb.h | 5 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 142 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 28 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 35 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 214 +- + drivers/gpu/drm/exynos/exynos_drm_plane.h | 7 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 41 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 59 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 239 +- + drivers/gpu/drm/exynos/regs-gsc.h | 4 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 1 - + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 2 +- + drivers/gpu/drm/gma500/cdv_device.c | 2 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_display.c | 2 - + drivers/gpu/drm/gma500/cdv_intel_dp.c | 3 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 7 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 6 +- + drivers/gpu/drm/gma500/framebuffer.c | 18 +- + drivers/gpu/drm/gma500/gem.c | 19 +- + drivers/gpu/drm/gma500/gma_display.c | 13 +- + drivers/gpu/drm/gma500/gtt.c | 1 + + drivers/gpu/drm/gma500/mdfld_device.c | 2 + + drivers/gpu/drm/gma500/mdfld_dsi_dpi.c | 12 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 5 +- + drivers/gpu/drm/gma500/oaktrail_device.c | 2 + + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 +- + drivers/gpu/drm/gma500/psb_device.c | 22 +- + drivers/gpu/drm/gma500/psb_drv.h | 4 + + drivers/gpu/drm/gma500/psb_intel_display.c | 2 - + drivers/gpu/drm/gma500/psb_intel_drv.h | 3 + + drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 8 +- + drivers/gpu/drm/i2c/adv7511.c | 2 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 2 +- + drivers/gpu/drm/i2c/sil164_drv.c | 2 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 28 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/dvo.h | 15 +- + drivers/gpu/drm/i915/dvo_ch7017.c | 2 +- + drivers/gpu/drm/i915/dvo_ch7xxx.c | 2 +- + drivers/gpu/drm/i915/dvo_ivch.c | 2 +- + drivers/gpu/drm/i915/dvo_ns2501.c | 2 +- + drivers/gpu/drm/i915/dvo_sil164.c | 2 +- + drivers/gpu/drm/i915/dvo_tfp410.c | 2 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 37 +- + drivers/gpu/drm/i915/i915_debugfs.c | 427 +- + drivers/gpu/drm/i915/i915_dma.c | 49 +- + drivers/gpu/drm/i915/i915_drv.c | 379 +- + drivers/gpu/drm/i915/i915_drv.h | 300 +- + drivers/gpu/drm/i915/i915_gem.c | 162 +- + drivers/gpu/drm/i915/i915_gem_context.c | 21 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 39 + + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 28 +- + drivers/gpu/drm/i915/i915_gem_fence.c | 2 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 133 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 56 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 2 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 3 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 4 + + drivers/gpu/drm/i915/i915_gpu_error.c | 40 +- + drivers/gpu/drm/i915/i915_guc_reg.h | 53 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 51 +- + drivers/gpu/drm/i915/i915_irq.c | 297 +- + drivers/gpu/drm/i915/i915_params.c | 10 +- + drivers/gpu/drm/i915/i915_reg.h | 2806 ++--- + drivers/gpu/drm/i915/i915_suspend.c | 4 +- + drivers/gpu/drm/i915/i915_sysfs.c | 13 +- + drivers/gpu/drm/i915/i915_trace.h | 4 +- + drivers/gpu/drm/i915/i915_vgpu.c | 6 +- + drivers/gpu/drm/i915/i915_vgpu.h | 14 +- + drivers/gpu/drm/i915/intel_atomic.c | 5 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 2 + + drivers/gpu/drm/i915/intel_audio.c | 118 +- + drivers/gpu/drm/i915/intel_bios.c | 168 +- + drivers/gpu/drm/i915/intel_bios.h | 4 - + drivers/gpu/drm/i915/intel_crt.c | 51 +- + drivers/gpu/drm/i915/intel_csr.c | 295 +- + drivers/gpu/drm/i915/intel_ddi.c | 200 +- + drivers/gpu/drm/i915/intel_display.c | 1198 ++- + drivers/gpu/drm/i915/intel_dp.c | 1137 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 323 + + drivers/gpu/drm/i915/intel_dp_mst.c | 42 +- + drivers/gpu/drm/i915/intel_drv.h | 262 +- + drivers/gpu/drm/i915/intel_dsi.c | 101 +- + drivers/gpu/drm/i915/intel_dsi.h | 2 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 6 +- + drivers/gpu/drm/i915/intel_dvo.c | 29 +- + drivers/gpu/drm/i915/intel_fbc.c | 742 +- + drivers/gpu/drm/i915/intel_fbdev.c | 62 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 143 +- + drivers/gpu/drm/i915/intel_guc.h | 12 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 72 + + drivers/gpu/drm/i915/intel_guc_loader.c | 105 +- + drivers/gpu/drm/i915/intel_hdmi.c | 130 +- + drivers/gpu/drm/i915/intel_hotplug.c | 2 +- + drivers/gpu/drm/i915/intel_i2c.c | 82 +- + drivers/gpu/drm/i915/intel_lrc.c | 176 +- + drivers/gpu/drm/i915/intel_lrc.h | 19 +- + drivers/gpu/drm/i915/intel_lvds.c | 13 +- + drivers/gpu/drm/i915/intel_mocs.c | 61 +- + drivers/gpu/drm/i915/intel_opregion.c | 79 +- + drivers/gpu/drm/i915/intel_overlay.c | 2 +- + drivers/gpu/drm/i915/intel_panel.c | 201 +- + drivers/gpu/drm/i915/intel_pm.c | 682 +- + drivers/gpu/drm/i915/intel_psr.c | 146 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 206 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 637 +- + drivers/gpu/drm/i915/intel_sdvo.c | 64 +- + drivers/gpu/drm/i915/intel_sprite.c | 34 +- + drivers/gpu/drm/i915/intel_tv.c | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 284 +- + drivers/gpu/drm/imx/Kconfig | 9 - + drivers/gpu/drm/imx/dw_hdmi-imx.c | 6 +- + drivers/gpu/drm/imx/imx-drm-core.c | 37 +- + drivers/gpu/drm/imx/imx-drm.h | 2 +- + drivers/gpu/drm/imx/imx-ldb.c | 10 +- + drivers/gpu/drm/imx/imx-tve.c | 10 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 3 +- + drivers/gpu/drm/imx/parallel-display.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 2 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_main.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 6 +- + drivers/gpu/drm/msm/Kconfig | 8 + + drivers/gpu/drm/msm/Makefile | 3 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 52 - + drivers/gpu/drm/msm/dsi/dsi.h | 6 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 35 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 4 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 508 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 4 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 195 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 3 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 10 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c | 533 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 87 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 3 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c | 198 + + drivers/gpu/drm/msm/mdp/mdp4/mdp4_dtv_encoder.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_irq.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 278 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 15 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lcdc_encoder.c | 13 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_lvds_connector.c | 23 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_plane.c | 3 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 3 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 20 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 129 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 2 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 76 +- + drivers/gpu/drm/msm/msm_drv.h | 11 +- + drivers/gpu/drm/msm/msm_fb.c | 4 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 5 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 10 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 9 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 43 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 8 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 14 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 6 - + drivers/gpu/drm/nouveau/nouveau_crtc.h | 3 + + drivers/gpu/drm/nouveau/nouveau_display.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 4 - + drivers/gpu/drm/nouveau/nouveau_encoder.h | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 1 - + drivers/gpu/drm/nouveau/nv50_display.c | 7 +- + drivers/gpu/drm/omapdrm/Makefile | 3 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 2 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 4 + + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 15 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 44 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 23 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 + + drivers/gpu/drm/omapdrm/omap_gem.c | 304 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 55 +- + drivers/gpu/drm/omapdrm/tcm-sita.c | 804 +- + drivers/gpu/drm/omapdrm/tcm.h | 26 +- + drivers/gpu/drm/panel/Kconfig | 19 + + drivers/gpu/drm/panel/Makefile | 2 + + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 334 + + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 387 + + drivers/gpu/drm/panel/panel-simple.c | 123 + + drivers/gpu/drm/qxl/qxl_display.c | 20 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 +- + drivers/gpu/drm/qxl/qxl_fb.c | 3 +- + drivers/gpu/drm/qxl/qxl_object.c | 2 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- + drivers/gpu/drm/radeon/Kconfig | 9 - + drivers/gpu/drm/radeon/Makefile | 4 - + drivers/gpu/drm/radeon/atombios_crtc.c | 1 + + drivers/gpu/drm/radeon/atombios_dp.c | 108 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 30 +- + drivers/gpu/drm/radeon/cik.c | 4 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 16 + + drivers/gpu/drm/radeon/drm_buffer.c | 177 - + drivers/gpu/drm/radeon/drm_buffer.h | 148 - + drivers/gpu/drm/radeon/r300_cmdbuf.c | 1186 --- + drivers/gpu/drm/radeon/r600_blit.c | 874 -- + drivers/gpu/drm/radeon/r600_cp.c | 2660 ----- + drivers/gpu/drm/radeon/r600_cs.c | 95 - + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_asic.c | 38 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 19 +- + drivers/gpu/drm/radeon/radeon_cp.c | 2243 ---- + drivers/gpu/drm/radeon/radeon_device.c | 1 + + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 14 +- + drivers/gpu/drm/radeon/radeon_drv.c | 97 - + drivers/gpu/drm/radeon/radeon_drv.h | 2048 ---- + drivers/gpu/drm/radeon/radeon_fb.c | 3 +- + drivers/gpu/drm/radeon/radeon_fence.c | 4 +- + drivers/gpu/drm/radeon/radeon_irq.c | 402 - + drivers/gpu/drm/radeon/radeon_kms.c | 24 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 1 + + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 15 +- + drivers/gpu/drm/radeon/radeon_mem.c | 302 - + drivers/gpu/drm/radeon/radeon_mode.h | 8 +- + drivers/gpu/drm/radeon/radeon_state.c | 3261 ------ + drivers/gpu/drm/radeon/radeon_vm.c | 12 +- + drivers/gpu/drm/radeon/sid.h | 5 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 6 +- + drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 10 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 3 +- + drivers/gpu/drm/rockchip/Makefile | 3 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 25 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 131 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.h | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 1200 +-- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 230 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 316 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 169 + + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 +- + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 2 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 - + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 7 +- + drivers/gpu/drm/tegra/Kconfig | 12 - + drivers/gpu/drm/tegra/dc.c | 15 +- + drivers/gpu/drm/tegra/dpaux.c | 41 +- + drivers/gpu/drm/tegra/drm.c | 94 +- + drivers/gpu/drm/tegra/drm.h | 35 +- + drivers/gpu/drm/tegra/dsi.c | 2 +- + drivers/gpu/drm/tegra/fb.c | 42 +- + drivers/gpu/drm/tegra/gem.c | 15 +- + drivers/gpu/drm/tegra/hdmi.c | 2 +- + drivers/gpu/drm/tegra/rgb.c | 2 +- + drivers/gpu/drm/tegra/sor.c | 147 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +- + drivers/gpu/drm/tilcdc/tilcdc_tfp410.c | 2 +- + drivers/gpu/drm/udl/udl_connector.c | 4 +- + drivers/gpu/drm/udl/udl_drv.h | 2 +- + drivers/gpu/drm/udl/udl_encoder.c | 3 +- + drivers/gpu/drm/udl/udl_fb.c | 5 +- + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/vc4/Makefile | 11 +- + drivers/gpu/drm/vc4/vc4_bo.c | 517 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 101 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 3 + + drivers/gpu/drm/vc4/vc4_drv.c | 36 +- + drivers/gpu/drm/vc4/vc4_drv.h | 318 +- + drivers/gpu/drm/vc4/vc4_gem.c | 866 ++ + drivers/gpu/drm/vc4/vc4_hdmi.c | 2 +- + drivers/gpu/drm/vc4/vc4_irq.c | 210 + + drivers/gpu/drm/vc4/vc4_kms.c | 149 +- + drivers/gpu/drm/vc4/vc4_packet.h | 399 + + drivers/gpu/drm/vc4/vc4_plane.c | 42 +- + drivers/gpu/drm/vc4/vc4_qpu_defines.h | 264 + + drivers/gpu/drm/vc4/vc4_regs.h | 2 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 634 ++ + drivers/gpu/drm/vc4/vc4_trace.h | 63 + + drivers/gpu/drm/vc4/vc4_trace_points.c | 14 + + drivers/gpu/drm/vc4/vc4_v3d.c | 262 + + drivers/gpu/drm/vc4/vc4_validate.c | 900 ++ + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 513 + + drivers/gpu/drm/virtio/virtgpu_display.c | 22 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 1 - + drivers/gpu/drm/virtio/virtgpu_plane.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 14 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 9 +- + drivers/gpu/host1x/Makefile | 3 +- + drivers/gpu/host1x/bus.c | 2 + + drivers/gpu/host1x/dev.c | 33 +- + drivers/gpu/host1x/hw/host1x05.c | 42 + + drivers/gpu/host1x/hw/host1x05.h | 26 + + drivers/gpu/host1x/hw/host1x05_hardware.h | 142 + + drivers/gpu/host1x/hw/hw_host1x05_channel.h | 121 + + drivers/gpu/host1x/hw/hw_host1x05_sync.h | 243 + + drivers/gpu/host1x/hw/hw_host1x05_uclass.h | 181 + + drivers/pci/quirks.c | 4 +- + include/drm/drmP.h | 15 +- + include/drm/drm_atomic.h | 6 +- + include/drm/drm_atomic_helper.h | 8 + + include/drm/drm_crtc.h | 1238 ++- + include/drm/drm_crtc_helper.h | 167 +- + include/drm/drm_dp_helper.h | 36 + + include/drm/drm_dp_mst_helper.h | 7 +- + include/drm/drm_encoder_slave.h | 2 +- + include/drm/drm_fb_cma_helper.h | 2 +- + include/drm/drm_fb_helper.h | 101 +- + include/drm/drm_gem.h | 106 +- + include/drm/drm_mipi_dsi.h | 27 + + include/drm/drm_mm.h | 26 +- + include/drm/drm_modes.h | 347 +- + include/drm/drm_modeset_helper_vtables.h | 890 ++ + include/drm/drm_modeset_lock.h | 4 +- + include/drm/drm_plane_helper.h | 38 +- + include/drm/drm_rect.h | 3 +- + include/drm/i915_component.h | 83 +- + include/drm/i915_pciids.h | 49 +- + include/drm/ttm/ttm_bo_driver.h | 4 +- + include/uapi/drm/Kbuild | 2 + + include/uapi/drm/amdgpu_drm.h | 290 +- + include/uapi/drm/armada_drm.h | 2 + + include/uapi/drm/drm.h | 9 +- + include/uapi/drm/drm_fourcc.h | 2 +- + include/uapi/drm/drm_mode.h | 18 +- + include/uapi/drm/drm_sarea.h | 2 +- + include/uapi/drm/etnaviv_drm.h | 222 + + include/uapi/drm/exynos_drm.h | 8 +- + include/uapi/drm/i810_drm.h | 2 +- + include/uapi/drm/i915_drm.h | 25 +- + include/uapi/drm/mga_drm.h | 2 +- + include/uapi/drm/msm_drm.h | 5 +- + include/uapi/drm/nouveau_drm.h | 86 +- + include/uapi/drm/omap_drm.h | 8 +- + include/uapi/drm/qxl_drm.h | 77 +- + include/uapi/drm/r128_drm.h | 2 +- + include/uapi/drm/radeon_drm.h | 128 +- + include/uapi/drm/savage_drm.h | 2 +- + include/uapi/drm/tegra_drm.h | 2 +- + include/uapi/drm/vc4_drm.h | 279 + + include/uapi/drm/via_drm.h | 5 +- + include/uapi/drm/virtgpu_drm.h | 101 +- + include/uapi/drm/vmwgfx_drm.h | 268 +- + include/uapi/linux/agpgart.h | 1 + + include/uapi/linux/virtio_gpu.h | 2 +- + kernel/async.c | 1 + + 614 files changed, 81899 insertions(+), 27241 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/etnaviv/etnaviv-drm.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv080wum-nl0.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/innolux,g121x1-l03.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/kyo,tcg121xglp.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/panasonic,vvx10f034n00.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/qiaodian,qd43003c0-40.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ls043t1le01.txt + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/fiji_ppsmc.h + rename drivers/gpu/drm/amd/amdgpu/{fiji_smumgr.h => fiji_smum.h} (100%) + delete mode 100644 drivers/gpu/drm/amd/amdgpu/tonga_ppsmc.h + rename drivers/gpu/drm/amd/amdgpu/{tonga_smumgr.h => tonga_smum.h} (100%) + rename drivers/gpu/drm/amd/{amdgpu/amdgpu_acpi.h => include/amd_acpi.h} (91%) + create mode 100644 drivers/gpu/drm/amd/include/amd_pcie.h + create mode 100644 drivers/gpu/drm/amd/include/amd_pcie_helpers.h + create mode 100644 drivers/gpu/drm/amd/powerplay/Kconfig + create mode 100644 drivers/gpu/drm/amd/powerplay/Makefile + create mode 100644 drivers/gpu/drm/amd/powerplay/amd_powerplay.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/Makefile + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventactionchains.h + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventinit.h + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmanagement.h + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventsubchains.h + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/eventtasks.h + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/psm.c + create mode 100644 drivers/gpu/drm/amd/powerplay/eventmgr/psm.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/Makefile + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_clockpowergating.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_clockpowergating.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_clockpowergating.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_dyn_defaults.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/functiontables.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pp_acpi.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppevvmath.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pppcielanes.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/pppcielanes.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/processpptables.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_clockpowergating.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_clockpowergating.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_dyn_defaults.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_processpptables.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/cz_ppsmc.h (99%) + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmanager.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/eventmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/fiji_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/fiji_pwrvirus.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/hardwaremanager.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/power_state.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_acpi.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_asicblocks.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_debug.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_feature.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_instance.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_power_source.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/ppinterrupt.h + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/smu7.h (100%) + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu72.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu72_discrete.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu73.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu73_discrete.h + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/smu7_discrete.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/smu7_fusion.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/smu8.h (100%) + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/smu8_fusion.h (91%) + rename drivers/gpu/drm/amd/{amdgpu => powerplay/inc}/smu_ucode_xfer_cz.h (100%) + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_ucode_xfer_vi.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smumgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/tonga_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/Makefile + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.h + rename drivers/gpu/drm/bridge/{dw_hdmi-ahb-audio.c => dw-hdmi-ahb-audio.c} (99%) + rename drivers/gpu/drm/bridge/{dw_hdmi-audio.h => dw-hdmi-audio.h} (100%) + rename drivers/gpu/drm/bridge/{dw_hdmi.c => dw-hdmi.c} (98%) + rename drivers/gpu/drm/bridge/{dw_hdmi.h => dw-hdmi.h} (100%) + create mode 100644 drivers/gpu/drm/etnaviv/Kconfig + create mode 100644 drivers/gpu/drm/etnaviv/Makefile + create mode 100644 drivers/gpu/drm/etnaviv/cmdstream.xml.h + create mode 100644 drivers/gpu/drm/etnaviv/common.xml.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_buffer.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_drv.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_drv.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_dump.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_dump.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_gem.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_gem.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_gpu.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_gpu.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.h + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_mmu.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_mmu.h + create mode 100644 drivers/gpu/drm/etnaviv/state.xml.h + create mode 100644 drivers/gpu/drm/etnaviv/state_hi.xml.h + create mode 100644 drivers/gpu/drm/i915/intel_dp_link_training.c + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_28nm_8960.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp4/mdp4_dsi_encoder.c + create mode 100644 drivers/gpu/drm/panel/panel-panasonic-vvx10f034n00.c + create mode 100644 drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c + delete mode 100644 drivers/gpu/drm/radeon/drm_buffer.c + delete mode 100644 drivers/gpu/drm/radeon/drm_buffer.h + delete mode 100644 drivers/gpu/drm/radeon/r300_cmdbuf.c + delete mode 100644 drivers/gpu/drm/radeon/r600_blit.c + delete mode 100644 drivers/gpu/drm/radeon/r600_cp.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_cp.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_irq.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_mem.c + delete mode 100644 drivers/gpu/drm/radeon/radeon_state.c + create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop_reg.c + create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop_reg.h + create mode 100644 drivers/gpu/drm/vc4/vc4_gem.c + create mode 100644 drivers/gpu/drm/vc4/vc4_irq.c + create mode 100644 drivers/gpu/drm/vc4/vc4_packet.h + create mode 100644 drivers/gpu/drm/vc4/vc4_qpu_defines.h + create mode 100644 drivers/gpu/drm/vc4/vc4_render_cl.c + create mode 100644 drivers/gpu/drm/vc4/vc4_trace.h + create mode 100644 drivers/gpu/drm/vc4/vc4_trace_points.c + create mode 100644 drivers/gpu/drm/vc4/vc4_v3d.c + create mode 100644 drivers/gpu/drm/vc4/vc4_validate.c + create mode 100644 drivers/gpu/drm/vc4/vc4_validate_shaders.c + create mode 100644 drivers/gpu/host1x/hw/host1x05.c + create mode 100644 drivers/gpu/host1x/hw/host1x05.h + create mode 100644 drivers/gpu/host1x/hw/host1x05_hardware.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x05_channel.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x05_sync.h + create mode 100644 drivers/gpu/host1x/hw/hw_host1x05_uclass.h + create mode 100644 include/drm/drm_modeset_helper_vtables.h + create mode 100644 include/uapi/drm/etnaviv_drm.h + create mode 100644 include/uapi/drm/vc4_drm.h +$ git am -3 ../patches/0001-drm-amdgpu-powerplay-include-asm-div64.h-for-do_div.patch +Applying: drm/amdgpu/powerplay: include asm/div64.h for do_div() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/amd/powerplay/hwmgr/fiji_thermal.c +M drivers/gpu/drm/amd/powerplay/hwmgr/tonga_thermal.c +$ git add -A . +$ git commit -v -a --amend +[master 5bfe1b016bf6] Merge remote-tracking branch 'drm/drm-next' + Date: Mon Jan 11 14:00:46 2016 +1100 +Merging drm-panel/drm/panel/for-next (abf08d5efee4 dt-bindings: Move panel bindings to correct location) +$ git merge drm-panel/drm/panel/for-next +Merge made by the 'recursive' strategy. +Merging drm-intel/for-linux-next (d5f384de5bf1 drm/i915: Move Braswell stop_machine GGTT insertion workaround) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem_gtt.c | 50 +++++++++++++++++++++---------------- + 1 file changed, 28 insertions(+), 22 deletions(-) +Merging drm-tegra/drm/tegra/for-next (ad906599c191 drm/tegra: Advertise DRIVER_ATOMIC) +$ git merge drm-tegra/drm/tegra/for-next +Already up-to-date. +Merging drm-misc/topic/drm-misc (d9d8c4cf23e8 drm: move MODULE_PARM_DESC to other file) +$ git merge drm-misc/topic/drm-misc +Auto-merging include/drm/drm_dp_mst_helper.h +Auto-merging drivers/gpu/vga/vga_switcheroo.c +Auto-merging drivers/gpu/drm/radeon/radeon_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_dp_mst.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Merge made by the 'recursive' strategy. + Documentation/DocBook/gpu.tmpl | 228 +++---------------------------- + drivers/gpu/drm/drm_atomic.c | 57 ++++---- + drivers/gpu/drm/drm_atomic_helper.c | 49 +++++-- + drivers/gpu/drm/drm_drv.c | 4 - + drivers/gpu/drm/drm_edid.c | 94 +++++++------ + drivers/gpu/drm/drm_fb_helper.c | 2 +- + drivers/gpu/drm/drm_gem.c | 109 ++++++++------- + drivers/gpu/drm/drm_irq.c | 3 + + drivers/gpu/drm/gma500/power.c | 4 +- + drivers/gpu/drm/i915/intel_display.c | 23 +++- + drivers/gpu/drm/i915/intel_dp_mst.c | 2 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 2 +- + drivers/gpu/drm/tegra/dsi.c | 13 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- + drivers/gpu/vga/vga_switcheroo.c | 2 +- + include/drm/drm_atomic.h | 4 - + include/drm/drm_atomic_helper.h | 2 + + include/drm/drm_crtc.h | 6 +- + include/drm/drm_dp_mst_helper.h | 2 +- + include/drm/drm_modeset_helper_vtables.h | 44 +++++- + 20 files changed, 279 insertions(+), 373 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 (2abd1c88345e drm/msm/mdp: fix a problematic usage of WARN_ON()) +$ git merge drm-msm/msm-next +Already up-to-date. +Merging hdlcd/for-upstream/hdlcd (2651f437261f MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.) +$ git merge hdlcd/for-upstream/hdlcd +Auto-merging drivers/gpu/drm/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/arm,hdlcd.txt | 79 +++ + MAINTAINERS | 6 + + arch/arm64/boot/dts/arm/juno-base.dtsi | 46 +- + drivers/gpu/drm/Kconfig | 2 + + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/arm/Kconfig | 29 ++ + drivers/gpu/drm/arm/Makefile | 2 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 327 ++++++++++++ + drivers/gpu/drm/arm/hdlcd_drv.c | 567 +++++++++++++++++++++ + drivers/gpu/drm/arm/hdlcd_drv.h | 42 ++ + drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++ + 11 files changed, 1184 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt + create mode 100644 drivers/gpu/drm/arm/Kconfig + create mode 100644 drivers/gpu/drm/arm/Makefile + create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c + create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h + create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h +Merging drm-vc4/drm-vc4-next (5645e785cea2 drm/vc4: fix an error code) +$ git merge drm-vc4/drm-vc4-next +Already up-to-date. +Merging sound/for-next (9d9938854efc Merge branch 'for-linus' into for-next) +$ git merge sound/for-next +Removing sound/soc/sh/rcar/rcar_snd.h +Auto-merging sound/pci/fm801.c +Removing sound/firewire/scs1x.c +Auto-merging sound/firewire/oxfw/oxfw-spkr.c +Auto-merging drivers/dma/Kconfig +Auto-merging arch/arm/plat-samsung/devs.c +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/sound/ak4613.txt | 10 + + .../devicetree/bindings/sound/atmel-classd.txt | 6 + + .../devicetree/bindings/sound/atmel-pdmic.txt | 55 + + Documentation/devicetree/bindings/sound/da7218.txt | 104 + + Documentation/devicetree/bindings/sound/da7219.txt | 8 +- + .../devicetree/bindings/sound/fsl,asrc.txt | 5 + + .../devicetree/bindings/sound/fsl,esai.txt | 5 + + .../devicetree/bindings/sound/fsl,spdif.txt | 5 + + .../devicetree/bindings/sound/img,i2s-in.txt | 47 + + .../devicetree/bindings/sound/img,i2s-out.txt | 51 + + .../devicetree/bindings/sound/img,parallel-out.txt | 44 + + .../bindings/sound/img,pistachio-internal-dac.txt | 18 + + .../devicetree/bindings/sound/img,spdif-in.txt | 41 + + .../devicetree/bindings/sound/img,spdif-out.txt | 44 + + .../devicetree/bindings/sound/inno-rk3036.txt | 20 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 82 + + .../bindings/sound/renesas,rsrc-card.txt | 4 +- + .../devicetree/bindings/sound/rockchip-i2s.txt | 2 + + Documentation/devicetree/bindings/sound/rt5616.txt | 26 + + Documentation/devicetree/bindings/sound/rt5659.txt | 75 + + Documentation/devicetree/bindings/sound/rt5677.txt | 2 +- + .../devicetree/bindings/sound/sun4i-codec.txt | 3 + + .../devicetree/bindings/sound/ti,pcm3168a.txt | 48 + + .../devicetree/bindings/sound/wlf,wm8974.txt | 15 + + Documentation/sound/alsa/img,spdif-in.txt | 49 + + arch/arm/mach-s3c64xx/dev-audio.c | 47 +- + arch/arm/mach-s3c64xx/include/mach/dma.h | 52 +- + arch/arm/plat-samsung/devs.c | 23 +- + arch/x86/include/asm/platform_sst_audio.h | 1 + + drivers/dma/Kconfig | 2 +- + include/linux/platform_data/asoc-s3c.h | 8 + + include/sound/ac97_codec.h | 3 + + include/sound/compress_driver.h | 7 +- + include/sound/da7218.h | 109 + + include/sound/da7219.h | 14 +- + include/sound/designware_i2s.h | 5 + + include/sound/hda_i915.h | 14 + + include/sound/hdaudio_ext.h | 6 + + include/sound/i2c.h | 2 +- + include/sound/rawmidi.h | 2 +- + include/sound/rt5659.h | 49 + + include/sound/soc-dapm.h | 4 + + include/sound/soc-topology.h | 6 +- + include/sound/soc.h | 42 +- + include/uapi/sound/asoc.h | 2 +- + include/uapi/sound/compress_params.h | 5 +- + sound/core/compress_offload.c | 99 +- + sound/core/oss/mixer_oss.c | 8 +- + sound/core/oss/pcm_oss.c | 10 +- + sound/core/pcm_native.c | 26 +- + sound/core/seq/oss/seq_oss.c | 7 +- + sound/core/seq/seq_virmidi.c | 2 +- + sound/drivers/dummy.c | 4 +- + sound/firewire/Kconfig | 12 +- + sound/firewire/Makefile | 2 - + sound/firewire/dice/dice-transaction.c | 123 +- + sound/firewire/dice/dice.c | 227 +- + sound/firewire/dice/dice.h | 3 + + sound/firewire/fireworks/fireworks.h | 4 +- + sound/firewire/fireworks/fireworks_midi.c | 16 +- + sound/firewire/fireworks/fireworks_pcm.c | 28 +- + sound/firewire/fireworks/fireworks_stream.c | 32 +- + sound/firewire/oxfw/Makefile | 4 +- + sound/firewire/oxfw/oxfw-scs1x.c | 406 ++ + .../firewire/oxfw/{oxfw-control.c => oxfw-spkr.c} | 142 +- + sound/firewire/oxfw/oxfw.c | 110 +- + sound/firewire/oxfw/oxfw.h | 23 +- + sound/firewire/scs1x.c | 530 --- + sound/hda/hdac_i915.c | 66 + + sound/i2c/i2c.c | 2 +- + sound/oss/Kconfig | 2 +- + sound/pci/atiixp.c | 6 +- + sound/pci/atiixp_modem.c | 4 +- + sound/pci/azt3328.c | 2 - + sound/pci/cs5535audio/cs5535audio_pcm.c | 4 +- + sound/pci/fm801.c | 145 +- + sound/pci/hda/hda_controller.c | 10 +- + sound/pci/hda/hda_controller.h | 14 +- + sound/pci/hda/hda_eld.c | 1 + + sound/pci/hda/hda_generic.c | 108 +- + sound/pci/hda/hda_generic.h | 5 - + sound/pci/hda/hda_intel.c | 76 +- + sound/pci/hda/hda_tegra.c | 5 +- + sound/pci/hda/patch_conexant.c | 3 + + sound/pci/hda/patch_hdmi.c | 240 +- + sound/pci/ice1712/delta.c | 2 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/atmel/Kconfig | 9 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/atmel-classd.c | 26 +- + sound/soc/atmel/atmel-pdmic.c | 738 ++++ + sound/soc/atmel/atmel-pdmic.h | 80 + + sound/soc/atmel/atmel_wm8904.c | 1 + + sound/soc/codecs/Kconfig | 56 +- + sound/soc/codecs/Makefile | 18 + + sound/soc/codecs/ak4613.c | 118 +- + sound/soc/codecs/arizona.c | 143 +- + sound/soc/codecs/arizona.h | 17 +- + sound/soc/codecs/cs47l24.c | 1148 ++++++ + sound/soc/codecs/cs47l24.h | 23 + + sound/soc/codecs/da7218.c | 3314 +++++++++++++++ + sound/soc/codecs/da7218.h | 1414 +++++++ + sound/soc/codecs/da7219.c | 89 +- + sound/soc/codecs/da7219.h | 9 - + sound/soc/codecs/hdac_hdmi.c | 659 +++ + sound/soc/codecs/inno_rk3036.c | 490 +++ + sound/soc/codecs/inno_rk3036.h | 123 + + sound/soc/codecs/max98357a.c | 10 + + sound/soc/codecs/pcm3168a-i2c.c | 66 + + sound/soc/codecs/pcm3168a-spi.c | 65 + + sound/soc/codecs/pcm3168a.c | 767 ++++ + sound/soc/codecs/pcm3168a.h | 100 + + sound/soc/codecs/rt286.c | 6 + + sound/soc/codecs/rt298.c | 2 - + sound/soc/codecs/rt5616.c | 1381 +++++++ + sound/soc/codecs/rt5616.h | 1819 +++++++++ + sound/soc/codecs/rt5645.c | 292 +- + sound/soc/codecs/rt5659.c | 4223 ++++++++++++++++++++ + sound/soc/codecs/rt5659.h | 1819 +++++++++ + sound/soc/codecs/rt5677.c | 13 +- + sound/soc/codecs/ssm2518.c | 2 +- + sound/soc/codecs/wm5110.c | 206 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8904.c | 2 +- + sound/soc/codecs/wm8962.c | 3 +- + sound/soc/codecs/wm8974.c | 7 + + sound/soc/codecs/wm8998.c | 46 +- + sound/soc/codecs/wm9713.c | 296 +- + sound/soc/codecs/wm_adsp.c | 769 +++- + sound/soc/codecs/wm_adsp.h | 23 +- + sound/soc/dwc/designware_i2s.c | 113 +- + sound/soc/fsl/fsl-asoc-card.c | 21 +- + sound/soc/fsl/fsl_asrc.c | 55 +- + sound/soc/fsl/fsl_asrc.h | 2 + + sound/soc/fsl/fsl_esai.c | 63 +- + sound/soc/fsl/fsl_sai.c | 98 +- + sound/soc/fsl/fsl_sai.h | 3 + + sound/soc/fsl/fsl_spdif.c | 35 +- + sound/soc/fsl/fsl_ssi.c | 25 +- + sound/soc/fsl/imx-pcm-dma.c | 2 + + sound/soc/fsl/imx-pcm-fiq.c | 4 +- + sound/soc/fsl/imx-wm8962.c | 10 +- + sound/soc/generic/simple-card.c | 12 +- + sound/soc/img/Kconfig | 52 + + sound/soc/img/Makefile | 7 + + sound/soc/img/img-i2s-in.c | 516 +++ + sound/soc/img/img-i2s-out.c | 565 +++ + sound/soc/img/img-parallel-out.c | 327 ++ + sound/soc/img/img-spdif-in.c | 806 ++++ + sound/soc/img/img-spdif-out.c | 441 ++ + sound/soc/img/pistachio-internal-dac.c | 287 ++ + sound/soc/intel/Kconfig | 46 +- + sound/soc/intel/atom/sst-atom-controls.c | 5 +- + sound/soc/intel/atom/sst-atom-controls.h | 1 + + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 32 +- + sound/soc/intel/atom/sst/sst_acpi.c | 67 +- + sound/soc/intel/atom/sst/sst_stream.c | 2 +- + sound/soc/intel/baytrail/sst-baytrail-pcm.c | 2 + + sound/soc/intel/boards/Makefile | 4 + + sound/soc/intel/boards/bytcr_rt5640.c | 241 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 19 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 19 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 19 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 485 +++ + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 536 +++ + sound/soc/intel/boards/skl_rt286.c | 128 +- + sound/soc/intel/common/Makefile | 7 +- + sound/soc/intel/common/sst-acpi.c | 41 +- + sound/soc/intel/common/sst-acpi.h | 33 + + sound/soc/intel/common/sst-dsp-priv.h | 8 +- + sound/soc/intel/common/sst-dsp.c | 2 +- + sound/soc/intel/common/sst-dsp.h | 2 +- + sound/soc/intel/common/sst-firmware.c | 20 +- + sound/soc/intel/common/sst-match-acpi.c | 43 + + sound/soc/intel/haswell/sst-haswell-dsp.c | 2 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 31 +- + sound/soc/intel/skylake/skl-messages.c | 280 +- + sound/soc/intel/skylake/skl-nhlt.c | 19 +- + sound/soc/intel/skylake/skl-pcm.c | 256 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 97 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 21 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 108 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 9 + + sound/soc/intel/skylake/skl-sst.c | 217 +- + sound/soc/intel/skylake/skl-topology.c | 658 ++- + sound/soc/intel/skylake/skl-topology.h | 63 +- + sound/soc/intel/skylake/skl-tplg-interface.h | 105 +- + sound/soc/intel/skylake/skl.c | 158 +- + sound/soc/intel/skylake/skl.h | 5 +- + sound/soc/mediatek/mtk-afe-common.h | 1 - + sound/soc/mediatek/mtk-afe-pcm.c | 59 +- + sound/soc/omap/omap-hdmi-audio.c | 2 + + sound/soc/pxa/brownstone.c | 3 +- + sound/soc/pxa/mioa701_wm9713.c | 6 +- + sound/soc/qcom/lpass-cpu.c | 1 + + sound/soc/rockchip/rockchip_i2s.c | 130 +- + sound/soc/rockchip/rockchip_max98090.c | 6 + + sound/soc/rockchip/rockchip_rt5645.c | 6 + + sound/soc/samsung/Kconfig | 2 - + sound/soc/samsung/ac97.c | 29 +- + sound/soc/samsung/bells.c | 40 +- + sound/soc/samsung/dma.h | 6 +- + sound/soc/samsung/dmaengine.c | 20 +- + sound/soc/samsung/i2s.c | 31 +- + sound/soc/samsung/littlemill.c | 32 +- + sound/soc/samsung/odroidx2_max98090.c | 9 +- + sound/soc/samsung/pcm.c | 25 +- + sound/soc/samsung/s3c2412-i2s.c | 16 +- + sound/soc/samsung/s3c24xx-i2s.c | 16 +- + sound/soc/samsung/snow.c | 9 +- + sound/soc/samsung/spdif.c | 17 +- + sound/soc/samsung/speyside.c | 12 +- + sound/soc/samsung/tobermory.c | 21 +- + sound/soc/sh/Kconfig | 1 - + sound/soc/sh/fsi.c | 11 +- + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/adg.c | 118 +- + sound/soc/sh/rcar/cmd.c | 171 + + sound/soc/sh/rcar/core.c | 586 +-- + sound/soc/sh/rcar/ctu.c | 99 +- + sound/soc/sh/rcar/dma.c | 245 +- + sound/soc/sh/rcar/dvc.c | 273 +- + sound/soc/sh/rcar/gen.c | 133 +- + sound/soc/sh/rcar/mix.c | 158 +- + sound/soc/sh/rcar/rcar_snd.h | 117 - + sound/soc/sh/rcar/rsnd.h | 335 +- + sound/soc/sh/rcar/rsrc-card.c | 129 +- + sound/soc/sh/rcar/src.c | 898 ++--- + sound/soc/sh/rcar/ssi.c | 744 ++-- + sound/soc/sh/rcar/ssiu.c | 225 ++ + sound/soc/soc-ac97.c | 125 + + sound/soc/soc-compress.c | 8 +- + sound/soc/soc-core.c | 602 ++- + sound/soc/soc-dapm.c | 14 +- + sound/soc/soc-ops.c | 4 +- + sound/soc/soc-pcm.c | 82 +- + sound/soc/sti/uniperif_player.c | 3 +- + sound/soc/sunxi/sun4i-codec.c | 279 +- + sound/soc/tegra/tegra_alc5632.c | 12 +- + sound/soc/tegra/tegra_wm8903.c | 3 +- + sound/synth/emux/emux_nrpn.c | 9 +- + sound/usb/midi.c | 27 +- + sound/usb/misc/ua101.c | 4 +- + sound/usb/stream.c | 6 +- + sound/usb/usx2y/usbusx2yaudio.c | 2 +- + 246 files changed, 31974 insertions(+), 5268 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/atmel-pdmic.txt + create mode 100644 Documentation/devicetree/bindings/sound/da7218.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,i2s-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,parallel-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,pistachio-internal-dac.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-in.txt + create mode 100644 Documentation/devicetree/bindings/sound/img,spdif-out.txt + create mode 100644 Documentation/devicetree/bindings/sound/inno-rk3036.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt + create mode 100644 Documentation/devicetree/bindings/sound/rt5659.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm3168a.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.txt + create mode 100644 Documentation/sound/alsa/img,spdif-in.txt + create mode 100644 include/sound/da7218.h + create mode 100644 include/sound/rt5659.h + create mode 100644 sound/firewire/oxfw/oxfw-scs1x.c + rename sound/firewire/oxfw/{oxfw-control.c => oxfw-spkr.c} (55%) + delete mode 100644 sound/firewire/scs1x.c + create mode 100644 sound/soc/atmel/atmel-pdmic.c + create mode 100644 sound/soc/atmel/atmel-pdmic.h + create mode 100644 sound/soc/codecs/cs47l24.c + create mode 100644 sound/soc/codecs/cs47l24.h + create mode 100644 sound/soc/codecs/da7218.c + create mode 100644 sound/soc/codecs/da7218.h + create mode 100644 sound/soc/codecs/hdac_hdmi.c + create mode 100644 sound/soc/codecs/inno_rk3036.c + create mode 100644 sound/soc/codecs/inno_rk3036.h + create mode 100644 sound/soc/codecs/pcm3168a-i2c.c + create mode 100644 sound/soc/codecs/pcm3168a-spi.c + create mode 100644 sound/soc/codecs/pcm3168a.c + create mode 100644 sound/soc/codecs/pcm3168a.h + create mode 100644 sound/soc/codecs/rt5616.c + create mode 100644 sound/soc/codecs/rt5616.h + create mode 100644 sound/soc/codecs/rt5659.c + create mode 100644 sound/soc/codecs/rt5659.h + create mode 100644 sound/soc/img/Kconfig + create mode 100644 sound/soc/img/Makefile + create mode 100644 sound/soc/img/img-i2s-in.c + create mode 100644 sound/soc/img/img-i2s-out.c + create mode 100644 sound/soc/img/img-parallel-out.c + create mode 100644 sound/soc/img/img-spdif-in.c + create mode 100644 sound/soc/img/img-spdif-out.c + create mode 100644 sound/soc/img/pistachio-internal-dac.c + create mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c + create mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c + create mode 100644 sound/soc/intel/common/sst-acpi.h + create mode 100644 sound/soc/intel/common/sst-match-acpi.c + create mode 100644 sound/soc/sh/rcar/cmd.c + delete mode 100644 sound/soc/sh/rcar/rcar_snd.h + create mode 100644 sound/soc/sh/rcar/ssiu.c +Merging sound-asoc/for-next (a0232cb4ee2d Merge remote-tracking branch 'asoc/topic/wm8960' into asoc-next) +$ git merge sound-asoc/for-next +Resolved 'sound/soc/intel/skylake/skl.h' using previous resolution. +Auto-merging sound/soc/soc-compress.c +Auto-merging sound/soc/intel/skylake/skl.h +CONFLICT (content): Merge conflict in sound/soc/intel/skylake/skl.h +Auto-merging sound/soc/codecs/pcm179x.h +Removing sound/soc/codecs/pcm1792a.c +Auto-merging Documentation/devicetree/bindings/sound/pcm179x.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c6dfa2504ec3] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/sound/{pcm1792a.txt => pcm179x.txt} | 2 +- + Documentation/devicetree/bindings/sound/rt5651.txt | 41 + + include/sound/designware_i2s.h | 1 + + include/sound/hda_register.h | 9 + + include/sound/hdaudio_ext.h | 15 + + include/sound/soc-dai.h | 1 + + include/sound/soc.h | 11 +- + sound/hda/ext/hdac_ext_controller.c | 29 +- + sound/hda/ext/hdac_ext_stream.c | 72 + + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/amd/Kconfig | 4 + + sound/soc/amd/Makefile | 3 + + sound/soc/amd/acp-pcm-dma.c | 1042 +++++++++ + sound/soc/amd/acp.h | 118 + + sound/soc/amd/include/acp_2_2_d.h | 609 ++++++ + sound/soc/amd/include/acp_2_2_enum.h | 1068 +++++++++ + sound/soc/amd/include/acp_2_2_sh_mask.h | 2292 ++++++++++++++++++++ + sound/soc/bcm/bcm2835-i2s.c | 12 +- + sound/soc/codecs/Kconfig | 6 +- + sound/soc/codecs/Makefile | 4 +- + sound/soc/codecs/arizona.c | 3 + + sound/soc/codecs/da7218.c | 47 +- + sound/soc/codecs/da7219.c | 74 +- + sound/soc/codecs/hdac_hdmi.c | 170 +- + sound/soc/codecs/pcm1792a.c | 271 --- + sound/soc/codecs/pcm179x.c | 271 +++ + sound/soc/codecs/{pcm1792a.h => pcm179x.h} | 6 +- + sound/soc/codecs/rt5640.c | 103 + + sound/soc/codecs/rt5640.h | 17 + + sound/soc/codecs/rt5645.c | 30 +- + sound/soc/codecs/rt5651.c | 31 + + sound/soc/codecs/twl6040.c | 3 +- + sound/soc/codecs/wm5110.c | 46 +- + sound/soc/codecs/wm8960.c | 24 +- + sound/soc/codecs/wm_adsp.c | 326 +++ + sound/soc/codecs/wm_adsp.h | 5 + + sound/soc/dwc/designware_i2s.c | 4 + + sound/soc/fsl/fsl_asrc.c | 7 + + sound/soc/fsl/fsl_asrc.h | 7 + + sound/soc/fsl/fsl_ssi.c | 40 +- + sound/soc/fsl/mpc8610_hpcd.c | 3 +- + sound/soc/fsl/p1022_ds.c | 3 +- + sound/soc/fsl/p1022_rdk.c | 3 +- + sound/soc/intel/Kconfig | 12 + + sound/soc/intel/atom/sst/sst_acpi.c | 23 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bytcr_rt5640.c | 25 +- + sound/soc/intel/boards/bytcr_rt5651.c | 332 +++ + sound/soc/intel/common/Makefile | 5 + + sound/soc/intel/skylake/skl-pcm.c | 56 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 15 + + sound/soc/intel/skylake/skl-sst-ipc.h | 5 + + sound/soc/intel/skylake/skl.c | 61 +- + sound/soc/intel/skylake/skl.h | 3 + + sound/soc/rockchip/rockchip_i2s.c | 9 +- + sound/soc/sh/rcar/ssi.c | 27 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-compress.c | 23 +- + sound/soc/soc-core.c | 274 ++- + sound/soc/soc-pcm.c | 28 +- + 61 files changed, 7174 insertions(+), 563 deletions(-) + rename Documentation/devicetree/bindings/sound/{pcm1792a.txt => pcm179x.txt} (88%) + create mode 100644 Documentation/devicetree/bindings/sound/rt5651.txt + create mode 100644 sound/soc/amd/Kconfig + create mode 100644 sound/soc/amd/Makefile + create mode 100644 sound/soc/amd/acp-pcm-dma.c + create mode 100644 sound/soc/amd/acp.h + create mode 100644 sound/soc/amd/include/acp_2_2_d.h + create mode 100644 sound/soc/amd/include/acp_2_2_enum.h + create mode 100644 sound/soc/amd/include/acp_2_2_sh_mask.h + delete mode 100644 sound/soc/codecs/pcm1792a.c + create mode 100644 sound/soc/codecs/pcm179x.c + rename sound/soc/codecs/{pcm1792a.h => pcm179x.h} (91%) + create mode 100644 sound/soc/intel/boards/bytcr_rt5651.c +Merging modules/modules-next (b3212ec77dd1 module: keep percpu symbols in module's symtab) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging arch/arc/kernel/unwind.c +Merge made by the 'recursive' strategy. + arch/alpha/kernel/module.c | 2 +- + arch/arc/kernel/unwind.c | 4 +- + arch/arm/kernel/module-plts.c | 2 +- + arch/avr32/kernel/module.c | 12 +- + arch/ia64/kernel/module.c | 14 +- + arch/metag/kernel/module.c | 4 +- + arch/mips/kernel/vpe.c | 6 +- + arch/parisc/kernel/module.c | 32 ++-- + arch/powerpc/kernel/module_32.c | 6 +- + arch/s390/kernel/module.c | 22 +-- + arch/x86/kernel/livepatch.c | 6 +- + include/linux/module.h | 68 ++++---- + kernel/debug/kdb/kdb_main.c | 4 +- + kernel/gcov/base.c | 7 +- + kernel/module.c | 349 +++++++++++++++++++--------------------- + 15 files changed, 256 insertions(+), 282 deletions(-) +Merging input/next (8679ee4204cf Input: gpio-keys - fix check for disabling unsupported keys) +$ git merge input/next +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/gpio/gpiolib.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Merge made by the 'recursive' strategy. + .../bindings/input/touchscreen/goodix.txt | 14 + + .../bindings/input/touchscreen/pixcir_i2c_ts.txt | 4 +- + .../bindings/input/touchscreen/ts4800-ts.txt | 11 + + drivers/gpio/gpiolib-acpi.c | 43 ++ + drivers/gpio/gpiolib.c | 3 + + drivers/gpio/gpiolib.h | 8 + + drivers/input/keyboard/gpio_keys.c | 29 +- + drivers/input/keyboard/omap-keypad.c | 10 +- + drivers/input/misc/bma150.c | 2 +- + drivers/input/misc/da9063_onkey.c | 8 +- + drivers/input/misc/sparcspkr.c | 18 +- + drivers/input/misc/uinput.c | 158 ++++- + drivers/input/mouse/alps.c | 22 +- + drivers/input/mouse/focaltech.c | 22 +- + drivers/input/mouse/focaltech.h | 8 + + drivers/input/mouse/logips2pp.c | 2 +- + drivers/input/mouse/logips2pp.h | 4 +- + drivers/input/mouse/psmouse-base.c | 770 ++++++++++----------- + drivers/input/touchscreen/Kconfig | 27 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/egalax_ts_serial.c | 194 ++++++ + drivers/input/touchscreen/goodix.c | 513 ++++++++++++-- + drivers/input/touchscreen/pcap_ts.c | 2 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 41 ++ + drivers/input/touchscreen/rohm_bu21023.c | 2 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 2 - + drivers/input/touchscreen/ts4800-ts.c | 216 ++++++ + drivers/input/touchscreen/wacom_w8001.c | 326 +++++---- + include/linux/uinput.h | 5 + + include/uapi/linux/serio.h | 1 + + include/uapi/linux/uinput.h | 80 ++- + 31 files changed, 1894 insertions(+), 653 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ts4800-ts.txt + create mode 100644 drivers/input/touchscreen/egalax_ts_serial.c + create mode 100644 drivers/input/touchscreen/ts4800-ts.c +Merging block/for-next (b02bb788ed41 Merge branch 'for-4.5/drivers' into for-next) +$ git merge block/for-next +Resolved 'drivers/nvme/host/Makefile' using previous resolution. +Resolved 'drivers/nvme/host/lightnvm.c' using previous resolution. +Resolved 'drivers/nvme/host/pci.c' using previous resolution. +Auto-merging include/linux/blkdev.h +Auto-merging fs/block_dev.c +Auto-merging drivers/nvme/host/pci.c +CONFLICT (content): Merge conflict in drivers/nvme/host/pci.c +Auto-merging drivers/nvme/host/nvme.h +Auto-merging drivers/nvme/host/lightnvm.c +CONFLICT (content): Merge conflict in drivers/nvme/host/lightnvm.c +Auto-merging drivers/nvme/host/Makefile +CONFLICT (content): Merge conflict in drivers/nvme/host/Makefile +Auto-merging drivers/block/null_blk.c +Auto-merging drivers/block/mtip32xx/mtip32xx.c +Auto-merging block/blk-merge.c +Auto-merging block/blk-core.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1da231343233] Merge remote-tracking branch 'block/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +- + block/bio-integrity.c | 13 +- + block/bio.c | 4 +- + block/blk-core.c | 23 +- + block/blk-merge.c | 3 + + block/blk-mq-cpumap.c | 2 +- + block/blk-mq-tag.c | 11 +- + block/blk-mq.c | 44 +- + block/blk-mq.h | 11 +- + block/blk-timeout.c | 17 +- + block/blk.h | 2 +- + block/genhd.c | 2 +- + drivers/block/drbd/drbd_actlog.c | 323 +++-- + drivers/block/drbd/drbd_bitmap.c | 22 +- + drivers/block/drbd/drbd_debugfs.c | 10 + + drivers/block/drbd/drbd_int.h | 111 +- + drivers/block/drbd/drbd_main.c | 74 +- + drivers/block/drbd/drbd_nl.c | 1361 ++++++++++++++++-- + drivers/block/drbd/drbd_proc.c | 6 +- + drivers/block/drbd/drbd_protocol.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 254 ++-- + drivers/block/drbd/drbd_req.c | 147 +- + drivers/block/drbd/drbd_req.h | 17 +- + drivers/block/drbd/drbd_state.c | 428 +++++- + drivers/block/drbd/drbd_state.h | 6 +- + drivers/block/drbd/drbd_state_change.h | 63 + + drivers/block/drbd/drbd_worker.c | 105 +- + drivers/block/mtip32xx/mtip32xx.c | 8 +- + drivers/block/null_blk.c | 2 +- + drivers/block/sx8.c | 7 +- + drivers/md/bcache/btree.c | 5 +- + drivers/md/bcache/super.c | 16 +- + drivers/md/bcache/writeback.c | 37 +- + drivers/md/bcache/writeback.h | 3 +- + drivers/nvme/host/Makefile | 2 +- + drivers/nvme/host/core.c | 1368 ++++++++++++++++++ + drivers/nvme/host/lightnvm.c | 37 +- + drivers/nvme/host/nvme.h | 238 ++- + drivers/nvme/host/pci.c | 2463 +++++++++----------------------- + drivers/nvme/host/scsi.c | 212 +-- + drivers/target/target_core_iblock.c | 4 +- + fs/block_dev.c | 4 +- + include/linux/aer.h | 1 + + include/linux/bio.h | 32 +- + include/linux/blk-mq.h | 8 +- + include/linux/blk_types.h | 2 - + include/linux/blkdev.h | 3 +- + include/linux/drbd.h | 26 +- + include/linux/drbd_genl.h | 149 ++ + include/linux/idr.h | 14 + + include/linux/lru_cache.h | 2 +- + include/linux/nvme.h | 27 +- + lib/lru_cache.c | 4 +- + 53 files changed, 5063 insertions(+), 2683 deletions(-) + create mode 100644 drivers/block/drbd/drbd_state_change.h + create mode 100644 drivers/nvme/host/core.c +$ git am -3 ../patches/0001-nvme-merge-fix-up-for-ns-code-movement.patch +Applying: nvme: merge fix up for ns code movement +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/nvme/host/core.c +$ git add -A . +$ git commit -v -a --amend +[master 5915098a36f7] Merge remote-tracking branch 'block/for-next' + Date: Mon Jan 11 14:19:39 2016 +1100 +Merging device-mapper/for-next (385277bfb57f dm snapshot: fix hung bios when copy error occurs) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-verity-target.c +Auto-merging drivers/md/dm-bufio.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/verity.txt | 40 +- + drivers/md/Kconfig | 21 + + drivers/md/Makefile | 5 + + drivers/md/dm-bufio.c | 44 +- + drivers/md/dm-cache-target.c | 3 - + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-snap-persistent.c | 5 +- + drivers/md/dm-snap-transient.c | 4 +- + drivers/md/dm-snap.c | 26 +- + drivers/md/dm-thin-metadata.c | 114 ++- + drivers/md/dm-thin.c | 8 +- + drivers/md/dm-verity-fec.c | 818 +++++++++++++++++++++ + drivers/md/dm-verity-fec.h | 152 ++++ + drivers/md/{dm-verity.c => dm-verity-target.c} | 602 ++++++++------- + drivers/md/dm-verity.h | 129 ++++ + drivers/md/persistent-data/Kconfig | 9 - + drivers/md/persistent-data/dm-block-manager.c | 11 +- + drivers/md/persistent-data/dm-btree.c | 17 +- + drivers/md/persistent-data/dm-space-map-metadata.c | 3 - + 19 files changed, 1657 insertions(+), 356 deletions(-) + create mode 100644 drivers/md/dm-verity-fec.c + create mode 100644 drivers/md/dm-verity-fec.h + rename drivers/md/{dm-verity.c => dm-verity-target.c} (69%) + create mode 100644 drivers/md/dm-verity.h +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/mmc-next (11bc9381b277 mmc: sdhci-s3c: use mmc_of_parse and remove the card_tasklet) +$ git merge mmc/mmc-next +Already up-to-date. +Merging mmc-uh/next (01a999e48995 mmc: dw_mmc: remove the unused quirks) +$ git merge mmc-uh/next +Auto-merging lib/Kconfig.debug +Removing include/linux/platform_data/mmc-mvsdio.h +Removing drivers/mmc/host/atmel-mci-regs.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/renesas,mmcif.txt | 1 + + MAINTAINERS | 1 - + drivers/mmc/card/block.c | 11 +- + drivers/mmc/core/bus.c | 2 + + drivers/mmc/core/core.c | 85 +++++----- + drivers/mmc/core/core.h | 8 + + drivers/mmc/core/host.c | 11 +- + drivers/mmc/core/mmc.c | 23 +-- + drivers/mmc/core/mmc_ops.c | 9 +- + drivers/mmc/core/pwrseq.h | 2 +- + drivers/mmc/core/pwrseq_emmc.c | 2 +- + drivers/mmc/core/pwrseq_simple.c | 2 +- + drivers/mmc/core/sd.c | 17 +- + drivers/mmc/core/sdio.c | 2 +- + drivers/mmc/core/sdio_bus.c | 1 + + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/atmel-mci-regs.h | 171 -------------------- + drivers/mmc/host/atmel-mci.c | 165 ++++++++++++++++++- + drivers/mmc/host/cb710-mmc.h | 3 +- + drivers/mmc/host/dw_mmc-pltfm.c | 2 +- + drivers/mmc/host/dw_mmc-rockchip.c | 8 - + drivers/mmc/host/dw_mmc.c | 21 +-- + drivers/mmc/host/mtk-sd.c | 9 +- + drivers/mmc/host/mvsdio.c | 58 ++----- + drivers/mmc/host/of_mmc_spi.c | 4 +- + drivers/mmc/host/omap_hsmmc.c | 6 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 7 +- + drivers/mmc/host/sdhci-of-at91.c | 75 ++++++++- + drivers/mmc/host/sdhci-of-esdhc.c | 10 ++ + drivers/mmc/host/sdhci-pci-core.c | 6 +- + drivers/mmc/host/sdhci-pltfm.c | 3 +- + drivers/mmc/host/sdhci-tegra.c | 178 +++++++++++++++++---- + drivers/mmc/host/sdhci.c | 124 ++++++-------- + drivers/mmc/host/sdhci.h | 21 +-- + drivers/mmc/host/sh_mmcif.c | 84 +++++----- + drivers/mmc/host/usdhi6rol0.c | 3 +- + include/linux/mmc/dw_mmc.h | 12 +- + include/linux/mmc/host.h | 6 +- + include/linux/platform_data/mmc-mvsdio.h | 18 --- + lib/Kconfig.debug | 3 +- + 40 files changed, 626 insertions(+), 549 deletions(-) + delete mode 100644 drivers/mmc/host/atmel-mci-regs.h + delete mode 100644 include/linux/platform_data/mmc-mvsdio.h +Merging kgdb/kgdb-next (2d289f14f00a kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (649ce6e4af6d raid5-cache: handle journal hotadd in quiesce) +$ git merge md/for-next +Merge made by the 'recursive' strategy. + Documentation/md-cluster.txt | 314 ++++++++++++++++++++++++++++++----------- + drivers/md/md-cluster.c | 164 +++++++++++++++++++-- + drivers/md/md-cluster.h | 2 + + drivers/md/md.c | 143 ++++++++++++------- + drivers/md/md.h | 9 +- + drivers/md/raid5-cache.c | 177 +++++++++++++++++------ + drivers/md/raid5.c | 56 +++++--- + drivers/md/raid5.h | 10 +- + include/uapi/linux/raid/md_u.h | 4 +- + 9 files changed, 650 insertions(+), 229 deletions(-) +Merging mfd/for-mfd-next (526c0ab13672 mfd: syscon: Add a DT property to set value width) +$ git merge mfd/for-mfd-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 2 +- + Documentation/devicetree/bindings/mfd/arizona.txt | 11 +- + Documentation/devicetree/bindings/mfd/palmas.txt | 2 +- + Documentation/devicetree/bindings/mfd/syscon.txt | 4 + + Documentation/devicetree/bindings/sound/wm8994.txt | 2 +- + MAINTAINERS | 2 + + drivers/mfd/Kconfig | 18 +- + drivers/mfd/Makefile | 6 +- + drivers/mfd/ab8500-core.c | 482 ------ + drivers/mfd/arizona-core.c | 74 +- + drivers/mfd/arizona-irq.c | 40 +- + drivers/mfd/arizona-spi.c | 7 + + drivers/mfd/arizona.h | 4 + + drivers/mfd/as3722.c | 30 + + drivers/mfd/cros_ec_spi.c | 30 +- + drivers/mfd/cs47l24-tables.c | 1629 ++++++++++++++++++++ + drivers/mfd/da903x.c | 4 +- + drivers/mfd/lpc_ich.c | 15 + + drivers/mfd/mc13xxx-core.c | 8 +- + drivers/mfd/qcom_rpm.c | 2 + + drivers/mfd/sec-core.c | 39 +- + drivers/mfd/sec-irq.c | 8 + + drivers/mfd/syscon.c | 13 + + drivers/mfd/wm5110-tables.c | 6 +- + drivers/regulator/Kconfig | 4 +- + drivers/regulator/s2mps11.c | 143 +- + drivers/rtc/rtc-s5m.c | 37 +- + include/linux/mfd/arizona/core.h | 3 + + include/linux/mfd/samsung/core.h | 1 + + include/linux/mfd/samsung/rtc.h | 2 + + include/linux/mfd/samsung/s2mps15.h | 158 ++ + 31 files changed, 2237 insertions(+), 549 deletions(-) + create mode 100644 drivers/mfd/cs47l24-tables.c + create mode 100644 include/linux/mfd/samsung/s2mps15.h +Merging backlight/for-backlight-next (ee65ad0e2a9e backlight: pwm_bl: Avoid backlight flicker when probed from DT) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/adp8860_bl.c | 10 ++++++---- + drivers/video/backlight/adp8870_bl.c | 10 ++++++---- + drivers/video/backlight/pwm_bl.c | 23 ++++++++++++++++++++++- + 3 files changed, 34 insertions(+), 9 deletions(-) +Merging battery/master (6b9140f39c2a power: test_power: correctly handle empty writes) +$ git merge battery/master +Merge made by the 'recursive' strategy. + drivers/Makefile | 2 +- + drivers/power/Kconfig | 17 +- + drivers/power/Makefile | 1 + + drivers/power/bq2415x_charger.c | 6 +- + drivers/power/bq27xxx_battery.c | 346 ++++------------------------------ + drivers/power/bq27xxx_battery_i2c.c | 150 +++++++++++++++ + drivers/power/ds2782_battery.c | 4 +- + drivers/power/generic-adc-battery.c | 2 +- + drivers/power/isp1704_charger.c | 2 +- + drivers/power/max8903_charger.c | 24 +-- + drivers/power/reset/at91-reset.c | 1 + + drivers/power/test_power.c | 2 + + include/linux/power/bq27xxx_battery.h | 57 +++++- + 13 files changed, 263 insertions(+), 351 deletions(-) + create mode 100644 drivers/power/bq27xxx_battery_i2c.c +Merging omap_dss2/for-next (caf05780f6ed Merge omapdss split between omapdrm and omapfb) +$ git merge omap_dss2/for-next +Removing include/video/sh_mobile_hdmi.h +Removing drivers/video/fbdev/sh_mobile_hdmi.c +Auto-merging drivers/gpu/drm/omapdrm/dss/venc.c +Auto-merging drivers/gpu/drm/omapdrm/dss/sdi.c +Auto-merging drivers/gpu/drm/omapdrm/dss/rfbi.c +Auto-merging drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +Auto-merging drivers/gpu/drm/omapdrm/dss/manager.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi5.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi4.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dss_features.h +Auto-merging drivers/gpu/drm/omapdrm/dss/dss_features.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dss.h +Auto-merging drivers/gpu/drm/omapdrm/dss/dss.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dsi.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dpi.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dispc.h +Auto-merging drivers/gpu/drm/omapdrm/dss/dispc.c +Auto-merging drivers/gpu/drm/omapdrm/dss/dispc-compat.c +Auto-merging drivers/gpu/drm/omapdrm/displays/panel-dpi.c +Auto-merging drivers/gpu/drm/omapdrm/displays/Kconfig +Auto-merging drivers/gpu/drm/omapdrm/Makefile +Auto-merging drivers/gpu/drm/Makefile +Merge made by the 'recursive' strategy. + .../bindings/display/simple-framebuffer.txt | 13 +- + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 10 +- + drivers/gpu/drm/omapdrm/Makefile | 3 + + .../drm/omapdrm/displays}/Kconfig | 3 +- + .../drm/omapdrm/displays}/Makefile | 0 + .../drm/omapdrm/displays}/connector-analog-tv.c | 0 + .../drm/omapdrm/displays}/connector-dvi.c | 0 + .../drm/omapdrm/displays}/connector-hdmi.c | 0 + .../drm/omapdrm/displays}/encoder-opa362.c | 0 + .../drm/omapdrm/displays}/encoder-tfp410.c | 0 + .../drm/omapdrm/displays}/encoder-tpd12s015.c | 0 + .../drm/omapdrm/displays}/panel-dpi.c | 8 +- + .../drm/omapdrm/displays}/panel-dsi-cm.c | 0 + .../omapdrm/displays}/panel-lgphilips-lb035q02.c | 0 + .../drm/omapdrm/displays}/panel-nec-nl8048hl11.c | 0 + .../omapdrm/displays}/panel-sharp-ls037v7dw01.c | 0 + .../drm/omapdrm/displays}/panel-sony-acx565akm.c | 0 + .../drm/omapdrm/displays}/panel-tpo-td028ttec1.c | 0 + .../drm/omapdrm/displays}/panel-tpo-td043mtea1.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c | 6 +- + .../omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c | 163 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h | 2 + + .../omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c | 2 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c | 4 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c | 6 + + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h | 8 +- + .../omap2 => gpu/drm/omapdrm}/dss/dss_features.c | 11 - + .../omap2 => gpu/drm/omapdrm}/dss/dss_features.h | 5 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c | 2 +- + .../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c | 2 +- + .../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h | 0 + .../omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c | 2 +- + .../drm/omapdrm}/dss/omapdss-boot-init.c | 4 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c | 0 + .../omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c | 0 + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c | 2 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c | 2 +- + .../fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c | 2 +- + .../omap2 => gpu/drm/omapdrm}/dss/video-pll.c | 0 + drivers/media/platform/omap/Kconfig | 2 +- + drivers/video/fbdev/Kconfig | 17 +- + drivers/video/fbdev/Makefile | 1 - + drivers/video/fbdev/auo_k190x.c | 11 +- + drivers/video/fbdev/core/Makefile | 2 +- + drivers/video/fbdev/core/fbmem.c | 14 +- + drivers/video/fbdev/geode/display_gx1.c | 2 +- + drivers/video/fbdev/geode/display_gx1.h | 2 +- + drivers/video/fbdev/geode/geodefb.h | 4 +- + drivers/video/fbdev/geode/video_cs5530.c | 2 +- + drivers/video/fbdev/geode/video_cs5530.h | 2 +- + drivers/video/fbdev/i740fb.c | 8 +- + drivers/video/fbdev/omap2/Kconfig | 5 - + drivers/video/fbdev/omap2/Makefile | 6 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 14 +- + drivers/video/fbdev/omap2/omapfb/Makefile | 3 + + drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 86 + + drivers/video/fbdev/omap2/omapfb/displays/Makefile | 14 + + .../omap2/omapfb/displays/connector-analog-tv.c | 320 ++ + .../fbdev/omap2/omapfb/displays/connector-dvi.c | 398 ++ + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 348 ++ + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 278 + + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 320 ++ + .../omap2/omapfb/displays/encoder-tpd12s015.c | 328 ++ + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 328 ++ + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 1388 +++++ + .../omapfb/displays/panel-lgphilips-lb035q02.c | 404 ++ + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 437 ++ + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 415 ++ + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 917 ++++ + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 511 ++ + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 686 +++ + drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 129 + + drivers/video/fbdev/omap2/omapfb/dss/Makefile | 18 + + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1702 ++++++ + drivers/video/fbdev/omap2/omapfb/dss/core.c | 343 ++ + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 667 +++ + .../video/fbdev/omap2/omapfb/dss/dispc-compat.h | 30 + + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4234 +++++++++++++++ + drivers/video/fbdev/omap2/omapfb/dss/dispc.h | 918 ++++ + drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c | 325 ++ + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 356 ++ + drivers/video/fbdev/omap2/omapfb/dss/display.c | 338 ++ + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 899 ++++ + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 5607 ++++++++++++++++++++ + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 183 + + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 1329 +++++ + drivers/video/fbdev/omap2/omapfb/dss/dss.h | 468 ++ + .../video/fbdev/omap2/omapfb/dss/dss_features.c | 951 ++++ + .../video/fbdev/omap2/omapfb/dss/dss_features.h | 108 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 370 ++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 839 +++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c | 904 ++++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h | 273 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 876 +++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 916 ++++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h | 304 ++ + drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c | 148 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 247 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c | 255 + + drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c | 282 + + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 531 ++ + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 263 + + .../fbdev/omap2/omapfb/dss/omapdss-boot-init.c | 225 + + drivers/video/fbdev/omap2/omapfb/dss/output.c | 267 + + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 456 ++ + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 202 + + drivers/video/fbdev/omap2/omapfb/dss/pll.c | 389 ++ + drivers/video/fbdev/omap2/omapfb/dss/rfbi.c | 1078 ++++ + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 454 ++ + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 997 ++++ + drivers/video/fbdev/omap2/omapfb/dss/video-pll.c | 211 + + drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c | 0 + drivers/video/fbdev/pxafb.c | 210 +- + drivers/video/fbdev/pxafb.h | 2 + + drivers/video/fbdev/riva/fbdev.c | 1 + + drivers/video/fbdev/sh_mobile_hdmi.c | 1489 ------ + drivers/video/fbdev/simplefb.c | 120 +- + drivers/video/fbdev/sm712fb.c | 16 +- + include/linux/fb.h | 18 + + include/video/omapdss.h | 5 +- + include/video/sh_mobile_hdmi.h | 49 - + 142 files changed, 36835 insertions(+), 1702 deletions(-) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Kconfig (96%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/Makefile (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-analog-tv.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-dvi.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/connector-hdmi.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-opa362.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tfp410.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/encoder-tpd12s015.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dpi.c (98%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-dsi-cm.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-lgphilips-lb035q02.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-nec-nl8048hl11.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sharp-ls037v7dw01.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-sony-acx565akm.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td028ttec1.c (100%) + rename drivers/{video/fbdev/omap2/displays-new => gpu/drm/omapdrm/displays}/panel-tpo-td043mtea1.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Kconfig (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/Makefile (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/apply.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/core.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.c (98%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc-compat.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.c (96%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc.h (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dispc_coefs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display-sysfs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/display.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dpi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dsi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss-of.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss.h (97%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/dss_features.h (94%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi4_core.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi5_core.h (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_common.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_phy.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_pll.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/hdmi_wp.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager-sysfs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/manager.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/omapdss-boot-init.c (98%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/output.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay-sysfs.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/overlay.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/pll.c (100%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/rfbi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/sdi.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/venc.c (99%) + rename drivers/{video/fbdev/omap2 => gpu/drm/omapdrm}/dss/video-pll.c (100%) + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Kconfig + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/Makefile + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-analog-tv.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-dvi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/connector-hdmi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-opa362.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tfp410.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/encoder-tpd12s015.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dpi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-dsi-cm.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-lgphilips-lb035q02.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-nec-nl8048hl11.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sharp-ls037v7dw01.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-sony-acx565akm.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td028ttec1.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/displays/panel-tpo-td043mtea1.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Kconfig + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/Makefile + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/apply.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/core.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc-compat.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dispc_coefs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display-sysfs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/display.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dpi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dsi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss-of.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/dss_features.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi4_core.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.h + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_common.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_pll.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/hdmi_wp.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager-sysfs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/manager.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/output.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay-sysfs.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/overlay.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/pll.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/rfbi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/sdi.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/venc.c + create mode 100644 drivers/video/fbdev/omap2/omapfb/dss/video-pll.c + rename drivers/video/fbdev/omap2/{ => omapfb}/vrfb.c (100%) + delete mode 100644 drivers/video/fbdev/sh_mobile_hdmi.c + delete mode 100644 include/video/sh_mobile_hdmi.h +Merging regulator/for-next (9540a8b2f4b2 Merge remote-tracking branches 'regulator/topic/tps65218' and 'regulator/topic/wm831x' into regulator-next) +$ git merge regulator/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging Documentation/devicetree/bindings/regulator/qcom,smd-rpm-regulator.txt +Merge made by the 'recursive' strategy. + .../bindings/regulator/lm363x-regulator.txt | 34 ++ + .../bindings/regulator/max8973-regulator.txt | 5 + + .../devicetree/bindings/regulator/pv88060.txt | 124 ++++++ + .../devicetree/bindings/regulator/pv88090.txt | 65 +++ + .../qcom,smd-rpm-regulator.txt} | 84 +++- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 58 +++ + drivers/regulator/Kconfig | 33 ++ + drivers/regulator/Makefile | 4 + + drivers/regulator/axp20x-regulator.c | 4 +- + drivers/regulator/core.c | 41 +- + drivers/regulator/da903x.c | 10 +- + drivers/regulator/da9052-regulator.c | 4 +- + drivers/regulator/da9055-regulator.c | 4 +- + drivers/regulator/da9062-regulator.c | 4 +- + drivers/regulator/da9063-regulator.c | 4 +- + drivers/regulator/da9210-regulator.c | 2 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/devres.c | 7 +- + drivers/regulator/lm363x-regulator.c | 291 +++++++++++++ + drivers/regulator/lp872x.c | 17 +- + drivers/regulator/lp8788-buck.c | 4 +- + drivers/regulator/lp8788-ldo.c | 20 +- + drivers/regulator/max8973-regulator.c | 140 ++++++- + drivers/regulator/mt6311-regulator.c | 1 + + drivers/regulator/palmas-regulator.c | 39 ++ + drivers/regulator/pv88060-regulator.c | 437 ++++++++++++++++++++ + drivers/regulator/pv88060-regulator.h | 69 ++++ + drivers/regulator/pv88090-regulator.c | 458 +++++++++++++++++++++ + drivers/regulator/pv88090-regulator.h | 98 +++++ + drivers/regulator/qcom_smd-regulator.c | 159 +++++++ + drivers/regulator/tps6105x-regulator.c | 95 +---- + drivers/regulator/tps65086-regulator.c | 251 +++++++++++ + drivers/regulator/tps65218-regulator.c | 137 ++++-- + drivers/regulator/wm831x-dcdc.c | 39 +- + drivers/regulator/wm831x-isink.c | 2 +- + drivers/regulator/wm831x-ldo.c | 33 +- + drivers/regulator/wm8350-regulator.c | 8 +- + drivers/regulator/wm8400-regulator.c | 4 +- + drivers/regulator/wm8994-regulator.c | 4 +- + include/linux/mfd/tps65218.h | 7 +- + include/linux/regulator/consumer.h | 3 + + include/linux/regulator/driver.h | 2 + + include/linux/regulator/max8973-regulator.h | 4 + + 43 files changed, 2561 insertions(+), 250 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/lm363x-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pv88060.txt + create mode 100644 Documentation/devicetree/bindings/regulator/pv88090.txt + rename Documentation/devicetree/bindings/{soc/qcom,smd-rpm.txt => regulator/qcom,smd-rpm-regulator.txt} (53%) + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,smd-rpm.txt + create mode 100644 drivers/regulator/lm363x-regulator.c + create mode 100644 drivers/regulator/pv88060-regulator.c + create mode 100644 drivers/regulator/pv88060-regulator.h + create mode 100644 drivers/regulator/pv88090-regulator.c + create mode 100644 drivers/regulator/pv88090-regulator.h + create mode 100644 drivers/regulator/tps65086-regulator.c +Merging security/next (607259e17b37 Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into ra-next) +$ git merge security/next +Auto-merging security/smack/smack_lsm.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/keys/trusted.c +Auto-merging security/keys/keyctl.c +Auto-merging security/integrity/iint.c +Merge made by the 'recursive' strategy. + Documentation/security/keys-trusted-encrypted.txt | 31 ++- + crypto/asymmetric_keys/x509_public_key.c | 2 + + crypto/hash_info.c | 2 + + drivers/char/tpm/tpm-interface.c | 23 +- + drivers/char/tpm/tpm.h | 11 +- + drivers/char/tpm/tpm2-cmd.c | 60 ++++- + drivers/char/tpm/tpm_crb.c | 14 +- + drivers/char/tpm/tpm_ibmvtpm.c | 22 +- + drivers/char/tpm/tpm_ibmvtpm.h | 1 + + drivers/char/tpm/tpm_tis.c | 256 ++++++++---------- + fs/gfs2/glops.c | 2 + + include/crypto/hash_info.h | 3 + + include/keys/system_keyring.h | 24 ++ + include/keys/trusted-type.h | 5 + + include/linux/audit.h | 8 +- + include/linux/capability.h | 22 +- + include/linux/evm.h | 7 + + include/linux/key.h | 1 + + include/linux/lsm_hooks.h | 10 +- + include/linux/security.h | 13 +- + include/uapi/linux/hash_info.h | 1 + + kernel/audit.c | 2 +- + kernel/audit.h | 2 +- + kernel/auditsc.c | 6 +- + security/integrity/Kconfig | 11 + + security/integrity/digsig.c | 14 +- + security/integrity/digsig_asymmetric.c | 14 + + security/integrity/evm/Kconfig | 17 ++ + security/integrity/evm/evm.h | 3 + + security/integrity/evm/evm_crypto.c | 54 +++- + security/integrity/evm/evm_main.c | 32 ++- + security/integrity/evm/evm_secfs.c | 12 +- + security/integrity/iint.c | 1 + + security/integrity/ima/Kconfig | 44 +++- + security/integrity/ima/Makefile | 1 + + security/integrity/ima/ima.h | 24 +- + security/integrity/ima/ima_fs.c | 53 +++- + security/integrity/ima/ima_init.c | 2 +- + security/integrity/ima/ima_mok.c | 55 ++++ + security/integrity/ima/ima_policy.c | 301 +++++++++++++++++++--- + security/integrity/integrity.h | 13 +- + security/keys/Kconfig | 1 + + security/keys/key.c | 5 +- + security/keys/keyctl.c | 49 +++- + security/keys/trusted.c | 56 +++- + security/security.c | 12 +- + security/selinux/hooks.c | 206 ++++++++++----- + security/selinux/include/classmap.h | 2 +- + security/selinux/include/objsec.h | 6 + + security/selinux/include/security.h | 3 + + security/selinux/selinuxfs.c | 80 ++++++ + security/selinux/ss/services.c | 34 ++- + security/smack/smack_lsm.c | 28 +- + 53 files changed, 1287 insertions(+), 374 deletions(-) + create mode 100644 security/integrity/ima/ima_mok.c +Merging integrity/next (1d6d167c2efc KEYS: refcount bug fix) +$ git merge integrity/next +Already up-to-date. +Merging selinux/next (76319946f321 selinux: rate-limit netlink message warnings in selinux_nlmsg_perm()) +$ git merge selinux/next +Already up-to-date. +Merging lblnet/next (b2776bf7149b Linux 3.18) +$ git merge lblnet/next +Already up-to-date. +Merging watchdog/master (ab3f09fe16d1 watchdog: add MT7621 watchdog support) +$ git merge watchdog/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-watchdog | 51 ++ + .../bindings/watchdog/alphascale-asm9260.txt | 35 ++ + .../devicetree/bindings/watchdog/mt7621-wdt.txt | 12 + + .../bindings/watchdog/sigma,smp8642-wdt.txt | 18 + + .../devicetree/bindings/watchdog/ts4800-wdt.txt | 25 + + .../devicetree/bindings/watchdog/ziirave-wdt.txt | 19 + + Documentation/watchdog/watchdog-kernel-api.txt | 72 ++- + MAINTAINERS | 1 + + drivers/hwmon/sch56xx-common.c | 31 +- + drivers/watchdog/Kconfig | 65 +++ + drivers/watchdog/Makefile | 6 + + drivers/watchdog/asm9260_wdt.c | 403 +++++++++++++++ + drivers/watchdog/atlas7_wdt.c | 242 +++++++++ + drivers/watchdog/bcm2835_wdt.c | 1 - + drivers/watchdog/bcm47xx_wdt.c | 55 +- + drivers/watchdog/cadence_wdt.c | 42 +- + drivers/watchdog/da9052_wdt.c | 24 - + drivers/watchdog/da9055_wdt.c | 24 - + drivers/watchdog/da9063_wdt.c | 23 +- + drivers/watchdog/diag288_wdt.c | 26 +- + drivers/watchdog/digicolor_wdt.c | 18 +- + drivers/watchdog/dw_wdt.c | 2 +- + drivers/watchdog/gpio_wdt.c | 38 +- + drivers/watchdog/hpwdt.c | 12 +- + drivers/watchdog/imgpdc_wdt.c | 34 +- + drivers/watchdog/imx2_wdt.c | 23 +- + drivers/watchdog/lpc18xx_wdt.c | 52 +- + drivers/watchdog/mena21_wdt.c | 4 +- + drivers/watchdog/meson_wdt.c | 88 ++-- + drivers/watchdog/moxart_wdt.c | 23 +- + drivers/watchdog/mt7621_wdt.c | 186 +++++++ + drivers/watchdog/mtk_wdt.c | 22 +- + drivers/watchdog/omap_wdt.c | 7 +- + drivers/watchdog/qcom-wdt.c | 50 +- + drivers/watchdog/s3c2410_wdt.c | 60 +-- + drivers/watchdog/softdog.c | 38 +- + drivers/watchdog/sp5100_tco.c | 32 +- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 28 + + drivers/watchdog/sunxi_wdt.c | 23 +- + drivers/watchdog/tangox_wdt.c | 225 ++++++++ + drivers/watchdog/ts4800_wdt.c | 215 ++++++++ + drivers/watchdog/w83627hf_wdt.c | 32 +- + drivers/watchdog/watchdog_core.c | 115 +++-- + drivers/watchdog/watchdog_core.h | 2 +- + drivers/watchdog/watchdog_dev.c | 570 ++++++++++++++------- + drivers/watchdog/ziirave_wdt.c | 381 ++++++++++++++ + include/linux/bcm47xx_wdt.h | 3 - + include/linux/watchdog.h | 35 +- + 48 files changed, 2683 insertions(+), 810 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-watchdog + create mode 100644 Documentation/devicetree/bindings/watchdog/alphascale-asm9260.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/mt7621-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/sigma,smp8642-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/ts4800-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/ziirave-wdt.txt + create mode 100644 drivers/watchdog/asm9260_wdt.c + create mode 100644 drivers/watchdog/atlas7_wdt.c + create mode 100644 drivers/watchdog/mt7621_wdt.c + create mode 100644 drivers/watchdog/tangox_wdt.c + create mode 100644 drivers/watchdog/ts4800_wdt.c + create mode 100644 drivers/watchdog/ziirave_wdt.c +Merging iommu/next (dabc4de14132 Merge branches 'iommu/fixes', 's390', 'arm/renesas', 'arm/msm', 'arm/shmobile', 'arm/smmu', 'x86/amd' and 'x86/vt-d' into next) +$ git merge iommu/next +Removing drivers/iommu/shmobile-ipmmu.h +Removing drivers/iommu/shmobile-ipmmu.c +Removing drivers/iommu/shmobile-iommu.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 12 +- + drivers/iommu/Kconfig | 75 ---- + drivers/iommu/Makefile | 2 - + drivers/iommu/amd_iommu.c | 396 ++++++++++++-------- + drivers/iommu/amd_iommu_types.h | 40 -- + drivers/iommu/amd_iommu_v2.c | 38 +- + drivers/iommu/arm-smmu-v3.c | 210 ++++------- + drivers/iommu/arm-smmu.c | 23 +- + drivers/iommu/dmar.c | 12 +- + drivers/iommu/io-pgtable-arm.c | 49 +-- + drivers/iommu/io-pgtable.h | 6 +- + drivers/iommu/ipmmu-vmsa.c | 4 +- + drivers/iommu/msm_iommu_dev.c | 25 +- + drivers/iommu/s390-iommu.c | 4 +- + drivers/iommu/shmobile-iommu.c | 402 --------------------- + drivers/iommu/shmobile-ipmmu.c | 129 ------- + drivers/iommu/shmobile-ipmmu.h | 34 -- + 17 files changed, 411 insertions(+), 1050 deletions(-) + delete mode 100644 drivers/iommu/shmobile-iommu.c + delete mode 100644 drivers/iommu/shmobile-ipmmu.c + delete mode 100644 drivers/iommu/shmobile-ipmmu.h +Merging dwmw2-iommu/master (0bdec95ce52d iommu/vt-d: Fix rwxp flags in SVM device fault callback) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (d4f50ee2f5b4 vfio/iommu_type1: make use of info.flags) +$ git merge vfio/next +Merge made by the 'recursive' strategy. + drivers/vfio/Kconfig | 15 ++ + drivers/vfio/pci/vfio_pci.c | 8 +- + .../vfio/platform/reset/vfio_platform_amdxgbe.c | 2 +- + drivers/vfio/vfio.c | 184 ++++++++++++++++++++- + drivers/vfio/vfio_iommu_type1.c | 2 +- + include/linux/vfio.h | 3 + + include/uapi/linux/vfio.h | 9 + + 7 files changed, 214 insertions(+), 9 deletions(-) +Merging jc_docs/docs-next (9daacf51b428 Documentation/kernel-parameters: update KMG units) +$ git merge jc_docs/docs-next +Auto-merging scripts/kernel-doc +Auto-merging mm/page_alloc.c +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/DocBook/Makefile | 10 ++- + Documentation/DocBook/iio.tmpl | 2 +- + Documentation/HOWTO | 2 +- + Documentation/accounting/getdelays.c | 3 +- + Documentation/arm/Marvell/README | 19 ++--- + Documentation/block/cfq-iosched.txt | 15 ++-- + Documentation/cpu-hotplug.txt | 2 +- + Documentation/filesystems/sharedsubtree.txt | 2 +- + Documentation/gpio/consumer.txt | 2 +- + Documentation/gpio/driver.txt | 6 +- + Documentation/gpio/drivers-on-gpio.txt | 6 +- + Documentation/ioctl/botching-up-ioctls.txt | 6 +- + Documentation/ja_JP/HOWTO | 1 - + Documentation/kernel-parameters.txt | 104 +++++++++++++++------------- + Documentation/ko_KR/HOWTO | 27 ++++---- + Documentation/networking/can.txt | 9 +++ + Documentation/stable_kernel_rules.txt | 2 +- + Documentation/vm/slub.txt | 2 +- + init/do_mounts_rd.c | 7 -- + kernel/crash_dump.c | 2 +- + mm/page_alloc.c | 2 +- + scripts/kernel-doc | 5 +- + 22 files changed, 124 insertions(+), 112 deletions(-) +Merging trivial/for-next (bcf4299e6215 floppy: make local variable non-static) +$ git merge trivial/for-next +Auto-merging lib/Kconfig +Auto-merging fs/super.c +Auto-merging drivers/net/ethernet/intel/i40evf/i40evf_main.c +Auto-merging drivers/media/pci/netup_unidvb/netup_unidvb_core.c +Auto-merging drivers/media/dvb-frontends/si2165.c +Auto-merging drivers/media/common/saa7146/saa7146_video.c +Auto-merging drivers/infiniband/hw/cxgb4/cm.c +Auto-merging drivers/gpu/drm/exynos/exynos_drm_fb.h +Auto-merging Documentation/sysctl/vm.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-ptp | 2 +- + Documentation/devicetree/bindings/cpufreq/arm_big_little_dt.txt | 2 +- + Documentation/devicetree/bindings/cpufreq/cpufreq-dt.txt | 2 +- + Documentation/sysctl/vm.txt | 4 ++-- + drivers/block/floppy.c | 5 +++-- + drivers/firmware/efi/libstub/fdt.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fb.h | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 2 +- + drivers/md/raid0.c | 4 ++-- + drivers/media/common/saa7146/saa7146_video.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/si2165.c | 4 ++-- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 2 +- + drivers/soc/ti/knav_dma.c | 2 +- + fs/eventfd.c | 4 ++-- + fs/super.c | 2 +- + include/dt-bindings/leds/common.h | 2 +- + include/dt-bindings/mfd/palmas.h | 2 +- + lib/Kconfig | 6 +++--- + sound/drivers/pcm-indirect2.c | 2 +- + sound/usb/6fire/firmware.c | 2 +- + 22 files changed, 30 insertions(+), 29 deletions(-) +Merging audit/next (09eccd1da92b audit: always enable syscall auditing when supported and audit is enabled) +$ git merge audit/next +Resolved 'kernel/audit.c' using previous resolution. +Auto-merging kernel/audit.c +CONFLICT (content): Merge conflict in kernel/audit.c +Auto-merging init/Kconfig +Auto-merging include/linux/audit.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cd82aaefe364] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + include/linux/audit.h | 204 +++++++++++++++++++++++++------------------------- + init/Kconfig | 11 +-- + kernel/audit.c | 17 ++--- + 3 files changed, 114 insertions(+), 118 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 (fcd71d9cc6e3 of: fix declaration of of_io_request_and_map) +$ git merge dt-rh/for-next +Auto-merging drivers/of/irq.c +Auto-merging drivers/of/address.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/sram/sunxi-sram.txt +Auto-merging Documentation/devicetree/bindings/sram/samsung-sram.txt +Auto-merging Documentation/devicetree/bindings/sram/rockchip-smp-sram.txt +Auto-merging Documentation/devicetree/bindings/net/macb.txt +Removing Documentation/devicetree/bindings/net/cdns-emac.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/arm,scpi.txt | 2 +- + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + Documentation/devicetree/bindings/arm/secure.txt | 53 ++++++++++++++++++ + .../devicetree/bindings/display/bridge/tda998x.txt | 4 ++ + .../interrupt-controller/qca,ath79-misc-intc.txt | 2 +- + .../memory-controllers/ath79-ddr-controller.txt | 8 +-- + .../devicetree/bindings/mtd/fsl-quadspi.txt | 3 +- + .../devicetree/bindings/net/cdns-emac.txt | 20 ------- + Documentation/devicetree/bindings/net/macb.txt | 3 ++ + .../pmu-sram.txt => sram/rockchip-pmu-sram.txt} | 0 + .../smp-sram.txt => sram/rockchip-smp-sram.txt} | 2 +- + .../smp-sysram.txt => sram/samsung-sram.txt} | 2 +- + .../devicetree/bindings/{misc => sram}/sram.txt | 0 + .../{soc/sunxi/sram.txt => sram/sunxi-sram.txt} | 2 +- + .../devicetree/bindings/usb/octeon-usb.txt | 62 ++++++++++++++++++++++ + Documentation/devicetree/bindings/usb/usb3503.txt | 5 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/of/address.c | 2 +- + drivers/of/irq.c | 27 +++++----- + include/linux/of_address.h | 19 +++---- + 20 files changed, 161 insertions(+), 57 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/secure.txt + delete mode 100644 Documentation/devicetree/bindings/net/cdns-emac.txt + rename Documentation/devicetree/bindings/{arm/rockchip/pmu-sram.txt => sram/rockchip-pmu-sram.txt} (100%) + rename Documentation/devicetree/bindings/{arm/rockchip/smp-sram.txt => sram/rockchip-smp-sram.txt} (92%) + rename Documentation/devicetree/bindings/{arm/exynos/smp-sysram.txt => sram/samsung-sram.txt} (95%) + rename Documentation/devicetree/bindings/{misc => sram}/sram.txt (100%) + rename Documentation/devicetree/bindings/{soc/sunxi/sram.txt => sram/sunxi-sram.txt} (97%) + create mode 100644 Documentation/devicetree/bindings/usb/octeon-usb.txt +Merging mailbox/mailbox-for-next (bfbcfa770b1c mailbox: constify mbox_chan_ops structure) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/mailbox-sti.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi/for-next (0aa267547b97 Merge remote-tracking branches 'spi/topic/spidev', 'spi/topic/sun4i', 'spi/topic/topcliff-pch' and 'spi/topic/zynq' into spi-next) +$ git merge spi/for-next +Auto-merging tools/spi/spidev_test.c +Auto-merging drivers/spi/spi.c +Auto-merging arch/arm/plat-samsung/devs.c +Removing Documentation/spi/Makefile +Merge made by the 'recursive' strategy. + Documentation/Makefile | 2 +- + Documentation/devicetree/bindings/spi/sh-msiof.txt | 1 + + .../devicetree/bindings/spi/spi-mt65xx.txt | 9 +- + Documentation/spi/00-INDEX | 4 - + Documentation/spi/Makefile | 8 - + arch/arm/plat-samsung/devs.c | 19 +- + drivers/spi/Kconfig | 11 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-atmel.c | 44 +- + drivers/spi/spi-bcm63xx.c | 7 +- + drivers/spi/spi-butterfly.c | 30 +- + drivers/spi/spi-cadence.c | 6 +- + drivers/spi/spi-davinci.c | 17 +- + drivers/spi/spi-dw-mid.c | 2 +- + drivers/spi/spi-dw.c | 2 +- + drivers/spi/spi-dw.h | 2 +- + drivers/spi/spi-fsl-espi.c | 6 + + drivers/spi/spi-imx.c | 101 +- + drivers/spi/spi-lm70llp.c | 43 +- + drivers/spi/spi-loopback-test.c | 1005 ++++++++++++++++++++ + drivers/spi/spi-mt65xx.c | 64 +- + drivers/spi/spi-omap2-mcspi.c | 31 +- + drivers/spi/spi-pxa2xx.c | 3 - + drivers/spi/spi-s3c64xx.c | 33 +- + drivers/spi/spi-sun4i.c | 14 +- + drivers/spi/spi-sun6i.c | 8 +- + drivers/spi/spi-test.h | 136 +++ + drivers/spi/spi-zynqmp-gqspi.c | 8 +- + drivers/spi/spi.c | 32 +- + drivers/spi/spidev.c | 2 +- + include/linux/platform_data/spi-s3c64xx.h | 2 + + include/linux/spi/spi.h | 29 +- + tools/Makefile | 7 +- + {Documentation => tools}/spi/.gitignore | 0 + tools/spi/Makefile | 4 + + {Documentation => tools}/spi/spidev_fdx.c | 0 + {Documentation => tools}/spi/spidev_test.c | 119 ++- + 37 files changed, 1558 insertions(+), 254 deletions(-) + delete mode 100644 Documentation/spi/Makefile + create mode 100644 drivers/spi/spi-loopback-test.c + create mode 100644 drivers/spi/spi-test.h + rename {Documentation => tools}/spi/.gitignore (100%) + create mode 100644 tools/spi/Makefile + rename {Documentation => tools}/spi/spidev_fdx.c (100%) + rename {Documentation => tools}/spi/spidev_test.c (75%) +Merging tip/auto-latest (5852b88267ad Merge branch 'x86/urgent') +$ git merge tip/auto-latest +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Resolved 'arch/h8300/Kconfig' using previous resolution. +Removing tools/perf/util/include/linux/string.h +Removing tools/perf/util/exec_cmd.h +Removing tools/perf/util/exec_cmd.c +Removing tools/perf/util/environment.c +Auto-merging tools/lib/traceevent/event-parse.c +Auto-merging tools/lib/subcmd/sigchain.h +Auto-merging tools/lib/subcmd/sigchain.c +Auto-merging tools/lib/subcmd/run-command.h +Auto-merging tools/lib/subcmd/run-command.c +Auto-merging tools/lib/subcmd/parse-options.h +Auto-merging tools/lib/subcmd/parse-options.c +Auto-merging tools/lib/subcmd/pager.c +Auto-merging tools/lib/subcmd/help.h +Auto-merging tools/lib/subcmd/help.c +Auto-merging tools/Makefile +Auto-merging include/linux/wait.h +Removing include/linux/platform_data/irq-renesas-intc-irqpin.h +Auto-merging include/linux/pci.h +Auto-merging include/linux/msi.h +Auto-merging include/linux/interrupt.h +Auto-merging fs/btrfs/disk-io.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/pci/msi.c +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/crypto/padlock-aes.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/h8300/Kconfig +CONFLICT (content): Merge conflict in arch/h8300/Kconfig +Auto-merging arch/arm/mach-ux500/Kconfig +Auto-merging arch/arm/mach-sti/Kconfig +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Auto-merging Documentation/devicetree/bindings/interrupt-controller/allwinner,sunxi-nmi.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b0f628623ec9] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Requirements/2013-08-is-it-dead.png | Bin 0 -> 100825 bytes + .../Design/Requirements/GPpartitionReaders1.svg | 374 +++ + .../RCU/Design/Requirements/RCUApplicability.svg | 237 ++ + .../Design/Requirements/ReadersPartitionGP1.svg | 639 +++++ + .../RCU/Design/Requirements/Requirements.html | 2897 ++++++++++++++++++++ + .../RCU/Design/Requirements/Requirements.htmlx | 2741 ++++++++++++++++++ + Documentation/RCU/Design/htmlqqz.sh | 108 + + ...r,sun67i-sc-nmi.txt => allwinner,sunxi-nmi.txt} | 2 +- + .../bindings/interrupt-controller/arm,gic.txt | 1 + + .../interrupt-controller/hisilicon,mbigen-v2.txt | 74 + + .../interrupt-controller/technologic,ts4800.txt | 16 + + Documentation/efi-stub.txt | 4 +- + Documentation/kernel-parameters.txt | 38 +- + Documentation/memory-barriers.txt | 12 +- + Documentation/sysctl/kernel.txt | 15 + + Documentation/trace/events-msr.txt | 37 + + Documentation/trace/postprocess/decode_msr.py | 37 + + Documentation/x86/x86_64/mm.txt | 12 +- + MAINTAINERS | 7 +- + arch/arm/Kconfig | 3 + + arch/arm/mach-exynos/Kconfig | 7 +- + arch/arm/mach-sti/Kconfig | 1 + + arch/arm/mach-ux500/Kconfig | 1 + + arch/blackfin/include/asm/cmpxchg.h | 1 - + arch/c6x/include/asm/cmpxchg.h | 2 - + arch/frv/include/asm/cmpxchg.h | 2 - + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/io.h | 39 +- + arch/h8300/kernel/setup.c | 8 +- + arch/ia64/include/asm/barrier.h | 2 +- + arch/powerpc/include/asm/barrier.h | 2 +- + arch/s390/include/asm/barrier.h | 2 +- + arch/tile/include/asm/cmpxchg.h | 2 - + arch/x86/Kconfig | 19 + + arch/x86/Kconfig.debug | 2 +- + arch/x86/crypto/chacha20_glue.c | 2 +- + arch/x86/crypto/crc32c-intel_glue.c | 2 +- + arch/x86/entry/calling.h | 15 + + arch/x86/entry/entry_32.S | 8 +- + arch/x86/entry/entry_64.S | 8 +- + arch/x86/entry/entry_64_compat.S | 20 +- + arch/x86/entry/vdso/vclock_gettime.c | 151 +- + arch/x86/entry/vdso/vdso-layout.lds.S | 3 +- + arch/x86/entry/vdso/vdso2c.c | 3 + + arch/x86/entry/vdso/vma.c | 14 + + arch/x86/include/asm/apic.h | 6 + + arch/x86/include/asm/atomic.h | 1 - + arch/x86/include/asm/atomic64_32.h | 1 - + arch/x86/include/asm/calgary.h | 2 +- + arch/x86/include/asm/cmpxchg_32.h | 2 +- + arch/x86/include/asm/cmpxchg_64.h | 2 +- + arch/x86/include/asm/cpu.h | 3 + + arch/x86/include/asm/cpufeature.h | 115 +- + arch/x86/include/asm/efi.h | 26 + + arch/x86/include/asm/fixmap.h | 5 - + arch/x86/include/asm/fpu/internal.h | 173 +- + arch/x86/include/asm/intel_pt.h | 10 + + arch/x86/include/asm/ipi.h | 2 + + arch/x86/include/asm/jump_label.h | 63 +- + arch/x86/include/asm/microcode.h | 39 +- + arch/x86/include/asm/msi.h | 6 + + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/msr-trace.h | 57 + + arch/x86/include/asm/msr.h | 43 +- + arch/x86/include/asm/page_types.h | 6 +- + arch/x86/include/asm/paravirt.h | 38 - + arch/x86/include/asm/paravirt_types.h | 35 - + arch/x86/include/asm/pgtable.h | 15 +- + arch/x86/include/asm/pvclock.h | 14 +- + arch/x86/include/asm/qspinlock_paravirt.h | 59 + + arch/x86/include/asm/reboot.h | 1 + + arch/x86/include/asm/smp.h | 12 - + arch/x86/include/asm/suspend_32.h | 1 + + arch/x86/include/asm/suspend_64.h | 1 + + arch/x86/include/asm/uaccess.h | 9 + + arch/x86/include/asm/vdso.h | 1 + + arch/x86/include/asm/x86_init.h | 2 - + arch/x86/include/asm/xor_32.h | 2 +- + arch/x86/include/uapi/asm/mce.h | 2 +- + arch/x86/kernel/apic/apic.c | 45 +- + arch/x86/kernel/apic/apic_flat_64.c | 19 +- + arch/x86/kernel/apic/apic_noop.c | 2 + + arch/x86/kernel/apic/apic_numachip.c | 2 + + arch/x86/kernel/apic/bigsmp_32.c | 10 +- + arch/x86/kernel/apic/ipi.c | 18 + + arch/x86/kernel/apic/msi.c | 8 +- + arch/x86/kernel/apic/probe_32.c | 1 + + arch/x86/kernel/apic/vector.c | 2 + + arch/x86/kernel/apic/x2apic_cluster.c | 9 + + arch/x86/kernel/apic/x2apic_phys.c | 9 + + arch/x86/kernel/apic/x2apic_uv_x.c | 1 + + arch/x86/kernel/asm-offsets.c | 3 - + arch/x86/kernel/asm-offsets_64.c | 1 - + arch/x86/kernel/cpu/amd.c | 8 +- + arch/x86/kernel/cpu/centaur.c | 2 +- + arch/x86/kernel/cpu/common.c | 65 +- + arch/x86/kernel/cpu/intel.c | 3 +- + arch/x86/kernel/cpu/intel_cacheinfo.c | 6 +- + arch/x86/kernel/cpu/mcheck/mce.c | 82 +- + arch/x86/kernel/cpu/microcode/core.c | 12 +- + arch/x86/kernel/cpu/microcode/intel.c | 16 +- + arch/x86/kernel/cpu/mtrr/cleanup.c | 11 +- + arch/x86/kernel/cpu/mtrr/generic.c | 2 +- + arch/x86/kernel/cpu/mtrr/main.c | 2 +- + arch/x86/kernel/cpu/perf_event.c | 36 +- + arch/x86/kernel/cpu/perf_event.h | 21 +- + arch/x86/kernel/cpu/perf_event_amd.c | 6 +- + arch/x86/kernel/cpu/perf_event_amd_uncore.c | 11 +- + arch/x86/kernel/cpu/perf_event_intel.c | 115 +- + arch/x86/kernel/cpu/perf_event_intel_ds.c | 39 +- + arch/x86/kernel/cpu/perf_event_intel_lbr.c | 42 +- + arch/x86/kernel/cpu/perf_event_intel_pt.c | 9 + + arch/x86/kernel/cpu/perf_event_intel_rapl.c | 25 +- + arch/x86/kernel/cpu/perf_event_intel_uncore.c | 17 + + arch/x86/kernel/cpu/perf_event_intel_uncore.h | 3 + + arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c | 2 +- + .../x86/kernel/cpu/perf_event_intel_uncore_snbep.c | 635 ++++- + arch/x86/kernel/cpu/rdrand.c | 25 +- + arch/x86/kernel/cpu/scattered.c | 20 - + arch/x86/kernel/cpu/transmeta.c | 4 +- + arch/x86/kernel/crash.c | 11 + + arch/x86/kernel/fpu/init.c | 21 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + arch/x86/kernel/hw_breakpoint.c | 6 +- + arch/x86/kernel/kvmclock.c | 11 +- + arch/x86/kernel/nmi.c | 32 +- + arch/x86/kernel/paravirt.c | 36 +- + arch/x86/kernel/paravirt_patch_32.c | 2 - + arch/x86/kernel/paravirt_patch_64.c | 3 - + arch/x86/kernel/pci-calgary_64.c | 4 +- + arch/x86/kernel/pci-swiotlb.c | 2 +- + arch/x86/kernel/process_64.c | 2 +- + arch/x86/kernel/ptrace.c | 15 - + arch/x86/kernel/pvclock.c | 24 - + arch/x86/kernel/reboot.c | 30 + + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/smp.c | 4 +- + arch/x86/kernel/smpboot.c | 9 +- + arch/x86/kernel/tsc.c | 2 - + arch/x86/kernel/vm86_32.c | 4 +- + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/kernel/x86_init.c | 1 - + arch/x86/kvm/cpuid.h | 34 + + arch/x86/kvm/svm.c | 17 + + arch/x86/lguest/boot.c | 1 - + arch/x86/lib/Makefile | 2 +- + arch/x86/lib/cpu.c | 35 + + arch/x86/lib/msr.c | 26 + + arch/x86/mm/Makefile | 1 + + arch/x86/mm/debug_pagetables.c | 46 + + arch/x86/mm/dump_pagetables.c | 34 +- + arch/x86/mm/ioremap.c | 4 +- + arch/x86/mm/pageattr.c | 17 +- + arch/x86/mm/pat.c | 12 +- + arch/x86/mm/pat_rbtree.c | 52 +- + arch/x86/mm/pgtable.c | 7 +- + arch/x86/mm/setup_nx.c | 4 +- + arch/x86/mm/srat.c | 2 + + arch/x86/platform/efi/efi-bgrt.c | 42 +- + arch/x86/platform/efi/efi.c | 39 +- + arch/x86/platform/efi/efi_32.c | 5 + + arch/x86/platform/efi/efi_64.c | 159 +- + arch/x86/platform/efi/efi_stub_64.S | 43 - + arch/x86/platform/efi/quirks.c | 4 +- + arch/x86/platform/uv/uv_nmi.c | 1 + + arch/x86/power/cpu.c | 92 + + arch/x86/xen/enlighten.c | 10 - + arch/x86/xen/mmu.c | 1 - + arch/x86/xen/xen-asm_32.S | 14 - + arch/x86/xen/xen-asm_64.S | 19 - + arch/x86/xen/xen-ops.h | 3 - + drivers/base/platform-msi.c | 256 +- + drivers/char/hw_random/via-rng.c | 5 +- + drivers/clocksource/Kconfig | 132 +- + drivers/clocksource/Makefile | 2 +- + drivers/clocksource/acpi_pm.c | 27 +- + drivers/clocksource/arm_global_timer.c | 21 +- + drivers/clocksource/dw_apb_timer.c | 46 +- + drivers/clocksource/dw_apb_timer_of.c | 16 + + drivers/clocksource/h8300_timer16.c | 222 +- + drivers/clocksource/h8300_timer8.c | 264 +- + drivers/clocksource/h8300_tpu.c | 159 +- + drivers/clocksource/mtk_timer.c | 20 +- + drivers/clocksource/rockchip_timer.c | 23 +- + drivers/clocksource/tango_xtal.c | 18 +- + drivers/clocksource/tegra20_timer.c | 3 +- + drivers/clocksource/time-lpc32xx.c | 4 +- + drivers/clocksource/time-pistachio.c | 2 +- + drivers/clocksource/timer-sun5i.c | 16 +- + drivers/clocksource/vt8500_timer.c | 1 - + drivers/crypto/padlock-aes.c | 2 +- + drivers/crypto/padlock-sha.c | 2 +- + drivers/firmware/efi/efi.c | 32 - + drivers/firmware/efi/esrt.c | 5 +- + drivers/iommu/intel_irq_remapping.c | 2 +- + drivers/irqchip/Kconfig | 19 + + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-bcm2836.c | 55 +- + drivers/irqchip/irq-gic-realview.c | 43 + + drivers/irqchip/irq-gic-v2m.c | 165 +- + drivers/irqchip/irq-gic.c | 64 +- + drivers/irqchip/irq-mbigen.c | 297 ++ + drivers/irqchip/irq-omap-intc.c | 28 +- + drivers/irqchip/irq-renesas-h8300h.c | 8 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 96 +- + drivers/irqchip/irq-sunxi-nmi.c | 13 + + drivers/irqchip/irq-ts4800.c | 163 ++ + drivers/irqchip/irq-zevio.c | 3 +- + drivers/pci/msi.c | 4 + + drivers/pci/pci-acpi.c | 42 + + drivers/pci/probe.c | 2 + + drivers/tty/sysrq.c | 6 + + fs/btrfs/disk-io.c | 2 +- + include/asm-generic/barrier.h | 2 +- + include/asm-generic/pgtable.h | 10 +- + include/asm-generic/qspinlock.h | 9 +- + include/linux/bootmem.h | 4 + + include/linux/clocksource.h | 16 +- + include/linux/compiler.h | 17 + + include/linux/context_tracking.h | 4 +- + include/linux/context_tracking_state.h | 4 +- + include/linux/init_task.h | 2 +- + include/linux/interrupt.h | 1 + + include/linux/irqchip/arm-gic.h | 13 +- + include/linux/irqdesc.h | 6 + + include/linux/irqdomain.h | 13 + + include/linux/kernel.h | 28 + + include/linux/kexec.h | 2 + + include/linux/list.h | 14 +- + include/linux/list_bl.h | 2 +- + include/linux/list_nulls.h | 2 +- + include/linux/msi.h | 18 + + include/linux/pci.h | 10 + + .../linux/platform_data/irq-renesas-intc-irqpin.h | 29 - + include/linux/rculist.h | 105 +- + include/linux/rcupdate.h | 21 +- + include/linux/rcutiny.h | 8 + + include/linux/rcutree.h | 4 +- + include/linux/sched.h | 20 +- + include/linux/sched_clock.h | 12 +- + include/linux/stop_machine.h | 7 +- + include/linux/time.h | 26 + + include/linux/tracepoint-defs.h | 27 + + include/linux/tracepoint.h | 20 +- + include/linux/vtime.h | 25 +- + include/linux/wait.h | 30 + + include/uapi/linux/perf_event.h | 6 + + init/main.c | 2 + + kernel/context_tracking.c | 4 +- + kernel/events/core.c | 286 +- + kernel/fork.c | 4 +- + kernel/futex.c | 83 +- + kernel/irq/chip.c | 9 +- + kernel/irq/irqdesc.c | 19 +- + kernel/irq/irqdomain.c | 12 +- + kernel/irq/manage.c | 25 + + kernel/irq/msi.c | 58 +- + kernel/kexec_core.c | 30 +- + kernel/ksysfs.c | 26 +- + kernel/locking/qspinlock.c | 82 +- + kernel/locking/qspinlock_paravirt.h | 252 +- + kernel/locking/qspinlock_stat.h | 300 ++ + kernel/panic.c | 33 +- + kernel/rcu/rcutorture.c | 24 +- + kernel/rcu/srcu.c | 2 +- + kernel/rcu/tree.c | 313 ++- + kernel/rcu/tree.h | 61 +- + kernel/rcu/tree_plugin.h | 66 +- + kernel/rcu/tree_trace.c | 39 +- + kernel/rcu/update.c | 22 +- + kernel/sched/auto_group.c | 2 +- + kernel/sched/core.c | 181 +- + kernel/sched/cputime.c | 74 +- + kernel/sched/deadline.c | 59 +- + kernel/sched/fair.c | 312 ++- + kernel/sched/idle_task.c | 1 - + kernel/sched/sched.h | 70 +- + kernel/stop_machine.c | 84 +- + kernel/time/alarmtimer.c | 17 + + kernel/time/clocksource.c | 4 +- + kernel/time/ntp.c | 44 +- + kernel/time/ntp_internal.h | 2 +- + kernel/time/posix-clock.c | 4 +- + kernel/time/tick-sched.c | 30 +- + kernel/time/timekeeping.c | 49 +- + kernel/time/timekeeping_internal.h | 8 +- + kernel/watchdog.c | 2 +- + lib/atomic64_test.c | 124 +- + lib/list_debug.c | 2 +- + mm/bootmem.c | 1 + + mm/mremap.c | 4 + + mm/nobootmem.c | 1 + + tools/Makefile | 2 +- + tools/build/Makefile | 2 +- + tools/build/Makefile.feature | 3 +- + tools/build/Makefile.include | 2 +- + tools/build/feature/Makefile | 93 +- + tools/include/linux/string.h | 15 + + tools/lib/bpf/Makefile | 10 + + tools/lib/bpf/bpf.c | 14 + + tools/lib/bpf/bpf.h | 2 + + tools/lib/bpf/libbpf.c | 412 ++- + tools/lib/bpf/libbpf.h | 88 + + tools/lib/string.c | 89 + + tools/lib/subcmd/Build | 7 + + tools/lib/subcmd/Makefile | 48 + + tools/lib/subcmd/exec-cmd.c | 209 ++ + tools/lib/subcmd/exec-cmd.h | 16 + + tools/{perf/util => lib/subcmd}/help.c | 179 +- + tools/{perf/util => lib/subcmd}/help.h | 13 +- + tools/{perf/util => lib/subcmd}/pager.c | 23 +- + tools/lib/subcmd/pager.h | 9 + + tools/{perf/util => lib/subcmd}/parse-options.c | 250 +- + tools/{perf/util => lib/subcmd}/parse-options.h | 26 +- + tools/{perf/util => lib/subcmd}/run-command.c | 24 +- + tools/{perf/util => lib/subcmd}/run-command.h | 12 +- + tools/{perf/util => lib/subcmd}/sigchain.c | 3 +- + tools/{perf/util => lib/subcmd}/sigchain.h | 6 +- + tools/lib/subcmd/subcmd-config.c | 11 + + tools/lib/subcmd/subcmd-config.h | 14 + + tools/lib/subcmd/subcmd-util.h | 91 + + tools/lib/traceevent/event-parse.c | 5 +- + tools/perf/Build | 7 +- + tools/perf/Documentation/perf-config.txt | 103 + + tools/perf/Documentation/perf-record.txt | 24 +- + tools/perf/Documentation/perf-report.txt | 14 +- + tools/perf/Documentation/perf-stat.txt | 34 + + tools/perf/MANIFEST | 3 + + tools/perf/Makefile.perf | 37 +- + tools/perf/arch/x86/include/arch-tests.h | 8 +- + tools/perf/arch/x86/tests/insn-x86.c | 2 +- + tools/perf/arch/x86/tests/intel-cqm.c | 2 +- + tools/perf/arch/x86/tests/perf-time-to-tsc.c | 2 +- + tools/perf/arch/x86/tests/rdpmc.c | 2 +- + tools/perf/arch/x86/util/Build | 1 + + tools/perf/arch/x86/util/intel-pt.c | 2 +- + tools/perf/bench/futex-hash.c | 2 +- + tools/perf/bench/futex-lock-pi.c | 2 +- + tools/perf/bench/futex-requeue.c | 2 +- + tools/perf/bench/futex-wake-parallel.c | 2 +- + tools/perf/bench/futex-wake.c | 2 +- + tools/perf/bench/mem-functions.c | 2 +- + tools/perf/bench/numa.c | 2 +- + tools/perf/bench/sched-messaging.c | 2 +- + tools/perf/bench/sched-pipe.c | 2 +- + tools/perf/builtin-annotate.c | 35 +- + tools/perf/builtin-bench.c | 2 +- + tools/perf/builtin-buildid-cache.c | 2 +- + tools/perf/builtin-buildid-list.c | 2 +- + tools/perf/builtin-config.c | 66 + + tools/perf/builtin-data.c | 2 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-help.c | 10 +- + tools/perf/builtin-inject.c | 2 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kvm.c | 5 +- + tools/perf/builtin-list.c | 2 +- + tools/perf/builtin-lock.c | 2 +- + tools/perf/builtin-mem.c | 2 +- + tools/perf/builtin-probe.c | 17 +- + tools/perf/builtin-record.c | 42 +- + tools/perf/builtin-report.c | 46 +- + tools/perf/builtin-sched.c | 2 +- + tools/perf/builtin-script.c | 93 +- + tools/perf/builtin-stat.c | 672 ++++- + tools/perf/builtin-timechart.c | 2 +- + tools/perf/builtin-top.c | 63 +- + tools/perf/builtin-trace.c | 4 +- + tools/perf/builtin-version.c | 10 + + tools/perf/builtin.h | 1 + + tools/perf/command-list.txt | 1 + + tools/perf/config/Makefile | 14 +- + tools/perf/config/utilities.mak | 19 - + tools/perf/perf.c | 20 +- + tools/perf/tests/.gitignore | 1 + + tools/perf/tests/Build | 16 +- + tools/perf/tests/attr.c | 6 +- + tools/perf/tests/bp_signal.c | 2 +- + tools/perf/tests/bp_signal_overflow.c | 2 +- + tools/perf/tests/bpf-script-test-prologue.c | 35 + + tools/perf/tests/bpf.c | 93 +- + tools/perf/tests/builtin-test.c | 141 +- + tools/perf/tests/code-reading.c | 16 +- + tools/perf/tests/cpumap.c | 88 + + tools/perf/tests/dso-data.c | 6 +- + tools/perf/tests/dwarf-unwind.c | 37 +- + tools/perf/tests/event_update.c | 117 + + tools/perf/tests/evsel-roundtrip-name.c | 5 +- + tools/perf/tests/evsel-tp-sched.c | 2 +- + tools/perf/tests/fdarray.c | 4 +- + tools/perf/tests/hists_common.c | 6 +- + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_link.c | 2 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/kmod-path.c | 2 +- + tools/perf/tests/llvm.c | 75 +- + tools/perf/tests/llvm.h | 2 + + tools/perf/tests/make | 3 +- + tools/perf/tests/mmap-basic.c | 2 +- + tools/perf/tests/mmap-thread-lookup.c | 8 +- + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/openat-syscall-tp-fields.c | 2 +- + tools/perf/tests/openat-syscall.c | 2 +- + tools/perf/tests/parse-events.c | 2 +- + tools/perf/tests/parse-no-sample-id-all.c | 2 +- + tools/perf/tests/perf-record.c | 2 +- + tools/perf/tests/pmu.c | 2 +- + tools/perf/tests/python-use.c | 3 +- + tools/perf/tests/sample-parsing.c | 2 +- + tools/perf/tests/stat.c | 111 + + tools/perf/tests/sw-clock.c | 2 +- + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/task-exit.c | 2 +- + tools/perf/tests/tests.h | 95 +- + tools/perf/tests/thread-map.c | 45 +- + tools/perf/tests/thread-mg-share.c | 2 +- + tools/perf/tests/topology.c | 2 +- + tools/perf/tests/vmlinux-kallsyms.c | 2 +- + tools/perf/ui/browser.c | 2 +- + tools/perf/ui/browsers/hists.c | 320 ++- + tools/perf/ui/gtk/hists.c | 148 +- + tools/perf/ui/stdio/hist.c | 94 +- + tools/perf/util/Build | 17 +- + tools/perf/util/annotate.c | 23 + + tools/perf/util/auxtrace.c | 2 +- + tools/perf/util/bpf-loader.c | 433 ++- + tools/perf/util/bpf-loader.h | 4 + + tools/perf/util/bpf-prologue.c | 455 +++ + tools/perf/util/bpf-prologue.h | 34 + + tools/perf/util/cache.h | 14 +- + tools/perf/util/callchain.c | 136 +- + tools/perf/util/callchain.h | 29 +- + tools/perf/util/cgroup.c | 2 +- + tools/perf/util/color.c | 2 +- + tools/perf/util/config.c | 2 +- + tools/perf/util/cpumap.c | 42 + + tools/perf/util/cpumap.h | 1 + + tools/perf/util/data-convert-bt.c | 2 + + tools/perf/util/dso.c | 2 + + tools/perf/util/env.c | 9 - + tools/perf/util/environment.c | 8 - + tools/perf/util/event.c | 308 +++ + tools/perf/util/event.h | 150 +- + tools/perf/util/evlist.c | 40 +- + tools/perf/util/evlist.h | 3 + + tools/perf/util/evsel.c | 30 +- + tools/perf/util/evsel.h | 3 +- + tools/perf/util/exec_cmd.c | 148 - + tools/perf/util/exec_cmd.h | 12 - + tools/perf/util/header.c | 207 +- + tools/perf/util/header.h | 17 + + tools/perf/util/help-unknown-cmd.c | 103 + + tools/perf/util/help-unknown-cmd.h | 0 + tools/perf/util/hist.c | 40 +- + tools/perf/util/include/linux/string.h | 3 - + tools/perf/util/intel-pt.c | 4 +- + tools/perf/util/machine.c | 74 +- + tools/perf/util/map.c | 7 +- + tools/perf/util/parse-branch-options.c | 2 +- + tools/perf/util/parse-events.c | 4 +- + tools/perf/util/parse-regs-options.c | 2 +- + tools/perf/util/path.c | 18 - + tools/perf/util/probe-event.c | 7 +- + tools/perf/util/probe-finder.c | 6 +- + tools/perf/util/session.c | 200 +- + tools/perf/util/session.h | 2 +- + tools/perf/util/sort.h | 2 +- + tools/perf/util/stat.c | 62 + + tools/perf/util/stat.h | 10 + + tools/perf/util/string.c | 16 - + tools/perf/util/symbol-elf.c | 9 +- + tools/perf/util/symbol.c | 65 +- + tools/perf/util/symbol.h | 3 +- + tools/perf/util/term.c | 35 + + tools/perf/util/term.h | 10 + + tools/perf/util/thread.c | 10 +- + tools/perf/util/thread_map.c | 28 + + tools/perf/util/thread_map.h | 3 + + tools/perf/util/tool.h | 8 +- + tools/perf/util/unwind-libdw.c | 53 +- + tools/perf/util/unwind-libdw.h | 2 + + tools/perf/util/unwind-libunwind.c | 60 +- + tools/perf/util/util.c | 40 +- + tools/perf/util/util.h | 18 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 9 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 22 +- + .../selftests/rcutorture/bin/parse-console.sh | 41 +- + .../testing/selftests/rcutorture/doc/TINY_RCU.txt | 1 - + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + .../testing/selftests/timers/clocksource-switch.c | 2 +- + 492 files changed, 19860 insertions(+), 4128 deletions(-) + create mode 100644 Documentation/RCU/Design/Requirements/2013-08-is-it-dead.png + create mode 100644 Documentation/RCU/Design/Requirements/GPpartitionReaders1.svg + create mode 100644 Documentation/RCU/Design/Requirements/RCUApplicability.svg + create mode 100644 Documentation/RCU/Design/Requirements/ReadersPartitionGP1.svg + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.html + create mode 100644 Documentation/RCU/Design/Requirements/Requirements.htmlx + create mode 100755 Documentation/RCU/Design/htmlqqz.sh + rename Documentation/devicetree/bindings/interrupt-controller/{allwinner,sun67i-sc-nmi.txt => allwinner,sunxi-nmi.txt} (94%) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/hisilicon,mbigen-v2.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/technologic,ts4800.txt + create mode 100644 Documentation/trace/events-msr.txt + create mode 100644 Documentation/trace/postprocess/decode_msr.py + create mode 100644 arch/x86/include/asm/intel_pt.h + create mode 100644 arch/x86/include/asm/msr-trace.h + create mode 100644 arch/x86/lib/cpu.c + create mode 100644 arch/x86/mm/debug_pagetables.c + create mode 100644 drivers/irqchip/irq-gic-realview.c + create mode 100644 drivers/irqchip/irq-mbigen.c + create mode 100644 drivers/irqchip/irq-ts4800.c + delete mode 100644 include/linux/platform_data/irq-renesas-intc-irqpin.h + create mode 100644 include/linux/tracepoint-defs.h + create mode 100644 kernel/locking/qspinlock_stat.h + create mode 100644 tools/include/linux/string.h + create mode 100644 tools/lib/string.c + create mode 100644 tools/lib/subcmd/Build + create mode 100644 tools/lib/subcmd/Makefile + create mode 100644 tools/lib/subcmd/exec-cmd.c + create mode 100644 tools/lib/subcmd/exec-cmd.h + rename tools/{perf/util => lib/subcmd}/help.c (56%) + rename tools/{perf/util => lib/subcmd}/help.h (73%) + rename tools/{perf/util => lib/subcmd}/pager.c (84%) + create mode 100644 tools/lib/subcmd/pager.h + rename tools/{perf/util => lib/subcmd}/parse-options.c (79%) + rename tools/{perf/util => lib/subcmd}/parse-options.h (94%) + rename tools/{perf/util => lib/subcmd}/run-command.c (90%) + rename tools/{perf/util => lib/subcmd}/run-command.h (86%) + rename tools/{perf/util => lib/subcmd}/sigchain.c (95%) + rename tools/{perf/util => lib/subcmd}/sigchain.h (55%) + create mode 100644 tools/lib/subcmd/subcmd-config.c + create mode 100644 tools/lib/subcmd/subcmd-config.h + create mode 100644 tools/lib/subcmd/subcmd-util.h + create mode 100644 tools/perf/Documentation/perf-config.txt + create mode 100644 tools/perf/builtin-config.c + create mode 100644 tools/perf/builtin-version.c + create mode 100644 tools/perf/tests/bpf-script-test-prologue.c + create mode 100644 tools/perf/tests/cpumap.c + create mode 100644 tools/perf/tests/event_update.c + create mode 100644 tools/perf/tests/stat.c + create mode 100644 tools/perf/util/bpf-prologue.c + create mode 100644 tools/perf/util/bpf-prologue.h + delete mode 100644 tools/perf/util/environment.c + delete mode 100644 tools/perf/util/exec_cmd.c + delete mode 100644 tools/perf/util/exec_cmd.h + create mode 100644 tools/perf/util/help-unknown-cmd.c + create mode 100644 tools/perf/util/help-unknown-cmd.h + delete mode 100644 tools/perf/util/include/linux/string.h + create mode 100644 tools/perf/util/term.c + create mode 100644 tools/perf/util/term.h +Merging clockevents/clockevents/next (1ddca16cc5b3 clocksource/drivers/h8300: Use ioread / iowrite) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/h8300_timer16.c' using previous resolution. +Auto-merging drivers/clocksource/h8300_timer16.c +CONFLICT (content): Merge conflict in drivers/clocksource/h8300_timer16.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 895442057877] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +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 (1cac5503fbf7 EDAC, i5100: Use to_delayed_work()) +$ git merge edac-amd/for-next +Auto-merging arch/powerpc/sysdev/fsl_pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/edac.txt | 10 +- + MAINTAINERS | 23 +- + arch/powerpc/sysdev/fsl_pci.c | 28 +- + arch/powerpc/sysdev/fsl_pci.h | 9 - + drivers/edac/Makefile | 2 +- + drivers/edac/edac_device.c | 41 +- + drivers/edac/edac_device_sysfs.c | 11 +- + drivers/edac/edac_mc.c | 29 +- + drivers/edac/edac_mc_sysfs.c | 37 +- + drivers/edac/edac_module.c | 52 +- + drivers/edac/edac_module.h | 10 +- + drivers/edac/edac_pci.c | 70 +-- + drivers/edac/edac_pci_sysfs.c | 16 +- + drivers/edac/edac_stub.c | 41 -- + drivers/edac/i5100_edac.c | 4 +- + drivers/edac/mpc85xx_edac.c | 54 +- + drivers/edac/mv64x60_edac.c | 39 +- + drivers/edac/sb_edac.c | 1071 +++++++++++++++++++++++++++++++++++--- + drivers/edac/wq.c | 42 ++ + include/linux/edac.h | 8 +- + include/linux/fsl/edac.h | 8 + + 21 files changed, 1236 insertions(+), 369 deletions(-) + create mode 100644 drivers/edac/wq.c + create mode 100644 include/linux/fsl/edac.h +Merging irqchip/irqchip/for-next (f290917dc209 Merge branch 'irqchip/sunxi' into irqchip/for-next) +$ git merge irqchip/irqchip/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging tiny/tiny/next (f114040e3ea6 Linux 3.18-rc1) +$ git merge tiny/tiny/next +Already up-to-date. +Merging ftrace/for-next (5156dca34a3e ftrace: Fix the race between ftrace and insmod) +$ git merge ftrace/for-next +Auto-merging kernel/trace/trace_events_trigger.c +Auto-merging kernel/trace/trace_event_perf.c +Auto-merging include/linux/tracepoint.h +Auto-merging include/linux/ftrace.h +Auto-merging arch/metag/kernel/ftrace.c +Merge made by the 'recursive' strategy. + arch/ia64/kernel/ftrace.c | 12 +- + arch/metag/kernel/ftrace.c | 11 +- + arch/sh/kernel/ftrace.c | 12 +- + arch/x86/kernel/ftrace.c | 21 +- + include/linux/ftrace.h | 56 ++- + include/linux/tracepoint.h | 4 + + include/trace/define_trace.h | 6 + + include/trace/trace_events.h | 6 + + kernel/trace/bpf_trace.c | 2 +- + kernel/trace/ftrace.c | 451 ++++++++++++--------- + kernel/trace/ring_buffer.c | 57 ++- + kernel/trace/trace.h | 6 +- + kernel/trace/trace_event_perf.c | 2 +- + kernel/trace/trace_events_trigger.c | 10 +- + lib/seq_buf.c | 6 +- + .../selftests/ftrace/test.d/instances/instance.tc | 90 ++++ + 16 files changed, 476 insertions(+), 276 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/instances/instance.tc +Merging rcu/rcu/next (4bd5655ef982 documentation: Add synchronize_rcu_mult() to the requirements) +$ git merge rcu/rcu/next +Auto-merging lib/Kconfig.debug +Auto-merging include/linux/compiler.h +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../RCU/Design/Requirements/Requirements.html | 102 +++- + .../RCU/Design/Requirements/Requirements.htmlx | 90 ++++ + Documentation/kernel-parameters.txt | 32 ++ + Documentation/memory-barriers.txt | 14 +- + include/linux/compiler.h | 12 +- + include/linux/irq.h | 6 +- + kernel/irq/internals.h | 4 + + kernel/rcu/Makefile | 1 + + kernel/rcu/rcuperf.c | 576 +++++++++++++++++++++ + kernel/rcu/rcutorture.c | 16 +- + kernel/rcu/tree.c | 247 ++++++--- + kernel/rcu/tree.h | 44 +- + kernel/rcu/tree_plugin.h | 37 +- + kernel/rcu/update.c | 1 + + lib/Kconfig.debug | 33 ++ + scripts/checkpatch.pl | 3 +- + .../selftests/rcutorture/bin/parse-console.sh | 6 +- + 17 files changed, 1085 insertions(+), 139 deletions(-) + create mode 100644 kernel/rcu/rcuperf.c +Merging kvm/linux-next (da3f7ca3e856 Merge tag 'kvm-s390-next-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm/linux-next +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/include/asm/sclp.h +Auto-merging arch/s390/include/asm/elf.h +Auto-merging arch/powerpc/kvm/book3s_pr.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 41 ++++ + Documentation/virtual/kvm/devices/vm.txt | 3 +- + Documentation/virtual/kvm/mmu.txt | 4 +- + arch/powerpc/kvm/book3s_hv.c | 10 +- + arch/powerpc/kvm/book3s_pr.c | 4 +- + arch/s390/include/asm/elf.h | 7 + + arch/s390/include/asm/kvm_host.h | 50 +++- + arch/s390/include/asm/sclp.h | 8 +- + arch/s390/include/uapi/asm/kvm.h | 2 + + arch/s390/kernel/processor.c | 6 + + arch/s390/kernel/setup.c | 9 + + arch/s390/kvm/diag.c | 11 +- + arch/s390/kvm/gaccess.c | 38 +++- + arch/s390/kvm/intercept.c | 7 +- + arch/s390/kvm/interrupt.c | 133 ++++++++--- + arch/s390/kvm/kvm-s390.c | 277 ++++++++++++++++------- + arch/s390/kvm/kvm-s390.h | 7 + + arch/s390/kvm/trace-s390.h | 6 +- + arch/s390/mm/pgtable.c | 4 +- + arch/x86/include/asm/kvm_host.h | 34 ++- + arch/x86/kvm/hyperv.c | 335 +++++++++++++++++++++++++++ + arch/x86/kvm/hyperv.h | 23 ++ + arch/x86/kvm/ioapic.c | 4 +- + arch/x86/kvm/ioapic.h | 7 +- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/irq_comm.c | 41 +++- + arch/x86/kvm/lapic.c | 40 ++-- + arch/x86/kvm/lapic.h | 9 +- + arch/x86/kvm/mmu.c | 377 +++++++++++++++---------------- + arch/x86/kvm/mmu_audit.c | 15 +- + arch/x86/kvm/paging_tmpl.h | 20 +- + arch/x86/kvm/svm.c | 37 ++- + arch/x86/kvm/trace.h | 2 +- + arch/x86/kvm/vmx.c | 48 ++-- + arch/x86/kvm/x86.c | 77 +++++-- + drivers/s390/char/sclp_early.c | 16 +- + include/linux/kvm_host.h | 20 +- + include/linux/kvm_para.h | 6 +- + include/uapi/linux/kvm.h | 25 ++ + virt/kvm/async_pf.c | 3 +- + virt/kvm/irqchip.c | 7 +- + virt/kvm/kvm_main.c | 36 +-- + 42 files changed, 1320 insertions(+), 491 deletions(-) +Merging kvm-arm/next (c7da6fa43cb1 arm/arm64: KVM: Detect vGIC presence at runtime) +$ git merge kvm-arm/next +Auto-merging virt/kvm/arm/vgic.c +Removing arch/arm64/kvm/vgic-v3-switch.S +Removing arch/arm64/kvm/vgic-v2-switch.S +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + arch/arm/include/asm/kvm_arm.h | 34 +- + arch/arm/include/asm/kvm_host.h | 6 + + arch/arm/include/asm/kvm_mmu.h | 5 + + arch/arm/kvm/arm.c | 40 +- + arch/arm/kvm/emulate.c | 74 +-- + arch/arm/kvm/guest.c | 6 + + arch/arm/kvm/handle_exit.c | 3 + + arch/arm/kvm/mmio.c | 3 + + arch/arm/kvm/mmu.c | 6 +- + arch/arm64/include/asm/kvm_arm.h | 3 +- + arch/arm64/include/asm/kvm_asm.h | 76 --- + arch/arm64/include/asm/kvm_emulate.h | 1 - + arch/arm64/include/asm/kvm_host.h | 87 ++- + arch/arm64/include/asm/kvm_mmio.h | 1 - + arch/arm64/include/asm/kvm_mmu.h | 9 +- + arch/arm64/include/asm/sysreg.h | 21 + + arch/arm64/kernel/asm-offsets.c | 40 +- + arch/arm64/kvm/Makefile | 3 +- + arch/arm64/kvm/guest.c | 10 +- + arch/arm64/kvm/handle_exit.c | 4 + + arch/arm64/kvm/hyp-init.S | 9 + + arch/arm64/kvm/hyp.S | 1081 +--------------------------------- + arch/arm64/kvm/hyp/Makefile | 14 + + arch/arm64/kvm/hyp/debug-sr.c | 140 +++++ + arch/arm64/kvm/hyp/entry.S | 160 +++++ + arch/arm64/kvm/hyp/fpsimd.S | 33 ++ + arch/arm64/kvm/hyp/hyp-entry.S | 212 +++++++ + arch/arm64/kvm/hyp/hyp.h | 90 +++ + arch/arm64/kvm/hyp/switch.c | 175 ++++++ + arch/arm64/kvm/hyp/sysreg-sr.c | 138 +++++ + arch/arm64/kvm/hyp/timer-sr.c | 71 +++ + arch/arm64/kvm/hyp/tlb.c | 80 +++ + arch/arm64/kvm/hyp/vgic-v2-sr.c | 84 +++ + arch/arm64/kvm/hyp/vgic-v3-sr.c | 228 +++++++ + arch/arm64/kvm/sys_regs.c | 59 +- + arch/arm64/kvm/vgic-v2-switch.S | 134 ----- + arch/arm64/kvm/vgic-v3-switch.S | 269 --------- + include/clocksource/arm_arch_timer.h | 6 + + include/kvm/arm_vgic.h | 6 + + virt/kvm/arm/vgic-v3.c | 11 +- + virt/kvm/arm/vgic.c | 2 +- + 42 files changed, 1731 insertions(+), 1704 deletions(-) + create mode 100644 arch/arm64/kvm/hyp/Makefile + create mode 100644 arch/arm64/kvm/hyp/debug-sr.c + create mode 100644 arch/arm64/kvm/hyp/entry.S + create mode 100644 arch/arm64/kvm/hyp/fpsimd.S + create mode 100644 arch/arm64/kvm/hyp/hyp-entry.S + create mode 100644 arch/arm64/kvm/hyp/hyp.h + create mode 100644 arch/arm64/kvm/hyp/switch.c + create mode 100644 arch/arm64/kvm/hyp/sysreg-sr.c + create mode 100644 arch/arm64/kvm/hyp/timer-sr.c + create mode 100644 arch/arm64/kvm/hyp/tlb.c + create mode 100644 arch/arm64/kvm/hyp/vgic-v2-sr.c + create mode 100644 arch/arm64/kvm/hyp/vgic-v3-sr.c + delete mode 100644 arch/arm64/kvm/vgic-v2-switch.S + delete mode 100644 arch/arm64/kvm/vgic-v3-switch.S +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 (696066f875bc KVM: PPC: Increase memslots to 512) +$ git merge kvm-ppc-paulus/kvm-ppc-next +Auto-merging arch/powerpc/kvm/book3s_hv.c +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/kvm_host.h | 3 +-- + arch/powerpc/kvm/book3s_64_mmu.c | 3 --- + arch/powerpc/kvm/book3s_hv.c | 18 ++++++++++++++++++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 4 +++- + 4 files changed, 22 insertions(+), 6 deletions(-) +Merging kvms390/next (c6e5f166373a KVM: s390: implement the RI support of guest) +$ git merge kvms390/next +Auto-merging arch/s390/kvm/kvm-s390.c +Merge made by the 'recursive' strategy. + arch/s390/include/asm/kvm_host.h | 3 ++- + arch/s390/include/uapi/asm/kvm.h | 3 +++ + arch/s390/kvm/kvm-s390.c | 23 ++++++++++++++++++++++- + include/uapi/linux/kvm.h | 1 + + 4 files changed, 28 insertions(+), 2 deletions(-) +Merging xen-tip/linux-next (b9fcbcf55dc4 xen/time: use READ_ONCE) +$ git merge xen-tip/linux-next +Auto-merging kernel/sched/cputime.c +Auto-merging arch/x86/xen/enlighten.c +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/kernel/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 20 ++++++ + arch/arm/include/asm/paravirt.h | 20 ++++++ + arch/arm/include/asm/xen/hypercall.h | 7 +++ + arch/arm/include/asm/xen/interface.h | 3 + + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/paravirt.c | 25 ++++++++ + arch/arm/xen/enlighten.c | 95 +++++++++++++++++++++++++++++ + arch/arm/xen/hypercall.S | 1 + + arch/arm64/Kconfig | 20 ++++++ + arch/arm64/include/asm/paravirt.h | 20 ++++++ + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/paravirt.c | 25 ++++++++ + arch/arm64/xen/hypercall.S | 1 + + arch/x86/include/asm/xen/hypercall.h | 6 +- + arch/x86/xen/apic.c | 2 +- + arch/x86/xen/enlighten.c | 8 +-- + arch/x86/xen/time.c | 115 ++++++++++------------------------- + drivers/xen/Makefile | 2 +- + drivers/xen/acpi.c | 2 +- + drivers/xen/efi.c | 30 ++++----- + drivers/xen/pcpu.c | 8 +-- + drivers/xen/time.c | 88 +++++++++++++++++++++++++++ + drivers/xen/xen-acpi-cpuhotplug.c | 2 +- + drivers/xen/xen-acpi-pad.c | 4 +- + drivers/xen/xen-acpi-processor.c | 8 +-- + drivers/xen/xenfs/xensyms.c | 4 +- + include/xen/interface/platform.h | 18 ++++-- + include/xen/interface/xen.h | 2 +- + include/xen/xen-ops.h | 5 ++ + kernel/sched/cputime.c | 3 + + 30 files changed, 419 insertions(+), 127 deletions(-) + create mode 100644 arch/arm/include/asm/paravirt.h + create mode 100644 arch/arm/kernel/paravirt.c + create mode 100644 arch/arm64/include/asm/paravirt.h + create mode 100644 arch/arm64/kernel/paravirt.c + create mode 100644 drivers/xen/time.c +Merging percpu/for-next (18fc93fd6412 percpu: remove PERCPU_ENOUGH_ROOM which is stale definition) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + arch/ia64/include/asm/percpu.h | 2 -- + include/linux/percpu-refcount.h | 2 +- + include/linux/percpu.h | 6 ------ + 3 files changed, 1 insertion(+), 9 deletions(-) +Merging workqueues/for-next (6201171e3b2c workqueue: simplify the apply_workqueue_attrs_locked()) +$ git merge workqueues/for-next +Auto-merging lib/Kconfig.debug +Auto-merging kernel/watchdog.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/sched/clock.c +Auto-merging include/linux/sched.h +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/kernel-parameters.txt | 9 ++ + include/linux/sched.h | 4 + + include/linux/workqueue.h | 6 + + kernel/sched/clock.c | 2 +- + kernel/time/tick-sched.c | 6 +- + kernel/watchdog.c | 18 ++- + kernel/workqueue.c | 220 ++++++++++++++++++++++++++++++++++-- + lib/Kconfig.debug | 11 ++ + 8 files changed, 261 insertions(+), 15 deletions(-) +Merging drivers-x86/for-next (c9abbe63aa08 asus-wmi: drop to_platform_driver macro) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/dell-wmi.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 10 +- + arch/x86/include/asm/intel_punit_ipc.h | 101 +++++++++ + drivers/platform/x86/Kconfig | 19 ++ + drivers/platform/x86/Makefile | 2 + + drivers/platform/x86/apple-gmux.c | 10 +- + drivers/platform/x86/asus-wmi.c | 3 - + drivers/platform/x86/dell-wmi.c | 85 +++++--- + drivers/platform/x86/ideapad-laptop.c | 7 + + drivers/platform/x86/intel-hid.c | 289 ++++++++++++++++++++++++++ + drivers/platform/x86/intel_pmc_ipc.c | 118 +++++++---- + drivers/platform/x86/intel_punit_ipc.c | 338 +++++++++++++++++++++++++++++++ + drivers/platform/x86/sony-laptop.c | 65 ++++-- + drivers/platform/x86/toshiba_acpi.c | 246 +++++++++++++++++++++- + drivers/platform/x86/toshiba_bluetooth.c | 2 +- + 14 files changed, 1193 insertions(+), 102 deletions(-) + create mode 100644 arch/x86/include/asm/intel_punit_ipc.h + create mode 100644 drivers/platform/x86/intel-hid.c + create mode 100644 drivers/platform/x86/intel_punit_ipc.c +Merging chrome-platform/for-next (ebaf31c46cce platform/chrome: Fix i2c-designware adapter name) +$ git merge chrome-platform/for-next +Already up-to-date. +Merging regmap/for-next (6cb07abcc318 Merge remote-tracking branches 'regmap/topic/mmio', 'regmap/topic/rbtree' and 'regmap/topic/seq' into regmap-next) +$ git merge regmap/for-next +Merge made by the 'recursive' strategy. + arch/mips/boot/dts/brcm/bcm6328.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7125.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7346.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7358.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7360.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7362.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7420.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7425.dtsi | 1 - + arch/mips/boot/dts/brcm/bcm7435.dtsi | 1 - + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache-lzo.c | 6 +- + drivers/base/regmap/regcache-rbtree.c | 18 ++++-- + drivers/base/regmap/regcache.c | 41 ++++++++++-- + drivers/base/regmap/regmap-debugfs.c | 69 ++++++-------------- + drivers/base/regmap/regmap-irq.c | 113 ++++++++++++++++++++++++++++++-- + drivers/base/regmap/regmap-mmio.c | 66 +++++++++++-------- + drivers/base/regmap/regmap.c | 118 +++++++++++++++++++++++++++++++--- + include/linux/regmap.h | 18 +++++- + 18 files changed, 341 insertions(+), 119 deletions(-) +Merging hsi/for-next (525e1abc6b5a HSI: omap_ssi_port: fix handling of_get_named_gpio result) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/controllers/omap_ssi.c | 7 +++---- + drivers/hsi/controllers/omap_ssi_port.c | 8 ++++---- + include/linux/hsi/hsi.h | 3 --- + 3 files changed, 7 insertions(+), 11 deletions(-) +Merging leds/for-next (522f17e1214c leds: add HAS_IOMEM dependency to LEDS_BCM6328/LEDS_BCM6358) +$ git merge leds/for-next +Auto-merging drivers/media/v4l2-core/v4l2-flash-led-class.c +Merge made by the 'recursive' strategy. + Documentation/leds/leds-class.txt | 13 +++ + drivers/leds/Kconfig | 2 + + drivers/leds/led-class-flash.c | 8 +- + drivers/leds/led-class.c | 11 ++- + drivers/leds/led-core.c | 120 ++++++++++++++++++------- + drivers/leds/led-triggers.c | 28 ++++++ + drivers/leds/leds-88pm860x.c | 23 ++--- + drivers/leds/leds-aat1290.c | 59 ++++-------- + drivers/leds/leds-adp5520.c | 26 ++---- + drivers/leds/leds-bcm6328.c | 63 +++++++------ + drivers/leds/leds-bcm6358.c | 37 ++++---- + drivers/leds/leds-bd2802.c | 39 +++----- + drivers/leds/leds-blinkm.c | 87 ++++-------------- + drivers/leds/leds-da903x.c | 46 ++++------ + drivers/leds/leds-da9052.c | 39 +++----- + drivers/leds/leds-dac124s085.c | 38 +++----- + drivers/leds/leds-gpio.c | 62 +++++-------- + drivers/leds/leds-ipaq-micro.c | 6 +- + drivers/leds/leds-ktd2692.c | 50 +++-------- + drivers/leds/leds-lm3533.c | 30 ++----- + drivers/leds/leds-lm355x.c | 85 ++++++------------ + drivers/leds/leds-lm3642.c | 73 +++++---------- + drivers/leds/leds-lp3944.c | 32 ++----- + drivers/leds/leds-lp5521.c | 11 +-- + drivers/leds/leds-lp5523.c | 10 +-- + drivers/leds/leds-lp5562.c | 11 +-- + drivers/leds/leds-lp55xx-common.c | 12 ++- + drivers/leds/leds-lp55xx-common.h | 6 +- + drivers/leds/leds-lp8501.c | 11 +-- + drivers/leds/leds-lp8788.c | 48 +++++----- + drivers/leds/leds-lp8860.c | 27 ++---- + drivers/leds/leds-lt3593.c | 33 +++---- + drivers/leds/leds-max77693.c | 58 +++--------- + drivers/leds/leds-max8997.c | 1 - + drivers/leds/leds-mc13783.c | 35 ++------ + drivers/leds/leds-ns2.c | 31 +++---- + drivers/leds/leds-pca9532.c | 28 +++--- + drivers/leds/leds-pca955x.c | 39 ++------ + drivers/leds/leds-pca963x.c | 80 +++++------------ + drivers/leds/leds-powernv.c | 18 ++-- + drivers/leds/leds-pwm.c | 39 ++++---- + drivers/leds/leds-regulator.c | 46 +++------- + drivers/leds/leds-sunfire.c | 23 ++--- + drivers/leds/leds-syscon.c | 18 +--- + drivers/leds/leds-tlc591xx.c | 31 ++----- + drivers/leds/leds-wm831x-status.c | 25 ++---- + drivers/leds/leds-wm8350.c | 64 ++++++------- + drivers/leds/leds.h | 27 +----- + drivers/leds/trigger/ledtrig-backlight.c | 8 +- + drivers/leds/trigger/ledtrig-cpu.c | 26 +----- + drivers/leds/trigger/ledtrig-default-on.c | 2 +- + drivers/leds/trigger/ledtrig-gpio.c | 6 +- + drivers/leds/trigger/ledtrig-heartbeat.c | 4 +- + drivers/leds/trigger/ledtrig-ide-disk.c | 14 +-- + drivers/leds/trigger/ledtrig-oneshot.c | 6 +- + drivers/leds/trigger/ledtrig-transient.c | 10 +-- + drivers/media/v4l2-core/v4l2-flash-led-class.c | 8 +- + include/linux/leds.h | 29 ++++-- + include/linux/mfd/wm8350/pmic.h | 1 - + 59 files changed, 677 insertions(+), 1146 deletions(-) +Merging ipmi/for-next (4193fcd31624 ipmi: Remove unnecessary pci_disable_device.) +$ git merge ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'recursive' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 7 ++++--- + drivers/char/ipmi/ipmi_si_intf.c | 28 ++++++++++++++++------------ + drivers/char/ipmi/ipmi_ssif.c | 1 - + 3 files changed, 20 insertions(+), 16 deletions(-) +Merging driver-core/driver-core-next (4ef7675344d6 Linux 4.4-rc6) +$ git merge driver-core/driver-core-next +Already up-to-date. +Merging tty/tty-next (041497eb721d drivers/tty/serial: delete unused MODULE_DEVICE_TABLE from atmel_serial.c) +$ git merge tty/tty-next +Resolved 'drivers/tty/serial/amba-pl011.c' using previous resolution. +Removing include/linux/nwpserial.h +Removing drivers/tty/serial/nwpserial.c +Auto-merging drivers/tty/serial/amba-pl011.c +CONFLICT (content): Merge conflict in drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/tty/serial/8250/8250_of.c +Auto-merging Documentation/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d10996c170f6] Merge remote-tracking branch 'tty/tty-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/serial/renesas,sci-serial.txt | 44 +- + Documentation/kernel-parameters.txt | 14 +- + arch/sh/kernel/cpu/clock-cpg.c | 1 - + arch/sh/kernel/cpu/sh2a/clock-sh7264.c | 9 +- + arch/sh/kernel/cpu/sh2a/clock-sh7269.c | 16 +- + arch/sh/kernel/cpu/sh4a/clock-sh7343.c | 8 +- + arch/sh/kernel/cpu/sh4a/clock-sh7366.c | 6 +- + arch/sh/kernel/cpu/sh4a/clock-sh7723.c | 12 +- + arch/sh/kernel/cpu/sh4a/clock-sh7734.c | 12 +- + arch/sh/kernel/cpu/sh4a/clock-sh7757.c | 6 +- + arch/sh/kernel/cpu/sh4a/clock-sh7785.c | 12 +- + arch/sh/kernel/cpu/sh4a/clock-sh7786.c | 12 +- + arch/sh/kernel/cpu/sh4a/clock-shx3.c | 8 +- + arch/sh/kernel/cpu/sh4a/setup-sh7734.c | 12 +- + drivers/tty/amiserial.c | 1 - + drivers/tty/cyclades.c | 8 +- + drivers/tty/isicom.c | 4 +- + drivers/tty/moxa.c | 1 - + drivers/tty/n_tty.c | 55 +- + drivers/tty/pty.c | 2 +- + drivers/tty/serial/68328serial.c | 130 ++--- + drivers/tty/serial/8250/8250_core.c | 7 +- + drivers/tty/serial/8250/8250_early.c | 29 +- + drivers/tty/serial/8250/8250_ingenic.c | 2 + + drivers/tty/serial/8250/8250_mtk.c | 35 +- + drivers/tty/serial/{of_serial.c => 8250/8250_of.c} | 38 +- + drivers/tty/serial/8250/8250_port.c | 20 + + drivers/tty/serial/8250/8250_uniphier.c | 24 + + drivers/tty/serial/8250/Kconfig | 14 +- + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 33 +- + drivers/tty/serial/Makefile | 2 - + drivers/tty/serial/amba-pl011.c | 16 +- + drivers/tty/serial/atmel_serial.c | 187 +------ + drivers/tty/serial/bcm63xx_uart.c | 2 +- + drivers/tty/serial/bfin_uart.c | 27 +- + drivers/tty/serial/earlycon.c | 15 +- + drivers/tty/serial/icom.c | 1 - + drivers/tty/serial/imx.c | 189 ++++--- + drivers/tty/serial/jsm/jsm_driver.c | 4 +- + drivers/tty/serial/jsm/jsm_neo.c | 2 +- + drivers/tty/serial/m32r_sio.c | 2 +- + drivers/tty/serial/men_z135_uart.c | 2 +- + drivers/tty/serial/meson_uart.c | 80 ++- + drivers/tty/serial/nwpserial.c | 477 ----------------- + drivers/tty/serial/omap-serial.c | 2 +- + drivers/tty/serial/pxa.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 13 + + drivers/tty/serial/serial_core.c | 11 +- + drivers/tty/serial/serial_mctrl_gpio.c | 2 + + drivers/tty/serial/sh-sci.c | 589 ++++++++++++++------- + drivers/tty/serial/sh-sci.h | 10 + + drivers/tty/serial/sprd_serial.c | 2 +- + drivers/tty/serial/sunsu.c | 2 +- + drivers/tty/serial/vt8500_serial.c | 2 +- + drivers/tty/synclink_gt.c | 4 +- + drivers/tty/tty_io.c | 88 ++- + drivers/tty/tty_ioctl.c | 21 +- + drivers/tty/tty_ldisc.c | 51 +- + drivers/tty/tty_ldsem.c | 4 +- + drivers/tty/tty_mutex.c | 10 +- + drivers/tty/tty_port.c | 9 +- + drivers/tty/vt/vt.c | 2 +- + include/linux/nwpserial.h | 18 - + include/linux/serial_core.h | 3 +- + include/linux/serial_sci.h | 1 + + include/linux/tty.h | 23 +- + include/uapi/linux/serial.h | 1 + + include/uapi/linux/serial_core.h | 2 +- + 69 files changed, 1068 insertions(+), 1386 deletions(-) + rename drivers/tty/serial/{of_serial.c => 8250/8250_of.c} (91%) + delete mode 100644 drivers/tty/serial/nwpserial.c + delete mode 100644 include/linux/nwpserial.h +Merging usb/usb-next (60d77b3d2229 MAINTAINERS: change my email address) +$ git merge usb/usb-next +Removing include/linux/usb/musb-omap.h +Removing include/linux/platform_data/usb-rcar-phy.h +Removing drivers/usb/phy/phy-rcar-usb.c +Auto-merging drivers/usb/phy/phy-am335x-control.h +Auto-merging drivers/usb/host/Kconfig +Removing drivers/usb/dwc3/dwc3-qcom.c +Auto-merging drivers/usb/core/usb.c +Auto-merging drivers/usb/core/port.c +Auto-merging drivers/usb/core/devio.c +Removing drivers/usb/chipidea/debug.h +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8173-evb.dts +Auto-merging MAINTAINERS +Auto-merging Documentation/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/configfs-usb-gadget-sourcesink | 2 + + Documentation/ABI/testing/sysfs-bus-usb | 27 +- + .../bindings/phy/brcm,brcmstb-sata-phy.txt | 1 + + .../devicetree/bindings/phy/phy-hi6220-usb.txt | 16 + + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 39 + + .../devicetree/bindings/phy/rockchip-usb-phy.txt | 6 +- + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + + Documentation/devicetree/bindings/phy/ti-phy.txt | 20 +- + Documentation/devicetree/bindings/usb/dwc2.txt | 1 + + .../devicetree/bindings/usb/dwc3-xilinx.txt | 33 + + .../devicetree/bindings/usb/mt8173-xhci.txt | 51 + + .../devicetree/bindings/usb/renesas_usb3.txt | 23 + + .../devicetree/bindings/usb/renesas_usbhs.txt | 22 +- + Documentation/devicetree/bindings/usb/usb-xhci.txt | 4 +- + Documentation/kernel-parameters.txt | 8 +- + Documentation/usb/chipidea.txt | 4 +- + Documentation/usb/gadget-testing.txt | 4 +- + Documentation/usb/power-management.txt | 11 +- + MAINTAINERS | 10 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 16 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 42 + + drivers/phy/Kconfig | 20 +- + drivers/phy/Makefile | 2 + + drivers/phy/phy-berlin-usb.c | 3 - + drivers/phy/phy-brcmstb-sata.c | 47 +- + drivers/phy/phy-hi6220-usb.c | 168 ++ + drivers/phy/phy-mt65xx-usb3.c | 106 +- + drivers/phy/phy-omap-usb2.c | 94 +- + drivers/phy/phy-rcar-gen3-usb2.c | 378 ++++ + drivers/phy/phy-rockchip-usb.c | 287 ++- + drivers/phy/phy-sun4i-usb.c | 158 +- + drivers/phy/phy-ti-pipe3.c | 302 ++- + drivers/phy/phy-twl4030-usb.c | 32 +- + drivers/usb/chipidea/Kconfig | 5 - + drivers/usb/chipidea/Makefile | 5 +- + drivers/usb/chipidea/ci.h | 3 + + drivers/usb/chipidea/ci_hdrc_imx.c | 6 + + drivers/usb/chipidea/ci_hdrc_msm.c | 3 +- + drivers/usb/chipidea/core.c | 59 +- + drivers/usb/chipidea/debug.c | 1 - + drivers/usb/chipidea/debug.h | 30 - + drivers/usb/chipidea/host.c | 2 + + drivers/usb/chipidea/otg_fsm.c | 26 +- + drivers/usb/chipidea/udc.c | 31 +- + drivers/usb/common/common.c | 60 +- + drivers/usb/core/devio.c | 25 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/core/hub.c | 68 +- + drivers/usb/core/hub.h | 5 +- + drivers/usb/core/port.c | 89 +- + drivers/usb/core/sysfs.c | 31 +- + drivers/usb/core/usb.c | 5 - + drivers/usb/dwc2/core.c | 429 ++++- + drivers/usb/dwc2/core.h | 66 +- + drivers/usb/dwc2/core_intr.c | 53 +- + drivers/usb/dwc2/gadget.c | 109 +- + drivers/usb/dwc2/hcd.c | 128 +- + drivers/usb/dwc2/hcd.h | 31 +- + drivers/usb/dwc2/hcd_ddma.c | 240 ++- + drivers/usb/dwc2/hcd_intr.c | 39 +- + drivers/usb/dwc2/hcd_queue.c | 2 +- + drivers/usb/dwc2/hw.h | 4 - + drivers/usb/dwc2/platform.c | 158 +- + drivers/usb/dwc3/Kconfig | 17 +- + drivers/usb/dwc3/Makefile | 2 +- + drivers/usb/dwc3/core.c | 8 +- + drivers/usb/dwc3/core.h | 3 + + drivers/usb/dwc3/dwc3-of-simple.c | 180 ++ + drivers/usb/dwc3/dwc3-qcom.c | 130 -- + drivers/usb/dwc3/ep0.c | 12 +- + drivers/usb/dwc3/gadget.c | 133 +- + drivers/usb/dwc3/trace.h | 11 +- + drivers/usb/gadget/Kconfig | 6 + + drivers/usb/gadget/configfs.c | 29 +- + drivers/usb/gadget/function/f_midi.c | 192 +- + drivers/usb/gadget/function/f_sourcesink.c | 149 +- + drivers/usb/gadget/function/g_zero.h | 7 +- + drivers/usb/gadget/function/u_ether.c | 18 +- + drivers/usb/gadget/function/u_serial.c | 258 +++ + drivers/usb/gadget/legacy/acm_ms.c | 2 +- + drivers/usb/gadget/legacy/audio.c | 2 +- + drivers/usb/gadget/legacy/cdc2.c | 2 +- + drivers/usb/gadget/legacy/ether.c | 2 +- + drivers/usb/gadget/legacy/g_ffs.c | 2 +- + drivers/usb/gadget/legacy/gmidi.c | 12 +- + drivers/usb/gadget/legacy/hid.c | 2 +- + drivers/usb/gadget/legacy/inode.c | 3 +- + drivers/usb/gadget/legacy/mass_storage.c | 2 +- + drivers/usb/gadget/legacy/multi.c | 2 +- + drivers/usb/gadget/legacy/ncm.c | 2 +- + drivers/usb/gadget/legacy/nokia.c | 2 +- + drivers/usb/gadget/legacy/printer.c | 2 +- + drivers/usb/gadget/legacy/serial.c | 2 +- + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2 +- + drivers/usb/gadget/legacy/webcam.c | 2 +- + drivers/usb/gadget/legacy/zero.c | 14 +- + drivers/usb/gadget/u_f.c | 1 - + drivers/usb/gadget/u_f.h | 10 +- + drivers/usb/gadget/udc/Kconfig | 11 + + drivers/usb/gadget/udc/Makefile | 1 + + drivers/usb/gadget/udc/bcm63xx_udc.c | 7 +- + drivers/usb/gadget/udc/gr_udc.c | 3 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 35 +- + drivers/usb/gadget/udc/renesas_usb3.c | 1975 ++++++++++++++++++++ + drivers/usb/gadget/udc/s3c-hsudc.c | 2 +- + drivers/usb/gadget/udc/udc-core.c | 79 +- + drivers/usb/host/Kconfig | 9 + + drivers/usb/host/Makefile | 4 + + drivers/usb/host/bcma-hcd.c | 21 +- + drivers/usb/host/ehci-dbg.c | 15 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mem.c | 18 +- + drivers/usb/host/ehci-msm.c | 4 +- + drivers/usb/host/ehci-q.c | 9 +- + drivers/usb/host/ehci.h | 1 + + drivers/usb/host/fhci-tds.c | 2 +- + drivers/usb/host/ohci-hcd.c | 4 +- + drivers/usb/host/ohci-pxa27x.c | 14 +- + drivers/usb/host/oxu210hp-hcd.c | 8 +- + drivers/usb/host/pci-quirks.c | 25 +- + drivers/usb/host/u132-hcd.c | 2 +- + drivers/usb/host/uhci-q.c | 3 +- + drivers/usb/host/whci/qset.c | 5 +- + drivers/usb/host/xhci-ext-caps.h | 83 +- + drivers/usb/host/xhci-hub.c | 2 +- + drivers/usb/host/xhci-mem.c | 81 +- + drivers/usb/host/xhci-mtk-sch.c | 415 ++++ + drivers/usb/host/xhci-mtk.c | 763 ++++++++ + drivers/usb/host/xhci-mtk.h | 162 ++ + drivers/usb/host/xhci-pci.c | 1 - + drivers/usb/host/xhci-plat.c | 88 +- + drivers/usb/host/xhci-plat.h | 39 + + drivers/usb/host/xhci-rcar.c | 44 +- + drivers/usb/host/xhci-rcar.h | 3 + + drivers/usb/host/xhci-ring.c | 16 +- + drivers/usb/host/xhci.c | 25 +- + drivers/usb/host/xhci.h | 4 + + drivers/usb/misc/usbtest.c | 233 ++- + drivers/usb/mon/mon_bin.c | 17 +- + drivers/usb/mon/mon_main.c | 2 +- + drivers/usb/mon/mon_text.c | 15 +- + drivers/usb/musb/musb_core.c | 48 +- + drivers/usb/musb/musb_core.h | 2 + + drivers/usb/musb/musb_gadget.c | 5 +- + drivers/usb/musb/omap2430.c | 30 +- + drivers/usb/phy/Kconfig | 14 +- + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-am335x-control.c | 16 +- + .../{am35x-phy-control.h => phy-am335x-control.h} | 8 +- + drivers/usb/phy/phy-am335x.c | 17 +- + drivers/usb/phy/phy-rcar-usb.c | 247 --- + drivers/usb/phy/phy-twl6030-usb.c | 30 +- + drivers/usb/renesas_usbhs/common.c | 78 +- + drivers/usb/renesas_usbhs/mod_gadget.c | 19 +- + drivers/usb/renesas_usbhs/mod_host.c | 11 +- + drivers/usb/renesas_usbhs/pipe.c | 112 +- + drivers/usb/renesas_usbhs/pipe.h | 1 - + drivers/usb/serial/Kconfig | 16 + + drivers/usb/serial/Makefile | 1 + + drivers/usb/serial/cp210x.c | 186 +- + drivers/usb/serial/io_edgeport.c | 35 +- + drivers/usb/serial/mos7840.c | 2 +- + drivers/usb/serial/mxu11x0.c | 986 ++++++++++ + drivers/usb/storage/uas.c | 48 +- + drivers/uwb/uwbd.c | 1 - + include/linux/phy/omap_usb.h | 23 + + include/linux/platform_data/usb-rcar-phy.h | 28 - + include/linux/usb.h | 6 +- + include/linux/usb/gadget.h | 11 +- + include/linux/usb/hcd.h | 4 +- + include/linux/usb/musb-omap.h | 30 - + include/linux/usb/musb.h | 15 + + include/linux/usb/of.h | 6 + + include/linux/usb/renesas_usbhs.h | 18 +- + 174 files changed, 9139 insertions(+), 2046 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt + create mode 100644 Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt + create mode 100644 Documentation/devicetree/bindings/usb/dwc3-xilinx.txt + create mode 100644 Documentation/devicetree/bindings/usb/mt8173-xhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/renesas_usb3.txt + create mode 100644 drivers/phy/phy-hi6220-usb.c + create mode 100644 drivers/phy/phy-rcar-gen3-usb2.c + delete mode 100644 drivers/usb/chipidea/debug.h + create mode 100644 drivers/usb/dwc3/dwc3-of-simple.c + delete mode 100644 drivers/usb/dwc3/dwc3-qcom.c + create mode 100644 drivers/usb/gadget/udc/renesas_usb3.c + create mode 100644 drivers/usb/host/xhci-mtk-sch.c + create mode 100644 drivers/usb/host/xhci-mtk.c + create mode 100644 drivers/usb/host/xhci-mtk.h + create mode 100644 drivers/usb/host/xhci-plat.h + rename drivers/usb/phy/{am35x-phy-control.h => phy-am335x-control.h} (68%) + delete mode 100644 drivers/usb/phy/phy-rcar-usb.c + create mode 100644 drivers/usb/serial/mxu11x0.c + delete mode 100644 include/linux/platform_data/usb-rcar-phy.h + delete mode 100644 include/linux/usb/musb-omap.h +Merging usb-gadget/next (5072cfc40a80 usb: dwc3: of-simple: fix build warning on !PM) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (6ff9d2761b86 USB: mxu11x0: drop redundant function name from error messages) +$ git merge usb-serial/usb-next +Already up-to-date. +Merging usb-chipidea-next/ci-for-usb-next (d0c40d9fda12 usb: chipidea: debug: use list_for_each_entry) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/debug.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging staging/staging-next (841e3ed977e0 Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC.") +$ git merge staging/staging-next +Resolved 'drivers/staging/lustre/lustre/llite/symlink.c' using previous resolution. +Removing drivers/staging/wilc1000/linux_wlan_spi.h +Removing drivers/staging/wilc1000/linux_wlan_spi.c +Removing drivers/staging/wilc1000/linux_wlan_sdio.h +Removing drivers/staging/wilc1000/linux_wlan_sdio.c +Removing drivers/staging/sm750fb/modedb.h +Auto-merging drivers/staging/rdma/hfi1/verbs.h +Auto-merging drivers/staging/rdma/hfi1/verbs.c +Auto-merging drivers/staging/rdma/ehca/ehca_mrmw.c +Auto-merging drivers/staging/rdma/ehca/ehca_main.c +Auto-merging drivers/staging/rdma/amso1100/c2_provider.c +Auto-merging drivers/staging/media/bcm2048/radio-bcm2048.c +Auto-merging drivers/staging/lustre/lustre/llite/xattr.c +Auto-merging drivers/staging/lustre/lustre/llite/symlink.c +CONFLICT (content): Merge conflict in drivers/staging/lustre/lustre/llite/symlink.c +Auto-merging drivers/staging/lustre/lustre/llite/namei.c +Auto-merging drivers/staging/lustre/lustre/llite/llite_internal.h +Auto-merging drivers/staging/lustre/lustre/llite/file.c +Removing drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h +Auto-merging drivers/staging/lustre/lnet/klnds/socklnd/socklnd_lib.c +Auto-merging drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c +Removing drivers/staging/iio/adc/ad7780.h +Auto-merging Documentation/devicetree/bindings/i2c/trivial-devices.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 25dfeff72fd6] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-iio | 21 + + Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc | 24 + + .../devicetree/bindings/i2c/trivial-devices.txt | 1 + + .../devicetree/bindings/iio/accel/mma8452.txt | 6 + + .../devicetree/bindings/iio/adc/imx7d-adc.txt | 22 + + .../devicetree/bindings/iio/adc/mcp320x.txt | 30 +- + .../devicetree/bindings/iio/adc/mcp3422.txt | 3 +- + .../devicetree/bindings/iio/adc/palmas-gpadc.txt | 48 + + .../devicetree/bindings/iio/adc/ti-adc128s052.txt | 4 +- + .../devicetree/bindings/iio/adc/ti-ads8688.txt | 20 + + .../devicetree/bindings/iio/health/max30100.txt | 21 + + .../devicetree/bindings/iio/light/us5182d.txt | 11 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../devicetree/bindings/staging/ion/hi6220-ion.txt | 31 + + Documentation/iio/iio_configfs.txt | 93 + + drivers/iio/Kconfig | 18 + + drivers/iio/Makefile | 4 + + drivers/iio/accel/Kconfig | 42 +- + drivers/iio/accel/Makefile | 6 + + drivers/iio/accel/bmc150-accel-core.c | 20 +- + drivers/iio/accel/kxcjk-1013.c | 20 +- + drivers/iio/accel/mma7455.h | 19 + + drivers/iio/accel/mma7455_core.c | 311 ++ + drivers/iio/accel/mma7455_i2c.c | 56 + + drivers/iio/accel/mma7455_spi.c | 52 + + drivers/iio/accel/mma8452.c | 61 +- + drivers/iio/accel/mma9551.c | 19 +- + drivers/iio/accel/mma9553.c | 20 +- + drivers/iio/accel/mxc6255.c | 198 ++ + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 1 + + drivers/iio/adc/Kconfig | 43 +- + drivers/iio/adc/Makefile | 4 + + drivers/iio/adc/ad7793.c | 5 +- + drivers/iio/adc/at91_adc.c | 2 +- + drivers/iio/adc/imx7d_adc.c | 609 ++++ + drivers/iio/adc/ina2xx-adc.c | 745 ++++ + drivers/iio/adc/mcp320x.c | 28 + + drivers/iio/adc/mcp3422.c | 9 + + drivers/iio/adc/palmas_gpadc.c | 859 +++++ + drivers/iio/adc/ti-adc128s052.c | 13 +- + drivers/iio/adc/ti-ads8688.c | 486 +++ + drivers/iio/adc/xilinx-xadc-core.c | 2 +- + drivers/iio/buffer/Kconfig | 20 + + drivers/iio/buffer/Makefile | 2 + + drivers/iio/buffer/industrialio-buffer-dma.c | 683 ++++ + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 213 ++ + drivers/iio/chemical/Kconfig | 8 + + drivers/iio/chemical/Makefile | 1 + + drivers/iio/chemical/ams-iaq-core.c | 200 ++ + drivers/iio/chemical/vz89x.c | 66 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 3 - + drivers/iio/dummy/Kconfig | 36 + + drivers/iio/dummy/Makefile | 10 + + .../{staging/iio => iio/dummy}/iio_dummy_evgen.c | 0 + .../{staging/iio => iio/dummy}/iio_dummy_evgen.h | 0 + .../{staging/iio => iio/dummy}/iio_simple_dummy.c | 0 + .../{staging/iio => iio/dummy}/iio_simple_dummy.h | 0 + .../iio => iio/dummy}/iio_simple_dummy_buffer.c | 0 + .../iio => iio/dummy}/iio_simple_dummy_events.c | 0 + drivers/iio/gyro/adis16136.c | 4 +- + drivers/iio/gyro/bmg160_core.c | 19 +- + drivers/iio/health/Kconfig | 21 + + drivers/iio/health/Makefile | 7 + + drivers/iio/health/max30100.c | 453 +++ + drivers/iio/imu/adis16400_core.c | 6 +- + drivers/iio/imu/adis16480.c | 4 +- + drivers/iio/imu/kmx61.c | 24 +- + drivers/iio/industrialio-buffer.c | 58 +- + drivers/iio/industrialio-configfs.c | 51 + + drivers/iio/industrialio-core.c | 10 + + drivers/iio/industrialio-sw-trigger.c | 184 + + drivers/iio/inkern.c | 6 +- + drivers/iio/light/lm3533-als.c | 4 +- + drivers/iio/light/pa12203001.c | 16 +- + drivers/iio/light/rpr0521.c | 14 +- + drivers/iio/light/us5182d.c | 609 +++- + drivers/iio/magnetometer/bmc150_magn.c | 20 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 151 +- + drivers/iio/trigger/Kconfig | 10 + + drivers/iio/trigger/Makefile | 2 + + drivers/iio/trigger/iio-trig-hrtimer.c | 193 + + drivers/staging/android/TODO | 8 + + drivers/staging/android/ashmem.c | 15 +- + drivers/staging/android/ion/Kconfig | 7 + + drivers/staging/android/ion/Makefile | 1 + + drivers/staging/android/ion/compat_ion.c | 6 +- + drivers/staging/android/ion/hisilicon/Kconfig | 5 + + drivers/staging/android/ion/hisilicon/Makefile | 1 + + drivers/staging/android/ion/hisilicon/hi6220_ion.c | 223 ++ + drivers/staging/android/lowmemorykiller.c | 6 +- + drivers/staging/android/sync.c | 41 +- + drivers/staging/android/sync.h | 10 + + drivers/staging/android/sync_debug.c | 42 +- + drivers/staging/android/timed_gpio.c | 11 +- + drivers/staging/comedi/Kconfig | 24 +- + drivers/staging/comedi/comedi.h | 307 +- + drivers/staging/comedi/comedi_fops.c | 124 +- + drivers/staging/comedi/comedilib.h | 32 +- + drivers/staging/comedi/drivers/Makefile | 2 + + drivers/staging/comedi/drivers/adl_pci9118.c | 3 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 542 ++- + drivers/staging/comedi/drivers/adv_pci1720.c | 195 ++ + drivers/staging/comedi/drivers/adv_pci1760.c | 432 +++ + drivers/staging/comedi/drivers/adv_pci_dio.c | 1125 ++---- + drivers/staging/comedi/drivers/amplc_pci224.c | 11 +- + drivers/staging/comedi/drivers/cb_pcidda.c | 6 +- + drivers/staging/comedi/drivers/comedi_parport.c | 4 +- + drivers/staging/comedi/drivers/das16.c | 3 +- + drivers/staging/comedi/drivers/ni_6527.c | 24 +- + drivers/staging/comedi/drivers/ni_65xx.c | 54 +- + drivers/staging/comedi/drivers/ni_670x.c | 5 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 100 +- + drivers/staging/comedi/drivers/plx9080.h | 126 +- + drivers/staging/comedi/drivers/s526.c | 197 +- + drivers/staging/dgnc/dgnc_cls.c | 2 +- + drivers/staging/dgnc/dgnc_neo.c | 10 +- + drivers/staging/dgnc/dgnc_tty.c | 2 +- + drivers/staging/dgnc/dgnc_utils.c | 1 - + drivers/staging/emxx_udc/emxx_udc.c | 40 +- + drivers/staging/fwserial/fwserial.c | 3 +- + drivers/staging/fwserial/fwserial.h | 10 - + drivers/staging/gdm724x/gdm_lte.c | 2 +- + drivers/staging/gdm724x/gdm_tty.c | 2 +- + drivers/staging/gdm724x/netlink_k.c | 5 - + drivers/staging/gdm724x/netlink_k.h | 1 - + drivers/staging/gdm72xx/gdm_qos.c | 52 +- + drivers/staging/gdm72xx/gdm_sdio.c | 13 +- + drivers/staging/gdm72xx/gdm_sdio.h | 4 +- + drivers/staging/gdm72xx/gdm_wimax.c | 21 +- + drivers/staging/gdm72xx/wm_ioctl.h | 7 +- + drivers/staging/iio/Kconfig | 29 - + drivers/staging/iio/Makefile | 7 - + drivers/staging/iio/accel/sca3000_ring.c | 2 +- + drivers/staging/iio/adc/ad7192.c | 2 +- + drivers/staging/iio/adc/ad7280a.c | 2 +- + drivers/staging/iio/adc/ad7780.c | 36 +- + drivers/staging/iio/adc/ad7780.h | 30 - + drivers/staging/iio/adc/ad7816.c | 2 +- + drivers/staging/iio/adc/mxs-lradc.c | 4 +- + drivers/staging/iio/frequency/ad9832.c | 2 +- + drivers/staging/iio/frequency/ad9834.c | 2 +- + drivers/staging/iio/light/tsl2x7x_core.c | 2 +- + .../staging/lustre/include/linux/libcfs/libcfs.h | 9 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 3 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 156 +- + .../include/linux/libcfs/libcfs_kernelcomm.h | 2 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 2 - + drivers/staging/lustre/include/linux/lnet/api.h | 6 - + .../staging/lustre/include/linux/lnet/lib-lnet.h | 2 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 2 +- + drivers/staging/lustre/include/linux/lnet/nidstr.h | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 4 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 2 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 2 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 13 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 3 + + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 2 - + drivers/staging/lustre/lnet/lnet/acceptor.c | 2 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 21 +- + drivers/staging/lustre/lnet/lnet/config.c | 26 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 18 - + drivers/staging/lustre/lnet/lnet/lib-move.c | 3 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 2 +- + drivers/staging/lustre/lnet/lnet/module.c | 4 +- + drivers/staging/lustre/lnet/lnet/router.c | 2 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 6 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 2 - + drivers/staging/lustre/lnet/selftest/conrpc.c | 4 +- + drivers/staging/lustre/lnet/selftest/console.c | 88 +- + drivers/staging/lustre/lnet/selftest/framework.c | 8 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 25 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 16 +- + drivers/staging/lustre/lustre/fid/fid_internal.h | 2 - + drivers/staging/lustre/lustre/fid/fid_request.c | 25 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 2 +- + drivers/staging/lustre/lustre/fld/fld_cache.c | 35 +- + drivers/staging/lustre/lustre/fld/fld_internal.h | 11 +- + drivers/staging/lustre/lustre/fld/fld_request.c | 4 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 2 +- + drivers/staging/lustre/lustre/include/cl_object.h | 3 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 5 +- + drivers/staging/lustre/lustre/include/lu_object.h | 2 +- + .../lustre/lustre/include/lustre/ll_fiemap.h | 2 + + .../lustre/lustre/include/lustre/lustre_idl.h | 2 +- + .../lustre/lustre/include/lustre/lustre_user.h | 2 +- + .../staging/lustre/lustre/include/lustre_disk.h | 1 + + drivers/staging/lustre/lustre/include/lustre_dlm.h | 4 +- + .../staging/lustre/lustre/include/lustre_eacl.h | 2 - + .../staging/lustre/lustre/include/lustre_export.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_fid.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_ha.h | 2 +- + drivers/staging/lustre/lustre/include/lustre_log.h | 5 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 6 - + drivers/staging/lustre/lustre/include/lustre_net.h | 2 +- + .../staging/lustre/lustre/include/lustre_param.h | 2 +- + .../lustre/lustre/include/lustre_req_layout.h | 2 +- + drivers/staging/lustre/lustre/include/obd.h | 324 +- + drivers/staging/lustre/lustre/include/obd_cksum.h | 23 - + drivers/staging/lustre/lustre/include/obd_class.h | 18 +- + .../staging/lustre/lustre/include/obd_support.h | 2 +- + drivers/staging/lustre/lustre/lclient/lcommon_cl.c | 6 +- + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 16 +- + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 49 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 4 +- + drivers/staging/lustre/lustre/libcfs/debug.c | 23 +- + drivers/staging/lustre/lustre/libcfs/fail.c | 4 +- + drivers/staging/lustre/lustre/libcfs/hash.c | 383 +- + .../lustre/lustre/libcfs/kernel_user_comm.c | 3 +- + drivers/staging/lustre/lustre/libcfs/libcfs_lock.c | 2 +- + drivers/staging/lustre/lustre/libcfs/libcfs_mem.c | 2 - + .../staging/lustre/lustre/libcfs/libcfs_string.c | 2 +- + .../staging/lustre/lustre/libcfs/linux/linux-cpu.c | 33 +- + .../lustre/libcfs/linux/linux-crypto-adler.c | 9 +- + .../lustre/lustre/libcfs/linux/linux-curproc.c | 2 +- + .../lustre/lustre/libcfs/linux/linux-debug.c | 1 - + .../lustre/lustre/libcfs/linux/linux-tracefile.h | 48 - + drivers/staging/lustre/lustre/libcfs/module.c | 8 +- + drivers/staging/lustre/lustre/libcfs/tracefile.c | 27 +- + drivers/staging/lustre/lustre/libcfs/tracefile.h | 29 +- + drivers/staging/lustre/lustre/libcfs/workitem.c | 58 +- + drivers/staging/lustre/lustre/llite/dcache.c | 2 +- + drivers/staging/lustre/lustre/llite/dir.c | 13 +- + drivers/staging/lustre/lustre/llite/file.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 12 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 2 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 2 +- + drivers/staging/lustre/lustre/llite/lloop.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 2 +- + drivers/staging/lustre/lustre/llite/namei.c | 3 +- + drivers/staging/lustre/lustre/llite/rw.c | 14 +- + drivers/staging/lustre/lustre/llite/rw26.c | 5 +- + drivers/staging/lustre/lustre/llite/statahead.c | 78 +- + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 2 + + drivers/staging/lustre/lustre/llite/vvp_io.c | 4 +- + drivers/staging/lustre/lustre/llite/vvp_lock.c | 2 + + drivers/staging/lustre/lustre/llite/vvp_object.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_page.c | 2 +- + drivers/staging/lustre/lustre/llite/xattr.c | 7 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 2 + + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 23 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 16 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 96 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/lov/lov_dev.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_internal.h | 17 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 62 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_pack.c | 17 +- + drivers/staging/lustre/lustre/lov/lov_page.c | 2 +- + drivers/staging/lustre/lustre/lov/lov_pool.c | 3 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 18 +- + drivers/staging/lustre/lustre/lov/lovsub_dev.c | 2 + + drivers/staging/lustre/lustre/lov/lovsub_object.c | 2 +- + drivers/staging/lustre/lustre/lov/lproc_lov.c | 2 +- + drivers/staging/lustre/lustre/mdc/lproc_mdc.c | 79 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 17 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 2 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 141 +- + drivers/staging/lustre/lustre/mgc/mgc_request.c | 36 +- + drivers/staging/lustre/lustre/obdclass/acl.c | 9 - + drivers/staging/lustre/lustre/obdclass/cl_io.c | 28 +- + drivers/staging/lustre/lustre/obdclass/cl_lock.c | 3 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 5 +- + drivers/staging/lustre/lustre/obdclass/cl_page.c | 2 +- + drivers/staging/lustre/lustre/obdclass/class_obd.c | 4 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 8 +- + .../lustre/lustre/obdclass/linux/linux-sysctl.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_cat.c | 2 +- + .../staging/lustre/lustre/obdclass/llog_internal.h | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_obd.c | 2 +- + drivers/staging/lustre/lustre/obdclass/llog_swab.c | 2 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 23 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 4 +- + .../staging/lustre/lustre/obdclass/obd_config.c | 2 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 12 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 18 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 12 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 2 +- + drivers/staging/lustre/lustre/osc/osc_dev.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 8 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 6 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 73 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 2 +- + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 2 + + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 5 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 3 +- + drivers/staging/lustre/lustre/ptlrpc/recover.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_config.c | 5 +- + drivers/staging/lustre/lustre/ptlrpc/sec_plain.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 2 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 2 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 393 +-- + drivers/staging/most/aim-network/networking.h | 2 - + drivers/staging/most/hdm-dim2/dim2_errors.h | 2 - + drivers/staging/most/hdm-dim2/dim2_hal.c | 133 +- + drivers/staging/most/hdm-dim2/dim2_hal.h | 53 +- + drivers/staging/most/hdm-dim2/dim2_hdm.c | 60 +- + drivers/staging/most/hdm-dim2/dim2_reg.h | 5 +- + drivers/staging/most/hdm-dim2/dim2_sysfs.h | 3 - + drivers/staging/most/mostcore/core.c | 3 +- + drivers/staging/most/mostcore/mostcore.h | 2 - + drivers/staging/nvec/README | 2 +- + drivers/staging/nvec/nvec.c | 20 +- + drivers/staging/octeon/ethernet-defines.h | 2 +- + drivers/staging/rdma/amso1100/c2.c | 17 +- + drivers/staging/rdma/amso1100/c2.h | 80 +- + drivers/staging/rdma/amso1100/c2_mq.h | 14 +- + drivers/staging/rdma/amso1100/c2_provider.c | 10 +- + drivers/staging/rdma/amso1100/c2_rnic.c | 5 +- + drivers/staging/rdma/amso1100/c2_vq.h | 20 +- + drivers/staging/rdma/ehca/ehca_av.c | 6 +- + drivers/staging/rdma/ehca/ehca_cq.c | 3 +- + drivers/staging/rdma/ehca/ehca_main.c | 3 +- + drivers/staging/rdma/ehca/ehca_mrmw.c | 6 +- + drivers/staging/rdma/ehca/ehca_pd.c | 3 +- + drivers/staging/rdma/ehca/ehca_qp.c | 3 +- + drivers/staging/rdma/hfi1/Makefile | 2 +- + drivers/staging/rdma/hfi1/chip.c | 3686 ++++++++++++++++++-- + drivers/staging/rdma/hfi1/chip.h | 273 +- + drivers/staging/rdma/hfi1/chip_registers.h | 4 +- + drivers/staging/rdma/hfi1/common.h | 15 +- + drivers/staging/rdma/hfi1/diag.c | 499 ++- + drivers/staging/rdma/hfi1/driver.c | 215 +- + drivers/staging/rdma/hfi1/efivar.c | 169 + + drivers/staging/rdma/hfi1/efivar.h | 60 + + drivers/staging/rdma/hfi1/eprom.c | 119 +- + drivers/staging/rdma/hfi1/file_ops.c | 207 +- + drivers/staging/rdma/hfi1/firmware.c | 193 +- + drivers/staging/rdma/hfi1/hfi.h | 104 +- + drivers/staging/rdma/hfi1/init.c | 101 +- + drivers/staging/rdma/hfi1/iowait.h | 6 +- + drivers/staging/rdma/hfi1/mad.c | 227 +- + drivers/staging/rdma/hfi1/mad.h | 114 + + drivers/staging/rdma/hfi1/pcie.c | 36 +- + drivers/staging/rdma/hfi1/pio.c | 68 +- + drivers/staging/rdma/hfi1/pio.h | 2 +- + drivers/staging/rdma/hfi1/pio_copy.c | 6 +- + drivers/staging/rdma/hfi1/qp.c | 48 +- + drivers/staging/rdma/hfi1/qp.h | 46 +- + drivers/staging/rdma/hfi1/qsfp.c | 5 +- + drivers/staging/rdma/hfi1/rc.c | 81 +- + drivers/staging/rdma/hfi1/ruc.c | 55 +- + drivers/staging/rdma/hfi1/sdma.c | 67 +- + drivers/staging/rdma/hfi1/sdma.h | 15 +- + drivers/staging/rdma/hfi1/trace.c | 29 +- + drivers/staging/rdma/hfi1/trace.h | 3 +- + drivers/staging/rdma/hfi1/uc.c | 15 +- + drivers/staging/rdma/hfi1/ud.c | 22 +- + drivers/staging/rdma/hfi1/user_exp_rcv.h | 74 + + drivers/staging/rdma/hfi1/user_pages.c | 97 +- + drivers/staging/rdma/hfi1/user_sdma.c | 363 +- + drivers/staging/rdma/hfi1/user_sdma.h | 12 +- + drivers/staging/rdma/hfi1/verbs.c | 130 +- + drivers/staging/rdma/hfi1/verbs.h | 50 +- + drivers/staging/rdma/ipath/ipath_file_ops.c | 8 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 54 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 100 +- + drivers/staging/rtl8188eu/core/rtw_efuse.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 7 - + drivers/staging/rtl8188eu/core/rtw_mlme.c | 22 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 84 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 14 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 11 +- + drivers/staging/rtl8188eu/hal/fw.c | 40 +- + drivers/staging/rtl8188eu/hal/hal_com.c | 14 +- + drivers/staging/rtl8188eu/hal/rtl8188e_dm.c | 2 +- + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 7 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 34 +- + drivers/staging/rtl8188eu/hal/usb_halinit.c | 10 +- + drivers/staging/rtl8188eu/include/HalVerDef.h | 33 - + drivers/staging/rtl8188eu/include/osdep_service.h | 2 - + drivers/staging/rtl8188eu/include/rtw_xmit.h | 1 - + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8188eu/os_dep/osdep_service.c | 6 - + drivers/staging/rtl8188eu/os_dep/usb_intf.c | 8 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 5 +- + drivers/staging/rtl8192u/r8192U_core.c | 15 - + drivers/staging/rtl8192u/r819xU_phy.c | 25 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 8 +- + drivers/staging/rtl8723au/core/rtw_efuse.c | 45 +- + drivers/staging/sm750fb/modedb.h | 233 -- + drivers/staging/sm750fb/sm750.c | 2 - + drivers/staging/unisys/include/channel.h | 114 +- + drivers/staging/unisys/include/iochannel.h | 157 +- + drivers/staging/unisys/include/vbushelper.h | 3 +- + drivers/staging/unisys/include/visorbus.h | 4 +- + drivers/staging/unisys/visorbus/Kconfig | 7 +- + .../unisys/visorbus/controlvmcompletionstatus.h | 24 +- + drivers/staging/unisys/visorbus/periodic_work.c | 11 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 9 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 15 +- + drivers/staging/unisys/visorbus/visorchannel.c | 4 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 34 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 16 +- + drivers/staging/unisys/visorinput/Kconfig | 7 +- + drivers/staging/unisys/visorinput/visorinput.c | 4 +- + drivers/staging/unisys/visornic/visornic_main.c | 1 - + drivers/staging/vme/devices/vme_pio2_cntr.c | 2 +- + drivers/staging/vme/devices/vme_pio2_core.c | 22 +- + drivers/staging/vme/devices/vme_pio2_gpio.c | 32 +- + drivers/staging/vme/devices/vme_user.c | 22 +- + drivers/staging/vme/devices/vme_user.h | 2 - + drivers/staging/vt6656/baseband.c | 4 - + drivers/staging/vt6656/baseband.h | 4 - + drivers/staging/vt6656/card.c | 3 - + drivers/staging/vt6656/card.h | 3 - + drivers/staging/vt6656/channel.c | 4 - + drivers/staging/vt6656/channel.h | 4 - + drivers/staging/vt6656/desc.h | 3 - + drivers/staging/vt6656/device.h | 3 - + drivers/staging/vt6656/dpc.c | 3 - + drivers/staging/vt6656/dpc.h | 3 - + drivers/staging/vt6656/firmware.c | 4 - + drivers/staging/vt6656/firmware.h | 4 - + drivers/staging/vt6656/int.c | 4 - + drivers/staging/vt6656/int.h | 4 - + drivers/staging/vt6656/key.c | 5 - + drivers/staging/vt6656/key.h | 4 - + drivers/staging/vt6656/mac.c | 4 - + drivers/staging/vt6656/mac.h | 4 - + drivers/staging/vt6656/main_usb.c | 3 - + drivers/staging/vt6656/power.c | 4 - + drivers/staging/vt6656/power.h | 3 - + drivers/staging/vt6656/rf.c | 4 - + drivers/staging/vt6656/rf.h | 4 - + drivers/staging/vt6656/rxtx.c | 3 - + drivers/staging/vt6656/rxtx.h | 3 - + drivers/staging/vt6656/usbpipe.c | 4 - + drivers/staging/vt6656/usbpipe.h | 4 - + drivers/staging/vt6656/wcmd.c | 3 - + drivers/staging/vt6656/wcmd.h | 3 - + drivers/staging/wilc1000/Kconfig | 46 +- + drivers/staging/wilc1000/Makefile | 22 +- + drivers/staging/wilc1000/coreconfigurator.c | 34 +- + drivers/staging/wilc1000/coreconfigurator.h | 24 +- + drivers/staging/wilc1000/host_interface.c | 2360 ++++++------- + drivers/staging/wilc1000/host_interface.h | 1034 +----- + drivers/staging/wilc1000/linux_mon.c | 13 +- + drivers/staging/wilc1000/linux_wlan.c | 1252 +++---- + drivers/staging/wilc1000/linux_wlan_common.h | 24 +- + drivers/staging/wilc1000/linux_wlan_sdio.c | 251 -- + drivers/staging/wilc1000/linux_wlan_sdio.h | 14 - + drivers/staging/wilc1000/linux_wlan_spi.c | 409 --- + drivers/staging/wilc1000/linux_wlan_spi.h | 14 - + drivers/staging/wilc1000/wilc_debugfs.c | 26 +- + drivers/staging/wilc1000/wilc_msgqueue.c | 9 +- + drivers/staging/wilc1000/wilc_msgqueue.h | 12 +- + drivers/staging/wilc1000/wilc_sdio.c | 717 ++-- + drivers/staging/wilc1000/wilc_spi.c | 714 ++-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 2061 ++++------- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 87 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 80 +- + drivers/staging/wilc1000/wilc_wlan.c | 1542 +++----- + drivers/staging/wilc1000/wilc_wlan.h | 384 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 25 +- + drivers/staging/wilc1000/wilc_wlan_cfg.h | 4 +- + drivers/staging/wilc1000/wilc_wlan_if.h | 38 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 34 +- + drivers/staging/wlan-ng/p80211netdev.h | 1 - + drivers/staging/wlan-ng/prism2mgmt.h | 1 - + drivers/staging/wlan-ng/prism2mib.c | 5 +- + drivers/staging/wlan-ng/prism2sta.c | 21 - + include/linux/iio/buffer-dma.h | 152 + + include/linux/iio/buffer-dmaengine.h | 18 + + include/linux/iio/buffer.h | 16 + + include/linux/iio/configfs.h | 15 + + include/linux/iio/iio.h | 2 + + include/linux/iio/sw_trigger.h | 70 + + include/linux/mfd/palmas.h | 75 +- + include/uapi/rdma/hfi/hfi1_user.h | 38 +- + 504 files changed, 20904 insertions(+), 13960 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-iio + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc + create mode 100644 Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/palmas-gpadc.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8688.txt + create mode 100644 Documentation/devicetree/bindings/iio/health/max30100.txt + create mode 100644 Documentation/devicetree/bindings/staging/ion/hi6220-ion.txt + create mode 100644 Documentation/iio/iio_configfs.txt + create mode 100644 drivers/iio/accel/mma7455.h + create mode 100644 drivers/iio/accel/mma7455_core.c + create mode 100644 drivers/iio/accel/mma7455_i2c.c + create mode 100644 drivers/iio/accel/mma7455_spi.c + create mode 100644 drivers/iio/accel/mxc6255.c + create mode 100644 drivers/iio/adc/imx7d_adc.c + create mode 100644 drivers/iio/adc/ina2xx-adc.c + create mode 100644 drivers/iio/adc/palmas_gpadc.c + create mode 100644 drivers/iio/adc/ti-ads8688.c + create mode 100644 drivers/iio/buffer/industrialio-buffer-dma.c + create mode 100644 drivers/iio/buffer/industrialio-buffer-dmaengine.c + create mode 100644 drivers/iio/chemical/ams-iaq-core.c + create mode 100644 drivers/iio/dummy/Kconfig + create mode 100644 drivers/iio/dummy/Makefile + rename drivers/{staging/iio => iio/dummy}/iio_dummy_evgen.c (100%) + rename drivers/{staging/iio => iio/dummy}/iio_dummy_evgen.h (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy.c (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy.h (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy_buffer.c (100%) + rename drivers/{staging/iio => iio/dummy}/iio_simple_dummy_events.c (100%) + create mode 100644 drivers/iio/health/Kconfig + create mode 100644 drivers/iio/health/Makefile + create mode 100644 drivers/iio/health/max30100.c + create mode 100644 drivers/iio/industrialio-configfs.c + create mode 100644 drivers/iio/industrialio-sw-trigger.c + create mode 100644 drivers/iio/trigger/iio-trig-hrtimer.c + create mode 100644 drivers/staging/android/ion/hisilicon/Kconfig + create mode 100644 drivers/staging/android/ion/hisilicon/Makefile + create mode 100644 drivers/staging/android/ion/hisilicon/hi6220_ion.c + create mode 100644 drivers/staging/comedi/drivers/adv_pci1720.c + create mode 100644 drivers/staging/comedi/drivers/adv_pci1760.c + delete mode 100644 drivers/staging/iio/adc/ad7780.h + delete mode 100644 drivers/staging/lustre/lustre/libcfs/linux/linux-tracefile.h + create mode 100644 drivers/staging/rdma/hfi1/efivar.c + create mode 100644 drivers/staging/rdma/hfi1/efivar.h + create mode 100644 drivers/staging/rdma/hfi1/user_exp_rcv.h + delete mode 100644 drivers/staging/sm750fb/modedb.h + delete mode 100644 drivers/staging/wilc1000/linux_wlan_sdio.c + delete mode 100644 drivers/staging/wilc1000/linux_wlan_sdio.h + delete mode 100644 drivers/staging/wilc1000/linux_wlan_spi.c + delete mode 100644 drivers/staging/wilc1000/linux_wlan_spi.h + create mode 100644 include/linux/iio/buffer-dma.h + create mode 100644 include/linux/iio/buffer-dmaengine.h + create mode 100644 include/linux/iio/configfs.h + create mode 100644 include/linux/iio/sw_trigger.h +Merging char-misc/char-misc-next (ed6dc538e5a3 mei: fix fasync return value on error) +$ git merge char-misc/char-misc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/extcon/extcon-arizona.txt | 60 +++++ + .../devicetree/bindings/extcon/extcon-max3355.txt | 21 ++ + drivers/extcon/Kconfig | 9 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-arizona.c | 71 +++++- + drivers/extcon/extcon-max14577.c | 2 +- + drivers/extcon/extcon-max3355.c | 146 ++++++++++++ + drivers/extcon/extcon-max77693.c | 4 +- + drivers/extcon/extcon-max77843.c | 2 +- + drivers/extcon/extcon-rt8973a.c | 2 +- + drivers/hv/channel.c | 138 ++++++------ + drivers/hv/channel_mgmt.c | 48 ++-- + drivers/hv/connection.c | 18 +- + drivers/hv/hv.c | 29 +-- + drivers/hv/hv_fcopy.c | 37 ++-- + drivers/hv/hv_kvp.c | 33 ++- + drivers/hv/hv_snapshot.c | 36 ++- + drivers/hv/hv_utils_transport.c | 130 ++++++++--- + drivers/hv/hv_utils_transport.h | 3 +- + drivers/hv/hyperv_vmbus.h | 26 +-- + drivers/hv/ring_buffer.c | 218 ++++++------------ + drivers/hv/vmbus_drv.c | 82 ++++--- + drivers/hwtracing/coresight/Kconfig | 2 +- + drivers/hwtracing/coresight/coresight.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 10 - + drivers/misc/mei/main.c | 6 +- + drivers/parport/share.c | 246 +++++++++++---------- + include/linux/hyperv.h | 133 ++++++----- + include/linux/mod_devicetable.h | 2 +- + include/uapi/linux/hyperv.h | 1 + + scripts/checkkconfigsymbols.py | 234 ++++++++++++++++---- + scripts/mod/file2alias.c | 2 +- + tools/hv/hv_fcopy_daemon.c | 24 +- + tools/hv/hv_vss_daemon.c | 2 +- + 34 files changed, 1104 insertions(+), 676 deletions(-) + create mode 100644 Documentation/devicetree/bindings/extcon/extcon-max3355.txt + create mode 100644 drivers/extcon/extcon-max3355.c +Merging extcon/extcon-next (f78bf950aec3 extcon: arizona: Use DAPM mutex helper functions) +$ git merge extcon/extcon-next +Merge made by the 'recursive' strategy. + drivers/extcon/extcon-arizona.c | 4 ++-- + drivers/extcon/extcon-gpio.c | 2 +- + drivers/extcon/extcon-max14577.c | 3 +++ + drivers/extcon/extcon-max77693.c | 12 +++++++++++- + drivers/extcon/extcon-max77843.c | 3 +++ + drivers/extcon/extcon-max8997.c | 3 +++ + drivers/extcon/extcon-rt8973a.c | 8 ++++++-- + drivers/extcon/extcon-sm5502.c | 8 ++++++-- + 8 files changed, 35 insertions(+), 8 deletions(-) +Merging cgroup/for-next (36ae3fad335f Merge branch 'for-4.5' into for-next) +$ git merge cgroup/for-next +Auto-merging mm/memcontrol.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/magic.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/cgroup-defs.h +Removing Documentation/cgroups/unified-hierarchy.txt +Auto-merging Documentation/cgroup-legacy/blkio-controller.txt +Auto-merging Documentation/cgroup-legacy/00-INDEX +Merge made by the 'recursive' strategy. + Documentation/{cgroups => cgroup-legacy}/00-INDEX | 2 - + .../blkio-controller.txt | 82 +- + .../{cgroups => cgroup-legacy}/cgroups.txt | 0 + .../{cgroups => cgroup-legacy}/cpuacct.txt | 0 + .../{cgroups => cgroup-legacy}/cpusets.txt | 0 + .../{cgroups => cgroup-legacy}/devices.txt | 0 + .../freezer-subsystem.txt | 0 + .../{cgroups => cgroup-legacy}/hugetlb.txt | 0 + .../{cgroups => cgroup-legacy}/memcg_test.txt | 0 + .../{cgroups => cgroup-legacy}/memory.txt | 0 + .../{cgroups => cgroup-legacy}/net_cls.txt | 0 + .../{cgroups => cgroup-legacy}/net_prio.txt | 0 + Documentation/{cgroups => cgroup-legacy}/pids.txt | 0 + Documentation/cgroup.txt | 1293 ++++++++++++++++++++ + Documentation/cgroups/unified-hierarchy.txt | 647 ---------- + include/linux/cgroup-defs.h | 13 +- + include/linux/cgroup.h | 19 +- + include/linux/cgroup_subsys.h | 18 - + include/uapi/linux/magic.h | 1 + + init/Kconfig | 241 ++-- + kernel/cgroup.c | 81 +- + kernel/cgroup_freezer.c | 2 +- + kernel/cgroup_pids.c | 6 +- + kernel/cpuset.c | 12 +- + kernel/fork.c | 7 +- + kernel/sched/core.c | 2 +- + mm/memcontrol.c | 2 +- + 27 files changed, 1467 insertions(+), 961 deletions(-) + rename Documentation/{cgroups => cgroup-legacy}/00-INDEX (95%) + rename Documentation/{cgroups => cgroup-legacy}/blkio-controller.txt (80%) + rename Documentation/{cgroups => cgroup-legacy}/cgroups.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpuacct.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/cpusets.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/devices.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/freezer-subsystem.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/hugetlb.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memcg_test.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/memory.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_cls.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/net_prio.txt (100%) + rename Documentation/{cgroups => cgroup-legacy}/pids.txt (100%) + create mode 100644 Documentation/cgroup.txt + delete mode 100644 Documentation/cgroups/unified-hierarchy.txt +Merging scsi/for-next (f6817f3450cb Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/Kconfig +Auto-merging drivers/block/cciss.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/scsi/hisilicon-sas.txt | 69 + + MAINTAINERS | 7 + + drivers/block/cciss.c | 2 +- + drivers/scsi/Kconfig | 2 + + drivers/scsi/Makefile | 1 + + drivers/scsi/aacraid/linit.c | 2 +- + drivers/scsi/aic94xx/aic94xx_sas.h | 49 +- + drivers/scsi/arcmsr/arcmsr.h | 14 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 209 +- + drivers/scsi/atp870u.c | 3707 ++++++-------------- + drivers/scsi/atp870u.h | 4 - + drivers/scsi/bfa/bfa.h | 7 +- + drivers/scsi/bfa/bfa_core.c | 7 +- + drivers/scsi/bfa/bfa_cs.h | 7 +- + drivers/scsi/bfa/bfa_defs.h | 7 +- + drivers/scsi/bfa/bfa_defs_fcs.h | 7 +- + drivers/scsi/bfa/bfa_defs_svc.h | 7 +- + drivers/scsi/bfa/bfa_fc.h | 7 +- + drivers/scsi/bfa/bfa_fcbuild.c | 7 +- + drivers/scsi/bfa/bfa_fcbuild.h | 7 +- + drivers/scsi/bfa/bfa_fcpim.c | 7 +- + drivers/scsi/bfa/bfa_fcpim.h | 7 +- + drivers/scsi/bfa/bfa_fcs.c | 7 +- + drivers/scsi/bfa/bfa_fcs.h | 9 +- + drivers/scsi/bfa/bfa_fcs_fcpim.c | 7 +- + drivers/scsi/bfa/bfa_fcs_lport.c | 9 +- + drivers/scsi/bfa/bfa_fcs_rport.c | 7 +- + drivers/scsi/bfa/bfa_hw_cb.c | 7 +- + drivers/scsi/bfa/bfa_hw_ct.c | 7 +- + drivers/scsi/bfa/bfa_ioc.c | 9 +- + drivers/scsi/bfa/bfa_ioc.h | 7 +- + drivers/scsi/bfa/bfa_ioc_cb.c | 7 +- + drivers/scsi/bfa/bfa_ioc_ct.c | 7 +- + drivers/scsi/bfa/bfa_modules.h | 7 +- + drivers/scsi/bfa/bfa_plog.h | 7 +- + drivers/scsi/bfa/bfa_port.c | 7 +- + drivers/scsi/bfa/bfa_port.h | 7 +- + drivers/scsi/bfa/bfa_svc.c | 7 +- + drivers/scsi/bfa/bfa_svc.h | 7 +- + drivers/scsi/bfa/bfad.c | 24 +- + drivers/scsi/bfa/bfad_attr.c | 75 +- + drivers/scsi/bfa/bfad_bsg.c | 7 +- + drivers/scsi/bfa/bfad_bsg.h | 7 +- + drivers/scsi/bfa/bfad_debugfs.c | 7 +- + drivers/scsi/bfa/bfad_drv.h | 9 +- + drivers/scsi/bfa/bfad_im.c | 35 +- + drivers/scsi/bfa/bfad_im.h | 7 +- + drivers/scsi/bfa/bfi.h | 7 +- + drivers/scsi/bfa/bfi_ms.h | 7 +- + drivers/scsi/bfa/bfi_reg.h | 9 +- + drivers/scsi/cxlflash/common.h | 2 + + drivers/scsi/cxlflash/main.c | 54 +- + drivers/scsi/cxlflash/main.h | 5 +- + drivers/scsi/cxlflash/superpipe.c | 8 +- + drivers/scsi/cxlflash/vlun.c | 2 + + drivers/scsi/device_handler/scsi_dh_alua.c | 294 +- + drivers/scsi/hisi_sas/Kconfig | 6 + + drivers/scsi/hisi_sas/Makefile | 2 + + drivers/scsi/hisi_sas/hisi_sas.h | 341 ++ + drivers/scsi/hisi_sas/hisi_sas_main.c | 1358 +++++++ + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 1839 ++++++++++ + drivers/scsi/hpsa.c | 117 +- + drivers/scsi/hpsa.h | 2 +- + drivers/scsi/hpsa_cmd.h | 13 + + drivers/scsi/initio.c | 16 - + drivers/scsi/lpfc/lpfc.h | 16 +- + drivers/scsi/lpfc/lpfc_attr.c | 48 +- + drivers/scsi/lpfc/lpfc_crtn.h | 6 +- + drivers/scsi/lpfc/lpfc_ct.c | 1864 ++++++---- + drivers/scsi/lpfc/lpfc_els.c | 484 +-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 65 +- + drivers/scsi/lpfc/lpfc_hw.h | 184 +- + drivers/scsi/lpfc/lpfc_hw4.h | 52 +- + drivers/scsi/lpfc/lpfc_init.c | 198 +- + drivers/scsi/lpfc/lpfc_mem.c | 6 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 134 +- + drivers/scsi/lpfc/lpfc_scsi.c | 41 +- + drivers/scsi/lpfc/lpfc_sli.c | 23 +- + drivers/scsi/lpfc/lpfc_sli4.h | 1 + + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 8 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/mvsas/mv_94xx.c | 134 + + drivers/scsi/mvsas/mv_94xx.h | 71 + + drivers/scsi/mvsas/mv_init.c | 2 + + drivers/scsi/mvsas/mv_sas.c | 17 +- + drivers/scsi/mvsas/mv_sas.h | 5 + + drivers/scsi/osd/osd_initiator.c | 5 +- + drivers/scsi/qla2xxx/Kconfig | 3 - + drivers/scsi/qla2xxx/qla_os.c | 3 - + drivers/scsi/scsi.c | 20 +- + drivers/scsi/scsi_debug.c | 14 +- + drivers/scsi/scsi_dh.c | 72 +- + drivers/scsi/scsi_lib.c | 188 + + drivers/scsi/scsi_priv.h | 3 +- + drivers/scsi/scsi_scan.c | 4 + + drivers/scsi/scsi_sysfs.c | 90 +- + drivers/scsi/scsi_transport_fc.c | 12 +- + drivers/scsi/scsi_transport_sas.c | 30 + + drivers/scsi/ses.c | 22 +- + drivers/scsi/st.h | 2 - + drivers/scsi/storvsc_drv.c | 309 +- + drivers/scsi/ufs/ufshcd-pltfrm.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 45 +- + drivers/scsi/vmw_pvscsi.h | 2 +- + include/scsi/sas.h | 74 + + include/scsi/scsi_dbg.h | 2 - + include/scsi/scsi_device.h | 7 +- + include/scsi/scsi_transport_sas.h | 10 + + include/uapi/scsi/cxlflash_ioctl.h | 10 + + 110 files changed, 8214 insertions(+), 4601 deletions(-) + create mode 100644 Documentation/devicetree/bindings/scsi/hisilicon-sas.txt + create mode 100644 drivers/scsi/hisi_sas/Kconfig + create mode 100644 drivers/scsi/hisi_sas/Makefile + create mode 100644 drivers/scsi/hisi_sas/hisi_sas.h + create mode 100644 drivers/scsi/hisi_sas/hisi_sas_main.c + create mode 100644 drivers/scsi/hisi_sas/hisi_sas_v1_hw.c +Merging target-updates/for-next (0de1be1c4dd0 target: Obtain se_node_acl->acl_kref during get_initiator_node_acl) +$ git merge target-updates/for-next +Resolved 'drivers/infiniband/ulp/isert/ib_isert.c' using previous resolution. +Auto-merging include/target/target_core_base.h +Auto-merging include/linux/configfs.h +Auto-merging fs/configfs/dir.c +Auto-merging drivers/usb/gadget/legacy/tcm_usb_gadget.c +Auto-merging drivers/usb/gadget/function/tcm.h +Auto-merging drivers/usb/gadget/Kconfig +Auto-merging drivers/target/target_core_user.c +Auto-merging drivers/target/target_core_transport.c +Auto-merging drivers/target/target_core_tmr.c +Auto-merging drivers/target/target_core_sbc.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/target/iscsi/iscsi_target_parameters.c +Auto-merging drivers/target/iscsi/iscsi_target.c +Auto-merging drivers/scsi/qla2xxx/tcm_qla2xxx.c +Auto-merging drivers/scsi/qla2xxx/qla_os.c +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.h +Auto-merging drivers/infiniband/ulp/srpt/ib_srpt.c +Auto-merging drivers/infiniband/ulp/isert/ib_isert.c +CONFLICT (content): Merge conflict in drivers/infiniband/ulp/isert/ib_isert.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7cb76ccae1eb] Merge remote-tracking branch 'target-updates/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-usb-gadget-tcm | 6 + + drivers/infiniband/ulp/isert/ib_isert.c | 5 +- + drivers/infiniband/ulp/srpt/ib_srpt.c | 95 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 2 - + drivers/scsi/qla2xxx/qla_attr.c | 36 + + drivers/scsi/qla2xxx/qla_dbg.c | 19 +- + drivers/scsi/qla2xxx/qla_def.h | 83 +- + drivers/scsi/qla2xxx/qla_dfs.c | 106 + + drivers/scsi/qla2xxx/qla_gbl.h | 18 +- + drivers/scsi/qla2xxx/qla_init.c | 58 +- + drivers/scsi/qla2xxx/qla_inline.h | 2 + + drivers/scsi/qla2xxx/qla_iocb.c | 188 ++ + drivers/scsi/qla2xxx/qla_isr.c | 126 +- + drivers/scsi/qla2xxx/qla_mbx.c | 265 ++- + drivers/scsi/qla2xxx/qla_os.c | 165 +- + drivers/scsi/qla2xxx/qla_target.c | 645 ++++-- + drivers/scsi/qla2xxx/qla_target.h | 34 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 38 +- + drivers/target/iscsi/iscsi_target.c | 5 +- + drivers/target/iscsi/iscsi_target_configfs.c | 14 +- + drivers/target/iscsi/iscsi_target_erl1.c | 7 +- + drivers/target/iscsi/iscsi_target_parameters.c | 2 +- + drivers/target/iscsi/iscsi_target_tmr.c | 2 +- + drivers/target/iscsi/iscsi_target_tpg.c | 10 - + drivers/target/iscsi/iscsi_target_tpg.h | 2 - + drivers/target/loopback/tcm_loop.c | 14 + + drivers/target/sbp/sbp_target.c | 2 - + drivers/target/target_core_configfs.c | 47 +- + drivers/target/target_core_device.c | 2 + + drivers/target/target_core_iblock.c | 2 + + drivers/target/target_core_pr.c | 11 +- + drivers/target/target_core_sbc.c | 10 +- + drivers/target/target_core_spc.c | 12 + + drivers/target/target_core_tmr.c | 2 +- + drivers/target/target_core_tpg.c | 164 +- + drivers/target/target_core_transport.c | 32 +- + drivers/target/target_core_user.c | 6 +- + drivers/target/tcm_fc/tfc_conf.c | 48 +- + drivers/target/tcm_fc/tfc_io.c | 8 +- + drivers/target/tcm_fc/tfc_sess.c | 35 +- + drivers/usb/gadget/Kconfig | 17 + + drivers/usb/gadget/function/Makefile | 2 + + drivers/usb/gadget/function/f_tcm.c | 2381 ++++++++++++++++++++ + .../{legacy/tcm_usb_gadget.h => function/tcm.h} | 9 +- + drivers/usb/gadget/function/u_tcm.h | 50 + + drivers/usb/gadget/legacy/Kconfig | 1 + + drivers/usb/gadget/legacy/tcm_usb_gadget.c | 2165 +----------------- + fs/configfs/dir.c | 150 +- + fs/ocfs2/cluster/nodemanager.c | 2 +- + include/linux/configfs.h | 21 +- + include/target/target_core_base.h | 6 +- + include/target/target_core_fabric.h | 6 +- + 52 files changed, 4481 insertions(+), 2657 deletions(-) + create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-tcm + create mode 100644 drivers/usb/gadget/function/f_tcm.c + rename drivers/usb/gadget/{legacy/tcm_usb_gadget.h => function/tcm.h} (95%) + create mode 100644 drivers/usb/gadget/function/u_tcm.h +Merging target-merge/for-next-merge (bc0195aad0da Linux 4.2-rc2) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging pinctrl/for-next (14da0a91bf4a pinctrl: mediatek: Modify pinctrl bindings for mt2701) +$ git merge pinctrl/for-next +Auto-merging include/linux/platform_device.h +Auto-merging drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c +Auto-merging drivers/base/platform.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/brcm,iproc-gpio.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 3 + + .../{brcm,cygnus-gpio.txt => brcm,iproc-gpio.txt} | 9 +- + .../devicetree/bindings/pinctrl/brcm,nsp-gpio.txt | 80 + + .../bindings/pinctrl/lantiq,pinctrl-xway.txt | 110 +- + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 9 +- + .../bindings/pinctrl/qcom,msm8996-pinctrl.txt | 199 ++ + .../devicetree/bindings/pinctrl/qcom,pmic-gpio.txt | 2 + + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.txt | 1 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 3 +- + MAINTAINERS | 2 + + drivers/base/platform.c | 20 + + drivers/pinctrl/Kconfig | 3 +- + drivers/pinctrl/Makefile | 7 +- + drivers/pinctrl/bcm/Kconfig | 48 +- + drivers/pinctrl/bcm/Makefile | 3 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 2 +- + ...{pinctrl-cygnus-gpio.c => pinctrl-iproc-gpio.c} | 358 ++-- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 749 ++++++++ + drivers/pinctrl/berlin/Makefile | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 28 +- + drivers/pinctrl/mvebu/Makefile | 2 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 29 +- + drivers/pinctrl/pinconf-generic.c | 1 + + drivers/pinctrl/pinctrl-adi2.c | 24 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 17 +- + drivers/pinctrl/pinctrl-at91.c | 14 +- + drivers/pinctrl/pinctrl-lantiq.h | 8 + + drivers/pinctrl/pinctrl-rockchip.c | 58 +- + drivers/pinctrl/pinctrl-single.c | 5 +- + drivers/pinctrl/pinctrl-tegra-xusb.c | 4 +- + drivers/pinctrl/pinctrl-tegra.c | 1 + + drivers/pinctrl/pinctrl-xway.c | 1187 ++++++++++-- + drivers/pinctrl/pxa/Kconfig | 17 + + drivers/pinctrl/pxa/Makefile | 2 + + drivers/pinctrl/pxa/pinctrl-pxa27x.c | 566 ++++++ + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 436 +++++ + drivers/pinctrl/pxa/pinctrl-pxa2xx.h | 92 + + drivers/pinctrl/qcom/Kconfig | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm8996.c | 1942 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 14 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 15 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 14 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 21 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 21 +- + drivers/pinctrl/sh-pfc/pfc-emev2.c | 136 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 22 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 62 +- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 58 +- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 167 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 86 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 1505 ++++++++++++++- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 548 +++++- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 29 +- + drivers/pinctrl/sh-pfc/pinctrl.c | 4 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 74 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 134 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 8 +- + drivers/pinctrl/spear/Makefile | 2 +- + drivers/pinctrl/sunxi/Kconfig | 9 + + drivers/pinctrl/sunxi/Makefile | 2 + + drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c | 515 ++++++ + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 181 ++ + drivers/pinctrl/uniphier/Kconfig | 23 +- + include/linux/platform_device.h | 1 + + 69 files changed, 8945 insertions(+), 766 deletions(-) + rename Documentation/devicetree/bindings/pinctrl/{brcm,cygnus-gpio.txt => brcm,iproc-gpio.txt} (94%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,nsp-gpio.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8996-pinctrl.txt + rename drivers/pinctrl/bcm/{pinctrl-cygnus-gpio.c => pinctrl-iproc-gpio.c} (56%) + create mode 100644 drivers/pinctrl/bcm/pinctrl-nsp-gpio.c + create mode 100644 drivers/pinctrl/pxa/Kconfig + create mode 100644 drivers/pinctrl/pxa/Makefile + create mode 100644 drivers/pinctrl/pxa/pinctrl-pxa27x.c + create mode 100644 drivers/pinctrl/pxa/pinctrl-pxa2xx.c + create mode 100644 drivers/pinctrl/pxa/pinctrl-pxa2xx.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8996.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun8i-h3.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c +Merging vhost/linux-next (5a6ef8bc4d62 checkpatch: add virt barriers) +$ git merge vhost/linux-next +Resolved 'arch/ia64/include/asm/barrier.h' using previous resolution. +Resolved 'arch/s390/include/asm/barrier.h' using previous resolution. +Resolved 'include/asm-generic/barrier.h' using previous resolution. +Auto-merging scripts/checkpatch.pl +Auto-merging include/asm-generic/barrier.h +CONFLICT (content): Merge conflict in include/asm-generic/barrier.h +Auto-merging arch/s390/include/asm/barrier.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/barrier.h +Auto-merging arch/powerpc/include/asm/barrier.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/barrier.h +Auto-merging arch/ia64/include/asm/barrier.h +CONFLICT (content): Merge conflict in arch/ia64/include/asm/barrier.h +Auto-merging Documentation/memory-barriers.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/powerpc/include/asm/barrier.h'. +[master dbe353703e9c] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/memory-barriers.txt | 28 +++++++-- + arch/arm/include/asm/barrier.h | 35 ++--------- + arch/arm64/include/asm/barrier.h | 19 ++---- + arch/blackfin/include/asm/barrier.h | 4 +- + arch/ia64/include/asm/barrier.h | 24 +++----- + arch/ia64/kernel/iosapic.c | 6 +- + arch/metag/include/asm/barrier.h | 55 +++++------------ + arch/mips/include/asm/barrier.h | 51 +++++----------- + arch/powerpc/include/asm/barrier.h | 33 ++++------ + arch/s390/include/asm/barrier.h | 23 ++++--- + arch/sh/include/asm/barrier.h | 3 +- + arch/sh/include/asm/cmpxchg-grb.h | 22 +++++++ + arch/sh/include/asm/cmpxchg-irq.h | 11 ++++ + arch/sh/include/asm/cmpxchg-llsc.h | 25 +------- + arch/sh/include/asm/cmpxchg-xchg.h | 51 ++++++++++++++++ + arch/sh/include/asm/cmpxchg.h | 3 + + arch/sparc/include/asm/barrier_32.h | 1 - + arch/sparc/include/asm/barrier_64.h | 29 ++------- + arch/sparc/include/asm/processor.h | 3 - + arch/tile/include/asm/barrier.h | 9 +-- + arch/x86/include/asm/barrier.h | 36 +++++------ + arch/x86/um/asm/barrier.h | 9 +-- + arch/xtensa/include/asm/barrier.h | 4 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 2 +- + drivers/misc/mic/card/mic_virtio.c | 2 +- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/s390/virtio/kvm_virtio.c | 2 +- + drivers/s390/virtio/virtio_ccw.c | 2 +- + drivers/virtio/virtio_balloon.c | 4 +- + drivers/virtio/virtio_input.c | 2 +- + drivers/virtio/virtio_mmio.c | 2 +- + drivers/virtio/virtio_pci_common.c | 4 +- + drivers/virtio/virtio_pci_common.h | 2 +- + drivers/virtio/virtio_pci_modern.c | 2 +- + drivers/virtio/virtio_ring.c | 15 +++-- + drivers/xen/events/events_fifo.c | 3 +- + drivers/xen/xenbus/xenbus_comms.c | 8 +-- + include/asm-generic/barrier.h | 106 ++++++++++++++++++++++++++++++--- + include/linux/virtio_config.h | 2 +- + include/linux/virtio_ring.h | 21 +++++-- + include/xen/interface/io/ring.h | 16 ++--- + mm/balloon_compaction.c | 4 +- + scripts/checkpatch.pl | 33 +++++++++- + 44 files changed, 401 insertions(+), 319 deletions(-) + create mode 100644 arch/sh/include/asm/cmpxchg-xchg.h +Merging remoteproc/for-next (7a6271a80cae remoteproc/wkup_m3: Use MODULE_DEVICE_TABLE to export alias) +$ git merge remoteproc/for-next +Auto-merging drivers/remoteproc/remoteproc_core.c +Merge made by the 'recursive' strategy. + drivers/remoteproc/remoteproc_core.c | 4 +++- + drivers/remoteproc/wkup_m3_rproc.c | 1 + + 2 files changed, 4 insertions(+), 1 deletion(-) +Merging rpmsg/for-next (b1b9891441fa rpmsg: use less buffers when vrings are small) +$ git merge rpmsg/for-next +Already up-to-date. +Merging gpio/for-next (de06c1db255f gpio: xilinx: Do not use gpiochip_get_data() in xgpio_save_regs()) +$ git merge gpio/for-next +Auto-merging sound/soc/soc-ac97.c +Auto-merging sound/soc/codecs/wm8962.c +Auto-merging sound/soc/codecs/wm8903.c +Auto-merging sound/soc/codecs/rt5677.c +Removing include/linux/platform_data/gpio-rcar.h +Removing include/linux/basic_mmio_gpio.h +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging drivers/pinctrl/sirf/pinctrl-sirf.c +Auto-merging drivers/pinctrl/sirf/pinctrl-atlas7.c +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Auto-merging drivers/pinctrl/samsung/pinctrl-exynos.c +Auto-merging drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c +Auto-merging drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-mpp.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Auto-merging drivers/pinctrl/pinctrl-xway.c +Auto-merging drivers/pinctrl/pinctrl-rockchip.c +Auto-merging drivers/pinctrl/pinctrl-at91.c +Auto-merging drivers/pinctrl/pinctrl-at91-pio4.c +Auto-merging drivers/pinctrl/pinctrl-adi2.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-mtk-common.c +Auto-merging drivers/pinctrl/bcm/pinctrl-nsp-gpio.c +Auto-merging drivers/pinctrl/bcm/pinctrl-iproc-gpio.c +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c +Auto-merging drivers/leds/leds-pca9532.c +Auto-merging drivers/hid/hid-cp2112.c +Auto-merging drivers/gpio/gpiolib.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpiolib-acpi.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/arm/plat-samsung/gpio-samsung.c +Auto-merging arch/arm/mach-s3c64xx/mach-crag6410.c +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 1 + + .../devicetree/bindings/gpio/gpio-sx150x.txt | 3 +- + .../devicetree/bindings/gpio/gpio-tps65086.txt | 16 + + MAINTAINERS | 15 +- + arch/arm/mach-clps711x/board-autcpu12.c | 2 +- + arch/arm/mach-clps711x/board-p720t.c | 2 +- + arch/arm/mach-imx/mach-mx21ads.c | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- + arch/arm/plat-samsung/gpio-samsung.c | 4 +- + arch/avr32/mach-at32ap/pio.c | 14 +- + drivers/bcma/driver_gpio.c | 25 +- + drivers/gpio/Kconfig | 28 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-104-idi-48.c | 343 +++++++++++++++++ + drivers/gpio/gpio-104-idio-16.c | 156 ++++++-- + drivers/gpio/gpio-74x164.c | 79 ++-- + drivers/gpio/gpio-74xx-mmio.c | 37 +- + drivers/gpio/gpio-adnp.c | 47 ++- + drivers/gpio/gpio-adp5520.c | 10 +- + drivers/gpio/gpio-adp5588.c | 18 +- + drivers/gpio/gpio-altera.c | 25 +- + drivers/gpio/gpio-amd8111.c | 18 +- + drivers/gpio/gpio-amdpt.c | 34 +- + drivers/gpio/gpio-arizona.c | 17 +- + drivers/gpio/gpio-ath79.c | 20 +- + drivers/gpio/gpio-bcm-kona.c | 31 +- + drivers/gpio/gpio-brcmstb.c | 80 ++-- + drivers/gpio/gpio-bt8xx.c | 10 +- + drivers/gpio/gpio-clps711x.c | 28 +- + drivers/gpio/gpio-crystalcove.c | 34 +- + drivers/gpio/gpio-cs5535.c | 15 +- + drivers/gpio/gpio-da9052.c | 26 +- + drivers/gpio/gpio-da9055.c | 17 +- + drivers/gpio/gpio-davinci.c | 25 +- + drivers/gpio/gpio-dln2.c | 38 +- + drivers/gpio/gpio-dwapb.c | 92 +++-- + drivers/gpio/gpio-em.c | 10 +- + drivers/gpio/gpio-ep93xx.c | 25 +- + drivers/gpio/gpio-etraxfs.c | 49 ++- + drivers/gpio/gpio-f7188x.c | 18 +- + drivers/gpio/gpio-ge.c | 24 +- + drivers/gpio/gpio-generic.c | 295 +++++++-------- + drivers/gpio/gpio-grgpio.c | 73 ++-- + drivers/gpio/gpio-ich.c | 4 +- + drivers/gpio/gpio-intel-mid.c | 23 +- + drivers/gpio/gpio-iop.c | 2 +- + drivers/gpio/gpio-it87.c | 17 +- + drivers/gpio/gpio-janz-ttl.c | 10 +- + drivers/gpio/gpio-kempld.c | 21 +- + drivers/gpio/gpio-ks8695.c | 2 +- + drivers/gpio/gpio-loongson.c | 2 +- + drivers/gpio/gpio-lp3943.c | 21 +- + drivers/gpio/gpio-lpc18xx.c | 15 +- + drivers/gpio/gpio-lpc32xx.c | 41 +- + drivers/gpio/gpio-lynxpoint.c | 24 +- + drivers/gpio/gpio-max7300.c | 1 - + drivers/gpio/gpio-max730x.c | 12 +- + drivers/gpio/gpio-max732x.c | 34 +- + drivers/gpio/gpio-mb86s7x.c | 21 +- + drivers/gpio/gpio-mc33880.c | 6 +- + drivers/gpio/gpio-mc9s08dz60.c | 17 +- + drivers/gpio/gpio-mcp23s08.c | 30 +- + drivers/gpio/gpio-ml-ioh.c | 14 +- + drivers/gpio/gpio-mm-lantiq.c | 9 +- + drivers/gpio/gpio-moxart.c | 29 +- + drivers/gpio/gpio-mpc5200.c | 39 +- + drivers/gpio/gpio-mpc8xxx.c | 25 +- + drivers/gpio/gpio-msic.c | 8 +- + drivers/gpio/gpio-mvebu.c | 25 +- + drivers/gpio/gpio-mxc.c | 27 +- + drivers/gpio/gpio-mxs.c | 33 +- + drivers/gpio/gpio-octeon.c | 14 +- + drivers/gpio/gpio-omap.c | 24 +- + drivers/gpio/gpio-palmas.c | 31 +- + drivers/gpio/gpio-pca953x.c | 141 ++++--- + drivers/gpio/gpio-pcf857x.c | 13 +- + drivers/gpio/gpio-pch.c | 19 +- + drivers/gpio/gpio-pl061.c | 41 +- + drivers/gpio/gpio-pxa.c | 413 ++++++++++++--------- + drivers/gpio/gpio-rc5t583.c | 21 +- + drivers/gpio/gpio-rcar.c | 123 +++--- + drivers/gpio/gpio-rdc321x.c | 10 +- + drivers/gpio/gpio-sa1100.c | 4 +- + drivers/gpio/gpio-sch.c | 16 +- + drivers/gpio/gpio-sch311x.c | 29 +- + drivers/gpio/gpio-sodaville.c | 13 +- + drivers/gpio/gpio-spear-spics.c | 13 +- + drivers/gpio/gpio-sta2x11.c | 14 +- + drivers/gpio/gpio-stmpe.c | 31 +- + drivers/gpio/gpio-stp-xway.c | 12 +- + drivers/gpio/gpio-sx150x.c | 83 +++-- + drivers/gpio/gpio-syscon.c | 21 +- + drivers/gpio/gpio-tb10x.c | 19 +- + drivers/gpio/gpio-tc3589x.c | 29 +- + drivers/gpio/gpio-tegra.c | 2 +- + drivers/gpio/gpio-timberdale.c | 10 +- + drivers/gpio/gpio-tps6586x.c | 17 +- + drivers/gpio/gpio-tps65910.c | 17 +- + drivers/gpio/gpio-tps65912.c | 14 +- + drivers/gpio/gpio-ts5500.c | 22 +- + drivers/gpio/gpio-twl4030.c | 27 +- + drivers/gpio/gpio-twl6040.c | 8 +- + drivers/gpio/gpio-tz1090-pdc.c | 17 +- + drivers/gpio/gpio-tz1090.c | 21 +- + drivers/gpio/gpio-ucb1400.c | 13 +- + drivers/gpio/gpio-vf610.c | 25 +- + drivers/gpio/gpio-viperboard.c | 46 +-- + drivers/gpio/gpio-vr41xx.c | 6 +- + drivers/gpio/gpio-vx855.c | 8 +- + drivers/gpio/gpio-wm831x.c | 23 +- + drivers/gpio/gpio-wm8350.c | 19 +- + drivers/gpio/gpio-wm8994.c | 23 +- + drivers/gpio/gpio-xgene-sb.c | 40 +- + drivers/gpio/gpio-xgene.c | 19 +- + drivers/gpio/gpio-xilinx.c | 18 +- + drivers/gpio/gpio-xlp.c | 25 +- + drivers/gpio/gpio-xtensa.c | 4 +- + drivers/gpio/gpio-zevio.c | 19 +- + drivers/gpio/gpio-zx.c | 25 +- + drivers/gpio/gpio-zynq.c | 52 ++- + drivers/gpio/gpiolib-acpi.c | 47 +-- + drivers/gpio/gpiolib-of.c | 16 +- + drivers/gpio/gpiolib-sysfs.c | 5 +- + drivers/gpio/gpiolib.c | 108 +++--- + drivers/gpio/gpiolib.h | 2 +- + drivers/hid/hid-cp2112.c | 18 +- + drivers/input/touchscreen/ad7879.c | 2 +- + drivers/leds/leds-pca9532.c | 14 +- + drivers/leds/leds-tca6507.c | 6 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/mfd/dm355evm_msp.c | 2 +- + drivers/mfd/htc-egpio.c | 2 +- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/tps65010.c | 2 +- + drivers/mfd/ucb1x00-core.c | 2 +- + drivers/mfd/vexpress-sysreg.c | 8 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 12 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 2 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 21 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 36 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 22 +- + drivers/pinctrl/intel/pinctrl-intel.c | 17 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 16 +- + drivers/pinctrl/meson/pinctrl-meson.c | 19 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 34 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 33 +- + drivers/pinctrl/pinctrl-adi2.c | 16 +- + drivers/pinctrl/pinctrl-amd.c | 35 +- + drivers/pinctrl/pinctrl-as3722.c | 15 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 16 +- + drivers/pinctrl/pinctrl-at91.c | 28 +- + drivers/pinctrl/pinctrl-coh901.c | 35 +- + drivers/pinctrl/pinctrl-digicolor.c | 12 +- + drivers/pinctrl/pinctrl-pistachio.c | 25 +- + drivers/pinctrl/pinctrl-rockchip.c | 17 +- + drivers/pinctrl/pinctrl-st.c | 23 +- + drivers/pinctrl/pinctrl-xway.c | 12 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 31 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 23 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 23 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 16 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 18 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 3 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 16 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 17 +- + drivers/pinctrl/sh-pfc/gpio.c | 18 +- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 31 +- + drivers/pinctrl/sirf/pinctrl-sirf.c | 31 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 24 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 16 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 12 +- + drivers/platform/x86/intel_pmic_gpio.c | 4 +- + drivers/tty/serial/max310x.c | 2 +- + drivers/tty/serial/sc16is7xx.c | 2 +- + drivers/video/fbdev/via/via-gpio.c | 19 +- + include/linux/basic_mmio_gpio.h | 80 ---- + include/linux/gpio/driver.h | 75 +++- + include/linux/of_gpio.h | 13 +- + include/linux/platform_data/gpio-rcar.h | 29 -- + sound/soc/codecs/rt5677.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8962.c | 2 +- + sound/soc/codecs/wm8996.c | 2 +- + sound/soc/soc-ac97.c | 2 +- + 186 files changed, 2674 insertions(+), 2504 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-tps65086.txt + create mode 100644 drivers/gpio/gpio-104-idi-48.c + delete mode 100644 include/linux/basic_mmio_gpio.h + delete mode 100644 include/linux/platform_data/gpio-rcar.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 (074726402b82 pwm: omap-dmtimer: Potential NULL dereference on error) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/lpc32xx-pwm.txt | 9 +- + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 18 ++ + drivers/pwm/Kconfig | 25 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-bcm2835.c | 18 +- + drivers/pwm/pwm-fsl-ftm.c | 58 ++-- + drivers/pwm/pwm-lpc32xx.c | 59 ++-- + drivers/pwm/pwm-lpss.c | 57 ++-- + drivers/pwm/pwm-lpss.h | 1 + + drivers/pwm/pwm-omap-dmtimer.c | 327 +++++++++++++++++++++ + drivers/pwm/pwm-rcar.c | 2 +- + include/linux/platform_data/pwm_omap_dmtimer.h | 69 +++++ + 12 files changed, 538 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-omap-dmtimer.txt + create mode 100644 drivers/pwm/pwm-omap-dmtimer.c + create mode 100644 include/linux/platform_data/pwm_omap_dmtimer.h +Merging dma-buf/for-next (168309855a7d Linux 4.4-rc8) +$ 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 (b953c0d234bc Linux 4.1) +$ git merge ktest/for-next +Already up-to-date. +Merging clk/clk-next (b360ada3f153 Merge tag 'tegra-for-4.5-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk/ti.h +Auto-merging drivers/clk/bcm/Makefile +Merge made by the 'recursive' strategy. + .../bindings/clock/brcm,bcm2835-aux-clock.txt | 31 + + .../devicetree/bindings/clock/cs2000-cp.txt | 22 + + .../devicetree/bindings/clock/nxp,lpc3220-clk.txt | 30 + + .../bindings/clock/nxp,lpc3220-usb-clk.txt | 22 + + .../bindings/clock/renesas,cpg-div6-clocks.txt | 4 + + .../devicetree/bindings/clock/tango4-clock.txt | 23 + + arch/arm/mach-omap2/clock.c | 4 + + drivers/clk/Kconfig | 17 + + drivers/clk/Makefile | 5 +- + drivers/clk/at91/clk-slow.c | 29 - + drivers/clk/bcm/Makefile | 1 + + drivers/clk/bcm/clk-bcm2835-aux.c | 85 ++ + drivers/clk/bcm/clk-bcm2835.c | 155 +- + drivers/clk/clk-cs2000-cp.c | 510 +++++++ + drivers/clk/clk-gpio.c | 28 +- + drivers/clk/clk-mux.c | 5 +- + drivers/clk/clk-si5351.c | 7 + + drivers/clk/clk-tango4.c | 61 + + drivers/clk/clk-xgene.c | 3 +- + drivers/clk/clk.c | 35 +- + drivers/clk/mvebu/Makefile | 2 +- + drivers/clk/mvebu/dove-divider.c | 262 ++++ + drivers/clk/mvebu/dove-divider.h | 6 + + drivers/clk/mvebu/dove.c | 6 + + drivers/clk/nxp/Makefile | 1 + + drivers/clk/nxp/clk-lpc32xx.c | 1569 ++++++++++++++++++++ + drivers/clk/qcom/common.c | 87 ++ + drivers/clk/qcom/common.h | 4 + + drivers/clk/qcom/gcc-apq8084.c | 17 +- + drivers/clk/qcom/gcc-ipq806x.c | 15 +- + drivers/clk/qcom/gcc-msm8660.c | 16 +- + drivers/clk/qcom/gcc-msm8916.c | 17 +- + drivers/clk/qcom/gcc-msm8960.c | 16 +- + drivers/clk/qcom/gcc-msm8974.c | 18 +- + drivers/clk/qcom/lcc-ipq806x.c | 1 + + drivers/clk/qcom/lcc-msm8960.c | 1 + + drivers/clk/qcom/mmcc-apq8084.c | 1 + + drivers/clk/qcom/mmcc-msm8960.c | 2 + + drivers/clk/qcom/mmcc-msm8974.c | 1 + + drivers/clk/rockchip/clk-rk3036.c | 55 +- + drivers/clk/rockchip/clk-rk3188.c | 110 +- + drivers/clk/rockchip/clk-rk3288.c | 94 +- + drivers/clk/rockchip/clk.c | 137 +- + drivers/clk/rockchip/clk.h | 19 + + drivers/clk/samsung/clk-cpu.c | 10 +- + drivers/clk/samsung/clk-exynos5420.c | 98 +- + drivers/clk/samsung/clk-s3c2410-dclk.c | 3 +- + drivers/clk/shmobile/Makefile | 24 +- + drivers/clk/shmobile/clk-div6.c | 137 +- + drivers/clk/shmobile/clk-div6.h | 7 + + drivers/clk/shmobile/clk-rcar-gen2.c | 4 +- + drivers/clk/shmobile/r8a7795-cpg-mssr.c | 383 +++++ + drivers/clk/shmobile/renesas-cpg-mssr.c | 596 ++++++++ + drivers/clk/shmobile/renesas-cpg-mssr.h | 132 ++ + drivers/clk/st/clkgen-fsyn.c | 17 +- + drivers/clk/ti/apll.c | 2 +- + drivers/clk/ti/dpll3xxx.c | 25 +- + drivers/clk/versatile/clk-sp810.c | 5 +- + include/dt-bindings/clock/bcm2835-aux.h | 17 + + include/dt-bindings/clock/bcm2835.h | 3 +- + include/dt-bindings/clock/exynos5420.h | 4 + + include/dt-bindings/clock/lpc32xx-clock.h | 56 + + include/linux/clk-provider.h | 9 +- + include/linux/clk/ti.h | 1 + + 64 files changed, 4702 insertions(+), 365 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/cs2000-cp.txt + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-usb-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/tango4-clock.txt + create mode 100644 drivers/clk/bcm/clk-bcm2835-aux.c + create mode 100644 drivers/clk/clk-cs2000-cp.c + create mode 100644 drivers/clk/clk-tango4.c + create mode 100644 drivers/clk/mvebu/dove-divider.c + create mode 100644 drivers/clk/mvebu/dove-divider.h + create mode 100644 drivers/clk/nxp/clk-lpc32xx.c + create mode 100644 drivers/clk/shmobile/clk-div6.h + create mode 100644 drivers/clk/shmobile/r8a7795-cpg-mssr.c + create mode 100644 drivers/clk/shmobile/renesas-cpg-mssr.c + create mode 100644 drivers/clk/shmobile/renesas-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/bcm2835-aux.h + create mode 100644 include/dt-bindings/clock/lpc32xx-clock.h +Merging random/dev (7185ad2672a7 crypto: memzero_explicit - make sure to clear out sensitive data) +$ git merge random/dev +Already up-to-date. +Merging aio/master (6a81013efc40 aio: add support for IOCB_CMD_POLL via aio thread helper) +$ git merge aio/master +Auto-merging net/unix/af_unix.c +Auto-merging net/sctp/socket.c +Auto-merging net/core/stream.c +Auto-merging net/atm/common.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/auditsc.c +Auto-merging init/Kconfig +Auto-merging include/linux/sched.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/read_write.c +Auto-merging fs/internal.h +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_lock.c | 2 +- + drivers/gpu/drm/ttm/ttm_lock.c | 6 +- + fs/aio.c | 382 ++++++++++++++++++++++++++++++++++++++--- + fs/attr.c | 2 +- + fs/binfmt_flat.c | 2 +- + fs/fuse/dev.c | 2 +- + fs/internal.h | 6 + + fs/pipe.c | 4 +- + fs/read_write.c | 5 +- + fs/splice.c | 8 +- + include/linux/aio.h | 8 + + include/linux/fs.h | 2 + + include/linux/sched.h | 6 + + include/uapi/linux/aio_abi.h | 2 +- + init/Kconfig | 13 ++ + kernel/auditsc.c | 6 +- + kernel/signal.c | 20 +++ + kernel/sysctl.c | 9 + + mm/filemap.c | 6 +- + net/atm/common.c | 4 +- + net/ax25/af_ax25.c | 2 +- + net/caif/caif_socket.c | 2 +- + net/core/stream.c | 2 +- + net/decnet/af_decnet.c | 2 +- + net/irda/af_irda.c | 4 +- + net/netrom/af_netrom.c | 2 +- + net/rose/af_rose.c | 2 +- + net/sctp/socket.c | 2 +- + net/unix/af_unix.c | 4 +- + net/x25/af_x25.c | 2 +- + 30 files changed, 455 insertions(+), 64 deletions(-) +Merging llvmlinux/for-next (25d4aee23af2 arm: LLVMLinux: Use global stack register variable for percpu) +$ git merge llvmlinux/for-next +Merge made by the 'recursive' strategy. +Merging kselftest/next (1b1fe542b6f0 selftests: firmware: add empty string and async tests) +$ git merge kselftest/next +Merge made by the 'recursive' strategy. + drivers/base/firmware_class.c | 8 +- + lib/test_firmware.c | 79 ++++++++++++++- + tools/testing/selftests/Makefile | 2 + + tools/testing/selftests/breakpoints/.gitignore | 1 + + tools/testing/selftests/capabilities/Makefile | 21 ++-- + tools/testing/selftests/firmware/fw_filesystem.sh | 29 +++++- + tools/testing/selftests/intel_pstate/Makefile | 15 +++ + tools/testing/selftests/intel_pstate/aperf.c | 80 +++++++++++++++ + tools/testing/selftests/intel_pstate/msr.c | 39 ++++++++ + tools/testing/selftests/intel_pstate/run.sh | 113 ++++++++++++++++++++++ + tools/testing/selftests/ptrace/.gitignore | 1 + + tools/testing/selftests/seccomp/test_harness.h | 5 +- + tools/testing/selftests/timers/.gitignore | 1 + + tools/testing/selftests/vm/.gitignore | 5 + + 14 files changed, 376 insertions(+), 23 deletions(-) + create mode 100644 tools/testing/selftests/breakpoints/.gitignore + create mode 100644 tools/testing/selftests/intel_pstate/Makefile + create mode 100644 tools/testing/selftests/intel_pstate/aperf.c + create mode 100644 tools/testing/selftests/intel_pstate/msr.c + create mode 100755 tools/testing/selftests/intel_pstate/run.sh + create mode 100644 tools/testing/selftests/ptrace/.gitignore +Merging y2038/y2038 (477b8541b31f qla2xxx: Remove use of 'struct timeval') +$ git merge y2038/y2038 +Merge made by the 'recursive' strategy. + drivers/scsi/qla2xxx/qla_mr.c | 5 ++--- + fs/afs/main.c | 6 ++---- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging luto-misc/next (8735f8e16a70 selftests/x86: Add tests for UC_SIGCONTEXT_SS and UC_STRICT_RESTORE_SS) +$ git merge luto-misc/next +Merge made by the 'recursive' strategy. + arch/x86/include/asm/desc_defs.h | 23 +++ + arch/x86/include/asm/sighandling.h | 1 - + arch/x86/include/uapi/asm/sigcontext.h | 25 +++- + arch/x86/include/uapi/asm/ucontext.h | 43 +++++- + arch/x86/kernel/signal.c | 114 ++++++++++++--- + tools/testing/selftests/x86/Makefile | 4 +- + tools/testing/selftests/x86/sigreturn.c | 240 ++++++++++++++++++++++++++++---- + 7 files changed, 391 insertions(+), 59 deletions(-) +Merging borntraeger/linux-next (fc7f9754db6c s390/dma: Allow per device dma ops) +$ git merge borntraeger/linux-next +Auto-merging lib/Makefile +Auto-merging include/linux/dma-mapping.h +Auto-merging arch/s390/pci/pci_dma.c +Auto-merging arch/s390/pci/pci.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/alpha/kernel/pci-noop.c | 46 ++--------------------- + arch/s390/Kconfig | 7 +--- + arch/s390/include/asm/device.h | 6 ++- + arch/s390/include/asm/dma-mapping.h | 6 ++- + arch/s390/pci/pci.c | 1 + + arch/s390/pci/pci_dma.c | 4 +- + include/linux/dma-mapping.h | 2 + + lib/Makefile | 1 + + lib/dma-noop.c | 75 +++++++++++++++++++++++++++++++++++++ + 9 files changed, 96 insertions(+), 52 deletions(-) + create mode 100644 lib/dma-noop.c +Merging livepatching/for-next (5dc5f4089332 Merge branch 'for-4.5/core' into for-next) +$ git merge livepatching/for-next +Resolved 'arch/x86/kernel/livepatch.c' using previous resolution. +Auto-merging arch/x86/kernel/livepatch.c +CONFLICT (content): Merge conflict in arch/x86/kernel/livepatch.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 2ddb096aca42] Merge remote-tracking branch 'livepatching/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-livepatch | 6 +- + arch/x86/kernel/livepatch.c | 25 +--- + include/linux/livepatch.h | 24 ++-- + kernel/livepatch/core.c | 176 +++++++++-------------- + 4 files changed, 85 insertions(+), 146 deletions(-) +Merging coresight/next (d2b29c2f35a2 coresight: Fix a typo in Kconfig) +$ git merge coresight/next +Merge made by the 'recursive' strategy. +Merging rtc/rtc-next (cab572b82c4b rtc: fix overflow and incorrect calculation in rtc_time64_to_tm) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-abx80x.c | 146 ++++++++++++- + drivers/rtc/rtc-da9063.c | 23 +- + drivers/rtc/rtc-ds1305.c | 8 +- + drivers/rtc/rtc-ds1307.c | 17 +- + drivers/rtc/rtc-ds1685.c | 22 +- + drivers/rtc/rtc-efi.c | 66 +++++- + drivers/rtc/rtc-gemini.c | 1 - + drivers/rtc/rtc-imxdi.c | 2 +- + drivers/rtc/rtc-lib.c | 14 +- + drivers/rtc/rtc-lpc32xx.c | 2 +- + drivers/rtc/rtc-pcf8523.c | 11 + + drivers/rtc/rtc-proc.c | 8 +- + drivers/rtc/rtc-rv8803.c | 3 +- + drivers/rtc/rtc-rx8010.c | 523 ++++++++++++++++++++++++++++++++++++++++++++++ + drivers/rtc/rtc-sunxi.c | 18 +- + drivers/rtc/rtc-sysfs.c | 11 +- + drivers/rtc/rtc-v3020.c | 6 +- + 19 files changed, 807 insertions(+), 85 deletions(-) + create mode 100644 drivers/rtc/rtc-rx8010.c +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 (4ce7a0ee0c7f Merge branch 'for-4.5/block-dax' into for-4.5/libnvdimm) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging lib/Kconfig.debug +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/inode.c +Auto-merging fs/block_dev.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +Auto-merging drivers/acpi/nfit.c +Auto-merging block/genhd.c +Auto-merging block/Makefile +Auto-merging arch/x86/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/tile/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/Kconfig.debug +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 1 + + arch/arm/Kconfig.debug | 14 - + arch/arm64/Kconfig | 1 + + arch/arm64/Kconfig.debug | 14 - + arch/frv/Kconfig | 1 + + arch/m32r/Kconfig | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/Kconfig.debug | 12 - + arch/s390/Kconfig | 1 + + arch/s390/Kconfig.debug | 12 - + arch/tile/Kconfig | 4 +- + arch/unicore32/Kconfig | 1 + + arch/unicore32/Kconfig.debug | 14 - + arch/x86/Kconfig | 1 + + arch/x86/Kconfig.debug | 17 -- + block/Makefile | 2 +- + block/badblocks.c | 590 ++++++++++++++++++++++++++++++++++++++ + block/genhd.c | 117 +++++++- + block/ioctl.c | 70 +++++ + drivers/acpi/nfit.c | 203 +++++++++++++ + drivers/block/brd.c | 9 +- + drivers/md/md.c | 516 ++------------------------------- + drivers/md/md.h | 40 +-- + drivers/nvdimm/btt.c | 11 + + drivers/nvdimm/btt_devs.c | 10 + + drivers/nvdimm/core.c | 202 +++++++++++++ + drivers/nvdimm/namespace_devs.c | 132 +++++++-- + drivers/nvdimm/nd-core.h | 2 + + drivers/nvdimm/nd.h | 16 +- + drivers/nvdimm/pfn_devs.c | 103 +++++-- + drivers/nvdimm/pmem.c | 98 ++++--- + drivers/nvdimm/region_devs.c | 72 ++--- + drivers/s390/block/dcssblk.c | 6 +- + fs/block_dev.c | 148 +++++++++- + fs/inode.c | 28 ++ + fs/xfs/xfs_fsops.c | 9 + + fs/xfs/xfs_super.c | 8 + + include/linux/badblocks.h | 56 ++++ + include/linux/fs.h | 14 + + include/linux/genhd.h | 3 + + include/linux/libnvdimm.h | 1 + + include/linux/nd.h | 2 + + include/uapi/linux/fs.h | 2 + + kernel/resource.c | 11 +- + lib/Kconfig.debug | 39 +++ + tools/testing/nvdimm/Kbuild | 2 + + tools/testing/nvdimm/test/iomap.c | 93 +++--- + tools/testing/nvdimm/test/nfit.c | 11 + + 48 files changed, 1894 insertions(+), 827 deletions(-) + create mode 100644 block/badblocks.c + create mode 100644 include/linux/badblocks.h +Merging akpm-current/current (055bd02ec563 ipc/msg.c: use freezable blocking call) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'fs/xattr.c' +Recorded preimage for 'lib/vsprintf.c' +Recorded preimage for 'net/mac80211/debugfs.c' +Resolved 'Makefile' using previous resolution. +Resolved 'arch/arm/Kconfig' using previous resolution. +Resolved 'arch/powerpc/include/asm/nohash/64/pgtable.h' using previous resolution. +Resolved 'arch/powerpc/mm/pgtable_64.c' using previous resolution. +Resolved 'arch/x86/kvm/mmu.c' using previous resolution. +Resolved 'arch/x86/mm/pgtable.c' using previous resolution. +Resolved 'drivers/gpu/drm/omapdrm/omap_gem.c' using previous resolution. +Resolved 'drivers/nvdimm/pmem.c' using previous resolution. +Resolved 'fs/block_dev.c' using previous resolution. +Resolved 'include/linux/memblock.h' using previous resolution. +Resolved 'include/net/sock.h' using previous resolution. +Resolved 'lib/Kconfig.debug' using previous resolution. +Resolved 'net/ipv4/tcp_ipv4.c' using previous resolution. +Resolved 'scripts/tags.sh' using previous resolution. +Auto-merging virt/kvm/kvm_main.c +Auto-merging security/smack/smack_lsm.c +Auto-merging scripts/tags.sh +CONFLICT (content): Merge conflict in scripts/tags.sh +Auto-merging scripts/mod/file2alias.c +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging net/mac80211/debugfs.c +CONFLICT (content): Merge conflict in net/mac80211/debugfs.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging net/ipv4/tcp_ipv4.c +CONFLICT (content): Merge conflict in net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/sock.c +Auto-merging mm/vmstat.c +Auto-merging mm/util.c +Auto-merging mm/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mremap.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memblock.c +Auto-merging mm/filemap.c +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Auto-merging lib/test_hexdump.c +Auto-merging lib/list_debug.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging kernel/stop_machine.c +Auto-merging kernel/kexec_core.c +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +Auto-merging kernel/events/core.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/net/tcp.h +Auto-merging include/net/sock.h +CONFLICT (content): Merge conflict in include/net/sock.h +Auto-merging include/linux/tracepoint.h +Auto-merging include/linux/string.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/percpu.h +Auto-merging include/linux/memblock.h +CONFLICT (content): Merge conflict in include/linux/memblock.h +Auto-merging include/linux/list.h +Auto-merging include/linux/kvm_host.h +Auto-merging include/linux/kexec.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/blkdev.h +Auto-merging include/asm-generic/pgtable.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xattr.c +CONFLICT (content): Merge conflict in fs/xattr.c +Auto-merging fs/udf/super.c +Auto-merging fs/sysv/inode.c +Auto-merging fs/squashfs/super.c +Auto-merging fs/romfs/super.c +Auto-merging fs/qnx6/inode.c +Auto-merging fs/qnx4/inode.c +Auto-merging fs/proc/namespaces.c +Auto-merging fs/proc/inode.c +Auto-merging fs/proc/base.c +Auto-merging fs/ocfs2/quota_global.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/inode.c +Auto-merging fs/nilfs2/super.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/ncpfs/inode.c +Auto-merging fs/minix/inode.c +Auto-merging fs/logfs/inode.c +Auto-merging fs/kernfs/dir.c +Auto-merging fs/isofs/inode.c +Auto-merging fs/inode.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/gfs2/main.c +Auto-merging fs/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/dcache.c +Auto-merging fs/coredump.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/block_dev.c +CONFLICT (content): Merge conflict in fs/block_dev.c +Auto-merging fs/befs/linuxvfs.c +Auto-merging fs/affs/super.c +Auto-merging fs/Kconfig +Auto-merging drivers/staging/lustre/lustre/llite/super25.c +Auto-merging drivers/staging/lustre/include/linux/libcfs/libcfs_private.h +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/nvdimm/pmem.c +CONFLICT (content): Merge conflict in drivers/nvdimm/pmem.c +Auto-merging drivers/nvdimm/pfn_devs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/dvm/calib.c +Auto-merging drivers/iio/industrialio-core.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/gpu/drm/gma500/framebuffer.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging drivers/block/drbd/drbd_bitmap.c +Auto-merging drivers/block/brd.c +Auto-merging block/genhd.c +Auto-merging arch/x86/mm/pgtable.c +CONFLICT (content): Merge conflict in arch/x86/mm/pgtable.c +Auto-merging arch/x86/mm/pat.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/paging_tmpl.h +Auto-merging arch/x86/kvm/mmu_audit.c +Auto-merging arch/x86/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c +Auto-merging arch/x86/kernel/vm86_32.c +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/unicore32/Kconfig +Auto-merging arch/tile/Kconfig +Auto-merging arch/s390/mm/pgtable.c +Auto-merging arch/s390/mm/gup.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/sysdev/axonram.c +Auto-merging arch/powerpc/mm/pgtable_64.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/pgtable_64.c +Auto-merging arch/powerpc/mm/hugetlbpage.c +Auto-merging arch/powerpc/mm/hugepage-hash64.c +Auto-merging arch/powerpc/include/asm/nohash/64/pgtable.h +CONFLICT (content): Merge conflict in arch/powerpc/include/asm/nohash/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/m68k/include/asm/page_mm.h +Auto-merging arch/frv/include/asm/page.h +Auto-merging arch/arm64/mm/flush.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/kvm/mmu.c +Auto-merging arch/arm/kernel/smp.c +Auto-merging arch/arm/include/asm/kvm_mmu.h +Auto-merging arch/arm/Kconfig +CONFLICT (content): Merge conflict in arch/arm/Kconfig +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging Documentation/sysctl/vm.txt +Auto-merging Documentation/sysctl/kernel.txt +Auto-merging Documentation/printk-formats.txt +Auto-merging Documentation/kernel-parameters.txt +Removing Documentation/features/vm/pmdp_splitting_flush/arch-support.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/xattr.c'. +Recorded resolution for 'lib/vsprintf.c'. +Recorded resolution for 'net/mac80211/debugfs.c'. +[master a01ab3d33fce] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + .../vm/pmdp_splitting_flush/arch-support.txt | 40 - + .../filesystems/ocfs2-online-filecheck.txt | 94 + + Documentation/filesystems/proc.txt | 23 +- + Documentation/filesystems/tmpfs.txt | 8 +- + Documentation/filesystems/vfat.txt | 10 + + Documentation/kernel-parameters.txt | 4 + + Documentation/printk-formats.txt | 19 +- + Documentation/sysctl/kernel.txt | 15 +- + Documentation/sysctl/vm.txt | 29 + + Documentation/ubsan.txt | 84 + + Documentation/vm/ksm.txt | 63 + + Documentation/vm/page_owner.txt | 9 +- + Documentation/vm/transhuge.txt | 151 +- + Makefile | 3 +- + arch/Kconfig | 72 + + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arc/Kconfig | 3 - + arch/arc/mm/cache.c | 4 +- + arch/arm/Kconfig | 15 +- + arch/arm/include/asm/kvm_mmu.h | 5 +- + arch/arm/include/asm/pgtable-3level.h | 10 +- + arch/arm/kernel/smp.c | 2 + + arch/arm/kvm/mmu.c | 10 +- + arch/arm/lib/uaccess_with_memcpy.c | 5 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm/mm/flush.c | 17 +- + arch/arm/mm/mmap.c | 3 +- + arch/arm64/Kconfig | 29 + + arch/arm64/include/asm/kvm_mmu.h | 3 +- + arch/arm64/include/asm/pgtable.h | 9 +- + arch/arm64/include/asm/thread_info.h | 15 +- + arch/arm64/mm/flush.c | 16 - + arch/arm64/mm/mmap.c | 8 +- + arch/avr32/Kconfig | 1 + + arch/avr32/include/asm/page.h | 8 +- + arch/blackfin/Kconfig | 1 + + arch/cris/Kconfig | 1 + + arch/frv/include/asm/io.h | 17 +- + arch/frv/include/asm/page.h | 2 +- + arch/ia64/include/asm/page.h | 1 + + arch/ia64/kernel/perfmon.c | 3 +- + arch/m32r/kernel/setup.c | 3 + + arch/m68k/include/asm/page_mm.h | 3 + + arch/metag/Kconfig | 3 - + arch/microblaze/Kconfig | 3 - + arch/mips/Kconfig | 1 + + arch/mips/include/asm/kvm_host.h | 6 +- + arch/mips/include/asm/pgtable-bits.h | 10 +- + arch/mips/include/asm/pgtable.h | 18 - + arch/mips/include/uapi/asm/mman.h | 1 + + arch/mips/kvm/emulate.c | 2 +- + arch/mips/kvm/tlb.c | 14 +- + arch/mips/mm/c-r4k.c | 3 +- + arch/mips/mm/cache.c | 2 +- + arch/mips/mm/gup.c | 17 +- + arch/mips/mm/init.c | 6 +- + arch/mips/mm/pgtable-64.c | 14 - + arch/mips/mm/tlbex.c | 1 - + arch/parisc/Kconfig | 3 - + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/Kconfig | 5 +- + arch/powerpc/include/asm/fadump.h | 2 +- + arch/powerpc/include/asm/kvm_book3s.h | 4 +- + arch/powerpc/include/asm/kvm_ppc.h | 2 +- + arch/powerpc/kernel/Makefile | 8 +- + arch/powerpc/kernel/fadump.c | 4 +- + arch/powerpc/kernel/vdso32/Makefile | 1 + + arch/powerpc/kernel/vdso64/Makefile | 1 + + arch/powerpc/kvm/book3s.c | 6 +- + arch/powerpc/kvm/book3s_32_mmu_host.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_host.c | 2 +- + arch/powerpc/kvm/e500.h | 2 +- + arch/powerpc/kvm/e500_mmu_host.c | 8 +- + arch/powerpc/kvm/trace_pr.h | 2 +- + arch/powerpc/mm/hugepage-hash64.c | 3 - + arch/powerpc/mm/hugetlbpage.c | 17 +- + arch/powerpc/mm/pgtable_64.c | 49 - + arch/powerpc/mm/subpage-prot.c | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/powerpc/sysdev/axonram.c | 9 +- + arch/powerpc/xmon/Makefile | 1 + + arch/s390/Kconfig | 4 +- + arch/s390/include/asm/pgtable.h | 16 +- + arch/s390/mm/gup.c | 24 +- + arch/s390/mm/pgtable.c | 52 +- + arch/sh/Kconfig | 4 +- + arch/sh/mm/cache-sh4.c | 2 +- + arch/sh/mm/cache.c | 8 +- + arch/sparc/Kconfig | 5 +- + arch/sparc/include/asm/pgtable_64.h | 19 +- + arch/sparc/mm/fault_64.c | 3 - + arch/sparc/mm/gup.c | 16 +- + arch/tile/Kconfig | 1 + + arch/tile/include/asm/pgtable.h | 10 - + arch/um/include/asm/page.h | 7 +- + arch/um/include/asm/pgtable-3level.h | 4 +- + arch/um/include/asm/pgtable.h | 2 +- + arch/unicore32/Kconfig | 3 - + arch/x86/Kconfig | 21 +- + arch/x86/boot/Makefile | 1 + + arch/x86/boot/compressed/Makefile | 1 + + arch/x86/entry/vdso/Makefile | 1 + + arch/x86/include/asm/pgtable.h | 40 +- + arch/x86/include/asm/pgtable_types.h | 9 +- + arch/x86/include/asm/pmem.h | 7 +- + arch/x86/kernel/apic/hw_nmi.c | 1 - + arch/x86/kernel/machine_kexec_64.c | 46 + + arch/x86/kernel/vm86_32.c | 6 +- + arch/x86/kvm/iommu.c | 11 +- + arch/x86/kvm/mmu.c | 37 +- + arch/x86/kvm/mmu_audit.c | 2 +- + arch/x86/kvm/paging_tmpl.h | 6 +- + arch/x86/kvm/vmx.c | 2 +- + arch/x86/kvm/x86.c | 2 +- + arch/x86/mm/gup.c | 74 +- + arch/x86/mm/init_64.c | 33 +- + arch/x86/mm/mmap.c | 12 +- + arch/x86/mm/pat.c | 5 +- + arch/x86/mm/pgtable.c | 13 - + arch/x86/realmode/rm/Makefile | 1 + + arch/x86/um/Kconfig | 1 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + arch/xtensa/mm/tlb.c | 2 +- + block/genhd.c | 2 +- + drivers/acpi/acpi_memhotplug.c | 4 +- + drivers/acpi/apei/erst.c | 6 +- + drivers/base/cpu.c | 10 +- + drivers/base/memory.c | 19 +- + drivers/block/brd.c | 7 +- + drivers/block/drbd/drbd_bitmap.c | 26 +- + drivers/block/drbd/drbd_int.h | 3 - + drivers/block/zram/zcomp.c | 24 +- + drivers/block/zram/zcomp.h | 2 +- + drivers/block/zram/zcomp_lz4.c | 15 +- + drivers/block/zram/zcomp_lzo.c | 15 +- + drivers/char/mspec.c | 15 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 11 +- + drivers/firmware/efi/libstub/Makefile | 1 + + drivers/gpu/drm/drm_hashtab.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 4 +- + drivers/gpu/drm/msm/msm_gem.c | 4 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 7 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 4 +- + drivers/iio/industrialio-core.c | 9 +- + drivers/net/wireless/intel/iwlwifi/dvm/calib.c | 2 +- + drivers/nvdimm/pfn_devs.c | 3 +- + drivers/nvdimm/pmem.c | 73 +- + drivers/s390/block/dcssblk.c | 11 +- + drivers/soc/qcom/smd.c | 13 +- + .../lustre/include/linux/libcfs/libcfs_private.h | 8 +- + drivers/staging/lustre/lustre/llite/super25.c | 3 +- + fs/9p/v9fs.c | 2 +- + fs/Kconfig | 3 +- + fs/adfs/super.c | 2 +- + fs/affs/super.c | 2 +- + fs/afs/super.c | 2 +- + fs/befs/linuxvfs.c | 2 +- + fs/bfs/inode.c | 2 +- + fs/block_dev.c | 17 +- + fs/btrfs/inode.c | 3 +- + fs/ceph/super.c | 4 +- + fs/cifs/cifsfs.c | 2 +- + fs/cifs/file.c | 8 +- + fs/coda/coda_linux.h | 3 +- + fs/coda/inode.c | 6 +- + fs/coredump.c | 20 + + fs/dax.c | 301 ++-- + fs/dcache.c | 5 +- + fs/ecryptfs/main.c | 6 +- + fs/efs/super.c | 6 +- + fs/eventpoll.c | 24 +- + fs/exofs/super.c | 4 +- + fs/ext2/super.c | 2 +- + fs/ext4/fsync.c | 5 +- + fs/ext4/super.c | 2 +- + fs/f2fs/super.c | 5 +- + fs/fat/cache.c | 79 +- + fs/fat/dir.c | 2 +- + fs/fat/fat.h | 8 +- + fs/fat/fatent.c | 24 +- + fs/fat/file.c | 61 + + fs/fat/inode.c | 106 +- + fs/file.c | 7 +- + fs/fuse/inode.c | 4 +- + fs/gfs2/main.c | 3 +- + fs/hfs/catalog.c | 6 +- + fs/hfs/super.c | 4 +- + fs/hfsplus/super.c | 2 +- + fs/hostfs/hostfs_kern.c | 2 +- + fs/hpfs/super.c | 2 +- + fs/hugetlbfs/inode.c | 31 +- + fs/inode.c | 2 +- + fs/isofs/inode.c | 2 +- + fs/jffs2/build.c | 8 +- + fs/jffs2/fs.c | 5 +- + fs/jffs2/super.c | 7 +- + fs/jfs/super.c | 2 +- + fs/kernfs/dir.c | 9 +- + fs/logfs/inode.c | 3 +- + fs/minix/inode.c | 2 +- + fs/ncpfs/inode.c | 2 +- + fs/nfs/inode.c | 2 +- + fs/nilfs2/super.c | 3 +- + fs/notify/inode_mark.c | 3 +- + fs/notify/mark.c | 66 +- + fs/ntfs/super.c | 4 +- + fs/ocfs2/Makefile | 3 +- + fs/ocfs2/alloc.c | 120 +- + fs/ocfs2/alloc.h | 2 +- + fs/ocfs2/aops.c | 1138 ++++++------ + fs/ocfs2/aops.h | 19 +- + fs/ocfs2/cluster/heartbeat.c | 4 +- + fs/ocfs2/dlm/dlmconvert.c | 24 +- + fs/ocfs2/dlm/dlmmaster.c | 35 +- + fs/ocfs2/dlm/dlmrecovery.c | 16 +- + fs/ocfs2/dlm/dlmunlock.c | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 2 +- + fs/ocfs2/dlmglue.c | 14 +- + fs/ocfs2/file.c | 173 +- + fs/ocfs2/filecheck.c | 605 +++++++ + fs/ocfs2/filecheck.h | 48 + + fs/ocfs2/inode.c | 203 ++- + fs/ocfs2/inode.h | 9 +- + fs/ocfs2/ioctl.c | 4 +- + fs/ocfs2/journal.c | 18 +- + fs/ocfs2/localalloc.c | 14 +- + fs/ocfs2/mmap.c | 4 +- + fs/ocfs2/namei.c | 21 +- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/ocfs2_trace.h | 18 +- + fs/ocfs2/quota_global.c | 2 +- + fs/ocfs2/resize.c | 2 +- + fs/ocfs2/slot_map.c | 14 +- + fs/ocfs2/stackglue.c | 3 +- + fs/ocfs2/stackglue.h | 2 + + fs/ocfs2/super.c | 57 +- + fs/ocfs2/super.h | 2 - + fs/openpromfs/inode.c | 2 +- + fs/proc/array.c | 2 +- + fs/proc/base.c | 21 +- + fs/proc/inode.c | 3 +- + fs/proc/meminfo.c | 5 +- + fs/proc/namespaces.c | 4 +- + fs/proc/page.c | 4 +- + fs/proc/task_mmu.c | 133 +- + fs/qnx4/inode.c | 2 +- + fs/qnx6/inode.c | 2 +- + fs/reiserfs/super.c | 3 +- + fs/romfs/super.c | 4 +- + fs/squashfs/super.c | 3 +- + fs/stat.c | 2 +- + fs/sysv/inode.c | 2 +- + fs/ubifs/super.c | 4 +- + fs/udf/super.c | 10 +- + fs/ufs/super.c | 2 +- + fs/xfs/kmem.h | 1 + + fs/xfs/xfs_super.c | 4 +- + include/asm-generic/memory_model.h | 4 +- + include/asm-generic/pgtable.h | 15 +- + include/asm-generic/sections.h | 65 + + include/linux/blkdev.h | 20 +- + include/linux/cpumask.h | 55 +- + include/linux/crc64_ecma.h | 56 + + include/linux/dcache.h | 4 +- + include/linux/err.h | 2 +- + include/linux/fsnotify_backend.h | 5 +- + include/linux/gfp.h | 22 +- + include/linux/hardirq.h | 2 + + include/linux/huge_mm.h | 79 +- + include/linux/hugetlb.h | 11 +- + include/linux/io.h | 16 +- + include/linux/kdev_t.h | 5 - + include/linux/kernel.h | 36 +- + include/linux/kexec.h | 66 +- + include/linux/kvm_host.h | 37 +- + include/linux/kvm_types.h | 2 +- + include/linux/list.h | 11 + + include/linux/lz4.h | 4 +- + include/linux/memblock.h | 31 +- + include/linux/memcontrol.h | 118 +- + include/linux/memory_hotplug.h | 3 +- + include/linux/mempolicy.h | 2 +- + include/linux/memremap.h | 114 ++ + include/linux/migrate.h | 6 +- + include/linux/mm.h | 245 ++- + include/linux/mm_inline.h | 2 + + include/linux/mm_types.h | 34 +- + include/linux/mmdebug.h | 9 +- + include/linux/mmzone.h | 40 +- + include/linux/page-flags.h | 288 ++-- + include/linux/page_ext.h | 1 + + include/linux/page_owner.h | 50 +- + include/linux/pagemap.h | 38 +- + include/linux/percpu.h | 3 - + include/linux/pfn.h | 10 + + include/linux/pfn_t.h | 102 ++ + include/linux/poison.h | 6 +- + include/linux/printk.h | 24 +- + include/linux/ptrace.h | 24 +- + include/linux/radix-tree.h | 2 +- + include/linux/rmap.h | 37 +- + include/linux/sched.h | 4 + + include/linux/sem.h | 1 + + include/linux/shm.h | 6 +- + include/linux/shmem_fs.h | 4 + + include/linux/slab.h | 5 + + include/linux/string.h | 1 + + include/linux/swap.h | 6 +- + include/linux/thread_info.h | 5 +- + include/linux/trace_events.h | 10 - + include/linux/tracepoint.h | 10 + + include/linux/vm_event_item.h | 5 +- + include/linux/vmalloc.h | 1 - + include/linux/vmpressure.h | 7 +- + include/linux/vmstat.h | 2 + + include/net/sock.h | 150 +- + include/net/tcp.h | 5 +- + include/net/tcp_memcontrol.h | 1 - + include/trace/events/gfpflags.h | 14 +- + include/trace/events/huge_memory.h | 166 ++ + include/trace/events/page_isolation.h | 38 + + include/trace/events/vmscan.h | 21 +- + include/uapi/asm-generic/mman-common.h | 1 + + include/uapi/linux/eventpoll.h | 3 + + init/Kconfig | 29 +- + init/do_mounts.h | 4 +- + init/do_mounts_initrd.c | 6 +- + init/main.c | 11 +- + ipc/mqueue.c | 2 +- + ipc/msg.c | 5 +- + ipc/sem.c | 126 +- + ipc/shm.c | 2 +- + ipc/util.c | 11 +- + ipc/util.h | 2 +- + kernel/cpu.c | 64 +- + kernel/cred.c | 4 +- + kernel/delayacct.c | 2 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 13 +- + kernel/exit.c | 5 +- + kernel/fork.c | 27 +- + kernel/futex.c | 67 +- + kernel/futex_compat.c | 2 +- + kernel/hung_task.c | 21 +- + kernel/kcmp.c | 4 +- + kernel/kexec.c | 19 +- + kernel/kexec_core.c | 13 +- + kernel/kexec_file.c | 10 +- + kernel/kexec_internal.h | 21 + + kernel/memremap.c | 219 ++- + kernel/pid.c | 2 +- + kernel/printk/Makefile | 1 + + kernel/printk/internal.h | 55 + + kernel/printk/nmi.c | 222 +++ + kernel/printk/printk.c | 87 +- + kernel/ptrace.c | 49 +- + kernel/sched/idle.c | 1 + + kernel/stop_machine.c | 4 - + kernel/sysctl.c | 24 +- + kernel/time/timer.c | 11 + + lib/Kconfig | 7 + + lib/Kconfig.debug | 11 +- + lib/Kconfig.ubsan | 29 + + lib/Makefile | 8 +- + lib/crc64_ecma.c | 341 ++++ + lib/dma-debug.c | 2 +- + lib/iomap_copy.c | 21 + + lib/kasprintf.c | 10 +- + lib/list_debug.c | 9 + + lib/nmi_backtrace.c | 89 +- + lib/string_helpers.c | 63 +- + lib/{test-hexdump.c => test_hexdump.c} | 146 +- + lib/test_printf.c | 121 +- + lib/ubsan.c | 456 +++++ + lib/ubsan.h | 84 + + lib/vsprintf.c | 328 ++-- + mm/backing-dev.c | 21 +- + mm/compaction.c | 18 +- + mm/debug.c | 128 +- + mm/filemap.c | 34 +- + mm/gup.c | 172 +- + mm/huge_memory.c | 1813 +++++++++++++------- + mm/hugetlb.c | 51 +- + mm/internal.h | 86 +- + mm/kasan/Makefile | 1 + + mm/kmemleak.c | 3 +- + mm/ksm.c | 822 +++++++-- + mm/madvise.c | 201 +++ + mm/memblock.c | 45 +- + mm/memcontrol.c | 402 +++-- + mm/memory-failure.c | 77 +- + mm/memory.c | 167 +- + mm/memory_hotplug.c | 80 +- + mm/mempolicy.c | 70 +- + mm/migrate.c | 34 +- + mm/mincore.c | 2 +- + mm/mlock.c | 21 +- + mm/mmap.c | 81 +- + mm/mmzone.c | 8 +- + mm/mprotect.c | 15 +- + mm/mremap.c | 22 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 184 +- + mm/page-writeback.c | 14 +- + mm/page_alloc.c | 354 ++-- + mm/page_idle.c | 27 +- + mm/page_isolation.c | 28 +- + mm/page_owner.c | 100 +- + mm/pagewalk.c | 2 +- + mm/percpu.c | 18 +- + mm/pgtable-generic.c | 23 +- + mm/process_vm_access.c | 2 +- + mm/readahead.c | 9 +- + mm/rmap.c | 356 ++-- + mm/shmem.c | 108 +- + mm/slab.c | 48 +- + mm/slab.h | 5 +- + mm/slab_common.c | 3 +- + mm/slub.c | 4 + + mm/sparse-vmemmap.c | 76 +- + mm/sparse.c | 8 +- + mm/swap.c | 319 +--- + mm/swap_state.c | 9 +- + mm/swapfile.c | 39 +- + mm/userfaultfd.c | 8 +- + mm/util.c | 54 +- + mm/vmalloc.c | 23 +- + mm/vmpressure.c | 78 +- + mm/vmscan.c | 81 +- + mm/vmstat.c | 89 +- + mm/zbud.c | 5 +- + mm/zsmalloc.c | 4 +- + net/core/sock.c | 78 +- + net/ipv4/fib_trie.c | 4 +- + net/ipv4/tcp.c | 3 +- + net/ipv4/tcp_ipv4.c | 9 +- + net/ipv4/tcp_memcontrol.c | 91 +- + net/ipv4/tcp_output.c | 7 +- + net/ipv6/tcp_ipv6.c | 3 - + net/mac80211/debugfs.c | 7 +- + net/socket.c | 2 +- + net/sunrpc/rpc_pipe.c | 2 +- + scripts/Makefile.lib | 6 + + scripts/Makefile.ubsan | 17 + + scripts/bloat-o-meter | 8 +- + scripts/checkpatch.pl | 49 +- + scripts/mod/file2alias.c | 3 +- + scripts/tags.sh | 1 - + security/commoncap.c | 7 +- + security/smack/smack_lsm.c | 8 +- + security/yama/yama_lsm.c | 4 +- + virt/kvm/kvm_main.c | 47 +- + 453 files changed, 11666 insertions(+), 5778 deletions(-) + delete mode 100644 Documentation/features/vm/pmdp_splitting_flush/arch-support.txt + create mode 100644 Documentation/filesystems/ocfs2-online-filecheck.txt + create mode 100644 Documentation/ubsan.txt + create mode 100644 fs/ocfs2/filecheck.c + create mode 100644 fs/ocfs2/filecheck.h + create mode 100644 include/linux/crc64_ecma.h + create mode 100644 include/linux/memremap.h + create mode 100644 include/linux/pfn_t.h + create mode 100644 include/trace/events/huge_memory.h + create mode 100644 include/trace/events/page_isolation.h + create mode 100644 kernel/printk/internal.h + create mode 100644 kernel/printk/nmi.c + create mode 100644 lib/Kconfig.ubsan + create mode 100644 lib/crc64_ecma.c + rename lib/{test-hexdump.c => test_hexdump.c} (52%) + create mode 100644 lib/ubsan.c + create mode 100644 lib/ubsan.h + create mode 100644 scripts/Makefile.ubsan +$ git am -3 ../patches/0001-merge-fix-for-powerpc-thp-remove-infrastructure-for-.patch +Applying: merge fix for "powerpc, thp: remove infrastructure for handling splitting PMDs" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/book3s/64/hash-64k.h +M arch/powerpc/include/asm/book3s/64/hash.h +M arch/powerpc/include/asm/book3s/64/pgtable.h +$ git add -A . +$ git commit -v -a --amend +[master 202ec527ff42] Merge branch 'akpm-current/current' + Date: Mon Jan 11 18:37:53 2016 +1100 +$ git am -3 ../patches/0001-mm-dax-gpu-merge-fix-for-convert-vm_insert_mixed-to-.patch +Applying: mm, dax, gpu: merge fix for convert vm_insert_mixed to pfn_t +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/book3s/32/pgtable.h +M arch/powerpc/include/asm/book3s/64/hash.h +M arch/powerpc/include/asm/nohash/pgtable.h +$ git add -A . +$ git commit -v -a --amend +[master c8bc94aa96ca] Merge branch 'akpm-current/current' + Date: Mon Jan 11 18:37:53 2016 +1100 +$ git am -3 ../patches/0001-mm-dax-convert-vmf_insert_pfn_pmd-to-pfn_t-fix.patch +Applying: mm, dax: convert vmf_insert_pfn_pmd() to pfn_t fix +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/book3s/64/pgtable.h +$ git add -A . +$ git commit -v -a --amend +[master cd05136bc475] Merge branch 'akpm-current/current' + Date: Mon Jan 11 18:37:53 2016 +1100 +$ git am -3 ../patches/0001-fix-up-for-bad-merge-of-arch-powerpc-include-asm-pgt.patch +Applying: fix up for bad merge of arch/powerpc/include/asm/pgtable-ppc64.h: add pmd_[dirty|mkclean] for THP +Using index info to reconstruct a base tree... +M arch/powerpc/include/asm/book3s/64/pgtable.h +Falling back to patching base and 3-way merge... +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/include/asm/book3s/64/pgtable.h +$ git add -A . +$ git commit -v -a --amend +[master 391f191bb525] Merge branch 'akpm-current/current' + Date: Mon Jan 11 18:37:53 2016 +1100 +$ git am -3 ../patches/0001-mm-printk-introduce-new-format-string-for-flags-fix-.patch +Applying: mm-printk-introduce-new-format-string-for-flags-fix-3 +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/printk-formats.txt +M mm/debug.c +M mm/oom_kill.c +M mm/page_alloc.c +M mm/page_owner.c +$ git add -A . +$ git commit -v -a --amend +[master a318b1348b41] Merge branch 'akpm-current/current' + Date: Mon Jan 11 18:37:53 2016 +1100 +$ 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: fs/overlayfs/super.c needs pagemap.h +Applying: fs/adfs/adfs.h: tidy up comments +Applying: iio: core: fix ptr_ret.cocci warnings +Applying: dma-mapping: make the generic coherent dma mmap implementation optional +Applying: arc: convert to dma_map_ops +Applying: arc: dma mapping fixes +Applying: ARC: dma mapping fixes #2 +Applying: avr32: convert to dma_map_ops +Applying: blackfin: convert to dma_map_ops +Applying: c6x: convert to dma_map_ops +Applying: C6X: fix build breakage +Applying: c6x: dma mapping fixes +Applying: cris: convert to dma_map_ops +Applying: nios2: convert to dma_map_ops +Applying: nios2: dma mapping fixes +Applying: frv: convert to dma_map_ops +Applying: parisc: convert to dma_map_ops +Applying: mn10300: convert to dma_map_ops +Applying: m68k: convert to dma_map_ops +Applying: metag: convert to dma_map_ops +Applying: sparc: use generic dma_set_mask +Applying: tile: uninline dma_set_mask +Applying: dma-mapping: always provide the dma_map_ops based implementation +Applying: HAVE_DMA_ATTRS: remove leftovers in Kconfig +Applying: dma-mapping: remove <asm-generic/dma-coherent.h> +Applying: dma-mapping: use offset_in_page macro +Applying: memstick: use sector_div instead of do_div +Applying: mm: memcontrol: drop unused @css argument in memcg_init_kmem +Applying: mm: memcontrol: remove double kmem page_counter init +Applying: mm: memcontrol: give the kmem states more descriptive names +Applying: mm: memcontrol: group kmem init and exit functions together +Applying: mm: memcontrol: separate kmem code from legacy tcp accounting code +Applying: mm: memcontrol: move kmem accounting code to CONFIG_MEMCG +Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-v2 +Applying: mm-memcontrol-move-kmem-accounting-code-to-config_memcg-fix +Applying: mm: memcontrol: account "kmem" consumers in cgroup2 memory controller +Applying: mm: memcontrol: allow to disable kmem accounting for cgroup2 +Applying: mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM +Applying: mm: memcontrol: only manage socket pressure for CONFIG_INET +Applying: net: drop tcp_memcontrol.c +Applying: net-drop-tcp_memcontrolc-fix +Applying: mm: memcontrol: rein in the CONFIG space madness +Applying: mm-memcontrol-reign-in-the-config-space-madness-fix +Applying: mm-memcontrol-reign-in-the-config-space-madness-fix-fix +Applying: mm: memcontrol: flatten struct cg_proto +Applying: mm: memcontrol: clean up alloc, online, offline, free functions +Applying: mm: memcontrol: clean up alloc, online, offline, free functions fix +Applying: memcg: fix SLOB build regression +Applying: mm: memcontrol: charge swap to cgroup2 +Applying: mm: vmscan: pass memcg to get_scan_count() +Applying: mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online +Applying: swap.h: move memcg related stuff to the end of the file +Applying: mm: vmscan: do not scan anon pages if memcg swap limit is hit +Applying: mm: free swap cache aggressively if memcg swap is full +Applying: Documentation: cgroup: add memory.swap.{current,max} description +Applying: MAINTAINERS: add git URL for APM driver +Applying: MAINTAINERS: add git URL for at91 +Applying: MAINTAINERS: add git URL for Rockchip +Applying: MAINTAINERS: add git URL for ARM64 +Applying: MAINTAINERS: update git URL for ath6kl +Applying: MAINTAINERS: add git URL for backlight +Applying: MAINTAINERS: add git URL for chrome +Applying: MAINTAINERS: add git URL for cris +Applying: MAINTAINERS: add git URL for cryptodev +Applying: MAINTAINERS: add git URL for devfreq +Applying: MAINTAINERS: update git URL for DLM +Applying: MAINTAINERS: add git URL for eCryptfs +Applying: MAINTAINERS: add git URL for ext4 +Applying: MAINTAINERS: add git URL for hwspinlock +Applying: MAINTAINERS: add git URL for integrity +Applying: MAINTAINERS: add git URL for IPVS +Applying: MAINTAINERS: add git URL for nfsd +Applying: MAINTAINERS: add git URL for KVM/s390 +Applying: MAINTAINERS: add git URL for kgdb +Applying: MAINTAINERS: add git URL for nvdimm +Applying: MAINTAINERS: add git URL for metag +Applying: MAINTAINERS: add git URL for wireless drivers +Applying: MAINTAINERS: add git URL for devicetree +Applying: MAINTAINERS: update git URL for PCMCIA +Applying: MAINTAINERS: update git URL for pstore +Applying: MAINTAINERS: update git URL for ath10k +Applying: MAINTAINERS: add git URL for hexagon +Applying: MAINTAINERS: add git URL for reset +Applying: MAINTAINERS: add git URL for s390 +Applying: MAINTAINERS: fix tree format for SAMSUNG thermal +Applying: MAINTAINERS: add git URL for md +Applying: MAINTAINERS: add git URL for squashfs +Applying: MAINTAINERS: add git URL for swiotlb +Applying: MAINTAINERS: add git URL for xtensa +Applying: MAINTAINERS: fix tree format for TPM +Applying: MAINTAINERS: add git URL for UML +Applying: MAINTAINERS: add git URL for VFIO +Applying: MAINTAINERS: add git URL for vhost +Applying: MAINTAINERS: update git URL for XFS +Applying: pmem: add wb_cache_pmem() to the PMEM API +Applying: pmem-add-wb_cache_pmem-to-the-pmem-api-v6 +Applying: dax: support dirty DAX entries in radix tree +Applying: dax-support-dirty-dax-entries-in-radix-tree-v6 +Applying: mm: add find_get_entries_tag() +Applying: dax: add support for fsync/sync +Applying: dax-add-support-for-fsync-sync-v6 +Applying: dax: fix dax_pmd_dbg build warning +Applying: ext2: call dax_pfn_mkwrite() for DAX fsync/msync +Applying: ext4: call dax_pfn_mkwrite() for DAX fsync/msync +Applying: xfs: call dax_pfn_mkwrite() for DAX fsync/msync +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + bce41ae785dc...8a6c65654e6e akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (8a6c65654e6e xfs: call dax_pfn_mkwrite() for DAX fsync/msync) +$ git merge --no-ff akpm/master +Removing net/ipv4/tcp_memcontrol.c +Removing include/net/tcp_memcontrol.h +Removing include/asm-generic/dma-mapping-common.h +Removing include/asm-generic/dma-mapping-broken.h +Removing include/asm-generic/dma-coherent.h +Removing Documentation/features/io/dma_map_attrs/arch-support.txt +Merge made by the 'recursive' strategy. + Documentation/DMA-API-HOWTO.txt | 10 - + Documentation/cgroup.txt | 33 + + .../features/io/dma_map_attrs/arch-support.txt | 40 -- + Documentation/kernel-parameters.txt | 1 + + MAINTAINERS | 50 +- + arch/Kconfig | 6 +- + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/dma-mapping.h | 2 - + arch/arc/include/asm/dma-mapping.h | 187 +---- + arch/arc/mm/dma.c | 152 +++-- + arch/arm/Kconfig | 1 - + arch/arm/include/asm/dma-mapping.h | 7 - + arch/arm64/Kconfig | 1 - + arch/arm64/include/asm/dma-mapping.h | 2 - + arch/avr32/include/asm/dma-mapping.h | 342 +--------- + arch/avr32/mm/dma-coherent.c | 115 +++- + arch/blackfin/include/asm/dma-mapping.h | 127 +--- + arch/blackfin/kernel/dma-mapping.c | 52 +- + arch/c6x/Kconfig | 1 + + arch/c6x/include/asm/dma-mapping.h | 98 +-- + arch/c6x/kernel/dma.c | 95 ++- + arch/c6x/mm/dma-coherent.c | 10 +- + arch/cris/arch-v32/drivers/pci/dma.c | 54 +- + arch/cris/include/asm/dma-mapping.h | 161 +---- + arch/frv/Kconfig | 1 + + arch/frv/include/asm/dma-mapping.h | 132 +--- + arch/frv/mb93090-mb00/pci-dma-nommu.c | 72 +- + arch/frv/mb93090-mb00/pci-dma.c | 74 +- + arch/h8300/Kconfig | 1 - + arch/h8300/include/asm/dma-mapping.h | 2 - + arch/hexagon/Kconfig | 1 - + arch/hexagon/include/asm/dma-mapping.h | 2 - + arch/ia64/Kconfig | 1 - + arch/ia64/include/asm/dma-mapping.h | 2 - + arch/m68k/include/asm/dma-mapping.h | 112 +-- + arch/m68k/kernel/dma.c | 61 +- + arch/metag/include/asm/dma-mapping.h | 179 +---- + arch/metag/kernel/dma.c | 146 +++- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/dma-mapping.h | 2 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/dma-mapping.h | 2 - + arch/mn10300/Kconfig | 1 + + arch/mn10300/include/asm/dma-mapping.h | 161 +---- + arch/mn10300/mm/dma-alloc.c | 67 +- + arch/nios2/include/asm/dma-mapping.h | 123 +--- + arch/nios2/mm/dma-mapping.c | 149 ++-- + arch/openrisc/Kconfig | 3 - + arch/openrisc/include/asm/dma-mapping.h | 2 - + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/dma-mapping.h | 189 +----- + arch/parisc/kernel/drivers.c | 2 +- + arch/parisc/kernel/pci-dma.c | 92 +-- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/dma-mapping.h | 2 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/dma-mapping.h | 2 - + arch/sh/Kconfig | 1 - + arch/sh/include/asm/dma-mapping.h | 2 - + arch/sparc/Kconfig | 1 - + arch/sparc/include/asm/dma-mapping.h | 17 - + arch/tile/Kconfig | 1 - + arch/tile/include/asm/dma-mapping.h | 32 +- + arch/tile/kernel/pci-dma.c | 29 + + arch/unicore32/Kconfig | 1 - + arch/unicore32/include/asm/dma-mapping.h | 2 - + arch/x86/Kconfig | 1 - + arch/x86/include/asm/dma-mapping.h | 2 - + arch/x86/include/asm/pmem.h | 11 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/dma-mapping.h | 4 - + drivers/base/dma-mapping.c | 7 +- + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/imx/Kconfig | 2 +- + drivers/gpu/drm/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/shmobile/Kconfig | 2 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/tilcdc/Kconfig | 2 +- + drivers/gpu/drm/vc4/Kconfig | 2 +- + drivers/iio/industrialio-sw-trigger.c | 4 +- + drivers/media/platform/Kconfig | 1 - + drivers/memstick/core/ms_block.c | 2 +- + drivers/parisc/ccio-dma.c | 57 +- + drivers/parisc/sba_iommu.c | 52 +- + fs/adfs/adfs.h | 28 +- + fs/block_dev.c | 2 +- + fs/dax.c | 196 +++++- + fs/ext2/file.c | 4 +- + fs/ext4/file.c | 4 +- + fs/inode.c | 2 +- + fs/overlayfs/super.c | 1 + + fs/xfs/xfs_file.c | 7 +- + include/asm-generic/dma-coherent.h | 32 - + include/asm-generic/dma-mapping-broken.h | 95 --- + include/asm-generic/dma-mapping-common.h | 358 ---------- + include/linux/dax.h | 7 + + include/linux/dma-attrs.h | 10 - + include/linux/dma-mapping.h | 411 ++++++++++- + include/linux/fs.h | 3 +- + include/linux/list_lru.h | 4 +- + include/linux/memcontrol.h | 81 +-- + include/linux/pagemap.h | 3 + + include/linux/pmem.h | 22 +- + include/linux/radix-tree.h | 9 + + include/linux/sched.h | 4 +- + include/linux/slab.h | 2 +- + include/linux/slab_def.h | 3 +- + include/linux/slub_def.h | 2 +- + include/linux/swap.h | 76 ++- + include/net/tcp_memcontrol.h | 6 - + init/Kconfig | 23 +- + mm/filemap.c | 91 ++- + mm/list_lru.c | 12 +- + mm/memcontrol.c | 752 ++++++++++++--------- + mm/memory.c | 3 +- + mm/shmem.c | 4 + + mm/slab.h | 6 +- + mm/slab_common.c | 14 +- + mm/slub.c | 10 +- + mm/swap_state.c | 5 + + mm/swapfile.c | 6 +- + mm/truncate.c | 69 +- + mm/vmscan.c | 37 +- + mm/workingset.c | 4 +- + net/ipv4/Makefile | 1 - + net/ipv4/sysctl_net_ipv4.c | 1 - + net/ipv4/tcp_ipv4.c | 1 - + net/ipv4/tcp_memcontrol.c | 200 ------ + net/ipv6/tcp_ipv6.c | 1 - + 129 files changed, 2329 insertions(+), 3663 deletions(-) + delete mode 100644 Documentation/features/io/dma_map_attrs/arch-support.txt + delete mode 100644 include/asm-generic/dma-coherent.h + delete mode 100644 include/asm-generic/dma-mapping-broken.h + delete mode 100644 include/asm-generic/dma-mapping-common.h + delete mode 100644 include/net/tcp_memcontrol.h + delete mode 100644 net/ipv4/tcp_memcontrol.c diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5959dd95b826 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,13 @@ +Importing jdelvare-hwmon based on 4.4-rc8 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard 168309855a7d1e16db751e9c647119fe2d2dc878 +HEAD is now at 168309855a7d Linux 4.4-rc8 +$ git am --patch-format=mbox ../quilt/jdelvare-hwmon/hwmon-emc2103-fix-typo-in-module_parm_desc.patch +Applying: hwmon: (emc2103) Fix typo in MODULE_PARM_DESC +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:jdelvare-hwmon/master +From ../quilt-tmp + + 69bb8a38c5a9...ef0303d2bba0 master -> jdelvare-hwmon/master (forced update) +Importing dmi based on 4.4-rc8 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8625b23ccaa9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20160111 |