diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-05 21:40:19 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-06-05 21:40:19 +1000 |
| commit | 20995ee603bf1a7a1c8668b218da94df3e02ec22 (patch) | |
| tree | 7c23a2d82e0c134e7b89b21683396227589e83bb | |
| parent | 132be85a7c38e8cd943881bb5b3f440fc7157072 (diff) | |
| download | linux-20995ee603bf1a7a1c8668b218da94df3e02ec22.tar.gz linux-20995ee603bf1a7a1c8668b218da94df3e02ec22.tar.xz | |
Add linux-next specific files for 20180605next-20180605
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 279 | ||||
| -rw-r--r-- | Next/Trees | 281 | ||||
| -rw-r--r-- | Next/merge.log | 15825 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 16388 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..22e802102ddd --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,279 @@ +Name SHA1 +---- ---- +origin 325520142b47690018d09060a874327d5e7f0709 +fixes 147a89bc71e7db40f011454a40add7ff2d10f8d8 +kbuild-current b04e217704b7f879c6b91222b066983a44a7a09f +arc-current 661e50bc853209e41a5c14a290ca4decc43cbfd1 +arm-current 92d44a42af81e850a038c38278ff4f434b2871df +arm64-fixes 82034c23fcbc2389c73d97737f61fa2dd6526413 +m68k-current b12c8a70643ffe2598c572cd206e4f68c524eb6f +powerpc-fixes faf37c44a105f3608115785f17cbbf3500f8bc71 +sparc fff75eb2a08c2ac96404a2d79685668f3cf5a7a3 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 885892fb378dc096693557ba4f2b875188619b36 +bpf 885892fb378dc096693557ba4f2b875188619b36 +ipsec 38369f54d97dd7dc50c73a2797bfeb53c2e87d2d +netfilter 6fcc02e3c2bddeaf628fde3c6a5ab3216d45691a +ipvs 312564269535892cc082bc80592150cd1f5e8ec3 +wireless-drivers ab1068d6866e28bf6427ceaea681a381e5870a4a +mac80211 312564269535892cc082bc80592150cd1f5e8ec3 +rdma-fixes a840c93ca7582bb6c88df2345a33f979b7a67874 +sound-current 7a6fc28b162bc0e48d8cef72be8226e11300317b +sound-asoc-fixes 0885ee81b84b4ec82dcce1fc14d24f5137940883 +regmap-fixes 579973b912e02d25fa02ee762eee33530c24f80b +regulator-fixes bbc7fea8e00b7e7ff457aebe587a9eb420f608d5 +spi-fixes 748d5c6905caff681693911b35302d8881f71b70 +pci-current 0cf22d6b317ce0103b7d5a47878aa5ef94240433 +driver-core.current 6da6c0db5316275015e8cc2959f12a17584aeb64 +tty.current 6da6c0db5316275015e8cc2959f12a17584aeb64 +usb.current 771c577c23bac90597c685971d7297ea00f99d11 +usb-gadget-fixes 6d08b06e67cd117f6992c46611dfb4ce267cd71e +usb-serial-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 60cc43fc888428bb2f18f08997432d426a243338 +staging.current 29dcea88779c856c7dc92040a0c01233263101d4 +char-misc.current 806e30873f0e74d9d41b0ef761bd4d3e55c7d510 +input-current e6e7e9cd8eed0e18217c899843bffbe8c7dae564 +crypto-current b268b3506d9910ca8238e92cb1dc51340574b2f2 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 89c29def6b0101fff66a3d74d0178b844f88d732 +kselftest-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes dbad41e7bb5f4b9949ff5ea1d76c20711f326308 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +mtd-fixes 9f825e74d761c13b0cfaa5f65344d64ff970e252 +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +mfd-fixes 11799564fc7eedff50801950090773928f867996 +v4l-dvb-fixes b84c8fdf8e6c318ecdb3fdbdd4953d83113283ea +reset-fixes e6914365fd280fce303a89b8a8d4529af5a2e0f9 +mips-fixes d8a9a51afaa98f319e18b95b7dc99d606a94525a +omap-fixes 41bd6adf3c5d3990d7a67639aff53d54483744fa +kvm-fixes 696ca779a928d0e93d61c38ffc3a4d8914a9b9a0 +kvms390-fixes f4a551b72358facbbe5714248dff78404272feee +hwmon-fixes 771c577c23bac90597c685971d7297ea00f99d11 +nvdimm-fixes 75bc37fefc4471e718ba8e651aa74673d4e0a9eb +btrfs-fixes e97ce3cc988823bdeb515f8fca24e5a38a38a00d +vfs-fixes b1b94fcbd39936d4e544792fb6fd13e6a5b2efc0 +dma-mapping-fixes 05e13bb57e6f181d7605f8608181c7e6fb7f591d +drivers-x86-fixes 32ffd6e8d1f6cef94bedca15dfcdebdeb590499d +samsung-krzk-fixes 60cc43fc888428bb2f18f08997432d426a243338 +pinctrl-samsung-fixes 60cc43fc888428bb2f18f08997432d426a243338 +devicetree-fixes f130307054a59ca21d2396f386be77ebd2e8ca96 +scsi-fixes c9ddf73476ff4fffb7a87bd5107a0705bf2cf64b +drm-intel-fixes 65b3bdc807ac7bd83f5b27bc2c29a3c631eed7dd +mmc-fixes 3de06d5a1f05c11c94cbb68af14dbfa7fb81d78b +rtc-fixes 60cc43fc888428bb2f18f08997432d426a243338 +drm-misc-fixes 889ad63d41eea20184b0483e7e585e5b20fb6cfe +kbuild 101c4345fe335a02ab573ab0df6bfec847081bdb +leaks 9f84a0f7f1a613335a9aaf0abd5858906752bf93 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 2550bbfd495227945e17ed1fa1c05bce4753b86b +asm-generic a71e7c44ffb7baea0c0795824afc34cc0bc1a301 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm a7f301beb1a400bd9a267687807f6561079ddd63 +arm-perf 73acc0315cd72174729141856c6607d1c91419cb +arm-soc c7953e19db50de6a3f62cb09a5712341c9b43920 +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 9999d2013e27be903e227bac2d2b4510954d959b +aspeed 6534b2d0de3693b8508375c2f01951d6eb5c69be +at91 20d3f36b0feaad5ab90ccff77e18c13939065cad +bcm2835 5c483a0c319cdc7fa46676939da59df1fa8abb5a +imx-mxs 452daaaf6021e7ff1d9d849493f8b7a740b206e4 +keystone fb5d812c3cb33d0410cb6d3beebca670b3af097d +mediatek 9378b342734132ddf6d95ed035e1124eacf762a1 +mvebu 78e5d8c26c70bf14e1b4d918e8d65209ffe12123 +omap 1b7e42c1dfe837642cfcc426776a3f98c6fb2d3e +reset d7bab65b1f57cdf2d81fc469cea6b2160a50e917 +qcom 509d20563e5d72c2b3a85cc6d05bee30006b8127 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas e800ff91fb6723f332fa837d8d11b3eab7aaad5b +rockchip 42568f346f6545c3b80fb9fe09d5d2a13766db02 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk fba97222728d6067f7d26da3136631a1cd4e44ac +sunxi e9736005439109315e474dfc59c734e724d3e071 +tegra 6de9ae597a799a1f753385a08ef0d48c6c683917 +arm64 38500be10e46c09e20b1a0e9c6cb94e1f0a86610 +clk 55913c2d33307ac11797531ebbe7c122a73cc0fd +clk-samsung e8cf870f253bdeadd4ce8a10e34655ef89ad57b1 +c6x 85fa2cc51104ee5b529ce85b12f4c8421888544f +m68k b12c8a70643ffe2598c572cd206e4f68c524eb6f +m68knommu 082f55c459845088c3fee99c3a88ee117c148218 +microblaze a7a9e2f0410ddf9ec7491fca0c91fcb4c5c30cbb +mips d1157b1074343fa3e21c083277fc4eae162ff1e4 +nds32 e5dd7e2f8a59051c01365880c9019cd7d32a5fa4 +nios2 3d9644ef9a0f6c3ca0c1bd2aea1d82e7ea0a7f24 +openrisc d56f3af9e801970d21c57621de3b42bc17eac152 +parisc-hd 8d40c754fbacc2432e53ab2b2a98b86beba251c0 +powerpc 04debf21fa1741e7d752c37550f7e4816e4067c4 +powerpc-pkey d86a4ba02fc6bea4670b2f59b208152a4a34c3c0 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 29dcea88779c856c7dc92040a0c01233263101d4 +s390 89a0c0ec0d2e3ce0ee9caa00f60c0c26ccf11c21 +sparc-next 17dec0a949153d9ac00760ba2f5b78cb583e995f +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml e40238dedb484c8a19f8257e4ef5d77d038f9ad8 +xtensa ae6063c83634cbef7f73ec8a3ab7a6adf5294716 +fscrypt e1cc40e5d42acb1d99652babb17e6a5ee4247409 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave f146e3341b738cf952ea6f09d77ced0f06016f57 +ceph 23edca864951250af845a11da86bb3ea63522ed2 +cifs 8e7360f67e75e06f3ea144354243728fb8f54c57 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs e86281e700cca8a773f9a572fa406adf2784ba5c +ext3 20b67d6401f1fca9cc92ba7bdfb99b2c5c262e8f +ext4 4f2f76f751433908364ccff82f437a57d0e6e9b7 +f2fs dfa742803fbbd8b82790c152600e09c5ad99caca +fuse 543b8f8662fe6d21f19958b666ab0051af9db21a +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs fcda3d5d221bbfc469415b0fa7dc4eb87d90d955 +nfs-anna ffbfa2ce88f169aa4b5cc90065cdc1c3c8003c27 +nfsd 28771950c592482ee86cb1c3b661688aec3c0d7d +orangefs b1116bc03c00255b7e5feaed561e8bb2fc38c0f8 +overlayfs 8acda16fcd19d423f576a3eacf44be0e086ba612 +ubifs b5094b7f135be34630e3ea8a98fa215715d0f29d +xfs 9d359ba7a91c4d133d11565567b7d8fa1167210c +file-locks 7a107c0f55a3b4c6f84a4323df5610360bde1684 +vfs 5f181c9ca1087df69a9c7ac7458d65086b358d0d +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk bb906b0d1827bcaceca1e6bb20bd573b3852a5be +pci e649a6be641e84bc9481a66bb473d1dc271685c4 +pstore e698aaf37f9fac419ac6c1867137cce83c90c80b +hid f1b6ae6701a772bba1150b5f1b8d43803f039be4 +i2c 1840b5ac656f50c5b4936d459d4468d19067e357 +dmi 5cb06cfce4a8a15bda8c7bcf8012f6ce301cad0e +hwmon-staging c9bdf291542e14dbc5b9a71aa11f995de0e54f0d +jc_docs a49d9c0ae46e149a22aefa8251d07dddd5611851 +v4l-dvb a00031c159748f322f771f3c1d5ed944cba4bd30 +v4l-dvb-next f10379aad39e9da8bc7d1822e251b5f0673067ef +fbdev dbeef4fe697bfc0c071a88fe565182ce9729a7ba +pm afb856775ab6005f057852d48d4576ac9a9834a4 +cpupower f9652d5cae04eb5e85303c087f5842d320499c65 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp 8a352fd8787cefcb19c25ca1390301f874797b9c +thermal d04d6c6d7a8d73a87719075dba91731293cc2475 +thermal-soc 6d7c70d1cd6526dc79e3d3b3faae1c40c1681168 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm da3627c30d229fea1e070e984366f80a1c4d9166 +swiotlb 4855c92dbb7b3b85c23e88ab7ca04f99b9677b41 +rdma 27d036e33237e49801780eb703ea38dad5449e12 +net-next d67b66b45a0593ebd68963c47a302ebfa4981040 +bpf-next 34ea38ca27991466a8fff849514b4181b42ae2eb +ipsec-next f03329627b46c28f0682040e7ddbfd346b78bd4e +netfilter-next f624434a0ec96ac338f10f3f7f5a2ef287dd597e +nfc-next c99f996b2ba49572d228075a5517455b8ecf6585 +ipvs-next e523452ac0e046d38fcfb7c16748ab8090bf98cd +wireless-drivers-next 76606886c9f433bb46ed9c8910cabce780b23f36 +bluetooth 1cd2fabf4bdcf95eda6a1bcebc4a0a965509da36 +mac80211-next f03329627b46c28f0682040e7ddbfd346b78bd4e +gfs2 6d1c2cf2247599c5b50df7d04e254ef0edec812c +mtd c64d4419a17cfb39a5b573f9016cd02ade4c9a64 +nand f567c71f4f91d173795a2f46d6fc493387ce084d +spi-nor 771ff17e82fac54686f149e311d4ea74a70255b1 +crypto b268b3506d9910ca8238e92cb1dc51340574b2f2 +drm 568cf2e6aa0c762f14d2d0d481a006f93c63ab7a +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel bc61ec46e83f84b7f42bd775e18567471f1aaaa6 +drm-tegra 6134534ca24f42043cacdd7108026803577f6c59 +drm-misc 069035c5db3459b9b5f12caf3bffed9a863fa5c4 +drm-msm 74d3a3a70775de356b96b5461c3a204a51496fb3 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 6e810eb508f4b937bc2a718bd4e5cd74cca55500 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 518665524272e4e993e9579bd8c4aba9d8bc7343 +etnaviv f6ffbd4fc1a1caafe2ab840993b917fba5324598 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 579973b912e02d25fa02ee762eee33530c24f80b +sound 7a6fc28b162bc0e48d8cef72be8226e11300317b +sound-asoc 0885ee81b84b4ec82dcce1fc14d24f5137940883 +modules c554b89868015d86cd330d9cc10656c3756352a5 +input 8f6a652a8c1379023775709e3db6c6f7c1bdb2ab +block 28313cee1d4f8b5f012677802e8cb6c5de21b490 +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper 1be8d9c3da01a08d1d92064abb91e4610115db11 +pcmcia c3a5307873d4a47efd4373f4a50f450a17b5d9c1 +mmc ef5332c10d4f332a2ac79e9ad5452f4e89d1815a +kgdb 2cf2f0d5b91fd1b06a6ae260462fc7945ea84add +md 5a409b4f56d50b212334f338cb8465d65550cd85 +mfd df7c3bf24f546ab0e5a23b282d34850f2b8eb0d2 +backlight cd4270258cbe9a427a6c1216e502bf18bdfc6b29 +battery c42812da1395bf57a6f7b5934b5339a3a42c2c7d +regulator bbc7fea8e00b7e7ff457aebe587a9eb420f608d5 +security d19289133b1d3d7b11ab52216ea4ac4a7c86942b +apparmor 430837708c219dfb25d148808078f15add2ea71c +integrity b5c90a7526fe39164c2204f0404ce8f8ff21e522 +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux d141136f523a3a6372d22981bdff7a8906f36fea +tpmdd 3ab2011ea368ec3433ad49e1b9e1c7b70d2e65df +watchdog 1c85ffc86a2b7b687b110b1427c7e701a453fc54 +iommu 1f568357117cafb48aafb10413cbd1567dc015b1 +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio a823b3a1b88b7233bace3eeafdbcbd76a58a65dc +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 5b71388663c0920848c0ee7de946970a2692b76d +devicetree 522811e944ed9b36806faa019faec10f9d259cca +mailbox dfbc9c5841fc455f9b284319fdc01cb0ca5e6b2e +spi 748d5c6905caff681693911b35302d8881f71b70 +tip 32dab4a92d1f62615de01195bc02eb9f14d12e0e +clockevents 6bd9549d8a7dd06087a06fa7a6df651b02d6f21e +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd eaa3a1d46cfdbf1af50311e7a22f5d38c0418b56 +irqchip 6a88c221acbaaa0460d190f99093ab8114f23c09 +ftrace a9235b544a0ae95fbd56443bdbd251358c7df4c5 +rcu 3b46bd8383acf12ad584352b3416c703a39d63a2 +kvm d7a8bea3638d78fbc6c73bda3c43efe946b352be +kvm-arm e25028c8ded011d19f9a11164807507c94febc01 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc deeb879de955f4e04be3d43c33bc311087f063bf +kvms390 2c8180e885c1b2844a24dcaf4a675972b8ce8edc +xen-tip 7f47e1c52d0c850cbd24aab763ce6bab11bdb4b2 +percpu b3a5d111994450909158929560906f2c1c6c1d85 +workqueues 197f6accacdaf9a0cf4da3c4ac8dd788633c0e38 +drivers-x86 64b824649b7787c9ac491015f16ffa4ad2ec287e +chrome-platform 79a3d60300fc28def9b58dc30d86274b47052422 +hsi 70d52ba9e57eb93cfe916f7f4d14a09750890ffd +leds 6d71021ab3b0bd6ff98270343353b03dfae5d550 +ipmi 048f7c3e352eeef50ed2c14dd89683f8a3af2f9b +driver-core 8c97a46af04b4f7c0a0dded031fef1806872e648 +usb c2ef60fea2dc7f903450926aee1f9c282ea529ca +usb-gadget 47265c067c0d129f3a0e94bc221293a780af9d78 +usb-serial 7041d9c3f01b365daa50340a5d2dce84a09ea813 +usb-chipidea-next 8bcf4c0bd7fbff64ec3fc70b5ecb0d1285e71eca +phy-next c1eb8f83845b6ca9e53c41c26a4dff57597d4969 +tty 4b4ecd9cb853c14913a3726cfcc60ccda1d2924a +char-misc b23220fe054e92f616b82450fae8cd3ab176cc60 +extcon 60cc43fc888428bb2f18f08997432d426a243338 +staging 3b93c0f4b6accb8105152900d7e414593a8b0c79 +mux 6a3d4baac84a624d7f4ae602254d022fea1eb5f2 +slave-dma c79c2212f7c9a2d1d6ac7cb57713e94c9b9aa58c +cgroup d8742e22902186e30c346b1ba881cb52942ae3e4 +scsi 7ce1b53b1b5d5326389eb04b906cd63a25eaaa37 +scsi-mkp 1b5c2cb196684f1418fe82257a1b0a8cb0aabc9d +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +libata ed058253618efe5555e95189236d1adcaeff72a7 +vhost cfcde40e8ce3aab6f61b4998945ab19985ea852c +rpmsg 1601c6923d66507ffd5c64a749507629442f3cdf +gpio 84bf021ecee4e50b63ab5e5563a5202e69cb5623 +pinctrl 86c5dd6860a60e9b69558ecfce2c4769045d110c +pinctrl-samsung 7c24e71c8a6423dfa5a7f19b253726b23af0c507 +pwm 692099cdcf275df272936b31c8409f2a5a1f7239 +userns 4b245b90065bee3231ca41a8c7f017f55a212656 +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest fa32156921daa5c175228e2cac7679d50efd6c52 +y2038 5dc0b1529d21b54aad4098874e334a52027fd16d +livepatching d7ab8e67aa52e27837aefdc0d67af93ae0931abc +coresight b66e01615a291e12765e1ff7d1ca1222f5dff392 +rtc 7e9ab519410f7b35def71b175a4d5c4c98be712c +nvdimm 36fc96be57fa14e5f567e84df4e5b1c093aa5e42 +at24 73b0d922cd5be4219eb5528a961714d740291b0e +ntb 5e083738f65d0fb292dcc737a195b532925c58bc +kspp 45888b40d2a6221d46bb69959e2600ddba71cc1f +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 5997aab0a11ea27ee8e520ecc551ed18fd3e8296 +akpm-current 06a5af82ba137c5b451e0cc017a4cbe9a2c6f72b +akpm 151e832642ed7988f7ae8c21b505ef5a970516d6 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5df04429dc8d --- /dev/null +++ b/Next/Trees @@ -0,0 +1,281 @@ +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/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.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 +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.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 +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +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 +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 +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.infradead.org/linux-mtd.git#master +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.infradead.org/linux-platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-next +uuid git git://git.infradead.org/users/hch/uuid.git#for-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/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 +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-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 +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.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 +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/sunxi/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 +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-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 +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.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-pkey git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/pkey +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-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 +sh git git://git.libc.org/linux-sh#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.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 +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.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 +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +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 +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 +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-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 +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.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/drm-misc#for-linux-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.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-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree 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.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-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-mips git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/kvm-mips.git#next +kvm-ppc 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/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-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 +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-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 +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#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 +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.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 +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 +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 +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 +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +cisco git https://github.com/daniel-walker/cisco-linux.git#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..a8de8c2e579e --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,15825 @@ +$ date -R +Tue, 05 Jun 2018 07:59:41 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 29dcea88779c Linux 4.17 +Merging origin/master (325520142b47 Merge tag '4.18-smb3-fixes' of git://git.samba.org/sfrench/cifs-2.6) +$ git merge origin/master +Updating 29dcea88779c..325520142b47 +Fast-forward + Documentation/00-INDEX | 10 - + Documentation/ABI/stable/sysfs-devices-node | 2 +- + .../ABI/testing/sysfs-kernel-mm-hugepages | 2 +- + Documentation/ABI/testing/sysfs-kernel-mm-ksm | 2 +- + Documentation/ABI/testing/sysfs-kernel-slab | 4 +- + .../{bcache.txt => admin-guide/bcache.rst} | 0 + .../{cgroup-v2.txt => admin-guide/cgroup-v2.rst} | 0 + Documentation/admin-guide/index.rst | 3 + + Documentation/admin-guide/kernel-parameters.txt | 161 +-- + Documentation/admin-guide/mm/concepts.rst | 222 ++++ + .../mm/hugetlbpage.rst} | 263 ++-- + .../mm/idle_page_tracking.rst} | 56 +- + Documentation/admin-guide/mm/index.rst | 36 + + Documentation/admin-guide/mm/ksm.rst | 189 +++ + .../admin-guide/mm/numa_memory_policy.rst | 495 +++++++ + .../{vm/pagemap.txt => admin-guide/mm/pagemap.rst} | 184 +-- + .../mm/soft-dirty.rst} | 20 +- + Documentation/admin-guide/mm/transhuge.rst | 418 ++++++ + .../mm/userfaultfd.rst} | 66 +- + Documentation/admin-guide/ramoops.rst | 2 +- + Documentation/arm/Marvell/README | 15 +- + Documentation/block/cmdline-partition.txt | 21 +- + Documentation/block/null_blk.txt | 9 +- + .../{cachetlb.txt => core-api/cachetlb.rst} | 0 + .../circular-buffers.rst} | 0 + Documentation/core-api/gfp_mask-from-fs-io.rst | 66 + + Documentation/core-api/index.rst | 3 + + Documentation/core-api/kernel-api.rst | 60 +- + Documentation/core-api/refcount-vs-atomic.rst | 2 +- + Documentation/crypto/index.rst | 1 + + Documentation/dev-tools/kasan.rst | 2 +- + Documentation/dev-tools/kselftest.rst | 5 + + .../devicetree/bindings/hwmon/gpio-fan.txt | 2 +- + .../devicetree/bindings/hwmon/ltc2990.txt | 36 + + Documentation/{clk.txt => driver-api/clk.rst} | 0 + Documentation/driver-api/device_connection.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 6 +- + Documentation/driver-api/index.rst | 2 + + Documentation/driver-api/uio-howto.rst | 3 +- + .../strncasecmp => core/cBPF-JIT}/arch-support.txt | 14 +- + .../core/{BPF-JIT => eBPF-JIT}/arch-support.txt | 8 +- + .../core/generic-idle-thread/arch-support.txt | 4 +- + .../features/core/jump-labels/arch-support.txt | 2 + + .../features/core/tracehook/arch-support.txt | 2 + + .../features/debug/KASAN/arch-support.txt | 4 +- + .../debug/gcov-profile-all/arch-support.txt | 2 + + Documentation/features/debug/kgdb/arch-support.txt | 4 +- + .../debug/kprobes-on-ftrace/arch-support.txt | 2 + + .../features/debug/kprobes/arch-support.txt | 4 +- + .../features/debug/kretprobes/arch-support.txt | 4 +- + .../features/debug/optprobes/arch-support.txt | 4 +- + .../features/debug/stackprotector/arch-support.txt | 2 + + .../features/debug/uprobes/arch-support.txt | 6 +- + .../debug/user-ret-profiler/arch-support.txt | 2 + + .../features/io/dma-api-debug/arch-support.txt | 31 - + .../features/io/dma-contiguous/arch-support.txt | 4 +- + .../features/io/sg-chain/arch-support.txt | 2 + + .../locking/cmpxchg-local/arch-support.txt | 4 +- + .../features/locking/lockdep/arch-support.txt | 4 +- + .../locking/queued-rwlocks/arch-support.txt | 10 +- + .../locking/queued-spinlocks/arch-support.txt | 8 +- + .../locking/rwsem-optimized/arch-support.txt | 10 +- + .../features/perf/kprobes-event/arch-support.txt | 6 +- + .../features/perf/perf-regs/arch-support.txt | 4 +- + .../features/perf/perf-stackdump/arch-support.txt | 4 +- + .../sched/membarrier-sync-core/arch-support.txt | 2 + + .../features/sched/numa-balancing/arch-support.txt | 6 +- + Documentation/features/scripts/features-refresh.sh | 98 ++ + .../seccomp/seccomp-filter/arch-support.txt | 6 +- + .../time/arch-tick-broadcast/arch-support.txt | 4 +- + .../features/time/clockevents/arch-support.txt | 4 +- + .../time/context-tracking/arch-support.txt | 2 + + .../features/time/irq-time-acct/arch-support.txt | 4 +- + .../time/modern-timekeeping/arch-support.txt | 2 + + .../features/time/virt-cpuacct/arch-support.txt | 2 + + .../features/vm/ELF-ASLR/arch-support.txt | 4 +- + .../features/vm/PG_uncached/arch-support.txt | 2 + + Documentation/features/vm/THP/arch-support.txt | 2 + + Documentation/features/vm/TLB/arch-support.txt | 2 + + .../features/vm/huge-vmap/arch-support.txt | 2 + + .../features/vm/ioremap_prot/arch-support.txt | 2 + + .../features/vm/numa-memblock/arch-support.txt | 4 +- + .../features/vm/pte_special/arch-support.txt | 2 + + Documentation/filesystems/Locking | 52 +- + Documentation/filesystems/proc.txt | 8 +- + Documentation/filesystems/tmpfs.txt | 5 +- + Documentation/filesystems/vfs.txt | 15 +- + Documentation/hwmon/hwmon-kernel-api.txt | 3 +- + Documentation/hwmon/ltc2990 | 24 +- + Documentation/index.rst | 3 +- + Documentation/ioctl/botching-up-ioctls.txt | 4 +- + Documentation/memory-barriers.txt | 4 +- + Documentation/process/2.Process.rst | 72 +- + Documentation/process/5.Posting.rst | 16 +- + Documentation/process/index.rst | 1 + + Documentation/process/maintainer-pgp-guide.rst | 39 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/scsi/scsi_eh.txt | 15 +- + Documentation/security/index.rst | 2 + + Documentation/sound/alsa-configuration.rst | 4 +- + Documentation/sound/soc/codec.rst | 2 +- + Documentation/sound/soc/platform.rst | 2 +- + Documentation/sysctl/vm.txt | 6 +- + Documentation/trace/coresight.txt | 103 +- + Documentation/trace/ftrace-uses.rst | 4 +- + Documentation/trace/ftrace.rst | 7 +- + .../translations/ko_KR/memory-barriers.txt | 4 +- + Documentation/vfio.txt | 5 +- + Documentation/vm/00-INDEX | 58 +- + Documentation/vm/active_mm.rst | 91 ++ + Documentation/vm/active_mm.txt | 83 -- + Documentation/vm/{balance => balance.rst} | 15 +- + .../vm/{cleancache.txt => cleancache.rst} | 105 +- + Documentation/vm/conf.py | 10 + + Documentation/vm/{frontswap.txt => frontswap.rst} | 59 +- + Documentation/vm/{highmem.txt => highmem.rst} | 87 +- + Documentation/vm/{hmm.txt => hmm.rst} | 78 +- + .../{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} | 220 ++-- + Documentation/vm/{hwpoison.txt => hwpoison.rst} | 141 +- + Documentation/vm/index.rst | 50 + + Documentation/vm/ksm.rst | 87 ++ + Documentation/vm/ksm.txt | 178 --- + Documentation/vm/mmu_notifier.rst | 99 ++ + Documentation/vm/mmu_notifier.txt | 93 -- + Documentation/vm/{numa => numa.rst} | 6 +- + Documentation/vm/numa_memory_policy.txt | 452 ------- + Documentation/vm/overcommit-accounting | 80 -- + Documentation/vm/overcommit-accounting.rst | 87 ++ + Documentation/vm/{page_frags => page_frags.rst} | 5 +- + .../vm/{page_migration => page_migration.rst} | 149 ++- + .../vm/{page_owner.txt => page_owner.rst} | 34 +- + .../{remap_file_pages.txt => remap_file_pages.rst} | 6 + + Documentation/vm/slub.rst | 361 ++++++ + Documentation/vm/slub.txt | 342 ----- + ...t_page_table_lock => split_page_table_lock.rst} | 12 +- + Documentation/vm/{swap_numa.txt => swap_numa.rst} | 55 +- + Documentation/vm/transhuge.rst | 197 +++ + Documentation/vm/transhuge.txt | 527 -------- + .../{unevictable-lru.txt => unevictable-lru.rst} | 117 +- + Documentation/vm/{z3fold.txt => z3fold.rst} | 6 +- + Documentation/vm/{zsmalloc.txt => zsmalloc.rst} | 60 +- + Documentation/vm/{zswap.txt => zswap.rst} | 71 +- + Documentation/x86/x86_64/boot-options.txt | 13 +- + LICENSES/exceptions/Linux-syscall-note | 2 +- + LICENSES/other/Apache-2.0 | 183 +++ + LICENSES/other/CC-BY-SA-4.0 | 397 ++++++ + LICENSES/other/CDDL-1.0 | 364 ++++++ + LICENSES/other/Linux-OpenIB | 26 + + LICENSES/other/X11 | 37 + + LICENSES/preferred/GPL-2.0 | 6 + + MAINTAINERS | 9 +- + arch/Kconfig | 3 - + arch/alpha/Kconfig | 16 +- + arch/alpha/include/asm/pci.h | 5 - + arch/arc/Kconfig | 11 +- + arch/arc/include/asm/Kbuild | 1 + + arch/arc/include/asm/dma-mapping.h | 21 - + arch/arc/include/asm/pci.h | 6 - + arch/arc/mm/dma.c | 162 +-- + arch/arm/Kconfig | 15 +- + arch/arm/include/asm/pci.h | 7 - + arch/arm/kernel/dma.c | 14 +- + arch/arm/kernel/setup.c | 2 +- + arch/arm/kernel/swp_emulate.c | 15 +- + arch/arm/mach-axxia/Kconfig | 1 - + arch/arm/mach-bcm/Kconfig | 1 - + arch/arm/mach-exynos/Kconfig | 1 - + arch/arm/mach-highbank/Kconfig | 1 - + arch/arm/mach-rockchip/Kconfig | 1 - + arch/arm/mach-rpc/ecard.c | 16 +- + arch/arm/mach-shmobile/Kconfig | 1 - + arch/arm/mach-tegra/Kconfig | 1 - + arch/arm/mm/Kconfig | 7 +- + arch/arm/mm/dma-mapping-nommu.c | 9 - + arch/arm/mm/dma-mapping.c | 9 - + arch/arm64/Kconfig | 22 +- + arch/arm64/include/asm/pci.h | 5 - + arch/arm64/mm/dma-mapping.c | 10 - + arch/c6x/Kconfig | 4 +- + arch/c6x/include/asm/Kbuild | 1 + + arch/c6x/include/asm/dma-mapping.h | 28 - + arch/c6x/include/asm/setup.h | 2 + + arch/c6x/kernel/Makefile | 2 +- + arch/c6x/kernel/dma.c | 149 --- + arch/c6x/mm/dma-coherent.c | 40 +- + arch/h8300/include/asm/pci.h | 2 - + arch/hexagon/Kconfig | 4 +- + arch/hexagon/kernel/dma.c | 1 - + arch/ia64/Kconfig | 25 +- + arch/ia64/hp/common/sba_iommu.c | 18 +- + arch/ia64/hp/sim/simserial.c | 15 +- + arch/ia64/include/asm/pci.h | 17 - + arch/ia64/kernel/dma-mapping.c | 10 - + arch/ia64/kernel/palinfo.c | 16 +- + arch/ia64/kernel/perfmon.c | 16 +- + arch/ia64/kernel/salinfo.c | 42 +- + arch/ia64/kernel/setup.c | 12 - + arch/ia64/sn/kernel/io_common.c | 5 - + arch/ia64/sn/kernel/sn2/prominfo_proc.c | 32 +- + arch/ia64/sn/kernel/sn2/sn_proc_fs.c | 62 +- + arch/m68k/include/asm/pci.h | 6 - + arch/m68k/kernel/setup_mm.c | 14 +- + arch/microblaze/Kconfig | 1 - + arch/microblaze/include/asm/pci.h | 6 - + arch/microblaze/kernel/dma.c | 11 - + arch/mips/Kconfig | 24 +- + arch/mips/cavium-octeon/Kconfig | 12 - + arch/mips/include/asm/pci.h | 7 - + arch/mips/loongson64/Kconfig | 15 - + arch/mips/mm/dma-default.c | 10 - + arch/mips/netlogic/Kconfig | 6 - + arch/mips/pci/ops-pmcmsp.c | 28 +- + arch/mips/sibyte/common/bus_watcher.c | 16 +- + arch/nds32/Kconfig | 3 + + arch/nds32/include/asm/Kbuild | 1 + + arch/nds32/include/asm/dma-mapping.h | 14 - + arch/nds32/kernel/dma.c | 196 +-- + arch/openrisc/kernel/dma.c | 11 - + arch/parisc/Kconfig | 8 +- + arch/parisc/include/asm/pci.h | 23 - + arch/parisc/kernel/pci-dma.c | 17 +- + arch/parisc/kernel/pdc_chassis.c | 14 +- + arch/parisc/kernel/setup.c | 5 - + arch/powerpc/Kconfig | 27 +- + arch/powerpc/include/asm/pci.h | 18 - + arch/powerpc/kernel/dma.c | 3 - + arch/powerpc/kernel/eeh.c | 14 +- + arch/powerpc/kernel/rtas-proc.c | 32 +- + arch/powerpc/platforms/Kconfig.cputype | 1 + + arch/powerpc/platforms/cell/spufs/sched.c | 14 +- + arch/riscv/Kconfig | 44 +- + arch/riscv/include/asm/dma-mapping.h | 15 + + arch/riscv/include/asm/pci.h | 3 - + arch/riscv/kernel/setup.c | 2 + + arch/s390/Kconfig | 17 +- + arch/s390/include/asm/pci.h | 2 - + arch/s390/kernel/sysinfo.c | 28 +- + arch/s390/pci/pci_dma.c | 11 - + arch/sh/Kconfig | 10 +- + arch/sh/drivers/dma/dma-api.c | 14 +- + arch/sh/include/asm/pci.h | 6 - + arch/sh/kernel/dma-nommu.c | 1 - + arch/sh/mm/consistent.c | 9 - + arch/sparc/Kconfig | 18 +- + .../sparc/include/asm}/iommu-common.h | 0 + arch/sparc/include/asm/iommu_64.h | 2 +- + arch/sparc/include/asm/pci_32.h | 4 - + arch/sparc/include/asm/pci_64.h | 6 - + arch/sparc/include/uapi/asm/jsflash.h | 40 - + arch/sparc/kernel/Makefile | 4 +- + arch/sparc/kernel/dma.c | 13 - + {lib => arch/sparc/kernel}/iommu-common.c | 5 +- + arch/sparc/kernel/iommu.c | 2 +- + arch/sparc/kernel/ioport.c | 19 +- + arch/sparc/kernel/ldc.c | 2 +- + arch/sparc/kernel/pci_sun4v.c | 2 +- + arch/um/drivers/ubd_kern.c | 16 +- + arch/unicore32/Kconfig | 5 +- + arch/unicore32/mm/Kconfig | 11 - + arch/x86/Kconfig | 36 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/dma-mapping.h | 5 +- + arch/x86/include/asm/pci.h | 3 - + arch/x86/kernel/apm_32.c | 15 +- + arch/x86/kernel/pci-dma.c | 58 +- + arch/xtensa/Kconfig | 1 - + arch/xtensa/include/asm/pci.h | 2 - + arch/xtensa/kernel/pci-dma.c | 9 - + arch/xtensa/platforms/iss/console.c | 15 +- + block/bfq-cgroup.c | 40 +- + block/bfq-iosched.c | 478 ++++--- + block/bfq-iosched.h | 30 +- + block/bio-integrity.c | 29 +- + block/bio.c | 189 +-- + block/blk-core.c | 120 +- + block/blk-integrity.c | 12 +- + block/blk-lib.c | 12 +- + block/blk-merge.c | 29 +- + block/blk-mq-debugfs.c | 1 - + block/blk-mq-sched.c | 46 +- + block/blk-mq-sched.h | 2 - + block/blk-mq-sysfs.c | 6 +- + block/blk-mq-tag.c | 14 +- + block/blk-mq.c | 340 ++--- + block/blk-mq.h | 42 +- + block/blk-stat.c | 10 +- + block/blk-stat.h | 45 +- + block/blk-sysfs.c | 80 +- + block/blk-throttle.c | 35 +- + block/blk-timeout.c | 6 +- + block/blk-wbt.c | 129 +- + block/blk-wbt.h | 55 +- + block/blk-zoned.c | 8 +- + block/blk.h | 5 +- + block/bounce.c | 52 +- + block/bsg-lib.c | 6 +- + block/bsg.c | 44 +- + block/cfq-iosched.c | 66 +- + block/deadline-iosched.c | 3 +- + block/elevator.c | 101 +- + block/genhd.c | 65 +- + block/kyber-iosched.c | 199 ++- + block/mq-deadline.c | 3 +- + block/partition-generic.c | 26 +- + block/scsi_ioctl.c | 10 +- + crypto/af_alg.c | 14 +- + crypto/algif_aead.c | 4 +- + crypto/algif_hash.c | 2 - + crypto/algif_rng.c | 1 - + crypto/algif_skcipher.c | 4 +- + crypto/proc.c | 14 +- + drivers/acpi/ac.c | 21 +- + drivers/acpi/battery.c | 121 +- + drivers/acpi/button.c | 19 +- + drivers/amba/bus.c | 5 +- + drivers/ata/libata-eh.c | 51 - + drivers/base/dma-mapping.c | 31 +- + drivers/base/platform.c | 18 +- + drivers/base/regmap/regmap-mmio.c | 3 +- + drivers/base/regmap/regmap-slimbus.c | 2 +- + drivers/bcma/main.c | 2 +- + drivers/block/DAC960.c | 60 +- + drivers/block/DAC960.h | 1 - + drivers/block/aoe/aoeblk.c | 11 +- + drivers/block/aoe/aoecmd.c | 3 +- + drivers/block/brd.c | 10 +- + drivers/block/drbd/drbd_bitmap.c | 5 +- + drivers/block/drbd/drbd_debugfs.c | 20 +- + drivers/block/drbd/drbd_int.h | 12 +- + drivers/block/drbd/drbd_main.c | 73 +- + drivers/block/drbd/drbd_proc.c | 34 +- + drivers/block/drbd/drbd_receiver.c | 6 +- + drivers/block/drbd/drbd_req.c | 4 +- + drivers/block/drbd/drbd_req.h | 2 +- + drivers/block/floppy.c | 2 +- + drivers/block/loop.c | 17 +- + drivers/block/loop.h | 1 + + drivers/block/mtip32xx/mtip32xx.c | 29 +- + drivers/block/nbd.c | 77 +- + drivers/block/null_blk.c | 36 +- + drivers/block/paride/pd.c | 2 +- + drivers/block/pktcdvd.c | 74 +- + drivers/block/ps3disk.c | 2 - + drivers/block/ps3vram.c | 17 +- + drivers/block/rbd.c | 44 +- + drivers/block/rsxx/core.c | 6 +- + drivers/block/sx8.c | 2 +- + drivers/block/virtio_blk.c | 8 +- + drivers/block/xen-blkback/blkback.c | 2 +- + drivers/block/xen-blkback/xenbus.c | 4 +- + drivers/block/xen-blkfront.c | 7 +- + drivers/cdrom/cdrom.c | 2 +- + drivers/char/apm-emulation.c | 15 +- + drivers/char/ds1620.c | 14 +- + drivers/char/efirtc.c | 15 +- + drivers/char/misc.c | 15 +- + drivers/char/nvram.c | 15 +- + drivers/char/pcmcia/synclink_cs.c | 15 +- + drivers/char/random.c | 29 +- + drivers/char/rtc.c | 19 +- + drivers/char/toshiba.c | 15 +- + drivers/connector/connector.c | 15 +- + drivers/dma/qcom/hidma_mgmt.c | 2 +- + drivers/gpu/host1x/bus.c | 9 +- + drivers/hwmon/Kconfig | 7 +- + drivers/hwmon/asus_atk0110.c | 117 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/hwmon.c | 3 + + drivers/hwmon/k10temp.c | 60 +- + drivers/hwmon/ltc2990.c | 212 ++- + drivers/hwmon/mc13783-adc.c | 60 + + drivers/ide/ide-atapi.c | 2 +- + drivers/ide/ide-cd.c | 17 +- + drivers/ide/ide-cd_ioctl.c | 2 +- + drivers/ide/ide-devsets.c | 2 +- + drivers/ide/ide-disk.c | 2 +- + drivers/ide/ide-disk_proc.c | 62 +- + drivers/ide/ide-dma.c | 2 - + drivers/ide/ide-floppy_proc.c | 17 +- + drivers/ide/ide-ioctls.c | 4 +- + drivers/ide/ide-lib.c | 26 - + drivers/ide/ide-park.c | 4 +- + drivers/ide/ide-pm.c | 5 +- + drivers/ide/ide-probe.c | 6 +- + drivers/ide/ide-proc.c | 182 +-- + drivers/ide/ide-tape.c | 21 +- + drivers/ide/ide-taskfile.c | 4 +- + drivers/input/misc/hp_sdc_rtc.c | 14 +- + drivers/iommu/Kconfig | 1 + + drivers/isdn/capi/capi.c | 30 +- + drivers/isdn/capi/capidrv.c | 15 +- + drivers/isdn/capi/kcapi.c | 3 +- + drivers/isdn/capi/kcapi_proc.c | 80 +- + drivers/isdn/gigaset/capi.c | 15 +- + drivers/isdn/hardware/avm/avmcard.h | 4 +- + drivers/isdn/hardware/avm/b1.c | 17 +- + drivers/isdn/hardware/avm/b1dma.c | 17 +- + drivers/isdn/hardware/avm/b1isa.c | 2 +- + drivers/isdn/hardware/avm/b1pci.c | 4 +- + drivers/isdn/hardware/avm/b1pcmcia.c | 2 +- + drivers/isdn/hardware/avm/c4.c | 15 +- + drivers/isdn/hardware/avm/t1isa.c | 2 +- + drivers/isdn/hardware/avm/t1pci.c | 2 +- + drivers/isdn/hardware/eicon/capimain.c | 15 +- + drivers/isdn/hardware/eicon/diva_didd.c | 17 +- + drivers/isdn/hardware/eicon/divasi.c | 17 +- + drivers/isdn/hysdn/hycapi.c | 15 +- + drivers/isdn/mISDN/socket.c | 3 +- + drivers/lightnvm/core.c | 10 +- + drivers/lightnvm/pblk-cache.c | 10 +- + drivers/lightnvm/pblk-core.c | 233 ++-- + drivers/lightnvm/pblk-gc.c | 112 +- + drivers/lightnvm/pblk-init.c | 172 ++- + drivers/lightnvm/pblk-map.c | 33 +- + drivers/lightnvm/pblk-rb.c | 48 +- + drivers/lightnvm/pblk-read.c | 146 ++- + drivers/lightnvm/pblk-recovery.c | 121 +- + drivers/lightnvm/pblk-rl.c | 29 +- + drivers/lightnvm/pblk-sysfs.c | 15 +- + drivers/lightnvm/pblk-write.c | 269 ++-- + drivers/lightnvm/pblk.h | 58 +- + drivers/macintosh/via-pmu.c | 57 +- + drivers/md/bcache/bcache.h | 14 +- + drivers/md/bcache/bset.c | 13 +- + drivers/md/bcache/bset.h | 2 +- + drivers/md/bcache/btree.c | 4 +- + drivers/md/bcache/io.c | 4 +- + drivers/md/bcache/request.c | 18 +- + drivers/md/bcache/super.c | 109 +- + drivers/md/bcache/sysfs.c | 51 +- + drivers/md/bcache/util.c | 35 - + drivers/md/bcache/util.h | 5 - + drivers/md/dm-bio-prison-v1.c | 13 +- + drivers/md/dm-bio-prison-v2.c | 13 +- + drivers/md/dm-cache-target.c | 25 +- + drivers/md/dm-core.h | 4 +- + drivers/md/dm-crypt.c | 59 +- + drivers/md/dm-integrity.c | 15 +- + drivers/md/dm-io.c | 29 +- + drivers/md/dm-kcopyd.c | 22 +- + drivers/md/dm-log-userspace-base.c | 19 +- + drivers/md/dm-mpath.c | 3 +- + drivers/md/dm-region-hash.c | 23 +- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-snap.c | 17 +- + drivers/md/dm-thin.c | 32 +- + drivers/md/dm-verity-fec.c | 55 +- + drivers/md/dm-verity-fec.h | 8 +- + drivers/md/dm-zoned-target.c | 13 +- + drivers/md/dm.c | 55 +- + drivers/md/md-faulty.c | 2 +- + drivers/md/md-linear.c | 2 +- + drivers/md/md-multipath.c | 17 +- + drivers/md/md-multipath.h | 2 +- + drivers/md/md.c | 61 +- + drivers/md/md.h | 4 +- + drivers/md/raid0.c | 5 +- + drivers/md/raid1.c | 76 +- + drivers/md/raid1.h | 6 +- + drivers/md/raid10.c | 60 +- + drivers/md/raid10.h | 6 +- + drivers/md/raid5-cache.c | 43 +- + drivers/md/raid5-ppl.c | 42 +- + drivers/md/raid5.c | 12 +- + drivers/md/raid5.h | 2 +- + drivers/media/pci/saa7164/saa7164-core.c | 14 +- + drivers/media/pci/zoran/videocodec.c | 16 +- + drivers/memstick/core/ms_block.c | 6 - + drivers/memstick/core/mspro_block.c | 6 - + drivers/message/fusion/mptbase.c | 57 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/mfd/mc13xxx-core.c | 15 +- + drivers/misc/sgi-gru/gruprocfs.c | 81 +- + drivers/mmc/core/block.c | 12 +- + drivers/mmc/core/queue.c | 5 +- + drivers/mmc/core/sdio_uart.c | 15 +- + drivers/mtd/devices/Kconfig | 1 + + drivers/mtd/devices/m25p80.c | 238 ++-- + drivers/mtd/mtd_blkdevs.c | 20 +- + drivers/mtd/mtdcore.c | 14 +- + drivers/net/bonding/bond_procfs.c | 36 +- + drivers/net/ethernet/sfc/efx.c | 5 +- + drivers/net/ethernet/sfc/falcon/efx.c | 5 +- + drivers/net/hamradio/bpqether.c | 16 +- + drivers/net/hamradio/scc.c | 17 +- + drivers/net/hamradio/yam.c | 16 +- + drivers/net/ppp/pppoe.c | 20 +- + drivers/net/ppp/pptp.c | 1 - + drivers/net/wireless/atmel/atmel.c | 15 +- + drivers/net/wireless/intersil/hostap/hostap_ap.c | 86 +- + drivers/net/wireless/intersil/hostap/hostap_hw.c | 17 +- + drivers/net/wireless/intersil/hostap/hostap_proc.c | 143 +- + drivers/net/wireless/ray_cs.c | 15 +- + drivers/nubus/proc.c | 51 +- + drivers/nvme/host/core.c | 157 ++- + drivers/nvme/host/fabrics.c | 100 +- + drivers/nvme/host/fabrics.h | 4 +- + drivers/nvme/host/fc.c | 15 +- + drivers/nvme/host/nvme.h | 9 +- + drivers/nvme/host/pci.c | 258 ++-- + drivers/nvme/host/rdma.c | 12 +- + drivers/nvme/host/trace.h | 4 +- + drivers/nvme/target/Makefile | 4 +- + drivers/nvme/target/admin-cmd.c | 143 +- + drivers/nvme/target/core.c | 128 +- + drivers/nvme/target/discovery.c | 2 - + drivers/nvme/target/fabrics-cmd.c | 4 - + drivers/nvme/target/fc.c | 2 +- + drivers/nvme/target/{io-cmd.c => io-cmd-bdev.c} | 77 +- + drivers/nvme/target/io-cmd-file.c | 304 +++++ + drivers/nvme/target/loop.c | 52 +- + drivers/nvme/target/nvmet.h | 51 +- + drivers/of/device.c | 6 +- + drivers/of/of_reserved_mem.c | 2 +- + drivers/parisc/Kconfig | 5 - + drivers/parisc/ccio-dma.c | 36 +- + drivers/parisc/sba_iommu.c | 34 +- + drivers/pci/Kconfig | 4 - + drivers/pci/bus.c | 4 +- + drivers/pci/pci-driver.c | 33 +- + drivers/pci/proc.c | 17 +- + drivers/platform/chrome/Kconfig | 11 + + drivers/platform/chrome/Makefile | 1 + + drivers/platform/chrome/chromeos_laptop.c | 315 ++++- + drivers/platform/chrome/chromeos_tbmc.c | 111 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 21 +- + drivers/platform/chrome/cros_ec_lpc.c | 13 +- + drivers/platform/chrome/cros_ec_sysfs.c | 2 - + drivers/platform/chrome/cros_ec_vbc.c | 9 +- + drivers/platform/x86/toshiba_acpi.c | 17 +- + drivers/pnp/pnpbios/proc.c | 78 +- + drivers/rtc/rtc-proc.c | 33 +- + drivers/s390/block/dasd.c | 6 +- + drivers/s390/block/dasd_proc.c | 17 +- + drivers/s390/char/tape_proc.c | 19 +- + drivers/sbus/char/Kconfig | 7 - + drivers/sbus/char/Makefile | 1 - + drivers/sbus/char/jsflash.c | 658 ---------- + drivers/scsi/gdth.c | 2 +- + drivers/scsi/libiscsi.c | 6 +- + drivers/scsi/megaraid.c | 140 +- + drivers/scsi/megaraid.h | 12 - + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mvumi.c | 2 +- + drivers/scsi/osd/osd_initiator.c | 24 +- + drivers/scsi/osst.c | 2 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_error.c | 10 +- + drivers/scsi/scsi_lib.c | 28 +- + drivers/scsi/scsi_transport_fc.c | 16 +- + drivers/scsi/scsi_transport_iscsi.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 19 +- + drivers/scsi/scsi_transport_srp.c | 4 +- + drivers/scsi/sg.c | 126 +- + drivers/scsi/st.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 6 +- + drivers/spi/Kconfig | 27 +- + drivers/spi/Makefile | 2 +- + drivers/spi/internals.h | 43 + + drivers/spi/spi-bcm-qspi.c | 162 +-- + drivers/spi/spi-bcm53xx.c | 360 ----- + drivers/spi/spi-bcm53xx.h | 73 -- + drivers/spi/spi-bcm63xx-hsspi.c | 25 +- + drivers/spi/spi-cadence.c | 6 +- + drivers/spi/spi-fsl-lpspi.c | 21 +- + drivers/spi/spi-imx.c | 22 +- + drivers/spi/spi-mem.c | 410 ++++++ + drivers/spi/spi-meson-spicc.c | 11 +- + drivers/spi/spi-mpc52xx.c | 2 +- + drivers/spi/spi-mxs.c | 48 +- + drivers/spi/spi-omap2-mcspi.c | 111 +- + drivers/spi/spi-pxa2xx-dma.c | 28 +- + drivers/spi/spi-pxa2xx.c | 257 ++-- + drivers/spi/spi-pxa2xx.h | 17 +- + drivers/spi/spi-s3c64xx.c | 160 ++- + drivers/spi/spi-sh-msiof.c | 73 +- + drivers/spi/spi-stm32.c | 2 +- + drivers/spi/spi-ti-qspi.c | 87 +- + drivers/spi/spi-zynqmp-gqspi.c | 92 +- + drivers/spi/spi.c | 145 +-- + drivers/staging/comedi/drivers/serial2002.c | 4 +- + drivers/staging/comedi/proc.c | 18 +- + drivers/staging/fwserial/fwserial.c | 15 +- + drivers/staging/ipx/af_ipx.c | 2 +- + drivers/staging/ipx/ipx_proc.c | 45 +- + drivers/staging/ncpfs/dir.c | 42 +- + drivers/staging/rtl8192u/r8192U_core.c | 67 +- + drivers/target/target_core_iblock.c | 16 +- + drivers/target/target_core_iblock.h | 2 +- + drivers/target/target_core_pscsi.c | 3 +- + drivers/tty/amiserial.c | 15 +- + drivers/tty/cyclades.c | 15 +- + drivers/tty/serial/serial_core.c | 15 +- + drivers/tty/synclink.c | 15 +- + drivers/tty/synclink_gt.c | 15 +- + drivers/tty/synclinkmp.c | 15 +- + drivers/tty/tty_ldisc.c | 15 +- + drivers/usb/gadget/udc/at91_udc.c | 16 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 18 +- + drivers/usb/gadget/udc/goku_udc.c | 18 +- + drivers/usb/gadget/udc/omap_udc.c | 15 +- + drivers/usb/serial/usb-serial.c | 15 +- + drivers/vfio/virqfd.c | 2 +- + drivers/vhost/vhost.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 15 +- + drivers/video/fbdev/via/viafbdev.c | 17 +- + drivers/w1/w1_io.c | 1 + + drivers/zorro/proc.c | 17 +- + fs/9p/vfs_inode.c | 35 +- + fs/Kconfig | 2 +- + fs/adfs/dir.c | 24 +- + fs/affs/super.c | 1 + + fs/afs/proc.c | 134 +- + fs/aio.c | 731 +++++++---- + fs/bfs/dir.c | 43 +- + fs/block_dev.c | 24 +- + fs/btrfs/btrfs_inode.h | 22 +- + fs/btrfs/compression.c | 7 +- + fs/btrfs/compression.h | 2 + + fs/btrfs/ctree.c | 123 +- + fs/btrfs/ctree.h | 76 +- + fs/btrfs/delayed-inode.c | 9 +- + fs/btrfs/delayed-ref.c | 275 ++-- + fs/btrfs/delayed-ref.h | 5 +- + fs/btrfs/dev-replace.c | 150 ++- + fs/btrfs/disk-io.c | 391 +++--- + fs/btrfs/extent-tree.c | 253 ++-- + fs/btrfs/extent_io.c | 87 +- + fs/btrfs/extent_io.h | 20 +- + fs/btrfs/extent_map.c | 6 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/free-space-cache.c | 6 +- + fs/btrfs/free-space-tree.c | 192 ++- + fs/btrfs/free-space-tree.h | 8 - + fs/btrfs/inode.c | 1371 ++++++++++---------- + fs/btrfs/ioctl.c | 1210 +++++++++++------ + fs/btrfs/locking.c | 34 +- + fs/btrfs/lzo.c | 76 +- + fs/btrfs/ordered-data.c | 14 +- + fs/btrfs/print-tree.c | 21 + + fs/btrfs/qgroup.c | 69 +- + fs/btrfs/raid56.c | 38 +- + fs/btrfs/relocation.c | 8 +- + fs/btrfs/scrub.c | 1 + + fs/btrfs/send.c | 46 +- + fs/btrfs/super.c | 7 +- + fs/btrfs/sysfs.c | 52 +- + fs/btrfs/sysfs.h | 4 +- + fs/btrfs/tests/btrfs-tests.c | 4 +- + fs/btrfs/tests/btrfs-tests.h | 6 +- + fs/btrfs/tests/extent-buffer-tests.c | 56 +- + fs/btrfs/tests/extent-io-tests.c | 75 +- + fs/btrfs/tests/extent-map-tests.c | 90 +- + fs/btrfs/tests/free-space-tests.c | 177 +-- + fs/btrfs/tests/free-space-tree-tests.c | 129 +- + fs/btrfs/tests/inode-tests.c | 312 ++--- + fs/btrfs/tests/qgroup-tests.c | 100 +- + fs/btrfs/transaction.c | 15 +- + fs/btrfs/transaction.h | 1 - + fs/btrfs/tree-log.c | 28 +- + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/volumes.c | 506 ++++---- + fs/btrfs/volumes.h | 24 +- + fs/cachefiles/proc.c | 19 +- + fs/cifs/Makefile | 7 +- + fs/cifs/cifs_debug.c | 58 +- + fs/cifs/cifs_debug.h | 2 +- + fs/cifs/cifs_fs_sb.h | 1 + + fs/cifs/cifsfs.c | 48 +- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 47 +- + fs/cifs/cifsproto.h | 16 +- + fs/cifs/cifssmb.c | 23 +- + fs/cifs/connect.c | 93 +- + fs/cifs/dir.c | 40 +- + fs/cifs/file.c | 75 +- + fs/cifs/inode.c | 13 +- + fs/cifs/misc.c | 7 +- + fs/cifs/netmisc.c | 2 +- + fs/cifs/readdir.c | 6 +- + fs/cifs/smb2glob.h | 5 - + fs/cifs/smb2inode.c | 43 +- + fs/cifs/smb2maperror.c | 11 +- + fs/cifs/smb2misc.c | 126 +- + fs/cifs/smb2ops.c | 314 +++-- + fs/cifs/smb2pdu.c | 340 +++-- + fs/cifs/smb2pdu.h | 84 +- + fs/cifs/smb2proto.h | 9 +- + fs/cifs/smb2transport.c | 10 +- + fs/cifs/trace.c | 18 + + fs/cifs/trace.h | 429 ++++++ + fs/cifs/transport.c | 4 +- + fs/cramfs/inode.c | 5 +- + fs/dax.c | 2 +- + fs/dcache.c | 205 ++- + fs/direct-io.c | 4 +- + fs/dlm/lowcomms.c | 16 +- + fs/eventfd.c | 15 +- + fs/eventpoll.c | 5 +- + fs/exofs/ore.c | 10 +- + fs/exofs/super.c | 2 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/mballoc.c | 29 +- + fs/ext4/sysfs.c | 49 +- + fs/f2fs/sysfs.c | 29 +- + fs/fat/namei_msdos.c | 4 - + fs/fat/namei_vfat.c | 13 +- + fs/fcntl.c | 15 +- + fs/filesystems.c | 14 +- + fs/freevxfs/vxfs_lookup.c | 8 +- + fs/fscache/histogram.c | 17 +- + fs/fscache/internal.h | 5 +- + fs/fscache/proc.c | 8 +- + fs/fscache/stats.c | 17 +- + fs/gfs2/aops.c | 69 +- + fs/gfs2/bmap.c | 428 +++--- + fs/gfs2/bmap.h | 6 +- + fs/gfs2/file.c | 6 +- + fs/gfs2/incore.h | 3 +- + fs/gfs2/inode.c | 4 - + fs/gfs2/log.h | 7 +- + fs/gfs2/ops_fstype.c | 19 - + fs/gfs2/quota.c | 5 +- + fs/gfs2/rgrp.c | 2 +- + fs/gfs2/trans.c | 27 +- + fs/hfs/dir.c | 20 +- + fs/hfs/inode.c | 4 +- + fs/hfsplus/dir.c | 3 +- + fs/jfs/jfs_debug.c | 43 +- + fs/jfs/jfs_debug.h | 10 +- + fs/jfs/jfs_logmgr.c | 14 +- + fs/jfs/jfs_metapage.c | 14 +- + fs/jfs/jfs_txnmgr.c | 28 +- + fs/jfs/jfs_xtree.c | 14 +- + fs/locks.c | 16 +- + fs/minix/namei.c | 8 +- + fs/namei.c | 12 +- + fs/nfs/client.c | 43 +- + fs/nfsd/blocklayout.c | 2 +- + fs/omfs/dir.c | 7 +- + fs/openpromfs/inode.c | 3 +- + fs/orangefs/namei.c | 64 +- + fs/pipe.c | 22 +- + fs/proc/array.c | 23 +- + fs/proc/base.c | 154 +-- + fs/proc/cmdline.c | 14 +- + fs/proc/consoles.c | 14 +- + fs/proc/devices.c | 14 +- + fs/proc/fd.c | 138 +- + fs/proc/generic.c | 151 ++- + fs/proc/internal.h | 17 +- + fs/proc/interrupts.c | 14 +- + fs/proc/loadavg.c | 14 +- + fs/proc/meminfo.c | 14 +- + fs/proc/namespaces.c | 24 +- + fs/proc/nommu.c | 14 +- + fs/proc/proc_net.c | 104 +- + fs/proc/proc_sysctl.c | 15 +- + fs/proc/proc_tty.c | 22 +- + fs/proc/self.c | 4 +- + fs/proc/softirqs.c | 14 +- + fs/proc/task_mmu.c | 4 +- + fs/proc/thread_self.c | 4 +- + fs/proc/uptime.c | 14 +- + fs/proc/version.c | 14 +- + fs/qnx4/namei.c | 8 +- + fs/qnx6/namei.c | 8 +- + fs/read_write.c | 6 +- + fs/reiserfs/procfs.c | 16 +- + fs/romfs/super.c | 36 +- + fs/select.c | 85 +- + fs/super.c | 2 +- + fs/sysv/namei.c | 9 +- + fs/timerfd.c | 22 +- + fs/ubifs/dir.c | 43 +- + fs/xattr.c | 4 +- + fs/xfs/xfs_aops.c | 2 +- + fs/xfs/xfs_aops.h | 2 +- + fs/xfs/xfs_iops.c | 16 +- + fs/xfs/xfs_stats.c | 33 +- + fs/xfs/xfs_super.c | 11 +- + include/asm-generic/dma-mapping.h | 9 + + include/asm-generic/pci.h | 8 - + include/crypto/if_alg.h | 3 +- + include/linux/aio.h | 2 - + include/linux/atalk.h | 7 +- + include/linux/bio.h | 42 +- + include/linux/blk-mq.h | 3 +- + include/linux/blk_types.h | 51 +- + include/linux/blkdev.h | 110 +- + include/linux/bsg-lib.h | 3 +- + include/linux/bsg.h | 6 +- + include/linux/compat.h | 7 + + include/linux/device.h | 11 +- + include/linux/dma-debug.h | 6 - + include/linux/dma-direct.h | 7 +- + include/linux/dma-mapping.h | 19 +- + include/linux/dma-noncoherent.h | 47 + + include/linux/elevator.h | 2 - + include/linux/fs.h | 8 +- + include/linux/hmm.h | 2 +- + include/linux/ide.h | 8 +- + include/linux/iommu-helper.h | 13 +- + include/linux/isdn/capilli.h | 2 +- + include/linux/libata.h | 2 - + include/linux/lightnvm.h | 2 +- + include/linux/mempool.h | 34 + + include/linux/memremap.h | 4 +- + include/linux/mfd/cros_ec.h | 2 + + include/linux/mfd/mc13xxx.h | 2 + + include/linux/mmu_notifier.h | 2 +- + include/linux/net.h | 1 + + include/linux/nvme.h | 16 +- + include/linux/of_device.h | 8 +- + include/linux/pci.h | 2 +- + include/linux/pktcdvd.h | 2 +- + include/linux/platform_device.h | 2 + + include/linux/poll.h | 14 +- + include/linux/proc_fs.h | 39 + + include/linux/regmap.h | 19 +- + include/linux/sbitmap.h | 36 + + include/linux/sched/mm.h | 42 +- + include/linux/seq_file_net.h | 19 +- + include/linux/skbuff.h | 3 +- + include/linux/spi/spi-mem.h | 249 ++++ + include/linux/spi/spi.h | 60 +- + include/linux/sunrpc/rpc_pipe_fs.h | 2 - + include/linux/swait.h | 14 +- + include/linux/swap.h | 2 +- + include/linux/syscalls.h | 6 + + include/linux/tty.h | 3 +- + include/linux/tty_driver.h | 2 +- + include/linux/xattr.h | 1 - + include/net/ax25.h | 5 +- + include/net/bluetooth/bluetooth.h | 2 +- + include/net/busy_poll.h | 15 + + include/net/ip6_fib.h | 10 +- + include/net/ip_vs.h | 12 - + include/net/iucv/af_iucv.h | 2 - + include/net/netrom.h | 5 +- + include/net/phonet/pn_dev.h | 4 +- + include/net/ping.h | 11 - + include/net/raw.h | 4 - + include/net/rose.h | 6 +- + include/net/sctp/sctp.h | 3 +- + include/net/sock.h | 2 - + include/net/tcp.h | 14 +- + include/net/udp.h | 22 +- + include/scsi/osd_initiator.h | 6 +- + include/scsi/scsi_host.h | 2 +- + include/trace/events/btrfs.h | 323 +++-- + include/uapi/asm-generic/unistd.h | 4 +- + include/uapi/linux/aio_abi.h | 12 +- + include/uapi/linux/btrfs.h | 97 ++ + include/uapi/linux/types.h | 4 - + kernel/cgroup/cgroup-internal.h | 2 +- + kernel/cgroup/cgroup-v1.c | 14 +- + kernel/cgroup/cgroup.c | 2 +- + kernel/dma.c | 14 +- + kernel/exec_domain.c | 14 +- + kernel/irq/proc.c | 82 +- + kernel/locking/lockdep_proc.c | 45 +- + kernel/power/swap.c | 14 +- + kernel/resource.c | 43 +- + kernel/sched/debug.c | 28 +- + kernel/sched/stats.c | 15 +- + kernel/sys_ni.c | 2 + + kernel/time/timer_list.c | 16 +- + lib/Kconfig | 43 +- + lib/Kconfig.debug | 19 +- + lib/Makefile | 3 +- + lib/dma-debug.c | 65 +- + lib/dma-direct.c | 29 +- + lib/dma-noncoherent.c | 102 ++ + lib/iommu-helper.c | 14 +- + lib/sbitmap.c | 113 +- + lib/swiotlb.c | 11 +- + mm/Kconfig | 9 +- + mm/backing-dev.c | 18 +- + mm/cleancache.c | 2 +- + mm/frontswap.c | 2 +- + mm/hmm.c | 2 +- + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 4 +- + mm/ksm.c | 23 +- + mm/memcontrol.c | 2 +- + mm/mempool.c | 108 +- + mm/mmap.c | 2 +- + mm/rmap.c | 6 +- + mm/util.c | 2 +- + mm/vmalloc.c | 21 +- + mm/vmstat.c | 56 +- + net/8021q/vlanproc.c | 39 +- + net/9p/trans_fd.c | 18 +- + net/appletalk/aarp.c | 20 +- + net/appletalk/atalk_proc.c | 51 +- + net/appletalk/ddp.c | 2 +- + net/atm/br2684.c | 14 +- + net/atm/clip.c | 17 +- + net/atm/common.c | 11 +- + net/atm/common.h | 2 +- + net/atm/lec.c | 15 +- + net/atm/proc.c | 131 +- + net/atm/pvc.c | 2 +- + net/atm/svc.c | 2 +- + net/ax25/af_ax25.c | 23 +- + net/ax25/ax25_route.c | 15 +- + net/ax25/ax25_uid.c | 15 +- + net/bluetooth/af_bluetooth.c | 47 +- + net/bluetooth/bnep/sock.c | 1 - + net/bluetooth/cmtp/capi.c | 14 +- + net/bluetooth/cmtp/sock.c | 1 - + net/bluetooth/hci_sock.c | 2 +- + net/bluetooth/hidp/sock.c | 1 - + net/bluetooth/l2cap_sock.c | 2 +- + net/bluetooth/rfcomm/sock.c | 2 +- + net/bluetooth/sco.c | 2 +- + net/caif/caif_socket.c | 12 +- + net/can/bcm.c | 18 +- + net/can/proc.c | 127 +- + net/can/raw.c | 2 +- + net/core/datagram.c | 13 +- + net/core/dev.c | 20 +- + net/core/neighbour.c | 31 +- + net/core/net-procfs.c | 65 +- + net/core/sock.c | 22 +- + net/dccp/dccp.h | 3 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/dccp/proto.c | 13 +- + net/decnet/af_decnet.c | 23 +- + net/decnet/dn_dev.c | 15 +- + net/decnet/dn_neigh.c | 18 +- + net/decnet/dn_route.c | 19 +- + net/ieee802154/socket.c | 4 +- + net/ipv4/af_inet.c | 8 +- + net/ipv4/arp.c | 17 +- + net/ipv4/fib_trie.c | 48 +- + net/ipv4/igmp.c | 33 +- + net/ipv4/ipconfig.c | 14 +- + net/ipv4/ipmr.c | 32 +- + net/ipv4/ping.c | 52 +- + net/ipv4/proc.c | 48 +- + net/ipv4/raw.c | 45 +- + net/ipv4/route.c | 15 +- + net/ipv4/tcp.c | 23 +- + net/ipv4/tcp_ipv4.c | 82 +- + net/ipv4/udp.c | 104 +- + net/ipv4/udplite.c | 21 +- + net/ipv6/addrconf.c | 16 +- + net/ipv6/af_inet6.c | 4 +- + net/ipv6/anycast.c | 16 +- + net/ipv6/ip6_fib.c | 18 +- + net/ipv6/ip6_flowlabel.c | 42 +- + net/ipv6/ip6mr.c | 32 +- + net/ipv6/mcast.c | 34 +- + net/ipv6/ping.c | 23 +- + net/ipv6/proc.c | 48 +- + net/ipv6/raw.c | 19 +- + net/ipv6/route.c | 26 +- + net/ipv6/tcp_ipv6.c | 22 +- + net/ipv6/udp.c | 23 +- + net/ipv6/udplite.c | 22 +- + net/iucv/af_iucv.c | 7 +- + net/kcm/kcmproc.c | 83 +- + net/kcm/kcmsock.c | 10 +- + net/key/af_key.c | 18 +- + net/l2tp/l2tp_ip.c | 2 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/l2tp/l2tp_ppp.c | 24 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_proc.c | 28 +- + net/netfilter/ipvs/ip_vs_app.c | 16 +- + net/netfilter/ipvs/ip_vs_conn.c | 35 +- + net/netfilter/ipvs/ip_vs_ctl.c | 47 +- + net/netfilter/nf_conntrack_expect.c | 17 +- + net/netfilter/nf_conntrack_standalone.c | 33 +- + net/netfilter/nf_log.c | 19 +- + net/netfilter/nf_synproxy_core.c | 17 +- + net/netfilter/nfnetlink_log.c | 18 +- + net/netfilter/nfnetlink_queue.c | 18 +- + net/netfilter/x_tables.c | 95 +- + net/netfilter/xt_hashlimit.c | 92 +- + net/netlink/af_netlink.c | 20 +- + net/netrom/af_netrom.c | 20 +- + net/netrom/nr_route.c | 29 +- + net/nfc/llcp_sock.c | 9 +- + net/nfc/rawsock.c | 4 +- + net/packet/af_packet.c | 26 +- + net/phonet/pn_dev.c | 6 +- + net/phonet/socket.c | 39 +- + net/qrtr/qrtr.c | 2 +- + net/rose/af_rose.c | 28 +- + net/rose/rose_route.c | 44 +- + net/rxrpc/af_rxrpc.c | 10 +- + net/rxrpc/ar-internal.h | 4 +- + net/rxrpc/net_ns.c | 7 +- + net/rxrpc/proc.c | 31 +- + net/sched/sch_api.c | 14 +- + net/sctp/ipv6.c | 2 +- + net/sctp/objcnt.c | 16 +- + net/sctp/proc.c | 71 +- + net/sctp/protocol.c | 2 +- + net/sctp/socket.c | 4 +- + net/socket.c | 55 +- + net/sunrpc/rpc_pipe.c | 16 - + net/tipc/socket.c | 14 +- + net/unix/af_unix.c | 47 +- + net/vmw_vsock/af_vsock.c | 19 +- + net/wireless/wext-proc.c | 17 +- + net/x25/af_x25.c | 2 +- + net/x25/x25_proc.c | 48 +- + net/xfrm/xfrm_proc.c | 16 +- + scripts/documentation-file-ref-check | 125 +- + scripts/spdxcheck.py | 284 ++++ + security/keys/proc.c | 34 +- + security/selinux/hooks.c | 7 +- + tools/virtio/linux/dma-mapping.h | 2 - + virt/kvm/eventfd.c | 2 +- + 1020 files changed, 20223 insertions(+), 20721 deletions(-) + rename Documentation/{bcache.txt => admin-guide/bcache.rst} (100%) + rename Documentation/{cgroup-v2.txt => admin-guide/cgroup-v2.rst} (100%) + create mode 100644 Documentation/admin-guide/mm/concepts.rst + rename Documentation/{vm/hugetlbpage.txt => admin-guide/mm/hugetlbpage.rst} (61%) + rename Documentation/{vm/idle_page_tracking.txt => admin-guide/mm/idle_page_tracking.rst} (72%) + create mode 100644 Documentation/admin-guide/mm/index.rst + create mode 100644 Documentation/admin-guide/mm/ksm.rst + create mode 100644 Documentation/admin-guide/mm/numa_memory_policy.rst + rename Documentation/{vm/pagemap.txt => admin-guide/mm/pagemap.rst} (53%) + rename Documentation/{vm/soft-dirty.txt => admin-guide/mm/soft-dirty.rst} (67%) + create mode 100644 Documentation/admin-guide/mm/transhuge.rst + rename Documentation/{vm/userfaultfd.txt => admin-guide/mm/userfaultfd.rst} (89%) + rename Documentation/{cachetlb.txt => core-api/cachetlb.rst} (100%) + rename Documentation/{circular-buffers.txt => core-api/circular-buffers.rst} (100%) + create mode 100644 Documentation/core-api/gfp_mask-from-fs-io.rst + create mode 100644 Documentation/devicetree/bindings/hwmon/ltc2990.txt + rename Documentation/{clk.txt => driver-api/clk.rst} (100%) + rename Documentation/features/{lib/strncasecmp => core/cBPF-JIT}/arch-support.txt (70%) + rename Documentation/features/core/{BPF-JIT => eBPF-JIT}/arch-support.txt (79%) + delete mode 100644 Documentation/features/io/dma-api-debug/arch-support.txt + create mode 100755 Documentation/features/scripts/features-refresh.sh + create mode 100644 Documentation/vm/active_mm.rst + delete mode 100644 Documentation/vm/active_mm.txt + rename Documentation/vm/{balance => balance.rst} (96%) + rename Documentation/vm/{cleancache.txt => cleancache.rst} (83%) + create mode 100644 Documentation/vm/conf.py + rename Documentation/vm/{frontswap.txt => frontswap.rst} (91%) + rename Documentation/vm/{highmem.txt => highmem.rst} (64%) + rename Documentation/vm/{hmm.txt => hmm.rst} (91%) + rename Documentation/vm/{hugetlbfs_reserv.txt => hugetlbfs_reserv.rst} (86%) + rename Documentation/vm/{hwpoison.txt => hwpoison.rst} (60%) + create mode 100644 Documentation/vm/index.rst + create mode 100644 Documentation/vm/ksm.rst + delete mode 100644 Documentation/vm/ksm.txt + create mode 100644 Documentation/vm/mmu_notifier.rst + delete mode 100644 Documentation/vm/mmu_notifier.txt + rename Documentation/vm/{numa => numa.rst} (98%) + delete mode 100644 Documentation/vm/numa_memory_policy.txt + delete mode 100644 Documentation/vm/overcommit-accounting + create mode 100644 Documentation/vm/overcommit-accounting.rst + rename Documentation/vm/{page_frags => page_frags.rst} (97%) + rename Documentation/vm/{page_migration => page_migration.rst} (63%) + rename Documentation/vm/{page_owner.txt => page_owner.rst} (86%) + rename Documentation/vm/{remap_file_pages.txt => remap_file_pages.rst} (92%) + create mode 100644 Documentation/vm/slub.rst + delete mode 100644 Documentation/vm/slub.txt + rename Documentation/vm/{split_page_table_lock => split_page_table_lock.rst} (95%) + rename Documentation/vm/{swap_numa.txt => swap_numa.rst} (74%) + create mode 100644 Documentation/vm/transhuge.rst + delete mode 100644 Documentation/vm/transhuge.txt + rename Documentation/vm/{unevictable-lru.txt => unevictable-lru.rst} (92%) + rename Documentation/vm/{z3fold.txt => z3fold.rst} (97%) + rename Documentation/vm/{zsmalloc.txt => zsmalloc.rst} (71%) + rename Documentation/vm/{zswap.txt => zswap.rst} (74%) + create mode 100644 LICENSES/other/Apache-2.0 + create mode 100644 LICENSES/other/CC-BY-SA-4.0 + create mode 100644 LICENSES/other/CDDL-1.0 + create mode 100644 LICENSES/other/Linux-OpenIB + create mode 100644 LICENSES/other/X11 + delete mode 100644 arch/arc/include/asm/dma-mapping.h + delete mode 100644 arch/c6x/include/asm/dma-mapping.h + delete mode 100644 arch/c6x/kernel/dma.c + delete mode 100644 arch/nds32/include/asm/dma-mapping.h + create mode 100644 arch/riscv/include/asm/dma-mapping.h + rename {include/linux => arch/sparc/include/asm}/iommu-common.h (100%) + delete mode 100644 arch/sparc/include/uapi/asm/jsflash.h + delete mode 100644 arch/sparc/kernel/dma.c + rename {lib => arch/sparc/kernel}/iommu-common.c (98%) + rename drivers/nvme/target/{io-cmd.c => io-cmd-bdev.c} (76%) + create mode 100644 drivers/nvme/target/io-cmd-file.c + create mode 100644 drivers/platform/chrome/chromeos_tbmc.c + delete mode 100644 drivers/sbus/char/jsflash.c + create mode 100644 drivers/spi/internals.h + delete mode 100644 drivers/spi/spi-bcm53xx.c + delete mode 100644 drivers/spi/spi-bcm53xx.h + create mode 100644 drivers/spi/spi-mem.c + create mode 100644 fs/cifs/trace.c + create mode 100644 fs/cifs/trace.h + create mode 100644 include/linux/dma-noncoherent.h + create mode 100644 include/linux/spi/spi-mem.h + create mode 100644 lib/dma-noncoherent.c + create mode 100755 scripts/spdxcheck.py +Merging fixes/master (147a89bc71e7 Merge tag 'kconfig-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild) +$ git merge fixes/master +Already up to date. +Merging kbuild-current/fixes (b04e217704b7 Linux 4.17-rc7) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (661e50bc8532 Linux 4.16-rc4) +$ git merge arc-current/for-curr +Already up to date. +Merging arm-current/fixes (92d44a42af81 ARM: fix kill( ,SIGFPE) breakage) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (82034c23fcbc arm64: Make sure permission updates happen for pmd/pud) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k-current/for-linus +Merge made by the 'recursive' strategy. + arch/m68k/68000/timers.c | 4 +++- + arch/m68k/apollo/config.c | 8 +++++--- + arch/m68k/configs/amiga_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/apollo_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/atari_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/bvme6000_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/hp300_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/mac_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/multi_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/mvme147_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/mvme16x_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/q40_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/sun3_defconfig | 20 ++++++++++++-------- + arch/m68k/configs/sun3x_defconfig | 20 ++++++++++++-------- + arch/m68k/include/asm/delay.h | 11 ++++++++--- + arch/m68k/include/asm/uaccess_mm.h | 16 +++++++++------- + arch/m68k/kernel/dma.c | 10 ++++++++++ + arch/m68k/kernel/signal.c | 23 ++++++++++++----------- + arch/m68k/kernel/time.c | 25 ++++++++++++++----------- + arch/m68k/mac/config.c | 2 +- + arch/m68k/mm/kmap.c | 3 ++- + arch/m68k/mvme147/config.c | 4 +++- + arch/m68k/mvme16x/config.c | 4 +++- + arch/m68k/sun3/intersil.c | 8 +++++--- + arch/m68k/sun3x/time.c | 8 +++++--- + drivers/zorro/zorro.c | 3 +++ + 26 files changed, 227 insertions(+), 142 deletions(-) +Merging powerpc-fixes/fixes (faf37c44a105 powerpc/64s: Clear PCR on boot) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (fff75eb2a08c Merge tag 'errseq-v4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (885892fb378d mlx4_core: restore optimal ICM memory allocation) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/ethernet/mellanox/mlx4/icm.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging bpf/master (885892fb378d mlx4_core: restore optimal ICM memory allocation) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (38369f54d97d xfrm Fix potential error pointer dereference in xfrm_bundle_create.) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (6fcc02e3c2bd ipvs: fix check on xmit to non-local addresses) +$ git merge netfilter/master +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging include/net/ip_vs.h +Merge made by the 'recursive' strategy. + include/net/ip_vs.h | 30 ++++++++++++++++++++++++++++++ + net/bridge/netfilter/nft_reject_bridge.c | 2 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 ++++ + net/netfilter/ipvs/ip_vs_xmit.c | 2 +- + net/netfilter/nf_tables_api.c | 11 ++++++----- + net/netfilter/xt_CT.c | 10 ++++++++++ + 6 files changed, 52 insertions(+), 7 deletions(-) +Merging ipvs/master (312564269535 net: netsec: reduce DMA mask to 40 bits) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (ab1068d6866e iwlwifi: pcie: compare with number of IRQs requested for, not number of CPUs) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (312564269535 net: netsec: reduce DMA mask to 40 bits) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (a840c93ca758 IB/core: Fix error code for invalid GID entry) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (7a6fc28b162b ALSA: usb-audio: remove redundant check on err) +$ git merge sound-current/for-linus +Removing sound/pci/hda/local.h +Auto-merging MAINTAINERS +Auto-merging Documentation/sound/alsa-configuration.rst +Merge made by the 'recursive' strategy. + Documentation/sound/alsa-configuration.rst | 7 + + Documentation/sound/hd-audio/models.rst | 2 + + MAINTAINERS | 7 + + include/linux/usb/audio-v2.h | 7 + + include/linux/usb/audio-v3.h | 40 + + include/sound/core.h | 2 +- + include/sound/emu10k1.h | 4 +- + include/sound/hdaudio.h | 5 + + include/sound/memalloc.h | 2 - + include/uapi/linux/usb/audio.h | 19 +- + include/uapi/sound/tlv.h | 16 + + sound/Kconfig | 2 + + sound/Makefile | 2 +- + sound/core/compress_offload.c | 2 +- + sound/core/device.c | 9 + + sound/core/info.c | 6 +- + sound/core/init.c | 4 +- + sound/core/oss/mixer_oss.c | 2 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm.c | 10 +- + sound/core/pcm_compat.c | 10 +- + sound/core/pcm_lib.c | 15 +- + sound/core/pcm_local.h | 18 + + sound/core/pcm_memory.c | 2 +- + sound/core/pcm_native.c | 261 +-- + sound/core/seq/seq_ports.c | 2 +- + sound/core/seq/seq_timer.c | 4 +- + sound/core/timer.c | 48 +- + sound/core/vmaster.c | 16 +- + sound/drivers/aloop.c | 19 +- + sound/drivers/dummy.c | 2 +- + sound/drivers/mts64.c | 6 +- + sound/drivers/opl4/opl4_proc.c | 2 +- + sound/drivers/portman2x4.c | 6 +- + sound/firewire/bebob/bebob_proc.c | 2 +- + sound/firewire/dice/Makefile | 3 +- + sound/firewire/dice/dice-alesis.c | 52 + + sound/firewire/dice/dice-extension.c | 172 ++ + sound/firewire/dice/dice-interface.h | 9 +- + sound/firewire/dice/dice-midi.c | 23 +- + sound/firewire/dice/dice-mytek.c | 46 + + sound/firewire/dice/dice-pcm.c | 233 ++- + sound/firewire/dice/dice-proc.c | 80 +- + sound/firewire/dice/dice-stream.c | 283 ++- + sound/firewire/dice/dice-tcelectronic.c | 104 + + sound/firewire/dice/dice-transaction.c | 49 +- + sound/firewire/dice/dice.c | 156 +- + sound/firewire/dice/dice.h | 25 +- + sound/firewire/digi00x/digi00x-proc.c | 2 +- + sound/firewire/fireface/ff-proc.c | 2 +- + sound/firewire/fireworks/fireworks_proc.c | 2 +- + sound/firewire/isight.c | 10 +- + sound/firewire/motu/motu-proc.c | 2 +- + sound/firewire/oxfw/oxfw-proc.c | 2 +- + sound/firewire/oxfw/oxfw.c | 8 +- + sound/firewire/tascam/tascam-proc.c | 2 +- + sound/hda/hdac_regmap.c | 4 +- + sound/isa/cmi8328.c | 4 +- + sound/isa/msnd/msnd_pinnacle.c | 32 +- + sound/isa/sc6000.c | 4 +- + sound/pci/ac97/ac97_proc.c | 4 +- + sound/pci/ad1889.c | 4 +- + sound/pci/asihpi/asihpi.c | 12 +- + sound/pci/asihpi/hpioctl.c | 4 +- + sound/pci/ca0106/ca0106_proc.c | 6 +- + sound/pci/cmipci.c | 2 +- + sound/pci/cs46xx/cs46xx.c | 2 +- + sound/pci/cs46xx/cs46xx_lib.c | 2 +- + sound/pci/cs46xx/dsp_spos.c | 14 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 2 +- + sound/pci/ctxfi/cttimer.c | 2 +- + sound/pci/ctxfi/xfi.c | 4 +- + sound/pci/echoaudio/echoaudio.c | 2 +- + sound/pci/echoaudio/echoaudio.h | 6 - + sound/pci/emu10k1/emu10k1x.c | 2 +- + sound/pci/emu10k1/emufx.c | 11 +- + sound/pci/emu10k1/emupcm.c | 2 +- + sound/pci/emu10k1/emuproc.c | 24 +- + sound/pci/emu10k1/memory.c | 6 +- + sound/pci/hda/Kconfig | 4 + + sound/pci/hda/hda_auto_parser.c | 10 +- + sound/pci/hda/hda_codec.c | 70 +- + sound/pci/hda/hda_controller.c | 4 +- + sound/pci/hda/hda_generic.c | 29 +- + sound/pci/hda/hda_intel.c | 11 + + sound/pci/hda/hda_sysfs.c | 20 +- + sound/pci/hda/hp_x360_helper.c | 95 + + sound/pci/hda/local.h | 40 - + sound/pci/hda/patch_ca0132.c | 3067 ++++++++++++++++++++++++++-- + sound/pci/hda/patch_conexant.c | 7 +- + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 55 +- + sound/pci/ice1712/pontis.c | 2 +- + sound/pci/ice1712/prodigy_hifi.c | 2 +- + sound/pci/lola/lola_proc.c | 2 +- + sound/pci/oxygen/oxygen_mixer.c | 14 +- + sound/pci/pcxhr/pcxhr.c | 2 +- + sound/soc/codecs/cs43130.c | 8 +- + sound/soc/codecs/wm_adsp.c | 11 +- + sound/soc/fsl/fsl_ssi_dbg.c | 2 +- + sound/sound_core.c | 6 +- + sound/sparc/dbri.c | 4 +- + sound/usb/card.c | 226 +- + sound/usb/clock.c | 27 +- + sound/usb/helper.h | 4 - + sound/usb/mixer.c | 639 +++++- + sound/usb/mixer.h | 6 + + sound/usb/mixer_maps.c | 65 + + sound/usb/mixer_quirks.c | 41 +- + sound/usb/mixer_quirks.h | 4 + + sound/usb/mixer_scarlett.c | 6 +- + sound/usb/pcm.c | 270 +-- + sound/usb/pcm.h | 1 + + sound/usb/quirks-table.h | 10 + + sound/usb/quirks.c | 59 + + sound/usb/stream.c | 693 ++++--- + sound/usb/usbaudio.h | 8 + + sound/xen/Kconfig | 10 + + sound/xen/Makefile | 9 + + sound/xen/xen_snd_front.c | 397 ++++ + sound/xen/xen_snd_front.h | 54 + + sound/xen/xen_snd_front_alsa.c | 822 ++++++++ + sound/xen/xen_snd_front_alsa.h | 23 + + sound/xen/xen_snd_front_cfg.c | 519 +++++ + sound/xen/xen_snd_front_cfg.h | 46 + + sound/xen/xen_snd_front_evtchnl.c | 494 +++++ + sound/xen/xen_snd_front_evtchnl.h | 95 + + sound/xen/xen_snd_front_shbuf.c | 194 ++ + sound/xen/xen_snd_front_shbuf.h | 36 + + 129 files changed, 8740 insertions(+), 1468 deletions(-) + create mode 100644 sound/firewire/dice/dice-alesis.c + create mode 100644 sound/firewire/dice/dice-extension.c + create mode 100644 sound/firewire/dice/dice-mytek.c + create mode 100644 sound/firewire/dice/dice-tcelectronic.c + create mode 100644 sound/pci/hda/hp_x360_helper.c + delete mode 100644 sound/pci/hda/local.h + create mode 100644 sound/xen/Kconfig + create mode 100644 sound/xen/Makefile + create mode 100644 sound/xen/xen_snd_front.c + create mode 100644 sound/xen/xen_snd_front.h + create mode 100644 sound/xen/xen_snd_front_alsa.c + create mode 100644 sound/xen/xen_snd_front_alsa.h + create mode 100644 sound/xen/xen_snd_front_cfg.c + create mode 100644 sound/xen/xen_snd_front_cfg.h + create mode 100644 sound/xen/xen_snd_front_evtchnl.c + create mode 100644 sound/xen/xen_snd_front_evtchnl.h + create mode 100644 sound/xen/xen_snd_front_shbuf.c + create mode 100644 sound/xen/xen_snd_front_shbuf.h +Merging sound-asoc-fixes/for-linus (0885ee81b84b Merge branch 'asoc-4.17' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 3 ++ + MAINTAINERS | 11 +++-- + include/sound/soc-dai.h | 4 +- + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/ep93xx-i2s.c | 26 ++++++----- + sound/soc/cirrus/snappercl15.c | 2 +- + sound/soc/codecs/cs35l35.c | 1 + + sound/soc/intel/boards/bytcr_rt5651.c | 5 ++- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 4 +- + sound/soc/omap/n810.c | 10 ++--- + sound/soc/soc-compress.c | 52 ++++++++++++---------- + 11 files changed, 65 insertions(+), 55 deletions(-) +Merging regmap-fixes/for-linus (579973b912e0 Merge branch 'regmap-4.17' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regulator-fixes/for-linus (bbc7fea8e00b Merge branch 'regulator-4.17' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/ltc3676.c | 20 +++++++++++++++++++- + drivers/regulator/max8998.c | 3 +-- + 2 files changed, 20 insertions(+), 3 deletions(-) +Merging spi-fixes/for-linus (748d5c6905ca Merge branch 'spi-4.17' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (0cf22d6b317c PCI: Add "PCIe" to pcie_print_link_status() messages) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (6da6c0db5316 Linux v4.17-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (6da6c0db5316 Linux v4.17-rc3) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (771c577c23ba Linux 4.17-rc6) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (6d08b06e67cd Linux 4.17-rc2) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (75bc37fefc44 Linux 4.17-rc4) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (29dcea88779c Linux 4.17) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (806e30873f0e hwtracing: stm: fix build error on some arches) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (e6e7e9cd8eed Input: elan_i2c - add ELAN0612 (Lenovo v330 14IKB) ACPI ID) +$ git merge input-current/for-linus +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/elan_i2c.txt | 1 + + MAINTAINERS | 6 + + drivers/input/input.c | 3 +- + drivers/input/joystick/as5011.c | 4 +- + drivers/input/joystick/gamecon.c | 27 +- + drivers/input/joystick/xpad.c | 35 +- + drivers/input/keyboard/cros_ec_keyb.c | 33 +- + drivers/input/misc/ati_remote2.c | 2 +- + drivers/input/mouse/Kconfig | 12 + + drivers/input/mouse/alps.c | 80 ++-- + drivers/input/mouse/elan_i2c_core.c | 89 +++- + drivers/input/mouse/elantech.c | 479 ++++++++++++++----- + drivers/input/mouse/elantech.h | 69 ++- + drivers/input/mouse/psmouse-base.c | 21 +- + drivers/input/mouse/psmouse-smbus.c | 24 +- + drivers/input/mouse/psmouse.h | 2 + + drivers/input/mouse/synaptics.c | 2 +- + drivers/input/touchscreen/Kconfig | 11 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/atmel_mxt_ts.c | 170 +------ + drivers/input/touchscreen/chipone_icn8505.c | 520 +++++++++++++++++++++ + drivers/input/touchscreen/goodix.c | 1 + + drivers/input/touchscreen/mk712.c | 2 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 7 + + drivers/input/touchscreen/usbtouchscreen.c | 94 ++++ + drivers/mfd/cros_ec.c | 19 +- + 26 files changed, 1325 insertions(+), 389 deletions(-) + create mode 100644 drivers/input/touchscreen/chipone_icn8505.c +Merging crypto-current/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) +$ git merge crypto-current/master +Removing include/crypto/salsa20.h +Auto-merging drivers/crypto/inside-secure/safexcel.c +Removing arch/x86/crypto/salsa20_glue.c +Removing arch/x86/crypto/salsa20-x86_64-asm_64.S +Removing arch/x86/crypto/salsa20-i586-asm_32.S +Merge made by the 'recursive' strategy. + arch/arm/crypto/sha1-armv4-large.S | 10 + + arch/arm/crypto/sha256-armv4.pl | 11 +- + arch/arm/crypto/sha256-core.S_shipped | 11 +- + arch/arm/crypto/sha512-armv4.pl | 11 +- + arch/arm/crypto/sha512-core.S_shipped | 11 +- + arch/arm64/crypto/Kconfig | 6 + + arch/arm64/crypto/Makefile | 3 + + arch/arm64/crypto/aes-ce-ccm-core.S | 150 +- + arch/arm64/crypto/aes-ce.S | 15 +- + arch/arm64/crypto/aes-modes.S | 331 +- + arch/arm64/crypto/aes-neonbs-core.S | 305 +- + arch/arm64/crypto/crc32-ce-core.S | 40 +- + arch/arm64/crypto/crct10dif-ce-core.S | 32 +- + arch/arm64/crypto/ghash-ce-core.S | 113 +- + arch/arm64/crypto/ghash-ce-glue.c | 28 +- + arch/arm64/crypto/sha1-ce-core.S | 42 +- + arch/arm64/crypto/sha2-ce-core.S | 37 +- + arch/arm64/crypto/sha256-core.S_shipped | 12 +- + arch/arm64/crypto/sha3-ce-core.S | 77 +- + arch/arm64/crypto/sha512-armv8.pl | 12 +- + arch/arm64/crypto/sha512-ce-core.S | 27 +- + arch/arm64/crypto/sha512-core.S_shipped | 12 +- + arch/arm64/crypto/sm4-ce-core.S | 36 + + arch/arm64/crypto/sm4-ce-glue.c | 73 + + arch/x86/crypto/Makefile | 25 +- + arch/x86/crypto/aegis128-aesni-asm.S | 749 + + arch/x86/crypto/aegis128-aesni-glue.c | 407 + + arch/x86/crypto/aegis128l-aesni-asm.S | 825 + + arch/x86/crypto/aegis128l-aesni-glue.c | 407 + + arch/x86/crypto/aegis256-aesni-asm.S | 702 + + arch/x86/crypto/aegis256-aesni-glue.c | 407 + + arch/x86/crypto/ghash-clmulni-intel_glue.c | 2 +- + arch/x86/crypto/morus1280-avx2-asm.S | 621 + + arch/x86/crypto/morus1280-avx2-glue.c | 68 + + arch/x86/crypto/morus1280-sse2-asm.S | 895 + + arch/x86/crypto/morus1280-sse2-glue.c | 68 + + arch/x86/crypto/morus1280_glue.c | 302 + + arch/x86/crypto/morus640-sse2-asm.S | 614 + + arch/x86/crypto/morus640-sse2-glue.c | 68 + + arch/x86/crypto/morus640_glue.c | 298 + + arch/x86/crypto/salsa20-i586-asm_32.S | 938 - + arch/x86/crypto/salsa20-x86_64-asm_64.S | 805 - + arch/x86/crypto/salsa20_glue.c | 91 - + crypto/Kconfig | 138 +- + crypto/Makefile | 6 + + crypto/aegis.h | 80 + + crypto/aegis128.c | 463 + + crypto/aegis128l.c | 527 + + crypto/aegis256.c | 478 + + crypto/algapi.c | 10 + + crypto/authenc.c | 1 + + crypto/authencesn.c | 1 + + crypto/cfb.c | 7 +- + crypto/cipher.c | 3 +- + crypto/crc32_generic.c | 15 +- + crypto/crc32c_generic.c | 8 +- + crypto/ctr.c | 4 +- + crypto/cts.c | 5 +- + crypto/ecc.c | 66 +- + crypto/ecc.h | 4 +- + crypto/ecdh.c | 4 +- + crypto/morus1280.c | 549 + + crypto/morus640.c | 544 + + crypto/pcbc.c | 5 +- + crypto/rsa.c | 1 - + crypto/salsa20_generic.c | 20 +- + crypto/sm4_generic.c | 10 +- + crypto/tcrypt.c | 122 +- + crypto/testmgr.c | 613 +- + crypto/testmgr.h | 47127 ++++++++++------------- + crypto/zstd.c | 265 + + drivers/char/hw_random/Kconfig | 1 + + drivers/char/hw_random/n2-drv.c | 2 +- + drivers/char/hw_random/stm32-rng.c | 9 +- + drivers/char/hw_random/via-rng.c | 2 +- + drivers/crypto/Kconfig | 16 +- + drivers/crypto/amcc/crypto4xx_alg.c | 231 +- + drivers/crypto/amcc/crypto4xx_core.c | 317 +- + drivers/crypto/amcc/crypto4xx_core.h | 35 +- + drivers/crypto/caam/caamalg.c | 231 +- + drivers/crypto/caam/caamalg_desc.c | 4 +- + drivers/crypto/caam/caamalg_qi.c | 227 +- + drivers/crypto/caam/caampkc.c | 71 +- + drivers/crypto/caam/caampkc.h | 8 + + drivers/crypto/caam/ctrl.c | 78 +- + drivers/crypto/caam/ctrl.h | 2 - + drivers/crypto/caam/intern.h | 1 + + drivers/crypto/caam/qi.c | 5 +- + drivers/crypto/caam/regs.h | 6 + + drivers/crypto/cavium/zip/common.h | 21 + + drivers/crypto/cavium/zip/zip_crypto.c | 22 +- + drivers/crypto/cavium/zip/zip_deflate.c | 4 +- + drivers/crypto/cavium/zip/zip_device.c | 4 +- + drivers/crypto/cavium/zip/zip_inflate.c | 4 +- + drivers/crypto/cavium/zip/zip_main.c | 24 +- + drivers/crypto/cavium/zip/zip_main.h | 1 - + drivers/crypto/cavium/zip/zip_regs.h | 42 +- + drivers/crypto/ccp/psp-dev.c | 143 +- + drivers/crypto/ccp/psp-dev.h | 4 + + drivers/crypto/ccree/cc_cipher.c | 350 +- + drivers/crypto/ccree/cc_cipher.h | 30 +- + drivers/crypto/ccree/cc_debugfs.c | 7 +- + drivers/crypto/ccree/cc_driver.c | 36 +- + drivers/crypto/ccree/cc_driver.h | 2 + + drivers/crypto/ccree/cc_host_regs.h | 6 +- + drivers/crypto/chelsio/chcr_algo.c | 303 +- + drivers/crypto/chelsio/chcr_algo.h | 3 +- + drivers/crypto/chelsio/chcr_core.h | 2 +- + drivers/crypto/chelsio/chcr_crypto.h | 15 +- + drivers/crypto/chelsio/chcr_ipsec.c | 35 +- + drivers/crypto/chelsio/chtls/chtls.h | 11 +- + drivers/crypto/chelsio/chtls/chtls_cm.c | 28 +- + drivers/crypto/chelsio/chtls/chtls_hw.c | 6 +- + drivers/crypto/chelsio/chtls/chtls_io.c | 158 +- + drivers/crypto/chelsio/chtls/chtls_main.c | 16 +- + drivers/crypto/exynos-rng.c | 6 +- + drivers/crypto/inside-secure/safexcel.c | 32 + + drivers/crypto/inside-secure/safexcel.h | 44 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 642 +- + drivers/crypto/inside-secure/safexcel_hash.c | 23 +- + drivers/crypto/nx/nx-842-powernv.c | 2 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/picoxcell_crypto.c | 6 +- + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 2 + + drivers/crypto/qat/qat_c62x/adf_drv.c | 2 + + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 1 + + drivers/crypto/vmx/aes.c | 2 - + drivers/crypto/vmx/aes_cbc.c | 3 - + drivers/crypto/vmx/aes_ctr.c | 2 - + drivers/crypto/vmx/aes_xts.c | 2 - + drivers/crypto/vmx/aesp8-ppc.pl | 49 +- + drivers/crypto/vmx/ghash.c | 2 - + drivers/crypto/vmx/ghashp8-ppc.pl | 9 + + include/crypto/algapi.h | 8 + + include/crypto/morus1280_glue.h | 137 + + include/crypto/morus640_glue.h | 137 + + include/crypto/morus_common.h | 23 + + include/crypto/salsa20.h | 27 - + include/crypto/sm4.h | 3 + + include/linux/psp-sev.h | 23 + + include/uapi/linux/psp-sev.h | 12 + + 141 files changed, 34902 insertions(+), 29595 deletions(-) + create mode 100644 arch/arm64/crypto/sm4-ce-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-glue.c + create mode 100644 arch/x86/crypto/aegis128-aesni-asm.S + create mode 100644 arch/x86/crypto/aegis128-aesni-glue.c + create mode 100644 arch/x86/crypto/aegis128l-aesni-asm.S + create mode 100644 arch/x86/crypto/aegis128l-aesni-glue.c + create mode 100644 arch/x86/crypto/aegis256-aesni-asm.S + create mode 100644 arch/x86/crypto/aegis256-aesni-glue.c + create mode 100644 arch/x86/crypto/morus1280-avx2-asm.S + create mode 100644 arch/x86/crypto/morus1280-avx2-glue.c + create mode 100644 arch/x86/crypto/morus1280-sse2-asm.S + create mode 100644 arch/x86/crypto/morus1280-sse2-glue.c + create mode 100644 arch/x86/crypto/morus1280_glue.c + create mode 100644 arch/x86/crypto/morus640-sse2-asm.S + create mode 100644 arch/x86/crypto/morus640-sse2-glue.c + create mode 100644 arch/x86/crypto/morus640_glue.c + delete mode 100644 arch/x86/crypto/salsa20-i586-asm_32.S + delete mode 100644 arch/x86/crypto/salsa20-x86_64-asm_64.S + delete mode 100644 arch/x86/crypto/salsa20_glue.c + create mode 100644 crypto/aegis.h + create mode 100644 crypto/aegis128.c + create mode 100644 crypto/aegis128l.c + create mode 100644 crypto/aegis256.c + create mode 100644 crypto/morus1280.c + create mode 100644 crypto/morus640.c + create mode 100644 crypto/zstd.c + create mode 100644 include/crypto/morus1280_glue.h + create mode 100644 include/crypto/morus640_glue.h + create mode 100644 include/crypto/morus_common.h + delete mode 100644 include/crypto/salsa20.h +Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (89c29def6b01 Revert "vfio/type1: Improve memory pinning process for raw PFN mapping") +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (75bc37fefc44 Linux 4.17-rc4) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (dbad41e7bb5f dmaengine: qcom: bam_dma: check if the runtime pm enabled) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 deletions(-) +Merging mtd-fixes/master (9f825e74d761 mtd: rawnand: Fix return type of __DIVIDE() when called with 32-bit) +$ git merge mtd-fixes/master +Already up to date. +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (7928b2cbe55b Linux 4.16-rc1) +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (11799564fc7e mfd: cros_ec: Retry commands when EC is known to be busy) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (b84c8fdf8e6c media: uvcvideo: Prevent setting unavailable flags) +$ git merge v4l-dvb-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/media/usb/uvc/uvc_ctrl.c | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) +Merging reset-fixes/reset/fixes (e6914365fd28 reset: uniphier: fix USB clock line for LD20) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (d8a9a51afaa9 MIPS: pb44: Fix i2c-gpio GPIO descriptor table) +$ git merge mips-fixes/mips-fixes +Merge made by the 'recursive' strategy. + arch/mips/ath79/mach-pb44.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging omap-fixes/fixes (41bd6adf3c5d Revert "ARM: dts: logicpd-som-lv: Fix pinmux controller references") +$ git merge omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (696ca779a928 KVM: x86: fix #UD address of failed Hyper-V hypercalls) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (f4a551b72358 KVM: s390: vsie: fix < 8k check for the itdba) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (771c577c23ba Linux 4.17-rc6) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (75bc37fefc44 Linux 4.17-rc4) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging btrfs-fixes/next-fixes (e97ce3cc9888 Merge branch 'misc-4.17' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (b1b94fcbd399 Revert "fs: fold open_check_o_direct into do_dentry_open") +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. +Merging dma-mapping-fixes/for-linus (05e13bb57e6f swiotlb: silent unwanted warning "buffer is full") +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (32ffd6e8d1f6 platform/x86: asus-wmi: Fix NULL pointer dereference) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (f130307054a5 dt-bindings: panel: lvds: Fix path to display timing bindings) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (c9ddf73476ff scsi: scsi_transport_srp: Fix shost to rport translation) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (65b3bdc807ac drm/i915/query: nospec expects no more than an unsigned long) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (3de06d5a1f05 mmc: sdhci-iproc: add SDHCI_QUIRK2_HOST_OFF_CARD_ON for cygnus) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (60cc43fc8884 Linux 4.17-rc1) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (889ad63d41ee drm/qxl: Call qxl_bo_unref outside atomic context) +$ git merge drm-misc-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/qxl/qxl_display.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging kbuild/for-next (101c4345fe33 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Removing scripts/kconfig/lxdialog/check-lxdialog.sh +Removing scripts/kconfig/kxgettext.c +Removing scripts/kconfig/check.sh +Removing scripts/kconfig/POTFILES.in +Auto-merging lib/Kconfig.debug +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/kbuild/kconfig-language.txt | 26 +- + Documentation/kbuild/kconfig-macro-language.txt | 242 +++++++++ + Kconfig | 10 +- + MAINTAINERS | 3 +- + Makefile | 118 +---- + arch/Kconfig | 71 +-- + arch/alpha/Makefile | 2 +- + arch/arm/Makefile | 2 +- + arch/arm64/Makefile | 2 +- + arch/ia64/Makefile | 2 +- + arch/mips/Makefile | 3 - + arch/openrisc/Makefile | 1 - + arch/parisc/Makefile | 4 +- + arch/powerpc/Kconfig | 19 +- + arch/powerpc/Makefile | 44 +- + arch/powerpc/boot/Makefile | 16 +- + arch/powerpc/include/asm/module.h | 2 +- + arch/powerpc/kernel/module_64.c | 4 +- + arch/powerpc/kernel/trace/ftrace.c | 6 +- + arch/powerpc/kernel/vdso32/Makefile | 15 +- + arch/powerpc/kernel/vmlinux.lds.S | 22 +- + arch/powerpc/tools/gcc-check-mprofile-kernel.sh | 13 +- + arch/s390/Makefile | 2 +- + arch/sh/Kconfig | 4 +- + arch/sparc/Kconfig | 4 +- + arch/sparc/Makefile | 2 +- + arch/um/Kconfig.common | 4 - + arch/x86/Kconfig | 15 +- + arch/x86/Makefile | 2 +- + arch/x86/um/Kconfig | 10 +- + include/asm-generic/export.h | 34 +- + include/asm-generic/vmlinux.lds.h | 334 ++++++------ + include/linux/export.h | 16 +- + init/Kconfig | 67 ++- + kernel/gcov/Kconfig | 17 +- + kernel/gcov/Makefile | 2 - + lib/Kconfig.debug | 11 +- + scripts/Kbuild.include | 102 +--- + scripts/Kconfig.include | 30 ++ + scripts/Makefile.build | 9 +- + scripts/Makefile.gcc-plugins | 91 +--- + scripts/Makefile.kcov | 10 +- + scripts/adjust_autoksyms.sh | 3 - + scripts/basic/fixdep.c | 6 +- + scripts/checkpatch.pl | 10 - + scripts/clang-version.sh | 18 +- + scripts/coccinelle/locks/mini_lock.cocci | 6 +- + scripts/coccinelle/null/deref_null.cocci | 40 +- + scripts/depmod.sh | 25 +- + scripts/gcc-plugins/Makefile | 1 + + scripts/gcc-x86_32-has-stack-protector.sh | 7 +- + scripts/gcc-x86_64-has-stack-protector.sh | 5 - + scripts/genksyms/genksyms.c | 11 +- + scripts/kallsyms.c | 49 +- + scripts/kconfig/.gitignore | 4 - + scripts/kconfig/Makefile | 190 ++----- + scripts/kconfig/POTFILES.in | 12 - + scripts/kconfig/check.sh | 14 - + scripts/kconfig/conf.c | 51 +- + scripts/kconfig/confdata.c | 37 +- + scripts/kconfig/gconf-cfg.sh | 23 + + scripts/kconfig/gconf.c | 46 +- + scripts/kconfig/kconf_id.c | 1 - + scripts/kconfig/kxgettext.c | 235 --------- + scripts/kconfig/lkc.h | 19 +- + scripts/kconfig/lkc_proto.h | 15 +- + scripts/kconfig/lxdialog/check-lxdialog.sh | 93 ---- + scripts/kconfig/lxdialog/checklist.c | 4 +- + scripts/kconfig/lxdialog/dialog.h | 8 +- + scripts/kconfig/lxdialog/inputbox.c | 4 +- + scripts/kconfig/lxdialog/menubox.c | 10 +- + scripts/kconfig/lxdialog/textbox.c | 2 +- + scripts/kconfig/lxdialog/yesno.c | 4 +- + scripts/kconfig/mconf-cfg.sh | 44 ++ + scripts/kconfig/mconf.c | 141 +++-- + scripts/kconfig/menu.c | 23 +- + scripts/kconfig/nconf-cfg.sh | 44 ++ + scripts/kconfig/nconf.c | 148 +++--- + scripts/kconfig/nconf.h | 1 - + scripts/kconfig/preprocess.c | 572 +++++++++++++++++++++ + scripts/kconfig/qconf-cfg.sh | 25 + + scripts/kconfig/qconf.cc | 104 ++-- + scripts/kconfig/symbol.c | 109 ---- + .../tests/no_write_if_dep_unmet/expected_config | 2 +- + .../kconfig/tests/preprocess/builtin_func/Kconfig | 27 + + .../tests/preprocess/builtin_func/__init__.py | 9 + + .../tests/preprocess/builtin_func/expected_stderr | 5 + + .../tests/preprocess/builtin_func/expected_stdout | 1 + + .../tests/preprocess/circular_expansion/Kconfig | 5 + + .../preprocess/circular_expansion/__init__.py | 11 + + .../preprocess/circular_expansion/expected_stderr | 1 + + scripts/kconfig/tests/preprocess/escape/Kconfig | 44 ++ + .../kconfig/tests/preprocess/escape/__init__.py | 8 + + .../tests/preprocess/escape/expected_stderr | 10 + + scripts/kconfig/tests/preprocess/variable/Kconfig | 53 ++ + .../kconfig/tests/preprocess/variable/__init__.py | 8 + + .../tests/preprocess/variable/expected_stderr | 9 + + scripts/kconfig/util.c | 33 +- + scripts/kconfig/zconf.l | 95 +++- + scripts/kconfig/zconf.y | 46 +- + scripts/link-vmlinux.sh | 4 - + scripts/mod/modpost.c | 97 ++-- + scripts/package/mkdebian | 27 +- + scripts/recordmcount.c | 2 +- + scripts/recordmcount.h | 2 +- + scripts/recordmcount.pl | 18 +- + scripts/tags.sh | 11 +- + 107 files changed, 2209 insertions(+), 1876 deletions(-) + create mode 100644 Documentation/kbuild/kconfig-macro-language.txt + create mode 100644 scripts/Kconfig.include + delete mode 100644 scripts/kconfig/POTFILES.in + delete mode 100755 scripts/kconfig/check.sh + create mode 100755 scripts/kconfig/gconf-cfg.sh + delete mode 100644 scripts/kconfig/kxgettext.c + delete mode 100755 scripts/kconfig/lxdialog/check-lxdialog.sh + create mode 100755 scripts/kconfig/mconf-cfg.sh + create mode 100644 scripts/kconfig/nconf-cfg.sh + create mode 100644 scripts/kconfig/preprocess.c + create mode 100755 scripts/kconfig/qconf-cfg.sh + create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/Kconfig + create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/__init__.py + create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/expected_stderr + create mode 100644 scripts/kconfig/tests/preprocess/builtin_func/expected_stdout + create mode 100644 scripts/kconfig/tests/preprocess/circular_expansion/Kconfig + create mode 100644 scripts/kconfig/tests/preprocess/circular_expansion/__init__.py + create mode 100644 scripts/kconfig/tests/preprocess/circular_expansion/expected_stderr + create mode 100644 scripts/kconfig/tests/preprocess/escape/Kconfig + create mode 100644 scripts/kconfig/tests/preprocess/escape/__init__.py + create mode 100644 scripts/kconfig/tests/preprocess/escape/expected_stderr + create mode 100644 scripts/kconfig/tests/preprocess/variable/Kconfig + create mode 100644 scripts/kconfig/tests/preprocess/variable/__init__.py + create mode 100644 scripts/kconfig/tests/preprocess/variable/expected_stderr +Merging leaks/leaks-next (9f84a0f7f1a6 leaking_addresses: check if file name contains address) +$ git merge leaks/leaks-next +Merge made by the 'recursive' strategy. +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (2550bbfd4952 dma-direct: don't crash on device without dma_mask) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a71e7c44ffb7 io: change writeX_relaxed() to remove barriers) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (a7f301beb1a4 Merge branches 'fixes' and 'misc'; commit 'spectre^{/^ARM: spectre-v1: fix syscall entry}' into for-next) +$ git merge arm/for-next +Auto-merging drivers/amba/bus.c +Auto-merging arch/arm/mm/dma-mapping.c +Auto-merging arch/arm/mm/Kconfig +Auto-merging arch/arm/include/asm/kvm_mmu.h +Auto-merging arch/arm/include/asm/kvm_host.h +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/Kconfig | 4 +- + arch/arm/Makefile | 2 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/include/asm/assembler.h | 8 + + arch/arm/include/asm/barrier.h | 32 ++++ + arch/arm/include/asm/bugs.h | 6 +- + arch/arm/include/asm/cp15.h | 3 + + arch/arm/include/asm/cputype.h | 8 + + arch/arm/include/asm/kgdb.h | 2 +- + arch/arm/include/asm/kvm_asm.h | 2 - + arch/arm/include/asm/kvm_host.h | 14 +- + arch/arm/include/asm/kvm_mmu.h | 23 ++- + arch/arm/include/asm/mpu.h | 112 +++++++++----- + arch/arm/include/asm/proc-fns.h | 4 + + arch/arm/include/asm/system_misc.h | 15 ++ + arch/arm/include/asm/uaccess.h | 2 +- + arch/arm/include/asm/v7m.h | 14 +- + arch/arm/kernel/Makefile | 1 + + arch/arm/kernel/asm-offsets.c | 8 +- + arch/arm/kernel/bugs.c | 18 +++ + arch/arm/kernel/entry-common.S | 18 +-- + arch/arm/kernel/entry-header.S | 25 +++ + arch/arm/kernel/head-nommu.S | 289 +++++++++++++++++++++++++++------- + arch/arm/kernel/smp.c | 7 +- + arch/arm/kernel/suspend.c | 2 + + arch/arm/kernel/vmlinux-xip.lds.S | 4 + + arch/arm/kernel/vmlinux.lds.S | 7 + + arch/arm/kernel/vmlinux.lds.h | 16 +- + arch/arm/kvm/hyp/hyp-entry.S | 112 +++++++++++++- + arch/arm/mm/Kconfig | 23 +++ + arch/arm/mm/Makefile | 4 +- + arch/arm/mm/dma-mapping.c | 2 +- + arch/arm/mm/fault.c | 3 + + arch/arm/mm/nommu.c | 32 ++++ + arch/arm/mm/pmsa-v7.c | 59 +++---- + arch/arm/mm/pmsa-v8.c | 307 +++++++++++++++++++++++++++++++++++++ + arch/arm/mm/proc-macros.S | 3 +- + arch/arm/mm/proc-v7-2level.S | 6 - + arch/arm/mm/proc-v7-bugs.c | 174 +++++++++++++++++++++ + arch/arm/mm/proc-v7.S | 154 +++++++++++++++---- + drivers/amba/bus.c | 1 + + 41 files changed, 1318 insertions(+), 210 deletions(-) + create mode 100644 arch/arm/kernel/bugs.c + create mode 100644 arch/arm/mm/pmsa-v8.c + create mode 100644 arch/arm/mm/proc-v7-bugs.c +Merging arm-perf/for-next/perf (73acc0315cd7 ARM: mcpm, perf/arm-cci: export mcpm_is_available) +$ git merge arm-perf/for-next/perf +Merge made by the 'recursive' strategy. + arch/arm/common/mcpm_entry.c | 2 ++ + arch/arm/kernel/perf_event_v6.c | 4 +--- + arch/arm/kernel/perf_event_v7.c | 3 +-- + arch/arm/kernel/perf_event_xscale.c | 6 ++--- + arch/arm64/kernel/perf_event.c | 3 +-- + drivers/perf/Kconfig | 36 ++++++++++++++-------------- + drivers/perf/arm-cci.c | 47 ++++++++++++++++++------------------- + drivers/perf/arm-ccn.c | 22 ++++++++--------- + drivers/perf/arm_pmu.c | 2 +- + drivers/perf/arm_spe_pmu.c | 6 ++--- + include/linux/perf/arm_pmu.h | 2 +- + 11 files changed, 64 insertions(+), 69 deletions(-) +Merging arm-soc/for-next (c7953e19db50 ARM: Document merges) +$ git merge arm-soc/for-next +Removing include/linux/platform_data/media/ir-rx51.h +Removing drivers/memory/tegra20-mc.c +Auto-merging arch/arm64/boot/dts/synaptics/berlin4ct.dtsi +Removing arch/arm64/boot/dts/marvell/berlin4ct-stb.dts +Removing arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts +Auto-merging arch/arm/mach-shmobile/Kconfig +Removing arch/arm/mach-omap2/omap-pm.h +Removing arch/arm/mach-omap2/omap-pm-noop.c +Auto-merging arch/arm/mach-exynos/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-exynos/Kconfig +Auto-merging arch/arm/include/asm/cputype.h +CONFLICT (content): Merge conflict in arch/arm/include/asm/cputype.h +Removing arch/arm/boot/dts/ste-ccu9540.dts +Removing arch/arm/boot/dts/ste-ccu8540.dts +Removing arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi +Removing arch/arm/boot/dts/exynos5440.dtsi +Removing arch/arm/boot/dts/exynos5440-trip-points.dtsi +Removing arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi +Removing arch/arm/boot/dts/exynos5440-ssdk5440.dts +Removing arch/arm/boot/dts/exynos5440-sd5v1.dts +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/memory-controllers/nvidia,tegra20-mc.txt +Removing Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt +Resolved 'arch/arm/include/asm/cputype.h' using previous resolution. +Resolved 'arch/arm/mach-exynos/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3cfc2a028d76] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm/OMAP/README | 4 + + Documentation/devicetree/bindings/arm/amlogic.txt | 6 + + .../devicetree/bindings/arm/bcm/brcm,bcm2835.txt | 4 + + .../bindings/arm/samsung/samsung-boards.txt | 2 - + Documentation/devicetree/bindings/arm/shmobile.txt | 12 +- + .../bindings/arm/tegra/nvidia,tegra30-mc.txt | 18 - + Documentation/devicetree/bindings/bus/ti-sysc.txt | 6 +- + .../bindings/clock/amlogic,gxbb-aoclkc.txt | 1 + + .../bindings/clock/amlogic,gxbb-clkc.txt | 16 +- + .../devicetree/bindings/firmware/qcom,scm.txt | 3 +- + .../nvidia,tegra20-mc.txt | 12 +- + .../memory-controllers/nvidia,tegra30-mc.txt | 5 + + .../devicetree/bindings/mmc/sdhci-omap.txt | 7 + + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 30 + + .../bindings/nvmem/allwinner,sunxi-sid.txt | 1 + + .../devicetree/bindings/power/pd-samsung.txt | 20 +- + .../bindings/power/renesas,rcar-sysc.txt | 2 + + .../bindings/reserved-memory/qcom,cmd-db.txt | 37 + + .../devicetree/bindings/reset/renesas,rst.txt | 2 + + .../devicetree/bindings/rng/brcm,bcm2835.txt | 9 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.txt | 119 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.txt | 1 + + .../bindings/soc/rockchip/power_domain.txt | 12 + + .../devicetree/bindings/timer/renesas,cmt.txt | 14 +- + .../devicetree/bindings/vendor-prefixes.txt | 2 + + MAINTAINERS | 3 +- + arch/arm/Kconfig | 2 +- + arch/arm/Kconfig.debug | 13 +- + arch/arm/Makefile | 2 +- + arch/arm/arm-soc-for-next-contents.txt | 211 ++ + arch/arm/boot/dts/Makefile | 41 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 2 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 2 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 2 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 9 +- + arch/arm/boot/dts/am335x-boneblue.dts | 2 +- + arch/arm/boot/dts/am335x-evm.dts | 9 +- + arch/arm/boot/dts/am335x-evmsk.dts | 12 +- + arch/arm/boot/dts/am335x-osd335x-common.dtsi | 124 + + arch/arm/boot/dts/am335x-pocketbeagle.dts | 237 ++ + arch/arm/boot/dts/am3517-evm.dts | 233 +- + arch/arm/boot/dts/am3517-som.dtsi | 142 ++ + arch/arm/boot/dts/am437x-cm-t43.dts | 2 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 2 +- + arch/arm/boot/dts/am437x-sk-evm.dts | 115 + + arch/arm/boot/dts/am43x-epos-evm.dts | 2 +- + arch/arm/boot/dts/am571x-idk.dts | 5 +- + arch/arm/boot/dts/am572x-idk.dts | 5 +- + arch/arm/boot/dts/am574x-idk.dts | 20 + + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 +- + arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- + arch/arm/boot/dts/am57xx-idk-common.dtsi | 14 +- + arch/arm/boot/dts/armada-370-db.dts | 57 +- + arch/arm/boot/dts/armada-370-dlink-dns327l.dts | 120 +- + arch/arm/boot/dts/armada-370-mirabox.dts | 51 +- + arch/arm/boot/dts/armada-370-netgear-rn102.dts | 90 +- + arch/arm/boot/dts/armada-370-netgear-rn104.dts | 90 +- + arch/arm/boot/dts/armada-370-rd.dts | 52 +- + arch/arm/boot/dts/armada-370-seagate-nas-xbay.dtsi | 64 +- + arch/arm/boot/dts/armada-370-xp.dtsi | 6 +- + arch/arm/boot/dts/armada-375-db.dts | 50 +- + arch/arm/boot/dts/armada-375.dtsi | 6 +- + arch/arm/boot/dts/armada-385-db-ap.dts | 69 +- + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 129 +- + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 129 +- + arch/arm/boot/dts/armada-385-linksys-rango.dts | 141 +- + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 129 +- + arch/arm/boot/dts/armada-385-linksys.dtsi | 16 +- + arch/arm/boot/dts/armada-388-db.dts | 55 +- + arch/arm/boot/dts/armada-38x.dtsi | 6 +- + arch/arm/boot/dts/armada-390-db.dts | 66 +- + arch/arm/boot/dts/armada-395-gp.dts | 74 +- + arch/arm/boot/dts/armada-398-db.dts | 60 +- + arch/arm/boot/dts/armada-39x.dtsi | 6 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 13 + + arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 2 +- + arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +- + arch/arm/boot/dts/armada-xp-db.dts | 2 +- + arch/arm/boot/dts/armada-xp-gp.dts | 2 +- + arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts | 2 +- + arch/arm/boot/dts/armada-xp-linksys-mamba.dts | 156 +- + arch/arm/boot/dts/armada-xp-netgear-rn2120.dts | 90 +- + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 18 + + arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts | 129 + + arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts | 325 +++ + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 6 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 32 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 6 + + arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts | 159 ++ + arch/arm/boot/dts/aspeed-g4.dtsi | 35 + + arch/arm/boot/dts/aspeed-g5.dtsi | 47 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-a.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi-b.dts | 6 + + arch/arm/boot/dts/bcm2835-rpi.dtsi | 6 - + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 6 + + arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 108 + + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 26 +- + arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi | 27 + + arch/arm/boot/dts/bcm283x.dtsi | 1 + + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 13 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 13 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 3 +- + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 3 +- + arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 +- + arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 15 +- + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 13 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 +- + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 13 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 13 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 13 +- + arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 +- + arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 3 +- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 13 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 3 +- + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 3 +- + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 13 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 3 +- + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 25 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 +- + arch/arm/boot/dts/bcm47094-luxul-abr-4500.dts | 3 +- + arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 57 + + arch/arm/boot/dts/bcm47094-luxul-xbr-4500.dts | 3 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 +- + arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 77 + + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 3 +- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch1.dtsi | 3 +- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch4.dtsi | 3 +- + arch/arm/boot/dts/bcm5301x-nand-cs0-bch8.dtsi | 3 +- + arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi | 3 +- + arch/arm/boot/dts/berlin2-sony-nsz-gs7.dts | 33 +- + arch/arm/boot/dts/berlin2.dtsi | 35 +- + arch/arm/boot/dts/berlin2cd-google-chromecast.dts | 65 +- + arch/arm/boot/dts/berlin2cd-valve-steamlink.dts | 79 + + arch/arm/boot/dts/berlin2cd.dtsi | 167 +- + arch/arm/boot/dts/berlin2q-marvell-dmp.dts | 33 +- + arch/arm/boot/dts/berlin2q.dtsi | 65 +- + arch/arm/boot/dts/da850-evm.dts | 298 +-- + arch/arm/boot/dts/da850-lego-ev3.dts | 83 +- + arch/arm/boot/dts/da850.dtsi | 154 ++ + arch/arm/boot/dts/dm8148-t410.dts | 2 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 15 + + arch/arm/boot/dts/dra7-evm.dts | 68 + + arch/arm/boot/dts/dra7-mmc-iodelay.dtsi | 19 + + arch/arm/boot/dts/dra7.dtsi | 32 +- + arch/arm/boot/dts/dra71-evm.dts | 17 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 71 +- + arch/arm/boot/dts/dra72x-mmc-iodelay.dtsi | 11 + + arch/arm/boot/dts/dra76-evm.dts | 34 +- + arch/arm/boot/dts/emev2-kzm9d.dts | 3 - + arch/arm/boot/dts/emev2.dtsi | 5 +- + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 28 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 4 + + arch/arm/boot/dts/exynos3250.dtsi | 2 +- + arch/arm/boot/dts/exynos4.dtsi | 3 +- + arch/arm/boot/dts/exynos4210-origen.dts | 34 +- + arch/arm/boot/dts/exynos4210-trats.dts | 4 +- + arch/arm/boot/dts/exynos4412-galaxy-s3.dtsi | 36 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 86 +- + arch/arm/boot/dts/exynos4412-n710x.dts | 16 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 33 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 6 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 6 +- + arch/arm/boot/dts/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5.dtsi | 3 - + arch/arm/boot/dts/exynos5250.dtsi | 7 +- + arch/arm/boot/dts/exynos5410.dtsi | 1 + + arch/arm/boot/dts/exynos5420-peach-pit.dts | 4 +- + arch/arm/boot/dts/exynos5420.dtsi | 87 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 2 +- + arch/arm/boot/dts/exynos5440-sd5v1.dts | 42 - + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 81 - + arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi | 20 - + arch/arm/boot/dts/exynos5440-trip-points.dtsi | 21 - + arch/arm/boot/dts/exynos5440.dtsi | 355 --- + arch/arm/boot/dts/exynos5800-peach-pi.dts | 4 +- + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 16 +- + arch/arm/boot/dts/gemini-dlink-dns-313.dts | 19 +- + arch/arm/boot/dts/gemini-nas4220b.dts | 20 +- + arch/arm/boot/dts/gemini-rut1xx.dts | 12 +- + arch/arm/boot/dts/gemini-sq201.dts | 12 +- + arch/arm/boot/dts/gemini-wbd111.dts | 17 +- + arch/arm/boot/dts/gemini-wbd222.dts | 16 +- + arch/arm/boot/dts/gemini.dtsi | 2 - + arch/arm/boot/dts/imx1-ads.dts | 11 - + arch/arm/boot/dts/imx1.dtsi | 21 +- + arch/arm/boot/dts/imx23-evk.dts | 13 +- + arch/arm/boot/dts/imx23.dtsi | 13 +- + arch/arm/boot/dts/imx25-pdk.dts | 14 +- + arch/arm/boot/dts/imx25.dtsi | 16 +- + arch/arm/boot/dts/imx27-apf27.dts | 13 +- + arch/arm/boot/dts/imx27-pdk.dts | 13 +- + arch/arm/boot/dts/imx27.dtsi | 18 +- + arch/arm/boot/dts/imx28-cfa10049.dts | 2 - + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 2 - + arch/arm/boot/dts/imx28-evk.dts | 13 +- + arch/arm/boot/dts/imx28-tx28.dts | 14 +- + arch/arm/boot/dts/imx28.dtsi | 13 +- + arch/arm/boot/dts/imx31.dtsi | 13 +- + arch/arm/boot/dts/imx35-pdk.dts | 15 +- + arch/arm/boot/dts/imx35.dtsi | 14 +- + arch/arm/boot/dts/imx50-evk.dts | 17 +- + arch/arm/boot/dts/imx50.dtsi | 3 - + arch/arm/boot/dts/imx51-babbage.dts | 15 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 +- + arch/arm/boot/dts/imx51.dtsi | 18 +- + arch/arm/boot/dts/imx53-ard.dts | 11 +- + arch/arm/boot/dts/imx53-m53.dtsi | 2 - + arch/arm/boot/dts/imx53-ppd.dts | 12 +- + arch/arm/boot/dts/imx53-qsb-common.dtsi | 15 +- + arch/arm/boot/dts/imx53-qsb.dts | 17 +- + arch/arm/boot/dts/imx53-qsrb.dts | 15 +- + arch/arm/boot/dts/imx53-smd.dts | 20 +- + arch/arm/boot/dts/imx53-tx53-x03x.dts | 1 + + arch/arm/boot/dts/imx53-tx53.dtsi | 14 +- + arch/arm/boot/dts/imx53-voipac-dmm-668.dtsi | 2 +- + arch/arm/boot/dts/imx53.dtsi | 11 +- + arch/arm/boot/dts/imx6dl-aristainetos2_4.dts | 2 - + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 15 +- + arch/arm/boot/dts/imx6dl-mamoj.dts | 224 ++ + arch/arm/boot/dts/imx6dl-sabreauto.dts | 10 +- + arch/arm/boot/dts/imx6dl-sabresd.dts | 10 +- + arch/arm/boot/dts/imx6dl-udoo.dts | 6 +- + arch/arm/boot/dts/imx6dl-wandboard-revb1.dts | 6 +- + arch/arm/boot/dts/imx6dl-wandboard-revd1.dts | 6 +- + arch/arm/boot/dts/imx6dl-wandboard.dts | 6 +- + arch/arm/boot/dts/imx6dl.dtsi | 12 +- + arch/arm/boot/dts/imx6q-b850v3.dts | 4 - + arch/arm/boot/dts/imx6q-ba16.dtsi | 7 +- + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 13 +- + arch/arm/boot/dts/imx6q-dhcom-pdk2.dts | 151 ++ + arch/arm/boot/dts/imx6q-dhcom-som.dtsi | 476 ++++ + arch/arm/boot/dts/imx6q-gk802.dts | 3 +- + arch/arm/boot/dts/imx6q-icore-mipi.dts | 25 + + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 31 +- + arch/arm/boot/dts/imx6q-kp-tpc.dts | 22 + + arch/arm/boot/dts/imx6q-kp.dtsi | 432 ++++ + arch/arm/boot/dts/imx6q-novena.dts | 2 - + arch/arm/boot/dts/imx6q-pistachio.dts | 2 +- + arch/arm/boot/dts/imx6q-sabreauto.dts | 15 +- + arch/arm/boot/dts/imx6q-sabresd.dts | 15 +- + arch/arm/boot/dts/imx6q-udoo.dts | 6 +- + arch/arm/boot/dts/imx6q-utilite-pro.dts | 2 - + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 2 - + arch/arm/boot/dts/imx6q-wandboard-revb1.dts | 6 +- + arch/arm/boot/dts/imx6q-wandboard-revd1.dts | 6 +- + arch/arm/boot/dts/imx6q-wandboard.dts | 6 +- + arch/arm/boot/dts/imx6q.dtsi | 39 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 52 +- + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 47 +- + arch/arm/boot/dts/imx6qdl-icore.dtsi | 25 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 15 +- + arch/arm/boot/dts/imx6qdl-sabrelite.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 18 +- + arch/arm/boot/dts/imx6qdl-tx6-lcd.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-tx6-mb7.dtsi | 3 - + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-wandboard-revb1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revc1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 24 +- + arch/arm/boot/dts/imx6qdl.dtsi | 70 +- + arch/arm/boot/dts/imx6qp-sabreauto.dts | 44 +- + arch/arm/boot/dts/imx6qp-sabresd.dts | 44 +- + arch/arm/boot/dts/imx6qp-wandboard-revd1.dts | 6 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 5 + + arch/arm/boot/dts/imx6qp.dtsi | 44 +- + arch/arm/boot/dts/imx6sl-evk.dts | 10 +- + arch/arm/boot/dts/imx6sl.dtsi | 34 +- + arch/arm/boot/dts/imx6sx-nitrogen6sx.dts | 4 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 427 +++- + arch/arm/boot/dts/imx6sx.dtsi | 101 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 10 +- + arch/arm/boot/dts/imx6ul-isiot.dtsi | 2 - + arch/arm/boot/dts/imx6ul-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 6 +- + arch/arm/boot/dts/imx6ul.dtsi | 51 +- + arch/arm/boot/dts/imx6ull-pinfunc.h | 9 + + arch/arm/boot/dts/imx6ull.dtsi | 2 + + arch/arm/boot/dts/imx7d-cl-som-imx7.dts | 2 +- + arch/arm/boot/dts/imx7d-nitrogen7.dts | 6 +- + arch/arm/boot/dts/imx7d-pinfunc.h | 6 +- + arch/arm/boot/dts/imx7d-sdb-sht11.dts | 44 +- + arch/arm/boot/dts/imx7d-sdb.dts | 70 +- + arch/arm/boot/dts/imx7d.dtsi | 71 +- + arch/arm/boot/dts/imx7s-warp.dts | 4 - + arch/arm/boot/dts/imx7s.dtsi | 88 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 26 + + arch/arm/boot/dts/logicpd-som-lv.dtsi | 34 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 10 + + arch/arm/boot/dts/meson8.dtsi | 33 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 68 +- + arch/arm/boot/dts/meson8b.dtsi | 24 +- + arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 244 ++ + arch/arm/boot/dts/meson8m2.dtsi | 54 + + arch/arm/boot/dts/mt2701-evb.dts | 9 +- + arch/arm/boot/dts/mt2701.dtsi | 197 +- + arch/arm/boot/dts/mt6323.dtsi | 17 +- + arch/arm/boot/dts/mt6580-evbp1.dts | 9 +- + arch/arm/boot/dts/mt6580.dtsi | 9 +- + arch/arm/boot/dts/mt6589-aquaris5.dts | 10 +- + arch/arm/boot/dts/mt6589.dtsi | 12 +- + arch/arm/boot/dts/mt6592-evb.dts | 9 +- + arch/arm/boot/dts/mt6592.dtsi | 9 +- + arch/arm/boot/dts/mt7623.dtsi | 537 ++++- + arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 291 +++ + arch/arm/boot/dts/mt7623a-rfb-nand.dts | 337 +++ + arch/arm/boot/dts/mt7623a.dtsi | 44 + + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 279 +-- + arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 326 +++ + arch/arm/boot/dts/mt7623n-rfb-nand.dts | 40 +- + arch/arm/boot/dts/mt7623n-rfb.dtsi | 12 +- + arch/arm/boot/dts/mt8127-moose.dts | 9 +- + arch/arm/boot/dts/mt8127.dtsi | 9 +- + arch/arm/boot/dts/mt8135-evbp1.dts | 9 +- + arch/arm/boot/dts/mt8135.dtsi | 9 +- + arch/arm/boot/dts/omap2420-n810.dts | 63 +- + arch/arm/boot/dts/omap3-beagle-xm.dts | 10 + + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 2 +- + arch/arm/boot/dts/omap3-devkit8000-common.dtsi | 9 +- + arch/arm/boot/dts/omap3-devkit8000-lcd-common.dtsi | 5 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 10 + + arch/arm/boot/dts/omap3-pandora-common.dtsi | 12 +- + arch/arm/boot/dts/omap3-sb-t35.dtsi | 2 +- + arch/arm/boot/dts/pxa3xx.dtsi | 20 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 58 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk01.1.dtsi | 10 +- + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts | 19 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dts | 9 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi | 111 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts | 64 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dts | 25 + + arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi | 75 + + arch/arm/boot/dts/qcom-ipq4019.dtsi | 178 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 2 +- + .../boot/dts/qcom-msm8974-sony-xperia-amami.dts | 436 ++++ + arch/arm/boot/dts/qcom-pm8941.dtsi | 6 + + arch/arm/boot/dts/r7s72100.dtsi | 1038 ++++---- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 4 +- + arch/arm/boot/dts/r8a73a4.dtsi | 10 +- + arch/arm/boot/dts/r8a7740.dtsi | 18 + + arch/arm/boot/dts/r8a7743-iwg20m.dtsi | 5 + + arch/arm/boot/dts/r8a7743.dtsi | 19 +- + arch/arm/boot/dts/r8a7745-iwg22m.dtsi | 5 + + arch/arm/boot/dts/r8a7745.dtsi | 19 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 48 + + arch/arm/boot/dts/r8a77470.dtsi | 336 +++ + arch/arm/boot/dts/r8a7790-lager.dts | 8 +- + arch/arm/boot/dts/r8a7790.dtsi | 67 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 11 +- + arch/arm/boot/dts/r8a7791-porter.dts | 8 +- + arch/arm/boot/dts/r8a7791.dtsi | 37 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 5 + + arch/arm/boot/dts/r8a7792-wheat.dts | 16 +- + arch/arm/boot/dts/r8a7792.dtsi | 19 +- + arch/arm/boot/dts/r8a7793-gose.dts | 11 +- + arch/arm/boot/dts/r8a7793.dtsi | 37 +- + arch/arm/boot/dts/r8a7794-alt.dts | 14 +- + arch/arm/boot/dts/r8a7794-silk.dts | 8 +- + arch/arm/boot/dts/r8a7794.dtsi | 28 +- + arch/arm/boot/dts/rk3036.dtsi | 2 + + arch/arm/boot/dts/rk322x.dtsi | 8 + + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 1 + + arch/arm/boot/dts/rk3288-tinker.dts | 4 + + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 3 +- + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 2 + + arch/arm/boot/dts/rk3288.dtsi | 20 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 5 +- + arch/arm/boot/dts/s3c2416.dtsi | 11 +- + arch/arm/boot/dts/s3c24xx.dtsi | 4 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 3 +- + arch/arm/boot/dts/s3c6410-smdk6410.dts | 3 +- + arch/arm/boot/dts/s3c64xx.dtsi | 4 +- + arch/arm/boot/dts/sh73a0.dtsi | 9 +- + arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi | 196 -- + arch/arm/boot/dts/ste-ccu8540.dts | 94 - + arch/arm/boot/dts/ste-ccu9540.dts | 79 - + arch/arm/boot/dts/ste-snowball.dts | 10 +- + arch/arm/boot/dts/stih407-family.dtsi | 52 +- + arch/arm/boot/dts/stih407-pinctrl.dtsi | 10 +- + arch/arm/boot/dts/stih407.dtsi | 2 +- + arch/arm/boot/dts/stih410.dtsi | 18 +- + arch/arm/boot/dts/stihxxx-b2120.dtsi | 4 +- + arch/arm/boot/dts/stm32f469-disco.dts | 53 +- + arch/arm/boot/dts/stm32f469.dtsi | 19 + + arch/arm/boot/dts/stm32f746-disco.dts | 8 + + arch/arm/boot/dts/stm32f746.dtsi | 36 + + arch/arm/boot/dts/stm32f769-disco.dts | 8 + + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 10 + + arch/arm/boot/dts/stm32h743.dtsi | 53 + + arch/arm/boot/dts/stm32h743i-eval.dts | 8 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 151 +- + arch/arm/boot/dts/stm32mp157c-ed1.dts | 57 +- + arch/arm/boot/dts/stm32mp157c-ev1.dts | 87 + + arch/arm/boot/dts/stm32mp157c.dtsi | 720 +++++- + .../arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts | 37 + + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 3 +- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 33 + + arch/arm/boot/dts/sun8i-a33.dtsi | 44 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 64 + + .../boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts | 13 + + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 + + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 206 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 21 + + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 28 + + arch/arm/boot/dts/sun8i-h3.dtsi | 32 +- + .../boot/dts/sun8i-r16-nintendo-nes-classic.dts | 56 + + .../dts/sun8i-r16-nintendo-super-nes-classic.dts | 11 + + arch/arm/boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 99 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 34 + + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 10 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 18 + + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 215 ++ + arch/arm/boot/dts/tegra114.dtsi | 5 + + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 6 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 6 +- + arch/arm/boot/dts/tegra30.dtsi | 14 + + arch/arm/boot/dts/uniphier-pro4.dtsi | 10 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 3 + + arch/arm/boot/dts/vexpress-v2m-rs1.dtsi | 712 +++--- + arch/arm/boot/dts/vexpress-v2m.dtsi | 710 +++--- + arch/arm/boot/dts/vexpress-v2p-ca15-tc1.dts | 3 +- + arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts | 9 +- + arch/arm/boot/dts/vexpress-v2p-ca5s.dts | 5 +- + arch/arm/boot/dts/vexpress-v2p-ca9.dts | 5 +- + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 6 - + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 4 - + arch/arm/boot/dts/vf610-zii-dev.dtsi | 4 + + arch/arm/boot/dts/vfxxx.dtsi | 2 +- + arch/arm/common/Makefile | 1 + + arch/arm/common/secure_cntvoff.S | 32 + + arch/arm/configs/bcm2835_defconfig | 2 + + arch/arm/configs/davinci_all_defconfig | 4 +- + arch/arm/configs/exynos_defconfig | 1 + + arch/arm/configs/imx_v6_v7_defconfig | 9 + + arch/arm/configs/multi_v7_defconfig | 12 +- + arch/arm/configs/shmobile_defconfig | 3 +- + arch/arm/include/asm/cputype.h | 14 +- + arch/arm/include/asm/secure_cntvoff.h | 8 + + arch/arm/include/debug/brcmstb.S | 21 +- + arch/arm/mach-berlin/Kconfig | 6 +- + arch/arm/mach-berlin/berlin.c | 5 +- + arch/arm/mach-berlin/headsmp.S | 5 +- + arch/arm/mach-berlin/platsmp.c | 6 +- + arch/arm/mach-davinci/aemif.c | 8 +- + arch/arm/mach-davinci/board-da830-evm.c | 1 + + arch/arm/mach-davinci/board-da850-evm.c | 1 + + arch/arm/mach-davinci/board-dm355-evm.c | 1 + + arch/arm/mach-davinci/board-dm355-leopard.c | 1 + + arch/arm/mach-davinci/board-dm365-evm.c | 1 + + arch/arm/mach-davinci/board-dm644x-evm.c | 3 + + arch/arm/mach-davinci/board-dm646x-evm.c | 1 + + arch/arm/mach-davinci/board-mityomapl138.c | 1 + + arch/arm/mach-davinci/board-neuros-osd2.c | 3 + + arch/arm/mach-davinci/board-sffsdr.c | 2 + + arch/arm/mach-davinci/davinci.h | 1 + + arch/arm/mach-davinci/dm644x.c | 13 +- + arch/arm/mach-exynos/Kconfig | 12 - + arch/arm/mach-exynos/common.h | 17 +- + arch/arm/mach-exynos/exynos.c | 37 +- + arch/arm/mach-exynos/include/mach/map.h | 2 - + arch/arm/mach-exynos/platsmp.c | 27 +- + arch/arm/mach-exynos/pm.c | 4 +- + arch/arm/mach-exynos/suspend.c | 4 +- + arch/arm/mach-imx/Kconfig | 1 + + arch/arm/mach-imx/mach-mx31_3ds.c | 18 +- + arch/arm/mach-imx/mach-mx31lilly.c | 12 +- + arch/arm/mach-imx/mach-mx31lite.c | 16 +- + arch/arm/mach-imx/mach-mx31moboard.c | 17 +- + arch/arm/mach-imx/mach-pca100.c | 13 +- + arch/arm/mach-imx/mach-pcm037.c | 13 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 5 +- + arch/arm/mach-imx/mach-pcm043.c | 13 +- + arch/arm/mach-imx/mach-vpr200.c | 9 +- + arch/arm/mach-meson/Kconfig | 9 +- + arch/arm/mach-meson/meson.c | 1 + + arch/arm/mach-omap1/board-ams-delta.c | 107 +- + arch/arm/mach-omap1/board-osk.c | 10 +- + arch/arm/mach-omap2/Makefile | 1 - + arch/arm/mach-omap2/board-generic.c | 2 - + arch/arm/mach-omap2/clockdomain.c | 73 + + arch/arm/mach-omap2/clockdomain.h | 8 + + arch/arm/mach-omap2/cm33xx.c | 53 + + arch/arm/mach-omap2/cminst44xx.c | 43 + + arch/arm/mach-omap2/common.h | 18 +- + arch/arm/mach-omap2/control.c | 112 + + arch/arm/mach-omap2/control.h | 61 + + arch/arm/mach-omap2/display.c | 10 +- + arch/arm/mach-omap2/hsmmc.c | 1 - + arch/arm/mach-omap2/i2c.c | 1 - + arch/arm/mach-omap2/io.c | 70 +- + arch/arm/mach-omap2/omap-pm-noop.c | 176 -- + arch/arm/mach-omap2/omap-pm.h | 161 -- + arch/arm/mach-omap2/omap_device.c | 22 +- + arch/arm/mach-omap2/omap_hwmod.c | 21 +- + arch/arm/mach-omap2/omap_hwmod.h | 6 +- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 1 + + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 + + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 1 + + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 + + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 3 + + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 6 + + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 1 + + arch/arm/mach-omap2/pdata-quirks.c | 15 - + arch/arm/mach-omap2/pm-debug.c | 5 - + arch/arm/mach-omap2/pm.c | 21 +- + arch/arm/mach-omap2/pm33xx-core.c | 4 +- + arch/arm/mach-omap2/pm44xx.c | 13 + + arch/arm/mach-omap2/powerdomain.c | 87 + + arch/arm/mach-omap2/powerdomain.h | 7 + + arch/arm/mach-omap2/prm33xx.c | 31 + + arch/arm/mach-omap2/prm44xx.c | 104 + + arch/arm/mach-omap2/timer.c | 100 +- + arch/arm/mach-pxa/pxa3xx.c | 4 + + arch/arm/mach-pxa/stargate2.c | 10 +- + arch/arm/mach-s3c24xx/h1940-bluetooth.c | 2 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 10 +- + arch/arm/mach-shmobile/Kconfig | 13 + + arch/arm/mach-shmobile/common.h | 1 - + arch/arm/mach-shmobile/headsmp-apmu.S | 22 +- + arch/arm/mach-shmobile/setup-rcar-gen2.c | 5 +- + arch/arm/mach-sunxi/Kconfig | 2 +- + arch/arm/mach-sunxi/Makefile | 2 +- + arch/arm/mach-sunxi/headsmp.S | 81 + + arch/arm/mach-sunxi/mc_smp.c | 239 +- + arch/arm/mach-sunxi/sunxi.c | 20 +- + arch/arm/mach-tegra/tegra.c | 4 + + arch/arm/mach-ux500/Kconfig | 53 +- + arch/arm/mach-ux500/cpu-db8500.c | 16 +- + arch/arm/mach-ux500/db8500-regs.h | 4 - + arch/arm/mm/cache-b15-rac.c | 30 +- + arch/arm/plat-omap/Kconfig | 10 - + arch/arm/plat-samsung/adc.c | 3 +- + arch/arm/plat-samsung/include/plat/map-s5p.h | 4 - + arch/arm64/Kconfig.platforms | 6 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 5 +- + arch/arm64/boot/dts/allwinner/axp803.dtsi | 5 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 21 + + .../allwinner/sun50i-h5-libretech-all-h3-cc.dts | 14 + + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 10 + + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 70 +- + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 106 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 453 +++- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 12 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 16 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 15 +- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 18 +- + arch/arm64/boot/dts/arm/juno-r1.dts | 8 +- + arch/arm64/boot/dts/arm/juno-r2.dts | 8 +- + arch/arm64/boot/dts/arm/juno.dts | 4 +- + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 4 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 453 ++-- + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 5 +- + arch/arm64/boot/dts/broadcom/Makefile | 3 +- + .../boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts | 2 + + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 80 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 18 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 10 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 147 ++ + .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 38 + + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 205 +- + arch/arm64/boot/dts/hisilicon/hip06-d03.dts | 8 + + arch/arm64/boot/dts/hisilicon/hip06.dtsi | 21 + + arch/arm64/boot/dts/hisilicon/hip07-d05.dts | 4 + + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 14 + + arch/arm64/boot/dts/hisilicon/poplar-pinctrl.dtsi | 98 + + arch/arm64/boot/dts/marvell/Makefile | 4 - + .../boot/dts/marvell/armada-3720-espressobin.dts | 27 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 6 + + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 5 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 10 + + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 70 + + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 1 + + arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts | 66 - + arch/arm64/boot/dts/marvell/berlin4ct-stb.dts | 66 - + arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h | 1123 +++++++++ + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 46 + + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 11 +- + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 99 + + arch/arm64/boot/dts/qcom/Makefile | 1 + + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 26 + + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 34 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 63 +- + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 62 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 313 ++- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +- + .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 17 + + arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 60 + + arch/arm64/boot/dts/qcom/msm8992.dtsi | 87 +- + arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi | 276 +++ + arch/arm64/boot/dts/qcom/msm8996.dtsi | 120 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 15 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 327 +++ + arch/arm64/boot/dts/renesas/Makefile | 3 +- + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 46 + + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 144 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 46 + + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 85 + + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 2499 +++++++++++--------- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 28 + + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 28 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 2395 +++++++++++-------- + .../arm64/boot/dts/renesas/r8a77965-salvator-x.dts | 28 + + .../boot/dts/renesas/r8a77965-salvator-xs.dts | 28 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1601 +++++++++---- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 116 + + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 137 ++ + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 661 ++++-- + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 81 + + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 60 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 99 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 65 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 281 +++ + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 730 +++--- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 187 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 37 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 10 + + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 10 + + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 8 + + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 8 +- + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 25 + + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 4 + + .../dts/rockchip/rk3399-sapphire-excavator.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 23 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 36 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 5 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 3 + + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 8 +- + arch/arm64/boot/dts/sprd/sc2731.dtsi | 11 + + arch/arm64/boot/dts/sprd/sc9860.dtsi | 32 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 55 +- + arch/arm64/boot/dts/synaptics/Makefile | 4 + + arch/arm64/boot/dts/synaptics/berlin4ct-dmp.dts | 29 + + arch/arm64/boot/dts/synaptics/berlin4ct-stb.dts | 29 + + .../boot/dts/{marvell => synaptics}/berlin4ct.dtsi | 39 +- + arch/arm64/configs/defconfig | 43 +- + drivers/bus/Kconfig | 1 - + drivers/bus/arm-cci.c | 2 - + drivers/bus/hisi_lpc.c | 159 +- + drivers/bus/ti-sysc.c | 388 ++- + drivers/cpufreq/scmi-cpufreq.c | 4 +- + drivers/firmware/arm_scmi/base.c | 43 +- + drivers/firmware/arm_scmi/bus.c | 22 +- + drivers/firmware/arm_scmi/clock.c | 24 +- + drivers/firmware/arm_scmi/common.h | 22 +- + drivers/firmware/arm_scmi/driver.c | 109 +- + drivers/firmware/arm_scmi/perf.c | 38 +- + drivers/firmware/arm_scmi/power.c | 16 +- + drivers/firmware/arm_scmi/sensors.c | 20 +- + drivers/firmware/qcom_scm.c | 3 + + drivers/firmware/ti_sci.c | 10 +- + drivers/firmware/ti_sci.h | 30 +- + drivers/media/rc/ir-rx51.c | 17 +- + drivers/memory/Kconfig | 10 - + drivers/memory/Makefile | 1 - + drivers/memory/brcmstb_dpfe.c | 42 +- + drivers/memory/omap-gpmc.c | 4 +- + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/mc.c | 362 ++- + drivers/memory/tegra/mc.h | 22 + + drivers/memory/tegra/tegra114.c | 33 + + drivers/memory/tegra/tegra124.c | 48 + + drivers/memory/tegra/tegra20.c | 296 +++ + drivers/memory/tegra/tegra210.c | 53 +- + drivers/memory/tegra/tegra30.c | 35 + + drivers/memory/tegra20-mc.c | 254 -- + drivers/memory/ti-aemif.c | 60 +- + drivers/mmc/host/sdhci-omap.c | 92 +- + drivers/mmc/host/sdhci.c | 148 +- + drivers/mmc/host/sdhci.h | 15 + + drivers/mtd/nand/raw/davinci_nand.c | 6 +- + drivers/of/platform.c | 1 + + drivers/reset/reset-uniphier.c | 13 +- + drivers/soc/Makefile | 2 +- + drivers/soc/imx/gpc.c | 18 +- + drivers/soc/imx/gpcv2.c | 22 +- + drivers/soc/mediatek/mtk-infracfg.c | 46 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 13 +- + drivers/soc/mediatek/mtk-scpsys.c | 167 +- + drivers/soc/qcom/Kconfig | 18 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/cmd-db.c | 317 +++ + drivers/soc/qcom/qcom-geni-se.c | 748 ++++++ + drivers/soc/qcom/qmi_interface.c | 5 +- + drivers/soc/qcom/smd-rpm.c | 1 + + drivers/soc/qcom/smem.c | 77 +- + drivers/soc/renesas/Kconfig | 13 +- + drivers/soc/renesas/Makefile | 2 + + drivers/soc/renesas/r8a77470-sysc.c | 29 + + drivers/soc/renesas/r8a77990-sysc.c | 68 + + drivers/soc/renesas/r8a77995-sysc.c | 3 +- + drivers/soc/renesas/rcar-rst.c | 2 + + drivers/soc/renesas/rcar-sysc.c | 6 + + drivers/soc/renesas/rcar-sysc.h | 2 + + drivers/soc/renesas/renesas-soc.c | 16 + + drivers/soc/rockchip/pm_domains.c | 117 +- + drivers/soc/samsung/pm_domains.c | 90 +- + drivers/soc/ti/knav_qmss.h | 14 +- + drivers/soc/ti/knav_qmss_queue.c | 60 +- + include/dt-bindings/clock/axg-aoclkc.h | 26 + + include/dt-bindings/clock/gxbb-clkc.h | 2 + + include/dt-bindings/clock/meson8b-clkc.h | 1 + + include/dt-bindings/memory/tegra114-mc.h | 17 + + include/dt-bindings/memory/tegra124-mc.h | 25 + + include/dt-bindings/memory/tegra20-mc.h | 21 + + include/dt-bindings/memory/tegra210-mc.h | 31 + + include/dt-bindings/memory/tegra30-mc.h | 19 + + include/dt-bindings/power/px30-power.h | 27 + + include/dt-bindings/power/r8a77470-sysc.h | 22 + + include/dt-bindings/power/r8a77990-sysc.h | 26 + + include/dt-bindings/power/rk3036-power.h | 13 + + include/dt-bindings/power/rk3128-power.h | 14 + + include/dt-bindings/power/rk3228-power.h | 21 + + include/dt-bindings/reset/axg-aoclkc.h | 20 + + include/linux/mmc/host.h | 4 + + include/linux/platform_data/media/ir-rx51.h | 9 - + include/linux/platform_data/mtd-davinci.h | 10 + + include/linux/platform_data/spi-imx.h | 29 +- + include/linux/platform_data/ti-aemif.h | 25 + + include/linux/platform_data/ti-sysc.h | 1 + + include/linux/qcom-geni-se.h | 425 ++++ + include/linux/scmi_protocol.h | 18 +- + include/linux/soc/qcom/smem.h | 2 + + include/linux/soc/ti/ti_sci_protocol.h | 10 +- + include/soc/qcom/cmd-db.h | 45 + + include/soc/tegra/cpuidle.h | 2 +- + include/soc/tegra/mc.h | 37 +- + sound/soc/omap/ams-delta.c | 38 +- + 746 files changed, 30409 insertions(+), 11727 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra30-mc.txt + rename Documentation/devicetree/bindings/{arm/tegra => memory-controllers}/nvidia,tegra20-mc.txt (57%) + create mode 100644 Documentation/devicetree/bindings/net/qualcomm-bluetooth.txt + create mode 100644 Documentation/devicetree/bindings/reserved-memory/qcom,cmd-db.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,geni-se.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-osd335x-common.dtsi + create mode 100644 arch/arm/boot/dts/am335x-pocketbeagle.dts + create mode 100644 arch/arm/boot/dts/am3517-som.dtsi + create mode 100644 arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-lanyang.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-portwell-neptune.dts + create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts + create mode 100644 arch/arm/boot/dts/bcm283x-rpi-lan7515.dtsi + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts + create mode 100644 arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts + create mode 100644 arch/arm/boot/dts/berlin2cd-valve-steamlink.dts + create mode 100644 arch/arm/boot/dts/dra7-mmc-iodelay.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5440-sd5v1.dts + delete mode 100644 arch/arm/boot/dts/exynos5440-ssdk5440.dts + delete mode 100644 arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5440-trip-points.dtsi + delete mode 100644 arch/arm/boot/dts/exynos5440.dtsi + create mode 100644 arch/arm/boot/dts/imx6dl-mamoj.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-pdk2.dts + create mode 100644 arch/arm/boot/dts/imx6q-dhcom-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6q-icore-mipi.dts + create mode 100644 arch/arm/boot/dts/imx6q-kp-tpc.dts + create mode 100644 arch/arm/boot/dts/imx6q-kp.dtsi + create mode 100644 arch/arm/boot/dts/meson8m2-mxiii-plus.dts + create mode 100644 arch/arm/boot/dts/meson8m2.dtsi + create mode 100644 arch/arm/boot/dts/mt7623a-rfb-emmc.dts + create mode 100644 arch/arm/boot/dts/mt7623a-rfb-nand.dts + create mode 100644 arch/arm/boot/dts/mt7623a.dtsi + create mode 100644 arch/arm/boot/dts/mt7623n-rfb-emmc.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c1.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1-c3.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk04.1.dtsi + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c1.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1-c2.dts + create mode 100644 arch/arm/boot/dts/qcom-ipq4019-ap.dk07.1.dtsi + create mode 100644 arch/arm/boot/dts/qcom-msm8974-sony-xperia-amami.dts + create mode 100644 arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts + create mode 100644 arch/arm/boot/dts/r8a77470.dtsi + delete mode 100644 arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/ste-ccu8540.dts + delete mode 100644 arch/arm/boot/dts/ste-ccu9540.dts + create mode 100644 arch/arm/boot/dts/stm32f469.dtsi + create mode 100644 arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-libretech-all-h3-cc.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts + create mode 100644 arch/arm/boot/dts/sun8i-r16-nintendo-super-nes-classic.dts + create mode 100644 arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi + create mode 100644 arch/arm/common/secure_cntvoff.S + create mode 100644 arch/arm/include/asm/secure_cntvoff.h + delete mode 100644 arch/arm/mach-omap2/omap-pm-noop.c + delete mode 100644 arch/arm/mach-omap2/omap-pm.h + create mode 100644 arch/arm/mach-sunxi/headsmp.S + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-libretech-all-h3-cc.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b-plus.dts + create mode 100644 arch/arm64/boot/dts/hisilicon/poplar-pinctrl.dtsi + delete mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-dmp.dts + delete mode 100644 arch/arm64/boot/dts/marvell/berlin4ct-stb.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h + create mode 100644 arch/arm64/boot/dts/qcom/msm8994-smd-rpm.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm845-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm845.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77990.dtsi + create mode 100644 arch/arm64/boot/dts/synaptics/Makefile + create mode 100644 arch/arm64/boot/dts/synaptics/berlin4ct-dmp.dts + create mode 100644 arch/arm64/boot/dts/synaptics/berlin4ct-stb.dts + rename arch/arm64/boot/dts/{marvell => synaptics}/berlin4ct.dtsi (78%) + create mode 100644 drivers/memory/tegra/tegra20.c + delete mode 100644 drivers/memory/tegra20-mc.c + create mode 100644 drivers/soc/qcom/cmd-db.c + create mode 100644 drivers/soc/qcom/qcom-geni-se.c + create mode 100644 drivers/soc/renesas/r8a77470-sysc.c + create mode 100644 drivers/soc/renesas/r8a77990-sysc.c + create mode 100644 include/dt-bindings/clock/axg-aoclkc.h + create mode 100644 include/dt-bindings/memory/tegra20-mc.h + create mode 100644 include/dt-bindings/power/px30-power.h + create mode 100644 include/dt-bindings/power/r8a77470-sysc.h + create mode 100644 include/dt-bindings/power/r8a77990-sysc.h + create mode 100644 include/dt-bindings/power/rk3036-power.h + create mode 100644 include/dt-bindings/power/rk3128-power.h + create mode 100644 include/dt-bindings/power/rk3228-power.h + create mode 100644 include/dt-bindings/reset/axg-aoclkc.h + delete mode 100644 include/linux/platform_data/media/ir-rx51.h + create mode 100644 include/linux/qcom-geni-se.h + create mode 100644 include/soc/qcom/cmd-db.h +Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (9999d2013e27 Merge branch 'v4.18/defconfig' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 3 --- + 1 file changed, 3 deletions(-) +Merging aspeed/for-next (6534b2d0de36 Merge branch 'dt-for-v4.17' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (20d3f36b0fea Merge tag 'at91-ab-4.17-dt2' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (5c483a0c319c Merge branch anholt/bcm2835-defconfig-64-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (452daaaf6021 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 (fb5d812c3cb3 Merge branch 'for_4.18/keystone-dts' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (9378b3427341 Merge branch 'v4.17-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (78e5d8c26c70 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-385-synology-ds116.dts | 2 +- + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging omap/for-next (1b7e42c1dfe8 Merge branch 'omap-for-v4.18/soc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/dra7.dtsi | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging reset/reset/next (d7bab65b1f57 reset: uniphier: add LD11/LD20 stream demux system reset control) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (509d20563e5d firmware: qcom: scm: Fix crash in qcom_scm_call_atomic1()) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (e800ff91fb67 Merge branches 'fixes-for-v4.17', 'arm64-dt-for-v4.18', 'arm64-defconfig-for-v4.18', 'defconfig-for-v4.18', 'dt-bindings-for-v4.18', 'dt-for-v4.18' and 'soc-for-v4.18' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (42568f346f65 Merge branch 'v4.18-clk/next' into for-next) +$ git merge rockchip/for-next +Removing drivers/clk/rockchip/clk-rockchip.c +Removing Documentation/devicetree/bindings/clock/rockchip.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/rockchip.txt | 77 ----------------- + drivers/clk/rockchip/Makefile | 1 - + drivers/clk/rockchip/clk-rockchip.c | 98 ---------------------- + drivers/clk/rockchip/clk.c | 16 ++-- + 4 files changed, 5 insertions(+), 187 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/rockchip.txt + delete mode 100644 drivers/clk/rockchip/clk-rockchip.c +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (fba97222728d Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (e97360054391 Merge branch 'sunxi/dt64-for-4.18' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 3 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 188 +++++++++++++++++++ + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 12 ++ + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 12 ++ + drivers/clk/Makefile | 2 +- + drivers/clk/sunxi-ng/Kconfig | 5 + + drivers/clk/sunxi-ng/Makefile | 40 ++-- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 207 +++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h | 19 ++ + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 72 +++++-- + include/dt-bindings/clock/sun50i-h6-r-ccu.h | 24 +++ + include/dt-bindings/reset/sun50i-h6-r-ccu.h | 17 ++ + 13 files changed, 565 insertions(+), 37 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-amarula-relic.dts + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c + create mode 100644 drivers/clk/sunxi-ng/ccu-sun50i-h6-r.h + create mode 100644 include/dt-bindings/clock/sun50i-h6-r-ccu.h + create mode 100644 include/dt-bindings/reset/sun50i-h6-r-ccu.h +Merging tegra/for-next (6de9ae597a79 Merge branch for-4.18/clk into for-next) +$ git merge tegra/for-next +Merge made by the 'recursive' strategy. + drivers/clk/tegra/clk-tegra114.c | 2 +- + drivers/clk/tegra/clk-tegra124.c | 2 +- + drivers/clk/tegra/clk-tegra20.c | 52 ++++++++++++++++++++++++++++++++++++---- + drivers/clk/tegra/clk-tegra210.c | 2 +- + drivers/clk/tegra/clk-tegra30.c | 2 +- + drivers/clk/tegra/clk.c | 5 ++-- + drivers/clk/tegra/clk.h | 2 +- + 7 files changed, 55 insertions(+), 12 deletions(-) +Merging arm64/for-next/core (38500be10e46 arm64: KVM: Move VCPU_WORKAROUND_2_FLAG macros to the top of the file) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/mm/dma-mapping.c +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/include/asm/kvm_mmu.h +Auto-merging arch/arm/include/asm/kvm_host.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 17 + + arch/arm/include/asm/kvm_host.h | 12 + + arch/arm/include/asm/kvm_mmu.h | 5 + + arch/arm64/Kconfig | 15 +- + arch/arm64/include/asm/acpi.h | 4 + + arch/arm64/include/asm/cache.h | 6 +- + arch/arm64/include/asm/cmpxchg.h | 4 +- + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 22 + + arch/arm64/include/asm/elf.h | 13 + + arch/arm64/include/asm/fpsimdmacros.h | 12 +- + arch/arm64/include/asm/kvm_asm.h | 30 +- + arch/arm64/include/asm/kvm_host.h | 26 + + arch/arm64/include/asm/kvm_mmu.h | 25 +- + arch/arm64/include/asm/processor.h | 5 + + arch/arm64/include/asm/thread_info.h | 1 + + arch/arm64/include/asm/topology.h | 6 +- + arch/arm64/include/uapi/asm/auxvec.h | 3 +- + arch/arm64/kernel/Makefile | 1 + + arch/arm64/kernel/armv8_deprecated.c | 3 +- + arch/arm64/kernel/asm-offsets.c | 1 + + arch/arm64/kernel/cacheinfo.c | 15 +- + arch/arm64/kernel/cpu_errata.c | 180 +++++++ + arch/arm64/kernel/cpufeature.c | 10 +- + arch/arm64/kernel/entry-fpsimd.S | 2 +- + arch/arm64/kernel/entry.S | 30 ++ + arch/arm64/kernel/fpsimd.c | 18 +- + arch/arm64/kernel/hibernate.c | 11 + + arch/arm64/kernel/ptrace.c | 5 - + arch/arm64/kernel/signal.c | 52 +- + arch/arm64/kernel/ssbd.c | 110 ++++ + arch/arm64/kernel/suspend.c | 8 + + arch/arm64/kernel/topology.c | 107 +++- + arch/arm64/kernel/vmlinux.lds.S | 20 +- + arch/arm64/kvm/hyp/hyp-entry.S | 38 +- + arch/arm64/kvm/hyp/switch.c | 42 ++ + arch/arm64/kvm/reset.c | 4 + + arch/arm64/mm/dma-mapping.c | 5 + + arch/arm64/mm/fault.c | 46 +- + arch/riscv/kernel/cacheinfo.c | 1 - + drivers/acpi/Kconfig | 3 + + drivers/acpi/Makefile | 1 + + drivers/acpi/pptt.c | 655 ++++++++++++++++++++++++ + drivers/acpi/tables.c | 2 +- + drivers/base/cacheinfo.c | 157 +++--- + include/linux/acpi.h | 4 + + include/linux/arm-smccc.h | 10 + + include/linux/cacheinfo.h | 25 +- + virt/kvm/arm/arm.c | 4 + + virt/kvm/arm/psci.c | 18 +- + 50 files changed, 1608 insertions(+), 189 deletions(-) + create mode 100644 arch/arm64/kernel/ssbd.c + create mode 100644 drivers/acpi/pptt.c +Merging clk/clk-next (55913c2d3330 Merge branch 'clk-imx6ul' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/clk-provider.h +Auto-merging drivers/soc/rockchip/pm_domains.c +Auto-merging drivers/clk/meson/meson8b.c +Auto-merging drivers/clk/meson/gxbb-aoclk.h +Auto-merging drivers/clk/meson/clk-regmap.c +Auto-merging drivers/clk/imx/clk-imx6ul.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/clk/Makefile +Auto-merging drivers/clk/Kconfig +Auto-merging arch/arm/boot/dts/imx7s.dtsi +Auto-merging arch/arm/boot/dts/imx7d.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/clk.rst +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,g3dsys.txt | 30 + + .../devicetree/bindings/clock/actions,s900-cmu.txt | 47 + + .../bindings/clock/brcm,iproc-clocks.txt | 26 +- + .../bindings/clock/nuvoton,npcm750-clk.txt | 100 + + .../devicetree/bindings/clock/qcom,gcc.txt | 2 + + .../devicetree/bindings/clock/qcom,rpmh-clk.txt | 22 + + .../devicetree/bindings/clock/qcom,videocc.txt | 19 + + .../devicetree/bindings/clock/renesas,cpg-mssr.txt | 10 +- + Documentation/driver-api/clk.rst | 2 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/imx7d.dtsi | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 2 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 2 + + drivers/clk/actions/Kconfig | 14 + + drivers/clk/actions/Makefile | 12 + + drivers/clk/actions/owl-common.c | 89 + + drivers/clk/actions/owl-common.h | 41 + + drivers/clk/actions/owl-composite.c | 199 ++ + drivers/clk/actions/owl-composite.h | 124 + + drivers/clk/actions/owl-divider.c | 94 + + drivers/clk/actions/owl-divider.h | 75 + + drivers/clk/actions/owl-factor.c | 222 ++ + drivers/clk/actions/owl-factor.h | 83 + + drivers/clk/actions/owl-fixed-factor.h | 28 + + drivers/clk/actions/owl-gate.c | 77 + + drivers/clk/actions/owl-gate.h | 73 + + drivers/clk/actions/owl-mux.c | 60 + + drivers/clk/actions/owl-mux.h | 61 + + drivers/clk/actions/owl-pll.c | 194 ++ + drivers/clk/actions/owl-pll.h | 92 + + drivers/clk/actions/owl-s900.c | 721 ++++ + drivers/clk/at91/clk-pll.c | 13 +- + drivers/clk/bcm/clk-bcm2835.c | 42 +- + drivers/clk/bcm/clk-sr.c | 135 +- + drivers/clk/berlin/berlin2-avpll.c | 13 +- + drivers/clk/berlin/berlin2-avpll.h | 13 +- + drivers/clk/berlin/berlin2-div.c | 13 +- + drivers/clk/berlin/berlin2-div.h | 13 +- + drivers/clk/berlin/berlin2-pll.c | 13 +- + drivers/clk/berlin/berlin2-pll.h | 13 +- + drivers/clk/berlin/bg2.c | 13 +- + drivers/clk/berlin/bg2q.c | 13 +- + drivers/clk/berlin/common.h | 13 +- + drivers/clk/clk-aspeed.c | 57 +- + drivers/clk/clk-bulk.c | 5 +- + drivers/clk/clk-npcm7xx.c | 656 ++++ + drivers/clk/clk-si544.c | 1 + + drivers/clk/clk-stm32mp1.c | 12 +- + drivers/clk/clk.c | 171 +- + drivers/clk/davinci/pll-da830.c | 5 +- + drivers/clk/davinci/pll-da850.c | 37 +- + drivers/clk/davinci/pll-dm355.c | 22 +- + drivers/clk/davinci/pll-dm365.c | 9 +- + drivers/clk/davinci/pll-dm644x.c | 9 +- + drivers/clk/davinci/pll-dm646x.c | 11 +- + drivers/clk/davinci/pll.c | 314 +- + drivers/clk/davinci/pll.h | 41 +- + drivers/clk/davinci/psc-da830.c | 3 +- + drivers/clk/davinci/psc-dm355.c | 7 +- + drivers/clk/davinci/psc-dm365.c | 22 +- + drivers/clk/davinci/psc-dm644x.c | 3 +- + drivers/clk/davinci/psc-dm646x.c | 3 +- + drivers/clk/davinci/psc.c | 72 +- + drivers/clk/davinci/psc.h | 12 + + drivers/clk/hisilicon/Kconfig | 13 +- + drivers/clk/hisilicon/crg-hi3798cv200.c | 17 + + drivers/clk/imx/clk-imx6q.c | 2 + + drivers/clk/imx/clk-imx6sl.c | 2 +- + drivers/clk/imx/clk-imx6sx.c | 17 +- + drivers/clk/imx/clk-imx6ul.c | 20 +- + drivers/clk/imx/clk-imx7d.c | 17 +- + drivers/clk/ingenic/cgu.c | 8 +- + drivers/clk/ingenic/cgu.h | 4 + + drivers/clk/ingenic/jz4770-cgu.c | 49 +- + drivers/clk/mediatek/Kconfig | 6 + + drivers/clk/mediatek/Makefile | 1 + + drivers/clk/mediatek/clk-mt2701-g3d.c | 95 + + drivers/clk/mediatek/clk-mt2701.c | 8 +- + drivers/clk/meson/Kconfig | 8 + + drivers/clk/meson/Makefile | 3 +- + drivers/clk/meson/axg-aoclk.c | 164 + + drivers/clk/meson/axg-aoclk.h | 29 + + drivers/clk/meson/axg.c | 4 + + drivers/clk/meson/clk-audio-divider.c | 13 +- + drivers/clk/meson/clk-mpll.c | 76 +- + drivers/clk/meson/clk-pll.c | 13 +- + drivers/clk/meson/clk-regmap.c | 6 +- + drivers/clk/meson/clk-regmap.h | 8 +- + drivers/clk/meson/clkc.h | 16 +- + drivers/clk/meson/gxbb-aoclk-32k.c | 3 +- + drivers/clk/meson/gxbb-aoclk.c | 147 +- + drivers/clk/meson/gxbb-aoclk.h | 8 +- + drivers/clk/meson/gxbb.c | 129 +- + drivers/clk/meson/gxbb.h | 58 +- + drivers/clk/meson/meson-aoclk.c | 81 + + drivers/clk/meson/meson-aoclk.h | 34 + + drivers/clk/meson/meson8b.c | 77 +- + drivers/clk/meson/meson8b.h | 18 +- + drivers/clk/mvebu/clk-corediv.c | 2 +- + drivers/clk/qcom/Kconfig | 27 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/clk-alpha-pll.c | 302 +- + drivers/clk/qcom/clk-alpha-pll.h | 18 +- + drivers/clk/qcom/clk-branch.c | 7 +- + drivers/clk/qcom/clk-branch.h | 1 + + drivers/clk/qcom/clk-rcg.h | 17 +- + drivers/clk/qcom/clk-rcg2.c | 168 +- + drivers/clk/qcom/common.c | 32 +- + drivers/clk/qcom/gcc-msm8996.c | 8 +- + drivers/clk/qcom/gcc-msm8998.c | 2834 ++++++++++++++++ + drivers/clk/qcom/gcc-sdm845.c | 3465 ++++++++++++++++++++ + drivers/clk/qcom/gdsc.c | 102 +- + drivers/clk/qcom/gdsc.h | 6 +- + drivers/clk/qcom/mmcc-msm8996.c | 22 +- + drivers/clk/qcom/videocc-sdm845.c | 358 ++ + drivers/clk/renesas/Kconfig | 10 + + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/r8a7743-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7745-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77470-cpg-mssr.c | 229 ++ + drivers/clk/renesas/r8a7791-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7792-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a7794-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 4 + + drivers/clk/renesas/r8a77980-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 289 ++ + drivers/clk/renesas/rcar-gen2-cpg.c | 24 + + drivers/clk/renesas/renesas-cpg-mssr.c | 12 + + drivers/clk/renesas/renesas-cpg-mssr.h | 2 + + drivers/clk/samsung/clk-s3c2410-dclk.c | 6 +- + drivers/clk/socfpga/clk-s10.c | 40 +- + drivers/clk/spear/spear6xx_clock.c | 2 +- + drivers/clk/tegra/clk-dfll.c | 42 +- + drivers/clk/uniphier/clk-uniphier-sys.c | 5 + + drivers/clocksource/timer-sp804.c | 3 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 4 +- + drivers/soc/rockchip/pm_domains.c | 4 +- + drivers/soc/tegra/pmc.c | 3 +- + include/dt-bindings/clock/actions,s900-cmu.h | 129 + + include/dt-bindings/clock/aspeed-clock.h | 4 +- + include/dt-bindings/clock/bcm-sr.h | 24 +- + include/dt-bindings/clock/histb-clock.h | 8 + + include/dt-bindings/clock/imx6qdl-clock.h | 4 +- + include/dt-bindings/clock/imx6sx-clock.h | 6 +- + include/dt-bindings/clock/imx6ul-clock.h | 33 +- + include/dt-bindings/clock/imx7d-clock.h | 4 +- + include/dt-bindings/clock/mt2701-clk.h | 20 +- + include/dt-bindings/clock/nuvoton,npcm7xx-clock.h | 44 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 208 ++ + include/dt-bindings/clock/qcom,gcc-sdm845.h | 239 ++ + include/dt-bindings/clock/qcom,rpmh.h | 22 + + include/dt-bindings/clock/qcom,videocc-sdm845.h | 35 + + include/dt-bindings/clock/r8a77470-cpg-mssr.h | 36 + + include/dt-bindings/clock/r8a77990-cpg-mssr.h | 62 + + include/dt-bindings/reset/mt2701-resets.h | 3 + + include/linux/clk-provider.h | 23 +- + include/linux/clk/davinci.h | 40 + + include/linux/of_clk.h | 30 + + 159 files changed, 13396 insertions(+), 1101 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,g3dsys.txt + create mode 100644 Documentation/devicetree/bindings/clock/actions,s900-cmu.txt + create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,rpmh-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,videocc.txt + create mode 100644 drivers/clk/actions/Kconfig + create mode 100644 drivers/clk/actions/Makefile + create mode 100644 drivers/clk/actions/owl-common.c + create mode 100644 drivers/clk/actions/owl-common.h + create mode 100644 drivers/clk/actions/owl-composite.c + create mode 100644 drivers/clk/actions/owl-composite.h + create mode 100644 drivers/clk/actions/owl-divider.c + create mode 100644 drivers/clk/actions/owl-divider.h + create mode 100644 drivers/clk/actions/owl-factor.c + create mode 100644 drivers/clk/actions/owl-factor.h + create mode 100644 drivers/clk/actions/owl-fixed-factor.h + create mode 100644 drivers/clk/actions/owl-gate.c + create mode 100644 drivers/clk/actions/owl-gate.h + create mode 100644 drivers/clk/actions/owl-mux.c + create mode 100644 drivers/clk/actions/owl-mux.h + create mode 100644 drivers/clk/actions/owl-pll.c + create mode 100644 drivers/clk/actions/owl-pll.h + create mode 100644 drivers/clk/actions/owl-s900.c + create mode 100644 drivers/clk/clk-npcm7xx.c + create mode 100644 drivers/clk/mediatek/clk-mt2701-g3d.c + create mode 100644 drivers/clk/meson/axg-aoclk.c + create mode 100644 drivers/clk/meson/axg-aoclk.h + create mode 100644 drivers/clk/meson/meson-aoclk.c + create mode 100644 drivers/clk/meson/meson-aoclk.h + create mode 100644 drivers/clk/qcom/gcc-msm8998.c + create mode 100644 drivers/clk/qcom/gcc-sdm845.c + create mode 100644 drivers/clk/qcom/videocc-sdm845.c + create mode 100644 drivers/clk/renesas/r8a77470-cpg-mssr.c + create mode 100644 drivers/clk/renesas/r8a77990-cpg-mssr.c + create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h + create mode 100644 include/dt-bindings/clock/nuvoton,npcm7xx-clock.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8998.h + create mode 100644 include/dt-bindings/clock/qcom,gcc-sdm845.h + create mode 100644 include/dt-bindings/clock/qcom,rpmh.h + create mode 100644 include/dt-bindings/clock/qcom,videocc-sdm845.h + create mode 100644 include/dt-bindings/clock/r8a77470-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/r8a77990-cpg-mssr.h + create mode 100644 include/linux/clk/davinci.h + create mode 100644 include/linux/of_clk.h +Merging clk-samsung/for-next (e8cf870f253b clk: samsung: simplify getting .drvdata) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (85fa2cc51104 c6x: pass endianness info to sparse) +$ git merge c6x/for-linux-next +Already up to date. +Merging m68k/for-next (b12c8a70643f m68k: Set default dma mask for platform devices) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (082f55c45984 m68k: fix ColdFire PCI config reads and writes) +$ git merge m68knommu/for-next +Auto-merging arch/m68k/mm/kmap.c +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig.bus | 8 +- + arch/m68k/coldfire/pci.c | 114 +--------------- + arch/m68k/include/asm/atarihw.h | 1 + + arch/m68k/include/asm/io.h | 10 +- + arch/m68k/include/asm/io_mm.h | 98 ++------------ + arch/m68k/include/asm/io_no.h | 253 +++++++++++++++--------------------- + arch/m68k/include/asm/kmap.h | 80 ++++++++++++ + arch/m68k/include/asm/nubus.h | 1 + + arch/m68k/include/asm/q40_master.h | 2 +- + arch/m68k/include/asm/raw_io.h | 14 -- + arch/m68k/include/asm/vga.h | 9 ++ + arch/m68k/include/asm/virtconvert.h | 2 + + arch/m68k/include/asm/zorro.h | 1 + + arch/m68k/mm/kmap.c | 8 ++ + 14 files changed, 230 insertions(+), 371 deletions(-) + create mode 100644 arch/m68k/include/asm/kmap.h +Merging microblaze/next (a7a9e2f0410d microblaze: dts: replace 'linux,stdout-path' with 'stdout-path') +$ git merge microblaze/next +Removing arch/microblaze/kernel/early_printk.c +Removing arch/microblaze/include/asm/prom.h +Auto-merging arch/microblaze/include/asm/pci.h +Merge made by the 'recursive' strategy. + arch/microblaze/Kconfig.debug | 8 -- + arch/microblaze/boot/Makefile | 10 +- + arch/microblaze/boot/dts/system.dts | 2 +- + arch/microblaze/include/asm/cpuinfo.h | 2 +- + arch/microblaze/include/asm/pci.h | 1 - + arch/microblaze/include/asm/prom.h | 27 ----- + arch/microblaze/include/asm/setup.h | 5 - + arch/microblaze/kernel/Makefile | 1 - + arch/microblaze/kernel/early_printk.c | 184 ---------------------------------- + arch/microblaze/kernel/misc.S | 35 ------- + arch/microblaze/kernel/platform.c | 1 - + arch/microblaze/kernel/prom.c | 82 --------------- + arch/microblaze/kernel/setup.c | 17 +--- + arch/microblaze/pci/indirect_pci.c | 1 - + 14 files changed, 12 insertions(+), 364 deletions(-) + delete mode 100644 arch/microblaze/include/asm/prom.h + delete mode 100644 arch/microblaze/kernel/early_printk.c +Merging mips/mips-next (d1157b107434 MIPS: ptrace: Make FPU context layout comments match reality) +$ git merge mips/mips-next +Auto-merging lib/Makefile +Auto-merging lib/Kconfig +Auto-merging arch/riscv/Kconfig +Removing arch/mips/lib/ucmpdi2.c +Removing arch/mips/lib/lshrdi3.c +Removing arch/mips/lib/cmpdi2.c +Removing arch/mips/lib/ashrdi3.c +Removing arch/mips/lib/ashldi3.c +Auto-merging arch/mips/kernel/ptrace32.c +Auto-merging arch/mips/kernel/ptrace.c +Auto-merging arch/mips/boot/dts/xilfpga/Makefile +CONFLICT (content): Merge conflict in arch/mips/boot/dts/xilfpga/Makefile +Auto-merging arch/mips/Kconfig +Resolved 'arch/mips/boot/dts/xilfpga/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b3de7cb4918e] Merge remote-tracking branch 'mips/mips-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 7 +- + arch/mips/Kconfig | 5 ++ + arch/mips/bcm47xx/board.c | 2 + + arch/mips/bcm47xx/buttons.c | 9 +++ + arch/mips/bcm47xx/leds.c | 11 ++- + arch/mips/boot/compressed/Makefile | 11 ++- + arch/mips/boot/dts/brcm/Makefile | 2 +- + arch/mips/boot/dts/cavium-octeon/Makefile | 2 +- + arch/mips/boot/dts/ingenic/Makefile | 2 +- + arch/mips/boot/dts/ingenic/jz4740.dtsi | 8 ++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 5 +- + arch/mips/boot/dts/lantiq/Makefile | 2 +- + arch/mips/boot/dts/mscc/Makefile | 2 +- + arch/mips/boot/dts/mscc/ocelot.dtsi | 88 +++++++++++++++++++++ + arch/mips/boot/dts/mscc/ocelot_pcb123.dts | 20 +++++ + arch/mips/boot/dts/mti/Makefile | 2 +- + arch/mips/boot/dts/netlogic/Makefile | 2 +- + arch/mips/boot/dts/pic32/Makefile | 2 +- + arch/mips/boot/dts/ralink/Makefile | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 + + arch/mips/dec/time.c | 12 +-- + arch/mips/include/asm/cpu-features.h | 7 ++ + arch/mips/include/asm/cpu.h | 2 + + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-jz4740/platform.h | 1 - + arch/mips/include/asm/mc146818-time.h | 4 +- + arch/mips/include/asm/mipsregs.h | 5 ++ + arch/mips/include/asm/time.h | 9 --- + arch/mips/jz4740/platform.c | 16 ---- + arch/mips/jz4740/reset.c | 31 -------- + arch/mips/kernel/cpu-probe.c | 12 +++ + arch/mips/kernel/perf_event_mipsxx.c | 91 ++++++++++------------ + arch/mips/kernel/ptrace.c | 4 +- + arch/mips/kernel/ptrace32.c | 4 +- + arch/mips/kernel/time.c | 15 ---- + arch/mips/kernel/vpe.c | 2 +- + arch/mips/lasat/ds1603.c | 11 ++- + arch/mips/lasat/sysctl.c | 12 ++- + arch/mips/lib/Makefile | 3 +- + arch/mips/lib/ashldi3.c | 30 ------- + arch/mips/lib/ashrdi3.c | 32 -------- + arch/mips/lib/cmpdi2.c | 28 ------- + arch/mips/lib/lshrdi3.c | 30 ------- + arch/mips/lib/memset.S | 28 +++---- + arch/mips/lib/ucmpdi2.c | 22 ------ + arch/mips/loongson64/common/time.c | 2 +- + arch/mips/mm/sc-debugfs.c | 9 +-- + arch/mips/mti-malta/malta-time.c | 2 +- + arch/mips/oprofile/op_model_mipsxx.c | 2 - + arch/mips/sibyte/swarm/rtc_m41t81.c | 8 +- + arch/mips/sibyte/swarm/rtc_xicor1241.c | 8 +- + arch/mips/sibyte/swarm/setup.c | 18 +++-- + arch/mips/sni/time.c | 6 -- + arch/riscv/Kconfig | 6 +- + drivers/firmware/broadcom/bcm47xx_nvram.c | 2 +- + drivers/watchdog/jz4740_wdt.c | 42 ++++------ + lib/Kconfig | 12 +-- + lib/Makefile | 12 +-- + lib/ucmpdi2.c | 2 +- + 59 files changed, 337 insertions(+), 392 deletions(-) + delete mode 100644 arch/mips/lib/ashldi3.c + delete mode 100644 arch/mips/lib/ashrdi3.c + delete mode 100644 arch/mips/lib/cmpdi2.c + delete mode 100644 arch/mips/lib/lshrdi3.c + delete mode 100644 arch/mips/lib/ucmpdi2.c +Merging nds32/next (e5dd7e2f8a59 nds32: define __NDS32_E[BL]__ for sparse) +$ git merge nds32/next +Merge made by the 'recursive' strategy. + arch/nds32/Makefile | 2 ++ + 1 file changed, 2 insertions(+) +Merging nios2/for-next (3d9644ef9a0f nios2: Use read_persistent_clock64() instead of read_persistent_clock()) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (d56f3af9e801 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (8d40c754fbac parisc: Drop struct sigaction from not exported header file) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/Makefile +Merge made by the 'recursive' strategy. + arch/parisc/Makefile | 4 ---- + arch/parisc/include/asm/signal.h | 8 -------- + 2 files changed, 12 deletions(-) +Merging powerpc/next (04debf21fa17 powerpc: Remove core support for Marvell mv64x60 hostbridges) +$ git merge powerpc/next +Removing tools/testing/selftests/powerpc/context_switch/cp_abort.c +Removing tools/testing/selftests/powerpc/context_switch/Makefile +Removing tools/testing/selftests/powerpc/context_switch/.gitignore +Auto-merging kernel/sys_ni.c +Auto-merging include/linux/mm.h +Auto-merging fs/proc/task_mmu.c +Auto-merging drivers/macintosh/via-pmu.c +Auto-merging arch/x86/include/asm/pkeys.h +Auto-merging arch/x86/include/asm/mmu_context.h +Removing arch/powerpc/sysdev/mv64x60_udbg.c +Removing arch/powerpc/sysdev/mv64x60_pic.c +Removing arch/powerpc/sysdev/mv64x60_pci.c +Removing arch/powerpc/sysdev/mv64x60_dev.c +Removing arch/powerpc/sysdev/mv64x60.h +Auto-merging arch/powerpc/platforms/pseries/setup.c +Auto-merging arch/powerpc/platforms/powernv/setup.c +Removing arch/powerpc/platforms/embedded6xx/c2k.c +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Removing arch/powerpc/platforms/83xx/sbc834x.c +Auto-merging arch/powerpc/lib/feature-fixups.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_radix.c +Auto-merging arch/powerpc/kernel/vmlinux.lds.S +Auto-merging arch/powerpc/kernel/trace/ftrace.c +Auto-merging arch/powerpc/kernel/security.c +Auto-merging arch/powerpc/kernel/rtas-proc.c +Auto-merging arch/powerpc/kernel/module_64.c +CONFLICT (content): Merge conflict in arch/powerpc/kernel/module_64.c +Auto-merging arch/powerpc/kernel/exceptions-64s.S +Auto-merging arch/powerpc/kernel/eeh.c +Auto-merging arch/powerpc/kernel/dma.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Removing arch/powerpc/include/asm/nohash/64/pgtable-64k.h +Auto-merging arch/powerpc/include/asm/module.h +Auto-merging arch/powerpc/include/asm/feature-fixups.h +Removing arch/powerpc/configs/c2k_defconfig +Removing arch/powerpc/configs/83xx/sbc834x_defconfig +Removing arch/powerpc/boot/mv64x60_i2c.c +Removing arch/powerpc/boot/mv64x60.h +Removing arch/powerpc/boot/mv64x60.c +Removing arch/powerpc/boot/mpsc.c +Removing arch/powerpc/boot/dts/sbc8349.dts +Removing arch/powerpc/boot/dts/c2k.dts +Removing arch/powerpc/boot/cuboot-c2k.c +Auto-merging arch/powerpc/Makefile +Auto-merging arch/powerpc/Kconfig +Removing Documentation/devicetree/bindings/marvell.txt +Resolved 'arch/powerpc/kernel/module_64.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c538f43c2d72] Merge remote-tracking branch 'powerpc/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-cxl | 4 +- + Documentation/accelerators/ocxl.rst | 11 + + Documentation/devicetree/bindings/marvell.txt | 516 ------------------ + arch/powerpc/Kconfig | 3 + + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/Makefile | 7 +- + arch/powerpc/boot/cuboot-c2k.c | 189 ------- + arch/powerpc/boot/dts/c2k.dts | 366 ------------- + arch/powerpc/boot/dts/fsl/t104xqds.dtsi | 2 +- + arch/powerpc/boot/dts/sbc8349.dts | 331 ------------ + arch/powerpc/boot/mpc8xx.c | 3 +- + arch/powerpc/boot/mpsc.c | 169 ------ + arch/powerpc/boot/mv64x60.c | 581 --------------------- + arch/powerpc/boot/mv64x60.h | 70 --- + arch/powerpc/boot/mv64x60_i2c.c | 204 -------- + arch/powerpc/boot/ops.h | 1 - + arch/powerpc/boot/serial.c | 4 - + arch/powerpc/configs/83xx/sbc834x_defconfig | 74 --- + arch/powerpc/configs/c2k_defconfig | 389 -------------- + arch/powerpc/configs/powernv_defconfig | 108 ++-- + arch/powerpc/configs/wii_defconfig | 14 + + arch/powerpc/include/asm/asm-prototypes.h | 20 +- + arch/powerpc/include/asm/barrier.h | 15 + + arch/powerpc/include/asm/book3s/32/pgalloc.h | 1 + + arch/powerpc/include/asm/book3s/32/pgtable.h | 7 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 8 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 7 + + arch/powerpc/include/asm/book3s/64/hash.h | 10 - + arch/powerpc/include/asm/book3s/64/mmu.h | 7 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 46 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 28 +- + arch/powerpc/include/asm/book3s/64/radix-4k.h | 3 + + arch/powerpc/include/asm/book3s/64/radix-64k.h | 4 + + arch/powerpc/include/asm/book3s/64/radix.h | 86 ++- + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 7 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 12 +- + arch/powerpc/include/asm/cache.h | 3 + + arch/powerpc/include/asm/cacheflush.h | 13 + + arch/powerpc/include/asm/checksum.h | 15 +- + arch/powerpc/include/asm/cputable.h | 3 +- + arch/powerpc/include/asm/cputime.h | 16 +- + arch/powerpc/include/asm/eeh.h | 11 +- + arch/powerpc/include/asm/feature-fixups.h | 9 + + arch/powerpc/include/asm/ftrace.h | 31 +- + arch/powerpc/include/asm/hardirq.h | 1 + + arch/powerpc/include/asm/hugetlb.h | 21 +- + arch/powerpc/include/asm/hw_irq.h | 11 +- + arch/powerpc/include/asm/imc-pmu.h | 1 + + arch/powerpc/include/asm/io.h | 10 + + arch/powerpc/include/asm/machdep.h | 2 +- + arch/powerpc/include/asm/mmu-book3e.h | 6 - + arch/powerpc/include/asm/mmu_context.h | 5 - + arch/powerpc/include/asm/module.h | 10 +- + arch/powerpc/include/asm/mpc52xx.h | 6 +- + arch/powerpc/include/asm/nmi.h | 6 + + arch/powerpc/include/asm/nohash/32/pgalloc.h | 1 + + arch/powerpc/include/asm/nohash/32/pgtable.h | 41 +- + arch/powerpc/include/asm/nohash/32/pte-40x.h | 3 - + arch/powerpc/include/asm/nohash/64/pgalloc.h | 95 ++-- + arch/powerpc/include/asm/nohash/64/pgtable-64k.h | 57 -- + arch/powerpc/include/asm/nohash/64/pgtable.h | 46 +- + arch/powerpc/include/asm/nohash/pgtable.h | 58 +- + arch/powerpc/include/asm/nohash/pte-book3e.h | 6 - + arch/powerpc/include/asm/opal-api.h | 8 + + arch/powerpc/include/asm/opal.h | 5 +- + arch/powerpc/include/asm/paca.h | 3 +- + arch/powerpc/include/asm/page.h | 1 + + arch/powerpc/include/asm/pgtable.h | 1 + + arch/powerpc/include/asm/pkeys.h | 13 - + arch/powerpc/include/asm/plpar_wrappers.h | 8 +- + arch/powerpc/include/asm/pmac_pfunc.h | 1 + + arch/powerpc/include/asm/pnv-ocxl.h | 2 +- + arch/powerpc/include/asm/ppc-opcode.h | 1 + + arch/powerpc/include/asm/ppc_asm.h | 6 +- + arch/powerpc/include/asm/processor.h | 10 +- + arch/powerpc/include/asm/pte-common.h | 8 - + arch/powerpc/include/asm/reg.h | 32 +- + arch/powerpc/include/asm/rheap.h | 3 + + arch/powerpc/include/asm/rtas.h | 2 +- + arch/powerpc/include/asm/setup.h | 9 + + arch/powerpc/include/asm/smp.h | 1 + + arch/powerpc/include/asm/sstep.h | 2 + + arch/powerpc/include/asm/switch_to.h | 1 - + arch/powerpc/include/asm/syscalls.h | 2 +- + arch/powerpc/include/asm/systbl.h | 6 +- + arch/powerpc/include/asm/thread_info.h | 8 +- + arch/powerpc/include/asm/time.h | 11 - + arch/powerpc/include/asm/tlb.h | 13 + + arch/powerpc/include/asm/tm.h | 2 - + arch/powerpc/include/asm/trace.h | 7 +- + arch/powerpc/include/asm/uaccess.h | 21 +- + arch/powerpc/include/asm/xive-regs.h | 6 - + arch/powerpc/include/asm/xmon.h | 2 +- + arch/powerpc/include/asm/xor.h | 12 +- + arch/powerpc/include/asm/xor_altivec.h | 19 + + arch/powerpc/kernel/align.c | 2 +- + arch/powerpc/kernel/asm-offsets.c | 1 + + arch/powerpc/kernel/btext.c | 10 +- + arch/powerpc/kernel/dma.c | 2 - + arch/powerpc/kernel/dt_cpu_ftrs.c | 1 + + arch/powerpc/kernel/eeh.c | 19 +- + arch/powerpc/kernel/eeh_driver.c | 496 ++++++++++-------- + arch/powerpc/kernel/eeh_pe.c | 26 +- + arch/powerpc/kernel/entry_64.S | 11 + + arch/powerpc/kernel/exceptions-64s.S | 1 + + arch/powerpc/kernel/fadump.c | 40 +- + arch/powerpc/kernel/head_8xx.S | 2 +- + arch/powerpc/kernel/hw_breakpoint.c | 4 +- + arch/powerpc/kernel/irq.c | 8 +- + arch/powerpc/kernel/kvm.c | 4 +- + arch/powerpc/kernel/machine_kexec.c | 2 + + arch/powerpc/kernel/machine_kexec_64.c | 8 +- + arch/powerpc/kernel/misc.S | 36 +- + arch/powerpc/kernel/module.c | 6 + + arch/powerpc/kernel/module_32.c | 4 +- + arch/powerpc/kernel/module_64.c | 44 +- + arch/powerpc/kernel/nvram_64.c | 4 +- + arch/powerpc/kernel/pci_32.c | 7 +- + arch/powerpc/kernel/pci_64.c | 8 +- + arch/powerpc/kernel/ppc_save_regs.S | 4 + + arch/powerpc/kernel/process.c | 147 ++---- + arch/powerpc/kernel/prom.c | 23 +- + arch/powerpc/kernel/prom_init.c | 189 ++++--- + arch/powerpc/kernel/ptrace.c | 21 +- + arch/powerpc/kernel/rtas-proc.c | 26 +- + arch/powerpc/kernel/rtas-rtc.c | 4 +- + arch/powerpc/kernel/rtas.c | 7 +- + arch/powerpc/kernel/security.c | 71 +++ + arch/powerpc/kernel/setup-common.c | 6 - + arch/powerpc/kernel/setup.h | 6 + + arch/powerpc/kernel/setup_64.c | 7 + + arch/powerpc/kernel/signal.c | 4 + + arch/powerpc/kernel/signal.h | 6 +- + arch/powerpc/kernel/signal_32.c | 61 ++- + arch/powerpc/kernel/signal_64.c | 19 +- + arch/powerpc/kernel/smp.c | 46 +- + arch/powerpc/kernel/stacktrace.c | 181 ++++++- + arch/powerpc/kernel/sys_ppc32.c | 9 - + arch/powerpc/kernel/syscalls.c | 4 + + arch/powerpc/kernel/systbl.S | 2 +- + arch/powerpc/kernel/systbl_chk.c | 2 +- + arch/powerpc/kernel/systbl_chk.sh | 4 +- + arch/powerpc/kernel/tau_6xx.c | 15 +- + arch/powerpc/kernel/time.c | 227 +++----- + arch/powerpc/kernel/tm.S | 12 + + arch/powerpc/kernel/trace/ftrace.c | 212 ++++++-- + arch/powerpc/kernel/trace/ftrace_32.S | 20 - + arch/powerpc/kernel/trace/ftrace_64.S | 29 - + arch/powerpc/kernel/trace/ftrace_64_mprofile.S | 88 +++- + arch/powerpc/kernel/trace/ftrace_64_pg.S | 6 +- + arch/powerpc/kernel/vecemu.c | 1 + + arch/powerpc/kernel/vmlinux.lds.S | 7 + + arch/powerpc/kernel/watchdog.c | 32 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 36 +- + arch/powerpc/kvm/book3s_hv.c | 4 + + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 3 + + arch/powerpc/lib/Makefile | 5 +- + arch/powerpc/lib/checksum_32.S | 46 +- + arch/powerpc/lib/checksum_64.S | 28 + + arch/powerpc/lib/feature-fixups-test.S | 42 +- + arch/powerpc/lib/feature-fixups.c | 60 ++- + arch/powerpc/lib/memcmp_32.S | 45 ++ + arch/powerpc/lib/sstep.c | 26 +- + arch/powerpc/lib/string.S | 70 +-- + arch/powerpc/lib/string_32.S | 90 ++++ + arch/powerpc/lib/test_emulate_step.c | 21 +- + arch/powerpc/lib/xor_vmx_glue.c | 1 + + arch/powerpc/mm/fault.c | 76 ++- + arch/powerpc/mm/hash_utils_64.c | 10 +- + arch/powerpc/mm/hugetlbpage.c | 40 +- + arch/powerpc/mm/mem.c | 4 +- + arch/powerpc/mm/mmu_context.c | 6 +- + arch/powerpc/mm/mmu_context_book3s64.c | 39 +- + arch/powerpc/mm/mmu_context_nohash.c | 135 ++--- + arch/powerpc/mm/pgtable-book3s64.c | 279 +++++++++- + arch/powerpc/mm/pgtable-hash64.c | 8 +- + arch/powerpc/mm/pgtable-radix.c | 38 +- + arch/powerpc/mm/pgtable.c | 49 +- + arch/powerpc/mm/pgtable_64.c | 171 ------ + arch/powerpc/mm/ppc_mmu_32.c | 2 +- + arch/powerpc/mm/slb.c | 21 +- + arch/powerpc/mm/subpage-prot.c | 8 +- + arch/powerpc/mm/tlb-radix.c | 366 ++++++++++++- + arch/powerpc/mm/tlb_hash32.c | 10 +- + arch/powerpc/perf/core-fsl-emb.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 68 ++- + arch/powerpc/perf/isa207-common.h | 64 --- + arch/powerpc/perf/power8-pmu.c | 64 +++ + arch/powerpc/platforms/83xx/Kconfig | 7 - + arch/powerpc/platforms/83xx/Makefile | 1 - + arch/powerpc/platforms/83xx/sbc834x.c | 73 --- + arch/powerpc/platforms/8xx/adder875.c | 2 - + arch/powerpc/platforms/8xx/ep88xc.c | 2 - + arch/powerpc/platforms/8xx/m8xx_setup.c | 11 +- + arch/powerpc/platforms/8xx/mpc885ads_setup.c | 2 - + arch/powerpc/platforms/Kconfig.cputype | 4 + + arch/powerpc/platforms/cell/spu_callbacks.c | 2 +- + arch/powerpc/platforms/cell/spu_syscalls.c | 3 +- + arch/powerpc/platforms/cell/spufs/file.c | 33 +- + arch/powerpc/platforms/chrp/pci.c | 12 +- + arch/powerpc/platforms/chrp/setup.c | 12 +- + arch/powerpc/platforms/chrp/time.c | 6 +- + arch/powerpc/platforms/embedded6xx/Kconfig | 10 - + arch/powerpc/platforms/embedded6xx/Makefile | 1 - + arch/powerpc/platforms/embedded6xx/c2k.c | 148 ------ + arch/powerpc/platforms/embedded6xx/flipper-pic.c | 8 - + arch/powerpc/platforms/embedded6xx/hlwd-pic.c | 7 +- + arch/powerpc/platforms/maple/maple.h | 2 +- + arch/powerpc/platforms/maple/time.c | 5 +- + arch/powerpc/platforms/pasemi/pasemi.h | 2 +- + arch/powerpc/platforms/pasemi/pci.c | 2 + + arch/powerpc/platforms/pasemi/time.c | 4 +- + arch/powerpc/platforms/powermac/bootx_init.c | 4 +- + arch/powerpc/platforms/powermac/pci.c | 4 +- + arch/powerpc/platforms/powermac/pmac.h | 2 +- + arch/powerpc/platforms/powermac/setup.c | 9 +- + arch/powerpc/platforms/powermac/smp.c | 1 - + arch/powerpc/platforms/powermac/time.c | 48 +- + arch/powerpc/platforms/powernv/copy-paste.h | 3 +- + arch/powerpc/platforms/powernv/idle.c | 4 +- + arch/powerpc/platforms/powernv/memtrace.c | 2 +- + arch/powerpc/platforms/powernv/npu-dma.c | 5 +- + arch/powerpc/platforms/powernv/ocxl.c | 4 +- + arch/powerpc/platforms/powernv/opal-imc.c | 22 +- + arch/powerpc/platforms/powernv/opal-irqchip.c | 89 ++-- + arch/powerpc/platforms/powernv/opal-rtc.c | 5 +- + arch/powerpc/platforms/powernv/opal-sensor.c | 53 ++ + arch/powerpc/platforms/powernv/opal-wrappers.S | 2 + + arch/powerpc/platforms/powernv/opal.c | 23 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 46 +- + arch/powerpc/platforms/powernv/powernv.h | 3 +- + arch/powerpc/platforms/powernv/setup.c | 11 +- + arch/powerpc/platforms/powernv/smp.c | 17 +- + arch/powerpc/platforms/ps3/platform.h | 2 +- + arch/powerpc/platforms/ps3/repository.c | 4 +- + arch/powerpc/platforms/ps3/time.c | 26 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/kexec.c | 7 +- + arch/powerpc/platforms/pseries/lpar.c | 3 +- + arch/powerpc/platforms/pseries/lparcfg.c | 18 +- + arch/powerpc/platforms/pseries/setup.c | 1 + + arch/powerpc/sysdev/Makefile | 3 - + arch/powerpc/sysdev/cpm_gpio.c | 1 - + arch/powerpc/sysdev/mv64x60.h | 13 - + arch/powerpc/sysdev/mv64x60_dev.c | 535 ------------------- + arch/powerpc/sysdev/mv64x60_pci.c | 171 ------ + arch/powerpc/sysdev/mv64x60_pic.c | 297 ----------- + arch/powerpc/sysdev/mv64x60_udbg.c | 152 ------ + arch/powerpc/sysdev/xics/xics-common.c | 7 +- + arch/powerpc/sysdev/xive/native.c | 2 +- + arch/powerpc/sysdev/xive/spapr.c | 88 +++- + arch/powerpc/xmon/nonstdio.h | 8 +- + arch/powerpc/xmon/spu-dis.c | 18 +- + arch/powerpc/xmon/xmon.c | 261 ++++----- + arch/x86/include/asm/mmu_context.h | 15 - + arch/x86/include/asm/pkeys.h | 13 + + arch/x86/kernel/setup.c | 8 - + drivers/hwmon/ibmpowernv.c | 9 +- + drivers/macintosh/via-pmu.c | 18 +- + drivers/macintosh/windfarm_pm121.c | 2 +- + drivers/macintosh/windfarm_pm81.c | 2 +- + drivers/macintosh/windfarm_pm91.c | 2 +- + drivers/misc/cxl/pci.c | 4 +- + drivers/misc/cxl/sysfs.c | 16 +- + drivers/misc/ocxl/context.c | 5 +- + drivers/misc/ocxl/file.c | 78 +++ + drivers/misc/ocxl/link.c | 38 +- + drivers/misc/ocxl/ocxl_internal.h | 1 + + drivers/tty/hvc/hvc_opal.c | 1 - + fs/proc/task_mmu.c | 13 +- + include/linux/mm.h | 14 +- + include/linux/pkeys.h | 13 +- + include/misc/ocxl.h | 9 + + include/uapi/misc/ocxl.h | 14 + + kernel/sys_ni.c | 2 +- + kernel/trace/Kconfig | 6 +- + tools/testing/selftests/powerpc/Makefile | 1 - + .../testing/selftests/powerpc/alignment/.gitignore | 1 + + .../selftests/powerpc/benchmarks/exec_target.c | 7 +- + .../selftests/powerpc/context_switch/.gitignore | 1 - + .../selftests/powerpc/context_switch/Makefile | 5 - + .../selftests/powerpc/context_switch/cp_abort.c | 110 ---- + tools/testing/selftests/powerpc/include/reg.h | 1 + + tools/testing/selftests/powerpc/ptrace/.gitignore | 2 + + tools/testing/selftests/powerpc/ptrace/Makefile | 6 +- + tools/testing/selftests/powerpc/ptrace/child.h | 139 +++++ + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 461 ++++++++++++++++ + .../selftests/powerpc/ptrace/perf-hwbreak.c | 195 +++++++ + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 342 ++++++++++++ + .../testing/selftests/powerpc/ptrace/ptrace-pkey.c | 327 ++++++++++++ + tools/testing/selftests/powerpc/ptrace/ptrace.h | 38 ++ + tools/testing/selftests/powerpc/tm/.gitignore | 1 + + 292 files changed, 5594 insertions(+), 6863 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/marvell.txt + delete mode 100644 arch/powerpc/boot/cuboot-c2k.c + delete mode 100644 arch/powerpc/boot/dts/c2k.dts + delete mode 100644 arch/powerpc/boot/dts/sbc8349.dts + delete mode 100644 arch/powerpc/boot/mpsc.c + delete mode 100644 arch/powerpc/boot/mv64x60.c + delete mode 100644 arch/powerpc/boot/mv64x60.h + delete mode 100644 arch/powerpc/boot/mv64x60_i2c.c + delete mode 100644 arch/powerpc/configs/83xx/sbc834x_defconfig + delete mode 100644 arch/powerpc/configs/c2k_defconfig + delete mode 100644 arch/powerpc/include/asm/nohash/64/pgtable-64k.h + create mode 100644 arch/powerpc/include/asm/xor_altivec.h + create mode 100644 arch/powerpc/lib/memcmp_32.S + create mode 100644 arch/powerpc/lib/string_32.S + delete mode 100644 arch/powerpc/platforms/83xx/sbc834x.c + delete mode 100644 arch/powerpc/platforms/embedded6xx/c2k.c + delete mode 100644 arch/powerpc/sysdev/mv64x60.h + delete mode 100644 arch/powerpc/sysdev/mv64x60_dev.c + delete mode 100644 arch/powerpc/sysdev/mv64x60_pci.c + delete mode 100644 arch/powerpc/sysdev/mv64x60_pic.c + delete mode 100644 arch/powerpc/sysdev/mv64x60_udbg.c + delete mode 100644 tools/testing/selftests/powerpc/context_switch/.gitignore + delete mode 100644 tools/testing/selftests/powerpc/context_switch/Makefile + delete mode 100644 tools/testing/selftests/powerpc/context_switch/cp_abort.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/child.h + create mode 100644 tools/testing/selftests/powerpc/ptrace/core-pkey.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/perf-hwbreak.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-hwbreak.c + create mode 100644 tools/testing/selftests/powerpc/ptrace/ptrace-pkey.c +Merging powerpc-pkey/topic/pkey (d86a4ba02fc6 powerpc/pkeys: Drop private VM_PKEY definitions) +$ git merge powerpc-pkey/topic/pkey +Already up to date. +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (29dcea88779c Linux 4.17) +$ git merge risc-v/for-next +Already up to date. +Merging s390/features (89a0c0ec0d2e s390/zcrypt: Fix CCA and EP11 CPRB processing failure memory leak.) +$ git merge s390/features +Auto-merging drivers/s390/block/dasd.c +Auto-merging arch/s390/Kconfig +Merge made by the 'recursive' strategy. + arch/s390/Kconfig | 4 ++ + arch/s390/crypto/arch_random.c | 103 ++++++++++++++++++++++++++++++++-- + arch/s390/include/asm/archrandom.h | 13 +---- + arch/s390/include/asm/ccwdev.h | 1 + + arch/s390/include/asm/ccwgroup.h | 10 ++++ + arch/s390/include/asm/cpu_mf.h | 6 +- + arch/s390/include/asm/pnet.h | 23 ++++++++ + arch/s390/kernel/Makefile | 27 +++++---- + arch/s390/kernel/early.c | 80 -------------------------- + arch/s390/kernel/early_nobss.c | 65 +++++++++++++++++++++ + arch/s390/kernel/entry.h | 1 + + arch/s390/kernel/head64.S | 8 ++- + arch/s390/kernel/nospec-branch.c | 4 +- + arch/s390/kernel/vmlinux.lds.S | 4 +- + arch/s390/lib/Makefile | 3 + + arch/s390/net/Makefile | 1 + + arch/s390/net/pnet.c | 80 ++++++++++++++++++++++++++ + arch/s390/scripts/Makefile.chkbss | 14 +++++ + drivers/s390/block/dasd.c | 31 +++++----- + drivers/s390/char/Makefile | 3 + + drivers/s390/cio/ccwgroup.c | 6 ++ + drivers/s390/cio/device_ops.c | 31 ++++++++++ + drivers/s390/crypto/ap_bus.h | 17 ++++-- + drivers/s390/crypto/zcrypt_api.c | 15 ++++- + drivers/s390/crypto/zcrypt_msgtype6.c | 51 +++++++---------- + 25 files changed, 435 insertions(+), 166 deletions(-) + create mode 100644 arch/s390/include/asm/pnet.h + create mode 100644 arch/s390/kernel/early_nobss.c + create mode 100644 arch/s390/net/pnet.c + create mode 100644 arch/s390/scripts/Makefile.chkbss +Merging sparc-next/master (17dec0a94915 Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (e40238dedb48 Fix vector raw inintialization logic) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (ae6063c83634 Merge branch 'xtensa-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/kernel/pci-dma.c +Merge made by the 'recursive' strategy. + arch/xtensa/kernel/pci-dma.c | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) +Merging fscrypt/master (e1cc40e5d42a fscrypt: log the crypto algorithm implementations) +$ git merge fscrypt/master +Auto-merging include/linux/fs.h +Merge made by the 'recursive' strategy. + Documentation/filesystems/fscrypt.rst | 10 ++ + fs/crypto/crypto.c | 47 ++++-- + fs/crypto/fname.c | 32 ++-- + fs/crypto/fscrypt_private.h | 23 +-- + fs/crypto/hooks.c | 5 +- + fs/crypto/keyinfo.c | 286 ++++++++++++++++++++-------------- + fs/ext4/super.c | 8 +- + fs/f2fs/super.c | 8 +- + fs/ubifs/crypto.c | 10 +- + include/linux/fs.h | 4 +- + include/linux/fscrypt_notsupp.h | 10 -- + include/linux/fscrypt_supp.h | 16 +- + include/uapi/linux/fs.h | 2 + + 13 files changed, 248 insertions(+), 213 deletions(-) +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/check-integrity.c +Auto-merging fs/block_dev.c +Auto-merging block/blk-cgroup.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 6d316033d42b] Merge remote-tracking branch 'btrfs/next' + Date: Tue Jun 5 09:22:01 2018 +1000 +Merging btrfs-kdave/for-next (f146e3341b73 Merge branch 'for-next-current-v4.17-20180531' into for-next-20180531) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (23edca864951 rbd: flush rbd_dev->watch_dwork after watch is unregistered) +$ git merge ceph/master +Auto-merging drivers/block/rbd.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/ceph.txt | 8 +- + drivers/block/rbd.c | 11 +- + fs/ceph/addr.c | 1 - + fs/ceph/caps.c | 160 ++++++++++++++++----------- + fs/ceph/dir.c | 2 + + fs/ceph/file.c | 1 - + fs/ceph/inode.c | 67 +++++++----- + fs/ceph/super.c | 35 ++++-- + fs/ceph/xattr.c | 60 ++++++----- + include/linux/ceph/ceph_fs.h | 1 + + include/linux/ceph/osd_client.h | 8 +- + include/linux/ceph/osdmap.h | 8 +- + net/ceph/messenger.c | 31 ++---- + net/ceph/osd_client.c | 216 ++++++++++++++++++++++--------------- + net/ceph/osdmap.c | 19 ++-- + 15 files changed, 372 insertions(+), 256 deletions(-) +Merging cifs/for-next (8e7360f67e75 CIFS: Add support for direct pages in wdata) +$ git merge cifs/for-next +Already up to date. +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (e86281e700cc eCryptfs: don't pass up plaintext names when using filename encryption) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (20b67d6401f1 Merge fsnotify cleanups from Amir into for_next.) +$ git merge ext3/for_next +Auto-merging include/linux/fs.h +Auto-merging fs/inode.c +Merge made by the 'recursive' strategy. + fs/inode.c | 2 +- + fs/mount.h | 11 +- + fs/notify/dnotify/dnotify.c | 16 +-- + fs/notify/fanotify/fanotify.c | 46 +++---- + fs/notify/fanotify/fanotify_user.c | 98 +++++-------- + fs/notify/fdinfo.c | 12 +- + fs/notify/fsnotify.c | 160 ++++++++++++--------- + fs/notify/fsnotify.h | 14 +- + fs/notify/group.c | 2 +- + fs/notify/inotify/inotify.h | 2 - + fs/notify/inotify/inotify_fsnotify.c | 6 +- + fs/notify/inotify/inotify_user.c | 16 ++- + fs/notify/mark.c | 140 +++++++++---------- + fs/udf/Kconfig | 6 +- + fs/udf/super.c | 12 +- + fs/udf/udfdecl.h | 3 +- + fs/udf/unicode.c | 260 +++++++++++++++++------------------ + include/linux/fs.h | 20 ++- + include/linux/fsnotify_backend.h | 109 ++++++++++++--- + include/linux/fsnotify_obj.h | 18 +++ + kernel/audit_fsnotify.c | 5 +- + kernel/audit_tree.c | 22 ++- + kernel/audit_watch.c | 7 +- + kernel/auditsc.c | 4 +- + 24 files changed, 527 insertions(+), 464 deletions(-) + create mode 100644 include/linux/fsnotify_obj.h +Merging ext4/dev (4f2f76f75143 ext4: fix fencepost error in check for inode count overflow during resize) +$ git merge ext4/dev +Auto-merging include/linux/fs.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/mballoc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ext4.h +Merge made by the 'recursive' strategy. + fs/ext4/balloc.c | 33 ++++++----------- + fs/ext4/ext4.h | 7 ++++ + fs/ext4/extents_status.c | 3 +- + fs/ext4/file.c | 93 ++++++++++++++++++++++++++++-------------------- + fs/ext4/fsmap.c | 4 +-- + fs/ext4/ialloc.c | 35 ++++++++---------- + fs/ext4/indirect.c | 14 +++++--- + fs/ext4/inline.c | 6 ++++ + fs/ext4/inode.c | 77 +++++++++++++++++++++++++++------------ + fs/ext4/mballoc.c | 23 ++++++------ + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 68 +++++++++++++++++++++++++++-------- + fs/ext4/xattr.c | 2 +- + fs/ext4/xattr_security.c | 2 +- + fs/jbd2/journal.c | 20 +++++------ + fs/jbd2/revoke.c | 12 +++---- + fs/jbd2/transaction.c | 6 ++-- + include/linux/fs.h | 5 +++ + 18 files changed, 245 insertions(+), 167 deletions(-) +Merging f2fs/dev (dfa742803fbb f2fs: fix to clear FI_VOLATILE_FILE correctly) +$ git merge f2fs/dev +Auto-merging include/linux/fscrypt_supp.h +Auto-merging include/linux/fscrypt_notsupp.h +Auto-merging fs/f2fs/sysfs.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/namei.c +CONFLICT (content): Merge conflict in fs/f2fs/namei.c +Auto-merging fs/f2fs/inode.c +Auto-merging fs/crypto/fscrypt_private.h +Auto-merging fs/crypto/crypto.c +Resolved 'fs/f2fs/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ac41106ff930] Merge remote-tracking branch 'f2fs/dev' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 3 +- + Documentation/filesystems/f2fs.txt | 16 +- + fs/crypto/bio.c | 35 +- + fs/crypto/crypto.c | 8 +- + fs/crypto/fscrypt_private.h | 1 - + fs/ext4/readpage.c | 2 +- + fs/f2fs/checkpoint.c | 149 ++++---- + fs/f2fs/data.c | 399 ++++++++++++-------- + fs/f2fs/debug.c | 6 + + fs/f2fs/dir.c | 76 ++-- + fs/f2fs/extent_cache.c | 22 +- + fs/f2fs/f2fs.h | 460 +++++++++++++---------- + fs/f2fs/file.c | 335 +++++++++-------- + fs/f2fs/gc.c | 183 +++++----- + fs/f2fs/gc.h | 2 - + fs/f2fs/inline.c | 78 ++-- + fs/f2fs/inode.c | 115 +++--- + fs/f2fs/namei.c | 67 ++-- + fs/f2fs/node.c | 285 ++++++++------- + fs/f2fs/recovery.c | 65 ++-- + fs/f2fs/segment.c | 621 ++++++++++++++++++-------------- + fs/f2fs/segment.h | 31 +- + fs/f2fs/shrinker.c | 4 +- + fs/f2fs/super.c | 198 +++++++--- + fs/f2fs/sysfs.c | 63 +++- + fs/f2fs/xattr.c | 26 +- + include/linux/fscrypt_notsupp.h | 13 +- + include/linux/fscrypt_supp.h | 5 +- + 28 files changed, 1880 insertions(+), 1388 deletions(-) +Merging fuse/for-next (543b8f8662fe fuse: don't keep dead fuse_conn at fuse_fill_super().) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/fuse-io.txt | 38 ++++++++++++++++++++++++++ + fs/fuse/acl.c | 4 +-- + fs/fuse/control.c | 15 ++++++++--- + fs/fuse/cuse.c | 11 +++++--- + fs/fuse/dev.c | 43 +++++++++++++++--------------- + fs/fuse/dir.c | 45 ++++++++++++++++++++++--------- + fs/fuse/fuse_i.h | 15 +++++++++-- + fs/fuse/inode.c | 50 ++++++++++++++++++++++++----------- + fs/fuse/xattr.c | 43 ++++++++++++++++++++++++++++++ + include/uapi/linux/fuse.h | 7 ++++- + kernel/user_namespace.c | 1 + + 11 files changed, 209 insertions(+), 63 deletions(-) + create mode 100644 Documentation/filesystems/fuse-io.txt +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (fcda3d5d221b Merge tag 'nfs-rdma-for-4.18-1' of git://git.linux-nfs.org/projects/anna/linux-nfs) +$ git merge nfs/linux-next +Auto-merging fs/nfs/client.c +Merge made by the 'recursive' strategy. + fs/nfs/callback_proc.c | 2 + + fs/nfs/client.c | 3 +- + fs/nfs/delegation.c | 70 +++++- + fs/nfs/dir.c | 51 ++-- + fs/nfs/export.c | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 1 + + fs/nfs/inode.c | 126 ++++++---- + fs/nfs/nfs3proc.c | 13 +- + fs/nfs/nfs42proc.c | 6 +- + fs/nfs/nfs4_fs.h | 27 ++- + fs/nfs/nfs4idmap.c | 5 +- + fs/nfs/nfs4proc.c | 359 +++++++++++++---------------- + fs/nfs/nfs4state.c | 8 + + fs/nfs/nfs4xdr.c | 65 +++++- + fs/nfs/pnfs.c | 325 ++++++++++++++++++++++---- + fs/nfs/pnfs.h | 28 ++- + fs/nfs/proc.c | 13 +- + fs/nfs/unlink.c | 20 +- + fs/nfs/write.c | 10 +- + include/linux/nfs_fs_sb.h | 2 + + include/linux/nfs_xdr.h | 15 +- + include/linux/rculist.h | 13 ++ + include/linux/sunrpc/rpc_rdma.h | 1 + + include/linux/sunrpc/xprt.h | 6 +- + include/linux/sunrpc/xprtrdma.h | 1 + + include/trace/events/rpcrdma.h | 76 ++++-- + net/sunrpc/clnt.c | 1 + + net/sunrpc/xprt.c | 17 +- + net/sunrpc/xprtrdma/backchannel.c | 105 ++++----- + net/sunrpc/xprtrdma/fmr_ops.c | 23 ++ + net/sunrpc/xprtrdma/frwr_ops.c | 31 ++- + net/sunrpc/xprtrdma/module.c | 1 + + net/sunrpc/xprtrdma/rpc_rdma.c | 66 ++---- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 1 + + net/sunrpc/xprtrdma/transport.c | 64 +++-- + net/sunrpc/xprtrdma/verbs.c | 291 +++++++++-------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 26 +-- + net/sunrpc/xprtsock.c | 4 + + 38 files changed, 1186 insertions(+), 692 deletions(-) +Merging nfs-anna/linux-next (ffbfa2ce88f1 sunrpc: Fix latency trace point crashes) +$ git merge nfs-anna/linux-next +Merge made by the 'recursive' strategy. +Merging nfsd/nfsd-next (28771950c592 svcrdma: Fix incorrect return value/type in svc_rdma_post_recvs) +$ git merge nfsd/nfsd-next +Auto-merging net/sunrpc/xprtrdma/xprt_rdma.h +Auto-merging net/sunrpc/xprtrdma/verbs.c +Auto-merging net/sunrpc/xprtrdma/transport.c +Auto-merging net/sunrpc/xprtrdma/svc_rdma_backchannel.c +Auto-merging net/sunrpc/xprtrdma/rpc_rdma.c +Auto-merging net/sunrpc/xprtrdma/module.c +Auto-merging net/sunrpc/xprtrdma/frwr_ops.c +Auto-merging net/sunrpc/xprtrdma/fmr_ops.c +Auto-merging net/sunrpc/xprtrdma/backchannel.c +Auto-merging include/trace/events/rpcrdma.h +Auto-merging fs/nfsd/blocklayout.c +Merge made by the 'recursive' strategy. + fs/nfsd/blocklayout.c | 18 +- + fs/nfsd/cache.h | 5 - + fs/nfsd/nfs4state.c | 20 +- + fs/nfsd/nfs4xdr.c | 45 ++- + fs/nfsd/nfscache.c | 6 +- + fs/nfsd/nfsd.h | 1 + + include/linux/nfs4.h | 8 + + include/linux/sunrpc/svc_rdma.h | 95 ++--- + include/trace/events/rpcrdma.h | 584 ++++++++++++++++++++++++++++- + net/sunrpc/xprtrdma/backchannel.c | 2 + + net/sunrpc/xprtrdma/fmr_ops.c | 3 + + net/sunrpc/xprtrdma/frwr_ops.c | 2 + + net/sunrpc/xprtrdma/module.c | 4 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 7 +- + net/sunrpc/xprtrdma/svc_rdma.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 54 ++- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 439 ++++++++++++++++------ + net/sunrpc/xprtrdma/svc_rdma_rw.c | 133 +++---- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 510 ++++++++++++++++--------- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 481 ++++-------------------- + net/sunrpc/xprtrdma/transport.c | 4 + + net/sunrpc/xprtrdma/verbs.c | 1 + + net/sunrpc/xprtrdma/xprt_rdma.h | 2 - + 23 files changed, 1536 insertions(+), 891 deletions(-) +Merging orangefs/for-next (b1116bc03c00 orangefs: use sparse annotations for holding locks across function calls.) +$ git merge orangefs/for-next +Auto-merging fs/orangefs/namei.c +Merge made by the 'recursive' strategy. + fs/orangefs/devorangefs-req.c | 17 +++++++------ + fs/orangefs/file.c | 4 +-- + fs/orangefs/inode.c | 57 ++++++++++++++++++++++++++---------------- + fs/orangefs/namei.c | 7 ++++++ + fs/orangefs/orangefs-bufmap.c | 20 +++------------ + fs/orangefs/orangefs-debugfs.c | 2 +- + fs/orangefs/orangefs-kernel.h | 1 - + fs/orangefs/orangefs-utils.c | 30 +++++++++++----------- + fs/orangefs/protocol.h | 2 +- + fs/orangefs/super.c | 13 +++++----- + fs/orangefs/waitqueue.c | 14 ++++++++--- + 11 files changed, 91 insertions(+), 76 deletions(-) +Merging overlayfs/overlayfs-next (8acda16fcd19 ovl: Enable metadata only feature) +$ git merge overlayfs/overlayfs-next +Auto-merging mm/util.c +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging fs/xattr.c +Auto-merging fs/read_write.c +CONFLICT (content): Merge conflict in fs/read_write.c +Auto-merging fs/open.c +CONFLICT (content): Merge conflict in fs/open.c +Auto-merging fs/namei.c +Auto-merging fs/locks.c +Auto-merging fs/internal.h +Auto-merging fs/inode.c +Auto-merging fs/btrfs/ioctl.c +CONFLICT (content): Merge conflict in fs/btrfs/ioctl.c +Auto-merging fs/btrfs/ctree.h +Auto-merging Documentation/filesystems/vfs.txt +Auto-merging Documentation/filesystems/Locking +Resolved 'fs/btrfs/ioctl.c' using previous resolution. +Resolved 'fs/open.c' using previous resolution. +Resolved 'fs/read_write.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 770a1aaf7417] Merge remote-tracking branch 'overlayfs/overlayfs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/Locking | 4 +- + Documentation/filesystems/overlayfs.txt | 97 ++++-- + Documentation/filesystems/vfs.txt | 19 +- + fs/btrfs/ctree.h | 5 +- + fs/btrfs/ioctl.c | 7 +- + fs/file_table.c | 13 +- + fs/inode.c | 210 +++++-------- + fs/internal.h | 17 +- + fs/ioctl.c | 1 + + fs/locks.c | 20 +- + fs/namei.c | 2 +- + fs/namespace.c | 69 +---- + fs/ocfs2/file.c | 10 +- + fs/open.c | 80 +++-- + fs/overlayfs/Kconfig | 46 ++- + fs/overlayfs/Makefile | 4 +- + fs/overlayfs/copy_up.c | 273 +++++++++------- + fs/overlayfs/dir.c | 313 +++++++++++++------ + fs/overlayfs/export.c | 11 +- + fs/overlayfs/file.c | 530 ++++++++++++++++++++++++++++++++ + fs/overlayfs/inode.c | 203 ++++++++---- + fs/overlayfs/namei.c | 205 +++++++----- + fs/overlayfs/overlayfs.h | 119 ++++--- + fs/overlayfs/ovl_entry.h | 7 +- + fs/overlayfs/super.c | 134 +++++--- + fs/overlayfs/util.c | 252 ++++++++++++++- + fs/read_write.c | 94 +++--- + fs/xattr.c | 9 +- + fs/xfs/xfs_file.c | 8 +- + include/linux/dcache.h | 15 +- + include/linux/fs.h | 36 ++- + include/linux/fsnotify.h | 14 +- + include/uapi/linux/fs.h | 1 - + mm/util.c | 5 + + 34 files changed, 1986 insertions(+), 847 deletions(-) + create mode 100644 fs/overlayfs/file.c +Merging ubifs/linux-next (b5094b7f135b ubi: Reject MLC NAND) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (9d359ba7a91c xfs_repair: check and repair quota metadata) +$ git merge xfs/for-next +Auto-merging mm/internal.h +Auto-merging include/uapi/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/bio.h +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/gfs2/bmap.c +CONFLICT (content): Merge conflict in fs/gfs2/bmap.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inline.c +Auto-merging fs/ext2/super.c +Auto-merging fs/buffer.c +Auto-merging block/bio.c +Recorded preimage for 'fs/gfs2/bmap.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/gfs2/bmap.c'. +[master ff92b345127e] Merge remote-tracking branch 'xfs/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ioctl/ioctl-number.txt | 3 +- + block/bio.c | 96 +-- + drivers/dax/super.c | 40 +- + fs/buffer.c | 114 ---- + fs/ext2/super.c | 3 +- + fs/ext4/inline.c | 4 +- + fs/ext4/super.c | 3 +- + fs/gfs2/bmap.c | 11 +- + fs/iomap.c | 408 ++++++++++++- + fs/xfs/Kconfig | 18 + + fs/xfs/Makefile | 9 + + fs/xfs/libxfs/xfs_ag.c | 464 +++++++++++++++ + fs/xfs/libxfs/xfs_ag.h | 30 + + fs/xfs/libxfs/xfs_alloc.c | 141 ++++- + fs/xfs/libxfs/xfs_alloc.h | 23 +- + fs/xfs/libxfs/xfs_alloc_btree.c | 10 +- + fs/xfs/libxfs/xfs_alloc_btree.h | 2 + + fs/xfs/libxfs/xfs_attr.c | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 93 +-- + fs/xfs/libxfs/xfs_bmap.h | 30 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 9 + + fs/xfs/libxfs/xfs_bmap_btree.h | 3 + + fs/xfs/libxfs/xfs_btree.c | 32 +- + fs/xfs/libxfs/xfs_btree.h | 3 +- + fs/xfs/libxfs/xfs_da_btree.c | 8 +- + fs/xfs/libxfs/xfs_defer.c | 24 +- + fs/xfs/libxfs/xfs_defer.h | 1 + + fs/xfs/libxfs/xfs_dir2_leaf.c | 1 - + fs/xfs/libxfs/xfs_dquot_buf.c | 94 +-- + fs/xfs/libxfs/xfs_errortag.h | 4 +- + fs/xfs/libxfs/xfs_format.h | 7 +- + fs/xfs/libxfs/xfs_fs.h | 9 +- + fs/xfs/libxfs/xfs_ialloc.c | 25 +- + fs/xfs/libxfs/xfs_ialloc.h | 3 + + fs/xfs/libxfs/xfs_ialloc_btree.c | 11 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 2 + + fs/xfs/libxfs/xfs_quota_defs.h | 11 +- + fs/xfs/libxfs/xfs_refcount.c | 24 +- + fs/xfs/libxfs/xfs_refcount.h | 7 + + fs/xfs/libxfs/xfs_refcount_btree.c | 1 - + fs/xfs/libxfs/xfs_rmap.c | 83 +++ + fs/xfs/libxfs/xfs_rmap.h | 4 + + fs/xfs/libxfs/xfs_rmap_btree.c | 1 - + fs/xfs/libxfs/xfs_rtbitmap.c | 26 +- + fs/xfs/libxfs/xfs_sb.c | 147 +++++ + fs/xfs/libxfs/xfs_sb.h | 16 + + fs/xfs/libxfs/xfs_shared.h | 16 +- + fs/xfs/libxfs/xfs_types.h | 2 +- + fs/xfs/scrub/agheader.c | 85 +-- + fs/xfs/scrub/agheader_repair.c | 70 +++ + fs/xfs/scrub/alloc.c | 4 +- + fs/xfs/scrub/attr.c | 3 +- + fs/xfs/scrub/bmap.c | 8 +- + fs/xfs/scrub/btree.c | 42 +- + fs/xfs/scrub/common.c | 131 +++- + fs/xfs/scrub/common.h | 32 +- + fs/xfs/scrub/dir.c | 35 +- + fs/xfs/scrub/ialloc.c | 7 +- + fs/xfs/scrub/inode.c | 10 +- + fs/xfs/scrub/parent.c | 19 +- + fs/xfs/scrub/quota.c | 181 +++--- + fs/xfs/scrub/refcount.c | 10 +- + fs/xfs/scrub/repair.c | 1089 ++++++++++++++++++++++++++++++++++ + fs/xfs/scrub/repair.h | 132 +++++ + fs/xfs/scrub/rmap.c | 6 +- + fs/xfs/scrub/rtbitmap.c | 60 +- + fs/xfs/scrub/scrub.c | 142 ++++- + fs/xfs/scrub/scrub.h | 5 + + fs/xfs/scrub/trace.h | 258 ++++++++ + fs/xfs/xfs_aops.c | 21 +- + fs/xfs/xfs_bmap_item.c | 4 +- + fs/xfs/xfs_bmap_util.c | 10 +- + fs/xfs/xfs_buf.c | 100 +++- + fs/xfs/xfs_buf.h | 29 +- + fs/xfs/xfs_buf_item.c | 10 +- + fs/xfs/xfs_dquot.c | 780 ++++++++++++++---------- + fs/xfs/xfs_dquot.h | 22 +- + fs/xfs/xfs_dquot_item.c | 7 +- + fs/xfs/xfs_error.c | 3 + + fs/xfs/xfs_extfree_item.c | 6 +- + fs/xfs/xfs_file.c | 55 +- + fs/xfs/xfs_fsmap.c | 14 +- + fs/xfs/xfs_fsops.c | 587 ++++-------------- + fs/xfs/xfs_globals.c | 1 + + fs/xfs/xfs_icache.c | 94 ++- + fs/xfs/xfs_icache.h | 3 + + fs/xfs/xfs_icreate_item.c | 4 +- + fs/xfs/xfs_inode.c | 47 +- + fs/xfs/xfs_inode.h | 14 +- + fs/xfs/xfs_inode_item.c | 8 +- + fs/xfs/xfs_ioctl.c | 96 ++- + fs/xfs/xfs_iomap.c | 186 +++--- + fs/xfs/xfs_iops.c | 32 +- + fs/xfs/xfs_log.c | 12 +- + fs/xfs/xfs_log_cil.c | 22 +- + fs/xfs/xfs_log_recover.c | 4 +- + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_qm.c | 254 ++++---- + fs/xfs/xfs_qm.h | 6 +- + fs/xfs/xfs_qm_bhv.c | 2 +- + fs/xfs/xfs_qm_syscalls.c | 97 ++- + fs/xfs/xfs_quota.h | 22 +- + fs/xfs/xfs_quotaops.c | 8 +- + fs/xfs/xfs_refcount_item.c | 4 +- + fs/xfs/xfs_reflink.c | 18 +- + fs/xfs/xfs_rmap_item.c | 4 +- + fs/xfs/xfs_rtalloc.h | 9 +- + fs/xfs/xfs_super.c | 59 +- + fs/xfs/xfs_symlink.c | 10 +- + fs/xfs/xfs_sysctl.h | 1 + + fs/xfs/xfs_sysfs.c | 31 + + fs/xfs/xfs_trace.h | 72 ++- + fs/xfs/xfs_trans.c | 89 ++- + fs/xfs/xfs_trans.h | 29 +- + fs/xfs/xfs_trans_ail.c | 50 +- + fs/xfs/xfs_trans_bmap.c | 4 +- + fs/xfs/xfs_trans_buf.c | 24 +- + fs/xfs/xfs_trans_dquot.c | 4 +- + fs/xfs/xfs_trans_extfree.c | 84 ++- + fs/xfs/xfs_trans_inode.c | 3 +- + fs/xfs/xfs_trans_priv.h | 11 +- + fs/xfs/xfs_trans_refcount.c | 4 +- + fs/xfs/xfs_trans_rmap.c | 4 +- + include/linux/bio.h | 9 + + include/linux/buffer_head.h | 2 - + include/linux/dax.h | 11 +- + include/linux/iomap.h | 27 +- + include/uapi/linux/fs.h | 8 +- + mm/internal.h | 2 +- + mm/readahead.c | 39 +- + 131 files changed, 5578 insertions(+), 2009 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_ag.c + create mode 100644 fs/xfs/libxfs/xfs_ag.h + create mode 100644 fs/xfs/scrub/agheader_repair.c + create mode 100644 fs/xfs/scrub/repair.c + create mode 100644 fs/xfs/scrub/repair.h +Merging file-locks/locks-next (7a107c0f55a3 fasync: Fix deadlock between task-context and interrupt-context kill_fasync()) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (5f181c9ca108 Merge branch 'work.compat' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging fs/orangefs/devorangefs-req.c +Auto-merging fs/iomap.c +Auto-merging fs/block_dev.c +Auto-merging drivers/block/loop.c +Resolved 'include/linux/fs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 735ba49b187d] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + block/ioprio.c | 22 +- + drivers/block/loop.c | 3 + + fs/afs/cell.c | 12 +- + fs/afs/cmservice.c | 2 +- + fs/afs/fsclient.c | 100 +++--- + fs/afs/internal.h | 45 +-- + fs/afs/main.c | 33 +- + fs/afs/netdevices.c | 6 +- + fs/afs/proc.c | 787 ++++++++++++++++-------------------------- + fs/afs/rxrpc.c | 2 +- + fs/afs/super.c | 20 +- + fs/aio.c | 18 +- + fs/block_dev.c | 2 + + fs/iomap.c | 1 + + fs/orangefs/devorangefs-req.c | 54 +-- + fs/proc/generic.c | 24 ++ + fs/proc/internal.h | 2 + + fs/proc/proc_net.c | 92 +++++ + fs/signalfd.c | 50 +-- + fs/splice.c | 98 +++--- + include/linux/fs.h | 16 +- + include/linux/ioprio.h | 9 + + include/linux/proc_fs.h | 12 + + include/uapi/linux/aio_abi.h | 1 + + 24 files changed, 695 insertions(+), 716 deletions(-) +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging printk/for-next (bb906b0d1827 Merge branch 'for-4.18-vsprintf-pcr-removal' into for-4.18) +$ git merge printk/for-next +Auto-merging lib/vsprintf.c +CONFLICT (content): Merge conflict in lib/vsprintf.c +Auto-merging kernel/printk/printk.c +Auto-merging drivers/clk/renesas/renesas-cpg-mssr.c +Resolved 'lib/vsprintf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bc67a6ad6fb3] Merge remote-tracking branch 'printk/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/core-api/printk-formats.rst | 3 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 9 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 4 +- + drivers/tty/serial/sh-sci.c | 4 +- + kernel/printk/printk.c | 14 +-- + kernel/printk/printk_safe.c | 16 ++-- + lib/test_printf.c | 2 +- + lib/vsprintf.c | 133 ++++++++++++----------------- + 8 files changed, 74 insertions(+), 111 deletions(-) +Merging pci/next (e649a6be641e Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging include/linux/pci.h +Auto-merging include/linux/acpi.h +Removing drivers/pci/pcie/portdrv_acpi.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/host/pci-aardvark.c +Auto-merging drivers/pci/Kconfig +Auto-merging drivers/nvme/host/pci.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/infiniband/hw/hfi1/pcie.c +Auto-merging arch/xtensa/include/asm/pci.h +Auto-merging arch/microblaze/include/asm/pci.h +CONFLICT (content): Merge conflict in arch/microblaze/include/asm/pci.h +Auto-merging arch/arm64/configs/defconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/microblaze/include/asm/pci.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 42236b5489e0] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/pci-error-recovery.txt | 35 +- + Documentation/admin-guide/kernel-parameters.txt | 2 + + .../devicetree/bindings/pci/designware-pcie.txt | 24 +- + .../devicetree/bindings/pci/mobiveil-pcie.txt | 73 + + .../devicetree/bindings/pci/pci-armada8k.txt | 5 +- + Documentation/devicetree/bindings/pci/rcar-pci.txt | 6 + + .../devicetree/bindings/pci/rockchip-pcie-ep.txt | 62 + + .../{rockchip-pcie.txt => rockchip-pcie-host.txt} | 0 + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 17 +- + arch/arm64/configs/defconfig | 3 +- + arch/microblaze/include/asm/pci.h | 4 - + arch/microblaze/pci/pci-common.c | 61 - + arch/mips/pci/pci-legacy.c | 8 +- + arch/sparc/kernel/leon_pci.c | 62 +- + arch/sparc/kernel/pci.c | 136 +- + arch/sparc/kernel/pci_common.c | 31 +- + arch/sparc/kernel/pci_msi.c | 10 +- + arch/sparc/kernel/pcic.c | 94 +- + arch/x86/pci/early.c | 19 +- + arch/x86/pci/fixup.c | 4 + + arch/xtensa/include/asm/pci.h | 2 - + arch/xtensa/kernel/pci.c | 69 +- + drivers/acpi/pci_root.c | 17 +- + drivers/infiniband/hw/hfi1/pcie.c | 24 +- + drivers/iommu/amd_iommu.c | 11 +- + drivers/iommu/intel-iommu.c | 3 +- + drivers/misc/pci_endpoint_test.c | 29 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 28 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 23 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 19 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 75 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 47 +- + drivers/nvme/host/pci.c | 20 +- + drivers/pci/Kconfig | 12 + + drivers/pci/Makefile | 1 + + drivers/pci/ats.c | 3 + + drivers/pci/dwc/Kconfig | 88 +- + drivers/pci/dwc/pci-dra7xx.c | 19 +- + drivers/pci/dwc/pci-imx6.c | 2 +- + drivers/pci/dwc/pci-keystone.c | 2 +- + drivers/pci/dwc/pcie-armada8k.c | 21 +- + drivers/pci/dwc/pcie-artpec6.c | 6 +- + drivers/pci/dwc/pcie-designware-ep.c | 19 +- + drivers/pci/dwc/pcie-designware-host.c | 80 +- + drivers/pci/dwc/pcie-designware-plat.c | 155 +- + drivers/pci/dwc/pcie-designware.c | 22 +- + drivers/pci/dwc/pcie-designware.h | 1 + + drivers/pci/dwc/pcie-qcom.c | 11 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 35 +- + drivers/pci/endpoint/pci-epf-core.c | 23 +- + drivers/pci/host/Kconfig | 55 +- + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-aardvark.c | 7 +- + drivers/pci/host/pci-ftpci100.c | 6 +- + drivers/pci/host/pci-host-common.c | 13 + + drivers/pci/host/pci-host-generic.c | 1 + + drivers/pci/host/pci-hyperv.c | 162 +- + drivers/pci/host/pci-mvebu.c | 2 + + drivers/pci/host/pci-rcar-gen2.c | 2 + + drivers/pci/host/pci-tegra.c | 2 + + drivers/pci/host/pci-v3-semi.c | 5 +- + drivers/pci/host/pci-versatile.c | 5 +- + drivers/pci/host/pci-xgene.c | 5 +- + drivers/pci/host/pcie-altera.c | 7 +- + drivers/pci/host/pcie-iproc-platform.c | 5 +- + drivers/pci/host/pcie-mediatek.c | 236 +-- + drivers/pci/host/pcie-mobiveil.c | 866 ++++++++++ + drivers/pci/host/pcie-rcar.c | 284 ++-- + drivers/pci/host/pcie-rockchip-ep.c | 642 ++++++++ + drivers/pci/host/pcie-rockchip-host.c | 1142 +++++++++++++ + drivers/pci/host/pcie-rockchip.c | 1684 +++----------------- + drivers/pci/host/pcie-rockchip.h | 338 ++++ + drivers/pci/host/pcie-xilinx-nwl.c | 6 +- + drivers/pci/host/pcie-xilinx.c | 6 +- + drivers/pci/host/vmd.c | 91 +- + drivers/pci/hotplug/Kconfig | 5 +- + drivers/pci/hotplug/acpi_pcihp.c | 45 +- + drivers/pci/hotplug/acpiphp_glue.c | 84 +- + drivers/pci/hotplug/ibmphp_core.c | 2 +- + drivers/pci/hotplug/pciehp.h | 2 +- + drivers/pci/hotplug/pciehp_core.c | 2 +- + drivers/pci/hotplug/pciehp_hpc.c | 84 +- + drivers/pci/hotplug/pnv_php.c | 8 +- + drivers/pci/hotplug/shpchp.h | 12 - + drivers/pci/hotplug/shpchp_core.c | 14 +- + drivers/pci/hotplug/shpchp_ctrl.c | 8 +- + drivers/pci/iov.c | 42 +- + drivers/pci/of.c | 63 +- + drivers/pci/pci-acpi.c | 55 +- + drivers/pci/pci-driver.c | 2 +- + drivers/pci/pci-pf-stub.c | 54 + + drivers/pci/pci-sysfs.c | 15 +- + drivers/pci/pci.c | 89 +- + drivers/pci/pci.h | 45 + + drivers/pci/pcie/Makefile | 2 +- + drivers/pci/pcie/aer/aerdrv.c | 5 +- + drivers/pci/pcie/aer/aerdrv.h | 30 - + drivers/pci/pcie/aer/aerdrv_core.c | 365 +---- + drivers/pci/pcie/aer/aerdrv_errprint.c | 38 +- + drivers/pci/pcie/aspm.c | 9 + + drivers/pci/pcie/dpc.c | 74 +- + drivers/pci/pcie/err.c | 388 +++++ + drivers/pci/pcie/portdrv.h | 5 +- + drivers/pci/pcie/portdrv_acpi.c | 57 - + drivers/pci/pcie/portdrv_core.c | 69 +- + drivers/pci/probe.c | 96 +- + drivers/pci/quirks.c | 1002 ++++++------ + drivers/pci/setup-bus.c | 82 +- + include/linux/acpi.h | 3 +- + include/linux/aer.h | 1 + + include/linux/of_pci.h | 34 - + include/linux/pci-ecam.h | 1 + + include/linux/pci-epc.h | 8 + + include/linux/pci-epf.h | 4 +- + include/linux/pci.h | 21 +- + include/linux/pci_hotplug.h | 18 +- + include/linux/pci_ids.h | 9 + + include/ras/ras_event.h | 22 +- + include/uapi/linux/pci_regs.h | 6 + + 120 files changed, 6204 insertions(+), 3874 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/mobiveil-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-ep.txt + rename Documentation/devicetree/bindings/pci/{rockchip-pcie.txt => rockchip-pcie-host.txt} (100%) + create mode 100644 drivers/pci/host/pcie-mobiveil.c + create mode 100644 drivers/pci/host/pcie-rockchip-ep.c + create mode 100644 drivers/pci/host/pcie-rockchip-host.c + create mode 100644 drivers/pci/host/pcie-rockchip.h + create mode 100644 drivers/pci/pci-pf-stub.c + create mode 100644 drivers/pci/pcie/err.c + delete mode 100644 drivers/pci/pcie/portdrv_acpi.c +Merging pstore/for-next/pstore (e698aaf37f9f pstore: fix crypto dependencies without compression) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (f1b6ae6701a7 Merge branch 'for-4.18/rmi' into for-next) +$ git merge hid/for-next +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 16 + + drivers/hid/Makefile | 2 + + drivers/hid/hid-alps.c | 30 +- + drivers/hid/hid-core.c | 21 +- + drivers/hid/hid-generic.c | 15 + + drivers/hid/hid-gfrm.c | 2 +- + drivers/hid/hid-ids.h | 5 + + drivers/hid/hid-input.c | 123 ++++- + drivers/hid/hid-magicmouse.c | 6 +- + drivers/hid/hid-multitouch.c | 232 +++++---- + drivers/hid/hid-plantronics.c | 6 +- + drivers/hid/hid-quirks.c | 1 - + drivers/hid/hid-redragon.c | 86 ++++ + drivers/hid/hid-rmi.c | 20 + + drivers/hid/hid-steam.c | 1115 +++++++++++++++++++++++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid.c | 33 +- + drivers/hid/wacom_wac.c | 74 +-- + include/linux/hid.h | 19 +- + 18 files changed, 1621 insertions(+), 185 deletions(-) + create mode 100644 drivers/hid/hid-redragon.c + create mode 100644 drivers/hid/hid-steam.c +Merging i2c/i2c/for-next (1840b5ac656f Merge branch 'i2c/for-4.18' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing include/linux/i2c-pnx.h +Auto-merging arch/arm/mach-sa1100/simpad.c +Auto-merging arch/arm/mach-pxa/viper.c +Auto-merging arch/arm/mach-pxa/palmz72.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_7xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_54xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_44xx_data.c +Auto-merging arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-davinci.txt | 2 +- + Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 1 + + .../devicetree/bindings/i2c/i2c-s3c2410.txt | 4 +- + Documentation/i2c/busses/i2c-mlxcpld | 4 + + Documentation/i2c/busses/i2c-ocores | 2 +- + Documentation/i2c/muxes/i2c-mux-gpio | 4 +- + MAINTAINERS | 8 +- + arch/arm/mach-ks8695/board-acs5k.c | 2 +- + arch/arm/mach-omap1/board-htcherald.c | 2 +- + arch/arm/mach-omap1/common.h | 2 +- + arch/arm/mach-omap1/i2c.c | 2 +- + arch/arm/mach-omap2/common.h | 2 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 +- + arch/arm/mach-pxa/palmz72.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-sa1100/simpad.c | 2 +- + arch/mips/alchemy/board-gpr.c | 2 +- + arch/sh/boards/board-sh7785lcr.c | 2 +- + drivers/i2c/algos/i2c-algo-bit.c | 4 +- + drivers/i2c/algos/i2c-algo-pca.c | 5 +- + drivers/i2c/algos/i2c-algo-pcf.c | 8 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/Makefile | 3 +- + drivers/i2c/busses/i2c-aspeed.c | 3 +- + drivers/i2c/busses/i2c-at91.c | 12 +- + drivers/i2c/busses/i2c-axxia.c | 31 +- + drivers/i2c/busses/i2c-designware-common.c | 20 +- + drivers/i2c/busses/i2c-designware-core.h | 14 +- + drivers/i2c/busses/i2c-designware-master.c | 8 +- + drivers/i2c/busses/i2c-designware-slave.c | 6 +- + drivers/i2c/busses/i2c-diolan-u2c.c | 11 +- + drivers/i2c/busses/i2c-efm32.c | 3 +- + drivers/i2c/busses/i2c-eg20t.c | 5 +- + drivers/i2c/busses/i2c-emev2.c | 2 +- + drivers/i2c/busses/i2c-exynos5.c | 29 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hix5hd2.c | 22 +- + drivers/i2c/busses/i2c-i801.c | 7 +- + drivers/i2c/busses/i2c-ibm_iic.c | 3 - + drivers/i2c/busses/i2c-imx-lpi2c.c | 16 +- + drivers/i2c/busses/i2c-imx.c | 21 +- + drivers/i2c/busses/i2c-kempld.c | 7 +- + drivers/i2c/busses/i2c-mlxcpld.c | 68 +- + drivers/i2c/busses/i2c-mt65xx.c | 8 +- + drivers/i2c/busses/i2c-mxs.c | 16 +- + drivers/i2c/busses/i2c-nomadik.c | 2 - + drivers/i2c/busses/i2c-ocores.c | 7 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-opal.c | 4 - + drivers/i2c/busses/i2c-pasemi.c | 2 +- + drivers/i2c/busses/i2c-pca-platform.c | 2 +- + drivers/i2c/busses/i2c-pnx.c | 21 +- + drivers/i2c/busses/i2c-qup.c | 59 +- + drivers/i2c/busses/i2c-rcar.c | 4 +- + drivers/i2c/busses/i2c-riic.c | 5 +- + drivers/i2c/busses/i2c-rk3x.c | 2 - + drivers/i2c/busses/i2c-robotfuzz-osif.c | 21 +- + drivers/i2c/busses/i2c-s3c2410.c | 2 - + drivers/i2c/busses/i2c-sh_mobile.c | 11 - + drivers/i2c/busses/i2c-stm32.c | 153 +++ + drivers/i2c/busses/i2c-stm32.h | 37 + + drivers/i2c/busses/i2c-stm32f7.c | 1045 +++++++++++++++++++- + drivers/i2c/busses/i2c-stu300.c | 22 +- + drivers/i2c/busses/i2c-synquacer.c | 2 +- + drivers/i2c/busses/i2c-tegra.c | 33 - + drivers/i2c/busses/i2c-xiic.c | 17 +- + drivers/i2c/busses/i2c-xlp9xx.c | 89 +- + drivers/i2c/i2c-core-base.c | 10 +- + drivers/i2c/i2c-core-of.c | 51 +- + drivers/i2c/i2c-core-smbus.c | 2 + + drivers/i2c/i2c-mux.c | 2 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 5 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 2 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 7 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 18 +- + drivers/i2c/muxes/i2c-mux-reg.c | 4 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 2 +- + drivers/mfd/sm501.c | 2 +- + drivers/mfd/timberdale.c | 4 +- + drivers/misc/eeprom/at24.c | 71 +- + include/linux/i2c-pnx.h | 38 - + include/linux/i2c.h | 12 +- + include/linux/{ => platform_data}/i2c-gpio.h | 0 + include/linux/{ => platform_data}/i2c-mux-gpio.h | 0 + include/linux/{ => platform_data}/i2c-ocores.h | 0 + include/linux/{ => platform_data}/i2c-omap.h | 0 + .../linux/{ => platform_data}/i2c-pca-platform.h | 0 + include/linux/{ => platform_data}/i2c-xiic.h | 0 + 94 files changed, 1683 insertions(+), 483 deletions(-) + create mode 100644 drivers/i2c/busses/i2c-stm32.c + delete mode 100644 include/linux/i2c-pnx.h + rename include/linux/{ => platform_data}/i2c-gpio.h (100%) + rename include/linux/{ => platform_data}/i2c-mux-gpio.h (100%) + rename include/linux/{ => platform_data}/i2c-ocores.h (100%) + rename include/linux/{ => platform_data}/i2c-omap.h (100%) + rename include/linux/{ => platform_data}/i2c-pca-platform.h (100%) + rename include/linux/{ => platform_data}/i2c-xiic.h (100%) +Merging dmi/master (5cb06cfce4a8 firmware: dmi: Add access to the SKU ID string) +$ git merge dmi/master +Merge made by the 'recursive' strategy. + drivers/firmware/dmi-id.c | 2 ++ + drivers/firmware/dmi_scan.c | 1 + + include/linux/mod_devicetable.h | 1 + + 3 files changed, 4 insertions(+) +Merging hwmon-staging/hwmon-next (c9bdf291542e hwmon: (asus_atk0110) Make use of device managed memory) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (a49d9c0ae46e Documentation: document hung_task_panic kernel parameter) +$ git merge jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (a00031c15974 media: ddbridge: conditionally enable fast TS for stv0910-equipped bridges) +$ git merge v4l-dvb/master +Removing include/media/videobuf-dvb.h +Auto-merging drivers/staging/media/zoran/zoran_driver.c +Auto-merging drivers/staging/media/zoran/Kconfig +Removing drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c +Removing drivers/staging/media/atomisp/platform/intel-mid/Makefile +Removing drivers/staging/media/atomisp/platform/Makefile +Removing drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c +Removing drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c +Removing drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu_mrfld.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_vm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_pool.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_common.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h +Removing drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c +Removing drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_custom_host_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c +Removing drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c +Removing drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c +Removing drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c +Removing drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_uds.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_shading.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_properties.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_pipe.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params_internal.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_morph.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metadata.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_host_data.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_frac.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/timer/src/timer.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/tagger/interface/ia_css_tagger_common.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl_comm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr_vbuf.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue_comm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/src/pipeline.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline_common.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys_comm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/src/isp_param.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/interface/ia_css_ifmtr.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/src/frame.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame_comm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/src/eventq.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/interface/ia_css_eventq.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/src/event.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/interface/ia_css_event.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_pipe.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_internal.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/memory_realloc.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_host_data.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/tag_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/sw_event_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/queue_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vmem.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vamem.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/type_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/timed_ctrl.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/tag.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/system_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/sp.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/socket.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/resource.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/queue.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/platform_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/pixelgen.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/misc_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_realloc.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_access/memory_access.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_stream2mmio.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_irq.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_dma.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isp.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/irq.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_system.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_formatter.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/ibuf_ctrl.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vmem_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vamem_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/timed_ctrl_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/tag_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/sp_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_irq_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_dma_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/irq_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_system_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_formatter_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/hmem_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gpio_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_timer_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_device_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gdc_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/fifo_monitor_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/event_fifo_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/dma_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/debug_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/hmem.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gpio.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_timer.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_device.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gdc_device.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/fifo_monitor.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/event_fifo.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/error_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/dma.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/debug.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/csi_rx.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bitop_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/assert_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vmem_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vamem_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/timed_ctrl_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/system_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/sp_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/mmu_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/irq_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_system_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/hmem_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gpio_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_timer_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_device_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/fifo_monitor_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/event_fifo_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/dma_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/debug_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_trace.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/spmem_dump.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/version.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/var.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/timed_controller_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/streaming_to_mipi_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/str2mem_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/scalar_processor_2400_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/mmu_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_capture_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_acquisition_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2401_mamoiada_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2400_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/irq_controller_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_ctrl_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_switch_2400_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_selector_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_formatter_subsystem_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/if_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gpio_block_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_timer_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gdc_v2_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/dma_v2_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_common_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/cell_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/bits.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/spmem_dump.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_stream2mmio_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_irq_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/ibuf_ctrl_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/version.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/var.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/timed_controller_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/stream2mmio_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/str2mem_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/rx_csi_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mmu_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_capture_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_acquisition_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2400_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/irq_controller_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_switch_2400_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_selector_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/if_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gpio_block_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_timer_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gdc_v2_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/dma_v2_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/cell_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/bits.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_local.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/csi_rx_global.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/spmem_dump.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/version.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/var.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/timed_controller_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/streaming_to_mipi_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/str2mem_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/scalar_processor_2400_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/mmu_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_capture_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_acquisition_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_support.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_mamoiada_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/irq_controller_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_ctrl_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_switch_2400_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_selector_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_formatter_subsystem_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/if_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_types.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gpio_block_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_timer_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gdc_v2_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/dma_v2_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_common_defs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/cell_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/bits.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_util.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_stagedesc.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_binarydesc.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_stagedesc.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/src/refcount.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/interface/ia_css_refcount.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_desc.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_comm.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h +Removing drivers/staging/media/atomisp/pci/atomisp2/css2400/Makefile +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_trace_event.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_tables.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_helper.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c +Removing drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h +Removing drivers/staging/media/atomisp/pci/atomisp2/Makefile +Removing drivers/staging/media/atomisp/pci/Makefile +Removing drivers/staging/media/atomisp/pci/Kconfig +Removing drivers/staging/media/atomisp/include/media/lm3554.h +Removing drivers/staging/media/atomisp/include/linux/libmsrlisthelper.h +Removing drivers/staging/media/atomisp/include/linux/atomisp_platform.h +Removing drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h +Removing drivers/staging/media/atomisp/include/linux/atomisp.h +Removing drivers/staging/media/atomisp/i2c/ov5693/ov5693.h +Removing drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c +Removing drivers/staging/media/atomisp/i2c/ov5693/ad5823.h +Removing drivers/staging/media/atomisp/i2c/ov5693/Makefile +Removing drivers/staging/media/atomisp/i2c/ov5693/Kconfig +Removing drivers/staging/media/atomisp/i2c/ov2722.h +Removing drivers/staging/media/atomisp/i2c/ov2680.h +Removing drivers/staging/media/atomisp/i2c/mt9m114.h +Removing drivers/staging/media/atomisp/i2c/gc2235.h +Removing drivers/staging/media/atomisp/i2c/gc0310.h +Removing drivers/staging/media/atomisp/i2c/atomisp-ov2722.c +Removing drivers/staging/media/atomisp/i2c/atomisp-ov2680.c +Removing drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c +Removing drivers/staging/media/atomisp/i2c/atomisp-lm3554.c +Removing drivers/staging/media/atomisp/i2c/atomisp-libmsrlisthelper.c +Removing drivers/staging/media/atomisp/i2c/atomisp-gc2235.c +Removing drivers/staging/media/atomisp/i2c/atomisp-gc0310.c +Removing drivers/staging/media/atomisp/i2c/Makefile +Removing drivers/staging/media/atomisp/i2c/Kconfig +Removing drivers/staging/media/atomisp/TODO +Removing drivers/staging/media/atomisp/Makefile +Removing drivers/staging/media/atomisp/Kconfig +Removing drivers/media/v4l2-core/videobuf-dvb.c +Auto-merging drivers/media/platform/vsp1/vsp1_brx.c +Removing drivers/media/platform/vsp1/vsp1_bru.h +Auto-merging drivers/media/platform/marvell-ccic/mmp-driver.c +Removing drivers/media/pci/pt1/va1j5jf8007t.h +Removing drivers/media/pci/pt1/va1j5jf8007t.c +Removing drivers/media/pci/pt1/va1j5jf8007s.h +Removing drivers/media/pci/pt1/va1j5jf8007s.c +Auto-merging MAINTAINERS +Auto-merging Documentation/media/uapi/v4l/selection-api-configuration.rst +Removing Documentation/media/uapi/v4l/selection-api-005.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-rc | 16 +- + Documentation/ABI/testing/sysfs-class-rc-nuvoton | 2 +- + Documentation/ABI/testing/sysfs-devices-edac | 14 +- + .../devicetree/bindings/media/cdns,csi2rx.txt | 100 + + .../devicetree/bindings/media/cdns,csi2tx.txt | 98 + + .../devicetree/bindings/media/i2c/ov7251.txt | 52 + + .../devicetree/bindings/media/i2c/ov772x.txt | 40 + + .../bindings/media/i2c/panasonic,amg88xx.txt | 19 + + .../devicetree/bindings/media/rcar_vin.txt | 138 +- + .../devicetree/bindings/media/renesas,ceu.txt | 7 +- + .../bindings/media/renesas,rcar-csi2.txt | 101 + + Documentation/media/kapi/cec-core.rst | 5 +- + Documentation/media/uapi/cec/cec-ioc-receive.rst | 24 +- + Documentation/media/uapi/dvb/dvbapi.rst | 2 +- + Documentation/media/uapi/rc/lirc-dev-intro.rst | 2 +- + .../media/uapi/rc/lirc-set-rec-timeout.rst | 14 +- + Documentation/media/uapi/v4l/common.rst | 2 +- + Documentation/media/uapi/v4l/crop.rst | 22 +- + Documentation/media/uapi/v4l/selection-api-005.rst | 34 - + ...api-004.rst => selection-api-configuration.rst} | 2 +- + ...tion-api-006.rst => selection-api-examples.rst} | 0 + ...lection-api-002.rst => selection-api-intro.rst} | 0 + ...ction-api-003.rst => selection-api-targets.rst} | 0 + .../media/uapi/v4l/selection-api-vs-crop-api.rst | 39 + + Documentation/media/uapi/v4l/selection-api.rst | 14 +- + Documentation/media/uapi/v4l/selection.svg | 4 +- + Documentation/media/uapi/v4l/v4l2.rst | 2 +- + .../media/v4l-drivers/cx23885-cardlist.rst | 18 +- + .../media/v4l-drivers/em28xx-cardlist.rst | 10 +- + MAINTAINERS | 31 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 156 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 15 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 12 +- + drivers/media/Kconfig | 12 +- + drivers/media/cec/cec-adap.c | 19 +- + drivers/media/cec/cec-core.c | 2 +- + drivers/media/cec/cec-pin-error-inj.c | 33 +- + drivers/media/cec/cec-pin.c | 2 +- + drivers/media/common/b2c2/flexcop-fe-tuner.c | 4 +- + drivers/media/common/b2c2/flexcop-i2c.c | 47 +- + drivers/media/common/b2c2/flexcop.c | 2 +- + drivers/media/common/b2c2/flexcop.h | 1 + + drivers/media/common/saa7146/saa7146_i2c.c | 4 +- + drivers/media/common/siano/smscoreapi.c | 32 +- + drivers/media/common/siano/smscoreapi.h | 3 + + drivers/media/common/siano/smsendian.c | 14 +- + drivers/media/common/videobuf2/Kconfig | 2 - + drivers/media/common/videobuf2/videobuf2-core.c | 9 +- + drivers/media/dvb-core/dmxdev.c | 2 +- + drivers/media/dvb-core/dvb_ca_en50221.c | 2 + + drivers/media/dvb-core/dvb_frontend.c | 230 +- + drivers/media/dvb-core/dvb_net.c | 2 +- + drivers/media/dvb-core/dvbdev.c | 4 + + drivers/media/dvb-frontends/Kconfig | 2 +- + drivers/media/dvb-frontends/as102_fe.h | 2 +- + drivers/media/dvb-frontends/au8522_decoder.c | 14 +- + drivers/media/dvb-frontends/cx24116.c | 2 +- + drivers/media/dvb-frontends/cx24117.c | 2 +- + drivers/media/dvb-frontends/cx24120.c | 2 +- + drivers/media/dvb-frontends/cx24123.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 4 +- + drivers/media/dvb-frontends/cxd2099.h | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + .../cxd2880/cxd2880_tnrdmd_driver_version.h | 4 +- + drivers/media/dvb-frontends/cxd2880/cxd2880_top.c | 14 +- + drivers/media/dvb-frontends/dvb-pll.c | 110 + + drivers/media/dvb-frontends/dvb-pll.h | 6 + + drivers/media/dvb-frontends/l64781.c | 4 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 874 +- + drivers/media/dvb-frontends/lgdt330x.h | 41 +- + drivers/media/dvb-frontends/mb86a20s.c | 2 +- + drivers/media/dvb-frontends/mxl5xx.c | 2 +- + drivers/media/dvb-frontends/s921.c | 2 +- + drivers/media/dvb-frontends/stv0910.c | 15 +- + drivers/media/dvb-frontends/stv0910.h | 1 + + drivers/media/dvb-frontends/tc90522.c | 15 +- + drivers/media/dvb-frontends/tc90522.h | 11 +- + drivers/media/i2c/Kconfig | 36 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv748x/adv748x-afe.c | 12 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 8 +- + drivers/media/i2c/adv7511.c | 22 +- + drivers/media/i2c/imx258.c | 1318 +++ + drivers/media/i2c/imx274.c | 74 +- + drivers/media/i2c/ir-kbd-i2c.c | 4 +- + drivers/media/i2c/ov13858.c | 1 - + drivers/media/i2c/ov2640.c | 112 +- + drivers/media/i2c/ov5640.c | 257 +- + drivers/media/i2c/ov5645.c | 6 +- + drivers/media/i2c/ov5695.c | 1 - + drivers/media/i2c/ov7251.c | 1503 +++ + drivers/media/i2c/ov772x.c | 2 +- + drivers/media/i2c/ov7740.c | 22 +- + drivers/media/i2c/smiapp/smiapp-core.c | 11 +- + drivers/media/i2c/tda1997x.c | 4 +- + drivers/media/i2c/tvp5150.c | 159 +- + drivers/media/i2c/video-i2c.c | 564 + + drivers/media/media-device.c | 21 +- + drivers/media/mmc/siano/smssdio.c | 2 +- + drivers/media/pci/Kconfig | 1 - + drivers/media/pci/Makefile | 1 - + drivers/media/pci/bt8xx/bttv-risc.c | 17 +- + drivers/media/pci/bt8xx/dst.c | 2 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 4 +- + drivers/media/pci/cx23885/cx23885-core.c | 132 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 6 +- + drivers/media/pci/cx23885/cx23885-reg.h | 14 + + drivers/media/pci/cx88/cx88-dvb.c | 7 +- + drivers/media/pci/cx88/cx88-input.c | 11 +- + drivers/media/pci/cx88/cx88-vbi.c | 1 - + drivers/media/pci/ddbridge/Kconfig | 1 + + drivers/media/pci/ddbridge/Makefile | 2 +- + drivers/media/pci/ddbridge/ddbridge-ci.c | 2 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 419 +- + drivers/media/pci/ddbridge/ddbridge-hw.c | 11 + + drivers/media/pci/ddbridge/ddbridge-i2c.c | 5 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 91 +- + drivers/media/pci/ddbridge/ddbridge-max.c | 42 + + drivers/media/pci/ddbridge/ddbridge-max.h | 1 + + drivers/media/pci/ddbridge/ddbridge-mci.c | 551 + + drivers/media/pci/ddbridge/ddbridge-mci.h | 156 + + drivers/media/pci/ddbridge/ddbridge-regs.h | 4 + + drivers/media/pci/ddbridge/ddbridge.h | 50 +- + drivers/media/pci/dt3155/Kconfig | 1 - + drivers/media/pci/intel/ipu3/Kconfig | 16 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 32 +- + drivers/media/pci/mantis/mantis_uart.c | 7 + + drivers/media/pci/meye/Kconfig | 3 +- + drivers/media/pci/ngene/ngene-cards.c | 18 +- + drivers/media/pci/ngene/ngene-dvb.c | 2 +- + drivers/media/pci/pt1/Kconfig | 3 + + drivers/media/pci/pt1/Makefile | 3 +- + drivers/media/pci/pt1/pt1.c | 471 +- + drivers/media/pci/pt1/va1j5jf8007s.c | 732 -- + drivers/media/pci/pt1/va1j5jf8007s.h | 42 - + drivers/media/pci/pt1/va1j5jf8007t.c | 532 - + drivers/media/pci/pt1/va1j5jf8007t.h | 42 - + drivers/media/pci/pt3/pt3.c | 70 +- + drivers/media/pci/pt3/pt3.h | 11 +- + drivers/media/pci/pt3/pt3_dma.c | 11 +- + drivers/media/pci/pt3/pt3_i2c.c | 11 +- + drivers/media/pci/saa7164/saa7164-fw.c | 3 +- + drivers/media/pci/solo6x10/Kconfig | 1 - + drivers/media/pci/sta2x11/Kconfig | 3 +- + drivers/media/pci/sta2x11/sta2x11_vip.c | 31 +- + drivers/media/pci/tw5864/Kconfig | 1 - + drivers/media/pci/tw686x/Kconfig | 1 - + drivers/media/pci/tw686x/tw686x-video.c | 3 +- + drivers/media/platform/Kconfig | 57 +- + drivers/media/platform/Makefile | 1 + + drivers/media/platform/am437x/Kconfig | 2 +- + drivers/media/platform/am437x/am437x-vpfe.c | 6 +- + drivers/media/platform/atmel/Kconfig | 4 +- + drivers/media/platform/cadence/Kconfig | 34 + + drivers/media/platform/cadence/Makefile | 4 + + drivers/media/platform/cadence/cdns-csi2rx.c | 498 + + drivers/media/platform/cadence/cdns-csi2tx.c | 563 + + drivers/media/platform/cec-gpio/cec-gpio.c | 2 +- + drivers/media/platform/coda/coda-common.c | 45 +- + drivers/media/platform/davinci/Kconfig | 12 +- + drivers/media/platform/davinci/isif.c | 4 +- + drivers/media/platform/davinci/vpbe.c | 38 +- + drivers/media/platform/davinci/vpbe_display.c | 33 +- + drivers/media/platform/davinci/vpbe_osd.c | 21 +- + drivers/media/platform/davinci/vpbe_venc.c | 11 +- + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/exynos4-is/Kconfig | 4 +- + drivers/media/platform/exynos4-is/fimc-lite-reg.c | 2 +- + drivers/media/platform/fsl-viu.c | 63 +- + drivers/media/platform/marvell-ccic/Kconfig | 5 +- + drivers/media/platform/marvell-ccic/mmp-driver.c | 6 +- + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 5 +- + drivers/media/platform/omap/Kconfig | 7 +- + drivers/media/platform/omap/omap_vout.c | 17 +- + drivers/media/platform/omap/omap_vout_vrfb.c | 4 +- + drivers/media/platform/omap3isp/isp.c | 22 +- + drivers/media/platform/omap3isp/ispccdc.c | 2 +- + drivers/media/platform/omap3isp/isph3a_aewb.c | 2 + + drivers/media/platform/omap3isp/isph3a_af.c | 2 + + drivers/media/platform/omap3isp/isphist.c | 2 + + drivers/media/platform/omap3isp/isppreview.c | 6 +- + drivers/media/platform/omap3isp/ispstat.c | 37 +- + drivers/media/platform/omap3isp/ispstat.h | 4 +- + drivers/media/platform/omap3isp/ispvideo.c | 2 +- + drivers/media/platform/pxa_camera.c | 17 +- + drivers/media/platform/rcar-vin/Kconfig | 16 +- + drivers/media/platform/rcar-vin/Makefile | 1 + + drivers/media/platform/rcar-vin/rcar-core.c | 959 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 1084 ++ + drivers/media/platform/rcar-vin/rcar-dma.c | 912 +- + drivers/media/platform/rcar-vin/rcar-v4l2.c | 490 +- + drivers/media/platform/rcar-vin/rcar-vin.h | 146 +- + drivers/media/platform/rcar_jpu.c | 4 +- + drivers/media/platform/renesas-ceu.c | 23 +- + .../media/platform/s5p-jpeg/jpeg-hw-exynos3250.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_dec.c | 4 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 4 +- + drivers/media/platform/soc_camera/Kconfig | 3 +- + .../platform/soc_camera/soc_camera_platform.c | 3 +- + drivers/media/platform/sti/bdisp/bdisp-hw.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 4 + + drivers/media/platform/sti/c8sectpfe/Kconfig | 2 +- + drivers/media/platform/sti/hva/hva-mem.c | 2 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 4 + + drivers/media/platform/via-camera.c | 2 +- + drivers/media/platform/video-mux.c | 16 +- + drivers/media/platform/vivid/vivid-vid-common.c | 2 +- + drivers/media/platform/vsp1/Makefile | 4 +- + drivers/media/platform/vsp1/vsp1.h | 16 +- + drivers/media/platform/vsp1/vsp1_bru.h | 48 - + .../media/platform/vsp1/{vsp1_bru.c => vsp1_brx.c} | 218 +- + drivers/media/platform/vsp1/vsp1_brx.h | 44 + + drivers/media/platform/vsp1/vsp1_clu.c | 184 +- + drivers/media/platform/vsp1/vsp1_clu.h | 7 +- + drivers/media/platform/vsp1/vsp1_dl.c | 441 +- + drivers/media/platform/vsp1/vsp1_dl.h | 36 +- + drivers/media/platform/vsp1/vsp1_drm.c | 951 +- + drivers/media/platform/vsp1/vsp1_drm.h | 31 +- + drivers/media/platform/vsp1/vsp1_drv.c | 38 +- + drivers/media/platform/vsp1/vsp1_entity.c | 137 +- + drivers/media/platform/vsp1/vsp1_entity.h | 60 +- + drivers/media/platform/vsp1/vsp1_hgo.c | 32 +- + drivers/media/platform/vsp1/vsp1_hgo.h | 6 +- + drivers/media/platform/vsp1/vsp1_hgt.c | 34 +- + drivers/media/platform/vsp1/vsp1_hgt.h | 6 +- + drivers/media/platform/vsp1/vsp1_histo.c | 67 +- + drivers/media/platform/vsp1/vsp1_histo.h | 9 +- + drivers/media/platform/vsp1/vsp1_hsit.c | 26 +- + drivers/media/platform/vsp1/vsp1_hsit.h | 6 +- + drivers/media/platform/vsp1/vsp1_lif.c | 96 +- + drivers/media/platform/vsp1/vsp1_lif.h | 6 +- + drivers/media/platform/vsp1/vsp1_lut.c | 151 +- + drivers/media/platform/vsp1/vsp1_lut.h | 7 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 127 +- + drivers/media/platform/vsp1/vsp1_pipe.h | 24 +- + drivers/media/platform/vsp1/vsp1_regs.h | 46 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 207 +- + drivers/media/platform/vsp1/vsp1_rwpf.c | 6 +- + drivers/media/platform/vsp1/vsp1_rwpf.h | 10 +- + drivers/media/platform/vsp1/vsp1_sru.c | 30 +- + drivers/media/platform/vsp1/vsp1_sru.h | 6 +- + drivers/media/platform/vsp1/vsp1_uds.c | 79 +- + drivers/media/platform/vsp1/vsp1_uds.h | 8 +- + drivers/media/platform/vsp1/vsp1_uif.c | 264 + + drivers/media/platform/vsp1/vsp1_uif.h | 32 + + drivers/media/platform/vsp1/vsp1_video.c | 220 +- + drivers/media/platform/vsp1/vsp1_video.h | 9 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 340 +- + drivers/media/platform/xilinx/xilinx-dma.c | 10 +- + drivers/media/radio/Kconfig | 45 +- + drivers/media/radio/si470x/Kconfig | 16 +- + drivers/media/radio/si470x/Makefile | 8 +- + drivers/media/radio/si470x/radio-si470x-common.c | 70 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 24 +- + drivers/media/radio/si470x/radio-si470x-usb.c | 18 +- + drivers/media/radio/si470x/radio-si470x.h | 15 +- + drivers/media/rc/Kconfig | 10 +- + drivers/media/rc/ir-imon-decoder.c | 136 +- + drivers/media/rc/ir-jvc-decoder.c | 1 + + drivers/media/rc/ir-mce_kbd-decoder.c | 64 +- + drivers/media/rc/ir-nec-decoder.c | 1 + + drivers/media/rc/ir-rc5-decoder.c | 4 +- + drivers/media/rc/ir-rc6-decoder.c | 11 +- + drivers/media/rc/ir-sanyo-decoder.c | 1 + + drivers/media/rc/ir-sharp-decoder.c | 1 + + drivers/media/rc/ir-sony-decoder.c | 1 + + drivers/media/rc/ir-spi.c | 4 +- + drivers/media/rc/ir-xmp-decoder.c | 1 + + drivers/media/rc/ite-cir.c | 8 +- + drivers/media/rc/ite-cir.h | 7 - + drivers/media/rc/lirc_dev.c | 31 +- + drivers/media/rc/mceusb.c | 53 +- + drivers/media/rc/mtk-cir.c | 4 +- + drivers/media/rc/nuvoton-cir.c | 89 +- + drivers/media/rc/rc-core-priv.h | 6 + + drivers/media/rc/rc-ir-raw.c | 81 +- + drivers/media/rc/rc-main.c | 72 +- + drivers/media/rc/st_rc.c | 16 +- + drivers/media/rc/winbond-cir.c | 4 +- + drivers/media/spi/cxd2880-spi.c | 32 +- + drivers/media/tuners/Kconfig | 7 + + drivers/media/tuners/Makefile | 1 + + drivers/media/tuners/mxl301rf.c | 11 +- + drivers/media/tuners/mxl301rf.h | 11 +- + drivers/media/tuners/qm1d1b0004.c | 266 + + drivers/media/tuners/qm1d1b0004.h | 24 + + drivers/media/tuners/qm1d1c0042.c | 11 +- + drivers/media/tuners/qm1d1c0042.h | 11 +- + drivers/media/usb/cx231xx/Kconfig | 5 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 1 + + drivers/media/usb/cx231xx/cx231xx-cards.c | 9 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 382 +- + drivers/media/usb/cx231xx/cx231xx-pcb-cfg.c | 2 +- + drivers/media/usb/cx231xx/cx231xx.h | 3 - + drivers/media/usb/dvb-usb-v2/dvbsky.c | 425 +- + drivers/media/usb/dvb-usb-v2/gl861.c | 22 +- + drivers/media/usb/dvb-usb-v2/usb_urb.c | 17 +- + drivers/media/usb/dvb-usb/cxusb.c | 9 +- + drivers/media/usb/dvb-usb/dvb-usb-dvb.c | 4 + + drivers/media/usb/dvb-usb/gp8psk.c | 2 +- + drivers/media/usb/dvb-usb/usb-urb.c | 6 +- + drivers/media/usb/em28xx/em28xx-cards.c | 50 +- + drivers/media/usb/em28xx/em28xx-core.c | 5 +- + drivers/media/usb/em28xx/em28xx-dvb.c | 8 +- + drivers/media/usb/em28xx/em28xx-v4l.h | 2 +- + drivers/media/usb/em28xx/em28xx.h | 1 + + drivers/media/usb/go7007/go7007-fw.c | 3 + + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/Kconfig | 1 + + drivers/media/usb/gspca/gspca.c | 946 +- + drivers/media/usb/gspca/gspca.h | 38 +- + drivers/media/usb/gspca/jl2005bcd.c | 2 +- + drivers/media/usb/gspca/m5602/m5602_core.c | 4 +- + drivers/media/usb/gspca/ov534.c | 1 - + drivers/media/usb/gspca/sq905.c | 2 +- + drivers/media/usb/gspca/sq905c.c | 2 +- + drivers/media/usb/gspca/topro.c | 1 - + drivers/media/usb/gspca/vc032x.c | 2 +- + drivers/media/usb/gspca/vicam.c | 2 +- + drivers/media/usb/gspca/zc3xx.c | 58 +- + drivers/media/usb/hackrf/hackrf.c | 11 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 2 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-cx2584x-v4l.c | 1 - + drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 4 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 83 +- + drivers/media/usb/siano/smsusb.c | 2 +- + drivers/media/usb/stk1160/stk1160-core.c | 4 +- + drivers/media/usb/usbtv/usbtv-video.c | 117 +- + drivers/media/usb/usbtv/usbtv.h | 2 +- + drivers/media/usb/usbvision/usbvision-core.c | 2 +- + drivers/media/usb/uvc/uvc_driver.c | 11 +- + drivers/media/usb/uvc/uvc_video.c | 24 +- + drivers/media/v4l2-core/Kconfig | 6 - + drivers/media/v4l2-core/Makefile | 1 - + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 807 +- + drivers/media/v4l2-core/v4l2-dev.c | 73 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 28 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 284 +- + drivers/media/v4l2-core/v4l2-subdev.c | 17 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 6 +- + drivers/media/v4l2-core/videobuf-dvb.c | 398 - + drivers/pnp/isapnp/Kconfig | 2 +- + drivers/staging/media/Kconfig | 4 +- + drivers/staging/media/Makefile | 2 +- + drivers/staging/media/atomisp/Kconfig | 12 - + drivers/staging/media/atomisp/Makefile | 6 - + drivers/staging/media/atomisp/TODO | 74 - + drivers/staging/media/atomisp/i2c/Kconfig | 86 - + drivers/staging/media/atomisp/i2c/Makefile | 25 - + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 1392 --- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 1122 -- + .../media/atomisp/i2c/atomisp-libmsrlisthelper.c | 205 - + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 968 -- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 1917 ---- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 1470 --- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 1271 --- + drivers/staging/media/atomisp/i2c/gc0310.h | 404 - + drivers/staging/media/atomisp/i2c/gc2235.h | 670 -- + drivers/staging/media/atomisp/i2c/mt9m114.h | 1777 --- + drivers/staging/media/atomisp/i2c/ov2680.h | 856 -- + drivers/staging/media/atomisp/i2c/ov2722.h | 1262 --- + drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 11 - + drivers/staging/media/atomisp/i2c/ov5693/Makefile | 9 - + drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 63 - + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 1993 ---- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1376 --- + .../staging/media/atomisp/include/linux/atomisp.h | 1359 --- + .../atomisp/include/linux/atomisp_gmin_platform.h | 36 - + .../media/atomisp/include/linux/atomisp_platform.h | 249 - + .../media/atomisp/include/linux/libmsrlisthelper.h | 28 - + .../staging/media/atomisp/include/media/lm3554.h | 131 - + drivers/staging/media/atomisp/pci/Kconfig | 14 - + drivers/staging/media/atomisp/pci/Makefile | 5 - + .../staging/media/atomisp/pci/atomisp2/Makefile | 349 - + .../media/atomisp/pci/atomisp2/atomisp-regs.h | 205 - + .../media/atomisp/pci/atomisp2/atomisp_acc.c | 604 - + .../media/atomisp/pci/atomisp2/atomisp_acc.h | 120 - + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 6696 ----------- + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 446 - + .../media/atomisp/pci/atomisp2/atomisp_common.h | 75 - + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 662 -- + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 4704 -------- + .../atomisp/pci/atomisp2/atomisp_compat_css20.h | 277 - + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 1259 --- + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 365 - + .../media/atomisp/pci/atomisp2/atomisp_csi2.c | 442 - + .../media/atomisp/pci/atomisp2/atomisp_csi2.h | 57 - + .../atomisp/pci/atomisp2/atomisp_dfs_tables.h | 408 - + .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 205 - + .../media/atomisp/pci/atomisp2/atomisp_drvfs.h | 24 - + .../media/atomisp/pci/atomisp2/atomisp_file.c | 225 - + .../media/atomisp/pci/atomisp2/atomisp_file.h | 43 - + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 1304 --- + .../media/atomisp/pci/atomisp2/atomisp_fops.h | 50 - + .../media/atomisp/pci/atomisp2/atomisp_helper.h | 29 - + .../media/atomisp/pci/atomisp2/atomisp_internal.h | 310 - + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 3124 ------ + .../media/atomisp/pci/atomisp2/atomisp_ioctl.h | 69 - + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 1422 --- + .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 467 - + .../media/atomisp/pci/atomisp2/atomisp_tables.h | 187 - + .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 164 - + .../media/atomisp/pci/atomisp2/atomisp_tpg.h | 38 - + .../atomisp/pci/atomisp2/atomisp_trace_event.h | 129 - + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 1573 --- + .../media/atomisp/pci/atomisp2/atomisp_v4l2.h | 40 - + .../media/atomisp/pci/atomisp2/css2400/Makefile | 2 - + .../base/circbuf/interface/ia_css_circbuf.h | 376 - + .../base/circbuf/interface/ia_css_circbuf_comm.h | 56 - + .../base/circbuf/interface/ia_css_circbuf_desc.h | 169 - + .../atomisp2/css2400/base/circbuf/src/circbuf.c | 321 - + .../base/refcount/interface/ia_css_refcount.h | 83 - + .../atomisp2/css2400/base/refcount/src/refcount.c | 281 - + .../camera/pipe/interface/ia_css_pipe_binarydesc.h | 297 - + .../camera/pipe/interface/ia_css_pipe_stagedesc.h | 52 - + .../camera/pipe/interface/ia_css_pipe_util.h | 39 - + .../css2400/camera/pipe/src/pipe_binarydesc.c | 880 -- + .../css2400/camera/pipe/src/pipe_stagedesc.c | 115 - + .../atomisp2/css2400/camera/pipe/src/pipe_util.c | 51 - + .../css2400/camera/util/interface/ia_css_util.h | 141 - + .../pci/atomisp2/css2400/camera/util/src/util.c | 227 - + .../ia_css_isp_configs.c | 360 - + .../ia_css_isp_configs.h | 189 - + .../ia_css_isp_params.c | 3221 ------ + .../ia_css_isp_params.h | 399 - + .../ia_css_isp_states.c | 214 - + .../ia_css_isp_states.h | 72 - + .../atomisp2/css2400/css_2400_system/hrt/bits.h | 104 - + .../css2400/css_2400_system/hrt/cell_params.h | 42 - + .../hrt/css_receiver_2400_common_defs.h | 200 - + .../css_2400_system/hrt/css_receiver_2400_defs.h | 258 - + .../atomisp2/css2400/css_2400_system/hrt/defs.h | 36 - + .../css2400/css_2400_system/hrt/dma_v2_defs.h | 199 - + .../css2400/css_2400_system/hrt/gdc_v2_defs.h | 170 - + .../css2400/css_2400_system/hrt/gp_timer_defs.h | 36 - + .../css2400/css_2400_system/hrt/gpio_block_defs.h | 42 - + .../css_2400_system/hrt/hive_isp_css_defs.h | 416 - + .../hrt/hive_isp_css_host_ids_hrt.h | 84 - + .../hrt/hive_isp_css_irq_types_hrt.h | 72 - + .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 - + .../css2400/css_2400_system/hrt/hive_types.h | 128 - + .../atomisp2/css2400/css_2400_system/hrt/if_defs.h | 22 - + .../hrt/input_formatter_subsystem_defs.h | 53 - + .../css_2400_system/hrt/input_selector_defs.h | 89 - + .../css_2400_system/hrt/input_switch_2400_defs.h | 30 - + .../css_2400_system/hrt/input_system_ctrl_defs.h | 254 - + .../css_2400_system/hrt/input_system_defs.h | 126 - + .../css_2400_system/hrt/irq_controller_defs.h | 28 - + .../css_2400_system/hrt/isp2400_mamoiada_params.h | 254 - + .../css2400/css_2400_system/hrt/isp2400_support.h | 38 - + .../css_2400_system/hrt/isp_acquisition_defs.h | 234 - + .../css2400/css_2400_system/hrt/isp_capture_defs.h | 310 - + .../css2400/css_2400_system/hrt/mmu_defs.h | 23 - + .../hrt/scalar_processor_2400_params.h | 20 - + .../css2400/css_2400_system/hrt/str2mem_defs.h | 39 - + .../css_2400_system/hrt/streaming_to_mipi_defs.h | 28 - + .../css_2400_system/hrt/timed_controller_defs.h | 22 - + .../pci/atomisp2/css2400/css_2400_system/hrt/var.h | 74 - + .../atomisp2/css2400/css_2400_system/hrt/version.h | 20 - + .../atomisp2/css2400/css_2400_system/spmem_dump.c | 3634 ------ + .../css2400/css_2401_csi2p_system/csi_rx_global.h | 63 - + .../ia_css_isp_configs.c | 360 - + .../ia_css_isp_configs.h | 189 - + .../ia_css_isp_params.c | 3220 ------ + .../ia_css_isp_params.h | 399 - + .../ia_css_isp_states.c | 214 - + .../ia_css_isp_states.h | 72 - + .../css2400/css_2401_csi2p_system/host/csi_rx.c | 41 - + .../css_2401_csi2p_system/host/csi_rx_local.h | 61 - + .../css_2401_csi2p_system/host/csi_rx_private.h | 282 - + .../css2400/css_2401_csi2p_system/host/ibuf_ctrl.c | 22 - + .../css_2401_csi2p_system/host/ibuf_ctrl_local.h | 58 - + .../css_2401_csi2p_system/host/ibuf_ctrl_private.h | 233 - + .../host/input_system_local.h | 106 - + .../host/input_system_private.h | 128 - + .../css2400/css_2401_csi2p_system/host/isys_dma.c | 40 - + .../css_2401_csi2p_system/host/isys_dma_local.h | 20 - + .../css_2401_csi2p_system/host/isys_dma_private.h | 60 - + .../css2400/css_2401_csi2p_system/host/isys_irq.c | 39 - + .../css_2401_csi2p_system/host/isys_irq_local.h | 35 - + .../css_2401_csi2p_system/host/isys_irq_private.h | 108 - + .../css_2401_csi2p_system/host/isys_stream2mmio.c | 21 - + .../host/isys_stream2mmio_local.h | 36 - + .../host/isys_stream2mmio_private.h | 168 - + .../css_2401_csi2p_system/host/pixelgen_local.h | 50 - + .../css_2401_csi2p_system/host/pixelgen_private.h | 164 - + .../css_2401_csi2p_system/host/system_local.h | 381 - + .../hrt/PixelGen_SysBlock_defs.h | 126 - + .../css2400/css_2401_csi2p_system/hrt/bits.h | 104 - + .../css_2401_csi2p_system/hrt/cell_params.h | 42 - + .../hrt/css_receiver_2400_common_defs.h | 200 - + .../hrt/css_receiver_2400_defs.h | 258 - + .../css2400/css_2401_csi2p_system/hrt/defs.h | 36 - + .../css_2401_csi2p_system/hrt/dma_v2_defs.h | 199 - + .../css_2401_csi2p_system/hrt/gdc_v2_defs.h | 170 - + .../css_2401_csi2p_system/hrt/gp_timer_defs.h | 36 - + .../css_2401_csi2p_system/hrt/gpio_block_defs.h | 42 - + .../hrt/hive_isp_css_2401_irq_types_hrt.h | 68 - + .../css_2401_csi2p_system/hrt/hive_isp_css_defs.h | 435 - + .../hrt/hive_isp_css_host_ids_hrt.h | 119 - + .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 - + .../css2400/css_2401_csi2p_system/hrt/hive_types.h | 128 - + .../css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h | 138 - + .../css2400/css_2401_csi2p_system/hrt/if_defs.h | 22 - + .../hrt/input_formatter_subsystem_defs.h | 53 - + .../hrt/input_selector_defs.h | 89 - + .../hrt/input_switch_2400_defs.h | 30 - + .../hrt/input_system_ctrl_defs.h | 254 - + .../css_2401_csi2p_system/hrt/input_system_defs.h | 126 - + .../hrt/irq_controller_defs.h | 28 - + .../css_2401_csi2p_system/hrt/isp2400_support.h | 38 - + .../hrt/isp2401_mamoiada_params.h | 258 - + .../hrt/isp_acquisition_defs.h | 234 - + .../css_2401_csi2p_system/hrt/isp_capture_defs.h | 310 - + .../hrt/mipi_backend_common_defs.h | 210 - + .../css_2401_csi2p_system/hrt/mipi_backend_defs.h | 215 - + .../css2400/css_2401_csi2p_system/hrt/mmu_defs.h | 23 - + .../css_2401_csi2p_system/hrt/rx_csi_defs.h | 175 - + .../hrt/scalar_processor_2400_params.h | 20 - + .../css_2401_csi2p_system/hrt/str2mem_defs.h | 39 - + .../css_2401_csi2p_system/hrt/stream2mmio_defs.h | 71 - + .../hrt/streaming_to_mipi_defs.h | 28 - + .../hrt/timed_controller_defs.h | 22 - + .../css2400/css_2401_csi2p_system/hrt/var.h | 99 - + .../css2400/css_2401_csi2p_system/hrt/version.h | 20 - + .../css_2401_csi2p_system/ibuf_ctrl_global.h | 80 - + .../css_2401_csi2p_system/input_system_global.h | 206 - + .../css_2401_csi2p_system/isys_dma_global.h | 87 - + .../css_2401_csi2p_system/isys_irq_global.h | 35 - + .../isys_stream2mmio_global.h | 39 - + .../css_2401_csi2p_system/pixelgen_global.h | 91 - + .../css2400/css_2401_csi2p_system/spmem_dump.c | 3686 ------ + .../css2400/css_2401_csi2p_system/system_global.h | 458 - + .../ia_css_isp_configs.c | 360 - + .../ia_css_isp_configs.h | 189 - + .../ia_css_isp_params.c | 3220 ------ + .../ia_css_isp_params.h | 399 - + .../ia_css_isp_states.c | 214 - + .../ia_css_isp_states.h | 72 - + .../atomisp2/css2400/css_2401_system/hrt/bits.h | 104 - + .../css2400/css_2401_system/hrt/cell_params.h | 42 - + .../hrt/css_receiver_2400_common_defs.h | 200 - + .../css_2401_system/hrt/css_receiver_2400_defs.h | 258 - + .../atomisp2/css2400/css_2401_system/hrt/defs.h | 36 - + .../css2400/css_2401_system/hrt/dma_v2_defs.h | 199 - + .../css2400/css_2401_system/hrt/gdc_v2_defs.h | 170 - + .../css2400/css_2401_system/hrt/gp_timer_defs.h | 36 - + .../css2400/css_2401_system/hrt/gpio_block_defs.h | 42 - + .../hrt/hive_isp_css_2401_irq_types_hrt.h | 69 - + .../css_2401_system/hrt/hive_isp_css_defs.h | 435 - + .../hrt/hive_isp_css_host_ids_hrt.h | 119 - + .../hrt/hive_isp_css_streaming_to_mipi_types_hrt.h | 26 - + .../css2400/css_2401_system/hrt/hive_types.h | 128 - + .../atomisp2/css2400/css_2401_system/hrt/if_defs.h | 22 - + .../hrt/input_formatter_subsystem_defs.h | 53 - + .../css_2401_system/hrt/input_selector_defs.h | 89 - + .../css_2401_system/hrt/input_switch_2400_defs.h | 30 - + .../css_2401_system/hrt/input_system_ctrl_defs.h | 254 - + .../css_2401_system/hrt/input_system_defs.h | 126 - + .../css_2401_system/hrt/irq_controller_defs.h | 28 - + .../css2400/css_2401_system/hrt/isp2400_support.h | 38 - + .../css_2401_system/hrt/isp2401_mamoiada_params.h | 258 - + .../css_2401_system/hrt/isp_acquisition_defs.h | 234 - + .../css2400/css_2401_system/hrt/isp_capture_defs.h | 310 - + .../css2400/css_2401_system/hrt/mmu_defs.h | 23 - + .../hrt/scalar_processor_2400_params.h | 20 - + .../css2400/css_2401_system/hrt/str2mem_defs.h | 39 - + .../css_2401_system/hrt/streaming_to_mipi_defs.h | 28 - + .../css_2401_system/hrt/timed_controller_defs.h | 22 - + .../pci/atomisp2/css2400/css_2401_system/hrt/var.h | 99 - + .../atomisp2/css2400/css_2401_system/hrt/version.h | 20 - + .../atomisp2/css2400/css_2401_system/spmem_dump.c | 3634 ------ + .../media/atomisp/pci/atomisp2/css2400/css_trace.h | 388 - + .../css2400/hive_isp_css_common/debug_global.h | 83 - + .../css2400/hive_isp_css_common/dma_global.h | 255 - + .../hive_isp_css_common/event_fifo_global.h | 20 - + .../hive_isp_css_common/fifo_monitor_global.h | 32 - + .../css2400/hive_isp_css_common/gdc_global.h | 90 - + .../css2400/hive_isp_css_common/gp_device_global.h | 85 - + .../css2400/hive_isp_css_common/gp_timer_global.h | 33 - + .../css2400/hive_isp_css_common/gpio_global.h | 45 - + .../css2400/hive_isp_css_common/hmem_global.h | 45 - + .../css2400/hive_isp_css_common/host/debug.c | 72 - + .../css2400/hive_isp_css_common/host/debug_local.h | 21 - + .../hive_isp_css_common/host/debug_private.h | 99 - + .../css2400/hive_isp_css_common/host/dma.c | 299 - + .../css2400/hive_isp_css_common/host/dma_local.h | 207 - + .../css2400/hive_isp_css_common/host/dma_private.h | 41 - + .../css2400/hive_isp_css_common/host/event_fifo.c | 19 - + .../hive_isp_css_common/host/event_fifo_local.h | 57 - + .../hive_isp_css_common/host/event_fifo_private.h | 75 - + .../hive_isp_css_common/host/fifo_monitor.c | 567 - + .../hive_isp_css_common/host/fifo_monitor_local.h | 99 - + .../host/fifo_monitor_private.h | 79 - + .../css2400/hive_isp_css_common/host/gdc.c | 127 - + .../css2400/hive_isp_css_common/host/gdc_local.h | 20 - + .../css2400/hive_isp_css_common/host/gdc_private.h | 20 - + .../css2400/hive_isp_css_common/host/gp_device.c | 108 - + .../hive_isp_css_common/host/gp_device_local.h | 143 - + .../hive_isp_css_common/host/gp_device_private.h | 46 - + .../css2400/hive_isp_css_common/host/gp_timer.c | 70 - + .../hive_isp_css_common/host/gp_timer_local.h | 45 - + .../hive_isp_css_common/host/gp_timer_private.h | 22 - + .../css2400/hive_isp_css_common/host/gpio_local.h | 20 - + .../hive_isp_css_common/host/gpio_private.h | 44 - + .../css2400/hive_isp_css_common/host/hmem.c | 19 - + .../css2400/hive_isp_css_common/host/hmem_local.h | 20 - + .../hive_isp_css_common/host/hmem_private.h | 30 - + .../hive_isp_css_common/host/input_formatter.c | 228 - + .../host/input_formatter_local.h | 120 - + .../host/input_formatter_private.h | 46 - + .../hive_isp_css_common/host/input_system.c | 1823 --- + .../hive_isp_css_common/host/input_system_local.h | 533 - + .../host/input_system_private.h | 116 - + .../css2400/hive_isp_css_common/host/irq.c | 448 - + .../css2400/hive_isp_css_common/host/irq_local.h | 136 - + .../css2400/hive_isp_css_common/host/irq_private.h | 44 - + .../css2400/hive_isp_css_common/host/isp.c | 129 - + .../css2400/hive_isp_css_common/host/isp_local.h | 57 - + .../css2400/hive_isp_css_common/host/isp_private.h | 157 - + .../css2400/hive_isp_css_common/host/mmu.c | 50 - + .../css2400/hive_isp_css_common/host/mmu_local.h | 20 - + .../css2400/hive_isp_css_common/host/mmu_private.h | 44 - + .../atomisp2/css2400/hive_isp_css_common/host/sp.c | 81 - + .../css2400/hive_isp_css_common/host/sp_local.h | 101 - + .../css2400/hive_isp_css_common/host/sp_private.h | 163 - + .../hive_isp_css_common/host/system_local.h | 306 - + .../css2400/hive_isp_css_common/host/timed_ctrl.c | 74 - + .../hive_isp_css_common/host/timed_ctrl_local.h | 20 - + .../hive_isp_css_common/host/timed_ctrl_private.h | 34 - + .../css2400/hive_isp_css_common/host/vamem_local.h | 20 - + .../hive_isp_css_common/host/vamem_private.h | 37 - + .../css2400/hive_isp_css_common/host/vmem.c | 258 - + .../css2400/hive_isp_css_common/host/vmem_local.h | 55 - + .../hive_isp_css_common/host/vmem_private.h | 20 - + .../hive_isp_css_common/input_formatter_global.h | 114 - + .../hive_isp_css_common/input_system_global.h | 155 - + .../css2400/hive_isp_css_common/irq_global.h | 45 - + .../css2400/hive_isp_css_common/isp_global.h | 115 - + .../css2400/hive_isp_css_common/mmu_global.h | 22 - + .../css2400/hive_isp_css_common/sp_global.h | 93 - + .../css2400/hive_isp_css_common/system_global.h | 348 - + .../hive_isp_css_common/timed_ctrl_global.h | 56 - + .../css2400/hive_isp_css_common/vamem_global.h | 34 - + .../css2400/hive_isp_css_common/vmem_global.h | 28 - + .../css2400/hive_isp_css_include/assert_support.h | 102 - + .../css2400/hive_isp_css_include/bitop_support.h | 25 - + .../atomisp2/css2400/hive_isp_css_include/csi_rx.h | 43 - + .../atomisp2/css2400/hive_isp_css_include/debug.h | 47 - + .../device_access/device_access.h | 194 - + .../atomisp2/css2400/hive_isp_css_include/dma.h | 47 - + .../css2400/hive_isp_css_include/error_support.h | 70 - + .../css2400/hive_isp_css_include/event_fifo.h | 46 - + .../css2400/hive_isp_css_include/fifo_monitor.h | 46 - + .../css2400/hive_isp_css_include/gdc_device.h | 48 - + .../css2400/hive_isp_css_include/gp_device.h | 46 - + .../css2400/hive_isp_css_include/gp_timer.h | 46 - + .../atomisp2/css2400/hive_isp_css_include/gpio.h | 46 - + .../atomisp2/css2400/hive_isp_css_include/hmem.h | 46 - + .../hive_isp_css_include/host/csi_rx_public.h | 135 - + .../hive_isp_css_include/host/debug_public.h | 99 - + .../css2400/hive_isp_css_include/host/dma_public.h | 73 - + .../hive_isp_css_include/host/event_fifo_public.h | 79 - + .../host/fifo_monitor_public.h | 110 - + .../css2400/hive_isp_css_include/host/gdc_public.h | 59 - + .../hive_isp_css_include/host/gp_device_public.h | 58 - + .../hive_isp_css_include/host/gp_timer_public.h | 34 - + .../hive_isp_css_include/host/gpio_public.h | 45 - + .../hive_isp_css_include/host/hmem_public.h | 32 - + .../hive_isp_css_include/host/ibuf_ctrl_public.h | 93 - + .../host/input_formatter_public.h | 115 - + .../host/input_system_public.h | 376 - + .../css2400/hive_isp_css_include/host/irq_public.h | 184 - + .../css2400/hive_isp_css_include/host/isp_public.h | 186 - + .../hive_isp_css_include/host/isys_dma_public.h | 38 - + .../hive_isp_css_include/host/isys_irq_public.h | 45 - + .../hive_isp_css_include/host/isys_public.h | 37 - + .../host/isys_stream2mmio_public.h | 101 - + .../css2400/hive_isp_css_include/host/mmu_public.h | 82 - + .../hive_isp_css_include/host/pixelgen_public.h | 79 - + .../css2400/hive_isp_css_include/host/sp_public.h | 223 - + .../css2400/hive_isp_css_include/host/tag_public.h | 41 - + .../hive_isp_css_include/host/timed_ctrl_public.h | 59 - + .../hive_isp_css_include/host/vamem_public.h | 20 - + .../hive_isp_css_include/host/vmem_public.h | 20 - + .../css2400/hive_isp_css_include/ibuf_ctrl.h | 48 - + .../css2400/hive_isp_css_include/input_formatter.h | 46 - + .../css2400/hive_isp_css_include/input_system.h | 46 - + .../atomisp2/css2400/hive_isp_css_include/irq.h | 46 - + .../atomisp2/css2400/hive_isp_css_include/isp.h | 46 - + .../css2400/hive_isp_css_include/isys_dma.h | 48 - + .../css2400/hive_isp_css_include/isys_irq.h | 39 - + .../hive_isp_css_include/isys_stream2mmio.h | 48 - + .../css2400/hive_isp_css_include/math_support.h | 223 - + .../memory_access/memory_access.h | 174 - + .../css2400/hive_isp_css_include/memory_realloc.h | 38 - + .../css2400/hive_isp_css_include/misc_support.h | 26 - + .../css2400/hive_isp_css_include/mmu_device.h | 48 - + .../css2400/hive_isp_css_include/pixelgen.h | 48 - + .../hive_isp_css_include/platform_support.h | 41 - + .../css2400/hive_isp_css_include/print_support.h | 44 - + .../atomisp2/css2400/hive_isp_css_include/queue.h | 46 - + .../css2400/hive_isp_css_include/resource.h | 47 - + .../atomisp2/css2400/hive_isp_css_include/socket.h | 47 - + .../pci/atomisp2/css2400/hive_isp_css_include/sp.h | 46 - + .../css2400/hive_isp_css_include/string_support.h | 165 - + .../css2400/hive_isp_css_include/system_types.h | 25 - + .../atomisp2/css2400/hive_isp_css_include/tag.h | 45 - + .../css2400/hive_isp_css_include/timed_ctrl.h | 46 - + .../css2400/hive_isp_css_include/type_support.h | 40 - + .../atomisp2/css2400/hive_isp_css_include/vamem.h | 46 - + .../atomisp2/css2400/hive_isp_css_include/vmem.h | 46 - + .../css2400/hive_isp_css_shared/host/queue_local.h | 20 - + .../hive_isp_css_shared/host/queue_private.h | 18 - + .../css2400/hive_isp_css_shared/host/tag.c | 95 - + .../css2400/hive_isp_css_shared/host/tag_local.h | 22 - + .../css2400/hive_isp_css_shared/host/tag_private.h | 18 - + .../css2400/hive_isp_css_shared/queue_global.h | 19 - + .../css2400/hive_isp_css_shared/sw_event_global.h | 36 - + .../css2400/hive_isp_css_shared/tag_global.h | 56 - + .../media/atomisp/pci/atomisp2/css2400/ia_css.h | 57 - + .../media/atomisp/pci/atomisp2/css2400/ia_css_3a.h | 188 - + .../pci/atomisp2/css2400/ia_css_acc_types.h | 468 - + .../atomisp/pci/atomisp2/css2400/ia_css_buffer.h | 84 - + .../atomisp/pci/atomisp2/css2400/ia_css_control.h | 157 - + .../pci/atomisp2/css2400/ia_css_device_access.c | 95 - + .../pci/atomisp2/css2400/ia_css_device_access.h | 59 - + .../atomisp/pci/atomisp2/css2400/ia_css_dvs.h | 299 - + .../atomisp/pci/atomisp2/css2400/ia_css_env.h | 94 - + .../atomisp/pci/atomisp2/css2400/ia_css_err.h | 63 - + .../pci/atomisp2/css2400/ia_css_event_public.h | 196 - + .../atomisp/pci/atomisp2/css2400/ia_css_firmware.h | 74 - + .../atomisp/pci/atomisp2/css2400/ia_css_frac.h | 37 - + .../pci/atomisp2/css2400/ia_css_frame_format.h | 101 - + .../pci/atomisp2/css2400/ia_css_frame_public.h | 352 - + .../pci/atomisp2/css2400/ia_css_host_data.h | 46 - + .../pci/atomisp2/css2400/ia_css_input_port.h | 60 - + .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 235 - + .../pci/atomisp2/css2400/ia_css_memory_access.c | 83 - + .../atomisp/pci/atomisp2/css2400/ia_css_metadata.h | 71 - + .../atomisp/pci/atomisp2/css2400/ia_css_mipi.h | 82 - + .../atomisp/pci/atomisp2/css2400/ia_css_mmu.h | 32 - + .../pci/atomisp2/css2400/ia_css_mmu_private.h | 29 - + .../atomisp/pci/atomisp2/css2400/ia_css_morph.h | 39 - + .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 195 - + .../pci/atomisp2/css2400/ia_css_pipe_public.h | 579 - + .../atomisp/pci/atomisp2/css2400/ia_css_prbs.h | 53 - + .../pci/atomisp2/css2400/ia_css_properties.h | 41 - + .../atomisp/pci/atomisp2/css2400/ia_css_shading.h | 40 - + .../atomisp/pci/atomisp2/css2400/ia_css_stream.h | 110 - + .../pci/atomisp2/css2400/ia_css_stream_format.h | 29 - + .../pci/atomisp2/css2400/ia_css_stream_public.h | 582 - + .../atomisp/pci/atomisp2/css2400/ia_css_timer.h | 84 - + .../atomisp/pci/atomisp2/css2400/ia_css_tpg.h | 78 - + .../atomisp/pci/atomisp2/css2400/ia_css_types.h | 616 - + .../atomisp/pci/atomisp2/css2400/ia_css_version.h | 40 - + .../pci/atomisp2/css2400/ia_css_version_data.h | 33 - + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c | 32 - + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 27 - + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h | 24 - + .../css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h | 48 - + .../isp/kernels/anr/anr_1.0/ia_css_anr.host.c | 60 - + .../isp/kernels/anr/anr_1.0/ia_css_anr.host.h | 39 - + .../isp/kernels/anr/anr_1.0/ia_css_anr_param.h | 25 - + .../isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 36 - + .../isp/kernels/anr/anr_2/ia_css_anr2.host.c | 46 - + .../isp/kernels/anr/anr_2/ia_css_anr2.host.h | 35 - + .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.c | 52 - + .../isp/kernels/anr/anr_2/ia_css_anr2_table.host.h | 22 - + .../isp/kernels/anr/anr_2/ia_css_anr2_types.h | 32 - + .../isp/kernels/anr/anr_2/ia_css_anr_param.h | 27 - + .../css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c | 66 - + .../css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h | 32 - + .../css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h | 40 - + .../css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h | 37 - + .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.c | 183 - + .../css2400/isp/kernels/bnlm/ia_css_bnlm.host.h | 40 - + .../css2400/isp/kernels/bnlm/ia_css_bnlm_param.h | 63 - + .../css2400/isp/kernels/bnlm/ia_css_bnlm_types.h | 106 - + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c | 122 - + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h | 35 - + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h | 47 - + .../isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h | 71 - + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 64 - + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h | 34 - + .../isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h | 30 - + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c | 28 - + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h | 25 - + .../isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h | 24 - + .../isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c | 76 - + .../isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h | 43 - + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h | 32 - + .../isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h | 55 - + .../isp/kernels/cnr/cnr_2/ia_css_cnr_param.h | 20 - + .../conversion_1.0/ia_css_conversion.host.c | 36 - + .../conversion_1.0/ia_css_conversion.host.h | 33 - + .../conversion_1.0/ia_css_conversion_param.h | 28 - + .../conversion_1.0/ia_css_conversion_types.h | 32 - + .../copy_output_1.0/ia_css_copy_output.host.c | 47 - + .../copy_output_1.0/ia_css_copy_output.host.h | 34 - + .../copy_output_1.0/ia_css_copy_output_param.h | 26 - + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.c | 64 - + .../isp/kernels/crop/crop_1.0/ia_css_crop.host.h | 41 - + .../isp/kernels/crop/crop_1.0/ia_css_crop_param.h | 32 - + .../isp/kernels/crop/crop_1.0/ia_css_crop_types.h | 35 - + .../isp/kernels/csc/csc_1.0/ia_css_csc.host.c | 132 - + .../isp/kernels/csc/csc_1.0/ia_css_csc.host.h | 54 - + .../isp/kernels/csc/csc_1.0/ia_css_csc_param.h | 34 - + .../isp/kernels/csc/csc_1.0/ia_css_csc_types.h | 78 - + .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c | 120 - + .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h | 33 - + .../isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h | 46 - + .../isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h | 20 - + .../isp/kernels/ctc/ctc2/ia_css_ctc2.host.c | 156 - + .../isp/kernels/ctc/ctc2/ia_css_ctc2.host.h | 33 - + .../isp/kernels/ctc/ctc2/ia_css_ctc2_param.h | 49 - + .../isp/kernels/ctc/ctc2/ia_css_ctc2_types.h | 55 - + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c | 63 - + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h | 36 - + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h | 44 - + .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c | 215 - + .../kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h | 24 - + .../isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h | 110 - + .../css2400/isp/kernels/de/de_1.0/ia_css_de.host.c | 79 - + .../css2400/isp/kernels/de/de_1.0/ia_css_de.host.h | 44 - + .../isp/kernels/de/de_1.0/ia_css_de_param.h | 27 - + .../isp/kernels/de/de_1.0/ia_css_de_state.h | 26 - + .../isp/kernels/de/de_1.0/ia_css_de_types.h | 43 - + .../css2400/isp/kernels/de/de_2/ia_css_de2.host.c | 54 - + .../css2400/isp/kernels/de/de_2/ia_css_de2.host.h | 38 - + .../css2400/isp/kernels/de/de_2/ia_css_de2_param.h | 30 - + .../css2400/isp/kernels/de/de_2/ia_css_de2_types.h | 42 - + .../css2400/isp/kernels/de/de_2/ia_css_de_param.h | 20 - + .../css2400/isp/kernels/de/de_2/ia_css_de_state.h | 21 - + .../css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c | 132 - + .../css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h | 47 - + .../isp/kernels/dp/dp_1.0/ia_css_dp_param.h | 36 - + .../isp/kernels/dp/dp_1.0/ia_css_dp_types.h | 50 - + .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.c | 65 - + .../css2400/isp/kernels/dpc2/ia_css_dpc2.host.h | 39 - + .../css2400/isp/kernels/dpc2/ia_css_dpc2_param.h | 53 - + .../css2400/isp/kernels/dpc2/ia_css_dpc2_types.h | 59 - + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 306 - + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h | 60 - + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h | 39 - + .../isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h | 30 - + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 321 - + .../isp/kernels/eed1_8/ia_css_eed1_8.host.h | 45 - + .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 154 - + .../isp/kernels/eed1_8/ia_css_eed1_8_types.h | 86 - + .../isp/kernels/fc/fc_1.0/ia_css_formats.host.c | 62 - + .../isp/kernels/fc/fc_1.0/ia_css_formats.host.h | 45 - + .../isp/kernels/fc/fc_1.0/ia_css_formats_param.h | 25 - + .../isp/kernels/fc/fc_1.0/ia_css_formats_types.h | 38 - + .../fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h | 33 - + .../fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h | 26 - + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 89 - + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h | 44 - + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h | 35 - + .../isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h | 52 - + .../css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c | 118 - + .../css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h | 65 - + .../isp/kernels/gc/gc_1.0/ia_css_gc_param.h | 61 - + .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c | 214 - + .../isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h | 24 - + .../isp/kernels/gc/gc_1.0/ia_css_gc_types.h | 97 - + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c | 110 - + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h | 79 - + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h | 43 - + .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.c | 132 - + .../isp/kernels/gc/gc_2/ia_css_gc2_table.host.h | 26 - + .../css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h | 54 - + .../css2400/isp/kernels/hdr/ia_css_hdr.host.c | 41 - + .../css2400/isp/kernels/hdr/ia_css_hdr.host.h | 31 - + .../css2400/isp/kernels/hdr/ia_css_hdr_param.h | 53 - + .../css2400/isp/kernels/hdr/ia_css_hdr_types.h | 64 - + .../io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 86 - + .../io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 31 - + .../io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 22 - + .../io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 22 - + .../kernels/io_ls/common/ia_css_common_io_param.h | 22 - + .../kernels/io_ls/common/ia_css_common_io_types.h | 31 - + .../io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h | 22 - + .../io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h | 22 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 86 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h | 31 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h | 22 - + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h | 22 - + .../ipu2_io_ls/common/ia_css_common_io_param.h | 22 - + .../ipu2_io_ls/common/ia_css_common_io_types.h | 31 - + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 86 - + .../yuv444_io_ls/ia_css_yuv444_io.host.h | 31 - + .../yuv444_io_ls/ia_css_yuv444_io_param.h | 22 - + .../yuv444_io_ls/ia_css_yuv444_io_types.h | 22 - + .../iterator/iterator_1.0/ia_css_iterator.host.c | 80 - + .../iterator/iterator_1.0/ia_css_iterator.host.h | 34 - + .../iterator/iterator_1.0/ia_css_iterator_param.h | 38 - + .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c | 74 - + .../isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h | 41 - + .../kernels/macc/macc1_5/ia_css_macc1_5_param.h | 31 - + .../macc/macc1_5/ia_css_macc1_5_table.host.c | 32 - + .../macc/macc1_5/ia_css_macc1_5_table.host.h | 22 - + .../kernels/macc/macc1_5/ia_css_macc1_5_types.h | 74 - + .../isp/kernels/macc/macc_1.0/ia_css_macc.host.c | 49 - + .../isp/kernels/macc/macc_1.0/ia_css_macc.host.h | 42 - + .../isp/kernels/macc/macc_1.0/ia_css_macc_param.h | 25 - + .../kernels/macc/macc_1.0/ia_css_macc_table.host.c | 47 - + .../kernels/macc/macc_1.0/ia_css_macc_table.host.h | 23 - + .../isp/kernels/macc/macc_1.0/ia_css_macc_types.h | 63 - + .../isp/kernels/norm/norm_1.0/ia_css_norm.host.c | 16 - + .../isp/kernels/norm/norm_1.0/ia_css_norm.host.h | 20 - + .../isp/kernels/norm/norm_1.0/ia_css_norm_param.h | 19 - + .../css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c | 79 - + .../css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h | 40 - + .../css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h | 29 - + .../css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h | 45 - + .../css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c | 159 - + .../css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h | 53 - + .../isp/kernels/ob/ob_1.0/ia_css_ob_param.h | 48 - + .../isp/kernels/ob/ob_1.0/ia_css_ob_types.h | 69 - + .../kernels/output/output_1.0/ia_css_output.host.c | 162 - + .../kernels/output/output_1.0/ia_css_output.host.h | 75 - + .../output/output_1.0/ia_css_output_param.h | 36 - + .../output/output_1.0/ia_css_output_types.h | 48 - + .../kernels/qplane/qplane_2/ia_css_qplane.host.c | 61 - + .../kernels/qplane/qplane_2/ia_css_qplane.host.h | 43 - + .../kernels/qplane/qplane_2/ia_css_qplane_param.h | 30 - + .../kernels/qplane/qplane_2/ia_css_qplane_types.h | 33 - + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 136 - + .../isp/kernels/raw/raw_1.0/ia_css_raw.host.h | 38 - + .../isp/kernels/raw/raw_1.0/ia_css_raw_param.h | 38 - + .../isp/kernels/raw/raw_1.0/ia_css_raw_types.h | 37 - + .../raw_aa_binning_1.0/ia_css_raa.host.c | 35 - + .../raw_aa_binning_1.0/ia_css_raa.host.h | 27 - + .../isp/kernels/ref/ref_1.0/ia_css_ref.host.c | 74 - + .../isp/kernels/ref/ref_1.0/ia_css_ref.host.h | 41 - + .../isp/kernels/ref/ref_1.0/ia_css_ref_param.h | 36 - + .../isp/kernels/ref/ref_1.0/ia_css_ref_state.h | 26 - + .../isp/kernels/ref/ref_1.0/ia_css_ref_types.h | 28 - + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c | 386 - + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h | 77 - + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h | 54 - + .../isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 220 - + .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c | 130 - + .../css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h | 77 - + .../isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 71 - + .../isp/kernels/sc/sc_1.0/ia_css_sc_types.h | 136 - + .../kernels/sdis/common/ia_css_sdis_common.host.h | 99 - + .../kernels/sdis/common/ia_css_sdis_common_types.h | 219 - + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 423 - + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 101 - + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h | 53 - + .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c | 338 - + .../isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h | 95 - + .../isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h | 69 - + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 76 - + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 38 - + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h | 43 - + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h | 53 - + .../isp/kernels/tnr/tnr3/ia_css_tnr3_types.h | 61 - + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c | 130 - + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h | 56 - + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h | 48 - + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h | 26 - + .../isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h | 60 - + .../isp/kernels/uds/uds_1.0/ia_css_uds_param.h | 31 - + .../css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 140 - + .../css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h | 47 - + .../isp/kernels/vf/vf_1.0/ia_css_vf_param.h | 37 - + .../isp/kernels/vf/vf_1.0/ia_css_vf_types.h | 32 - + .../css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c | 89 - + .../css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h | 39 - + .../isp/kernels/wb/wb_1.0/ia_css_wb_param.h | 29 - + .../isp/kernels/wb/wb_1.0/ia_css_wb_types.h | 47 - + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c | 66 - + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h | 47 - + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h | 51 - + .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c | 81 - + .../kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h | 22 - + .../isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h | 71 - + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 265 - + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h | 42 - + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h | 96 - + .../isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h | 98 - + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c | 219 - + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h | 60 - + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h | 49 - + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h | 26 - + .../isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h | 81 - + .../isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c | 125 - + .../isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h | 56 - + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h | 45 - + .../isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h | 94 - + .../isp/kernels/ynr/ynr_2/ia_css_ynr_param.h | 20 - + .../isp/kernels/ynr/ynr_2/ia_css_ynr_state.h | 21 - + .../css2400/isp/modes/interface/input_buf.isp.h | 73 - + .../css2400/isp/modes/interface/isp_const.h | 482 - + .../css2400/isp/modes/interface/isp_types.h | 128 - + .../atomisp/pci/atomisp2/css2400/memory_realloc.c | 81 - + .../runtime/binary/interface/ia_css_binary.h | 257 - + .../atomisp2/css2400/runtime/binary/src/binary.c | 1838 --- + .../css2400/runtime/bufq/interface/ia_css_bufq.h | 197 - + .../runtime/bufq/interface/ia_css_bufq_comm.h | 66 - + .../pci/atomisp2/css2400/runtime/bufq/src/bufq.c | 589 - + .../css2400/runtime/debug/interface/ia_css_debug.h | 509 - + .../debug/interface/ia_css_debug_internal.h | 31 - + .../runtime/debug/interface/ia_css_debug_pipe.h | 84 - + .../css2400/runtime/debug/src/ia_css_debug.c | 3596 ------ + .../css2400/runtime/event/interface/ia_css_event.h | 46 - + .../pci/atomisp2/css2400/runtime/event/src/event.c | 126 - + .../runtime/eventq/interface/ia_css_eventq.h | 69 - + .../atomisp2/css2400/runtime/eventq/src/eventq.c | 77 - + .../css2400/runtime/frame/interface/ia_css_frame.h | 180 - + .../runtime/frame/interface/ia_css_frame_comm.h | 132 - + .../pci/atomisp2/css2400/runtime/frame/src/frame.c | 1026 -- + .../css2400/runtime/ifmtr/interface/ia_css_ifmtr.h | 49 - + .../pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c | 569 - + .../runtime/inputfifo/interface/ia_css_inputfifo.h | 69 - + .../css2400/runtime/inputfifo/src/inputfifo.c | 613 - + .../runtime/isp_param/interface/ia_css_isp_param.h | 118 - + .../isp_param/interface/ia_css_isp_param_types.h | 98 - + .../css2400/runtime/isp_param/src/isp_param.c | 227 - + .../css2400/runtime/isys/interface/ia_css_isys.h | 201 - + .../runtime/isys/interface/ia_css_isys_comm.h | 69 - + .../css2400/runtime/isys/src/csi_rx_rmgr.c | 179 - + .../css2400/runtime/isys/src/csi_rx_rmgr.h | 43 - + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.c | 140 - + .../css2400/runtime/isys/src/ibuf_ctrl_rmgr.h | 55 - + .../css2400/runtime/isys/src/isys_dma_rmgr.c | 103 - + .../css2400/runtime/isys/src/isys_dma_rmgr.h | 41 - + .../atomisp2/css2400/runtime/isys/src/isys_init.c | 139 - + .../runtime/isys/src/isys_stream2mmio_rmgr.c | 105 - + .../runtime/isys/src/isys_stream2mmio_rmgr.h | 41 - + .../pci/atomisp2/css2400/runtime/isys/src/rx.c | 607 - + .../css2400/runtime/isys/src/virtual_isys.c | 898 -- + .../css2400/runtime/isys/src/virtual_isys.h | 41 - + .../runtime/pipeline/interface/ia_css_pipeline.h | 302 - + .../pipeline/interface/ia_css_pipeline_common.h | 42 - + .../css2400/runtime/pipeline/src/pipeline.c | 805 -- + .../css2400/runtime/queue/interface/ia_css_queue.h | 192 - + .../runtime/queue/interface/ia_css_queue_comm.h | 69 - + .../pci/atomisp2/css2400/runtime/queue/src/queue.c | 412 - + .../css2400/runtime/queue/src/queue_access.c | 192 - + .../css2400/runtime/queue/src/queue_access.h | 101 - + .../css2400/runtime/rmgr/interface/ia_css_rmgr.h | 88 - + .../runtime/rmgr/interface/ia_css_rmgr_vbuf.h | 115 - + .../pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c | 55 - + .../atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c | 330 - + .../runtime/spctrl/interface/ia_css_spctrl.h | 87 - + .../runtime/spctrl/interface/ia_css_spctrl_comm.h | 61 - + .../atomisp2/css2400/runtime/spctrl/src/spctrl.c | 193 - + .../tagger/interface/ia_css_tagger_common.h | 59 - + .../pci/atomisp2/css2400/runtime/timer/src/timer.c | 48 - + .../media/atomisp/pci/atomisp2/css2400/sh_css.c | 11094 ------------------- + .../atomisp/pci/atomisp2/css2400/sh_css_defs.h | 410 - + .../atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h | 36 - + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.c | 315 - + .../atomisp/pci/atomisp2/css2400/sh_css_firmware.h | 54 - + .../atomisp/pci/atomisp2/css2400/sh_css_frac.h | 40 - + .../pci/atomisp2/css2400/sh_css_host_data.c | 42 - + .../atomisp/pci/atomisp2/css2400/sh_css_hrt.c | 84 - + .../atomisp/pci/atomisp2/css2400/sh_css_hrt.h | 34 - + .../atomisp/pci/atomisp2/css2400/sh_css_internal.h | 1089 -- + .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 77 - + .../atomisp/pci/atomisp2/css2400/sh_css_metadata.c | 16 - + .../atomisp/pci/atomisp2/css2400/sh_css_metrics.c | 176 - + .../atomisp/pci/atomisp2/css2400/sh_css_metrics.h | 55 - + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.c | 749 -- + .../atomisp/pci/atomisp2/css2400/sh_css_mipi.h | 49 - + .../atomisp/pci/atomisp2/css2400/sh_css_mmu.c | 56 - + .../atomisp/pci/atomisp2/css2400/sh_css_morph.c | 16 - + .../pci/atomisp2/css2400/sh_css_param_dvs.c | 267 - + .../pci/atomisp2/css2400/sh_css_param_dvs.h | 86 - + .../pci/atomisp2/css2400/sh_css_param_shading.c | 417 - + .../pci/atomisp2/css2400/sh_css_param_shading.h | 39 - + .../atomisp/pci/atomisp2/css2400/sh_css_params.c | 5253 --------- + .../atomisp/pci/atomisp2/css2400/sh_css_params.h | 188 - + .../pci/atomisp2/css2400/sh_css_params_internal.h | 21 - + .../atomisp/pci/atomisp2/css2400/sh_css_pipe.c | 16 - + .../pci/atomisp2/css2400/sh_css_properties.c | 43 - + .../atomisp/pci/atomisp2/css2400/sh_css_shading.c | 16 - + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.c | 1803 --- + .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.h | 248 - + .../atomisp/pci/atomisp2/css2400/sh_css_stream.c | 16 - + .../pci/atomisp2/css2400/sh_css_stream_format.c | 76 - + .../pci/atomisp2/css2400/sh_css_stream_format.h | 23 - + .../atomisp/pci/atomisp2/css2400/sh_css_struct.h | 80 - + .../atomisp/pci/atomisp2/css2400/sh_css_uds.h | 37 - + .../atomisp/pci/atomisp2/css2400/sh_css_version.c | 30 - + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 727 -- + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 1528 --- + .../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 233 - + .../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 252 - + .../media/atomisp/pci/atomisp2/hmm/hmm_vm.c | 212 - + .../atomisp2/hrt/hive_isp_css_custom_host_hrt.h | 103 - + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 125 - + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 56 - + .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 102 - + .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 319 - + .../atomisp/pci/atomisp2/include/hmm/hmm_common.h | 96 - + .../atomisp/pci/atomisp2/include/hmm/hmm_pool.h | 115 - + .../atomisp/pci/atomisp2/include/hmm/hmm_vm.h | 64 - + .../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 169 - + .../pci/atomisp2/include/mmu/sh_mmu_mrfld.h | 24 - + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 584 - + .../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 75 - + drivers/staging/media/atomisp/platform/Makefile | 5 - + .../media/atomisp/platform/intel-mid/Makefile | 4 - + .../platform/intel-mid/atomisp_gmin_platform.c | 785 -- + drivers/staging/media/davinci_vpfe/Kconfig | 4 +- + drivers/staging/media/davinci_vpfe/Makefile | 5 + + drivers/staging/media/davinci_vpfe/TODO | 1 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 143 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 19 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 14 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 9 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 15 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 2 +- + drivers/staging/media/davinci_vpfe/vpfe_video.c | 4 +- + drivers/staging/media/imx/imx-media-capture.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 3 +- + drivers/staging/media/imx/imx-media-utils.c | 9 + + drivers/staging/media/omap4iss/Kconfig | 4 +- + drivers/staging/media/tegra-vde/tegra-vde.c | 105 +- + drivers/{media/pci => staging/media}/zoran/Kconfig | 2 +- + .../{media/pci => staging/media}/zoran/Makefile | 0 + drivers/staging/media/zoran/TODO | 4 + + .../pci => staging/media}/zoran/videocodec.c | 0 + .../pci => staging/media}/zoran/videocodec.h | 0 + drivers/{media/pci => staging/media}/zoran/zoran.h | 0 + .../pci => staging/media}/zoran/zoran_card.c | 0 + .../pci => staging/media}/zoran/zoran_card.h | 0 + .../pci => staging/media}/zoran/zoran_device.c | 0 + .../pci => staging/media}/zoran/zoran_device.h | 0 + .../pci => staging/media}/zoran/zoran_driver.c | 4 +- + .../pci => staging/media}/zoran/zoran_procfs.c | 0 + .../pci => staging/media}/zoran/zoran_procfs.h | 0 + .../{media/pci => staging/media}/zoran/zr36016.c | 0 + .../{media/pci => staging/media}/zoran/zr36016.h | 0 + .../{media/pci => staging/media}/zoran/zr36050.c | 0 + .../{media/pci => staging/media}/zoran/zr36050.h | 0 + .../{media/pci => staging/media}/zoran/zr36057.h | 0 + .../{media/pci => staging/media}/zoran/zr36060.c | 0 + .../{media/pci => staging/media}/zoran/zr36060.h | 0 + drivers/video/fbdev/omap2/Kconfig | 2 +- + include/linux/omap-iommu.h | 5 + + include/linux/platform_data/media/mmp-camera.h | 19 + + include/linux/sony-laptop.h | 4 + + include/media/dvb-usb-ids.h | 1 + + include/media/dvbdev.h | 2 + + include/media/media-entity.h | 2 +- + include/media/rc-core.h | 1 + + include/media/v4l2-dev.h | 25 +- + include/media/v4l2-device.h | 4 +- + include/media/v4l2-fwnode.h | 2 +- + include/media/v4l2-ioctl.h | 12 - + include/media/videobuf-dvb.h | 59 - + include/media/vsp1.h | 45 +- + include/uapi/linux/lirc.h | 6 + + include/uapi/linux/omap3isp.h | 22 + + include/video/omapfb_dss.h | 54 +- + sound/isa/Kconfig | 3 +- + 1164 files changed, 16773 insertions(+), 176676 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2rx.txt + create mode 100644 Documentation/devicetree/bindings/media/cdns,csi2tx.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov7251.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov772x.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/panasonic,amg88xx.txt + create mode 100644 Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt + delete mode 100644 Documentation/media/uapi/v4l/selection-api-005.rst + rename Documentation/media/uapi/v4l/{selection-api-004.rst => selection-api-configuration.rst} (98%) + rename Documentation/media/uapi/v4l/{selection-api-006.rst => selection-api-examples.rst} (100%) + rename Documentation/media/uapi/v4l/{selection-api-002.rst => selection-api-intro.rst} (100%) + rename Documentation/media/uapi/v4l/{selection-api-003.rst => selection-api-targets.rst} (100%) + create mode 100644 Documentation/media/uapi/v4l/selection-api-vs-crop-api.rst + create mode 100644 drivers/media/i2c/imx258.c + create mode 100644 drivers/media/i2c/ov7251.c + create mode 100644 drivers/media/i2c/video-i2c.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-mci.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-mci.h + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007s.c + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007s.h + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007t.c + delete mode 100644 drivers/media/pci/pt1/va1j5jf8007t.h + create mode 100644 drivers/media/platform/cadence/Kconfig + create mode 100644 drivers/media/platform/cadence/Makefile + create mode 100644 drivers/media/platform/cadence/cdns-csi2rx.c + create mode 100644 drivers/media/platform/cadence/cdns-csi2tx.c + create mode 100644 drivers/media/platform/rcar-vin/rcar-csi2.c + delete mode 100644 drivers/media/platform/vsp1/vsp1_bru.h + rename drivers/media/platform/vsp1/{vsp1_bru.c => vsp1_brx.c} (60%) + create mode 100644 drivers/media/platform/vsp1/vsp1_brx.h + create mode 100644 drivers/media/platform/vsp1/vsp1_uif.c + create mode 100644 drivers/media/platform/vsp1/vsp1_uif.h + create mode 100644 drivers/media/tuners/qm1d1b0004.c + create mode 100644 drivers/media/tuners/qm1d1b0004.h + delete mode 100644 drivers/media/v4l2-core/videobuf-dvb.c + delete mode 100644 drivers/staging/media/atomisp/Kconfig + delete mode 100644 drivers/staging/media/atomisp/Makefile + delete mode 100644 drivers/staging/media/atomisp/TODO + delete mode 100644 drivers/staging/media/atomisp/i2c/Kconfig + delete mode 100644 drivers/staging/media/atomisp/i2c/Makefile + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-gc0310.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-gc2235.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-libmsrlisthelper.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-mt9m114.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-ov2680.c + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-ov2722.c + delete mode 100644 drivers/staging/media/atomisp/i2c/gc0310.h + delete mode 100644 drivers/staging/media/atomisp/i2c/gc2235.h + delete mode 100644 drivers/staging/media/atomisp/i2c/mt9m114.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov2680.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov2722.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Kconfig + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h + delete mode 100644 drivers/staging/media/atomisp/include/linux/atomisp.h + delete mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h + delete mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_platform.h + delete mode 100644 drivers/staging/media/atomisp/include/linux/libmsrlisthelper.h + delete mode 100644 drivers/staging/media/atomisp/include/media/lm3554.h + delete mode 100644 drivers/staging/media/atomisp/pci/Kconfig + delete mode 100644 drivers/staging/media/atomisp/pci/Makefile + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/Makefile + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_helper.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tables.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_trace_event.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/Makefile + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_comm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_desc.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/interface/ia_css_refcount.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/src/refcount.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_stagedesc.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_binarydesc.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_stagedesc.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_util.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/bits.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/cell_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_common_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/dma_v2_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gdc_v2_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_timer_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gpio_block_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/if_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_formatter_subsystem_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_selector_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_switch_2400_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_ctrl_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/irq_controller_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_mamoiada_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_acquisition_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_capture_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/mmu_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/scalar_processor_2400_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/str2mem_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/streaming_to_mipi_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/timed_controller_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/var.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/version.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/spmem_dump.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/csi_rx_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_configs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hive_isp_css_2401_system_csi2p_generated/ia_css_isp_states.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/bits.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/cell_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/dma_v2_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gdc_v2_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_timer_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gpio_block_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/if_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_selector_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_switch_2400_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/irq_controller_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2400_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_acquisition_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_capture_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mmu_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/rx_csi_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/str2mem_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/stream2mmio_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/timed_controller_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/var.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/version.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/ibuf_ctrl_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_irq_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_stream2mmio_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/spmem_dump.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/bits.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/cell_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_common_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/dma_v2_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gdc_v2_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_timer_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gpio_block_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/if_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_formatter_subsystem_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_selector_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_switch_2400_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_ctrl_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/irq_controller_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2400_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2401_mamoiada_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_acquisition_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_capture_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/mmu_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/scalar_processor_2400_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/str2mem_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/streaming_to_mipi_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/timed_controller_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/var.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/version.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/spmem_dump.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_trace.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/debug_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/dma_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/event_fifo_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/fifo_monitor_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_device_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_timer_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gpio_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/hmem_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_system_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/irq_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/mmu_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/sp_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/system_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/timed_ctrl_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vamem_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vmem_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/assert_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bitop_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/csi_rx.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/debug.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/dma.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/error_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/event_fifo.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/fifo_monitor.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gdc_device.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_device.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_timer.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gpio.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/hmem.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/debug_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/dma_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/event_fifo_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/fifo_monitor_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gdc_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_device_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_timer_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gpio_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/hmem_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_formatter_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_system_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/irq_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_dma_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_irq_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/sp_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/tag_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/timed_ctrl_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vamem_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vmem_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/ibuf_ctrl.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_formatter.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_system.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/irq.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isp.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_dma.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_irq.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_stream2mmio.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_access/memory_access.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_realloc.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/misc_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/pixelgen.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/platform_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/queue.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/resource.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/socket.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/sp.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/system_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/tag.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/timed_ctrl.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/type_support.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vamem.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vmem.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_local.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/queue_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/sw_event_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/tag_global.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_host_data.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/memory_realloc.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_internal.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_pipe.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/interface/ia_css_event.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/src/event.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/interface/ia_css_eventq.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/src/eventq.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame_comm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/src/frame.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/interface/ia_css_ifmtr.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/src/isp_param.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys_comm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline_common.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/src/pipeline.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue_comm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr_vbuf.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl_comm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/tagger/interface/ia_css_tagger_common.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/timer/src/timer.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_frac.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_host_data.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metadata.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_morph.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params_internal.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_pipe.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_properties.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_shading.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_uds.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_custom_host_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_common.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_pool.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_vm.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu_mrfld.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c + delete mode 100644 drivers/staging/media/atomisp/platform/Makefile + delete mode 100644 drivers/staging/media/atomisp/platform/intel-mid/Makefile + delete mode 100644 drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c + rename drivers/{media/pci => staging/media}/zoran/Kconfig (97%) + rename drivers/{media/pci => staging/media}/zoran/Makefile (100%) + create mode 100644 drivers/staging/media/zoran/TODO + rename drivers/{media/pci => staging/media}/zoran/videocodec.c (100%) + rename drivers/{media/pci => staging/media}/zoran/videocodec.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran_card.c (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran_card.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran_device.c (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran_device.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran_driver.c (99%) + rename drivers/{media/pci => staging/media}/zoran/zoran_procfs.c (100%) + rename drivers/{media/pci => staging/media}/zoran/zoran_procfs.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36016.c (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36016.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36050.c (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36050.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36057.h (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36060.c (100%) + rename drivers/{media/pci => staging/media}/zoran/zr36060.h (100%) + delete mode 100644 include/media/videobuf-dvb.h +Merging v4l-dvb-next/master (f10379aad39e media: include/video/omapfb_dss.h: use IS_ENABLED()) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (dbeef4fe697b video: fbdev: pxafb: match_string() conversion fixup) +$ git merge fbdev/fbdev-for-next +Removing include/video/sh_mobile_meram.h +Removing include/video/auo_k190xfb.h +Auto-merging drivers/video/fbdev/via/viafbdev.c +Removing drivers/video/fbdev/sh_mobile_meram.c +Removing drivers/video/fbdev/auo_k190x.h +Removing drivers/video/fbdev/auo_k190x.c +Removing drivers/video/fbdev/auo_k1901fb.c +Removing drivers/video/fbdev/auo_k1900fb.c +Auto-merging drivers/media/platform/via-camera.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/shmobile/Kconfig | 1 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 42 - + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 - + drivers/gpu/drm/shmobile/shmob_drm_drv.h | 2 - + drivers/gpu/drm/shmobile/shmob_drm_kms.c | 11 - + drivers/gpu/drm/shmobile/shmob_drm_kms.h | 1 - + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 2 - + drivers/media/platform/via-camera.c | 5 + + drivers/video/fbdev/Kconfig | 48 +- + drivers/video/fbdev/Makefile | 4 - + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/radeon_pm.c | 8 +- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/auo_k1900fb.c | 204 ---- + drivers/video/fbdev/auo_k1901fb.c | 257 ----- + drivers/video/fbdev/auo_k190x.c | 1195 -------------------- + drivers/video/fbdev/auo_k190x.h | 129 --- + drivers/video/fbdev/core/fb_defio.c | 4 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 5 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 8 +- + drivers/video/fbdev/nvidia/nvidia.c | 2 +- + drivers/video/fbdev/omap/omapfb_main.c | 2 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 18 +- + drivers/video/fbdev/pxafb.c | 8 +- + drivers/video/fbdev/savage/savagefb_driver.c | 8 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 77 +- + drivers/video/fbdev/sh_mobile_lcdcfb.h | 1 - + drivers/video/fbdev/sh_mobile_meram.c | 758 ------------- + drivers/video/fbdev/sm501fb.c | 3 +- + drivers/video/fbdev/via/global.h | 6 + + drivers/video/fbdev/via/hw.c | 1 - + drivers/video/fbdev/via/via-core.c | 1 - + drivers/video/fbdev/via/via_clock.c | 2 +- + drivers/video/fbdev/via/viafbdev.c | 1 - + include/linux/platform_data/shmob_drm.h | 4 - + include/video/auo_k190xfb.h | 107 -- + include/video/sh_mobile_lcdc.h | 3 - + include/video/sh_mobile_meram.h | 95 -- + 39 files changed, 48 insertions(+), 2982 deletions(-) + delete mode 100644 drivers/video/fbdev/auo_k1900fb.c + delete mode 100644 drivers/video/fbdev/auo_k1901fb.c + delete mode 100644 drivers/video/fbdev/auo_k190x.c + delete mode 100644 drivers/video/fbdev/auo_k190x.h + delete mode 100644 drivers/video/fbdev/sh_mobile_meram.c + delete mode 100644 include/video/auo_k190xfb.h + delete mode 100644 include/video/sh_mobile_meram.h +Merging pm/linux-next (afb856775ab6 Merge branch 'pm-tools' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/spi/spi.c +Auto-merging drivers/soc/tegra/pmc.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging drivers/base/platform.c +Auto-merging drivers/amba/bus.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/battery.c +Auto-merging drivers/acpi/ac.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/acpi/cppc_sysfs.txt | 69 ++ + .../devicetree/bindings/opp/kryo-cpufreq.txt | 680 +++++++++++++++ + Documentation/devicetree/bindings/opp/opp.txt | 7 +- + .../devicetree/bindings/power/power_domain.txt | 6 +- + .../bindings/power/rockchip-io-domain.txt | 15 + + MAINTAINERS | 16 + + arch/x86/include/asm/msr-index.h | 4 +- + drivers/acpi/ac.c | 48 +- + drivers/acpi/acpi_apd.c | 47 ++ + drivers/acpi/acpi_lpss.c | 6 +- + drivers/acpi/acpi_watchdog.c | 72 +- + drivers/acpi/acpica/acapps.h | 2 + + drivers/acpi/acpica/acglobal.h | 2 +- + drivers/acpi/acpica/dbnames.c | 12 +- + drivers/acpi/acpica/dbtest.c | 59 +- + drivers/acpi/acpica/dswscope.c | 8 +- + drivers/acpi/acpica/evgpe.c | 6 + + drivers/acpi/acpica/evxfgpe.c | 22 + + drivers/acpi/acpica/hwregs.c | 4 +- + drivers/acpi/acpica/hwxface.c | 4 +- + drivers/acpi/acpica/rsdump.c | 2 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/utbuffer.c | 4 +- + drivers/acpi/acpica/utmutex.c | 4 +- + drivers/acpi/acpica/utobject.c | 2 + + drivers/acpi/acpica/utprint.c | 1 + + drivers/acpi/acpica/utstring.c | 2 +- + drivers/acpi/battery.c | 81 +- + drivers/acpi/cppc_acpi.c | 159 ++-- + drivers/acpi/device_pm.c | 9 +- + drivers/acpi/ec.c | 6 + + drivers/acpi/internal.h | 1 + + drivers/acpi/reboot.c | 4 +- + drivers/acpi/sleep.c | 7 + + drivers/acpi/tables.c | 9 +- + drivers/amba/bus.c | 4 +- + drivers/base/base.h | 3 + + drivers/base/core.c | 20 + + drivers/base/dd.c | 7 +- + drivers/base/platform.c | 17 +- + drivers/base/power/common.c | 10 +- + drivers/base/power/domain.c | 212 +++-- + drivers/base/power/main.c | 37 +- + drivers/base/power/power.h | 30 - + drivers/base/power/runtime.c | 29 +- + drivers/base/power/wakeup.c | 96 ++- + drivers/base/property.c | 104 ++- + drivers/clk/x86/Makefile | 3 +- + drivers/clk/x86/clk-st.c | 77 ++ + drivers/cpufreq/Kconfig.arm | 13 +- + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/armada-37xx-cpufreq.c | 100 ++- + drivers/cpufreq/cppc_cpufreq.c | 80 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 5 +- + drivers/cpufreq/cpufreq-dt.c | 10 +- + drivers/cpufreq/cpufreq-dt.h | 5 + + drivers/cpufreq/cpufreq.c | 78 +- + drivers/cpufreq/cpufreq_governor.c | 2 +- + drivers/cpufreq/intel_pstate.c | 46 +- + drivers/cpufreq/qcom-cpufreq-kryo.c | 212 +++++ + drivers/cpufreq/s3c2440-cpufreq.c | 2 +- + drivers/cpufreq/speedstep-lib.c | 2 +- + drivers/cpufreq/tegra20-cpufreq.c | 200 +++-- + drivers/cpuidle/governor.c | 17 +- + drivers/cpuidle/governors/ladder.c | 10 +- + drivers/cpuidle/governors/menu.c | 10 +- + drivers/firmware/efi/apple-properties.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +- + drivers/i2c/i2c-core-base.c | 2 +- + drivers/mailbox/pcc.c | 81 +- + drivers/mmc/core/sdio_bus.c | 2 +- + drivers/opp/core.c | 267 ++---- + drivers/opp/debugfs.c | 15 +- + drivers/opp/of.c | 184 ++++- + drivers/opp/opp.h | 6 +- + drivers/pci/pci-driver.c | 5 +- + drivers/pci/pci.c | 6 +- + drivers/power/avs/rockchip-io-domain.c | 68 ++ + drivers/soc/tegra/pmc.c | 20 +- + drivers/soundwire/bus_type.c | 15 +- + drivers/spi/spi.c | 11 +- + include/acpi/acnames.h | 7 +- + include/acpi/acpiosxf.h | 21 + + include/acpi/acpixf.h | 3 +- + include/acpi/actypes.h | 4 + + include/acpi/cppc_acpi.h | 14 +- + include/acpi/platform/aclinux.h | 5 + + include/acpi/platform/aclinuxex.h | 30 + + include/linux/acpi.h | 3 +- + include/linux/cpufreq.h | 2 +- + include/linux/cpuidle.h | 1 + + include/linux/kernel.h | 1 + + include/linux/notifier.h | 34 +- + include/linux/platform_data/clk-st.h | 17 + + include/linux/pm_domain.h | 79 +- + include/linux/pm_opp.h | 27 +- + include/linux/pm_runtime.h | 6 +- + include/linux/property.h | 52 +- + include/linux/srcutiny.h | 6 +- + include/linux/srcutree.h | 6 +- + kernel/power/hibernate.c | 7 + + kernel/power/qos.c | 1 - + kernel/power/suspend.c | 27 +- + kernel/power/user.c | 5 + + kernel/power/wakelock.c | 1 + + kernel/sched/cpufreq_schedutil.c | 262 ++++-- + kernel/time/tick-common.c | 2 + + tools/power/pm-graph/bootgraph.py | 2 +- + tools/power/pm-graph/sleepgraph.8 | 4 + + tools/power/pm-graph/sleepgraph.py | 399 +++++---- + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 54 +- + tools/power/x86/turbostat/Makefile | 2 +- + tools/power/x86/turbostat/turbostat.8 | 26 +- + tools/power/x86/turbostat/turbostat.c | 908 +++++++++++++++------ + tools/power/x86/x86_energy_perf_policy/Makefile | 2 +- + 115 files changed, 4103 insertions(+), 1433 deletions(-) + create mode 100644 Documentation/acpi/cppc_sysfs.txt + create mode 100644 Documentation/devicetree/bindings/opp/kryo-cpufreq.txt + create mode 100644 drivers/clk/x86/clk-st.c + create mode 100644 drivers/cpufreq/qcom-cpufreq-kryo.c + create mode 100644 include/linux/platform_data/clk-st.h +Merging cpupower/cpupower (f9652d5cae04 cpupower : Fix header name to read idle state name) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/bench/parse.c | 2 +- + .../cpupower/utils/idle_monitor/cpuidle_sysfs.c | 15 ++++++++++ + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 35 ++++++++++++---------- + .../cpupower/utils/idle_monitor/cpupower-monitor.h | 9 ++++++ + 4 files changed, 45 insertions(+), 16 deletions(-) +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (8a352fd8787c OPP: Allow same OPP table to be used for multiple genpd) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (d04d6c6d7a8d Merge branch 'thermal-soc' into next) +$ git merge thermal/next +Removing drivers/thermal/samsung/exynos_tmu.h +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/exynos-thermal.txt | 14 +- + .../devicetree/bindings/thermal/imx-thermal.txt | 9 +- + .../bindings/thermal/mediatek-thermal.txt | 1 + + .../devicetree/bindings/thermal/qcom-tsens.txt | 1 + + .../bindings/thermal/rcar-gen3-thermal.txt | 3 +- + .../devicetree/bindings/thermal/rcar-thermal.txt | 7 +- + .../bindings/thermal/uniphier-thermal.txt | 1 + + drivers/thermal/imx_thermal.c | 306 +++++-- + .../thermal/int340x_thermal/int340x_thermal_zone.c | 6 +- + .../int340x_thermal/processor_thermal_device.c | 4 + + drivers/thermal/mtk_thermal.c | 40 +- + drivers/thermal/of-thermal.c | 19 +- + drivers/thermal/qcom-spmi-temp-alarm.c | 92 +- + drivers/thermal/qcom/tsens.c | 12 +- + drivers/thermal/rcar_gen3_thermal.c | 17 +- + drivers/thermal/rcar_thermal.c | 158 +++- + drivers/thermal/samsung/exynos_tmu.c | 959 ++++++++------------- + drivers/thermal/samsung/exynos_tmu.h | 75 -- + drivers/thermal/tegra/soctherm.c | 31 +- + drivers/thermal/thermal_core.c | 11 +- + drivers/thermal/thermal_core.h | 30 +- + drivers/thermal/thermal_helpers.c | 5 +- + drivers/thermal/thermal_hwmon.c | 17 +- + drivers/thermal/thermal_hwmon.h | 17 +- + drivers/thermal/thermal_sysfs.c | 81 +- + .../thermal/ti-soc-thermal/omap5-thermal-data.c | 2 +- + drivers/thermal/uniphier_thermal.c | 4 + + include/linux/thermal.h | 17 +- + 28 files changed, 901 insertions(+), 1038 deletions(-) + delete mode 100644 drivers/thermal/samsung/exynos_tmu.h +Merging thermal-soc/next (6d7c70d1cd65 thermal: qcom: tsens: Allow number of sensors to come from DT) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (da3627c30d22 dlm: remove O_NONBLOCK flag in sctp_connect_to_sock) +$ git merge dlm/next +Already up to date. +Merging swiotlb/linux-next (4855c92dbb7b xen-swiotlb: fix the check condition for xen_swiotlb_free_coherent) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (27d036e33237 mm: Remove return value of zap_vma_ptes()) +$ git merge rdma/for-next +Auto-merging include/linux/mm.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/hfi1/pcie.c +Auto-merging drivers/infiniband/core/cache.c +Merge made by the 'recursive' strategy. + drivers/infiniband/Kconfig | 11 + + drivers/infiniband/core/Makefile | 7 +- + drivers/infiniband/core/addr.c | 172 +++---- + drivers/infiniband/core/cache.c | 112 ++--- + drivers/infiniband/core/cm.c | 62 ++- + drivers/infiniband/core/cma.c | 36 +- + drivers/infiniband/core/core_priv.h | 3 - + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/mad.c | 12 +- + drivers/infiniband/core/nldev.c | 122 ++++- + drivers/infiniband/core/restrack.c | 7 + + drivers/infiniband/core/roce_gid_mgmt.c | 2 - + drivers/infiniband/core/security.c | 4 - + drivers/infiniband/core/umem.c | 13 +- + drivers/infiniband/core/uverbs_cmd.c | 23 + + drivers/infiniband/core/uverbs_main.c | 42 +- + drivers/infiniband/hw/cxgb3/iwch.h | 1 - + drivers/infiniband/hw/cxgb4/Makefile | 3 +- + drivers/infiniband/hw/cxgb4/cm.c | 1 + + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 5 + + drivers/infiniband/hw/cxgb4/provider.c | 8 + + drivers/infiniband/hw/cxgb4/qp.c | 9 +- + drivers/infiniband/hw/cxgb4/restrack.c | 501 +++++++++++++++++++++ + drivers/infiniband/hw/hfi1/Makefile | 10 +- + drivers/infiniband/hw/hfi1/affinity.c | 497 ++++++++++++++++++-- + drivers/infiniband/hw/hfi1/affinity.h | 10 +- + drivers/infiniband/hw/hfi1/chip.c | 70 +-- + drivers/infiniband/hw/hfi1/chip.h | 15 +- + drivers/infiniband/hw/hfi1/chip_registers.h | 7 +- + drivers/infiniband/hw/hfi1/debugfs.c | 292 +----------- + drivers/infiniband/hw/hfi1/debugfs.h | 102 ++--- + drivers/infiniband/hw/hfi1/driver.c | 53 ++- + drivers/infiniband/hw/hfi1/exp_rcv.c | 39 +- + drivers/infiniband/hw/hfi1/exp_rcv.h | 24 +- + drivers/infiniband/hw/hfi1/fault.c | 375 +++++++++++++++ + drivers/infiniband/hw/hfi1/fault.h | 109 +++++ + drivers/infiniband/hw/hfi1/file_ops.c | 6 +- + drivers/infiniband/hw/hfi1/hfi.h | 57 ++- + drivers/infiniband/hw/hfi1/init.c | 32 +- + drivers/infiniband/hw/hfi1/mad.c | 37 +- + drivers/infiniband/hw/hfi1/pcie.c | 8 + + drivers/infiniband/hw/hfi1/pio.c | 44 +- + drivers/infiniband/hw/hfi1/rc.c | 10 +- + drivers/infiniband/hw/hfi1/ruc.c | 154 +------ + drivers/infiniband/hw/hfi1/trace.c | 43 +- + drivers/infiniband/hw/hfi1/trace_dbg.h | 3 +- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 160 ++++--- + drivers/infiniband/hw/hfi1/uc.c | 4 +- + drivers/infiniband/hw/hfi1/ud.c | 61 ++- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 1 - + drivers/infiniband/hw/hfi1/verbs.c | 45 +- + drivers/infiniband/hw/hfi1/verbs.h | 15 +- + drivers/infiniband/hw/hns/hns_roce_cmd.c | 3 + + drivers/infiniband/hw/hns/hns_roce_device.h | 14 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 188 ++++++-- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 7 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 76 +++- + drivers/infiniband/hw/hns/hns_roce_mr.c | 6 - + drivers/infiniband/hw/hns/hns_roce_pd.c | 10 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 67 ++- + drivers/infiniband/hw/i40iw/i40iw_cm.h | 4 +- + drivers/infiniband/hw/i40iw/i40iw_hw.c | 34 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 2 +- + drivers/infiniband/hw/mlx4/mad.c | 1 - + drivers/infiniband/hw/mlx4/main.c | 54 +-- + drivers/infiniband/hw/mlx4/mr.c | 50 +- + drivers/infiniband/hw/mlx4/qp.c | 2 +- + drivers/infiniband/hw/mlx5/cq.c | 59 ++- + drivers/infiniband/hw/mlx5/main.c | 208 ++++++--- + drivers/infiniband/hw/mlx5/qp.c | 43 +- + drivers/infiniband/hw/qedr/verbs.c | 4 +- + drivers/infiniband/hw/qib/qib.h | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 12 +- + drivers/infiniband/hw/qib/qib_init.c | 13 + + drivers/infiniband/hw/qib/qib_rc.c | 8 +- + drivers/infiniband/hw/qib/qib_ruc.c | 154 +------ + drivers/infiniband/hw/qib/qib_uc.c | 4 +- + drivers/infiniband/hw/qib/qib_ud.c | 4 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 20 +- + drivers/infiniband/hw/qib/qib_verbs.c | 6 +- + drivers/infiniband/hw/qib/qib_verbs.h | 2 - + drivers/infiniband/sw/rdmavt/Kconfig | 2 +- + drivers/infiniband/sw/rdmavt/cq.c | 74 ++- + drivers/infiniband/sw/rdmavt/cq.h | 6 +- + drivers/infiniband/sw/rdmavt/qp.c | 151 ++++++- + drivers/infiniband/sw/rdmavt/trace_cq.h | 35 +- + drivers/infiniband/sw/rdmavt/vt.c | 35 +- + drivers/infiniband/sw/rxe/Kconfig | 1 + + drivers/infiniband/sw/rxe/rxe.c | 11 +- + drivers/infiniband/sw/rxe/rxe.h | 4 +- + drivers/infiniband/sw/rxe/rxe_comp.c | 10 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 13 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 13 +- + drivers/infiniband/sw/rxe/rxe_net.c | 18 +- + drivers/infiniband/sw/rxe/rxe_net.h | 3 - + drivers/infiniband/sw/rxe/rxe_recv.c | 7 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 20 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 +- + drivers/infiniband/ulp/ipoib/ipoib.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 93 ++-- + drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 15 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 12 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 2 + + drivers/infiniband/ulp/iser/iser_initiator.c | 2 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 21 +- + drivers/infiniband/ulp/isert/ib_isert.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 28 +- + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 9 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 26 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/mr.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/qp.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/vport.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 1 - + include/linux/mlx5/device.h | 12 + + include/linux/mlx5/fs.h | 6 +- + include/linux/mlx5/mlx5_ifc.h | 66 ++- + include/linux/mm.h | 8 +- + include/rdma/ib_addr.h | 20 +- + include/rdma/ib_cache.h | 1 + + include/rdma/ib_verbs.h | 46 ++ + include/rdma/rdma_cm.h | 3 + + include/rdma/rdma_vt.h | 7 +- + include/rdma/rdmavt_cq.h | 5 +- + include/rdma/rdmavt_qp.h | 1 + + include/rdma/restrack.h | 20 + + include/uapi/rdma/ib_user_verbs.h | 50 ++ + include/uapi/rdma/mlx5-abi.h | 6 +- + include/uapi/rdma/rdma_netlink.h | 30 +- + mm/memory.c | 7 +- + 138 files changed, 3782 insertions(+), 1719 deletions(-) + create mode 100644 drivers/infiniband/hw/cxgb4/restrack.c + create mode 100644 drivers/infiniband/hw/hfi1/fault.c + create mode 100644 drivers/infiniband/hw/hfi1/fault.h +Merging net-next/master (d67b66b45a05 Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue) +$ git merge net-next/master +Auto-merging tools/testing/selftests/bpf/test_tunnel_kern.c +Auto-merging tools/testing/selftests/bpf/test_sockmap_kern.h +Auto-merging tools/testing/selftests/bpf/test_sockmap.c +Auto-merging security/selinux/hooks.c +Removing samples/sockmap/sockmap_test.sh +Removing samples/sockmap/Makefile +Removing samples/bpf/test_tunnel_bpf.sh +Auto-merging samples/bpf/bpf_insn.h +Auto-merging net/tipc/socket.c +Auto-merging net/sctp/socket.c +Auto-merging net/rxrpc/ar-internal.h +Auto-merging net/packet/af_packet.c +Auto-merging net/netfilter/nfnetlink_queue.c +Auto-merging net/netfilter/nfnetlink_log.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_flow_table_core.c +Auto-merging net/netfilter/ipvs/ip_vs_xmit.c +Auto-merging net/netfilter/ipvs/ip_vs_ctl.c +Auto-merging net/netfilter/ipvs/ip_vs_app.c +Auto-merging net/l2tp/l2tp_ppp.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv6/route.c +Auto-merging net/ipv6/ip6mr.c +Auto-merging net/ipv6/ip6_fib.c +Auto-merging net/ipv6/anycast.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/ipv6/addrconf.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/route.c +Auto-merging net/ipv4/proc.c +Auto-merging net/ipv4/ipmr.c +Auto-merging net/ipv4/ipconfig.c +CONFLICT (content): Merge conflict in net/ipv4/ipconfig.c +Auto-merging net/ipv4/fib_trie.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/core/sock.c +Auto-merging net/core/neighbour.c +Auto-merging net/core/dev.c +Removing net/bridge/netfilter/nft_meta_bridge.c +Auto-merging init/Kconfig +Auto-merging include/uapi/linux/pci_regs.h +Removing include/trace/events/bpf.h +Auto-merging include/net/udp.h +Auto-merging include/net/tcp.h +Auto-merging include/net/sock.h +Auto-merging include/net/sctp/sctp.h +Removing include/net/netfilter/nft_meta.h +Auto-merging include/net/ip_vs.h +Auto-merging include/net/ip6_fib.h +Auto-merging include/linux/skbuff.h +Removing include/linux/platform_data/mdio-gpio.h +Auto-merging include/linux/net.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/device.h +Auto-merging drivers/soc/ti/knav_qmss_queue.c +Auto-merging drivers/soc/ti/knav_qmss.h +Removing drivers/net/wireless/intel/iwlwifi/fw/nvm.c +Auto-merging drivers/net/ethernet/sfc/efx.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/fs_core.c +Removing drivers/net/ethernet/marvell/mvpp2.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Removing drivers/net/ethernet/freescale/gianfar_ptp.c +Auto-merging drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Removing arch/x86/net/bpf_jit.S +Auto-merging arch/x86/Kconfig +Removing arch/sparc/net/bpf_jit_asm_64.S +Removing arch/s390/net/bpf_jit.S +Auto-merging arch/s390/net/Makefile +CONFLICT (content): Merge conflict in arch/s390/net/Makefile +Removing arch/powerpc/net/bpf_jit_asm64.S +Auto-merging arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/e1000.rst +Auto-merging Documentation/networking/e100.rst +Removing Documentation/bpf/bpf_devel_QA.txt +Removing Documentation/bpf/bpf_design_QA.txt +Resolved 'arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi' using previous resolution. +Resolved 'arch/s390/net/Makefile' using previous resolution. +Resolved 'net/ipv4/ipconfig.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6f1d01c30ee5] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/README.rst | 36 + + Documentation/bpf/bpf_design_QA.rst | 221 + + Documentation/bpf/bpf_design_QA.txt | 156 - + Documentation/bpf/bpf_devel_QA.rst | 640 ++ + Documentation/bpf/bpf_devel_QA.txt | 570 -- + .../devicetree/bindings/arm/stm32/stm32-syscon.txt | 14 + + .../devicetree/bindings/arm/{ => stm32}/stm32.txt | 0 + Documentation/devicetree/bindings/net/dsa/dsa.txt | 6 - + .../devicetree/bindings/net/dsa/qca8k.txt | 23 +- + .../devicetree/bindings/net/dwmac-sun8i.txt | 21 +- + .../devicetree/bindings/net/fsl-tsec-phy.txt | 68 +- + .../devicetree/bindings/net/meson-dwmac.txt | 1 + + .../devicetree/bindings/net/microchip,lan78xx.txt | 54 + + .../devicetree/bindings/net/mscc-miim.txt | 26 + + .../devicetree/bindings/net/mscc-ocelot.txt | 82 + + Documentation/devicetree/bindings/net/sff,sfp.txt | 4 +- + Documentation/devicetree/bindings/net/sh_eth.txt | 1 + + .../bindings/net/socionext,uniphier-ave4.txt | 19 +- + .../devicetree/bindings/net/stm32-dwmac.txt | 18 +- + .../bindings/net/wireless/qcom,ath10k.txt | 31 + + .../devicetree/bindings/ptp/ptp-qoriq.txt | 69 + + .../bindings/soc/ti/keystone-navigator-qmss.txt | 9 +- + Documentation/filesystems/nfs/nfsroot.txt | 70 +- + Documentation/networking/6lowpan.txt | 4 +- + Documentation/networking/af_xdp.rst | 297 + + Documentation/networking/bonding.txt | 2 +- + Documentation/networking/{e100.txt => e100.rst} | 60 +- + Documentation/networking/{e1000.txt => e1000.rst} | 59 +- + Documentation/networking/failover.rst | 18 + + Documentation/networking/filter.txt | 21 +- + Documentation/networking/gtp.txt | 4 +- + Documentation/networking/ila.txt | 2 +- + Documentation/networking/index.rst | 3 + + Documentation/networking/ip-sysctl.txt | 42 +- + Documentation/networking/ipsec.txt | 4 +- + Documentation/networking/ipvlan.txt | 4 +- + Documentation/networking/kcm.txt | 10 +- + Documentation/networking/net_failover.rst | 116 + + Documentation/networking/netdev-features.txt | 7 + + Documentation/networking/nf_conntrack-sysctl.txt | 2 +- + Documentation/sysctl/net.txt | 1 + + MAINTAINERS | 68 +- + arch/arm/net/bpf_jit_32.c | 90 +- + arch/arm64/net/bpf_jit_comp.c | 180 +- + arch/mips/net/ebpf_jit.c | 130 - + arch/powerpc/net/Makefile | 2 +- + arch/powerpc/net/bpf_jit64.h | 37 +- + arch/powerpc/net/bpf_jit_asm64.S | 180 - + arch/powerpc/net/bpf_jit_comp64.c | 217 +- + arch/s390/net/Makefile | 2 +- + arch/s390/net/bpf_jit.S | 120 - + arch/s390/net/bpf_jit.h | 20 +- + arch/s390/net/bpf_jit_comp.c | 127 +- + arch/sparc/net/Makefile | 5 +- + arch/sparc/net/bpf_jit_64.h | 29 - + arch/sparc/net/bpf_jit_asm_64.S | 162 - + arch/sparc/net/bpf_jit_comp_64.c | 80 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/nospec-branch.h | 41 +- + arch/x86/net/Makefile | 7 +- + arch/x86/net/bpf_jit.S | 154 - + arch/x86/net/bpf_jit_comp.c | 343 +- + arch/x86/net/bpf_jit_comp32.c | 2419 ++++++ + drivers/bluetooth/Kconfig | 1 + + drivers/bluetooth/btbcm.c | 201 +- + drivers/bluetooth/btbcm.h | 5 +- + drivers/bluetooth/btmrvl_debugfs.c | 55 +- + drivers/bluetooth/btmrvl_drv.h | 2 - + drivers/bluetooth/btmrvl_main.c | 6 - + drivers/bluetooth/btmrvl_sdio.c | 11 +- + drivers/bluetooth/btqca.c | 104 +- + drivers/bluetooth/btqca.h | 11 +- + drivers/bluetooth/btqcomsmd.c | 10 + + drivers/bluetooth/btusb.c | 45 +- + drivers/bluetooth/hci_bcm.c | 45 +- + drivers/bluetooth/hci_ldisc.c | 24 +- + drivers/bluetooth/hci_ll.c | 3 - + drivers/bluetooth/hci_nokia.c | 3 - + drivers/bluetooth/hci_qca.c | 118 +- + drivers/bluetooth/hci_serdev.c | 32 +- + drivers/bluetooth/hci_uart.h | 1 + + drivers/connector/cn_proc.c | 4 + + drivers/dca/dca-core.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_encap.c | 21 +- + .../infiniband/ulp/opa_vnic/opa_vnic_internal.h | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 2 +- + drivers/net/Kconfig | 14 + + drivers/net/Makefile | 1 + + drivers/net/bonding/bond_alb.c | 58 +- + drivers/net/bonding/bond_main.c | 117 +- + drivers/net/bonding/bond_options.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 81 +- + drivers/net/dsa/b53/b53_priv.h | 6 +- + drivers/net/dsa/bcm_sf2.c | 200 +- + drivers/net/dsa/dsa_loop.c | 43 +- + drivers/net/dsa/lan9303-core.c | 11 +- + drivers/net/dsa/microchip/ksz_common.c | 11 +- + drivers/net/dsa/mt7530.c | 11 +- + drivers/net/dsa/mv88e6xxx/chip.c | 391 +- + drivers/net/dsa/mv88e6xxx/chip.h | 18 +- + drivers/net/dsa/mv88e6xxx/global1.c | 109 +- + drivers/net/dsa/mv88e6xxx/global1.h | 45 +- + drivers/net/dsa/mv88e6xxx/global2.c | 65 +- + drivers/net/dsa/mv88e6xxx/global2.h | 25 +- + drivers/net/dsa/mv88e6xxx/port.c | 39 + + drivers/net/dsa/mv88e6xxx/port.h | 3 + + drivers/net/dsa/mv88e6xxx/serdes.c | 20 + + drivers/net/dsa/mv88e6xxx/serdes.h | 3 + + drivers/net/dsa/qca8k.c | 74 +- + drivers/net/dsa/qca8k.h | 7 +- + drivers/net/ethernet/3com/3c59x.c | 62 +- + drivers/net/ethernet/8390/Kconfig | 17 +- + drivers/net/ethernet/8390/Makefile | 1 + + drivers/net/ethernet/8390/ax88796.c | 228 +- + drivers/net/ethernet/8390/xsurf100.c | 382 + + drivers/net/ethernet/Kconfig | 15 +- + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/amd/amd8111e.c | 16 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 137 +- + drivers/net/ethernet/amd/xgbe/xgbe-ethtool.c | 217 + + drivers/net/ethernet/amd/xgbe/xgbe-main.c | 20 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 167 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 36 +- + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 349 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 31 + + .../aquantia/atlantic/hw_atl/hw_atl_utils_fw2x.c | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bnx2.c | 44 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 7 +- + drivers/net/ethernet/broadcom/bnxt/Makefile | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 164 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 19 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 166 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c | 124 + + drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h | 23 + + drivers/net/ethernet/broadcom/bnxt/bnxt_dim.c | 8 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 60 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 22 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.h | 17 + + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 2 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +- + drivers/net/ethernet/cadence/macb_main.c | 12 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.c | 60 +- + .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 14 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 510 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 727 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 372 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 259 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 15 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 87 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 12 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 16 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 4 +- + .../net/ethernet/cavium/liquidio/octeon_mailbox.c | 52 + + .../net/ethernet/cavium/liquidio/octeon_mailbox.h | 7 + + .../net/ethernet/cavium/liquidio/octeon_network.h | 79 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/sge.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/cudbg_entity.h | 20 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_if.h | 1 + + drivers/net/ethernet/chelsio/cxgb4/cudbg_lib.c | 87 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 42 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.c | 28 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_cudbg.h | 3 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 22 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 94 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 125 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 18 + + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 123 +- + drivers/net/ethernet/chelsio/cxgb4/srq.c | 3 +- + drivers/net/ethernet/chelsio/cxgb4/t4_chip_type.h | 2 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 196 +- + drivers/net/ethernet/chelsio/cxgb4/t4_msg.h | 5 + + drivers/net/ethernet/chelsio/cxgb4/t4_pci_id_tbl.h | 6 + + drivers/net/ethernet/chelsio/cxgb4/t4_regs.h | 5 + + drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h | 49 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 12 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 21 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 7 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_common.h | 5 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 73 +- + drivers/net/ethernet/chelsio/libcxgb/libcxgb_cm.h | 15 +- + drivers/net/ethernet/cortina/gemini.c | 6 +- + drivers/net/ethernet/ethoc.c | 6 +- + drivers/net/ethernet/freescale/Kconfig | 2 +- + drivers/net/ethernet/freescale/Makefile | 1 - + drivers/net/ethernet/freescale/fec.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 12 +- + drivers/net/ethernet/freescale/fec_ptp.c | 6 - + drivers/net/ethernet/freescale/fman/fman_port.c | 8 +- + drivers/net/ethernet/freescale/gianfar.h | 3 - + drivers/net/ethernet/freescale/gianfar_ethtool.c | 23 +- + drivers/net/ethernet/freescale/gianfar_ptp.c | 572 -- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 23 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 88 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 20 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 565 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 6 + + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 25 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 29 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 22 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 681 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 43 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 98 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 7 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 50 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.h | 5 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 186 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 6 +- + drivers/net/ethernet/huawei/hinic/Kconfig | 2 +- + drivers/net/ethernet/huawei/hinic/hinic_main.c | 8 +- + drivers/net/ethernet/ibm/ibmvnic.c | 223 +- + drivers/net/ethernet/ibm/ibmvnic.h | 2 + + drivers/net/ethernet/intel/e100.c | 28 +- + drivers/net/ethernet/intel/e1000/Makefile | 26 - + drivers/net/ethernet/intel/e1000/e1000.h | 29 +- + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 23 +- + drivers/net/ethernet/intel/e1000/e1000_hw.c | 28 +- + drivers/net/ethernet/intel/e1000/e1000_hw.h | 28 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 28 +- + drivers/net/ethernet/intel/e1000/e1000_osdep.h | 29 +- + drivers/net/ethernet/intel/e1000/e1000_param.c | 28 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.c | 21 +- + drivers/net/ethernet/intel/e1000e/80003es2lan.h | 21 +- + drivers/net/ethernet/intel/e1000e/82571.c | 21 +- + drivers/net/ethernet/intel/e1000e/82571.h | 21 +- + drivers/net/ethernet/intel/e1000e/Makefile | 27 +- + drivers/net/ethernet/intel/e1000e/defines.h | 21 +- + drivers/net/ethernet/intel/e1000e/e1000.h | 21 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 21 +- + drivers/net/ethernet/intel/e1000e/hw.h | 21 +- + drivers/net/ethernet/intel/e1000e/ich8lan.c | 21 +- + drivers/net/ethernet/intel/e1000e/ich8lan.h | 21 +- + drivers/net/ethernet/intel/e1000e/mac.c | 21 +- + drivers/net/ethernet/intel/e1000e/mac.h | 21 +- + drivers/net/ethernet/intel/e1000e/manage.c | 21 +- + drivers/net/ethernet/intel/e1000e/manage.h | 21 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 36 +- + drivers/net/ethernet/intel/e1000e/nvm.c | 21 +- + drivers/net/ethernet/intel/e1000e/nvm.h | 21 +- + drivers/net/ethernet/intel/e1000e/param.c | 21 +- + drivers/net/ethernet/intel/e1000e/phy.c | 21 +- + drivers/net/ethernet/intel/e1000e/phy.h | 21 +- + drivers/net/ethernet/intel/e1000e/ptp.c | 21 +- + drivers/net/ethernet/intel/e1000e/regs.h | 21 +- + drivers/net/ethernet/intel/fm10k/Makefile | 23 +- + drivers/net/ethernet/intel/fm10k/fm10k.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_common.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_dcbnl.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_debugfs.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_ethtool.c | 136 +- + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 27 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_mbx.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 94 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_pf.c | 20 +- + 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 | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_type.h | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.c | 20 +- + drivers/net/ethernet/intel/fm10k/fm10k_vf.h | 20 +- + drivers/net/ethernet/intel/i40e/Makefile | 26 +- + drivers/net/ethernet/intel/i40e/i40e.h | 33 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_alloc.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 32 +- + drivers/net/ethernet/intel/i40e/i40e_client.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 63 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 117 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 37 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 34 +- + drivers/net/ethernet/intel/i40e/i40e_devids.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_diag.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_diag.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 542 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 26 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 196 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 27 +- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 84 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_status.h | 26 +- + drivers/net/ethernet/intel/i40e/i40e_trace.h | 23 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 126 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 29 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 34 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 111 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 26 +- + drivers/net/ethernet/intel/i40evf/Makefile | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.c | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_adminq.h | 26 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_alloc.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_common.c | 27 +- + drivers/net/ethernet/intel/i40evf/i40e_devids.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_hmc.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_lan_hmc.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_osdep.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_prototype.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_register.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_status.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_trace.h | 23 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 30 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 26 +- + drivers/net/ethernet/intel/i40evf/i40e_type.h | 36 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 27 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.c | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.h | 8 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 33 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 59 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 37 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 13 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 7 +- + drivers/net/ethernet/intel/igb/Makefile | 28 +- + drivers/net/ethernet/intel/igb/e1000_82575.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_82575.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_defines.h | 25 +- + drivers/net/ethernet/intel/igb/e1000_hw.h | 22 +- + drivers/net/ethernet/intel/igb/e1000_i210.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_i210.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_mac.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_mac.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_mbx.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_mbx.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_nvm.c | 22 +- + drivers/net/ethernet/intel/igb/e1000_nvm.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_phy.c | 23 +- + drivers/net/ethernet/intel/igb/e1000_phy.h | 23 +- + drivers/net/ethernet/intel/igb/e1000_regs.h | 23 +- + drivers/net/ethernet/intel/igb/igb.h | 36 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 96 +- + drivers/net/ethernet/intel/igb/igb_hwmon.c | 23 +- + drivers/net/ethernet/intel/igb/igb_main.c | 404 +- + drivers/net/ethernet/intel/igb/igb_ptp.c | 19 +- + drivers/net/ethernet/intel/igbvf/Makefile | 28 +- + drivers/net/ethernet/intel/igbvf/defines.h | 26 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 26 +- + drivers/net/ethernet/intel/igbvf/igbvf.h | 26 +- + drivers/net/ethernet/intel/igbvf/mbx.c | 26 +- + drivers/net/ethernet/intel/igbvf/mbx.h | 26 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 26 +- + drivers/net/ethernet/intel/igbvf/regs.h | 26 +- + drivers/net/ethernet/intel/igbvf/vf.c | 26 +- + drivers/net/ethernet/intel/igbvf/vf.h | 26 +- + drivers/net/ethernet/intel/ixgb/Makefile | 27 - + drivers/net/ethernet/intel/ixgb/ixgb.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_ee.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_ee.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_hw.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_ids.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_main.c | 29 +- + drivers/net/ethernet/intel/ixgb/ixgb_osdep.h | 28 +- + drivers/net/ethernet/intel/ixgb/ixgb_param.c | 29 +- + drivers/net/ethernet/intel/ixgbe/Makefile | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe.h | 32 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c | 41 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_common.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.c | 30 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82598.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_82599.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_dcb_nl.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_debugfs.c | 85 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.c | 31 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_fcoe.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 141 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.h | 27 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 431 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_mbx.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_model.h | 42 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 39 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sysfs.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 28 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.c | 29 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x540.h | 24 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c | 35 +- + drivers/net/ethernet/intel/ixgbevf/Makefile | 28 +- + drivers/net/ethernet/intel/ixgbevf/defines.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/ethtool.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf.h | 27 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 76 +- + drivers/net/ethernet/intel/ixgbevf/mbx.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/mbx.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/regs.h | 26 +- + drivers/net/ethernet/intel/ixgbevf/vf.c | 27 +- + drivers/net/ethernet/intel/ixgbevf/vf.h | 26 +- + drivers/net/ethernet/marvell/Kconfig | 1 + + drivers/net/ethernet/marvell/Makefile | 2 +- + drivers/net/ethernet/marvell/mvmdio.c | 5 +- + drivers/net/ethernet/marvell/mvpp2.c | 8956 -------------------- + drivers/net/ethernet/marvell/mvpp2/Makefile | 7 + + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 1046 +++ + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 141 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 44 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 5281 ++++++++++++ + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 2467 ++++++ + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h | 314 + + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 23 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 12 + + drivers/net/ethernet/mellanox/mlx4/main.c | 56 +- + drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 +- + drivers/net/ethernet/mellanox/mlx4/port.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 13 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 10 +- + .../net/ethernet/mellanox/mlx5/core/accel/tls.c | 71 + + .../net/ethernet/mellanox/mlx5/core/accel/tls.h | 86 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 125 +- + .../net/ethernet/mellanox/mlx5/core/en/Makefile | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 237 + + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 48 + + .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 327 + + .../ethernet/mellanox/mlx5/core/en/port_buffer.h | 75 + + .../mellanox/mlx5/core/en_accel/en_accel.h | 72 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 3 - + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.c | 197 + + .../net/ethernet/mellanox/mlx5/core/en_accel/tls.h | 87 + + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 278 + + .../mellanox/mlx5/core/en_accel/tls_rxtx.h | 50 + + .../mellanox/mlx5/core/en_accel/tls_stats.c | 89 + + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 132 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 28 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 144 +- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 1 - + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 697 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 124 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 538 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 138 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 459 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 334 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 39 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 31 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 141 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.h | 7 + + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.c | 63 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 1 + + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/fpga/sdk.h | 8 + + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c | 562 ++ + drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h | 68 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 26 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/wq.c | 95 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 95 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 47 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 48 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 7 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 278 +- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 74 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 31 + + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 71 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 175 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 207 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.h | 1 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 82 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.h | 43 + + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 11 +- + drivers/net/ethernet/mscc/Kconfig | 30 + + drivers/net/ethernet/mscc/Makefile | 5 + + drivers/net/ethernet/mscc/ocelot.c | 1333 +++ + drivers/net/ethernet/mscc/ocelot.h | 572 ++ + drivers/net/ethernet/mscc/ocelot_ana.h | 625 ++ + drivers/net/ethernet/mscc/ocelot_board.c | 316 + + drivers/net/ethernet/mscc/ocelot_dev.h | 275 + + drivers/net/ethernet/mscc/ocelot_dev_gmii.h | 154 + + drivers/net/ethernet/mscc/ocelot_hsio.h | 785 ++ + drivers/net/ethernet/mscc/ocelot_io.c | 116 + + drivers/net/ethernet/mscc/ocelot_qs.h | 78 + + drivers/net/ethernet/mscc/ocelot_qsys.h | 270 + + drivers/net/ethernet/mscc/ocelot_regs.c | 497 ++ + drivers/net/ethernet/mscc/ocelot_rew.h | 81 + + drivers/net/ethernet/mscc/ocelot_sys.h | 144 + + drivers/net/ethernet/neterion/vxge/vxge-config.c | 12 +- + drivers/net/ethernet/neterion/vxge/vxge-config.h | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-ethtool.c | 2 +- + drivers/net/ethernet/neterion/vxge/vxge-main.c | 4 +- + drivers/net/ethernet/netronome/Kconfig | 13 + + drivers/net/ethernet/netronome/nfp/Makefile | 8 + + drivers/net/ethernet/netronome/nfp/abm/ctrl.c | 333 + + drivers/net/ethernet/netronome/nfp/abm/main.c | 765 ++ + drivers/net/ethernet/netronome/nfp/abm/main.h | 142 + + drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 16 +- + drivers/net/ethernet/netronome/nfp/bpf/fw.h | 21 +- + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 764 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 39 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 66 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 174 +- + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 114 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 131 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 11 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 14 + + .../net/ethernet/netronome/nfp/flower/lag_conf.c | 726 ++ + drivers/net/ethernet/netronome/nfp/flower/main.c | 74 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 61 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 20 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 52 +- + drivers/net/ethernet/netronome/nfp/nfp_abi.h | 143 + + drivers/net/ethernet/netronome/nfp/nfp_app.c | 27 +- + drivers/net/ethernet/netronome/nfp/nfp_app.h | 26 + + drivers/net/ethernet/netronome/nfp/nfp_app_nic.c | 5 +- + drivers/net/ethernet/netronome/nfp/nfp_asm.h | 40 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 40 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 145 + + drivers/net/ethernet/netronome/nfp/nfp_main.h | 27 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 7 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 23 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 4 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 10 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 72 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 17 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 11 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_port.c | 8 +- + drivers/net/ethernet/netronome/nfp/nfp_port.h | 8 + + .../net/ethernet/netronome/nfp/nfp_shared_buf.c | 180 + + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 2 + + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 95 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_cpp.h | 7 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 45 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_nffw.h | 2 + + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 59 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_rtsym.c | 43 + + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 6 +- + drivers/net/ethernet/qlogic/qed/Makefile | 2 +- + drivers/net/ethernet/qlogic/qed/qed.h | 74 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.h | 1 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 14 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 118 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 115 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 3 + + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 262 + + drivers/net/ethernet/qlogic/qed/qed_iwarp.c | 23 + + drivers/net/ethernet/qlogic/qed/qed_l2.c | 68 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 46 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 170 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 99 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 81 +- + drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c | 1337 +++ + drivers/net/ethernet/qlogic/qed/qed_rdma.c | 178 +- + drivers/net/ethernet/qlogic/qed/qed_rdma.h | 2 + + drivers/net/ethernet/qlogic/qed/qed_roce.c | 17 +- + drivers/net/ethernet/qlogic/qed/qed_sp.h | 12 +- + drivers/net/ethernet/qlogic/qed/qed_sp_commands.c | 76 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 247 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 29 + + drivers/net/ethernet/qlogic/qed/qed_vf.h | 21 + + drivers/net/ethernet/qlogic/qede/qede.h | 7 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 663 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 227 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 183 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 4 +- + drivers/net/ethernet/qualcomm/emac/emac-mac.c | 11 +- + drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 140 +- + drivers/net/ethernet/qualcomm/emac/emac-sgmii.h | 32 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 9 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 13 + + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 21 +- + .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 14 +- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 64 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 51 + + drivers/net/ethernet/realtek/8139too.c | 2 - + drivers/net/ethernet/realtek/r8169.c | 1144 +-- + drivers/net/ethernet/renesas/sh_eth.c | 118 +- + drivers/net/ethernet/renesas/sh_eth.h | 40 +- + drivers/net/ethernet/rocker/rocker_main.c | 10 + + drivers/net/ethernet/sfc/efx.c | 36 + + drivers/net/ethernet/sfc/tx.c | 33 +- + drivers/net/ethernet/socionext/Kconfig | 2 + + drivers/net/ethernet/socionext/netsec.c | 27 +- + drivers/net/ethernet/socionext/sni_ave.c | 252 +- + drivers/net/ethernet/stmicro/stmmac/Makefile | 3 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 236 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 120 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 267 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 221 +- + drivers/net/ethernet/stmicro/stmmac/dwmac1000.h | 1 - + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 29 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 92 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 23 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 35 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 43 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 38 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 1 - + drivers/net/ethernet/stmicro/stmmac/dwmac5.c | 269 +- + drivers/net/ethernet/stmicro/stmmac/dwmac5.h | 41 +- + drivers/net/ethernet/stmicro/stmmac/enh_desc.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/hwif.c | 268 + + drivers/net/ethernet/stmicro/stmmac/hwif.h | 477 ++ + drivers/net/ethernet/stmicro/stmmac/norm_desc.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 45 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 94 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 34 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 734 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 5 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 60 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 295 + + drivers/net/ethernet/ti/Kconfig | 10 +- + drivers/net/ethernet/ti/cpsw-phy-sel.c | 8 +- + drivers/net/ethernet/ti/cpsw.c | 115 +- + drivers/net/ethernet/ti/cpts.c | 5 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 10 +- + drivers/net/ethernet/ti/davinci_emac.c | 4 +- + drivers/net/ethernet/ti/davinci_mdio.c | 27 +- + drivers/net/ethernet/ti/netcp.h | 3 + + drivers/net/ethernet/ti/netcp_core.c | 32 + + drivers/net/ethernet/ti/netcp_ethss.c | 182 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 1 - + drivers/net/geneve.c | 72 +- + drivers/net/hamradio/mkiss.c | 2 +- + drivers/net/hippi/rrunner.c | 2 +- + drivers/net/hyperv/Kconfig | 2 + + drivers/net/hyperv/hyperv_net.h | 168 +- + drivers/net/hyperv/netvsc.c | 61 +- + drivers/net/hyperv/netvsc_drv.c | 240 +- + drivers/net/hyperv/rndis_filter.c | 35 +- + drivers/net/ifb.c | 2 +- + drivers/net/macvlan.c | 68 +- + drivers/net/net_failover.c | 837 ++ + drivers/net/phy/Kconfig | 27 +- + drivers/net/phy/Makefile | 4 + + drivers/net/phy/asix.c | 63 + + drivers/net/phy/bcm-phy-lib.c | 6 +- + drivers/net/phy/dp83tc811.c | 347 + + drivers/net/phy/marvell.c | 5 +- + drivers/net/phy/mdio-bitbang.c | 9 - + drivers/net/phy/mdio-boardinfo.c | 5 +- + drivers/net/phy/mdio-gpio.c | 128 +- + drivers/net/phy/mdio-mscc-miim.c | 193 + + drivers/net/phy/micrel.c | 5 +- + drivers/net/phy/microchip.c | 25 + + drivers/net/phy/microchip_t1.c | 74 + + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phylink.c | 20 +- + drivers/net/phy/realtek.c | 16 + + drivers/net/phy/sfp-bus.c | 7 + + drivers/net/phy/sfp.c | 37 +- + drivers/net/phy/smsc.c | 5 +- + drivers/net/team/team.c | 13 +- + drivers/net/tun.c | 154 +- + drivers/net/usb/Kconfig | 1 + + drivers/net/usb/lan78xx.c | 235 +- + drivers/net/usb/qmi_wwan.c | 2 +- + drivers/net/virtio_net.c | 166 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 6 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +- + drivers/net/vrf.c | 27 +- + drivers/net/vxlan.c | 17 +- + drivers/net/wan/fsl_ucc_hdlc.c | 11 +- + drivers/net/wireless/ath/ath10k/Kconfig | 12 + + drivers/net/wireless/ath/ath10k/Makefile | 7 +- + drivers/net/wireless/ath/ath10k/ahb.c | 9 +- + drivers/net/wireless/ath/ath10k/ce.c | 269 +- + drivers/net/wireless/ath/ath10k/ce.h | 24 +- + drivers/net/wireless/ath/ath10k/core.c | 183 +- + drivers/net/wireless/ath/ath10k/core.h | 24 + + drivers/net/wireless/ath/ath10k/coredump.c | 98 + + drivers/net/wireless/ath/ath10k/debug.c | 28 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 30 +- + drivers/net/wireless/ath/ath10k/hif.h | 15 +- + drivers/net/wireless/ath/ath10k/htc.c | 6 + + drivers/net/wireless/ath/ath10k/htc.h | 4 + + drivers/net/wireless/ath/ath10k/htt.c | 4 +- + drivers/net/wireless/ath/ath10k/htt.h | 111 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 24 +- + drivers/net/wireless/ath/ath10k/htt_tx.c | 19 +- + drivers/net/wireless/ath/ath10k/hw.c | 9 +- + drivers/net/wireless/ath/ath10k/hw.h | 26 +- + drivers/net/wireless/ath/ath10k/mac.c | 63 +- + drivers/net/wireless/ath/ath10k/pci.c | 8 +- + drivers/net/wireless/ath/ath10k/rx_desc.h | 136 +- + drivers/net/wireless/ath/ath10k/sdio.c | 24 +- + drivers/net/wireless/ath/ath10k/snoc.c | 1413 +++ + drivers/net/wireless/ath/ath10k/snoc.h | 95 + + drivers/net/wireless/ath/ath10k/txrx.c | 8 + + drivers/net/wireless/ath/ath10k/wmi-ops.h | 78 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 96 +- + drivers/net/wireless/ath/ath10k/wmi-tlv.h | 373 +- + drivers/net/wireless/ath/ath10k/wmi.c | 238 +- + drivers/net/wireless/ath/ath10k/wmi.h | 62 +- + drivers/net/wireless/ath/ath10k/wow.c | 138 +- + drivers/net/wireless/ath/ath6kl/core.h | 2 +- + drivers/net/wireless/ath/ath6kl/debug.c | 2 +- + drivers/net/wireless/ath/ath6kl/main.c | 14 +- + drivers/net/wireless/ath/ath6kl/txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/dfs.c | 8 +- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 5 +- + drivers/net/wireless/ath/dfs_pattern_detector.h | 3 +- + drivers/net/wireless/ath/dfs_pri_detector.h | 3 +- + drivers/net/wireless/ath/regd.h | 7 + + drivers/net/wireless/ath/regd_common.h | 60 +- + drivers/net/wireless/ath/wcn36xx/Makefile | 2 + + drivers/net/wireless/ath/wcn36xx/dxe.c | 200 +- + drivers/net/wireless/ath/wcn36xx/dxe.h | 1 - + drivers/net/wireless/ath/wcn36xx/hal.h | 24 +- + drivers/net/wireless/ath/wcn36xx/main.c | 53 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 146 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 6 + + drivers/net/wireless/ath/wcn36xx/testmode.c | 149 + + drivers/net/wireless/ath/wcn36xx/testmode.h | 46 + + drivers/net/wireless/ath/wcn36xx/testmode_i.h | 29 + + drivers/net/wireless/ath/wcn36xx/txrx.c | 15 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 9 +- + drivers/net/wireless/ath/wil6210/Kconfig | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 61 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 27 +- + drivers/net/wireless/ath/wil6210/main.c | 5 +- + drivers/net/wireless/ath/wil6210/netdev.c | 8 +- + drivers/net/wireless/ath/wil6210/rx_reorder.c | 7 +- + drivers/net/wireless/ath/wil6210/txrx.c | 12 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 13 +- + drivers/net/wireless/ath/wil6210/wmi.c | 171 +- + drivers/net/wireless/ath/wil6210/wmi.h | 387 +- + drivers/net/wireless/atmel/atmel_pci.c | 4 +- + drivers/net/wireless/broadcom/b43/dma.c | 14 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 2 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 53 +- + .../wireless/broadcom/brcm80211/brcmfmac/chip.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/common.h | 2 - + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 8 + + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 36 + + .../broadcom/brcm80211/brcmfmac/firmware.c | 2 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 2 +- + .../broadcom/brcm80211/brcmfmac/flowring.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.h | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 7 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 46 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 6 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 2 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 9 +- + .../broadcom/brcm80211/include/brcm_hw_ids.h | 1 + + drivers/net/wireless/intel/ipw2x00/ipw2100.c | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2100.h | 2 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 5 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/1000.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/2000.c | 13 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 11 +- + drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/6000.c | 20 +- + drivers/net/wireless/intel/iwlwifi/cfg/7000.c | 12 +- + drivers/net/wireless/intel/iwlwifi/cfg/8000.c | 10 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 8 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 5 - + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 42 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 156 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 36 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.h | 31 - + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 6 + + drivers/net/wireless/intel/iwlwifi/fw/nvm.c | 162 - + drivers/net/wireless/intel/iwlwifi/fw/paging.c | 78 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 92 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 14 + + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 4 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 5 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 356 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 56 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 13 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 37 + + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 7 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 22 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 25 + + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 47 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 101 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 208 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 18 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 117 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 103 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 69 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 194 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 70 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 438 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 + + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 5 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 15 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 139 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 55 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 52 +- + drivers/net/wireless/intersil/prism54/islpci_eth.c | 6 +- + drivers/net/wireless/mac80211_hwsim.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 31 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 1 - + drivers/net/wireless/marvell/mwifiex/debugfs.c | 31 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 1 + + drivers/net/wireless/marvell/mwifiex/ie.c | 1 + + drivers/net/wireless/marvell/mwifiex/main.c | 43 +- + drivers/net/wireless/marvell/mwifiex/main.h | 8 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 21 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 10 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 12 + + drivers/net/wireless/marvell/mwifiex/sta_event.c | 3 + + drivers/net/wireless/marvell/mwifiex/uap_event.c | 25 +- + drivers/net/wireless/marvell/mwifiex/usb.c | 15 + + drivers/net/wireless/marvell/mwifiex/util.c | 15 +- + drivers/net/wireless/mediatek/mt76/agg-rx.c | 16 +- + drivers/net/wireless/mediatek/mt76/dma.c | 4 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 56 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 6 + + drivers/net/wireless/mediatek/mt76/mt76x2.h | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x2_dma.h | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt76x2_eeprom.h | 6 + + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 31 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x2_mac.h | 1 - + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 16 +- + drivers/net/wireless/mediatek/mt76/mt76x2_phy.c | 84 +- + drivers/net/wireless/mediatek/mt76/tx.c | 8 +- + drivers/net/wireless/mediatek/mt7601u/mac.c | 4 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 6 + + drivers/net/wireless/mediatek/mt7601u/mt7601u.h | 5 +- + drivers/net/wireless/mediatek/mt7601u/phy.c | 11 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 3 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 65 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 35 +- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 5 - + drivers/net/wireless/quantenna/qtnfmac/core.c | 5 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 2 - + drivers/net/wireless/quantenna/qtnfmac/event.c | 60 +- + .../net/wireless/quantenna/qtnfmac/pearl/pcie.c | 19 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 9 +- + drivers/net/wireless/quantenna/qtnfmac/trans.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 17 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 20 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 6 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 - + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 4 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 4 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 208 +- + drivers/net/wireless/realtek/rtlwifi/base.h | 7 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 25 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a1ant.c | 19 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/pci.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/def.h | 32 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 7 - + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 4 - + .../net/wireless/realtek/rtlwifi/rtl8192ce/def.h | 25 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/def.h | 8 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 78 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/sw.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 29 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h | 3 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/def.h | 25 - + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 6 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.h | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/sw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 7 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.h | 3 - + .../net/wireless/realtek/rtlwifi/rtl8723be/def.h | 8 - + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 69 - + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 13 - + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 2 - + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 30 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h | 3 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/def.h | 33 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 69 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 21 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 3 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 31 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 3 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 61 +- + drivers/net/wireless/rsi/rsi_91x_coex.c | 1 + + drivers/net/wireless/rsi/rsi_91x_core.c | 33 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 108 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 75 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 35 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 27 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 8 + + drivers/net/wireless/rsi/rsi_boot_params.h | 3 +- + drivers/net/wireless/rsi/rsi_hal.h | 3 + + drivers/net/wireless/rsi/rsi_main.h | 7 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 19 +- + drivers/net/wireless/rsi/rsi_sdio.h | 2 +- + drivers/net/wireless/rsi/rsi_usb.h | 1 + + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + drivers/net/wireless/ti/wlcore/sdio.c | 42 +- + drivers/of/of_mdio.c | 3 + + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 17 +- + drivers/ptp/Kconfig | 14 +- + drivers/ptp/Makefile | 1 + + drivers/ptp/ptp_pch.c | 7 +- + drivers/ptp/ptp_qoriq.c | 454 + + drivers/s390/net/lcs.c | 3 + + drivers/s390/net/qeth_core.h | 61 +- + drivers/s390/net/qeth_core_main.c | 148 +- + drivers/s390/net/qeth_core_mpc.h | 2 + + drivers/s390/net/qeth_core_sys.c | 2 + + drivers/s390/net/qeth_l2_main.c | 98 +- + drivers/s390/net/qeth_l3_main.c | 207 +- + drivers/scsi/csiostor/csio_hw.c | 2 +- + drivers/scsi/qedf/qedf.h | 7 + + drivers/scsi/qedf/qedf_debugfs.c | 1 - + drivers/scsi/qedf/qedf_fip.c | 7 +- + drivers/scsi/qedf/qedf_io.c | 11 + + drivers/scsi/qedf/qedf_main.c | 106 +- + drivers/scsi/qedi/qedi.h | 3 + + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/qedi/qedi_iscsi.h | 6 + + drivers/scsi/qedi/qedi_main.c | 198 + + drivers/soc/ti/knav_dma.c | 8 + + drivers/soc/ti/knav_qmss.h | 6 + + drivers/soc/ti/knav_qmss_queue.c | 98 +- + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 6 + + drivers/vhost/net.c | 19 +- + fs/afs/rotate.c | 4 + + fs/exec.c | 38 +- + fs/proc/Kconfig | 15 + + fs/proc/vmcore.c | 386 +- + include/dt-bindings/net/microchip-lan78xx.h | 21 + + include/linux/avf/virtchnl.h | 4 +- + include/linux/binfmts.h | 1 + + include/linux/bpf.h | 85 +- + include/linux/bpf_trace.h | 1 - + include/linux/bpf_types.h | 9 +- + include/linux/bpf_verifier.h | 13 +- + include/linux/bpfilter.h | 15 + + include/linux/btf.h | 50 + + include/linux/crash_dump.h | 18 + + include/linux/ethtool.h | 5 + + include/linux/filter.h | 37 +- + include/linux/fsl/ptp_qoriq.h | 141 + + include/linux/if_bridge.h | 29 + + include/linux/if_macvlan.h | 29 +- + include/linux/if_tun.h | 4 +- + include/linux/if_vlan.h | 4 +- + include/linux/inetdevice.h | 1 + + include/linux/kcore.h | 6 + + include/linux/mdio-bitbang.h | 2 - + include/linux/mdio-gpio.h | 9 + + include/linux/microchipphy.h | 3 + + include/linux/mlx4/device.h | 1 + + include/linux/mlx5/device.h | 11 + + include/linux/mlx5/driver.h | 18 +- + include/linux/mlx5/mlx5_ifc.h | 70 +- + include/linux/mlx5/mlx5_ifc_fpga.h | 93 + + include/linux/mmc/sdio_ids.h | 1 + + include/linux/net.h | 1 + + include/linux/net_dim.h | 69 +- + include/linux/netdev_features.h | 6 +- + include/linux/netdevice.h | 81 +- + include/linux/netfilter.h | 34 +- + include/linux/netfilter/nf_osf.h | 33 + + include/linux/netfilter/nfnetlink.h | 1 + + include/linux/netfilter_bridge/ebtables.h | 4 - + include/linux/perf_event.h | 5 + + include/linux/phy.h | 69 +- + include/linux/phy/phy.h | 1 + + include/linux/platform_data/b53.h | 4 + + include/linux/platform_data/mdio-gpio.h | 33 - + include/linux/platform_data/mv88e6xxx.h | 18 + + include/linux/qed/qed_eth_if.h | 5 + + include/linux/qed/qed_if.h | 284 +- + include/linux/qed/qed_ll2_if.h | 10 +- + include/linux/qed/qed_rdma_if.h | 12 +- + include/linux/rhashtable.h | 38 +- + include/linux/skb_array.h | 5 + + include/linux/skbuff.h | 28 +- + include/linux/soc/ti/knav_dma.h | 12 + + include/linux/soc/ti/knav_qmss.h | 1 + + include/linux/socket.h | 5 +- + include/linux/tcp.h | 5 +- + include/linux/tnum.h | 4 +- + include/linux/trace_events.h | 17 + + include/linux/u64_stats_sync.h | 14 - + include/linux/udp.h | 3 + + include/linux/umh.h | 12 + + include/net/addrconf.h | 43 + + include/net/ax88796.h | 14 + + include/net/bluetooth/hci_core.h | 2 + + include/net/bonding.h | 11 +- + include/net/cfg80211.h | 131 +- + include/net/dcbnl.h | 4 + + include/net/devlink.h | 32 +- + include/net/dsa.h | 37 +- + include/net/erspan.h | 28 + + include/net/failover.h | 36 + + include/net/fib_rules.h | 3 +- + include/net/flow_dissector.h | 7 +- + include/net/if_inet6.h | 6 +- + include/net/inet_connection_sock.h | 24 +- + include/net/inet_sock.h | 1 + + include/net/inet_timewait_sock.h | 1 + + include/net/ip.h | 9 +- + include/net/ip6_fib.h | 211 +- + include/net/ip6_route.h | 85 +- + include/net/ip_fib.h | 2 + + include/net/ip_tunnels.h | 15 +- + include/net/ip_vs.h | 11 +- + include/net/ipv6.h | 11 +- + include/net/mac80211.h | 18 +- + include/net/neighbour.h | 19 +- + include/net/net_failover.h | 40 + + include/net/netfilter/ipv4/nf_nat_masquerade.h | 2 +- + include/net/netfilter/ipv6/nf_nat_masquerade.h | 2 +- + include/net/netfilter/nf_conntrack_count.h | 11 + + include/net/netfilter/nf_flow_table.h | 24 +- + include/net/netfilter/nf_nat.h | 6 +- + include/net/netfilter/nf_nat_core.h | 11 +- + include/net/netfilter/nf_nat_l3proto.h | 64 +- + include/net/netfilter/nf_nat_l4proto.h | 8 +- + include/net/netfilter/nf_nat_redirect.h | 2 +- + include/net/netfilter/nf_socket.h | 17 +- + include/net/netfilter/nf_tables.h | 88 +- + include/net/netfilter/nf_tables_core.h | 11 + + include/net/netfilter/nf_tproxy.h | 113 + + include/net/netfilter/nfnetlink_log.h | 17 - + include/net/netfilter/nft_meta.h | 44 - + include/net/netns/ipv4.h | 2 + + include/net/netns/ipv6.h | 4 +- + include/net/netns/nftables.h | 3 +- + include/net/page_pool.h | 144 + + include/net/pkt_cls.h | 20 +- + include/net/route.h | 1 + + include/net/rtnetlink.h | 4 +- + include/net/sch_generic.h | 22 +- + include/net/sctp/constants.h | 5 +- + include/net/sctp/sctp.h | 52 +- + include/net/sctp/sm.h | 4 +- + include/net/sctp/structs.h | 6 +- + include/net/seg6.h | 7 +- + include/net/seg6_local.h | 32 + + include/net/sock.h | 25 +- + include/net/switchdev.h | 1 + + include/net/tcp.h | 30 +- + include/net/tipc.h | 4 +- + include/net/tls.h | 127 +- + include/net/udp.h | 4 + + include/net/vxlan.h | 1 + + include/net/xdp.h | 85 + + include/net/xdp_sock.h | 57 + + include/trace/events/bpf.h | 355 - + include/trace/events/fib.h | 107 +- + include/trace/events/fib6.h | 43 +- + include/trace/events/rxrpc.h | 32 + + include/trace/events/tcp.h | 78 +- + include/trace/events/xdp.h | 50 +- + include/uapi/linux/bpf.h | 2136 ++++- + include/uapi/linux/bpfilter.h | 21 + + include/uapi/linux/btf.h | 113 + + include/uapi/linux/cn_proc.h | 4 + + include/uapi/linux/dcbnl.h | 11 + + include/uapi/linux/devlink.h | 14 + + include/uapi/linux/elf.h | 1 + + include/uapi/linux/if_addr.h | 1 + + include/uapi/linux/if_link.h | 2 + + include/uapi/linux/if_xdp.h | 78 + + include/uapi/linux/netfilter/nf_nat.h | 12 +- + include/uapi/linux/netfilter/nf_osf.h | 86 + + include/uapi/linux/netfilter/nf_tables.h | 67 +- + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 + + include/uapi/linux/netfilter/xt_osf.h | 106 +- + include/uapi/linux/netfilter_bridge/ebtables.h | 6 + + include/uapi/linux/netfilter_ipv6/ip6t_srh.h | 43 +- + include/uapi/linux/nl80211.h | 99 +- + include/uapi/linux/openvswitch.h | 28 + + include/uapi/linux/pci_regs.h | 2 + + include/uapi/linux/pkt_cls.h | 1 + + include/uapi/linux/rtnetlink.h | 8 + + include/uapi/linux/seg6_local.h | 12 + + include/uapi/linux/snmp.h | 3 + + include/uapi/linux/tcp.h | 16 + + include/uapi/linux/tipc.h | 12 +- + include/uapi/linux/tipc_config.h | 5 + + include/uapi/linux/tipc_netlink.h | 1 + + include/uapi/linux/udp.h | 1 + + include/uapi/linux/virtio_net.h | 3 + + include/uapi/linux/vmcore.h | 18 + + init/Kconfig | 1 + + kernel/bpf/Makefile | 4 + + kernel/bpf/arraymap.c | 50 + + kernel/bpf/btf.c | 2324 +++++ + kernel/bpf/core.c | 109 +- + kernel/bpf/cpumap.c | 132 +- + kernel/bpf/devmap.c | 131 +- + kernel/bpf/inode.c | 172 +- + kernel/bpf/offload.c | 6 +- + kernel/bpf/sockmap.c | 640 +- + kernel/bpf/stackmap.c | 139 +- + kernel/bpf/syscall.c | 331 +- + kernel/bpf/tnum.c | 10 + + kernel/bpf/verifier.c | 308 +- + kernel/bpf/xskmap.c | 232 + + kernel/events/core.c | 8 + + kernel/trace/bpf_trace.c | 100 +- + kernel/trace/trace_kprobe.c | 29 + + kernel/trace/trace_uprobe.c | 22 + + kernel/umh.c | 125 +- + lib/kobject_uevent.c | 178 +- + lib/rhashtable.c | 51 +- + lib/test_bpf.c | 570 +- + net/8021q/vlan.c | 11 +- + net/8021q/vlan.h | 3 +- + net/8021q/vlan_dev.c | 4 +- + net/8021q/vlan_netlink.c | 45 +- + net/9p/mod.c | 2 +- + net/Kconfig | 22 + + net/Makefile | 2 + + net/batman-adv/Kconfig | 6 +- + net/batman-adv/bat_v_elp.c | 15 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 29 +- + net/batman-adv/soft-interface.c | 5 +- + net/batman-adv/types.h | 23 +- + net/bluetooth/hci_core.c | 54 +- + net/bluetooth/hci_debugfs.c | 24 +- + net/bluetooth/hci_event.c | 12 +- + net/bluetooth/hci_request.c | 30 +- + net/bluetooth/smp.c | 12 +- + net/bpf/test_run.c | 3 +- + net/bpfilter/Kconfig | 16 + + net/bpfilter/Makefile | 30 + + net/bpfilter/bpfilter_kern.c | 114 + + net/bpfilter/main.c | 63 + + net/bpfilter/msgfmt.h | 17 + + net/bridge/br.c | 16 +- + net/bridge/br_fdb.c | 69 +- + net/bridge/br_forward.c | 6 +- + net/bridge/br_if.c | 11 +- + net/bridge/br_input.c | 1 + + net/bridge/br_netlink.c | 9 +- + net/bridge/br_private.h | 41 +- + net/bridge/br_switchdev.c | 37 +- + net/bridge/br_sysfs_if.c | 2 + + net/bridge/br_vlan.c | 144 +- + net/bridge/netfilter/Kconfig | 7 - + net/bridge/netfilter/Makefile | 1 - + net/bridge/netfilter/ebtables.c | 63 +- + net/bridge/netfilter/nft_meta_bridge.c | 135 - + net/core/Makefile | 2 + + net/core/dev.c | 148 +- + net/core/devlink.c | 93 +- + net/core/dst.c | 1 + + net/core/ethtool.c | 63 +- + net/core/failover.c | 315 + + net/core/fib_rules.c | 495 +- + net/core/filter.c | 1416 +++- + net/core/flow_dissector.c | 19 +- + net/core/neighbour.c | 8 +- + net/core/net-traces.c | 4 - + net/core/page_pool.c | 317 + + net/core/rtnetlink.c | 26 +- + net/core/skbuff.c | 25 +- + net/core/sock.c | 40 +- + net/core/xdp.c | 290 + + net/dcb/dcbnl.c | 20 + + net/decnet/dn_rules.c | 7 +- + net/dsa/Kconfig | 2 +- + net/dsa/dsa2.c | 24 + + net/dsa/dsa_priv.h | 9 - + net/dsa/master.c | 62 +- + net/dsa/port.c | 96 +- + net/dsa/slave.c | 307 +- + net/ethernet/eth.c | 6 +- + net/ipv4/Makefile | 5 +- + net/ipv4/af_inet.c | 5 +- + net/ipv4/bpfilter/Makefile | 2 + + net/ipv4/bpfilter/sockopt.c | 43 + + net/ipv4/devinet.c | 15 + + net/ipv4/fib_frontend.c | 58 +- + net/ipv4/fib_rules.c | 7 +- + net/ipv4/fib_semantics.c | 43 +- + net/ipv4/fib_trie.c | 14 +- + net/ipv4/inet_connection_sock.c | 5 - + net/ipv4/ip_gre.c | 12 + + net/ipv4/ip_output.c | 45 +- + net/ipv4/ip_sockglue.c | 17 + + net/ipv4/ip_tunnel_core.c | 6 +- + net/ipv4/ipconfig.c | 149 +- + net/ipv4/ipmr.c | 3 +- + net/ipv4/metrics.c | 53 + + net/ipv4/netfilter/Kconfig | 10 +- + net/ipv4/netfilter/Makefile | 5 +- + net/ipv4/netfilter/ip_tables.c | 7 +- + net/ipv4/netfilter/ipt_MASQUERADE.c | 2 +- + net/ipv4/netfilter/iptable_nat.c | 88 +- + net/ipv4/netfilter/nf_flow_table_ipv4.c | 255 +- + net/ipv4/netfilter/nf_nat_h323.c | 4 +- + net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 143 +- + net/ipv4/netfilter/nf_nat_masquerade_ipv4.c | 8 +- + net/ipv4/netfilter/nf_nat_pptp.c | 2 +- + net/ipv4/netfilter/nf_nat_proto_gre.c | 2 +- + net/ipv4/netfilter/nf_nat_proto_icmp.c | 2 +- + net/ipv4/netfilter/nf_tproxy_ipv4.c | 147 + + net/ipv4/netfilter/nft_chain_nat_ipv4.c | 53 +- + net/ipv4/netfilter/nft_masq_ipv4.c | 2 +- + net/ipv4/netlink.c | 23 + + net/ipv4/proc.c | 3 + + net/ipv4/route.c | 177 +- + net/ipv4/sysctl_net_ipv4.c | 22 +- + net/ipv4/tcp.c | 204 +- + net/ipv4/tcp_input.c | 249 +- + net/ipv4/tcp_ipv4.c | 55 +- + net/ipv4/tcp_minisocks.c | 1 + + net/ipv4/tcp_output.c | 112 +- + net/ipv4/tcp_recovery.c | 80 +- + net/ipv4/tcp_timer.c | 27 +- + net/ipv4/udp.c | 96 +- + net/ipv4/udp_offload.c | 101 +- + net/ipv6/Kconfig | 5 + + net/ipv6/addrconf.c | 523 +- + net/ipv6/addrconf_core.c | 41 +- + net/ipv6/af_inet6.c | 65 +- + net/ipv6/anycast.c | 33 +- + net/ipv6/exthdrs.c | 55 +- + net/ipv6/exthdrs_core.c | 2 +- + net/ipv6/fib6_rules.c | 145 +- + net/ipv6/ip6_fib.c | 639 +- + net/ipv6/ip6_gre.c | 51 +- + net/ipv6/ip6_input.c | 2 +- + net/ipv6/ip6_offload.c | 6 +- + net/ipv6/ip6_output.c | 96 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ip6mr.c | 3 +- + net/ipv6/ndisc.c | 48 +- + net/ipv6/netfilter/Kconfig | 10 +- + net/ipv6/netfilter/Makefile | 3 +- + net/ipv6/netfilter/ip6_tables.c | 6 +- + net/ipv6/netfilter/ip6t_MASQUERADE.c | 2 +- + net/ipv6/netfilter/ip6t_rpfilter.c | 2 + + net/ipv6/netfilter/ip6t_srh.c | 173 +- + net/ipv6/netfilter/ip6table_nat.c | 87 +- + net/ipv6/netfilter/nf_flow_table_ipv6.c | 246 +- + net/ipv6/netfilter/nf_nat_l3proto_ipv6.c | 137 +- + net/ipv6/netfilter/nf_nat_masquerade_ipv6.c | 8 +- + net/ipv6/netfilter/nf_nat_proto_icmpv6.c | 2 +- + net/ipv6/netfilter/nf_tproxy_ipv6.c | 146 + + net/ipv6/netfilter/nft_chain_nat_ipv6.c | 51 +- + net/ipv6/netfilter/nft_masq_ipv6.c | 2 +- + net/ipv6/netfilter/nft_redir_ipv6.c | 2 +- + net/ipv6/reassembly.c | 25 +- + net/ipv6/route.c | 1885 ++-- + net/ipv6/seg6.c | 1 - + net/ipv6/seg6_iptunnel.c | 24 +- + net/ipv6/seg6_local.c | 190 +- + net/ipv6/sysctl_net_ipv6.c | 8 + + net/ipv6/tcp_ipv6.c | 8 +- + net/ipv6/udp.c | 44 +- + net/ipv6/udp_offload.c | 5 +- + net/ipv6/xfrm6_policy.c | 2 - + net/ipv6/xfrm6_state.c | 6 +- + net/l2tp/l2tp_debugfs.c | 20 +- + net/l2tp/l2tp_ppp.c | 21 +- + net/mac80211/cfg.c | 103 +- + net/mac80211/driver-ops.h | 8 +- + net/mac80211/ethtool.c | 13 +- + net/mac80211/ht.c | 44 +- + net/mac80211/ieee80211_i.h | 3 + + net/mac80211/main.c | 3 + + net/mac80211/mlme.c | 17 +- + net/mac80211/rx.c | 40 +- + net/mac80211/sta_info.c | 38 +- + net/mac80211/sta_info.h | 5 +- + net/mac80211/status.c | 2 + + net/mac80211/trace.h | 25 +- + net/mac80211/tx.c | 45 + + net/mac80211/util.c | 6 +- + net/ncsi/internal.h | 34 +- + net/ncsi/ncsi-manage.c | 226 +- + net/ncsi/ncsi-netlink.c | 21 +- + net/ncsi/ncsi-rsp.c | 179 +- + net/netfilter/Kconfig | 51 +- + net/netfilter/Makefile | 12 +- + net/netfilter/core.c | 102 +- + net/netfilter/ipvs/Kconfig | 37 + + net/netfilter/ipvs/Makefile | 1 + + net/netfilter/ipvs/ip_vs_app.c | 24 +- + net/netfilter/ipvs/ip_vs_ctl.c | 4 + + net/netfilter/ipvs/ip_vs_dh.c | 3 +- + net/netfilter/ipvs/ip_vs_ftp.c | 467 +- + net/netfilter/ipvs/ip_vs_lblc.c | 4 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 4 +- + net/netfilter/ipvs/ip_vs_mh.c | 540 ++ + net/netfilter/ipvs/ip_vs_nfct.c | 101 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 8 +- + net/netfilter/ipvs/ip_vs_proto_udp.c | 4 +- + net/netfilter/ipvs/ip_vs_sh.c | 3 +- + net/netfilter/ipvs/ip_vs_xmit.c | 5 +- + net/netfilter/nf_conncount.c | 36 +- + net/netfilter/nf_conntrack_core.c | 92 +- + net/netfilter/nf_conntrack_ftp.c | 3 +- + net/netfilter/nf_conntrack_irc.c | 6 +- + net/netfilter/nf_conntrack_netlink.c | 13 +- + net/netfilter/nf_conntrack_sane.c | 3 +- + net/netfilter/nf_conntrack_sip.c | 2 +- + net/netfilter/nf_conntrack_tftp.c | 2 +- + .../{nf_flow_table.c => nf_flow_table_core.c} | 309 +- + net/netfilter/nf_flow_table_inet.c | 3 +- + net/netfilter/nf_flow_table_ip.c | 489 ++ + net/netfilter/nf_internals.h | 5 + + net/netfilter/nf_nat_core.c | 321 +- + net/netfilter/nf_nat_helper.c | 2 +- + net/netfilter/nf_nat_proto_common.c | 9 +- + net/netfilter/nf_nat_proto_dccp.c | 2 +- + net/netfilter/nf_nat_proto_sctp.c | 2 +- + net/netfilter/nf_nat_proto_tcp.c | 2 +- + net/netfilter/nf_nat_proto_udp.c | 4 +- + net/netfilter/nf_nat_proto_unknown.c | 2 +- + net/netfilter/nf_nat_redirect.c | 10 +- + net/netfilter/nf_nat_sip.c | 2 +- + net/netfilter/nf_osf.c | 218 + + net/netfilter/nf_tables_api.c | 1325 ++- + net/netfilter/nf_tables_core.c | 72 +- + net/netfilter/nfnetlink.c | 44 +- + net/netfilter/nfnetlink_log.c | 8 +- + net/netfilter/nfnetlink_queue.c | 28 +- + net/netfilter/nft_compat.c | 29 +- + net/netfilter/nft_connlimit.c | 297 + + net/netfilter/nft_counter.c | 4 +- + net/netfilter/nft_ct.c | 3 +- + net/netfilter/nft_dynset.c | 16 +- + net/netfilter/nft_exthdr.c | 23 +- + net/netfilter/nft_flow_offload.c | 5 +- + net/netfilter/nft_fwd_netdev.c | 146 +- + net/netfilter/nft_hash.c | 127 +- + net/netfilter/nft_immediate.c | 27 +- + net/netfilter/nft_log.c | 92 +- + net/netfilter/nft_lookup.c | 47 + + net/netfilter/nft_meta.c | 112 +- + net/netfilter/nft_nat.c | 2 +- + net/netfilter/nft_numgen.c | 158 +- + net/netfilter/nft_objref.c | 4 +- + net/netfilter/nft_rt.c | 22 +- + net/netfilter/nft_set_bitmap.c | 34 +- + net/netfilter/nft_set_hash.c | 174 +- + net/netfilter/nft_set_rbtree.c | 109 +- + net/netfilter/nft_socket.c | 144 + + net/netfilter/xt_NETMAP.c | 8 +- + net/netfilter/xt_NFLOG.c | 15 +- + net/netfilter/xt_REDIRECT.c | 2 +- + net/netfilter/xt_TPROXY.c | 366 +- + net/netfilter/xt_nat.c | 72 +- + net/netfilter/xt_osf.c | 202 +- + net/netfilter/xt_socket.c | 4 +- + net/nfc/netlink.c | 17 - + net/openvswitch/Kconfig | 3 +- + net/openvswitch/conntrack.c | 555 +- + net/openvswitch/conntrack.h | 9 +- + net/openvswitch/datapath.c | 7 +- + net/openvswitch/datapath.h | 3 + + net/packet/af_packet.c | 44 +- + net/qrtr/Kconfig | 7 + + net/qrtr/Makefile | 2 + + net/qrtr/tun.c | 161 + + net/rfkill/core.c | 66 +- + net/rxrpc/ar-internal.h | 2 + + net/rxrpc/call_event.c | 8 +- + net/rxrpc/input.c | 10 +- + net/sched/act_api.c | 20 +- + net/sched/act_csum.c | 6 + + net/sched/cls_api.c | 443 +- + net/sched/cls_basic.c | 24 +- + net/sched/cls_bpf.c | 22 +- + net/sched/cls_cgroup.c | 23 +- + net/sched/cls_flow.c | 24 +- + net/sched/cls_flower.c | 317 +- + net/sched/cls_fw.c | 24 +- + net/sched/cls_matchall.c | 21 +- + net/sched/cls_route.c | 23 +- + net/sched/cls_rsvp.h | 20 +- + net/sched/cls_tcindex.c | 41 +- + net/sched/cls_u32.c | 37 +- + net/sched/sch_generic.c | 49 +- + net/sched/sch_mq.c | 37 + + net/sctp/associola.c | 85 +- + net/sctp/chunk.c | 12 +- + net/sctp/output.c | 28 +- + net/sctp/outqueue.c | 660 +- + net/sctp/sm_make_chunk.c | 143 +- + net/sctp/socket.c | 43 +- + net/sctp/transport.c | 37 +- + net/smc/af_smc.c | 803 +- + net/smc/smc.h | 68 +- + net/smc/smc_cdc.c | 101 +- + net/smc/smc_cdc.h | 15 +- + net/smc/smc_clc.c | 6 +- + net/smc/smc_clc.h | 2 +- + net/smc/smc_core.c | 199 +- + net/smc/smc_core.h | 29 +- + net/smc/smc_diag.c | 44 +- + net/smc/smc_ib.c | 13 +- + net/smc/smc_llc.c | 242 +- + net/smc/smc_llc.h | 8 +- + net/smc/smc_rx.c | 308 +- + net/smc/smc_rx.h | 11 +- + net/smc/smc_tx.c | 111 +- + net/smc/smc_tx.h | 5 +- + net/smc/smc_wr.c | 1 + + net/tipc/bearer.c | 29 +- + net/tipc/bearer.h | 3 + + net/tipc/name_table.c | 103 +- + net/tipc/node.c | 33 +- + net/tipc/node.h | 3 +- + net/tipc/socket.c | 13 +- + net/tipc/udp_media.c | 4 +- + net/tipc/udp_media.h | 14 + + net/tls/Kconfig | 10 + + net/tls/Makefile | 2 + + net/tls/tls_device.c | 766 ++ + net/tls/tls_device_fallback.c | 450 + + net/tls/tls_main.c | 139 +- + net/tls/tls_sw.c | 141 +- + net/wireless/core.c | 4 + + net/wireless/nl80211.c | 304 +- + net/wireless/rdev-ops.h | 12 + + net/wireless/reg.c | 39 +- + net/wireless/sme.c | 88 +- + net/wireless/trace.h | 14 + + net/wireless/util.c | 11 + + net/xdp/Kconfig | 7 + + net/xdp/Makefile | 1 + + net/xdp/xdp_umem.c | 248 + + net/xdp/xdp_umem.h | 57 + + net/xdp/xdp_umem_props.h | 14 + + net/xdp/xsk.c | 674 ++ + net/xdp/xsk_queue.c | 63 + + net/xdp/xsk_queue.h | 255 + + net/xfrm/xfrm_state.c | 9 +- + samples/bpf/Makefile | 172 +- + samples/bpf/{libbpf.h => bpf_insn.h} | 8 +- + samples/bpf/bpf_load.c | 111 +- + samples/bpf/bpf_load.h | 13 +- + samples/bpf/cookie_uid_helper_example.c | 2 +- + samples/bpf/cpustat_user.c | 2 +- + samples/bpf/fds_example.c | 4 +- + samples/bpf/lathist_user.c | 2 +- + samples/bpf/load_sock_ops.c | 2 +- + samples/bpf/lwt_len_hist_user.c | 2 +- + samples/bpf/map_perf_test_user.c | 2 +- + samples/bpf/offwaketime_user.c | 1 + + samples/bpf/sampleip_user.c | 1 + + samples/bpf/sock_example.c | 7 +- + samples/bpf/sock_example.h | 1 - + samples/bpf/sockex1_user.c | 2 +- + samples/bpf/sockex2_user.c | 2 +- + samples/bpf/sockex3_user.c | 2 +- + samples/bpf/spintest_user.c | 1 + + samples/bpf/syscall_tp_user.c | 2 +- + samples/bpf/task_fd_query_kern.c | 19 + + samples/bpf/task_fd_query_user.c | 382 + + samples/bpf/tc_l2_redirect_user.c | 2 +- + samples/bpf/test_cgrp2_array_pin.c | 2 +- + samples/bpf/test_cgrp2_attach.c | 3 +- + samples/bpf/test_cgrp2_attach2.c | 3 +- + samples/bpf/test_cgrp2_sock.c | 3 +- + samples/bpf/test_cgrp2_sock2.c | 3 +- + samples/bpf/test_current_task_under_cgroup_user.c | 2 +- + samples/bpf/test_lru_dist.c | 2 +- + samples/bpf/test_map_in_map_user.c | 2 +- + samples/bpf/test_overhead_user.c | 2 +- + samples/bpf/test_probe_write_user_user.c | 2 +- + samples/bpf/test_tunnel_bpf.sh | 319 - + samples/bpf/trace_event_user.c | 1 + + samples/bpf/trace_output_user.c | 112 +- + samples/bpf/tracex1_user.c | 2 +- + samples/bpf/tracex2_user.c | 2 +- + samples/bpf/tracex3_user.c | 2 +- + samples/bpf/tracex4_user.c | 2 +- + samples/bpf/tracex5_user.c | 2 +- + samples/bpf/tracex6_user.c | 2 +- + samples/bpf/tracex7_user.c | 2 +- + samples/bpf/xdp1_user.c | 31 +- + samples/bpf/xdp_adjust_tail_kern.c | 152 + + samples/bpf/xdp_adjust_tail_user.c | 150 + + samples/bpf/xdp_fwd_kern.c | 138 + + samples/bpf/xdp_fwd_user.c | 136 + + samples/bpf/xdp_monitor_kern.c | 49 + + samples/bpf/xdp_monitor_user.c | 77 +- + samples/bpf/xdp_redirect_cpu_user.c | 2 +- + samples/bpf/xdp_redirect_map_user.c | 2 +- + samples/bpf/xdp_redirect_user.c | 2 +- + samples/bpf/xdp_router_ipv4_user.c | 2 +- + samples/bpf/xdp_rxq_info_user.c | 46 +- + samples/bpf/xdp_tx_iptunnel_user.c | 2 +- + samples/bpf/xdpsock.h | 11 + + samples/bpf/xdpsock_kern.c | 56 + + samples/bpf/xdpsock_user.c | 967 +++ + samples/sockmap/Makefile | 78 - + samples/sockmap/sockmap_test.sh | 488 -- + scripts/bpf_helpers_doc.py | 421 + + security/selinux/hooks.c | 4 +- + security/selinux/include/classmap.h | 4 +- + tools/bpf/bpftool/.gitignore | 3 + + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 11 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 53 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 81 + + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 3 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 7 +- + tools/bpf/bpftool/Makefile | 7 +- + tools/bpf/bpftool/bash-completion/bpftool | 59 +- + tools/bpf/bpftool/cgroup.c | 15 +- + tools/bpf/bpftool/common.c | 77 +- + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 8 +- + tools/bpf/bpftool/map.c | 90 +- + tools/bpf/bpftool/map_perf_ring.c | 306 + + tools/bpf/bpftool/perf.c | 246 + + tools/bpf/bpftool/prog.c | 111 +- + tools/bpf/bpftool/xlated_dumper.c | 14 +- + tools/bpf/bpftool/xlated_dumper.h | 3 + + tools/include/uapi/asm/bitsperlong.h | 18 + + tools/include/uapi/asm/errno.h | 18 + + tools/include/uapi/linux/bpf.h | 2136 ++++- + tools/include/uapi/linux/btf.h | 113 + + tools/include/uapi/linux/erspan.h | 52 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 2 +- + tools/lib/bpf/bpf.c | 127 +- + tools/lib/bpf/bpf.h | 23 + + tools/lib/bpf/btf.c | 373 + + tools/lib/bpf/btf.h | 22 + + tools/lib/bpf/libbpf.c | 286 +- + tools/lib/bpf/libbpf.h | 69 +- + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 50 +- + tools/testing/selftests/bpf/bpf_helpers.h | 32 + + tools/testing/selftests/bpf/bpf_rand.h | 80 + + tools/testing/selftests/bpf/test_adjust_tail.c | 30 + + tools/testing/selftests/bpf/test_btf.c | 2270 +++++ + tools/testing/selftests/bpf/test_btf_haskv.c | 48 + + tools/testing/selftests/bpf/test_btf_nokv.c | 43 + + tools/testing/selftests/bpf/test_get_stack_rawtp.c | 102 + + tools/testing/selftests/bpf/test_lwt_seg6local.c | 437 + + tools/testing/selftests/bpf/test_lwt_seg6local.sh | 140 + + tools/testing/selftests/bpf/test_progs.c | 566 +- + tools/testing/selftests/bpf/test_sockhash_kern.c | 5 + + .../testing/selftests/bpf/test_sockmap.c | 893 +- + tools/testing/selftests/bpf/test_sockmap_kern.c | 5 + + .../testing/selftests/bpf/test_sockmap_kern.h | 64 +- + .../selftests/bpf/test_stacktrace_build_id.c | 20 +- + tools/testing/selftests/bpf/test_stacktrace_map.c | 19 +- + tools/testing/selftests/bpf/test_tunnel.sh | 729 ++ + .../testing/selftests/bpf/test_tunnel_kern.c | 263 +- + tools/testing/selftests/bpf/test_verifier.c | 754 +- + tools/testing/selftests/bpf/trace_helpers.c | 165 + + tools/testing/selftests/bpf/trace_helpers.h | 21 + + tools/testing/selftests/bpf/urandom_read.c | 10 +- + tools/testing/selftests/net/.gitignore | 5 + + tools/testing/selftests/net/Makefile | 7 +- + tools/testing/selftests/net/fib_rule_tests.sh | 248 + + tools/testing/selftests/net/fib_tests.sh | 858 +- + .../selftests/net/forwarding/bridge_vlan_aware.sh | 26 +- + .../net/forwarding/bridge_vlan_unaware.sh | 26 +- + tools/testing/selftests/net/forwarding/lib.sh | 190 +- + .../testing/selftests/net/forwarding/mirror_gre.sh | 159 + + .../selftests/net/forwarding/mirror_gre_bound.sh | 226 + + .../net/forwarding/mirror_gre_bridge_1d_vlan.sh | 121 + + .../selftests/net/forwarding/mirror_gre_changes.sh | 278 + + .../selftests/net/forwarding/mirror_gre_flower.sh | 137 + + .../selftests/net/forwarding/mirror_gre_lib.sh | 130 + + .../selftests/net/forwarding/mirror_gre_neigh.sh | 115 + + .../selftests/net/forwarding/mirror_gre_nh.sh | 127 + + .../net/forwarding/mirror_gre_topo_lib.sh | 94 + + .../selftests/net/forwarding/mirror_gre_vlan.sh | 92 + + .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 270 + + .../testing/selftests/net/forwarding/mirror_lib.sh | 132 + + .../selftests/net/forwarding/mirror_topo_lib.sh | 101 + + .../selftests/net/forwarding/mirror_vlan.sh | 131 + + tools/testing/selftests/net/forwarding/router.sh | 14 +- + .../selftests/net/forwarding/router_multipath.sh | 29 +- + .../testing/selftests/net/forwarding/tc_actions.sh | 25 +- + .../testing/selftests/net/forwarding/tc_chains.sh | 7 +- + .../testing/selftests/net/forwarding/tc_flower.sh | 80 +- + .../selftests/net/forwarding/tc_shblocks.sh | 5 +- + tools/testing/selftests/net/msg_zerocopy.sh | 8 + + tools/testing/selftests/net/pmtu.sh | 4 +- + tools/testing/selftests/net/psock_snd.c | 397 + + tools/testing/selftests/net/psock_snd.sh | 98 + + tools/testing/selftests/net/rtnetlink.sh | 103 + + tools/testing/selftests/net/tcp_inq.c | 189 + + tools/testing/selftests/net/tcp_mmap.c | 447 + + tools/testing/selftests/net/udpgso.c | 693 ++ + tools/testing/selftests/net/udpgso.sh | 29 + + tools/testing/selftests/net/udpgso_bench.sh | 74 + + tools/testing/selftests/net/udpgso_bench_rx.c | 265 + + tools/testing/selftests/net/udpgso_bench_tx.c | 420 + + .../tc-testing/tc-tests/actions/csum.json | 74 +- + .../selftests/tc-testing/tc-tests/actions/ife.json | 1036 ++- + .../tc-testing/tc-tests/actions/mirred.json | 24 +- + .../tc-testing/tc-tests/actions/police.json | 4 +- + .../tc-testing/tc-tests/actions/sample.json | 588 ++ + .../tc-testing/tc-tests/actions/vlan.json | 320 +- + tools/testing/selftests/uevent/Makefile | 17 + + tools/testing/selftests/uevent/config | 2 + + tools/testing/selftests/uevent/uevent_filtering.c | 486 ++ + 1667 files changed, 109200 insertions(+), 41025 deletions(-) + create mode 100644 Documentation/bpf/README.rst + create mode 100644 Documentation/bpf/bpf_design_QA.rst + delete mode 100644 Documentation/bpf/bpf_design_QA.txt + create mode 100644 Documentation/bpf/bpf_devel_QA.rst + delete mode 100644 Documentation/bpf/bpf_devel_QA.txt + create mode 100644 Documentation/devicetree/bindings/arm/stm32/stm32-syscon.txt + rename Documentation/devicetree/bindings/arm/{ => stm32}/stm32.txt (100%) + create mode 100644 Documentation/devicetree/bindings/net/microchip,lan78xx.txt + create mode 100644 Documentation/devicetree/bindings/net/mscc-miim.txt + create mode 100644 Documentation/devicetree/bindings/net/mscc-ocelot.txt + create mode 100644 Documentation/devicetree/bindings/ptp/ptp-qoriq.txt + create mode 100644 Documentation/networking/af_xdp.rst + rename Documentation/networking/{e100.txt => e100.rst} (79%) + rename Documentation/networking/{e1000.txt => e1000.rst} (89%) + create mode 100644 Documentation/networking/failover.rst + create mode 100644 Documentation/networking/net_failover.rst + delete mode 100644 arch/powerpc/net/bpf_jit_asm64.S + delete mode 100644 arch/s390/net/bpf_jit.S + delete mode 100644 arch/sparc/net/bpf_jit_asm_64.S + delete mode 100644 arch/x86/net/bpf_jit.S + create mode 100644 arch/x86/net/bpf_jit_comp32.c + create mode 100644 drivers/net/ethernet/8390/xsurf100.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_debugfs.h + delete mode 100644 drivers/net/ethernet/freescale/gianfar_ptp.c + delete mode 100644 drivers/net/ethernet/marvell/mvpp2.c + create mode 100644 drivers/net/ethernet/marvell/mvpp2/Makefile + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2.h + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c + create mode 100644 drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/accel/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/Makefile + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/port.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/port.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/en_accel.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_rxtx.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en_accel/tls_stats.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/fpga/tls.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.h + create mode 100644 drivers/net/ethernet/mscc/Kconfig + create mode 100644 drivers/net/ethernet/mscc/Makefile + create mode 100644 drivers/net/ethernet/mscc/ocelot.c + create mode 100644 drivers/net/ethernet/mscc/ocelot.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_ana.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_board.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_dev.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_dev_gmii.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_hsio.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_io.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_qs.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_qsys.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_regs.c + create mode 100644 drivers/net/ethernet/mscc/ocelot_rew.h + create mode 100644 drivers/net/ethernet/mscc/ocelot_sys.h + create mode 100644 drivers/net/ethernet/netronome/nfp/abm/ctrl.c + create mode 100644 drivers/net/ethernet/netronome/nfp/abm/main.c + create mode 100644 drivers/net/ethernet/netronome/nfp/abm/main.h + create mode 100644 drivers/net/ethernet/netronome/nfp/flower/lag_conf.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_abi.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nfp_shared_buf.c + create mode 100644 drivers/net/ethernet/qlogic/qed/qed_mng_tlv.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/hwif.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c + create mode 100644 drivers/net/net_failover.c + create mode 100644 drivers/net/phy/asix.c + create mode 100644 drivers/net/phy/dp83tc811.c + create mode 100644 drivers/net/phy/mdio-mscc-miim.c + create mode 100644 drivers/net/phy/microchip_t1.c + create mode 100644 drivers/net/wireless/ath/ath10k/snoc.c + create mode 100644 drivers/net/wireless/ath/ath10k/snoc.h + create mode 100644 drivers/net/wireless/ath/wcn36xx/testmode.c + create mode 100644 drivers/net/wireless/ath/wcn36xx/testmode.h + create mode 100644 drivers/net/wireless/ath/wcn36xx/testmode_i.h + delete mode 100644 drivers/net/wireless/intel/iwlwifi/fw/nvm.c + create mode 100644 drivers/ptp/ptp_qoriq.c + create mode 100644 include/dt-bindings/net/microchip-lan78xx.h + create mode 100644 include/linux/bpfilter.h + create mode 100644 include/linux/btf.h + create mode 100644 include/linux/fsl/ptp_qoriq.h + create mode 100644 include/linux/mdio-gpio.h + create mode 100644 include/linux/netfilter/nf_osf.h + delete mode 100644 include/linux/platform_data/mdio-gpio.h + create mode 100644 include/linux/platform_data/mv88e6xxx.h + create mode 100644 include/net/failover.h + create mode 100644 include/net/net_failover.h + create mode 100644 include/net/netfilter/nf_tproxy.h + delete mode 100644 include/net/netfilter/nft_meta.h + create mode 100644 include/net/page_pool.h + create mode 100644 include/net/seg6_local.h + create mode 100644 include/net/xdp_sock.h + delete mode 100644 include/trace/events/bpf.h + create mode 100644 include/uapi/linux/bpfilter.h + create mode 100644 include/uapi/linux/btf.h + create mode 100644 include/uapi/linux/if_xdp.h + create mode 100644 include/uapi/linux/netfilter/nf_osf.h + create mode 100644 include/uapi/linux/vmcore.h + create mode 100644 kernel/bpf/btf.c + create mode 100644 kernel/bpf/xskmap.c + create mode 100644 net/bpfilter/Kconfig + create mode 100644 net/bpfilter/Makefile + create mode 100644 net/bpfilter/bpfilter_kern.c + create mode 100644 net/bpfilter/main.c + create mode 100644 net/bpfilter/msgfmt.h + delete mode 100644 net/bridge/netfilter/nft_meta_bridge.c + create mode 100644 net/core/failover.c + create mode 100644 net/core/page_pool.c + create mode 100644 net/ipv4/bpfilter/Makefile + create mode 100644 net/ipv4/bpfilter/sockopt.c + create mode 100644 net/ipv4/metrics.c + create mode 100644 net/ipv4/netfilter/nf_tproxy_ipv4.c + create mode 100644 net/ipv4/netlink.c + create mode 100644 net/ipv6/netfilter/nf_tproxy_ipv6.c + create mode 100644 net/netfilter/ipvs/ip_vs_mh.c + rename net/netfilter/{nf_flow_table.c => nf_flow_table_core.c} (67%) + create mode 100644 net/netfilter/nf_flow_table_ip.c + create mode 100644 net/netfilter/nf_osf.c + create mode 100644 net/netfilter/nft_connlimit.c + create mode 100644 net/netfilter/nft_socket.c + create mode 100644 net/qrtr/tun.c + create mode 100644 net/tls/tls_device.c + create mode 100644 net/tls/tls_device_fallback.c + create mode 100644 net/xdp/Kconfig + create mode 100644 net/xdp/Makefile + create mode 100644 net/xdp/xdp_umem.c + create mode 100644 net/xdp/xdp_umem.h + create mode 100644 net/xdp/xdp_umem_props.h + create mode 100644 net/xdp/xsk.c + create mode 100644 net/xdp/xsk_queue.c + create mode 100644 net/xdp/xsk_queue.h + rename samples/bpf/{libbpf.h => bpf_insn.h} (98%) + create mode 100644 samples/bpf/task_fd_query_kern.c + create mode 100644 samples/bpf/task_fd_query_user.c + delete mode 100755 samples/bpf/test_tunnel_bpf.sh + create mode 100644 samples/bpf/xdp_adjust_tail_kern.c + create mode 100644 samples/bpf/xdp_adjust_tail_user.c + create mode 100644 samples/bpf/xdp_fwd_kern.c + create mode 100644 samples/bpf/xdp_fwd_user.c + create mode 100644 samples/bpf/xdpsock.h + create mode 100644 samples/bpf/xdpsock_kern.c + create mode 100644 samples/bpf/xdpsock_user.c + delete mode 100644 samples/sockmap/Makefile + delete mode 100755 samples/sockmap/sockmap_test.sh + create mode 100755 scripts/bpf_helpers_doc.py + create mode 100644 tools/bpf/bpftool/.gitignore + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-perf.rst + create mode 100644 tools/bpf/bpftool/map_perf_ring.c + create mode 100644 tools/bpf/bpftool/perf.c + create mode 100644 tools/include/uapi/asm/bitsperlong.h + create mode 100644 tools/include/uapi/asm/errno.h + create mode 100644 tools/include/uapi/linux/btf.h + create mode 100644 tools/include/uapi/linux/erspan.h + create mode 100644 tools/lib/bpf/btf.c + create mode 100644 tools/lib/bpf/btf.h + create mode 100644 tools/testing/selftests/bpf/bpf_rand.h + create mode 100644 tools/testing/selftests/bpf/test_adjust_tail.c + create mode 100644 tools/testing/selftests/bpf/test_btf.c + create mode 100644 tools/testing/selftests/bpf/test_btf_haskv.c + create mode 100644 tools/testing/selftests/bpf/test_btf_nokv.c + create mode 100644 tools/testing/selftests/bpf/test_get_stack_rawtp.c + create mode 100644 tools/testing/selftests/bpf/test_lwt_seg6local.c + create mode 100755 tools/testing/selftests/bpf/test_lwt_seg6local.sh + create mode 100644 tools/testing/selftests/bpf/test_sockhash_kern.c + rename samples/sockmap/sockmap_user.c => tools/testing/selftests/bpf/test_sockmap.c (56%) + create mode 100644 tools/testing/selftests/bpf/test_sockmap_kern.c + rename samples/sockmap/sockmap_kern.c => tools/testing/selftests/bpf/test_sockmap_kern.h (88%) + create mode 100755 tools/testing/selftests/bpf/test_tunnel.sh + rename samples/bpf/tcbpf2_kern.c => tools/testing/selftests/bpf/test_tunnel_kern.c (68%) + create mode 100644 tools/testing/selftests/bpf/trace_helpers.c + create mode 100644 tools/testing/selftests/bpf/trace_helpers.h + create mode 100755 tools/testing/selftests/net/fib_rule_tests.sh + mode change 100755 => 100644 tools/testing/selftests/net/fib_tests.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bound.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_bridge_1d_vlan.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_changes.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_flower.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_gre_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_neigh.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_nh.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_gre_topo_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_vlan.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_gre_vlan_bridge_1q.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_lib.sh + create mode 100644 tools/testing/selftests/net/forwarding/mirror_topo_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/mirror_vlan.sh + create mode 100644 tools/testing/selftests/net/psock_snd.c + create mode 100755 tools/testing/selftests/net/psock_snd.sh + create mode 100644 tools/testing/selftests/net/tcp_inq.c + create mode 100644 tools/testing/selftests/net/tcp_mmap.c + create mode 100644 tools/testing/selftests/net/udpgso.c + create mode 100755 tools/testing/selftests/net/udpgso.sh + create mode 100755 tools/testing/selftests/net/udpgso_bench.sh + create mode 100644 tools/testing/selftests/net/udpgso_bench_rx.c + create mode 100644 tools/testing/selftests/net/udpgso_bench_tx.c + create mode 100644 tools/testing/selftests/tc-testing/tc-tests/actions/sample.json + create mode 100644 tools/testing/selftests/uevent/Makefile + create mode 100644 tools/testing/selftests/uevent/config + create mode 100644 tools/testing/selftests/uevent/uevent_filtering.c +$ git am -3 ../patches/0001-xsk-update-for-net-convert-datagram_poll-users-tp-po.patch +Applying: xsk: update for "net: convert datagram_poll users tp ->poll_mask" +$ git reset HEAD^ +Unstaged changes after reset: +M net/xdp/xsk.c +$ git add -A . +$ git commit -v -a --amend +[master b87460a9bd93] Merge remote-tracking branch 'net-next/master' + Date: Tue Jun 5 11:48:16 2018 +1000 +$ git am -3 ../patches/0001-net-bpfilter-mark-as-BROKEN-for-now.patch +Applying: net: bpfilter: mark as BROKEN for now +$ git reset HEAD^ +Unstaged changes after reset: +M net/bpfilter/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master dc41be187ba6] Merge remote-tracking branch 'net-next/master' + Date: Tue Jun 5 11:48:16 2018 +1000 +Merging bpf-next/master (34ea38ca2799 bpf: guard bpf_get_current_cgroup_id() with CONFIG_CGROUPS) +$ git merge bpf-next/master +Auto-merging tools/include/uapi/linux/bpf.h +Auto-merging net/xdp/xsk.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv4/udp.c +Auto-merging include/uapi/linux/bpf.h +Auto-merging include/linux/netdevice.h +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.c +Auto-merging drivers/media/rc/rc-ir-raw.c +Auto-merging drivers/media/rc/rc-core-priv.h +Auto-merging drivers/media/rc/lirc_dev.c +Auto-merging drivers/media/rc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/networking/af_xdp.rst | 101 +- + MAINTAINERS | 2 + + drivers/media/rc/Kconfig | 13 + + drivers/media/rc/Makefile | 1 + + drivers/media/rc/bpf-lirc.c | 313 ++++++ + drivers/media/rc/lirc_dev.c | 30 + + drivers/media/rc/rc-core-priv.h | 21 + + drivers/media/rc/rc-ir-raw.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 23 +- + drivers/net/tun.c | 25 +- + drivers/net/virtio_net.c | 9 +- + include/linux/bpf-cgroup.h | 24 +- + include/linux/bpf.h | 1 + + include/linux/bpf_lirc.h | 29 + + include/linux/bpf_types.h | 3 + + include/linux/filter.h | 44 +- + include/linux/netdevice.h | 7 +- + include/net/xdp.h | 4 + + include/uapi/linux/bpf.h | 136 ++- + include/uapi/linux/if_xdp.h | 12 +- + kernel/bpf/btf.c | 28 +- + kernel/bpf/cgroup.c | 11 +- + kernel/bpf/core.c | 12 +- + kernel/bpf/devmap.c | 21 +- + kernel/bpf/hashtab.c | 12 +- + kernel/bpf/helpers.c | 15 + + kernel/bpf/stackmap.c | 7 +- + kernel/bpf/syscall.c | 27 +- + kernel/bpf/verifier.c | 73 +- + kernel/trace/bpf_trace.c | 16 +- + lib/test_bpf.c | 63 ++ + net/core/filter.c | 91 +- + net/ipv4/udp.c | 20 +- + net/ipv6/udp.c | 24 + + net/xdp/xdp_umem.c | 33 +- + net/xdp/xdp_umem.h | 27 +- + net/xdp/xdp_umem_props.h | 4 +- + net/xdp/xsk.c | 41 +- + net/xdp/xsk_queue.c | 2 +- + net/xdp/xsk_queue.h | 63 +- + samples/bpf/xdp_fwd_kern.c | 2 +- + samples/bpf/xdpsock_user.c | 92 +- + tools/bpf/bpf_exp.l | 2 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 9 +- + tools/bpf/bpftool/bash-completion/bpftool | 5 +- + tools/bpf/bpftool/cgroup.c | 4 +- + tools/bpf/bpftool/prog.c | 1 + + tools/include/linux/filter.h | 10 + + tools/include/uapi/linux/bpf.h | 134 ++- + tools/include/uapi/linux/lirc.h | 217 ++++ + tools/include/uapi/linux/seg6.h | 55 + + tools/include/uapi/linux/seg6_local.h | 80 ++ + tools/lib/bpf/Makefile | 1 + + tools/lib/bpf/libbpf.c | 3 + + tools/testing/selftests/bpf/.gitignore | 2 + + tools/testing/selftests/bpf/Makefile | 9 +- + tools/testing/selftests/bpf/bpf_helpers.h | 7 + + tools/testing/selftests/bpf/cgroup_helpers.c | 57 + + tools/testing/selftests/bpf/cgroup_helpers.h | 1 + + tools/testing/selftests/bpf/get_cgroup_id_kern.c | 28 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 141 +++ + tools/testing/selftests/bpf/sendmsg4_prog.c | 49 + + tools/testing/selftests/bpf/sendmsg6_prog.c | 60 + + tools/testing/selftests/bpf/test_btf.c | 45 + + tools/testing/selftests/bpf/test_lirc_mode2.sh | 28 + + tools/testing/selftests/bpf/test_lirc_mode2_kern.c | 23 + + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 149 +++ + tools/testing/selftests/bpf/test_sock_addr.c | 1155 ++++++++++++++++---- + tools/testing/selftests/bpf/test_sockmap.c | 87 +- + tools/testing/selftests/bpf/test_verifier.c | 185 +++- + 72 files changed, 3463 insertions(+), 595 deletions(-) + create mode 100644 drivers/media/rc/bpf-lirc.c + create mode 100644 include/linux/bpf_lirc.h + create mode 100644 tools/include/uapi/linux/lirc.h + create mode 100644 tools/include/uapi/linux/seg6.h + create mode 100644 tools/include/uapi/linux/seg6_local.h + create mode 100644 tools/testing/selftests/bpf/get_cgroup_id_kern.c + create mode 100644 tools/testing/selftests/bpf/get_cgroup_id_user.c + create mode 100644 tools/testing/selftests/bpf/sendmsg4_prog.c + create mode 100644 tools/testing/selftests/bpf/sendmsg6_prog.c + create mode 100755 tools/testing/selftests/bpf/test_lirc_mode2.sh + create mode 100644 tools/testing/selftests/bpf/test_lirc_mode2_kern.c + create mode 100644 tools/testing/selftests/bpf/test_lirc_mode2_user.c +Merging ipsec-next/master (f03329627b46 Merge branch 'hns3-next') +$ git merge ipsec-next/master +Already up to date. +Merging netfilter-next/master (f624434a0ec9 Merge tag 'wireless-drivers-next-for-davem-2018-05-31' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (c99f996b2ba4 NFC: st95hf: drop illegal kfree_skb()) +$ git merge nfc-next/master +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 4 ++-- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 6 ++++-- + 4 files changed, 11 insertions(+), 11 deletions(-) +Merging ipvs-next/master (e523452ac0e0 netfilter: nf_tables: remove unused variables) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (76606886c9f4 Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (1cd2fabf4bdc Bluetooth: btusb: Add additional device ID for RTL8822BE) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (f03329627b46 Merge branch 'hns3-next') +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (6d1c2cf22475 MAINTAINERS: Add Andreas Gruenbacher as a maintainer for gfs2) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (c64d4419a17c mtd: cfi_cmdset_0002: Change erase one block to enable XIP once) +$ git merge mtd/mtd/next +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/mtd/chips/cfi_cmdset_0002.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-mtd | 8 +++ + .../devicetree/bindings/mtd/partition.txt | 2 +- + .../partitions/brcm,bcm947xx-cfe-partitions.txt | 42 +++++++++++++++ + drivers/mtd/bcm47xxpart.c | 29 ++++++++-- + drivers/mtd/chips/cfi_cmdset_0002.c | 62 +++++++++++++--------- + drivers/mtd/chips/cfi_probe.c | 42 +++++++++++++++ + drivers/mtd/cmdlinepart.c | 5 +- + drivers/mtd/devices/docg3.c | 3 +- + drivers/mtd/devices/mtd_dataflash.c | 2 +- + drivers/mtd/inftlmount.c | 23 +++++--- + drivers/mtd/maps/pismo.c | 1 - + drivers/mtd/mtdcore.c | 24 +++++---- + drivers/mtd/mtdcore.h | 1 - + drivers/mtd/mtdpart.c | 44 ++++++--------- + drivers/mtd/nand/raw/Kconfig | 8 +-- + drivers/mtd/nftlmount.c | 23 +++++--- + drivers/mtd/spi-nor/Kconfig | 2 +- + 17 files changed, 225 insertions(+), 96 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm947xx-cfe-partitions.txt +Merging nand/nand/next (f567c71f4f91 mtd: nand: Pass mode information to nand_page_io_req) +$ git merge nand/nand/next +Auto-merging include/linux/mtd/rawnand.h +Auto-merging drivers/mtd/nand/raw/nand_base.c +Auto-merging drivers/mtd/nand/raw/davinci_nand.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/gpmi-nand.txt | 5 + + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 24 ++- + .../devicetree/bindings/mtd/sunxi-nand.txt | 2 - + MAINTAINERS | 8 + + drivers/mtd/nand/onenand/samsung.c | 6 +- + drivers/mtd/nand/raw/davinci_nand.c | 25 +-- + drivers/mtd/nand/raw/diskonchip.c | 4 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 13 +- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 29 ++-- + drivers/mtd/nand/raw/fsmc_nand.c | 27 +-- + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 54 +++--- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 188 +++++++-------------- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 25 +-- + drivers/mtd/nand/raw/hisi504_nand.c | 35 ++-- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 38 +++-- + drivers/mtd/nand/raw/lpc32xx_slc.c | 26 +-- + drivers/mtd/nand/raw/mtk_ecc.c | 7 +- + drivers/mtd/nand/raw/mtk_nand.c | 10 +- + drivers/mtd/nand/raw/nand_base.c | 89 +++++++--- + drivers/mtd/nand/raw/sunxi_nand.c | 91 ++-------- + include/linux/mtd/nand.h | 3 + + include/linux/mtd/rawnand.h | 35 +++- + 22 files changed, 328 insertions(+), 416 deletions(-) +Merging spi-nor/spi-nor/next (771ff17e82fa mtd: spi-nor: Add support for EN25QH32) +$ git merge spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/cadence-quadspi.c +Auto-merging drivers/mtd/spi-nor/Kconfig +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/Kconfig | 4 +- + drivers/mtd/spi-nor/cadence-quadspi.c | 96 ++++++++++++++++++++++++++++++++++- + drivers/mtd/spi-nor/fsl-quadspi.c | 15 +++++- + drivers/mtd/spi-nor/hisi-sfc.c | 12 ++--- + drivers/mtd/spi-nor/intel-spi.c | 80 +++++++++++++++++++++++++---- + drivers/mtd/spi-nor/spi-nor.c | 33 ++++++++++++ + drivers/mtd/spi-nor/stm32-quadspi.c | 2 +- + include/linux/mtd/spi-nor.h | 2 + + 8 files changed, 220 insertions(+), 24 deletions(-) +Merging crypto/master (b268b3506d99 crypto: chtls - free beyond end rspq_skb_cache) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (568cf2e6aa0c Merge tag 'drm-amdkfd-next-2018-05-28' of git://people.freedesktop.org/~gabbayo/linux into drm-next) +$ git merge drm/drm-next +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/scheduler/gpu_scheduler_trace.h +Auto-merging drivers/gpu/drm/rcar-du/rcar_du_vsp.c +Auto-merging drivers/gpu/drm/rcar-du/rcar_du_crtc.h +Auto-merging drivers/gpu/drm/rcar-du/rcar_du_crtc.c +Auto-merging drivers/gpu/drm/qxl/qxl_display.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/dma/gv100.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygt215.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/coregt215.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp100.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/coregm200.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/coregm107.c +Removing drivers/gpu/drm/nouveau/nvkm/engine/disp/coregk110.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/changv100.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/ce/gv100.c +Auto-merging drivers/gpu/drm/nouveau/nvif/userc361.c +Auto-merging drivers/gpu/drm/nouveau/nvif/disp.c +Removing drivers/gpu/drm/nouveau/nv50_display.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/sorc37d.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/sor907d.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/dac907d.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/curs907a.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/core917d.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/core907d.c +Auto-merging drivers/gpu/drm/i915/selftests/i915_timeline.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_engine_cs.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/i915_timeline.h +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Removing drivers/gpu/drm/i915/i915_gem_timeline.c +Removing drivers/gpu/drm/exynos/exynos_drm_gsc.h +Removing drivers/gpu/drm/exynos/exynos_drm_fimc.h +Auto-merging drivers/gpu/drm/drm_drv.c +Auto-merging drivers/gpu/drm/drm_dp_helper.c +Removing drivers/gpu/drm/amd/display/include/fixed32_32.h +Removing drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/df_v3_6.h +Auto-merging drivers/gpu/drm/amd/amdgpu/df_v1_7.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c +Auto-merging MAINTAINERS +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_engine_cs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 12df286bfea5] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/adi,adv7511.txt | 18 +- + .../bindings/display/bridge/cdns,dsi.txt | 133 + + .../bindings/display/bridge/renesas,dw-hdmi.txt | 1 + + .../devicetree/bindings/display/bridge/tda998x.txt | 3 + + .../bindings/display/bridge/thine,thc63lvd1024.txt | 60 + + .../bindings/display/exynos/exynos5433-decon.txt | 9 +- + .../devicetree/bindings/display/renesas,du.txt | 28 +- + .../bindings/display/sunxi/sun6i-dsi.txt | 93 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 28 + + .../devicetree/bindings/gpu/samsung-scaler.txt | 27 + + Documentation/gpu/drivers.rst | 2 + + Documentation/gpu/i915.rst | 141 +- + Documentation/gpu/kms-properties.csv | 1 - + Documentation/gpu/todo.rst | 18 + + Documentation/gpu/xen-front.rst | 31 + + MAINTAINERS | 21 +- + drivers/dma-buf/sync_debug.h | 10 - + drivers/gpu/drm/Kconfig | 13 +- + drivers/gpu/drm/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 10 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 10 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 1043 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 584 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 44 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 247 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 195 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 121 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 20 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 111 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 120 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 365 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_prime.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 21 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 496 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 22 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 292 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 40 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 273 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 15 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 7 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 10 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 120 + + .../disp/basegk104.c => amd/amdgpu/df_v1_7.h} | 30 +- + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 116 + + .../disp/basegk110.c => amd/amdgpu/df_v3_6.h} | 30 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 102 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 344 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 146 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 67 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 9 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 3 + + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 96 +- + drivers/gpu/drm/amd/amdgpu/si.c | 7 + + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 125 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 15 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 6 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 46 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 40 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 112 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1073 ++--- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 188 +- + drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c | 53 + + drivers/gpu/drm/amd/amdgpu/vi.c | 130 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 10 +- + drivers/gpu/drm/amd/amdkfd/cik_event_interrupt.c | 20 +- + drivers/gpu/drm/amd/amdkfd/cik_regs.h | 3 +- + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 560 +++ + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 274 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 1214 ++++++ + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 52 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 11 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 131 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 114 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 84 + + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 65 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 119 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 92 + + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 39 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.h | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_cik.c | 9 + + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c | 340 ++ + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_vi.c | 319 ++ + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 7 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 443 ++ + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 392 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 583 +++ + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 112 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 50 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 22 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 1 + + drivers/gpu/drm/amd/amdkfd/soc15_int.h | 47 + + drivers/gpu/drm/amd/display/Kconfig | 8 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 226 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 15 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 5 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 13 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 28 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 376 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c | 161 - + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 1 - + drivers/gpu/drm/amd/display/dc/basics/logger.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 3 + + .../gpu/drm/amd/display/dc/bios/command_table.c | 22 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 26 +- + .../drm/amd/display/dc/bios/command_table_helper.c | 1 + + .../amd/display/dc/bios/command_table_helper2.c | 1 + + .../gpu/drm/amd/display/dc/calcs/calcs_logger.h | 579 +++ + .../gpu/drm/amd/display/dc/calcs/custom_float.c | 46 +- + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 256 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 82 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 112 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 38 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 170 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 30 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 2 - + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 345 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc.h | 46 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_helper.c | 59 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 5 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 9 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 28 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 17 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 9 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 73 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 33 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 6 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 103 +- + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 17 + + .../gpu/drm/amd/display/dc/dce/dce_scl_filters.c | 48 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 76 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 26 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 33 - + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 200 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 1 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 33 - + .../display/dc/dce110/dce110_timing_generator.c | 16 +- + .../display/dc/dce110/dce110_timing_generator_v.c | 7 - + .../drm/amd/display/dc/dce110/dce110_transform_v.c | 8 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 35 +- + .../drm/amd/display/dc/dce112/dce112_resource.h | 5 - + .../drm/amd/display/dc/dce120/dce120_resource.c | 50 +- + .../display/dc/dce120/dce120_timing_generator.c | 12 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 49 - + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 98 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 43 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 76 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 96 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 38 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 229 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 14 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 215 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 82 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 435 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 2 + + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1362 ++++++ + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 330 ++ + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 24 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 104 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 26 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 349 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 1490 +++++++ + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 524 +++ + drivers/gpu/drm/amd/display/dc/dm_services.h | 8 +- + .../drm/amd/display/dc/dml/display_mode_enums.h | 13 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 138 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 969 +++-- + .../gpu/drm/amd/display/dc/dml/dml_inline_defs.h | 10 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + .../dc/i2caux/dce110/i2c_hw_engine_dce110.c | 2 +- + drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/dce_calcs.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 64 + + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 2 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 17 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 36 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 22 +- + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 56 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 4 - + drivers/gpu/drm/amd/display/dc/irq_types.h | 9 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 11 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 272 +- + drivers/gpu/drm/amd/display/include/fixed32_32.h | 129 - + .../gpu/drm/amd/display/include/logger_interface.h | 9 + + drivers/gpu/drm/amd/display/include/logger_types.h | 66 +- + .../drm/amd/display/modules/color/color_gamma.c | 692 ++- + .../drm/amd/display/modules/color/color_gamma.h | 48 +- + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 4 + + drivers/gpu/drm/amd/display/modules/stats/stats.c | 254 +- + drivers/gpu/drm/amd/include/amd_shared.h | 23 +- + .../drm/amd/include/asic_reg/dce/dce_12_0_offset.h | 12 + + .../amd/include/asic_reg/dce/dce_12_0_sh_mask.h | 152 + + .../drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h | 19 +- + .../drm/amd/include/asic_reg/dcn/dcn_1_0_sh_mask.h | 8 + + .../drm/amd/include/asic_reg/df/df_1_7_default.h | 26 + + .../drm/amd/include/asic_reg/df/df_1_7_offset.h | 37 + + .../drm/amd/include/asic_reg/df/df_1_7_sh_mask.h | 52 + + .../drm/amd/include/asic_reg/df/df_3_6_default.h | 26 + + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 33 + + .../drm/amd/include/asic_reg/df/df_3_6_sh_mask.h | 48 + + drivers/gpu/drm/amd/include/atombios.h | 7 + + drivers/gpu/drm/amd/include/atomfirmware.h | 35 + + drivers/gpu/drm/amd/include/cgs_common.h | 170 - + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 26 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 13 +- + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 1 + + drivers/gpu/drm/amd/include/v9_structs.h | 48 +- + drivers/gpu/drm/amd/include/vega20_ip_offset.h | 1051 +++++ + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 489 +-- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 41 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 91 +- + drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 11 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.c | 222 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomctrl.h | 15 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 99 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 2 + + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 39 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 4 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 208 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.h | 3 +- + .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 16 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 330 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.h | 2 + + .../gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 229 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 37 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 98 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.h | 27 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 951 ++-- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 26 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 121 +- + .../amd/powerplay/hwmgr/vega10_processpptables.c | 2 +- + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 107 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 95 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 2 +- + .../amd/powerplay/hwmgr/vega12_processpptables.c | 7 +- + .../gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c | 37 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 9 +- + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 35 +- + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 4 +- + drivers/gpu/drm/amd/powerplay/inc/smu75.h | 760 ++++ + drivers/gpu/drm/amd/powerplay/inc/smu75_discrete.h | 886 ++++ + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 12 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 24 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 9 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 25 +- + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 39 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 46 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 1 - + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 19 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 52 +- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 56 +- + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2383 ++++++++++ + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.h | 75 + + drivers/gpu/drm/ast/ast_mode.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 13 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 89 +- + drivers/gpu/drm/bochs/bochs_kms.c | 2 +- + drivers/gpu/drm/bridge/Kconfig | 16 + + drivers/gpu/drm/bridge/Makefile | 2 + + drivers/gpu/drm/bridge/adv7511/Kconfig | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 6 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 46 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 331 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 5 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 236 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 7 + + drivers/gpu/drm/bridge/cdns-dsi.c | 1623 +++++++ + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 1 - + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 18 +- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 206 + + drivers/gpu/drm/drm_atomic.c | 26 +- + drivers/gpu/drm/drm_atomic_helper.c | 109 +- + drivers/gpu/drm/drm_blend.c | 39 + + drivers/gpu/drm/drm_connector.c | 50 +- + drivers/gpu/drm/drm_crtc.c | 54 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_dp_helper.c | 22 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 9 +- + drivers/gpu/drm/drm_drv.c | 64 +- + drivers/gpu/drm/drm_edid.c | 43 +- + drivers/gpu/drm/drm_fb_helper.c | 12 +- + drivers/gpu/drm/drm_framebuffer.c | 33 +- + drivers/gpu/drm/drm_gem.c | 9 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 19 + + drivers/gpu/drm/drm_ioc32.c | 4 +- + drivers/gpu/drm/drm_ioctl.c | 85 +- + drivers/gpu/drm/drm_lease.c | 2 +- + drivers/gpu/drm/drm_modes.c | 179 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 29 +- + drivers/gpu/drm/drm_plane.c | 54 +- + drivers/gpu/drm/drm_prime.c | 21 +- + drivers/gpu/drm/drm_property.c | 27 +- + drivers/gpu/drm/drm_rect.c | 74 +- + drivers/gpu/drm/drm_scdc_helper.c | 10 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- + drivers/gpu/drm/drm_sysfs.c | 4 +- + drivers/gpu/drm/etnaviv/Kconfig | 8 - + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 68 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 45 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.h | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 19 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 19 +- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 49 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.h | 15 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 143 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 31 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.h | 16 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.h | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 13 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 13 +- + drivers/gpu/drm/exynos/Kconfig | 18 +- + drivers/gpu/drm/exynos/Makefile | 2 + + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 21 +- + drivers/gpu/drm/exynos/exynos_dp.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 55 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 11 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 46 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1080 ++--- + drivers/gpu/drm/exynos/exynos_drm_fimc.h | 23 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 8 + + drivers/gpu/drm/exynos/exynos_drm_gem.c | 21 +- + drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1075 ++--- + drivers/gpu/drm/exynos/exynos_drm_gsc.h | 24 - + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 916 ++++ + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 175 + + drivers/gpu/drm/exynos/exynos_drm_plane.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 758 +--- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 694 +++ + drivers/gpu/drm/exynos/regs-scaler.h | 426 ++ + drivers/gpu/drm/gma500/cdv_device.c | 4 +- + drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/mdfld_dsi_output.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 2 +- + drivers/gpu/drm/i2c/Kconfig | 6 + + drivers/gpu/drm/i2c/Makefile | 1 + + drivers/gpu/drm/i2c/tda9950.c | 509 +++ + drivers/gpu/drm/i2c/tda998x_drv.c | 244 +- + drivers/gpu/drm/i915/Kconfig.debug | 15 +- + drivers/gpu/drm/i915/Makefile | 20 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 81 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 72 +- + drivers/gpu/drm/i915/gvt/gvt.h | 2 +- + drivers/gpu/drm/i915/gvt/handlers.c | 35 +- + drivers/gpu/drm/i915/gvt/mmio.c | 2 - + drivers/gpu/drm/i915/gvt/mmio_context.c | 2 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 31 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 89 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 + + drivers/gpu/drm/i915/gvt/trace.h | 24 +- + drivers/gpu/drm/i915/i915_debugfs.c | 566 +-- + drivers/gpu/drm/i915/i915_drv.c | 89 +- + drivers/gpu/drm/i915/i915_drv.h | 424 +- + drivers/gpu/drm/i915/i915_gem.c | 394 +- + drivers/gpu/drm/i915/i915_gem.h | 13 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 30 +- + drivers/gpu/drm/i915/i915_gem_batch_pool.h | 29 +- + drivers/gpu/drm/i915/i915_gem_context.c | 62 +- + drivers/gpu/drm/i915/i915_gem_context.h | 43 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 32 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 70 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 5 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 178 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 154 - + drivers/gpu/drm/i915/i915_gpu_error.c | 66 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 366 ++ + drivers/gpu/drm/i915/i915_irq.c | 410 +- + drivers/gpu/drm/i915/i915_oa_icl.c | 118 + + drivers/gpu/drm/i915/i915_oa_icl.h | 34 + + drivers/gpu/drm/i915/i915_params.c | 3 + + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_perf.c | 96 +- + drivers/gpu/drm/i915/i915_pmu.c | 27 +- + drivers/gpu/drm/i915/i915_pmu.h | 30 +- + drivers/gpu/drm/i915/i915_reg.h | 879 ++-- + drivers/gpu/drm/i915/i915_request.c | 438 +- + drivers/gpu/drm/i915/i915_request.h | 49 +- + drivers/gpu/drm/i915/i915_scheduler.h | 72 + + drivers/gpu/drm/i915/i915_timeline.c | 105 + + .../i915/{i915_gem_timeline.h => i915_timeline.h} | 71 +- + drivers/gpu/drm/i915/i915_trace.h | 129 +- + drivers/gpu/drm/i915/i915_utils.h | 10 +- + drivers/gpu/drm/i915/i915_vma.c | 73 +- + drivers/gpu/drm/i915/i915_vma.h | 6 + + drivers/gpu/drm/i915/intel_atomic.c | 19 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 7 +- + drivers/gpu/drm/i915/intel_bios.c | 18 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 52 +- + drivers/gpu/drm/i915/intel_crt.c | 8 +- + drivers/gpu/drm/i915/intel_csr.c | 9 +- + drivers/gpu/drm/i915/intel_ddi.c | 451 +- + drivers/gpu/drm/i915/intel_device_info.c | 169 +- + drivers/gpu/drm/i915/intel_device_info.h | 4 +- + drivers/gpu/drm/i915/intel_display.c | 472 +- + drivers/gpu/drm/i915/intel_display.h | 4 + + drivers/gpu/drm/i915/intel_dp.c | 298 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 5 + + drivers/gpu/drm/i915/intel_dp_mst.c | 8 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 11 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 909 +++- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 97 +- + drivers/gpu/drm/i915/intel_drv.h | 84 +- + drivers/gpu/drm/i915/intel_dsi_vbt.c | 34 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 937 +--- + drivers/gpu/drm/i915/intel_fbc.c | 28 + + drivers/gpu/drm/i915/intel_fbdev.c | 7 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 2 +- + drivers/gpu/drm/i915/intel_gpu_commands.h | 274 ++ + drivers/gpu/drm/i915/intel_guc.c | 231 +- + drivers/gpu/drm/i915/intel_guc.h | 82 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 9 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 545 ++- + drivers/gpu/drm/i915/intel_guc_ct.h | 18 +- + drivers/gpu/drm/i915/intel_guc_fw.c | 7 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 162 +- + drivers/gpu/drm/i915/intel_guc_log.c | 544 +-- + drivers/gpu/drm/i915/intel_guc_log.h | 59 +- + drivers/gpu/drm/i915/intel_guc_reg.h | 14 +- + drivers/gpu/drm/i915/intel_guc_submission.c | 114 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 16 +- + drivers/gpu/drm/i915/intel_hdcp.c | 185 +- + drivers/gpu/drm/i915/intel_hdmi.c | 40 +- + drivers/gpu/drm/i915/intel_hotplug.c | 3 + + drivers/gpu/drm/i915/intel_huc.c | 30 +- + drivers/gpu/drm/i915/intel_huc.h | 7 + + drivers/gpu/drm/i915/intel_huc_fw.c | 8 +- + drivers/gpu/drm/i915/intel_lrc.c | 538 ++- + drivers/gpu/drm/i915/intel_lrc.h | 2 +- + drivers/gpu/drm/i915/intel_mocs.c | 5 +- + drivers/gpu/drm/i915/intel_overlay.c | 1 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 75 +- + drivers/gpu/drm/i915/intel_pm.c | 578 ++- + drivers/gpu/drm/i915/intel_psr.c | 444 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 78 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 71 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 101 +- + drivers/gpu/drm/i915/intel_sdvo.c | 5 +- + drivers/gpu/drm/i915/intel_sprite.c | 178 +- + drivers/gpu/drm/i915/intel_uc.c | 132 +- + drivers/gpu/drm/i915/intel_uc.h | 5 +- + drivers/gpu/drm/i915/intel_uc_fw.c | 13 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 24 +- + drivers/gpu/drm/i915/intel_uncore.c | 175 +- + drivers/gpu/drm/i915/intel_uncore.h | 1 + + drivers/gpu/drm/i915/intel_wopcm.c | 275 ++ + drivers/gpu/drm/i915/intel_wopcm.h | 31 + + drivers/gpu/drm/i915/intel_workarounds.c | 949 ++++ + drivers/gpu/drm/i915/intel_workarounds.h | 17 + + drivers/gpu/drm/i915/selftests/huge_pages.c | 5 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 3 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 2 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 1 + + .../{i915_gem_timeline.c => i915_timeline.c} | 94 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 70 + + drivers/gpu/drm/i915/selftests/igt_flush_test.h | 14 + + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/selftests/intel_engine_cs.c | 58 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 414 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 459 ++ + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 291 ++ + drivers/gpu/drm/i915/selftests/mock_engine.c | 67 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 21 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 1 - + drivers/gpu/drm/i915/selftests/mock_timeline.c | 45 +- + drivers/gpu/drm/i915/selftests/mock_timeline.h | 28 +- + drivers/gpu/drm/mediatek/Kconfig | 1 + + drivers/gpu/drm/mediatek/mtk_dpi.c | 60 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 14 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 1 - + drivers/gpu/drm/msm/msm_debugfs.c | 3 - + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 11 +- + drivers/gpu/drm/nouveau/Kbuild | 8 +- + drivers/gpu/drm/nouveau/dispnv50/Kbuild | 51 + + drivers/gpu/drm/nouveau/dispnv50/atom.h | 222 + + drivers/gpu/drm/nouveau/dispnv50/base.c | 53 + + drivers/gpu/drm/nouveau/dispnv50/base.h | 31 + + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 286 ++ + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 71 + + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 110 + + drivers/gpu/drm/nouveau/dispnv50/base917c.c | 48 + + drivers/gpu/drm/nouveau/dispnv50/core.c | 70 + + drivers/gpu/drm/nouveau/dispnv50/core.h | 50 + + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 115 + + drivers/gpu/drm/nouveau/dispnv50/core827d.c | 41 + + .../disp/basegt215.c => dispnv50/core907d.c} | 34 +- + .../disp/basegt200.c => dispnv50/core917d.c} | 34 +- + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 110 + + drivers/gpu/drm/nouveau/dispnv50/curs.c | 52 + + drivers/gpu/drm/nouveau/dispnv50/curs.h | 14 + + drivers/gpu/drm/nouveau/dispnv50/curs507a.c | 145 + + .../fifo/gpfifogk110.c => dispnv50/curs907a.c} | 22 +- + drivers/gpu/drm/nouveau/dispnv50/cursc37a.c | 50 + + drivers/gpu/drm/nouveau/dispnv50/dac507d.c | 44 + + .../engine/disp/cursgt215.c => dispnv50/dac907d.c} | 30 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2238 ++++++++++ + drivers/gpu/drm/nouveau/dispnv50/disp.h | 89 + + drivers/gpu/drm/nouveau/dispnv50/head.c | 511 +++ + drivers/gpu/drm/nouveau/dispnv50/head.h | 78 + + drivers/gpu/drm/nouveau/dispnv50/head507d.c | 325 ++ + drivers/gpu/drm/nouveau/dispnv50/head827d.c | 124 + + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 284 ++ + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 100 + + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 212 + + drivers/gpu/drm/nouveau/dispnv50/lut.c | 95 + + drivers/gpu/drm/nouveau/dispnv50/lut.h | 15 + + drivers/gpu/drm/nouveau/dispnv50/oimm.c | 51 + + drivers/gpu/drm/nouveau/dispnv50/oimm.h | 8 + + drivers/gpu/drm/nouveau/dispnv50/oimm507b.c | 52 + + drivers/gpu/drm/nouveau/dispnv50/ovly.c | 57 + + drivers/gpu/drm/nouveau/dispnv50/ovly.h | 30 + + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 217 + + drivers/gpu/drm/nouveau/dispnv50/ovly827e.c | 107 + + drivers/gpu/drm/nouveau/dispnv50/ovly907e.c | 70 + + drivers/gpu/drm/nouveau/dispnv50/ovly917e.c | 45 + + drivers/gpu/drm/nouveau/dispnv50/pior507d.c | 44 + + drivers/gpu/drm/nouveau/dispnv50/sor507d.c | 44 + + .../engine/disp/coregt200.c => dispnv50/sor907d.c} | 31 +- + .../engine/disp/cursgk104.c => dispnv50/sorc37d.c} | 30 +- + drivers/gpu/drm/nouveau/dispnv50/wimm.c | 47 + + drivers/gpu/drm/nouveau/dispnv50/wimm.h | 8 + + drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 86 + + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 641 +++ + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 96 + + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 278 ++ + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 47 + + drivers/gpu/drm/nouveau/include/nvif/cla06f.h | 18 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 14 + + drivers/gpu/drm/nouveau/include/nvif/clc37b.h | 11 + + drivers/gpu/drm/nouveau/include/nvif/clc37e.h | 13 + + drivers/gpu/drm/nouveau/include/nvif/device.h | 9 +- + drivers/gpu/drm/nouveau/include/nvif/disp.h | 12 + + drivers/gpu/drm/nouveau/include/nvif/fifo.h | 18 + + drivers/gpu/drm/nouveau/include/nvif/mem.h | 2 + + drivers/gpu/drm/nouveau/include/nvif/mmu.h | 1 + + drivers/gpu/drm/nouveau/include/nvif/object.h | 16 + + drivers/gpu/drm/nouveau/include/nvif/user.h | 19 + + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 13 +- + drivers/gpu/drm/nouveau/include/nvkm/core/engine.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/core/subdev.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/engine/ce.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/dma.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h | 3 + + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 2 + + .../gpu/drm/nouveau/include/nvkm/subdev/bios/dp.h | 4 + + .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/fault.h | 33 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 1 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/ltc.h | 3 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/mmu.h | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 36 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 + + drivers/gpu/drm/nouveau/nouveau_chan.c | 39 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 1 + + drivers/gpu/drm/nouveau/nouveau_connector.c | 16 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 39 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 15 +- + drivers/gpu/drm/nouveau/nouveau_dma.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 90 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 6 + + drivers/gpu/drm/nouveau/nouveau_encoder.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 2 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 50 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 16 +- + drivers/gpu/drm/nouveau/nouveau_vmm.c | 1 + + drivers/gpu/drm/nouveau/nouveau_vmm.h | 2 + + drivers/gpu/drm/nouveau/nv04_fence.c | 2 - + drivers/gpu/drm/nouveau/nv10_fence.c | 2 - + drivers/gpu/drm/nouveau/nv17_fence.c | 2 - + drivers/gpu/drm/nouveau/nv50_display.c | 4558 -------------------- + drivers/gpu/drm/nouveau/nv50_display.h | 1 - + drivers/gpu/drm/nouveau/nv50_fence.c | 2 - + drivers/gpu/drm/nouveau/nv84_fence.c | 11 +- + drivers/gpu/drm/nouveau/nvif/Kbuild | 6 + + drivers/gpu/drm/nouveau/nvif/device.c | 5 + + .../inc/pp_soc15.h => nouveau/nvif/disp.c} | 62 +- + drivers/gpu/drm/nouveau/nvif/fifo.c | 99 + + drivers/gpu/drm/nouveau/nvif/mem.c | 13 + + drivers/gpu/drm/nouveau/nvif/mmu.c | 11 + + drivers/gpu/drm/nouveau/nvif/user.c | 64 + + .../engine/fifo/gpfifogp100.c => nvif/userc361.c} | 21 +- + drivers/gpu/drm/nouveau/nvif/vmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/core/engine.c | 15 + + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 12 + + drivers/gpu/drm/nouveau/nvkm/engine/ce/Kbuild | 1 + + .../nvkm/engine/{disp/cursg84.c => ce/gv100.c} | 29 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 73 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 74 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild | 30 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 23 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/baseg84.c | 26 +- + .../gpu/drm/nouveau/nvkm/engine/disp/basegf119.c | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/basegp102.c | 22 +- + .../gpu/drm/nouveau/nvkm/engine/disp/basenv50.c | 42 +- + .../gpu/drm/nouveau/nvkm/engine/disp/changf119.c | 13 + + .../{fifo/gpfifogm200.c => disp/changv100.c} | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/channv50.c | 146 +- + .../gpu/drm/nouveau/nvkm/engine/disp/channv50.h | 190 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg84.c | 24 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/coreg94.c | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregf119.c | 47 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregk104.c | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregk110.c | 38 - + .../gpu/drm/nouveau/nvkm/engine/disp/coregm107.c | 38 - + .../gpu/drm/nouveau/nvkm/engine/disp/coregm200.c | 38 - + .../gpu/drm/nouveau/nvkm/engine/disp/coregp100.c | 38 - + .../gpu/drm/nouveau/nvkm/engine/disp/coregp102.c | 34 +- + .../gpu/drm/nouveau/nvkm/engine/disp/coregt215.c | 38 - + .../gpu/drm/nouveau/nvkm/engine/disp/coregv100.c | 204 + + .../gpu/drm/nouveau/nvkm/engine/disp/corenv50.c | 61 +- + .../gpu/drm/nouveau/nvkm/engine/disp/cursgf119.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/cursgp102.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/cursgv100.c | 81 + + .../gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c | 36 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dacgf119.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c | 11 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgf119.c | 40 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgp102.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacgv100.c | 77 + + .../gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.c | 179 +- + .../gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h | 102 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 91 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk110.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp102.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gt200.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 427 ++ + .../gpu/drm/nouveau/nvkm/engine/disp/hdmigv100.c | 85 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/head.h | 8 + + .../gpu/drm/nouveau/nvkm/engine/disp/headgf119.c | 13 +- + .../gpu/drm/nouveau/nvkm/engine/disp/headgv100.c | 105 + + .../gpu/drm/nouveau/nvkm/engine/disp/headnv50.c | 7 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 24 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp77.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 207 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h | 50 +- + .../gpu/drm/nouveau/nvkm/engine/disp/oimmgf119.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c | 37 - + .../gpu/drm/nouveau/nvkm/engine/disp/oimmgp102.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c | 37 - + .../gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c | 36 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlyg84.c | 26 +- + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygf119.c | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygk104.c | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygp102.c | 22 +- + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygt200.c | 24 +- + .../gpu/drm/nouveau/nvkm/engine/disp/ovlygt215.c | 38 - + .../gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c | 42 +- + .../gpu/drm/nouveau/nvkm/engine/disp/piocgf119.c | 13 +- + .../gpu/drm/nouveau/nvkm/engine/disp/piocnv50.c | 6 +- + .../gpu/drm/nouveau/nvkm/engine/disp/piornv50.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/priv.h | 3 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/rootg84.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/rootg94.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c | 101 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgk104.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgk110.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgm107.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgm200.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgp100.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgp102.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgt200.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgt215.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c | 52 + + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c | 175 +- + .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h | 22 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg84.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sorg94.c | 10 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgf119.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgk104.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm107.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgm200.c | 8 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgt215.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c | 120 + + .../gpu/drm/nouveau/nvkm/engine/disp/sormcp77.c | 2 +- + .../gpu/drm/nouveau/nvkm/engine/disp/sormcp89.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c | 19 +- + .../gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c | 82 + + .../gpu/drm/nouveau/nvkm/engine/disp/wndwgv100.c | 184 + + drivers/gpu/drm/nouveau/nvkm/engine/dma/Kbuild | 2 + + .../nvkm/engine/{disp/oimmg84.c => dma/gv100.c} | 27 +- + drivers/gpu/drm/nouveau/nvkm/engine/dma/user.h | 2 + + .../gpu/drm/nouveau/nvkm/engine/dma/usergv100.c | 119 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/Kbuild | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c | 46 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.h | 11 + + .../gpu/drm/nouveau/nvkm/engine/fifo/changk104.h | 20 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.c | 373 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk104.h | 57 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk110.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk208.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gk20a.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm107.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm200.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gm20b.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp100.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gp10b.c | 11 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c | 155 +- + .../gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c | 225 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c | 306 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/priv.h | 7 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/user.h | 6 + + .../gpu/drm/nouveau/nvkm/engine/fifo/usergv100.c | 45 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 4 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.c | 423 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 79 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf104.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf108.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf110.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf117.c | 114 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf119.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk104.c | 190 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110.c | 28 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk110b.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk208.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgk20a.c | 9 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm107.c | 93 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm200.c | 120 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgm20b.c | 22 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c | 100 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c | 42 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c | 48 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp107.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgv100.c | 215 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 417 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 109 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf104.c | 14 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf108.c | 21 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf110.c | 14 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf117.c | 42 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf119.c | 14 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk104.c | 143 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110.c | 31 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk110b.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk208.c | 16 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gk20a.c | 37 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm107.c | 178 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm200.c | 175 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gm20b.c | 5 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 180 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c | 77 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c | 66 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp107.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp10b.c | 27 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c | 120 + + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/dp.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 19 +- + .../gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild | 1 + + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm200.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c | 79 + + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c | 179 + + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c | 69 + + drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c | 206 + + drivers/gpu/drm/nouveau/nvkm/subdev/fault/priv.h | 34 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 2 - + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 46 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/base.c | 10 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp102.c | 51 + + drivers/gpu/drm/nouveau/nvkm/subdev/ltc/priv.h | 5 + + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp100.c | 20 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/gp10b.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mc/priv.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gv100.c | 43 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.h | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgv100.c | 87 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/gp108.c | 21 + + .../nvkm/subdev/secboot/ls_ucode_msgqueue.c | 7 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 3 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 3 + + drivers/gpu/drm/omapdrm/omap_plane.c | 2 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 14 +- + drivers/gpu/drm/pl111/Makefile | 1 + + drivers/gpu/drm/pl111/pl111_display.c | 11 +- + drivers/gpu/drm/pl111/pl111_drm.h | 1 + + drivers/gpu/drm/pl111/pl111_drv.c | 34 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 56 +- + drivers/gpu/drm/pl111/pl111_vexpress.c | 134 + + drivers/gpu/drm/pl111/pl111_vexpress.h | 29 + + drivers/gpu/drm/qxl/qxl_cmd.c | 36 +- + drivers/gpu/drm/qxl/qxl_display.c | 278 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 - + drivers/gpu/drm/qxl/qxl_fb.c | 2 - + drivers/gpu/drm/qxl/qxl_irq.c | 3 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 8 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 32 +- + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 2 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 10 +- + drivers/gpu/drm/radeon/radeon_device.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 53 +- + drivers/gpu/drm/radeon/radeon_drv.c | 5 + + drivers/gpu/drm/radeon/radeon_fb.c | 20 +- + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 20 +- + drivers/gpu/drm/radeon/radeon_mode.h | 8 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 26 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 51 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 5 +- + drivers/gpu/drm/rcar-du/rcar_du_group.c | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_group.h | 2 + + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 41 +- + drivers/gpu/drm/rcar-du/rcar_du_of.c | 1 + + drivers/gpu/drm/rcar-du/rcar_du_of.h | 2 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 15 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 2 - + drivers/gpu/drm/rcar-du/rcar_du_regs.h | 16 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 51 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 3 - + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 37 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 61 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.c | 158 +- + drivers/gpu/drm/rockchip/rockchip_drm_psr.h | 7 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 28 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 1 + + drivers/gpu/drm/scheduler/gpu_scheduler.c | 91 +- + .../gpu/drm/scheduler}/gpu_scheduler_trace.h | 2 +- + drivers/gpu/drm/scheduler/sched_fence.c | 8 +- + drivers/gpu/drm/selftests/Makefile | 2 +- + drivers/gpu/drm/selftests/drm_helper_selftests.h | 9 + + drivers/gpu/drm/selftests/test-drm-helper.c | 247 ++ + drivers/gpu/drm/sti/Kconfig | 3 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 24 +- + drivers/gpu/drm/sti/sti_plane.c | 9 +- + drivers/gpu/drm/stm/drv.c | 2 - + drivers/gpu/drm/stm/ltdc.c | 88 +- + drivers/gpu/drm/stm/ltdc.h | 10 +- + drivers/gpu/drm/sun4i/Kconfig | 10 + + drivers/gpu/drm/sun4i/Makefile | 4 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 16 +- + drivers/gpu/drm/sun4i/sun4i_backend.h | 3 + + drivers/gpu/drm/sun4i/sun4i_layer.c | 2 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 86 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 46 + + drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c | 292 ++ + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 1107 +++++ + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 63 + + drivers/gpu/drm/tegra/dc.c | 300 +- + drivers/gpu/drm/tegra/dc.h | 11 +- + drivers/gpu/drm/tegra/drm.c | 154 +- + drivers/gpu/drm/tegra/drm.h | 13 +- + drivers/gpu/drm/tegra/fb.c | 99 +- + drivers/gpu/drm/tegra/gem.c | 20 +- + drivers/gpu/drm/tegra/gr2d.c | 57 +- + drivers/gpu/drm/tegra/gr3d.c | 60 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 194 +- + drivers/gpu/drm/tegra/plane.h | 15 +- + drivers/gpu/drm/tegra/vic.c | 5 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 30 + + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 22 +- + drivers/gpu/drm/tinydrm/ili9225.c | 28 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 49 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 30 +- + drivers/gpu/drm/tinydrm/repaper.c | 33 +- + drivers/gpu/drm/tinydrm/st7586.c | 28 +- + drivers/gpu/drm/tinydrm/st7735r.c | 7 +- + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + + drivers/gpu/drm/ttm/ttm_bo.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo_manager.c | 1 + + drivers/gpu/drm/ttm/ttm_bo_util.c | 51 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 1 + + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 1 + + drivers/gpu/drm/ttm/ttm_lock.c | 1 + + drivers/gpu/drm/ttm/ttm_memory.c | 1 + + drivers/gpu/drm/ttm/ttm_module.c | 1 + + drivers/gpu/drm/ttm/ttm_object.c | 1 + + drivers/gpu/drm/ttm/ttm_tt.c | 1 + + drivers/gpu/drm/tve200/tve200_display.c | 11 +- + drivers/gpu/drm/udl/udl_connector.c | 2 +- + drivers/gpu/drm/udl/udl_dmabuf.c | 5 +- + drivers/gpu/drm/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_drv.h | 2 + + drivers/gpu/drm/udl/udl_gem.c | 5 +- + drivers/gpu/drm/udl/udl_main.c | 2 + + drivers/gpu/drm/v3d/Kconfig | 9 + + drivers/gpu/drm/v3d/Makefile | 18 + + drivers/gpu/drm/v3d/v3d_bo.c | 389 ++ + drivers/gpu/drm/v3d/v3d_debugfs.c | 191 + + drivers/gpu/drm/v3d/v3d_drv.c | 371 ++ + drivers/gpu/drm/v3d/v3d_drv.h | 294 ++ + drivers/gpu/drm/v3d/v3d_fence.c | 58 + + drivers/gpu/drm/v3d/v3d_gem.c | 668 +++ + drivers/gpu/drm/v3d/v3d_irq.c | 206 + + drivers/gpu/drm/v3d/v3d_mmu.c | 122 + + drivers/gpu/drm/v3d/v3d_regs.h | 295 ++ + drivers/gpu/drm/v3d/v3d_sched.c | 228 + + drivers/gpu/drm/v3d/v3d_trace.h | 82 + + drivers/gpu/drm/v3d/v3d_trace_points.c | 9 + + drivers/gpu/drm/vc4/vc4_crtc.c | 75 +- + drivers/gpu/drm/vc4/vc4_drv.c | 9 +- + drivers/gpu/drm/vc4/vc4_drv.h | 38 + + drivers/gpu/drm/vc4/vc4_dsi.c | 5 + + drivers/gpu/drm/vc4/vc4_gem.c | 57 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 4 + + drivers/gpu/drm/vc4/vc4_kms.c | 224 +- + drivers/gpu/drm/vc4/vc4_plane.c | 152 +- + drivers/gpu/drm/vc4/vc4_regs.h | 97 + + drivers/gpu/drm/vc4/vc4_v3d.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 8 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 35 - + drivers/gpu/drm/xen/Kconfig | 17 + + drivers/gpu/drm/xen/Makefile | 11 + + drivers/gpu/drm/xen/xen_drm_front.c | 840 ++++ + drivers/gpu/drm/xen/xen_drm_front.h | 158 + + drivers/gpu/drm/xen/xen_drm_front_cfg.c | 77 + + drivers/gpu/drm/xen/xen_drm_front_cfg.h | 37 + + drivers/gpu/drm/xen/xen_drm_front_conn.c | 115 + + drivers/gpu/drm/xen/xen_drm_front_conn.h | 27 + + drivers/gpu/drm/xen/xen_drm_front_evtchnl.c | 387 ++ + drivers/gpu/drm/xen/xen_drm_front_evtchnl.h | 81 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 308 ++ + drivers/gpu/drm/xen/xen_drm_front_gem.h | 40 + + drivers/gpu/drm/xen/xen_drm_front_kms.c | 366 ++ + drivers/gpu/drm/xen/xen_drm_front_kms.h | 26 + + drivers/gpu/drm/xen/xen_drm_front_shbuf.c | 414 ++ + drivers/gpu/drm/xen/xen_drm_front_shbuf.h | 64 + + drivers/gpu/drm/zte/zx_plane.c | 2 +- + drivers/gpu/drm/zte/zx_vou.c | 5 +- + drivers/gpu/drm/zte/zx_vou.h | 3 +- + drivers/gpu/host1x/cdma.c | 6 +- + drivers/gpu/host1x/cdma.h | 4 +- + drivers/gpu/host1x/debug.c | 2 +- + drivers/gpu/host1x/dev.c | 11 +- + drivers/gpu/host1x/dev.h | 8 - + drivers/gpu/host1x/hw/channel_hw.c | 5 +- + drivers/gpu/host1x/hw/syncpt_hw.c | 11 - + drivers/gpu/host1x/intr.c | 16 +- + drivers/gpu/host1x/intr.h | 8 +- + drivers/gpu/host1x/job.c | 147 +- + drivers/gpu/host1x/job.h | 4 +- + drivers/gpu/host1x/syncpt.c | 10 +- + drivers/gpu/host1x/syncpt.h | 3 - + drivers/staging/vboxvideo/vbox_drv.c | 2 +- + drivers/video/hdmi.c | 3 + + include/drm/amd_asic_type.h | 2 + + include/drm/bridge/analogix_dp.h | 3 +- + include/drm/drmP.h | 28 +- + include/drm/drm_blend.h | 3 + + include/drm/drm_device.h | 10 +- + include/drm/drm_dp_helper.h | 24 +- + include/drm/drm_drv.h | 15 +- + include/drm/drm_edid.h | 2 - + include/drm/drm_file.h | 23 +- + include/drm/drm_gem_framebuffer_helper.h | 3 + + include/drm/drm_ioctl.h | 7 - + include/drm/drm_legacy.h | 4 +- + include/drm/drm_mode_config.h | 8 + + include/drm/drm_modes.h | 22 + + include/drm/drm_modeset_helper_vtables.h | 5 +- + include/drm/drm_plane.h | 21 +- + include/drm/drm_property.h | 28 +- + include/drm/drm_rect.h | 3 +- + include/drm/drm_simple_kms_helper.h | 6 +- + include/drm/gpu_scheduler.h | 56 +- + include/drm/i915_pciids.h | 1 + + include/drm/tinydrm/mipi-dbi.h | 4 +- + include/drm/tinydrm/tinydrm-helpers.h | 5 + + include/drm/tinydrm/tinydrm.h | 8 +- + include/linux/dma-fence.h | 236 +- + include/linux/host1x.h | 24 +- + include/linux/platform_data/tda9950.h | 16 + + include/trace/events/host1x.h | 16 +- + include/uapi/drm/amdgpu_drm.h | 20 + + include/uapi/drm/drm.h | 7 + + include/uapi/drm/drm_mode.h | 6 + + include/uapi/drm/exynos_drm.h | 240 ++ + include/uapi/drm/tegra_drm.h | 492 ++- + include/uapi/drm/v3d_drm.h | 194 + + include/uapi/drm/vc4_drm.h | 13 +- + include/uapi/linux/virtio_gpu.h | 1 + + scripts/coccinelle/api/drm-get-put.cocci | 10 - + 1110 files changed, 72649 insertions(+), 26344 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/thine,thc63lvd1024.txt + create mode 100644 Documentation/devicetree/bindings/display/sunxi/sun6i-dsi.txt + create mode 100644 Documentation/devicetree/bindings/gpu/brcm,bcm-v3d.txt + create mode 100644 Documentation/devicetree/bindings/gpu/samsung-scaler.txt + create mode 100644 Documentation/gpu/xen-front.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v1_7.c + rename drivers/gpu/drm/{nouveau/nvkm/engine/disp/basegk104.c => amd/amdgpu/df_v1_7.h} (71%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v3_6.c + rename drivers/gpu/drm/{nouveau/nvkm/engine/disp/basegk110.c => amd/amdgpu/df_v3_6.h} (71%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega20_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v9.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue_v9.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/soc15_int.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/basics/fixpt32_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/calcs/calcs_logger.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h + delete mode 100644 drivers/gpu/drm/amd/display/include/fixed32_32.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_1_7_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_3_6_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/vega20_ip_offset.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu75.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu75_discrete.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.h + create mode 100644 drivers/gpu/drm/bridge/cdns-dsi.c + create mode 100644 drivers/gpu/drm/bridge/thc63lvd1024.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_fimc.h + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_gsc.h + create mode 100644 drivers/gpu/drm/exynos/exynos_drm_ipp.c + create mode 100644 drivers/gpu/drm/exynos/exynos_drm_ipp.h + create mode 100644 drivers/gpu/drm/exynos/exynos_drm_scaler.c + create mode 100644 drivers/gpu/drm/exynos/regs-scaler.h + create mode 100644 drivers/gpu/drm/i2c/tda9950.c + delete mode 100644 drivers/gpu/drm/i915/i915_gem_timeline.c + create mode 100644 drivers/gpu/drm/i915/i915_gpu_error.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_icl.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_icl.h + create mode 100644 drivers/gpu/drm/i915/i915_scheduler.h + create mode 100644 drivers/gpu/drm/i915/i915_timeline.c + rename drivers/gpu/drm/i915/{i915_gem_timeline.h => i915_timeline.h} (68%) + create mode 100644 drivers/gpu/drm/i915/intel_gpu_commands.h + create mode 100644 drivers/gpu/drm/i915/intel_wopcm.c + create mode 100644 drivers/gpu/drm/i915/intel_wopcm.h + create mode 100644 drivers/gpu/drm/i915/intel_workarounds.c + create mode 100644 drivers/gpu/drm/i915/intel_workarounds.h + rename drivers/gpu/drm/i915/selftests/{i915_gem_timeline.c => i915_timeline.c} (70%) + create mode 100644 drivers/gpu/drm/i915/selftests/igt_flush_test.c + create mode 100644 drivers/gpu/drm/i915/selftests/igt_flush_test.h + create mode 100644 drivers/gpu/drm/i915/selftests/intel_engine_cs.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_lrc.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_workarounds.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/atom.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/base.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/base.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/base507c.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/base827c.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/base907c.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/base917c.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/core.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/core.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/core507d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/core827d.c + rename drivers/gpu/drm/nouveau/{nvkm/engine/disp/basegt215.c => dispnv50/core907d.c} (71%) + rename drivers/gpu/drm/nouveau/{nvkm/engine/disp/basegt200.c => dispnv50/core917d.c} (71%) + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/corec37d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/curs.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/curs.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/curs507a.c + rename drivers/gpu/drm/nouveau/{nvkm/engine/fifo/gpfifogk110.c => dispnv50/curs907a.c} (79%) + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/cursc37a.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/dac507d.c + rename drivers/gpu/drm/nouveau/{nvkm/engine/disp/cursgt215.c => dispnv50/dac907d.c} (74%) + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/disp.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/disp.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/head.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/head.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/head507d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/head827d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/head907d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/head917d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/headc37d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/lut.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/lut.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/oimm.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/oimm.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/oimm507b.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/ovly.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/ovly.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/ovly507e.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/ovly827e.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/ovly907e.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/ovly917e.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/pior507d.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/sor507d.c + rename drivers/gpu/drm/nouveau/{nvkm/engine/disp/coregt200.c => dispnv50/sor907d.c} (74%) + rename drivers/gpu/drm/nouveau/{nvkm/engine/disp/cursgk104.c => dispnv50/sorc37d.c} (74%) + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wimm.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wimm.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndw.c + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndw.h + create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/clc37b.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/clc37e.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/disp.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/fifo.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvif/user.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/subdev/fault.h + delete mode 100644 drivers/gpu/drm/nouveau/nv50_display.c + rename drivers/gpu/drm/{amd/powerplay/inc/pp_soc15.h => nouveau/nvif/disp.c} (57%) + create mode 100644 drivers/gpu/drm/nouveau/nvif/fifo.c + create mode 100644 drivers/gpu/drm/nouveau/nvif/user.c + rename drivers/gpu/drm/nouveau/{nvkm/engine/fifo/gpfifogp100.c => nvif/userc361.c} (79%) + rename drivers/gpu/drm/nouveau/nvkm/engine/{disp/cursg84.c => ce/gv100.c} (76%) + rename drivers/gpu/drm/nouveau/nvkm/engine/{fifo/gpfifogm200.c => disp/changv100.c} (79%) + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregk110.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregm107.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregm200.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregp100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregt215.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/coregv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/cursgv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacgv100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/dmacnv50.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/headgv100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgk104.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmgt215.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlygt215.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorgv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/wimmgv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/wndwgv100.c + rename drivers/gpu/drm/nouveau/nvkm/engine/{disp/oimmg84.c => dma/gv100.c} (76%) + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/dma/usergv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/cgrp.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/user.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/fifo/usergv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gp104.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fault/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fault/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fault/gp100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fault/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fault/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/ltc/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/gv100.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgv100.c + create mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.c + create mode 100644 drivers/gpu/drm/pl111/pl111_vexpress.h + rename {include/drm => drivers/gpu/drm/scheduler}/gpu_scheduler_trace.h (97%) + create mode 100644 drivers/gpu/drm/selftests/drm_helper_selftests.h + create mode 100644 drivers/gpu/drm/selftests/test-drm-helper.c + create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dphy.c + create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c + create mode 100644 drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h + create mode 100644 drivers/gpu/drm/v3d/Kconfig + create mode 100644 drivers/gpu/drm/v3d/Makefile + create mode 100644 drivers/gpu/drm/v3d/v3d_bo.c + create mode 100644 drivers/gpu/drm/v3d/v3d_debugfs.c + create mode 100644 drivers/gpu/drm/v3d/v3d_drv.c + create mode 100644 drivers/gpu/drm/v3d/v3d_drv.h + create mode 100644 drivers/gpu/drm/v3d/v3d_fence.c + create mode 100644 drivers/gpu/drm/v3d/v3d_gem.c + create mode 100644 drivers/gpu/drm/v3d/v3d_irq.c + create mode 100644 drivers/gpu/drm/v3d/v3d_mmu.c + create mode 100644 drivers/gpu/drm/v3d/v3d_regs.h + create mode 100644 drivers/gpu/drm/v3d/v3d_sched.c + create mode 100644 drivers/gpu/drm/v3d/v3d_trace.h + create mode 100644 drivers/gpu/drm/v3d/v3d_trace_points.c + create mode 100644 drivers/gpu/drm/xen/Kconfig + create mode 100644 drivers/gpu/drm/xen/Makefile + create mode 100644 drivers/gpu/drm/xen/xen_drm_front.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_cfg.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_cfg.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_conn.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_conn.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_evtchnl.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_evtchnl.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_gem.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_gem.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_kms.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_kms.h + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.c + create mode 100644 drivers/gpu/drm/xen/xen_drm_front_shbuf.h + create mode 100644 include/linux/platform_data/tda9950.h + create mode 100644 include/uapi/drm/v3d_drm.h +$ git am -3 ../patches/0001-drm-xen-front-merge-fix-for-drivers-remove-force-dma.patch +Applying: drm/xen-front: merge fix for "drivers: remove force dma flag from buses" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/xen/xen_drm_front.c +$ git add -A . +$ git commit -v -a --amend +[master ca6b37bbcbd3] Merge remote-tracking branch 'drm/drm-next' + Date: Tue Jun 5 12:28:07 2018 +1000 +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (bc61ec46e83f drm/i915: Remove stale asserts from i915_gem_find_active_request()) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/intel_lvds.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/i915_gem.c | 17 +++++++-------- + drivers/gpu/drm/i915/intel_dp.c | 38 +++++----------------------------- + drivers/gpu/drm/i915/intel_drv.h | 2 -- + drivers/gpu/drm/i915/intel_dsi.c | 2 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 2 +- + drivers/gpu/drm/i915/intel_lvds.c | 3 +-- + drivers/gpu/drm/i915/intel_panel.c | 6 ------ + 8 files changed, 17 insertions(+), 55 deletions(-) +Merging drm-tegra/drm/tegra/for-next (6134534ca24f drm/tegra: Add kerneldoc for UAPI) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (069035c5db34 drm: Fix possible race conditions while unplugging DRM device) +$ git merge drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_drv.c | 14 +++++++------- + drivers/gpu/drm/v3d/Kconfig | 1 + + 2 files changed, 8 insertions(+), 7 deletions(-) +Merging drm-msm/msm-next (74d3a3a70775 drm/msm: Fix NULL deref on bind/probe deferral) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/msm_kms.h +Auto-merging drivers/gpu/drm/msm/dsi/dsi_host.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 17 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 9 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 105 ++++++++---- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 27 +-- + drivers/gpu/drm/msm/disp/mdp5/mdp5_mixer.c | 12 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c | 20 ++- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 17 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 14 +- + drivers/gpu/drm/msm/msm_atomic.c | 258 +++-------------------------- + drivers/gpu/drm/msm/msm_drv.c | 11 +- + drivers/gpu/drm/msm/msm_drv.h | 9 +- + drivers/gpu/drm/msm/msm_kms.h | 14 -- + 13 files changed, 177 insertions(+), 352 deletions(-) +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (6e810eb508f4 drm: mali-dp: Add YUV->RGB conversion support for video layers) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (518665524272 gpu: ipu-csi: Check for field type alternate) +$ git merge imx-drm/imx-drm/next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/imx-ldb.c | 9 ++++++--- + drivers/gpu/drm/imx/ipuv3-crtc.c | 1 - + drivers/gpu/ipu-v3/ipu-csi.c | 37 ++++++++++++++++++++++++++++++------- + 4 files changed, 36 insertions(+), 12 deletions(-) +Merging etnaviv/etnaviv/next (f6ffbd4fc1a1 drm/etnaviv: replace license text with SPDX tags) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (579973b912e0 Merge branch 'regmap-4.17' into regmap-linus) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (7a6fc28b162b ALSA: usb-audio: remove redundant check on err) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (0885ee81b84b Merge branch 'asoc-4.17' into asoc-linus) +$ git merge sound-asoc/for-next +Already up to date. +Merging modules/modules-next (c554b8986801 module: Allow to always show the status of modsign) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Merge made by the 'recursive' strategy. + kernel/module.c | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) +Merging input/next (8f6a652a8c13 Input: goldfish_events - fix checkpatch warnings) +$ git merge input/next +Merge made by the 'recursive' strategy. + .../bindings/input/sprd,sc27xx-vibra.txt | 23 +++ + drivers/input/keyboard/goldfish_events.c | 9 +- + drivers/input/misc/Kconfig | 10 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/sc27xx-vibra.c | 154 +++++++++++++++++++++ + 5 files changed, 193 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/sprd,sc27xx-vibra.txt + create mode 100644 drivers/input/misc/sc27xx-vibra.c +Merging block/for-next (28313cee1d4f Merge branch 'for-4.18/block' into for-next) +$ git merge block/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (1be8d9c3da01 dm: add writecache target) +$ git merge device-mapper/for-next +Merge made by the 'recursive' strategy. + Documentation/device-mapper/writecache.txt | 68 + + drivers/md/Kconfig | 11 + + drivers/md/Makefile | 1 + + drivers/md/dm-ioctl.c | 3 +- + drivers/md/dm-writecache.c | 2285 ++++++++++++++++++++++++++++ + kernel/sched/swait.c | 2 + + 6 files changed, 2369 insertions(+), 1 deletion(-) + create mode 100644 Documentation/device-mapper/writecache.txt + create mode 100644 drivers/md/dm-writecache.c +Merging pcmcia/pcmcia-next (c3a5307873d4 pcmcia: Use module_pcmcia_driver for scsi drivers) +$ git merge pcmcia/pcmcia-next +Merge made by the 'recursive' strategy. + drivers/char/pcmcia/cm4040_cs.c | 2 +- + drivers/scsi/pcmcia/aha152x_stub.c | 14 +------------- + drivers/scsi/pcmcia/nsp_cs.c | 15 +-------------- + drivers/scsi/pcmcia/nsp_cs.h | 4 ---- + drivers/scsi/pcmcia/qlogic_stub.c | 13 +------------ + drivers/scsi/pcmcia/sym53c500_cs.c | 16 +--------------- + 6 files changed, 5 insertions(+), 59 deletions(-) +Merging mmc/next (ef5332c10d4f mmc: renesas_sdhi: really fix WP logic regressions) +$ git merge mmc/next +Auto-merging include/linux/mmc/sdio_ids.h +Auto-merging drivers/mmc/core/block.c +Auto-merging arch/mips/boot/dts/ingenic/jz4780.dtsi +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 3 + + .../devicetree/bindings/mmc/bluefield-dw-mshc.txt | 29 +++ + Documentation/devicetree/bindings/mmc/jz4740.txt | 38 ++++ + Documentation/devicetree/bindings/mmc/mmc.txt | 6 + + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 2 + + arch/mips/boot/dts/ingenic/ci20.dts | 34 ++++ + arch/mips/boot/dts/ingenic/jz4780.dtsi | 52 ++++++ + arch/mips/configs/ci20_defconfig | 4 + + drivers/mmc/core/block.c | 11 +- + drivers/mmc/core/card.h | 6 + + drivers/mmc/core/core.c | 67 +++++-- + drivers/mmc/core/core.h | 4 +- + drivers/mmc/core/host.c | 16 +- + drivers/mmc/core/mmc.c | 16 +- + drivers/mmc/core/pwrseq_simple.c | 14 +- + drivers/mmc/core/quirks.h | 3 + + drivers/mmc/core/sd.c | 12 +- + drivers/mmc/core/sdio.c | 70 ++++--- + drivers/mmc/core/slot-gpio.c | 22 ++- + drivers/mmc/host/Kconfig | 32 ++-- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/android-goldfish.c | 8 +- + drivers/mmc/host/atmel-mci.c | 21 +-- + drivers/mmc/host/au1xmmc.c | 12 +- + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc-bluefield.c | 81 ++++++++ + drivers/mmc/host/dw_mmc-rockchip.c | 5 +- + drivers/mmc/host/dw_mmc.c | 4 + + drivers/mmc/host/jz4740_mmc.c | 203 ++++++++++++++------- + drivers/mmc/host/meson-gx-mmc.c | 72 ++++++-- + drivers/mmc/host/mmci.c | 5 - + drivers/mmc/host/mtk-sd.c | 63 +++++-- + drivers/mmc/host/mvsdio.c | 6 +- + drivers/mmc/host/mxcmmc.c | 22 ++- + drivers/mmc/host/renesas_sdhi_core.c | 5 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 32 ++-- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 3 + + drivers/mmc/host/rtsx_usb_sdmmc.c | 19 +- + drivers/mmc/host/sdhci-bcm-kona.c | 4 +- + drivers/mmc/host/sdhci-cadence.c | 22 ++- + drivers/mmc/host/sdhci-esdhc-imx.c | 22 +++ + drivers/mmc/host/sdhci-msm.c | 85 ++++++++- + drivers/mmc/host/sdhci-of-arasan.c | 9 +- + drivers/mmc/host/sdhci-pci-core.c | 38 +++- + drivers/mmc/host/sdhci-pci.h | 1 + + drivers/mmc/host/sdhci-pic32.c | 4 +- + drivers/mmc/host/sdhci-pxav2.c | 4 +- + drivers/mmc/host/sdhci-pxav3.c | 4 +- + drivers/mmc/host/sdhci-s3c.c | 4 +- + drivers/mmc/host/sdhci-spear.c | 4 +- + drivers/mmc/host/sdhci-st.c | 4 +- + drivers/mmc/host/sdhci-tegra.c | 2 +- + drivers/mmc/host/sdhci-xenon-phy.c | 11 +- + drivers/mmc/host/sunxi-mmc.c | 187 ++++++++++++------- + drivers/mmc/host/ushc.c | 4 +- + drivers/mmc/host/wbsd.c | 68 +++---- + drivers/mmc/host/wmt-sdmmc.c | 6 +- + include/dt-bindings/dma/jz4780-dma.h | 49 +++++ + include/linux/mmc/card.h | 2 + + include/linux/mmc/core.h | 1 + + include/linux/mmc/host.h | 2 + + include/linux/mmc/sdio_ids.h | 1 + + 62 files changed, 1156 insertions(+), 391 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/bluefield-dw-mshc.txt + create mode 100644 Documentation/devicetree/bindings/mmc/jz4740.txt + create mode 100644 drivers/mmc/host/dw_mmc-bluefield.c + create mode 100644 include/dt-bindings/dma/jz4780-dma.h +Merging kgdb/kgdb-next (2cf2f0d5b91f kdb: use memmove instead of overlapping memcpy) +$ git merge kgdb/kgdb-next +Already up to date. +Merging md/for-next (5a409b4f56d5 MD: fix lock contention for flush bios) +$ git merge md/for-next +Auto-merging drivers/md/raid5.h +Auto-merging drivers/md/raid5.c +Auto-merging drivers/md/raid10.c +Auto-merging drivers/md/raid1.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/md.c +CONFLICT (content): Merge conflict in drivers/md/md.c +Resolved 'drivers/md/md.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1631891aca13] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/md/md.c | 165 +++++++++++++++++++++++++++++++++++----------------- + drivers/md/md.h | 22 ++++--- + drivers/md/raid1.c | 4 +- + drivers/md/raid10.c | 10 ++-- + drivers/md/raid5.c | 12 +++- + drivers/md/raid5.h | 1 + + 6 files changed, 144 insertions(+), 70 deletions(-) +Merging mfd/for-mfd-next (df7c3bf24f54 mfd: cros_ec_dev: Don't advertise junk features on failure) +$ git merge mfd/for-mfd-next +Removing include/linux/mfd/syscon/exynos5-pmu.h +Removing include/linux/mfd/syscon/exynos4-pmu.h +Auto-merging include/linux/mfd/cros_ec.h +Auto-merging drivers/mfd/timberdale.c +Auto-merging drivers/mfd/sm501.c +Removing drivers/mfd/cros_ec_acpi_gpe.c +Auto-merging drivers/mfd/cros_ec.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/input/mtk-pmic-keys.txt | 43 ++ + Documentation/devicetree/bindings/mfd/arizona.txt | 6 +- + Documentation/devicetree/bindings/mfd/da9063.txt | 32 +- + .../devicetree/bindings/mfd/motorola-cpcap.txt | 42 ++ + Documentation/devicetree/bindings/mfd/mt6397.txt | 6 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.txt | 3 + + MAINTAINERS | 10 + + drivers/input/keyboard/Kconfig | 9 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/mtk-pmic-keys.c | 339 +++++++++++++++ + drivers/mfd/Makefile | 1 - + drivers/mfd/ab8500-debugfs.c | 3 +- + drivers/mfd/abx500-core.c | 25 +- + drivers/mfd/arizona-core.c | 53 ++- + drivers/mfd/asic3.c | 3 + + drivers/mfd/atmel-smc.c | 1 + + drivers/mfd/axp20x.c | 252 +++-------- + drivers/mfd/cros_ec.c | 41 +- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ----- + drivers/mfd/cros_ec_dev.c | 45 +- + drivers/mfd/cros_ec_i2c.c | 17 +- + drivers/mfd/da9062-core.c | 462 +++++---------------- + drivers/mfd/htc-i2cpld.c | 4 +- + drivers/mfd/intel-lpss-pci.c | 25 +- + drivers/mfd/intel-lpss.c | 8 +- + drivers/mfd/janz-cmodio.c | 4 +- + drivers/mfd/jz4740-adc.c | 4 +- + drivers/mfd/max8997.c | 4 +- + drivers/mfd/mt6397-core.c | 26 +- + drivers/mfd/omap-usb-host.c | 24 +- + drivers/mfd/omap-usb-tll.c | 60 ++- + drivers/mfd/pcf50633-core.c | 7 +- + drivers/mfd/qcom-spmi-pmic.c | 6 + + drivers/mfd/rave-sp.c | 118 +++++- + drivers/mfd/rc5t583.c | 6 +- + drivers/mfd/si476x-i2c.c | 6 +- + drivers/mfd/sm501.c | 32 +- + drivers/mfd/smsc-ece1099.c | 7 +- + drivers/mfd/sprd-sc27xx-spi.c | 3 + + drivers/mfd/stm32-timers.c | 201 ++++++++- + drivers/mfd/syscon.c | 2 + + drivers/mfd/ti_am335x_tscadc.c | 5 +- + drivers/mfd/timberdale.c | 2 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/tps65910.c | 18 +- + drivers/mfd/tps65911-comparator.c | 17 +- + drivers/mfd/tps68470.c | 10 +- + drivers/mfd/tps80031.c | 4 +- + drivers/mfd/twl-core.c | 2 +- + drivers/mfd/twl6030-irq.c | 4 +- + drivers/mfd/viperboard.c | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 20 + + drivers/pwm/pwm-stm32.c | 257 ++++++++++++ + drivers/rtc/rtc-mt6397.c | 7 +- + include/linux/mfd/arizona/pdata.h | 3 +- + include/linux/mfd/axp20x.h | 10 +- + include/linux/mfd/cros_ec.h | 20 +- + include/linux/mfd/stm32-timers.h | 70 ++++ + include/linux/mfd/syscon/exynos4-pmu.h | 21 - + include/linux/mfd/syscon/exynos5-pmu.h | 19 - + include/linux/mfd/tps65218.h | 4 +- + include/linux/mfd/tps68470.h | 17 +- + 63 files changed, 1574 insertions(+), 992 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/mtk-pmic-keys.txt + create mode 100644 drivers/input/keyboard/mtk-pmic-keys.c + delete mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + delete mode 100644 include/linux/mfd/syscon/exynos4-pmu.h + delete mode 100644 include/linux/mfd/syscon/exynos5-pmu.h +Merging backlight/for-backlight-next (cd4270258cbe backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight/for-backlight-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/pwm-backlight.txt | 6 + + .../leds/backlight/zii,rave-sp-backlight.txt | 23 ++ + MAINTAINERS | 1 + + drivers/staging/fbtft/fbtft-core.c | 4 +- + drivers/staging/fbtft/fbtft.h | 1 + + drivers/video/backlight/Kconfig | 13 ++ + drivers/video/backlight/Makefile | 2 + + drivers/video/backlight/generic_bl.c | 5 - + drivers/video/backlight/otm3225a.c | 252 +++++++++++++++++++++ + drivers/video/backlight/pandora_bl.c | 25 +- + drivers/video/backlight/pwm_bl.c | 34 ++- + drivers/video/backlight/rave-sp-backlight.c | 82 +++++++ + include/linux/backlight.h | 4 - + include/linux/mfd/rave-sp.h | 1 + + include/linux/pwm_backlight.h | 2 + + 15 files changed, 430 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/zii,rave-sp-backlight.txt + create mode 100644 drivers/video/backlight/otm3225a.c + create mode 100644 drivers/video/backlight/rave-sp-backlight.c +Merging battery/for-next (c42812da1395 MAINTAINERS: add entry for LEGO MINDSTORMS EV3) +$ git merge battery/for-next +Auto-merging include/linux/usb/audio-v2.h +Auto-merging drivers/usb/typec/tcpm.c +Auto-merging drivers/usb/core/hub.c +Auto-merging drivers/usb/core/hcd.c +CONFLICT (content): Merge conflict in drivers/usb/core/hcd.c +Auto-merging MAINTAINERS +Resolved 'drivers/usb/core/hcd.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master ea6a74b22631] Merge remote-tracking branch 'battery/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-usb | 18 + + Documentation/ABI/testing/sysfs-class-power | 455 +++++++++ + .../devicetree/bindings/power/supply/bq27xxx.txt | 1 + + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 6 + + .../devicetree/bindings/usb/fcs,fusb302.txt | 6 - + .../devicetree/bindings/usb/richtek,rt1711h.txt | 17 + + MAINTAINERS | 8 + + drivers/power/reset/gpio-poweroff.c | 4 +- + drivers/power/supply/ab8500_bmdata.c | 63 -- + drivers/power/supply/ab8500_btemp.c | 93 +- + drivers/power/supply/ab8500_charger.c | 133 +-- + drivers/power/supply/ab8500_fg.c | 14 +- + drivers/power/supply/abx500_chargalg.c | 62 -- + drivers/power/supply/axp288_charger.c | 26 +- + drivers/power/supply/axp288_fuel_gauge.c | 27 +- + drivers/power/supply/bq27xxx_battery.c | 9 + + drivers/power/supply/bq27xxx_battery_i2c.c | 2 + + drivers/power/supply/charger-manager.c | 5 +- + drivers/power/supply/gpio-charger.c | 3 +- + drivers/power/supply/power_supply_core.c | 11 +- + drivers/power/supply/power_supply_sysfs.c | 123 ++- + drivers/power/supply/s3c_adc_battery.c | 8 +- + drivers/staging/typec/Kconfig | 8 + + drivers/staging/typec/Makefile | 1 + + drivers/staging/typec/tcpci.h | 1 + + drivers/staging/typec/tcpci_rt1711h.c | 312 ++++++ + drivers/usb/core/hcd.c | 49 +- + drivers/usb/core/hub.c | 23 +- + drivers/usb/core/sysfs.c | 22 + + drivers/usb/gadget/udc/Kconfig | 4 +- + drivers/usb/host/Kconfig | 4 +- + drivers/usb/host/ehci-omap.c | 5 +- + drivers/usb/host/ehci-tegra.c | 87 +- + drivers/usb/isp1760/isp1760-core.c | 2 +- + drivers/usb/isp1760/isp1760-hcd.c | 2 +- + drivers/usb/mon/mon_bin.c | 2 +- + drivers/usb/mtu3/Kconfig | 2 +- + drivers/usb/mtu3/mtu3_plat.c | 6 +- + drivers/usb/musb/omap2430.c | 95 +- + drivers/usb/phy/Kconfig | 9 + + drivers/usb/phy/Makefile | 2 +- + drivers/usb/phy/phy-am335x.c | 6 +- + drivers/usb/phy/phy-tegra-usb.c | 140 ++- + drivers/usb/phy/phy.c | 133 +-- + drivers/usb/renesas_usbhs/common.h | 1 - + drivers/usb/renesas_usbhs/rcar2.c | 29 - + drivers/usb/roles/intel-xhci-usb-role-switch.c | 2 + + drivers/usb/storage/freecom.c | 4 +- + drivers/usb/typec/Kconfig | 1 + + drivers/usb/typec/fusb302/Kconfig | 2 +- + drivers/usb/typec/fusb302/fusb302.c | 105 +- + drivers/usb/typec/tcpm.c | 1059 ++++++++++++++++++-- + drivers/usb/typec/typec_wcove.c | 4 +- + include/linux/mfd/abx500.h | 1 - + include/linux/mfd/abx500/ab8500-bm.h | 2 - + include/linux/mfd/abx500/ux500_chargalg.h | 4 - + include/linux/power/bq27xxx_battery.h | 3 +- + include/linux/power_supply.h | 16 + + include/linux/usb.h | 4 + + include/linux/usb/audio-v2.h | 2 +- + include/linux/usb/hcd.h | 2 +- + include/linux/usb/pd.h | 4 +- + include/linux/usb/phy.h | 36 - + include/linux/usb/tcpm.h | 10 +- + include/linux/usb/tegra_usb_phy.h | 2 + + include/uapi/linux/usb/ch11.h | 5 + + 66 files changed, 2353 insertions(+), 954 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/richtek,rt1711h.txt + create mode 100644 drivers/staging/typec/tcpci_rt1711h.c +Merging regulator/for-next (bbc7fea8e00b Merge branch 'regulator-4.17' into regulator-linus) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (d19289133b1d Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) +$ git merge security/next-testing +Auto-merging security/selinux/hooks.c +Auto-merging net/socket.c +Auto-merging drivers/char/tpm/eventlog/tpm2.c +Auto-merging drivers/char/tpm/eventlog/tpm1.c +Auto-merging drivers/char/tpm/eventlog/of.c +Auto-merging drivers/char/tpm/eventlog/efi.c +Auto-merging drivers/char/tpm/eventlog/acpi.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/evm | 13 ++ + Documentation/ABI/testing/ima_policy | 2 +- + drivers/char/tpm/Makefile | 10 +- + .../tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 3 +- + drivers/char/tpm/eventlog/common.c | 195 ++++++++++++++++++++ + drivers/char/tpm/eventlog/common.h | 35 ++++ + .../tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 6 +- + .../char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 11 +- + .../char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 200 ++------------------- + .../char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 3 +- + drivers/char/tpm/st33zp24/spi.c | 4 +- + drivers/char/tpm/st33zp24/st33zp24.c | 2 - + drivers/char/tpm/tpm-interface.c | 5 +- + drivers/char/tpm/tpm.h | 32 +--- + drivers/char/tpm/tpm2-space.c | 3 +- + drivers/char/tpm/tpm_crb.c | 10 +- + drivers/char/tpm/tpm_tis_core.c | 58 +++++- + include/linux/lsm_hooks.h | 7 + + include/linux/security.h | 21 +-- + include/uapi/linux/audit.h | 1 + + net/socket.c | 7 + + security/integrity/evm/Kconfig | 11 ++ + security/integrity/evm/evm.h | 7 +- + security/integrity/evm/evm_crypto.c | 10 +- + security/integrity/evm/evm_main.c | 79 ++++---- + security/integrity/evm/evm_secfs.c | 200 ++++++++++++++++++++- + security/integrity/iint.c | 18 ++ + security/integrity/ima/ima.h | 1 - + security/integrity/ima/ima_fs.c | 18 +- + security/integrity/ima/ima_kexec.c | 2 + + security/integrity/ima/ima_main.c | 8 +- + security/integrity/ima/ima_policy.c | 53 ++++-- + security/integrity/ima/ima_template_lib.c | 2 + + security/integrity/integrity.h | 2 + + security/keys/big_key.c | 11 +- + security/keys/dh.c | 35 ++-- + security/security.c | 6 + + security/selinux/hooks.c | 13 ++ + security/smack/smack_lsm.c | 22 +++ + 39 files changed, 781 insertions(+), 345 deletions(-) + rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (98%) + create mode 100644 drivers/char/tpm/eventlog/common.c + create mode 100644 drivers/char/tpm/eventlog/common.h + rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (91%) + rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (91%) + rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (58%) + rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%) +Merging apparmor/apparmor-next (430837708c21 apparmor: Fix memory leak of rule on error exit path) +$ git merge apparmor/apparmor-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/LSM/apparmor.rst | 6 +- + security/apparmor/audit.c | 90 +++++++++++- + security/apparmor/domain.c | 2 +- + security/apparmor/include/audit.h | 6 + + security/apparmor/include/label.h | 2 +- + security/apparmor/include/path.h | 32 ++--- + security/apparmor/include/secid.h | 15 +- + security/apparmor/label.c | 14 +- + security/apparmor/lib.c | 2 +- + security/apparmor/lsm.c | 44 ++++-- + security/apparmor/match.c | 2 +- + security/apparmor/mount.c | 2 +- + security/apparmor/policy.c | 4 +- + security/apparmor/secid.c | 221 ++++++++++++++++++++++++++--- + 14 files changed, 373 insertions(+), 69 deletions(-) +Merging integrity/next-integrity (b5c90a7526fe EVM: unlock on error path in evm_read_xattrs()) +$ git merge integrity/next-integrity +Merge made by the 'recursive' strategy. + security/integrity/evm/evm_secfs.c | 14 ++++++++++---- + security/integrity/ima/ima_main.c | 11 ++++------- + security/integrity/ima/ima_policy.c | 17 ++--------------- + 3 files changed, 16 insertions(+), 26 deletions(-) +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (d141136f523a audit: normalize MAC_POLICY_LOAD record) +$ git merge selinux/next +Merge made by the 'recursive' strategy. + security/selinux/selinuxfs.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging tpmdd/next (3ab2011ea368 tpm: fix race condition in tpm_common_write()) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm-dev-common.c | 40 ++++++++++++++++++--------------------- + drivers/char/tpm/tpm-dev.h | 2 +- + 2 files changed, 19 insertions(+), 23 deletions(-) +Merging watchdog/master (1c85ffc86a2b dt-bindings: watchdog: renesas-wdt: Add R-Car Gen2 support) +$ git merge watchdog/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/watchdog/renesas-wdt.txt | 23 +++++++++++++++------- + drivers/watchdog/cadence_wdt.c | 6 ++---- + drivers/watchdog/hpwdt.c | 2 +- + drivers/watchdog/mena21_wdt.c | 18 ----------------- + drivers/watchdog/of_xilinx_wdt.c | 6 ++---- + drivers/watchdog/renesas_wdt.c | 2 +- + drivers/watchdog/sp805_wdt.c | 14 +++++++++++++ + drivers/watchdog/wdat_wdt.c | 6 ++---- + 8 files changed, 38 insertions(+), 39 deletions(-) +Merging iommu/next (1f568357117c Merge branches 'arm/io-pgtable', 'arm/qcom', 'arm/tegra', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/iommu/Kconfig +Merge made by the 'recursive' strategy. + drivers/iommu/Kconfig | 5 +- + drivers/iommu/amd_iommu.c | 69 ++++++++++++------------- + drivers/iommu/amd_iommu_types.h | 1 + + drivers/iommu/dmar.c | 8 ++- + drivers/iommu/intel-iommu.c | 101 ++++++++++++++++++------------------- + drivers/iommu/intel-svm.c | 2 +- + drivers/iommu/io-pgtable-arm-v7s.c | 5 +- + drivers/iommu/io-pgtable-arm.c | 18 ++++--- + drivers/iommu/iommu.c | 7 +-- + drivers/iommu/qcom_iommu.c | 6 +-- + drivers/iommu/tegra-gart.c | 15 +++++- + include/linux/intel-iommu.h | 1 - + 12 files changed, 122 insertions(+), 116 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (a823b3a1b88b vfio: platform: Fix using devices in PM Domains) +$ git merge vfio/next +Auto-merging drivers/vfio/vfio_iommu_type1.c +CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_type1.c +Resolved 'drivers/vfio/vfio_iommu_type1.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5675b796775f] Merge remote-tracking branch 'vfio/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/vfio-mediated-device.txt | 5 + + drivers/vfio/mdev/mdev_core.c | 102 +- + drivers/vfio/mdev/mdev_private.h | 2 +- + drivers/vfio/mdev/mdev_sysfs.c | 14 +- + drivers/vfio/platform/vfio_platform_common.c | 30 +- + drivers/vfio/vfio.c | 11 +- + drivers/vfio/vfio_iommu_type1.c | 570 ++++++++++- + include/uapi/linux/vfio.h | 23 + + samples/Kconfig | 30 + + samples/vfio-mdev/Makefile | 3 + + samples/vfio-mdev/mbochs.c | 1406 ++++++++++++++++++++++++++ + samples/vfio-mdev/mdpy-defs.h | 22 + + samples/vfio-mdev/mdpy-fb.c | 232 +++++ + samples/vfio-mdev/mdpy.c | 807 +++++++++++++++ + 14 files changed, 3129 insertions(+), 128 deletions(-) + create mode 100644 samples/vfio-mdev/mbochs.c + create mode 100644 samples/vfio-mdev/mdpy-defs.h + create mode 100644 samples/vfio-mdev/mdpy-fb.c + create mode 100644 samples/vfio-mdev/mdpy.c +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (5b71388663c0 audit: Fix wrong task in comparison of session ID) +$ git merge audit/next +Auto-merging security/selinux/ss/services.c +Auto-merging security/selinux/selinuxfs.c +CONFLICT (content): Merge conflict in security/selinux/selinuxfs.c +Auto-merging security/selinux/hooks.c +Auto-merging net/netfilter/x_tables.c +Auto-merging net/core/dev.c +Auto-merging net/bridge/netfilter/ebtables.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/fork.c +Auto-merging kernel/auditsc.c +Auto-merging kernel/audit_watch.c +Auto-merging include/uapi/linux/audit.h +Auto-merging include/net/xfrm.h +Resolved 'security/selinux/selinuxfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master be605de39543] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/userspace-api/seccomp_filter.rst | 7 -- + include/linux/audit.h | 39 ++++--- + include/net/xfrm.h | 4 +- + include/uapi/linux/audit.h | 1 + + init/init_task.c | 3 +- + kernel/audit.c | 6 +- + kernel/audit_watch.c | 2 +- + kernel/auditfilter.c | 6 +- + kernel/auditsc.c | 135 ++++++++++++++++--------- + kernel/fork.c | 2 +- + kernel/seccomp.c | 126 ++++++++++++++++------- + net/bridge/netfilter/ebtables.c | 2 +- + net/core/dev.c | 18 ++-- + net/netfilter/x_tables.c | 2 +- + net/netlabel/netlabel_user.c | 2 +- + security/integrity/ima/ima_api.c | 2 +- + security/integrity/integrity_audit.c | 2 +- + security/lsm_audit.c | 2 +- + security/selinux/hooks.c | 7 +- + security/selinux/selinuxfs.c | 6 +- + security/selinux/ss/services.c | 12 +-- + 21 files changed, 242 insertions(+), 144 deletions(-) +Merging devicetree/for-next (522811e944ed of: platform: stop accessing invalid dev in of_platform_device_destroy) +$ git merge devicetree/for-next +Auto-merging scripts/Makefile.lib +Auto-merging drivers/of/platform.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.txt +Auto-merging Documentation/devicetree/bindings/mtd/mtk-nand.txt +Auto-merging Documentation/devicetree/bindings/mmc/tmio_mmc.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/ux500/boards.txt | 2 +- + Documentation/devicetree/bindings/dma/k3dma.txt | 1 - + Documentation/devicetree/bindings/dma/ti-edma.txt | 1 - + .../devicetree/bindings/fsi/fsi-master-gpio.txt | 4 + + .../adc/samsung,exynos-adc.txt} | 0 + .../devicetree/bindings/mips/lantiq/rcu.txt | 2 - + Documentation/devicetree/bindings/mmc/tmio_mmc.txt | 4 - + .../{powerpc/4xx/ndfc.txt => mtd/ibm,ndfc.txt} | 0 + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 4 - + .../{powerpc/4xx/emac.txt => net/ibm,emac.txt} | 0 + .../devicetree/bindings/net/renesas,ravb.txt | 1 + + .../devicetree/bindings/pci/xgene-pci.txt | 7 - + Documentation/devicetree/bindings/pps/pps-gpio.txt | 1 - + .../devicetree/bindings/pwm/pwm-omap-dmtimer.txt | 2 +- + .../samsung,exynos4-rng.txt} | 0 + .../bindings/{ => rng}/sparc_sun_oracle_rng.txt | 0 + .../bindings/thermal/rcar-gen3-thermal.txt | 6 +- + .../{nios2/timer.txt => timer/altr,timer-1.0.txt} | 0 + .../arch_timer.txt => timer/arm,arch_timer.txt} | 0 + .../arm,armv7m-systick.txt} | 0 + .../arm,global_timer.txt} | 0 + .../bindings/{arm/twd.txt => timer/arm,twd.txt} | 0 + .../{powerpc/fsl/gtm.txt => timer/fsl,gtm.txt} | 0 + .../mrvl/timer.txt => timer/mrvl,mmp-timer.txt} | 0 + .../msm/timer.txt => timer/qcom,msm-timer.txt} | 0 + .../spear-timer.txt => timer/st,spear-timer.txt} | 0 + .../{c6x/timer64.txt => timer/ti,c64x+timer64.txt} | 0 + .../{arm/omap/timer.txt => timer/ti,timer.txt} | 0 + .../{arm/vt8500 => timer}/via,vt8500-timer.txt | 0 + .../devicetree/bindings/vendor-prefixes.txt | 6 + + MAINTAINERS | 2 + + drivers/gpu/drm/rcar-du/Makefile | 7 + + drivers/of/of_numa.c | 1 - + drivers/of/platform.c | 16 +- + drivers/of/resolver.c | 5 + + drivers/of/unittest.c | 8 +- + scripts/Makefile.lib | 3 + + scripts/dtc/checks.c | 199 ++++++++++++++++++++- + scripts/dtc/dtc-lexer.l | 7 + + scripts/dtc/dtc-parser.y | 39 ++-- + scripts/dtc/dtc.h | 4 + + scripts/dtc/livetree.c | 26 ++- + scripts/dtc/version_gen.h | 2 +- + 43 files changed, 312 insertions(+), 48 deletions(-) + rename Documentation/devicetree/bindings/{arm/samsung/exynos-adc.txt => iio/adc/samsung,exynos-adc.txt} (100%) + rename Documentation/devicetree/bindings/{powerpc/4xx/ndfc.txt => mtd/ibm,ndfc.txt} (100%) + rename Documentation/devicetree/bindings/{powerpc/4xx/emac.txt => net/ibm,emac.txt} (100%) + rename Documentation/devicetree/bindings/{crypto/samsung,exynos-rng4.txt => rng/samsung,exynos4-rng.txt} (100%) + rename Documentation/devicetree/bindings/{ => rng}/sparc_sun_oracle_rng.txt (100%) + rename Documentation/devicetree/bindings/{nios2/timer.txt => timer/altr,timer-1.0.txt} (100%) + rename Documentation/devicetree/bindings/{arm/arch_timer.txt => timer/arm,arch_timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/armv7m_systick.txt => timer/arm,armv7m-systick.txt} (100%) + rename Documentation/devicetree/bindings/{arm/global_timer.txt => timer/arm,global_timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/twd.txt => timer/arm,twd.txt} (100%) + rename Documentation/devicetree/bindings/{powerpc/fsl/gtm.txt => timer/fsl,gtm.txt} (100%) + rename Documentation/devicetree/bindings/{arm/mrvl/timer.txt => timer/mrvl,mmp-timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/msm/timer.txt => timer/qcom,msm-timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/spear-timer.txt => timer/st,spear-timer.txt} (100%) + rename Documentation/devicetree/bindings/{c6x/timer64.txt => timer/ti,c64x+timer64.txt} (100%) + rename Documentation/devicetree/bindings/{arm/omap/timer.txt => timer/ti,timer.txt} (100%) + rename Documentation/devicetree/bindings/{arm/vt8500 => timer}/via,vt8500-timer.txt (100%) +Merging mailbox/mailbox-for-next (dfbc9c5841fc mailbox: Remove depends on HAS_DMA in case of platform dependency) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + drivers/mailbox/Kconfig | 2 -- + 1 file changed, 2 deletions(-) +Merging spi/for-next (748d5c6905ca Merge branch 'spi-4.17' into spi-linus) +$ git merge spi/for-next +Already up to date. +Merging tip/auto-latest (32dab4a92d1f Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Removing tools/testing/selftests/rcutorture/bin/parse-torture.sh +Auto-merging kernel/time/timer_list.c +Auto-merging kernel/time/tick-common.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/events/core.c +Auto-merging include/linux/syscalls.h +Auto-merging include/linux/swait.h +Auto-merging include/linux/perf_event.h +Auto-merging include/linux/compat.h +Auto-merging drivers/s390/net/qeth_core_main.c +Auto-merging drivers/nvme/host/core.c +Removing drivers/irqchip/irq-mvebu-gicp.h +Auto-merging arch/x86/net/bpf_jit_comp.c +CONFLICT (content): Merge conflict in arch/x86/net/bpf_jit_comp.c +Auto-merging arch/x86/kernel/cpu/mtrr/mtrr.c +Auto-merging arch/x86/kernel/cpu/cacheinfo.c +Auto-merging arch/x86/kernel/apm_32.c +Auto-merging arch/x86/Kconfig +Removing arch/s390/include/uapi/asm/shmbuf.h +Removing arch/s390/include/uapi/asm/sembuf.h +Removing arch/s390/include/uapi/asm/msgbuf.h +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/hardirq.h +Auto-merging arch/nds32/include/asm/Kbuild +Removing arch/ia64/include/uapi/asm/shmbuf.h +Removing arch/ia64/include/uapi/asm/sembuf.h +Removing arch/ia64/include/uapi/asm/msgbuf.h +Removing arch/ia64/include/uapi/asm/ipcbuf.h +Auto-merging arch/c6x/include/asm/Kbuild +Auto-merging arch/arm/boot/dts/stm32mp157c.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/stm32mp157c.dtsi +Auto-merging arch/arm/boot/dts/stm32mp157-pinctrl.dtsi +Auto-merging arch/arc/include/asm/Kbuild +Removing arch/alpha/include/uapi/asm/shmbuf.h +Removing arch/alpha/include/uapi/asm/sembuf.h +Removing arch/alpha/include/uapi/asm/msgbuf.h +Removing arch/alpha/include/uapi/asm/ipcbuf.h +Auto-merging arch/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/translations/ko_KR/memory-barriers.txt +Auto-merging Documentation/memory-barriers.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Resolved 'arch/arm/boot/dts/stm32mp157c.dtsi' using previous resolution. +Resolved 'arch/x86/net/bpf_jit_comp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d76483ed856b] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/whatisRCU.txt | 2 + + Documentation/admin-guide/kernel-parameters.txt | 8 +- + Documentation/core-api/atomic_ops.rst | 13 +- + .../amlogic,meson-gpio-intc.txt | 11 +- + .../bindings/interrupt-controller/arm,gic-v3.txt | 17 + + .../interrupt-controller/st,stm32-exti.txt | 3 + + Documentation/memory-barriers.txt | 17 +- + Documentation/scheduler/sched-deadline.txt | 25 +- + .../translations/ko_KR/memory-barriers.txt | 50 +- + Documentation/x86/intel_rdt_ui.txt | 75 ++- + MAINTAINERS | 3 +- + arch/Kconfig | 15 + + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/uapi/asm/Kbuild | 4 + + arch/alpha/include/uapi/asm/ipcbuf.h | 2 - + arch/alpha/include/uapi/asm/msgbuf.h | 28 - + arch/alpha/include/uapi/asm/sembuf.h | 23 - + arch/alpha/include/uapi/asm/shmbuf.h | 39 -- + arch/arc/include/asm/Kbuild | 1 + + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 4 + + arch/arm/boot/dts/stm32mp157c.dtsi | 7 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm64/include/asm/compat.h | 43 +- + arch/arm64/include/asm/spinlock.h | 5 - + arch/arm64/include/asm/stat.h | 1 + + arch/arm64/kernel/hw_breakpoint.c | 1 - + arch/arm64/kernel/perf_regs.c | 2 +- + arch/c6x/include/asm/Kbuild | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/ia64/include/asm/Kbuild | 1 + + arch/ia64/include/asm/hardirq.h | 2 +- + arch/ia64/include/uapi/asm/Kbuild | 4 + + arch/ia64/include/uapi/asm/ipcbuf.h | 2 - + arch/ia64/include/uapi/asm/msgbuf.h | 28 - + arch/ia64/include/uapi/asm/sembuf.h | 23 - + arch/ia64/include/uapi/asm/shmbuf.h | 39 -- + arch/m68k/include/asm/Kbuild | 1 + + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/compat.h | 51 +- + arch/mips/include/uapi/asm/msgbuf.h | 57 +- + arch/mips/include/uapi/asm/sembuf.h | 15 +- + arch/mips/include/uapi/asm/shmbuf.h | 23 +- + arch/mips/kernel/signal32.c | 2 +- + arch/nds32/include/asm/Kbuild | 1 + + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/compat.h | 43 +- + arch/parisc/include/asm/hardirq.h | 8 - + arch/parisc/include/uapi/asm/msgbuf.h | 33 +- + arch/parisc/include/uapi/asm/sembuf.h | 16 +- + arch/parisc/include/uapi/asm/shmbuf.h | 19 +- + arch/powerpc/include/asm/compat.h | 43 +- + arch/powerpc/include/asm/hardirq.h | 7 - + arch/powerpc/include/uapi/asm/msgbuf.h | 18 +- + arch/powerpc/include/uapi/asm/sembuf.h | 14 +- + arch/powerpc/include/uapi/asm/shmbuf.h | 19 +- + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/oprofile/backtrace.c | 1 + + arch/s390/hypfs/hypfs_sprp.c | 1 - + arch/s390/include/asm/compat.h | 43 +- + arch/s390/include/asm/elf.h | 4 +- + arch/s390/include/asm/hardirq.h | 2 + + arch/s390/include/uapi/asm/Kbuild | 3 + + arch/s390/include/uapi/asm/msgbuf.h | 38 -- + arch/s390/include/uapi/asm/sembuf.h | 30 - + arch/s390/include/uapi/asm/shmbuf.h | 49 -- + arch/s390/kvm/priv.c | 1 - + arch/s390/pci/pci_clp.c | 1 - + arch/sh/include/asm/Kbuild | 1 + + arch/sh/kernel/irq.c | 2 +- + arch/sparc/include/asm/compat.h | 47 +- + arch/sparc/include/asm/hardirq_64.h | 5 +- + arch/sparc/include/uapi/asm/msgbuf.h | 22 +- + arch/sparc/include/uapi/asm/sembuf.h | 16 +- + arch/sparc/include/uapi/asm/shmbuf.h | 21 +- + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/Kconfig | 1 + + arch/x86/boot/compressed/cmdline.c | 2 +- + arch/x86/boot/compressed/eboot.c | 114 +--- + arch/x86/boot/compressed/head_64.S | 1 + + arch/x86/boot/compressed/kaslr.c | 4 +- + arch/x86/boot/compressed/misc.h | 6 +- + arch/x86/boot/compressed/pgtable_64.c | 14 +- + arch/x86/entry/vdso/Makefile | 11 +- + arch/x86/events/amd/ibs.c | 2 +- + arch/x86/events/amd/uncore.c | 21 +- + arch/x86/events/core.c | 2 +- + arch/x86/events/intel/pt.c | 4 +- + arch/x86/events/intel/uncore.c | 76 ++- + arch/x86/events/intel/uncore.h | 127 +++- + arch/x86/events/intel/uncore_nhmex.c | 2 +- + arch/x86/events/intel/uncore_snb.c | 101 +-- + arch/x86/events/intel/uncore_snbep.c | 82 +++ + arch/x86/hyperv/Makefile | 3 +- + arch/x86/hyperv/hv_apic.c | 256 ++++++++ + arch/x86/hyperv/hv_init.c | 32 +- + arch/x86/hyperv/mmu.c | 75 +-- + arch/x86/include/asm/cacheinfo.h | 7 + + arch/x86/include/asm/compat.h | 43 +- + arch/x86/include/asm/ftrace.h | 2 +- + arch/x86/include/asm/hardirq.h | 8 - + arch/x86/include/asm/hyperv-tlfs.h | 30 +- + arch/x86/include/asm/intel_mid_vrtc.h | 4 +- + arch/x86/include/asm/io.h | 8 +- + arch/x86/include/asm/mc146818rtc.h | 4 +- + arch/x86/include/asm/mshyperv.h | 44 +- + arch/x86/include/asm/page_64_types.h | 2 +- + arch/x86/include/asm/paravirt.h | 4 +- + arch/x86/include/asm/pgalloc.h | 4 +- + arch/x86/include/asm/pgtable.h | 12 +- + arch/x86/include/asm/pgtable_32_types.h | 2 +- + arch/x86/include/asm/pgtable_64.h | 2 +- + arch/x86/include/asm/pgtable_64_types.h | 25 +- + arch/x86/include/asm/processor.h | 9 - + arch/x86/include/asm/pvclock.h | 2 +- + arch/x86/include/asm/qspinlock.h | 21 +- + arch/x86/include/asm/qspinlock_paravirt.h | 3 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/include/asm/sparsemem.h | 4 +- + arch/x86/include/asm/stacktrace.h | 2 + + arch/x86/include/asm/string_64.h | 10 +- + arch/x86/include/asm/uaccess_64.h | 14 + + arch/x86/include/asm/x86_init.h | 7 +- + arch/x86/include/uapi/asm/sembuf.h | 11 +- + arch/x86/kernel/apic/vector.c | 17 +- + arch/x86/kernel/apm_32.c | 2 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/amd.c | 36 +- + .../kernel/cpu/{intel_cacheinfo.c => cacheinfo.c} | 46 +- + arch/x86/kernel/cpu/centaur.c | 53 ++ + arch/x86/kernel/cpu/common.c | 35 ++ + arch/x86/kernel/cpu/cpu.h | 10 + + arch/x86/kernel/cpu/intel.c | 34 +- + arch/x86/kernel/cpu/intel_rdt.c | 50 +- + arch/x86/kernel/cpu/intel_rdt.h | 18 + + arch/x86/kernel/cpu/intel_rdt_ctrlmondata.c | 24 +- + arch/x86/kernel/cpu/intel_rdt_monitor.c | 170 ++++- + arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 33 + + arch/x86/kernel/cpu/mcheck/mce-inject.c | 2 +- + arch/x86/kernel/cpu/mcheck/mce.c | 18 + + arch/x86/kernel/cpu/mcheck/mce_amd.c | 15 +- + arch/x86/kernel/cpu/microcode/core.c | 6 +- + arch/x86/kernel/cpu/mtrr/Makefile | 2 +- + arch/x86/kernel/cpu/mtrr/if.c | 33 +- + arch/x86/kernel/cpu/mtrr/{main.c => mtrr.c} | 37 +- + arch/x86/kernel/cpu/topology.c | 8 +- + arch/x86/kernel/dumpstack.c | 144 +++-- + arch/x86/kernel/e820.c | 32 +- + arch/x86/kernel/early-quirks.c | 8 +- + arch/x86/kernel/head64.c | 25 +- + arch/x86/kernel/hpet.c | 5 +- + arch/x86/kernel/i8237.c | 25 + + arch/x86/kernel/jailhouse.c | 2 +- + arch/x86/kernel/kvmclock.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 3 +- + arch/x86/kernel/perf_regs.c | 10 +- + arch/x86/kernel/platform-quirks.c | 7 +- + arch/x86/kernel/process_32.c | 8 +- + arch/x86/kernel/pvclock.c | 15 +- + arch/x86/kernel/rtc.c | 10 +- + arch/x86/kernel/smpboot.c | 7 - + arch/x86/kernel/sys_x86_64.c | 2 +- + arch/x86/kernel/uprobes.c | 4 +- + arch/x86/kernel/vmlinux.lds.S | 4 +- + arch/x86/lib/memcpy_64.S | 102 ++- + arch/x86/lib/usercopy_64.c | 30 +- + arch/x86/mm/dump_pagetables.c | 6 +- + arch/x86/mm/fault.c | 11 +- + arch/x86/mm/ident_map.c | 2 +- + arch/x86/mm/init_64.c | 8 +- + arch/x86/mm/kasan_init_64.c | 14 +- + arch/x86/mm/kaslr.c | 8 +- + arch/x86/mm/numa.c | 22 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/platform/efi/efi_64.c | 2 +- + arch/x86/platform/intel-mid/intel_mid_vrtc.c | 12 +- + arch/x86/power/hibernate_64.c | 2 +- + arch/x86/um/vdso/Makefile | 4 +- + arch/x86/xen/efi.c | 57 ++ + arch/x86/xen/time.c | 10 +- + arch/xtensa/include/asm/Kbuild | 1 + + arch/xtensa/include/uapi/asm/msgbuf.h | 25 +- + arch/xtensa/include/uapi/asm/sembuf.h | 17 +- + arch/xtensa/include/uapi/asm/shmbuf.h | 37 +- + drivers/base/platform-msi.c | 3 + + drivers/bus/fsl-mc/fsl-mc-msi.c | 2 + + drivers/clocksource/Kconfig | 4 +- + drivers/clocksource/arc_timer.c | 14 + + drivers/clocksource/mips-gic-timer.c | 18 +- + drivers/clocksource/mxs_timer.c | 28 +- + drivers/clocksource/timer-imx-gpt.c | 28 +- + drivers/clocksource/timer-imx-tpm.c | 13 +- + drivers/firmware/efi/Kconfig | 5 + + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/capsule-loader.c | 14 +- + drivers/firmware/efi/cper-arm.c | 6 +- + drivers/firmware/efi/cper-x86.c | 356 +++++++++++ + drivers/firmware/efi/cper.c | 16 +- + drivers/firmware/efi/libstub/secureboot.c | 3 + + drivers/firmware/efi/libstub/tpm.c | 2 +- + drivers/irqchip/Makefile | 2 +- + drivers/irqchip/irq-gic-v3-mbi.c | 331 ++++++++++ + drivers/irqchip/irq-gic-v3.c | 7 + + drivers/irqchip/irq-meson-gpio.c | 5 + + drivers/irqchip/irq-mvebu-gicp.c | 38 +- + drivers/irqchip/irq-mvebu-gicp.h | 12 - + drivers/irqchip/irq-mvebu-icu.c | 33 +- + drivers/irqchip/irq-stm32-exti.c | 683 ++++++++++++++++++--- + drivers/nvdimm/claim.c | 3 +- + drivers/nvdimm/pmem.c | 6 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/msi.c | 3 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 13 +- + drivers/s390/block/dasd_ioctl.c | 1 - + drivers/s390/char/fs3270.c | 1 - + drivers/s390/char/sclp_ctl.c | 1 - + drivers/s390/char/vmcp.c | 1 - + drivers/s390/cio/chsc_sch.c | 1 - + drivers/s390/net/qeth_core_main.c | 2 +- + include/asm-generic/atomic-long.h | 19 + + include/asm-generic/barrier.h | 27 +- + include/asm-generic/compat.h | 3 + + include/asm-generic/qspinlock.h | 4 +- + include/asm-generic/qspinlock_types.h | 32 +- + include/linux/atomic.h | 2 + + include/linux/compat.h | 12 +- + include/linux/compat_time.h | 23 + + include/linux/cper.h | 4 +- + include/linux/delayacct.h | 2 +- + include/linux/dma-iommu.h | 1 + + include/linux/efi.h | 6 +- + include/linux/interrupt.h | 13 +- + include/linux/irq.h | 1 + + include/linux/irq_cpustat.h | 10 +- + include/linux/irq_sim.h | 13 +- + include/linux/irqchip/arm-gic-v3.h | 1 + + include/linux/irqdomain.h | 8 +- + include/linux/msi.h | 2 + + include/linux/mutex.h | 3 - + include/linux/perf_event.h | 10 +- + include/linux/rcupdate.h | 5 +- + include/linux/rcutiny.h | 1 + + include/linux/rcutree.h | 2 + + include/linux/restart_block.h | 7 +- + include/linux/sched.h | 9 +- + include/linux/spinlock.h | 18 + + include/linux/srcu.h | 36 +- + include/linux/string.h | 4 +- + include/linux/swait.h | 1 + + include/linux/syscalls.h | 19 +- + include/linux/time.h | 4 +- + include/linux/time32.h | 18 +- + include/linux/time64.h | 17 +- + include/linux/timekeeping.h | 91 ++- + include/linux/timekeeping32.h | 70 +-- + include/linux/uio.h | 15 + + include/trace/events/rcu.h | 13 +- + include/uapi/asm-generic/msgbuf.h | 27 +- + include/uapi/asm-generic/posix_types.h | 1 + + include/uapi/asm-generic/sembuf.h | 26 +- + include/uapi/asm-generic/shmbuf.h | 41 +- + include/uapi/linux/time.h | 7 + + ipc/mqueue.c | 86 +-- + ipc/msg.c | 20 +- + ipc/sem.c | 27 +- + ipc/shm.c | 14 +- + ipc/syscall.c | 13 +- + ipc/util.h | 4 +- + kernel/compat.c | 52 +- + kernel/delayacct.c | 17 +- + kernel/events/core.c | 44 +- + kernel/irq/irq_sim.c | 7 +- + kernel/irq/msi.c | 33 +- + kernel/locking/lockdep.c | 70 +-- + kernel/locking/mcs_spinlock.h | 10 +- + kernel/locking/mutex.c | 3 +- + kernel/locking/qspinlock.c | 247 ++++---- + kernel/locking/qspinlock_paravirt.h | 49 +- + kernel/locking/qspinlock_stat.h | 9 +- + kernel/locking/rwsem-xadd.c | 25 +- + kernel/rcu/rcu.h | 12 +- + kernel/rcu/rcu_segcblist.c | 18 - + kernel/rcu/rcu_segcblist.h | 2 - + kernel/rcu/rcuperf.c | 2 +- + kernel/rcu/rcutorture.c | 15 +- + kernel/rcu/srcutiny.c | 9 +- + kernel/rcu/srcutree.c | 30 +- + kernel/rcu/tree.c | 364 ++++------- + kernel/rcu/tree.h | 36 +- + kernel/rcu/tree_exp.h | 235 ++++--- + kernel/rcu/tree_plugin.h | 98 +-- + kernel/rcu/update.c | 50 +- + kernel/sched/core.c | 53 +- + kernel/sched/cpufreq_schedutil.c | 17 +- + kernel/sched/fair.c | 117 ++-- + kernel/sched/sched.h | 6 + + kernel/softirq.c | 7 +- + kernel/stop_machine.c | 24 +- + kernel/time/clocksource.c | 35 +- + kernel/time/hrtimer.c | 10 +- + kernel/time/posix-stubs.c | 12 +- + kernel/time/posix-timers.c | 24 +- + kernel/time/tick-common.c | 3 +- + kernel/time/time.c | 60 +- + kernel/time/timekeeping.c | 73 +-- + kernel/time/timer.c | 14 +- + kernel/time/timer_list.c | 2 - + kernel/torture.c | 2 +- + kernel/trace/trace_benchmark.c | 4 +- + lib/iov_iter.c | 61 ++ + tools/include/linux/compiler-gcc.h | 3 + + tools/lib/api/fs/tracing_path.c | 40 +- + tools/lib/api/fs/tracing_path.h | 9 +- + tools/lib/symbol/kallsyms.c | 6 + + tools/lib/symbol/kallsyms.h | 2 + + tools/memory-model/Documentation/cheatsheet.txt | 7 +- + tools/memory-model/Documentation/explanation.txt | 221 ++++--- + tools/memory-model/Documentation/references.txt | 17 +- + tools/memory-model/README | 2 +- + tools/memory-model/linux-kernel.bell | 4 +- + tools/memory-model/linux-kernel.cat | 41 +- + tools/memory-model/linux-kernel.def | 34 +- + tools/memory-model/litmus-tests/.gitignore | 1 + + .../litmus-tests/IRIW+mbonceonces+OnceOnce.litmus | 2 +- + .../MP+polockmbonce+poacquiresilsil.litmus | 35 ++ + .../MP+polockonce+poacquiresilsil.litmus | 34 + + tools/memory-model/litmus-tests/README | 19 +- + .../WRC+pooncerelease+rmbonceonce+Once.litmus | 4 +- + tools/memory-model/lock.cat | 107 +++- + tools/memory-model/scripts/checkalllitmus.sh | 73 +++ + tools/memory-model/scripts/checklitmus.sh | 86 +++ + tools/perf/Documentation/Makefile | 29 +- + tools/perf/Documentation/asciidoctor-extensions.rb | 29 + + tools/perf/Documentation/perf-buildid-cache.txt | 7 +- + tools/perf/Documentation/perf-stat.txt | 16 + + tools/perf/Makefile.config | 14 + + tools/perf/Makefile.perf | 10 + + tools/perf/arch/arm/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/arm64/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 3 +- + tools/perf/arch/x86/tests/dwarf-unwind.c | 2 +- + tools/perf/arch/x86/util/Build | 2 + + tools/perf/arch/x86/util/event.c | 76 +++ + tools/perf/arch/x86/util/machine.c | 103 ++++ + tools/perf/builtin-annotate.c | 9 +- + tools/perf/builtin-buildid-cache.c | 81 ++- + tools/perf/builtin-inject.c | 4 +- + tools/perf/builtin-kallsyms.c | 2 +- + tools/perf/builtin-kmem.c | 6 +- + tools/perf/builtin-report.c | 27 +- + tools/perf/builtin-script.c | 56 +- + tools/perf/builtin-stat.c | 92 ++- + tools/perf/builtin-timechart.c | 8 +- + tools/perf/builtin-top.c | 9 +- + tools/perf/builtin-trace.c | 11 +- + tools/perf/check-headers.sh | 30 +- + tools/perf/examples/bpf/5sec.c | 49 ++ + tools/perf/examples/bpf/empty.c | 3 + + tools/perf/include/bpf/bpf.h | 13 + + tools/perf/perf.c | 24 +- + tools/perf/tests/builtin-test.c | 9 + + tools/perf/tests/code-reading.c | 5 +- + tools/perf/tests/hists_common.c | 6 +- + tools/perf/tests/mmap-thread-lookup.c | 7 +- + tools/perf/tests/parse-events.c | 22 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 12 +- + tools/perf/tests/vmlinux-kallsyms.c | 20 +- + tools/perf/ui/browsers/annotate.c | 8 + + tools/perf/ui/browsers/map.c | 2 +- + tools/perf/ui/stdio/hist.c | 3 +- + tools/perf/util/Build | 2 + + tools/perf/util/annotate.c | 57 +- + tools/perf/util/annotate.h | 11 +- + tools/perf/util/auxtrace.c | 12 +- + tools/perf/util/build-id.c | 4 +- + tools/perf/util/config.c | 16 +- + tools/perf/util/config.h | 1 - + tools/perf/util/cs-etm.c | 4 +- + tools/perf/util/db-export.c | 7 +- + tools/perf/util/dso.c | 34 +- + tools/perf/util/dso.h | 37 +- + tools/perf/util/env.c | 31 + + tools/perf/util/env.h | 3 + + tools/perf/util/event.c | 73 ++- + tools/perf/util/event.h | 8 + + tools/perf/util/evlist.c | 15 + + tools/perf/util/evlist.h | 3 + + tools/perf/util/evsel.c | 2 +- + tools/perf/util/genelf.c | 2 +- + tools/perf/util/intel-bts.c | 3 +- + tools/perf/util/intel-pt.c | 8 +- + tools/perf/util/llvm-utils.c | 19 +- + tools/perf/util/machine.c | 355 +++++++---- + tools/perf/util/machine.h | 72 ++- + tools/perf/util/map.c | 121 ++-- + tools/perf/util/map.h | 74 +-- + tools/perf/util/parse-events.c | 73 ++- + tools/perf/util/probe-event.c | 29 +- + tools/perf/util/probe-file.c | 3 +- + tools/perf/util/session.c | 13 +- + tools/perf/util/sort.c | 10 +- + tools/perf/util/sort.h | 4 +- + tools/perf/util/srcline.c | 1 + + tools/perf/util/stat.h | 3 +- + tools/perf/util/symbol-elf.c | 494 +++++++++------ + tools/perf/util/symbol-minimal.c | 3 +- + tools/perf/util/symbol.c | 264 ++++---- + tools/perf/util/symbol.h | 24 +- + tools/perf/util/symbol_fprintf.c | 4 +- + tools/perf/util/thread.c | 35 +- + tools/perf/util/thread.h | 13 +- + tools/perf/util/trace-event-info.c | 11 +- + tools/perf/util/trace-event.c | 8 +- + tools/perf/util/unwind-libdw.c | 23 +- + tools/perf/util/unwind-libunwind-local.c | 19 +- + tools/perf/util/util.c | 34 +- + tools/perf/util/util.h | 4 +- + tools/perf/util/vdso.c | 6 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 56 ++ + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 12 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 4 - + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 1 - + .../selftests/rcutorture/bin/parse-console.sh | 115 +++- + .../selftests/rcutorture/bin/parse-torture.sh | 105 ---- + 427 files changed, 7715 insertions(+), 4329 deletions(-) + delete mode 100644 arch/alpha/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/msgbuf.h + delete mode 100644 arch/alpha/include/uapi/asm/sembuf.h + delete mode 100644 arch/alpha/include/uapi/asm/shmbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/ipcbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/msgbuf.h + delete mode 100644 arch/ia64/include/uapi/asm/sembuf.h + delete mode 100644 arch/ia64/include/uapi/asm/shmbuf.h + delete mode 100644 arch/s390/include/uapi/asm/msgbuf.h + delete mode 100644 arch/s390/include/uapi/asm/sembuf.h + delete mode 100644 arch/s390/include/uapi/asm/shmbuf.h + create mode 100644 arch/x86/hyperv/hv_apic.c + create mode 100644 arch/x86/include/asm/cacheinfo.h + rename arch/x86/kernel/cpu/{intel_cacheinfo.c => cacheinfo.c} (95%) + rename arch/x86/kernel/cpu/mtrr/{main.c => mtrr.c} (96%) + create mode 100644 drivers/firmware/efi/cper-x86.c + create mode 100644 drivers/irqchip/irq-gic-v3-mbi.c + delete mode 100644 drivers/irqchip/irq-mvebu-gicp.h + create mode 100644 include/asm-generic/compat.h + create mode 100644 include/linux/compat_time.h + create mode 100644 tools/memory-model/litmus-tests/.gitignore + create mode 100644 tools/memory-model/litmus-tests/MP+polockmbonce+poacquiresilsil.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+polockonce+poacquiresilsil.litmus + create mode 100644 tools/memory-model/scripts/checkalllitmus.sh + create mode 100644 tools/memory-model/scripts/checklitmus.sh + create mode 100644 tools/perf/Documentation/asciidoctor-extensions.rb + create mode 100644 tools/perf/arch/x86/util/event.c + create mode 100644 tools/perf/arch/x86/util/machine.c + create mode 100644 tools/perf/examples/bpf/5sec.c + create mode 100644 tools/perf/examples/bpf/empty.c + create mode 100644 tools/perf/include/bpf/bpf.h + create mode 100755 tools/testing/selftests/rcutorture/bin/kvm-find-errors.sh + delete mode 100755 tools/testing/selftests/rcutorture/bin/parse-torture.sh +Merging clockevents/clockevents/next (6bd9549d8a7d clocksource/drivers/arc_timer: Add comments about locking while read GFRC) +$ git merge clockevents/clockevents/next +Already up to date. +Merging edac/linux_next (345fb0a9a634 Merge tag 'edac_for_4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp) +$ git merge edac/linux_next +Already up to date. +Merging edac-amd/for-next (eaa3a1d46cfd EDAC, ghes: Make platform-based whitelisting x86-only) +$ git merge edac-amd/for-next +Auto-merging Documentation/devicetree/bindings/edac/socfpga-eccmgr.txt +Merge made by the 'recursive' strategy. + .../{arm/altera => edac}/socfpga-eccmgr.txt | 35 ++ + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 6 +- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 83 +++- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 44 +- + drivers/acpi/apei/ghes.c | 16 +- + drivers/edac/Kconfig | 3 +- + drivers/edac/altera_edac.c | 504 ++++++++++++++++++++- + drivers/edac/altera_edac.h | 132 +++++- + drivers/edac/ghes_edac.c | 55 ++- + drivers/edac/i7core_edac.c | 2 +- + include/acpi/ghes.h | 7 +- + 11 files changed, 817 insertions(+), 70 deletions(-) + rename Documentation/devicetree/bindings/{arm/altera => edac}/socfpga-eccmgr.txt (87%) +Merging irqchip/irq/irqchip-next (6a88c221acba ARM: dts: stm32: Add exti support to stm32mp157 pinctrl) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (a9235b544a0a ring-buffer: Fix typo in comment) +$ git merge ftrace/for-next +Auto-merging scripts/Makefile.build +Auto-merging include/linux/trace_events.h +Auto-merging Documentation/trace/ftrace.rst +Merge made by the 'recursive' strategy. + Documentation/trace/events.rst | 6 +- + Documentation/trace/ftrace.rst | 5 + + Documentation/trace/histogram.txt | 545 ++++++++++++++++++++- + include/linux/ring_buffer.h | 2 +- + include/linux/trace_events.h | 3 +- + include/trace/trace_events.h | 1 + + kernel/trace/ring_buffer.c | 20 +- + kernel/trace/trace.c | 19 + + kernel/trace/trace.h | 9 +- + kernel/trace/trace_entries.h | 6 +- + kernel/trace/trace_events.c | 36 +- + kernel/trace/trace_events_filter.c | 23 +- + kernel/trace/trace_events_hist.c | 2 +- + kernel/trace/trace_events_trigger.c | 6 +- + kernel/trace/trace_export.c | 9 +- + kernel/tracepoint.c | 3 +- + scripts/Makefile.build | 6 + + tools/testing/selftests/ftrace/test.d/functions | 23 +- + .../test.d/trigger/trigger-trace-marker-hist.tc | 49 ++ + .../trigger/trigger-trace-marker-snapshot.tc | 74 +++ + .../trigger-trace-marker-synthetic-kernel.tc | 68 +++ + .../trigger/trigger-trace-marker-synthetic.tc | 66 +++ + 22 files changed, 927 insertions(+), 54 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-hist.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-snapshot.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic-kernel.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-trace-marker-synthetic.tc +Merging rcu/rcu/next (3b46bd8383ac rcu: Add diagnostics for rcutorture writer stall warning) +$ git merge rcu/rcu/next +Removing tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + .../Design/Data-Structures/Data-Structures.html | 118 +-- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 22 +- + .../Design/Memory-Ordering/TreeRCU-gp-cleanup.svg | 123 +-- + .../Design/Memory-Ordering/TreeRCU-gp-init-1.svg | 16 +- + .../Design/Memory-Ordering/TreeRCU-gp-init-3.svg | 56 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 237 ++--- + .../RCU/Design/Memory-Ordering/TreeRCU-qs.svg | 12 +- + Documentation/RCU/stallwarn.txt | 24 +- + Documentation/admin-guide/kernel-parameters.txt | 4 +- + include/linux/rcupdate.h | 20 +- + include/linux/rcutiny.h | 2 +- + include/linux/srcu.h | 17 + + include/linux/torture.h | 4 +- + include/trace/events/rcu.h | 112 ++- + kernel/locking/locktorture.c | 5 +- + kernel/rcu/rcu.h | 111 ++- + kernel/rcu/rcuperf.c | 57 +- + kernel/rcu/rcutorture.c | 185 ++-- + kernel/rcu/srcutree.c | 36 +- + kernel/rcu/tiny.c | 4 +- + kernel/rcu/tree.c | 959 +++++++++++---------- + kernel/rcu/tree.h | 71 +- + kernel/rcu/tree_exp.h | 5 +- + kernel/rcu/tree_plugin.h | 174 ++-- + kernel/rcu/update.c | 45 +- + kernel/torture.c | 15 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 26 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 11 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 1 + + .../selftests/rcutorture/bin/kvm-recheck.sh | 1 + + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 5 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 7 + + .../selftests/rcutorture/configs/rcu/TREE03.boot | 4 +- + .../selftests/rcutorture/configs/rcu/TREE08-T.boot | 1 - + .../rcutorture/configs/rcu/ver_functions.sh | 2 +- + 36 files changed, 1332 insertions(+), 1162 deletions(-) + delete mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE08-T.boot +Merging kvm/linux-next (d7a8bea3638d Merge tag 'kvm-s390-next-4.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge kvm/linux-next +Auto-merging virt/kvm/arm/arm.c +Auto-merging include/linux/sched.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/lapic.c +Auto-merging arch/x86/kvm/hyperv.c +CONFLICT (content): Merge conflict in arch/x86/kvm/hyperv.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/s390/kvm/priv.c +Auto-merging arch/arm64/kvm/hyp/switch.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/kvm/hyp/hyp-entry.S +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/include/asm/thread_info.h +Auto-merging arch/arm64/include/asm/processor.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/processor.h +Auto-merging arch/arm64/include/asm/kvm_host.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/kvm_asm.h +Auto-merging arch/arm64/include/asm/cpufeature.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/include/asm/kvm_host.h +Resolved 'arch/arm64/include/asm/cpufeature.h' using previous resolution. +Resolved 'arch/arm64/include/asm/kvm_host.h' using previous resolution. +Resolved 'arch/arm64/include/asm/processor.h' using previous resolution. +Resolved 'arch/arm64/kvm/hyp/switch.c' using previous resolution. +Resolved 'arch/x86/kvm/hyperv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 4c626cfb3c73] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 27 +- + Documentation/virtual/kvm/devices/arm-vgic-v3.txt | 30 +- + Documentation/virtual/kvm/mmu.txt | 2 +- + arch/arm/include/asm/kvm_host.h | 10 +- + arch/arm/include/uapi/asm/kvm.h | 1 + + arch/arm64/Kconfig | 7 + + arch/arm64/include/asm/cpufeature.h | 29 -- + arch/arm64/include/asm/fpsimd.h | 21 ++ + arch/arm64/include/asm/kvm_asm.h | 8 +- + arch/arm64/include/asm/kvm_host.h | 45 ++- + arch/arm64/include/asm/processor.h | 15 +- + arch/arm64/include/asm/thread_info.h | 13 +- + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/fpsimd.c | 177 +++++------ + arch/arm64/kernel/ptrace.c | 1 + + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/debug.c | 8 +- + arch/arm64/kvm/fpsimd.c | 110 +++++++ + arch/arm64/kvm/hyp/debug-sr.c | 6 +- + arch/arm64/kvm/hyp/entry.S | 43 --- + arch/arm64/kvm/hyp/hyp-entry.S | 19 -- + arch/arm64/kvm/hyp/switch.c | 124 +++++--- + arch/arm64/kvm/hyp/sysreg-sr.c | 4 +- + arch/arm64/kvm/sys_regs.c | 9 +- + arch/s390/include/asm/ctl_reg.h | 12 + + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/include/asm/mmu.h | 2 +- + arch/s390/include/asm/mmu_context.h | 2 +- + arch/s390/include/asm/pgtable.h | 4 +- + arch/s390/kvm/guestdbg.c | 2 +- + arch/s390/kvm/interrupt.c | 20 +- + arch/s390/kvm/kvm-s390.c | 59 ++-- + arch/s390/kvm/kvm-s390.h | 13 + + arch/s390/kvm/priv.c | 28 +- + arch/s390/kvm/vsie.c | 10 +- + arch/s390/mm/gmap.c | 6 +- + arch/s390/mm/pgtable.c | 4 +- + arch/x86/hyperv/mmu.c | 28 +- + arch/x86/include/asm/hyperv-tlfs.h | 25 +- + arch/x86/include/asm/kvm_host.h | 7 +- + arch/x86/include/asm/mshyperv.h | 2 +- + arch/x86/include/asm/vmx.h | 2 + + arch/x86/kvm/cpuid.c | 3 +- + arch/x86/kvm/emulate.c | 4 +- + arch/x86/kvm/hyperv.c | 171 +++++++++- + arch/x86/kvm/lapic.c | 12 +- + arch/x86/kvm/lapic.h | 14 + + arch/x86/kvm/mmu.c | 78 ++--- + arch/x86/kvm/svm.c | 12 +- + arch/x86/kvm/trace.h | 51 +++ + arch/x86/kvm/vmx.c | 363 +++++++++++++++++----- + arch/x86/kvm/x86.c | 35 ++- + include/kvm/arm_vgic.h | 17 +- + include/linux/kvm_host.h | 12 + + include/linux/sched.h | 6 + + include/linux/thread_info.h | 11 + + include/uapi/linux/kvm.h | 1 + + virt/kvm/Kconfig | 3 + + virt/kvm/arm/arm.c | 15 +- + virt/kvm/arm/vgic/vgic-init.c | 100 +++--- + virt/kvm/arm/vgic/vgic-kvm-device.c | 53 +++- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 112 ++++++- + virt/kvm/arm/vgic/vgic-v3.c | 99 +++++- + virt/kvm/arm/vgic/vgic.h | 42 ++- + virt/kvm/kvm_main.c | 41 ++- + 66 files changed, 1586 insertions(+), 609 deletions(-) + create mode 100644 arch/arm64/kvm/fpsimd.c +Merging kvm-arm/next (e25028c8ded0 KVM: arm/arm64: Bump VGIC_V3_MAX_CPUS to 512) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (deeb879de955 KVM: PPC: Book3S PR: Enable kvmppc_get/set_one_reg_pr() for HTM registers) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/asm-prototypes.h +Merge made by the 'recursive' strategy. + arch/powerpc/include/asm/asm-prototypes.h | 6 + + arch/powerpc/include/asm/kvm_book3s.h | 37 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 20 +- + arch/powerpc/include/asm/kvm_booke.h | 20 +- + arch/powerpc/include/asm/kvm_host.h | 21 +- + arch/powerpc/include/asm/kvm_ppc.h | 17 +- + arch/powerpc/include/asm/reg.h | 1 + + arch/powerpc/include/uapi/asm/kvm.h | 1 + + arch/powerpc/kernel/asm-offsets.c | 18 +- + arch/powerpc/kvm/Makefile | 3 + + arch/powerpc/kvm/book3s.c | 10 +- + arch/powerpc/kvm/book3s.h | 6 + + arch/powerpc/kvm/book3s_32_mmu.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu.c | 11 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 3 + + arch/powerpc/kvm/book3s_64_mmu_radix.c | 348 +++++++++----- + arch/powerpc/kvm/book3s_64_vio.c | 71 ++- + arch/powerpc/kvm/book3s_64_vio_hv.c | 54 ++- + arch/powerpc/kvm/book3s_emulate.c | 369 ++++++++++++++- + arch/powerpc/kvm/book3s_hv.c | 97 +++- + arch/powerpc/kvm/book3s_hv_builtin.c | 21 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 2 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 36 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 318 +++---------- + arch/powerpc/kvm/book3s_hv_tm.c | 10 +- + arch/powerpc/kvm/book3s_hv_tm_builtin.c | 10 +- + arch/powerpc/kvm/book3s_pr.c | 437 ++++++++++++++--- + arch/powerpc/kvm/book3s_segment.S | 13 + + arch/powerpc/kvm/book3s_xive_template.c | 4 +- + arch/powerpc/kvm/booke.c | 41 +- + arch/powerpc/kvm/booke_emulate.c | 6 +- + arch/powerpc/kvm/e500_emulate.c | 6 +- + arch/powerpc/kvm/e500_mmu.c | 2 +- + arch/powerpc/kvm/e500_mmu_host.c | 8 +- + arch/powerpc/kvm/emulate_loadstore.c | 752 +++++++++--------------------- + arch/powerpc/kvm/powerpc.c | 311 +++++++++--- + arch/powerpc/kvm/tm.S | 384 +++++++++++++++ + 38 files changed, 2283 insertions(+), 1195 deletions(-) + create mode 100644 arch/powerpc/kvm/tm.S +Merging kvms390/next (2c8180e885c1 KVM: s390: vsie: simplify < 8k address checks) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (7f47e1c52d0c xen/PVH: Make GDT selectors PVH-specific) +$ git merge xen-tip/linux-next +Auto-merging arch/x86/xen/mmu.c +Merge made by the 'recursive' strategy. + arch/arm/xen/enlighten.c | 11 ++++ + arch/x86/xen/mmu.c | 60 ++++++++++++----- + arch/x86/xen/xen-pvh.S | 47 ++++++++++--- + drivers/net/xen-netfront.c | 2 +- + drivers/xen/privcmd.c | 135 +++++++++++++++++++++++++++++++++++++- + drivers/xen/xenbus/xenbus_probe.c | 5 +- + include/uapi/xen/privcmd.h | 11 ++++ + include/xen/interface/memory.h | 66 +++++++++++++++++++ + include/xen/interface/xen.h | 7 +- + include/xen/xen-ops.h | 24 ++++++- + 10 files changed, 332 insertions(+), 36 deletions(-) +Merging percpu/for-next (b3a5d1119944 percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (197f6accacda workqueue: Make sure struct worker is accessible for wq_worker_comm()) +$ git merge workqueues/for-next +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/base.c +Auto-merging fs/proc/array.c +Merge made by the 'recursive' strategy. + fs/proc/array.c | 33 ++++++----- + fs/proc/base.c | 5 +- + fs/proc/internal.h | 2 + + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 135 +++++++++++++++++++++++++++++--------------- + kernel/workqueue_internal.h | 3 +- + 6 files changed, 117 insertions(+), 62 deletions(-) +Merging drivers-x86/for-next (64b824649b77 platform/x86: dell-wmi: Ignore new rfkill and fn-lock events) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/asus-wireless.c +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-platform-ideapad-laptop | 13 + + Documentation/laptops/thinkpad-acpi.txt | 2 + + drivers/platform/mellanox/mlxreg-hotplug.c | 54 ++-- + drivers/platform/x86/acer-wmi.c | 1 + + drivers/platform/x86/apple-gmux.c | 2 +- + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-wireless.c | 2 +- + drivers/platform/x86/asus-wmi.c | 3 +- + drivers/platform/x86/dell-smbios-base.c | 5 +- + drivers/platform/x86/dell-wmi.c | 16 +- + drivers/platform/x86/fujitsu-laptop.c | 47 ++-- + drivers/platform/x86/ideapad-laptop.c | 66 ++++- + drivers/platform/x86/intel_scu_ipc.c | 4 +- + drivers/platform/x86/mlx-platform.c | 289 ++++++++++++++++++++- + drivers/platform/x86/samsung-laptop.c | 3 +- + drivers/platform/x86/silead_dmi.c | 92 ++++++- + drivers/platform/x86/thinkpad_acpi.c | 30 ++- + include/linux/platform_data/mlxreg.h | 3 +- + include/linux/string_helpers.h | 1 + + 19 files changed, 560 insertions(+), 76 deletions(-) +Merging chrome-platform/for-next (79a3d60300fc platform/chrome: Use to_cros_ec_dev more broadly) +$ git merge chrome-platform/for-next +Already up to date. +Merging hsi/for-next (70d52ba9e57e hsi: clients: Change return type to vm_fault_t) +$ git merge hsi/for-next +Merge made by the 'recursive' strategy. + drivers/hsi/clients/cmt_speech.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging leds/for-next (6d71021ab3b0 leds: class: ensure workqueue is initialized before setting brightness) +$ git merge leds/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-cr0014114.txt | 54 +++ + .../devicetree/bindings/leds/leds-lm3601x.txt | 45 ++ + .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 41 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/leds/Kconfig | 33 ++ + drivers/leds/Makefile | 3 + + drivers/leds/led-class.c | 10 +- + drivers/leds/leds-cr0014114.c | 315 +++++++++++++ + drivers/leds/leds-lm3601x.c | 487 +++++++++++++++++++++ + drivers/leds/leds-sc27xx-bltc.c | 244 +++++++++++ + drivers/leds/leds-wm831x-status.c | 22 +- + 11 files changed, 1237 insertions(+), 18 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-cr0014114.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3601x.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-sc27xx-bltc.txt + create mode 100644 drivers/leds/leds-cr0014114.c + create mode 100644 drivers/leds/leds-lm3601x.c + create mode 100644 drivers/leds/leds-sc27xx-bltc.c +Merging ipmi/for-next (048f7c3e352e ipmi: Properly release srcu locks on error conditions) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt | 39 + + drivers/char/ipmi/Kconfig | 23 +- + drivers/char/ipmi/Makefile | 1 + + drivers/char/ipmi/ipmi_bt_sm.c | 3 +- + drivers/char/ipmi/ipmi_devintf.c | 129 +- + drivers/char/ipmi/ipmi_msghandler.c | 2123 +++++++++----------- + drivers/char/ipmi/ipmi_poweroff.c | 32 +- + drivers/char/ipmi/ipmi_si_intf.c | 198 +- + drivers/char/ipmi/ipmi_ssif.c | 183 +- + drivers/char/ipmi/ipmi_watchdog.c | 407 ++-- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 215 ++ + include/linux/ipmi.h | 153 +- + include/linux/ipmi_smi.h | 129 +- + 13 files changed, 1752 insertions(+), 1883 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ipmi/npcm7xx-kcs-bmc.txt + create mode 100644 drivers/char/ipmi/kcs_bmc_npcm7xx.c +Merging driver-core/driver-core-next (8c97a46af04b driver core: hold dev's parent lock when needed) +$ git merge driver-core/driver-core-next +Auto-merging include/linux/device.h +CONFLICT (content): Merge conflict in include/linux/device.h +Auto-merging drivers/net/wireless/ath/ath10k/core.c +Auto-merging drivers/base/dd.c +Auto-merging drivers/base/core.c +Resolved 'include/linux/device.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c15525e9950b] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/dell_rbu.txt | 5 +- + .../driver-api/firmware/fallback-mechanisms.rst | 14 +- + .../driver-api/firmware/firmware_cache.rst | 4 +- + .../driver-api/firmware/request_firmware.rst | 5 + + drivers/base/Kconfig | 90 +++--------- + drivers/base/bus.c | 16 +-- + drivers/base/core.c | 18 ++- + drivers/base/dd.c | 8 +- + drivers/base/driver.c | 6 +- + drivers/base/firmware_loader/Kconfig | 154 +++++++++++++++++++++ + drivers/base/firmware_loader/fallback.c | 53 +++++-- + drivers/base/firmware_loader/fallback.h | 18 +-- + drivers/base/firmware_loader/firmware.h | 37 +++-- + drivers/base/firmware_loader/main.c | 57 ++++++-- + drivers/base/memory.c | 8 +- + drivers/net/wireless/ath/ath10k/core.c | 2 +- + drivers/net/wireless/ath/ath10k/testmode.c | 2 +- + drivers/usb/core/driver.c | 1 + + fs/debugfs/file.c | 10 +- + fs/debugfs/inode.c | 4 +- + fs/kernfs/file.c | 8 +- + include/linux/device.h | 4 + + include/linux/firmware.h | 10 ++ + 23 files changed, 372 insertions(+), 162 deletions(-) + create mode 100644 drivers/base/firmware_loader/Kconfig +Merging usb/usb-next (c2ef60fea2dc Revert "xhci: Reset Renesas uPD72020x USB controller for 32-bit DMA issue") +$ git merge usb/usb-next +Removing include/linux/usb/atmel_usba_udc.h +Auto-merging include/linux/tty.h +Auto-merging drivers/usb/serial/usb-serial.c +Removing drivers/usb/musb/musbhsdma.h +Auto-merging drivers/usb/gadget/udc/fsl_udc_core.c +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-usb | 22 + + .../devicetree/bindings/phy/phy-mtk-xsphy.txt | 109 +++ + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 3 +- + .../devicetree/bindings/phy/qcom-qusb2-phy.txt | 23 +- + Documentation/devicetree/bindings/usb/dwc3.txt | 21 + + .../bindings/usb/hisilicon,histb-xhci.txt | 45 ++ + .../devicetree/bindings/usb/qcom,dwc3.txt | 85 ++- + Documentation/driver-api/usb/dwc3.rst | 3 +- + MAINTAINERS | 9 + + drivers/i2c/busses/Kconfig | 3 +- + drivers/nfc/pn533/usb.c | 42 +- + drivers/phy/mediatek/Kconfig | 9 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-xsphy.c | 600 +++++++++++++++ + drivers/phy/motorola/phy-mapphone-mdm6600.c | 85 +++ + drivers/phy/phy-core.c | 18 + + drivers/phy/qualcomm/Kconfig | 11 +- + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-ath79-usb.c | 108 +++ + drivers/phy/qualcomm/phy-qcom-qmp.c | 169 ++++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 5 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 130 +++- + drivers/phy/samsung/phy-exynos-mipi-video.c | 34 +- + drivers/phy/st/phy-stm32-usbphyc.c | 9 +- + drivers/phy/tegra/xusb.c | 15 +- + drivers/platform/x86/Kconfig | 4 +- + drivers/power/supply/power_supply_core.c | 4 +- + drivers/tty/tty_ioctl.c | 2 +- + drivers/usb/chipidea/ci.h | 2 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 3 +- + drivers/usb/chipidea/core.c | 4 +- + drivers/usb/chipidea/debug.c | 56 +- + drivers/usb/class/usbtmc.c | 81 +- + drivers/usb/core/hub.c | 19 +- + drivers/usb/core/hub.h | 1 + + drivers/usb/core/message.c | 2 +- + drivers/usb/core/port.c | 23 + + drivers/usb/core/usb.c | 26 +- + drivers/usb/dwc2/core.c | 7 + + drivers/usb/dwc2/core.h | 188 ++++- + drivers/usb/dwc2/core_intr.c | 8 + + drivers/usb/dwc2/debug.h | 2 +- + drivers/usb/dwc2/debugfs.c | 100 +-- + drivers/usb/dwc2/gadget.c | 334 ++++---- + drivers/usb/dwc2/hcd.c | 3 +- + drivers/usb/dwc2/hcd.h | 14 +- + drivers/usb/dwc2/hcd_ddma.c | 1 + + drivers/usb/dwc2/hcd_intr.c | 12 + + drivers/usb/dwc2/hcd_queue.c | 5 +- + drivers/usb/dwc2/hw.h | 2 + + drivers/usb/dwc2/params.c | 14 +- + drivers/usb/dwc2/pci.c | 6 + + drivers/usb/dwc3/Kconfig | 12 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 154 +++- + drivers/usb/dwc3/core.h | 25 +- + drivers/usb/dwc3/debug.h | 26 +- + drivers/usb/dwc3/debugfs.c | 43 +- + drivers/usb/dwc3/drd.c | 34 +- + drivers/usb/dwc3/dwc3-of-simple.c | 2 +- + drivers/usb/dwc3/dwc3-qcom.c | 619 +++++++++++++++ + drivers/usb/dwc3/ep0.c | 6 +- + drivers/usb/dwc3/gadget.c | 773 +++++++++---------- + drivers/usb/dwc3/gadget.h | 5 +- + drivers/usb/dwc3/trace.h | 12 +- + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/function/f_ecm.c | 3 +- + drivers/usb/gadget/function/f_fs.c | 11 + + drivers/usb/gadget/function/f_midi.c | 26 +- + drivers/usb/gadget/function/f_printer.c | 6 +- + drivers/usb/gadget/function/rndis.c | 3 + + drivers/usb/gadget/function/u_ether.c | 4 + + drivers/usb/gadget/udc/Kconfig | 2 + + drivers/usb/gadget/udc/Makefile | 1 + + drivers/usb/gadget/udc/aspeed-vhub/Kconfig | 7 + + drivers/usb/gadget/udc/aspeed-vhub/Makefile | 4 + + drivers/usb/gadget/udc/aspeed-vhub/core.c | 425 +++++++++++ + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 589 ++++++++++++++ + drivers/usb/gadget/udc/aspeed-vhub/ep0.c | 486 ++++++++++++ + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 843 +++++++++++++++++++++ + drivers/usb/gadget/udc/aspeed-vhub/hub.c | 829 ++++++++++++++++++++ + drivers/usb/gadget/udc/aspeed-vhub/vhub.h | 514 +++++++++++++ + drivers/usb/gadget/udc/atmel_usba_udc.c | 93 +-- + drivers/usb/gadget/udc/atmel_usba_udc.h | 5 - + drivers/usb/gadget/udc/bcm63xx_udc.c | 37 +- + drivers/usb/gadget/udc/core.c | 6 + + drivers/usb/gadget/udc/fsl_udc_core.c | 1 + + drivers/usb/gadget/udc/gr_udc.c | 7 +- + drivers/usb/gadget/udc/gr_udc.h | 1 - + drivers/usb/gadget/udc/pxa27x_udc.c | 43 +- + drivers/usb/gadget/udc/pxa27x_udc.h | 3 - + drivers/usb/gadget/udc/renesas_usb3.c | 45 +- + drivers/usb/gadget/udc/s3c2410_udc.c | 17 +- + drivers/usb/gadget/usbstring.c | 2 +- + drivers/usb/host/Kconfig | 7 + + drivers/usb/host/Makefile | 1 + + drivers/usb/host/ehci-dbg.c | 30 +- + drivers/usb/host/ehci-hcd.c | 5 - + drivers/usb/host/fhci-dbg.c | 23 +- + drivers/usb/host/fhci.h | 2 - + drivers/usb/host/fotg210-hcd.c | 34 +- + drivers/usb/host/imx21-dbg.c | 44 +- + drivers/usb/host/isp116x-hcd.c | 17 +- + drivers/usb/host/ohci-at91.c | 2 +- + drivers/usb/host/ohci-dbg.c | 45 +- + drivers/usb/host/ohci-hcd.c | 5 - + drivers/usb/host/ohci.h | 3 - + drivers/usb/host/pci-quirks.c | 20 - + drivers/usb/host/pci-quirks.h | 1 - + drivers/usb/host/uhci-hcd.c | 15 +- + drivers/usb/host/xhci-dbgcap.c | 1 + + drivers/usb/host/xhci-dbgcap.h | 2 +- + drivers/usb/host/xhci-dbgtty.c | 1 + + drivers/usb/host/xhci-debugfs.c | 85 +++ + drivers/usb/host/xhci-histb.c | 410 ++++++++++ + drivers/usb/host/xhci-hub.c | 244 +++--- + drivers/usb/host/xhci-mem.c | 193 +++-- + drivers/usb/host/xhci-mtk-sch.c | 4 +- + drivers/usb/host/xhci-pci.c | 15 +- + drivers/usb/host/xhci-ring.c | 126 +-- + drivers/usb/host/xhci-tegra.c | 176 +++-- + drivers/usb/host/xhci.c | 123 ++- + drivers/usb/host/xhci.h | 106 +-- + drivers/usb/misc/sisusbvga/sisusb.c | 2 +- + drivers/usb/mon/mon_text.c | 37 +- + drivers/usb/mtu3/Kconfig | 3 +- + drivers/usb/mtu3/mtu3.h | 15 +- + drivers/usb/mtu3/mtu3_core.c | 26 +- + drivers/usb/mtu3/mtu3_dr.c | 73 +- + drivers/usb/mtu3/mtu3_gadget.c | 9 +- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 12 +- + drivers/usb/musb/am35x.c | 3 - + drivers/usb/musb/da8xx.c | 3 - + drivers/usb/musb/davinci.c | 49 +- + drivers/usb/musb/musb_core.c | 838 ++++++++++---------- + drivers/usb/musb/musb_core.h | 16 +- + drivers/usb/musb/musb_cppi41.c | 4 +- + drivers/usb/musb/musb_debug.h | 5 +- + drivers/usb/musb/musb_debugfs.c | 44 +- + drivers/usb/musb/musb_dma.h | 10 +- + drivers/usb/musb/musb_dsps.c | 39 +- + drivers/usb/musb/musb_gadget.c | 8 +- + drivers/usb/musb/musb_gadget.h | 10 +- + drivers/usb/musb/musb_host.c | 8 +- + drivers/usb/musb/musb_io.h | 6 +- + drivers/usb/musb/musb_regs.h | 55 -- + drivers/usb/musb/musb_virthub.c | 2 +- + drivers/usb/musb/musbhsdma.c | 74 +- + drivers/usb/musb/musbhsdma.h | 72 -- + drivers/usb/musb/omap2430.c | 5 - + drivers/usb/musb/sunxi.c | 14 +- + drivers/usb/musb/ux500.c | 2 - + drivers/usb/phy/Kconfig | 1 + + drivers/usb/roles/intel-xhci-usb-role-switch.c | 37 +- + drivers/usb/serial/bus.c | 3 +- + drivers/usb/serial/ftdi_sio.c | 194 ++--- + drivers/usb/serial/option.c | 3 +- + drivers/usb/serial/pl2303.c | 16 +- + drivers/usb/serial/usb-serial.c | 2 +- + drivers/usb/storage/uas.c | 6 + + drivers/usb/storage/unusual_devs.h | 9 + + drivers/usb/storage/unusual_uas.h | 9 + + drivers/usb/typec/fusb302/fusb302.c | 16 +- + drivers/usb/typec/mux.c | 2 +- + drivers/usb/typec/tcpm.c | 15 +- + drivers/usb/typec/typec_wcove.c | 30 +- + drivers/usb/usbip/vhci_sysfs.c | 24 +- + include/dt-bindings/phy/phy-qcom-qusb2.h | 37 + + include/linux/power_supply.h | 2 + + include/linux/tty.h | 2 +- + include/linux/usb.h | 10 + + include/linux/usb/atmel_usba_udc.h | 24 - + include/linux/usb/gadget.h | 2 +- + include/linux/usb/musb.h | 15 - + .../selftests/drivers/usb/usbip/usbip_test.sh | 198 +++++ + tools/usb/usbip/libsrc/vhci_driver.c | 32 +- + tools/usb/usbip/libsrc/vhci_driver.h | 3 +- + tools/usb/usbip/src/usbip_detach.c | 46 +- + 178 files changed, 9196 insertions(+), 2936 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-xsphy.txt + create mode 100644 Documentation/devicetree/bindings/usb/hisilicon,histb-xhci.txt + create mode 100644 drivers/phy/mediatek/phy-mtk-xsphy.c + create mode 100644 drivers/phy/qualcomm/phy-ath79-usb.c + create mode 100644 drivers/usb/dwc3/dwc3-qcom.c + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/Kconfig + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/Makefile + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/core.c + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/dev.c + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/ep0.c + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/epn.c + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/hub.c + create mode 100644 drivers/usb/gadget/udc/aspeed-vhub/vhub.h + create mode 100644 drivers/usb/host/xhci-histb.c + delete mode 100644 drivers/usb/musb/musbhsdma.h + create mode 100644 include/dt-bindings/phy/phy-qcom-qusb2.h + delete mode 100644 include/linux/usb/atmel_usba_udc.h + create mode 100755 tools/testing/selftests/drivers/usb/usbip/usbip_test.sh +Merging usb-gadget/next (47265c067c0d usb: dwc2: gadget: Fix coverity issue) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (7041d9c3f01b USB: serial: pl2303: add support for tx xon/xoff flow control) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (8bcf4c0bd7fb usb: chipidea: properly handle host or gadget initialization failure) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. +Merging phy-next/next (c1eb8f83845b phy: mediatek: add XS-PHY driver) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (4b4ecd9cb853 vt: Perform safe console erase only once) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging arch/arm/boot/dts/armada-38x.dtsi +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 + + arch/arm/boot/dts/armada-38x.dtsi | 4 +- + drivers/tty/ipwireless/network.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/nozomi.c | 104 +++++++------- + drivers/tty/pty.c | 3 + + drivers/tty/serial/8250/8250_aspeed_vuart.c | 125 +++++++++++++++++ + drivers/tty/serial/8250/8250_dw.c | 35 ++++- + drivers/tty/serial/8250/8250_early.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 63 +++++---- + drivers/tty/serial/8250/8250_omap.c | 27 +++- + drivers/tty/serial/8250/8250_port.c | 6 +- + drivers/tty/serial/Kconfig | 8 +- + drivers/tty/serial/amba-pl011.c | 16 +++ + drivers/tty/serial/atmel_serial.c | 5 +- + drivers/tty/serial/earlycon.c | 5 +- + drivers/tty/serial/imx.c | 43 +++--- + drivers/tty/serial/msm_serial.c | 23 +++ + drivers/tty/serial/mvebu-uart.c | 64 +++++++++ + drivers/tty/serial/qcom_geni_serial.c | 177 ++++++++++++++++-------- + drivers/tty/serial/samsung.c | 40 ++++-- + drivers/tty/serial/sc16is7xx.c | 5 +- + drivers/tty/serial/serial_core.c | 4 +- + drivers/tty/serial/sh-sci.c | 81 +++++++---- + drivers/tty/serial/sh-sci.h | 4 + + drivers/tty/serial/st-asc.c | 6 +- + drivers/tty/serial/xilinx_uartps.c | 108 ++++++--------- + drivers/tty/vt/vt.c | 16 +-- + include/linux/serial_8250.h | 1 + + include/linux/serial_core.h | 4 +- + include/uapi/linux/tty_flags.h | 2 +- + 31 files changed, 694 insertions(+), 297 deletions(-) +Merging char-misc/char-misc-next (b23220fe054e vmw_balloon: fixing double free when batching mode is off) +$ git merge char-misc/char-misc-next +Auto-merging include/sound/soc-dai.h +Auto-merging drivers/amba/bus.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Removing Documentation/fpga/overview.txt +Removing Documentation/fpga/fpga-region.txt +Removing Documentation/fpga/fpga-mgr.txt +Auto-merging Documentation/driver-api/index.rst +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-vmbus | 40 +- + .../bindings/fpga/lattice-machxo2-spi.txt | 29 + + .../bindings/nvmem/zii,rave-sp-eeprom.txt | 40 + + Documentation/driver-api/fpga/fpga-bridge.rst | 49 + + Documentation/driver-api/fpga/fpga-mgr.rst | 220 ++ + Documentation/driver-api/fpga/fpga-region.rst | 102 + + Documentation/driver-api/fpga/index.rst | 13 + + Documentation/driver-api/fpga/intro.rst | 54 + + Documentation/driver-api/index.rst | 1 + + .../driver-api/soundwire/error_handling.rst | 65 + + Documentation/driver-api/soundwire/index.rst | 3 + + Documentation/driver-api/soundwire/locking.rst | 106 + + Documentation/driver-api/soundwire/stream.rst | 372 +++ + Documentation/fpga/fpga-mgr.txt | 199 -- + Documentation/fpga/fpga-region.txt | 95 - + Documentation/fpga/overview.txt | 23 - + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/misc-devices/ibmvmc.rst | 226 ++ + Documentation/trace/coresight-cpu-debug.txt | 4 +- + MAINTAINERS | 7 + + arch/powerpc/include/asm/hvcall.h | 1 + + drivers/amba/bus.c | 4 +- + drivers/android/Kconfig | 15 +- + drivers/android/binder.c | 17 +- + drivers/android/binder_alloc.c | 6 +- + drivers/char/mspec.c | 11 +- + drivers/firmware/google/Kconfig | 8 + + drivers/firmware/google/Makefile | 1 + + drivers/firmware/google/coreboot_table-acpi.c | 2 +- + drivers/firmware/google/coreboot_table-of.c | 2 +- + drivers/firmware/google/coreboot_table.c | 130 +- + drivers/firmware/google/coreboot_table.h | 72 +- + drivers/firmware/google/framebuffer-coreboot.c | 115 + + drivers/firmware/google/memconsole-coreboot.c | 49 +- + drivers/firmware/google/vpd.c | 43 +- + drivers/fpga/Kconfig | 8 +- + drivers/fpga/Makefile | 1 + + drivers/fpga/altera-cvp.c | 19 +- + drivers/fpga/altera-fpga2sdram.c | 34 +- + drivers/fpga/altera-freeze-bridge.c | 35 +- + drivers/fpga/altera-hps2fpga.c | 37 +- + drivers/fpga/altera-pr-ip-core-plat.c | 13 +- + drivers/fpga/altera-pr-ip-core.c | 31 +- + drivers/fpga/altera-ps-spi.c | 20 +- + drivers/fpga/fpga-bridge.c | 86 +- + drivers/fpga/fpga-mgr.c | 129 +- + drivers/fpga/fpga-region.c | 91 +- + drivers/fpga/ice40-spi.c | 21 +- + drivers/fpga/machxo2-spi.c | 415 ++++ + drivers/fpga/of-fpga-region.c | 28 +- + drivers/fpga/socfpga-a10.c | 28 +- + drivers/fpga/socfpga.c | 32 +- + drivers/fpga/ts73xx-fpga.c | 20 +- + drivers/fpga/xilinx-pr-decoupler.c | 22 +- + drivers/fpga/xilinx-spi.c | 20 +- + drivers/fpga/zynq-fpga.c | 14 +- + drivers/hv/connection.c | 44 +- + drivers/hv/hyperv_vmbus.h | 3 + + drivers/hwtracing/coresight/coresight-cpu-debug.c | 16 +- + .../coresight/coresight-dynamic-replicator.c | 10 +- + drivers/hwtracing/coresight/coresight-etb10.c | 13 +- + drivers/hwtracing/coresight/coresight-etm-cp14.c | 13 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 13 +- + drivers/hwtracing/coresight/coresight-etm-perf.h | 13 +- + drivers/hwtracing/coresight/coresight-etm.h | 13 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 13 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 13 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 13 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 13 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 13 +- + drivers/hwtracing/coresight/coresight-funnel.c | 13 +- + drivers/hwtracing/coresight/coresight-priv.h | 13 +- + drivers/hwtracing/coresight/coresight-replicator.c | 13 +- + drivers/hwtracing/coresight/coresight-stm.c | 13 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 13 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 20 +- + drivers/hwtracing/coresight/coresight-tmc.c | 10 +- + drivers/hwtracing/coresight/coresight-tmc.h | 13 +- + drivers/hwtracing/coresight/coresight-tpiu.c | 13 +- + drivers/hwtracing/coresight/coresight.c | 21 +- + drivers/hwtracing/coresight/of_coresight.c | 13 +- + drivers/hwtracing/stm/ftrace.c | 10 +- + drivers/misc/Kconfig | 14 + + drivers/misc/Makefile | 1 + + drivers/misc/cxl/context.c | 7 +- + drivers/misc/ibmvmc.c | 2418 ++++++++++++++++++++ + drivers/misc/ibmvmc.h | 209 ++ + drivers/misc/sgi-gru/grumain.c | 2 +- + drivers/misc/sgi-gru/grutables.h | 3 +- + drivers/misc/sgi-xp/xpnet.c | 2 +- + drivers/misc/ti-st/st_kim.c | 2 +- + drivers/misc/tifm_7xx1.c | 6 +- + drivers/misc/vmw_balloon.c | 23 +- + drivers/mux/adg792a.c | 5 +- + drivers/nubus/bus.c | 19 +- + drivers/nubus/nubus.c | 2 +- + drivers/nvmem/Kconfig | 6 + + drivers/nvmem/Makefile | 3 + + drivers/nvmem/core.c | 33 +- + drivers/nvmem/meson-efuse.c | 41 +- + drivers/nvmem/rave-sp-eeprom.c | 357 +++ + drivers/slimbus/qcom-ctrl.c | 3 +- + drivers/soundwire/Kconfig | 2 +- + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/bus.c | 43 + + drivers/soundwire/bus.h | 72 + + drivers/soundwire/cadence_master.c | 451 +++- + drivers/soundwire/cadence_master.h | 151 ++ + drivers/soundwire/intel.c | 525 ++++- + drivers/soundwire/intel.h | 4 + + drivers/soundwire/intel_init.c | 3 + + drivers/soundwire/stream.c | 1479 ++++++++++++ + drivers/uio/uio.c | 123 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 1 - + drivers/virt/vboxguest/vboxguest_linux.c | 4 +- + drivers/w1/masters/mxc_w1.c | 20 +- + drivers/w1/w1.c | 2 +- + include/linux/coresight.h | 13 +- + include/linux/fpga/altera-pr-ip-core.h | 13 +- + include/linux/fpga/fpga-bridge.h | 9 +- + include/linux/fpga/fpga-mgr.h | 23 +- + include/linux/fpga/fpga-region.h | 13 +- + include/linux/hyperv.h | 26 +- + include/linux/nubus.h | 2 +- + include/linux/nvmem-provider.h | 11 + + include/linux/soundwire/sdw.h | 332 ++- + include/linux/soundwire/sdw_intel.h | 14 + + include/linux/uio_driver.h | 4 +- + include/sound/soc-dai.h | 23 + + scripts/mod/devicetable-offsets.c | 3 + + scripts/mod/file2alias.c | 11 + + scripts/ver_linux | 81 +- + 132 files changed, 8980 insertions(+), 1233 deletions(-) + create mode 100644 Documentation/devicetree/bindings/fpga/lattice-machxo2-spi.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/zii,rave-sp-eeprom.txt + create mode 100644 Documentation/driver-api/fpga/fpga-bridge.rst + create mode 100644 Documentation/driver-api/fpga/fpga-mgr.rst + create mode 100644 Documentation/driver-api/fpga/fpga-region.rst + create mode 100644 Documentation/driver-api/fpga/index.rst + create mode 100644 Documentation/driver-api/fpga/intro.rst + create mode 100644 Documentation/driver-api/soundwire/error_handling.rst + create mode 100644 Documentation/driver-api/soundwire/locking.rst + create mode 100644 Documentation/driver-api/soundwire/stream.rst + delete mode 100644 Documentation/fpga/fpga-mgr.txt + delete mode 100644 Documentation/fpga/fpga-region.txt + delete mode 100644 Documentation/fpga/overview.txt + create mode 100644 Documentation/misc-devices/ibmvmc.rst + create mode 100644 drivers/firmware/google/framebuffer-coreboot.c + create mode 100644 drivers/fpga/machxo2-spi.c + create mode 100644 drivers/misc/ibmvmc.c + create mode 100644 drivers/misc/ibmvmc.h + create mode 100644 drivers/nvmem/rave-sp-eeprom.c + create mode 100644 drivers/soundwire/stream.c +Merging extcon/extcon-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (3b93c0f4b6ac staging: vc04_services: no need to save the log debufs dentries) +$ git merge staging/staging-next +Auto-merging include/linux/kernel.h +Auto-merging include/linux/iio/common/cros_ec_sensors_core.h +Auto-merging drivers/staging/rtl8723bs/include/hal_phy_reg_8723b.h +Auto-merging drivers/staging/rtl8723bs/include/hal_phy_cfg.h +Auto-merging drivers/staging/rtl8723bs/hal/hal_pwr_seq.c +Auto-merging drivers/staging/rtl8192u/r8192U_core.c +Removing drivers/staging/most/dim2/dim2.h +CONFLICT (modify/delete): drivers/staging/media/atomisp/TODO deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/atomisp/TODO left in tree. +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-module.c +Removing drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c +Auto-merging drivers/staging/lustre/lnet/libcfs/linux-tracefile.c +Auto-merging drivers/staging/lustre/lnet/libcfs/linux-debug.c +Auto-merging drivers/staging/lustre/lnet/libcfs/linux-crypto.c +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h +Removing drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h +Removing drivers/staging/lustre/include/linux/libcfs/libcfs_time.h +Removing drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h +Removing drivers/staging/lustre/include/linux/libcfs/curproc.h +Removing drivers/staging/ks7010/ks7010_sdio.h +Removing drivers/staging/iio/meter/ade7759.c +Removing drivers/staging/iio/meter/ade7758_trigger.c +Removing drivers/staging/iio/meter/ade7758_ring.c +Removing drivers/staging/iio/meter/ade7758_core.c +Removing drivers/staging/iio/meter/ade7758.h +Removing drivers/staging/iio/meter/ade7754.c +Removing drivers/staging/iio/meter/ade7753.c +Removing drivers/staging/iio/light/tsl2x7x.h +Removing drivers/staging/iio/light/tsl2x7x.c +Removing drivers/staging/iio/light/Makefile +Removing drivers/staging/iio/light/Kconfig +Removing drivers/staging/iio/accel/adis16201.c +Removing drivers/staging/goldfish/goldfish_nand_reg.h +Removing drivers/staging/goldfish/goldfish_nand.c +Auto-merging drivers/staging/fsl-dpaa2/ethsw/ethsw.c +Auto-merging drivers/iio/resolver/ad2s1200.c +Auto-merging drivers/iio/common/hid-sensors/hid-sensor-trigger.c +Auto-merging drivers/iio/adc/stm32-dfsdm-adc.c +Auto-merging drivers/iio/accel/adis16209.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/atomisp/TODO +drivers/staging/media/atomisp/TODO: needs merge +rm 'drivers/staging/media/atomisp/TODO' +$ git commit -v -a +[master 09d3237732b8] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-iio | 9 + + .../bindings/iio/adc/amlogic,meson-saradc.txt | 1 + + .../devicetree/bindings/iio/adc/mcp320x.txt | 2 +- + .../devicetree/bindings/iio/adc/st,stm32-adc.txt | 6 +- + .../bindings/iio/adc/st,stm32-dfsdm-adc.txt | 7 +- + .../bindings/iio/afe/current-sense-amplifier.txt | 26 + + .../bindings/iio/afe/current-sense-shunt.txt | 41 + + .../bindings/iio/afe/voltage-divider.txt | 53 + + .../devicetree/bindings/iio/dac/ltc2632.txt | 14 + + .../devicetree/bindings/iio/dac/ti,dac5571.txt | 24 + + .../devicetree/bindings/iio/imu/inv_mpu6050.txt | 12 +- + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 1 + + .../bindings/iio/potentiostat/lmp91000.txt | 9 +- + MAINTAINERS | 23 + + drivers/iio/Kconfig | 2 + + drivers/iio/Makefile | 2 + + drivers/iio/accel/Kconfig | 24 + + drivers/iio/accel/Makefile | 2 + + drivers/iio/accel/adis16201.c | 321 ++ + drivers/{staging => }/iio/accel/adis16209.c | 52 +- + drivers/iio/accel/bmc150-accel-core.c | 23 +- + drivers/iio/accel/mma8452.c | 24 +- + drivers/iio/accel/sca3000.c | 13 +- + drivers/iio/accel/st_accel_i2c.c | 1 + + drivers/iio/adc/ad7791.c | 87 +- + drivers/iio/adc/imx7d_adc.c | 2 +- + drivers/iio/adc/meson_saradc.c | 83 +- + drivers/iio/adc/stm32-adc-core.c | 66 +- + drivers/iio/adc/stm32-adc.c | 47 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 17 +- + drivers/iio/adc/stm32-dfsdm-core.c | 26 + + drivers/iio/adc/stx104.c | 11 + + drivers/iio/adc/ti-ads8688.c | 48 +- + drivers/iio/afe/Kconfig | 19 + + drivers/iio/afe/Makefile | 6 + + drivers/iio/afe/iio-rescale.c | 359 ++ + drivers/iio/amplifiers/ad8366.c | 6 +- + drivers/iio/chemical/atlas-ph-sensor.c | 14 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 3 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 9 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 9 +- + drivers/iio/dac/Kconfig | 33 +- + drivers/iio/dac/Makefile | 3 + + drivers/iio/dac/ad5686-spi.c | 119 + + drivers/iio/dac/ad5686.c | 428 +- + drivers/iio/dac/ad5686.h | 145 + + drivers/iio/dac/ad5696-i2c.c | 102 + + drivers/iio/dac/ltc2632.c | 89 +- + drivers/iio/dac/ti-dac5571.c | 439 ++ + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 284 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 86 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 22 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 47 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 12 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 52 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 10 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 7 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 5 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 5 + + drivers/iio/light/Kconfig | 8 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/cros_ec_light_prox.c | 3 +- + drivers/iio/light/tsl2583.c | 2 +- + drivers/iio/light/tsl2772.c | 1800 ++++++++ + drivers/iio/magnetometer/mag3110.c | 158 +- + drivers/iio/potentiometer/mcp4018.c | 41 +- + drivers/iio/potentiometer/mcp4531.c | 145 +- + drivers/iio/potentiostat/lmp91000.c | 2 + + drivers/iio/pressure/cros_ec_baro.c | 3 +- + drivers/iio/resolver/Kconfig | 17 + + drivers/iio/resolver/Makefile | 5 + + drivers/{staging => }/iio/resolver/ad2s1200.c | 167 +- + drivers/staging/android/Kconfig | 11 +- + drivers/staging/android/Makefile | 1 + + drivers/staging/android/TODO | 9 + + drivers/staging/android/ashmem.h | 6 +- + drivers/staging/android/ion/Kconfig | 2 +- + drivers/staging/android/ion/ion.c | 22 +- + drivers/staging/android/ion/ion.h | 2 +- + drivers/staging/android/ion/ion_page_pool.c | 5 + + drivers/staging/android/uapi/ashmem.h | 6 +- + drivers/staging/android/uapi/ion.h | 2 +- + drivers/staging/android/uapi/vsoc_shm.h | 295 ++ + drivers/staging/android/vsoc.c | 1152 +++++ + drivers/staging/board/armadillo800eva.c | 10 +- + drivers/staging/board/board.c | 5 +- + drivers/staging/comedi/comedi_compat32.c | 12 +- + drivers/staging/comedi/comedi_usb.h | 5 +- + drivers/staging/comedi/comedidev.h | 2 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 6 +- + drivers/staging/emxx_udc/Kconfig | 2 +- + drivers/staging/emxx_udc/TODO | 2 + + drivers/staging/fbtft/TODO | 4 + + drivers/staging/fbtft/fbtft-bus.c | 13 +- + drivers/staging/fsl-dpaa2/Kconfig | 8 + + drivers/staging/fsl-dpaa2/Makefile | 5 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 111 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 49 +- + drivers/staging/fsl-dpaa2/ethernet/dpaa2-ethtool.c | 23 + + drivers/staging/fsl-dpaa2/ethsw/dpsw-cmd.h | 13 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.c | 42 + + drivers/staging/fsl-dpaa2/ethsw/dpsw.h | 6 + + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 39 +- + drivers/staging/fsl-dpaa2/rtc/Makefile | 7 + + drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h | 137 + + drivers/staging/fsl-dpaa2/rtc/dprtc.c | 701 +++ + drivers/staging/fsl-dpaa2/rtc/dprtc.h | 164 + + drivers/staging/fsl-dpaa2/rtc/rtc.c | 229 + + drivers/staging/fsl-dpaa2/rtc/rtc.h | 14 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 28 +- + drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 4 +- + drivers/staging/fsl-mc/include/dpaa2-io.h | 2 +- + drivers/staging/gdm724x/gdm_endian.c | 14 +- + drivers/staging/gdm724x/gdm_endian.h | 14 +- + drivers/staging/gdm724x/gdm_lte.c | 16 +- + drivers/staging/gdm724x/gdm_lte.h | 14 +- + drivers/staging/gdm724x/gdm_mux.c | 14 +- + drivers/staging/gdm724x/gdm_mux.h | 14 +- + drivers/staging/gdm724x/gdm_tty.c | 14 +- + drivers/staging/gdm724x/gdm_tty.h | 14 +- + drivers/staging/gdm724x/gdm_usb.c | 14 +- + drivers/staging/gdm724x/gdm_usb.h | 14 +- + drivers/staging/gdm724x/hci.h | 14 +- + drivers/staging/gdm724x/hci_packet.h | 14 +- + drivers/staging/gdm724x/netlink_k.c | 14 +- + drivers/staging/gdm724x/netlink_k.h | 14 +- + drivers/staging/goldfish/Kconfig | 9 +- + drivers/staging/goldfish/Makefile | 1 - + drivers/staging/goldfish/goldfish_nand.c | 441 -- + drivers/staging/goldfish/goldfish_nand_reg.h | 76 - + drivers/staging/greybus/TODO | 5 + + drivers/staging/greybus/arche-platform.c | 9 +- + drivers/staging/greybus/audio_codec.h | 5 +- + drivers/staging/greybus/audio_topology.c | 2 +- + drivers/staging/greybus/camera.c | 17 +- + drivers/staging/greybus/svc.c | 3 - + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/TODO | 9 +- + drivers/staging/iio/accel/Kconfig | 24 - + drivers/staging/iio/accel/Makefile | 2 - + drivers/staging/iio/accel/adis16201.c | 385 -- + drivers/staging/iio/adc/ad7606_par.c | 6 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/cdc/ad7746.c | 44 +- + drivers/staging/iio/light/Kconfig | 14 - + drivers/staging/iio/light/Makefile | 5 - + drivers/staging/iio/light/tsl2x7x.c | 1889 --------- + drivers/staging/iio/light/tsl2x7x.h | 99 - + drivers/staging/iio/meter/Kconfig | 42 - + drivers/staging/iio/meter/Makefile | 8 - + drivers/staging/iio/meter/ade7753.c | 630 --- + drivers/staging/iio/meter/ade7754.c | 664 --- + drivers/staging/iio/meter/ade7758.h | 183 - + drivers/staging/iio/meter/ade7758_core.c | 955 ----- + drivers/staging/iio/meter/ade7758_ring.c | 177 - + drivers/staging/iio/meter/ade7758_trigger.c | 108 - + drivers/staging/iio/meter/ade7759.c | 558 --- + drivers/staging/iio/meter/ade7854-i2c.c | 238 +- + drivers/staging/iio/meter/ade7854-spi.c | 268 +- + drivers/staging/iio/meter/ade7854.c | 40 +- + drivers/staging/iio/meter/ade7854.h | 16 +- + drivers/staging/iio/resolver/Kconfig | 12 - + drivers/staging/iio/resolver/Makefile | 1 - + drivers/staging/ks7010/eap_packet.h | 76 +- + drivers/staging/ks7010/ks7010_sdio.c | 632 +-- + drivers/staging/ks7010/ks7010_sdio.h | 164 - + drivers/staging/ks7010/ks_hostif.c | 1043 ++--- + drivers/staging/ks7010/ks_hostif.h | 465 +- + drivers/staging/ks7010/ks_wlan.h | 278 +- + drivers/staging/ks7010/ks_wlan_ioctl.h | 7 +- + drivers/staging/ks7010/ks_wlan_net.c | 1118 ++--- + drivers/staging/ks7010/michael_mic.c | 28 +- + drivers/staging/ks7010/michael_mic.h | 11 +- + drivers/staging/lustre/README.txt | 2 +- + drivers/staging/lustre/TODO | 2 +- + .../staging/lustre/include/linux/libcfs/curproc.h | 85 - + .../staging/lustre/include/linux/libcfs/libcfs.h | 103 +- + .../lustre/include/linux/libcfs/libcfs_cpu.h | 217 +- + .../lustre/include/linux/libcfs/libcfs_crypto.h | 3 + + .../lustre/include/linux/libcfs/libcfs_debug.h | 40 + + .../lustre/include/linux/libcfs/libcfs_fail.h | 9 +- + .../lustre/include/linux/libcfs/libcfs_hash.h | 3 + + .../lustre/include/linux/libcfs/libcfs_prim.h | 82 - + .../lustre/include/linux/libcfs/libcfs_string.h | 2 + + .../lustre/include/linux/libcfs/libcfs_time.h | 79 - + .../lustre/include/linux/libcfs/linux/libcfs.h | 133 - + .../lustre/include/linux/libcfs/linux/linux-cpu.h | 78 - + .../lustre/include/linux/libcfs/linux/linux-time.h | 103 - + .../staging/lustre/include/linux/lnet/lib-lnet.h | 8 + + .../lustre/include/uapi/linux/lnet/lnet-dlc.h | 3 +- + .../lustre/include/uapi/linux/lnet/lnetctl.h | 11 - + .../include/uapi/linux/lustre/lustre_fiemap.h | 2 +- + .../lustre/include/uapi/linux/lustre/lustre_idl.h | 8 +- + .../include/uapi/linux/lustre/lustre_ioctl.h | 2 - + .../lustre/include/uapi/linux/lustre/lustre_user.h | 6 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 40 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 24 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 78 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 9 + + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 19 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 3 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 98 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 1 + + drivers/staging/lustre/lnet/libcfs/Makefile | 19 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 9 +- + drivers/staging/lustre/lnet/libcfs/fail.c | 4 + + drivers/staging/lustre/lnet/libcfs/hash.c | 5 +- + drivers/staging/lustre/lnet/libcfs/libcfs_cpu.c | 942 ++++- + drivers/staging/lustre/lnet/libcfs/libcfs_lock.c | 3 + + drivers/staging/lustre/lnet/libcfs/libcfs_mem.c | 6 +- + drivers/staging/lustre/lnet/libcfs/libcfs_string.c | 6 + + .../lnet/libcfs/{linux => }/linux-crypto-adler.c | 0 + .../lustre/lnet/libcfs/{linux => }/linux-crypto.c | 10 +- + .../lustre/lnet/libcfs/{linux => }/linux-crypto.h | 0 + .../lustre/lnet/libcfs/{linux => }/linux-debug.c | 5 +- + .../lnet/libcfs/{linux => }/linux-tracefile.c | 5 +- + .../staging/lustre/lnet/libcfs/linux/linux-cpu.c | 1079 ----- + .../lustre/lnet/libcfs/linux/linux-module.c | 197 - + drivers/staging/lustre/lnet/libcfs/module.c | 296 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 27 +- + drivers/staging/lustre/lnet/libcfs/tracefile.h | 11 + + drivers/staging/lustre/lnet/lnet/api-ni.c | 6 +- + drivers/staging/lustre/lnet/lnet/config.c | 1 + + drivers/staging/lustre/lnet/lnet/lib-eq.c | 2 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 16 +- + drivers/staging/lustre/lnet/lnet/lib-socket.c | 1 - + drivers/staging/lustre/lnet/lnet/module.c | 42 +- + drivers/staging/lustre/lnet/lnet/net_fault.c | 40 +- + drivers/staging/lustre/lnet/lnet/nidstrings.c | 3 + + drivers/staging/lustre/lnet/lnet/peer.c | 2 +- + drivers/staging/lustre/lnet/lnet/router.c | 17 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 16 +- + drivers/staging/lustre/lnet/selftest/conctl.c | 28 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 15 +- + drivers/staging/lustre/lnet/selftest/conrpc.h | 1 - + drivers/staging/lustre/lnet/selftest/console.c | 15 +- + drivers/staging/lustre/lnet/selftest/console.h | 4 +- + drivers/staging/lustre/lnet/selftest/framework.c | 4 +- + drivers/staging/lustre/lnet/selftest/module.c | 6 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 1 - + drivers/staging/lustre/lnet/selftest/timer.c | 4 +- + drivers/staging/lustre/lustre/fid/fid_internal.h | 1 - + drivers/staging/lustre/lustre/fid/fid_lib.c | 1 - + drivers/staging/lustre/lustre/fid/fid_request.c | 70 +- + drivers/staging/lustre/lustre/fid/lproc_fid.c | 1 - + drivers/staging/lustre/lustre/fld/fld_cache.c | 1 - + drivers/staging/lustre/lustre/fld/fld_internal.h | 1 - + drivers/staging/lustre/lustre/fld/fld_request.c | 63 +- + drivers/staging/lustre/lustre/fld/lproc_fld.c | 1 - + drivers/staging/lustre/lustre/include/cl_object.h | 10 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 34 +- + drivers/staging/lustre/lustre/include/lu_object.h | 42 +- + drivers/staging/lustre/lustre/include/lustre_acl.h | 7 +- + .../staging/lustre/lustre/include/lustre_compat.h | 1 + + .../staging/lustre/lustre/include/lustre_disk.h | 1 - + drivers/staging/lustre/lustre/include/lustre_dlm.h | 20 +- + .../staging/lustre/lustre/include/lustre_export.h | 9 +- + drivers/staging/lustre/lustre/include/lustre_fld.h | 1 - + .../staging/lustre/lustre/include/lustre_handles.h | 2 - + .../staging/lustre/lustre/include/lustre_import.h | 1 + + .../staging/lustre/lustre/include/lustre_intent.h | 2 + + drivers/staging/lustre/lustre/include/lustre_lib.h | 22 +- + drivers/staging/lustre/lustre/include/lustre_mds.h | 1 - + drivers/staging/lustre/lustre/include/lustre_net.h | 11 +- + .../lustre/include/lustre_patchless_compat.h | 1 + + drivers/staging/lustre/lustre/include/lustre_sec.h | 2 + + drivers/staging/lustre/lustre/include/obd.h | 35 +- + drivers/staging/lustre/lustre/include/obd_class.h | 36 +- + .../staging/lustre/lustre/include/obd_support.h | 28 - + drivers/staging/lustre/lustre/ldlm/l_lock.c | 1 - + drivers/staging/lustre/lustre/ldlm/ldlm_extent.c | 1 - + drivers/staging/lustre/lustre/ldlm/ldlm_flock.c | 11 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lib.c | 1 - + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 25 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 20 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 18 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 67 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 107 +- + drivers/staging/lustre/lustre/llite/Makefile | 2 + + drivers/staging/lustre/lustre/llite/acl.c | 108 + + drivers/staging/lustre/lustre/llite/dir.c | 4 +- + drivers/staging/lustre/lustre/llite/file.c | 40 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 1 - + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 9 +- + .../staging/lustre/lustre/llite/llite_internal.h | 11 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 14 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 14 +- + drivers/staging/lustre/lustre/llite/llite_nfs.c | 2 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 81 +- + drivers/staging/lustre/lustre/llite/namei.c | 11 +- + drivers/staging/lustre/lustre/llite/range_lock.c | 1 + + drivers/staging/lustre/lustre/llite/range_lock.h | 2 +- + drivers/staging/lustre/lustre/llite/statahead.c | 10 +- + drivers/staging/lustre/lustre/llite/super25.c | 4 + + drivers/staging/lustre/lustre/llite/vvp_dev.c | 167 +- + drivers/staging/lustre/lustre/llite/vvp_internal.h | 8 +- + drivers/staging/lustre/lustre/llite/vvp_object.c | 2 - + drivers/staging/lustre/lustre/llite/xattr.c | 231 +- + drivers/staging/lustre/lustre/llite/xattr_cache.c | 83 +- + drivers/staging/lustre/lustre/lmv/lmv_intent.c | 12 +- + drivers/staging/lustre/lustre/lmv/lmv_internal.h | 2 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 60 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 20 +- + drivers/staging/lustre/lustre/lov/lov_ea.c | 1 - + drivers/staging/lustre/lustre/lov/lov_internal.h | 13 +- + drivers/staging/lustre/lustre/lov/lov_merge.c | 4 +- + drivers/staging/lustre/lustre/lov/lov_obd.c | 36 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 8 +- + drivers/staging/lustre/lustre/lov/lov_offset.c | 2 - + drivers/staging/lustre/lustre/lov/lov_pool.c | 184 +- + drivers/staging/lustre/lustre/lov/lov_request.c | 6 +- + drivers/staging/lustre/lustre/mdc/mdc_internal.h | 8 +- + drivers/staging/lustre/lustre/mdc/mdc_lib.c | 17 +- + drivers/staging/lustre/lustre/mdc/mdc_locks.c | 95 +- + drivers/staging/lustre/lustre/mdc/mdc_reint.c | 4 +- + drivers/staging/lustre/lustre/mdc/mdc_request.c | 48 +- + drivers/staging/lustre/lustre/mgc/mgc_internal.h | 1 - + drivers/staging/lustre/lustre/mgc/mgc_request.c | 7 + + drivers/staging/lustre/lustre/obdclass/cl_io.c | 1 - + drivers/staging/lustre/lustre/obdclass/cl_object.c | 2 - + drivers/staging/lustre/lustre/obdclass/cl_page.c | 1 - + drivers/staging/lustre/lustre/obdclass/class_obd.c | 15 +- + drivers/staging/lustre/lustre/obdclass/genops.c | 50 +- + .../staging/lustre/lustre/obdclass/kernelcomm.c | 2 + + .../lustre/lustre/obdclass/linux/linux-module.c | 23 +- + drivers/staging/lustre/lustre/obdclass/llog.c | 3 +- + .../lustre/lustre/obdclass/lprocfs_counters.c | 1 + + .../lustre/lustre/obdclass/lprocfs_status.c | 150 +- + drivers/staging/lustre/lustre/obdclass/lu_object.c | 266 +- + drivers/staging/lustre/lustre/obdclass/lu_ref.c | 2 - + .../lustre/lustre/obdclass/lustre_handles.c | 1 + + .../staging/lustre/lustre/obdclass/obd_config.c | 163 +- + drivers/staging/lustre/lustre/obdclass/obd_mount.c | 1 + + drivers/staging/lustre/lustre/obdclass/uuid.c | 2 - + .../staging/lustre/lustre/obdecho/echo_client.c | 9 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 15 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 4 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 12 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 9 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 1 - + drivers/staging/lustre/lustre/osc/osc_object.c | 11 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 4 +- + drivers/staging/lustre/lustre/osc/osc_quota.c | 136 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 50 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 20 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 164 +- + drivers/staging/lustre/lustre/ptlrpc/errno.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/import.c | 11 +- + drivers/staging/lustre/lustre/ptlrpc/layout.c | 4 +- + drivers/staging/lustre/lustre/ptlrpc/llog_client.c | 2 - + drivers/staging/lustre/lustre/ptlrpc/llog_net.c | 2 - + .../staging/lustre/lustre/ptlrpc/lproc_ptlrpc.c | 42 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/nrs.c | 3 +- + drivers/staging/lustre/lustre/ptlrpc/nrs_fifo.c | 3 +- + .../staging/lustre/lustre/ptlrpc/pack_generic.c | 2 - + drivers/staging/lustre/lustre/ptlrpc/pinger.c | 23 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_module.c | 4 + + drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c | 14 +- + drivers/staging/lustre/lustre/ptlrpc/sec.c | 8 +- + drivers/staging/lustre/lustre/ptlrpc/sec_lproc.c | 41 +- + drivers/staging/lustre/lustre/ptlrpc/service.c | 21 +- + drivers/staging/lustre/lustre/ptlrpc/wiretest.c | 4 +- + drivers/staging/most/cdev/cdev.c | 16 +- + drivers/staging/most/core.c | 68 +- + drivers/staging/most/core.h | 4 + + drivers/staging/most/dim2/Kconfig | 2 +- + drivers/staging/most/dim2/dim2.c | 397 +- + drivers/staging/most/dim2/dim2.h | 21 - + drivers/staging/most/dim2/hal.c | 9 +- + drivers/staging/most/dim2/reg.h | 84 +- + drivers/staging/most/i2c/i2c.c | 140 +- + drivers/staging/most/sound/sound.c | 123 +- + drivers/staging/most/usb/usb.c | 55 +- + drivers/staging/most/video/video.c | 32 - + drivers/staging/mt7621-dts/gbpc1.dts | 3 +- + drivers/staging/mt7621-dts/mt7621.dtsi | 24 +- + drivers/staging/mt7621-eth/ethtool.c | 54 +- + drivers/staging/mt7621-eth/gsw_mt7620.h | 4 +- + drivers/staging/mt7621-eth/gsw_mt7621.c | 10 +- + drivers/staging/mt7621-eth/mdio.c | 6 +- + drivers/staging/mt7621-eth/mtk_eth_soc.c | 44 +- + drivers/staging/mt7621-eth/mtk_eth_soc.h | 33 +- + drivers/staging/mt7621-eth/soc_mt7621.c | 7 +- + drivers/staging/mt7621-gpio/TODO | 2 - + drivers/staging/mt7621-gpio/gpio-mt7621.c | 200 +- + .../staging/mt7621-gpio/mediatek,mt7621-gpio.txt | 68 + + drivers/staging/mt7621-mmc/board.h | 82 +- + drivers/staging/mt7621-mmc/dbg.c | 398 +- + drivers/staging/mt7621-mmc/dbg.h | 97 +- + drivers/staging/mt7621-mmc/mt6575_sd.h | 1087 +++-- + drivers/staging/mt7621-mmc/sd.c | 4458 +++++++++----------- + drivers/staging/mt7621-pci/pci-mt7621.c | 481 +-- + drivers/staging/mt7621-pinctrl/pinctrl-rt2880.c | 1 - + drivers/staging/mt7621-spi/spi-mt7621.c | 4 - + drivers/staging/nvec/nvec.c | 81 +- + drivers/staging/nvec/nvec.h | 2 +- + drivers/staging/olpc_dcon/TODO | 4 + + .../pi433/Documentation/devicetree/pi433.txt | 6 +- + drivers/staging/pi433/Documentation/pi433.txt | 10 +- + drivers/staging/pi433/Kconfig | 2 +- + drivers/staging/pi433/pi433_if.c | 39 +- + drivers/staging/pi433/rf69.c | 182 +- + drivers/staging/pi433/rf69.h | 28 +- + drivers/staging/rtl8188eu/TODO | 5 - + drivers/staging/rtl8188eu/core/rtw_ap.c | 72 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 26 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 20 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 38 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 100 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 34 +- + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 16 +- + drivers/staging/rtl8188eu/include/wlan_bssdef.h | 10 +- + drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 12 +- + drivers/staging/rtl8188eu/os_dep/recv_linux.c | 4 - + drivers/staging/rtl8192e/dot11d.c | 2 +- + drivers/staging/rtl8192e/rtllib_tx.c | 14 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 2 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 467 +- + drivers/staging/rtl8192u/r8192U_core.c | 2 +- + drivers/staging/rtl8192u/r8192U_dm.c | 4 +- + drivers/staging/rtl8723bs/Makefile | 2 +- + drivers/staging/rtl8723bs/core/rtw_ap.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_debug.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_eeprom.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_odm.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_rf.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_security.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 10 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 10 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 10 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 10 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 12 +- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 10 +- + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 10 +- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h | 10 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 10 +- + drivers/staging/rtl8723bs/hal/HalPhyRf.h | 10 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 10 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 10 +- + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 10 +- + drivers/staging/rtl8723bs/hal/Mp_Precomp.h | 10 +- + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 10 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 10 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 10 +- + drivers/staging/rtl8723bs/hal/hal_intf.c | 10 +- + drivers/staging/rtl8723bs/hal/hal_phy.c | 10 +- + .../hal/{Hal8723BPwrSeq.c => hal_pwr_seq.c} | 12 +- + drivers/staging/rtl8723bs/hal/hal_sdio.c | 10 +- + drivers/staging/rtl8723bs/hal/odm.c | 10 +- + drivers/staging/rtl8723bs/hal/odm.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_AntDiv.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_AntDiv.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_DIG.h | 10 +- + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 10 +- + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_NoiseMonitor.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_PathDiv.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_PathDiv.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_RTL8723B.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_RTL8723B.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_debug.c | 10 +- + drivers/staging/rtl8723bs/hal/odm_debug.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_interface.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_precomp.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_reg.h | 10 +- + drivers/staging/rtl8723bs/hal/odm_types.h | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 40 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 10 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 10 +- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 10 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 10 +- + drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h | 10 +- + drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 10 +- + drivers/staging/rtl8723bs/include/HalVerDef.h | 10 +- + drivers/staging/rtl8723bs/include/autoconf.h | 10 +- + drivers/staging/rtl8723bs/include/basic_types.h | 10 +- + drivers/staging/rtl8723bs/include/cmd_osdep.h | 10 +- + drivers/staging/rtl8723bs/include/drv_conf.h | 10 +- + drivers/staging/rtl8723bs/include/drv_types.h | 10 +- + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 10 +- + drivers/staging/rtl8723bs/include/ethernet.h | 10 +- + drivers/staging/rtl8723bs/include/hal_btcoex.h | 10 +- + drivers/staging/rtl8723bs/include/hal_com.h | 10 +- + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 10 +- + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 10 +- + drivers/staging/rtl8723bs/include/hal_com_reg.h | 10 +- + drivers/staging/rtl8723bs/include/hal_data.h | 10 +- + drivers/staging/rtl8723bs/include/hal_intf.h | 10 +- + drivers/staging/rtl8723bs/include/hal_pg.h | 10 +- + drivers/staging/rtl8723bs/include/hal_phy.h | 10 +- + .../include/{Hal8723BPhyCfg.h => hal_phy_cfg.h} | 10 +- + drivers/staging/rtl8723bs/include/hal_phy_reg.h | 10 +- + .../{Hal8723BPhyReg.h => hal_phy_reg_8723b.h} | 10 +- + .../include/{Hal8723BPwrSeq.h => hal_pwr_seq.h} | 0 + drivers/staging/rtl8723bs/include/hal_sdio.h | 10 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 10 +- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 10 +- + drivers/staging/rtl8723bs/include/mlme_osdep.h | 10 +- + drivers/staging/rtl8723bs/include/osdep_intf.h | 10 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 10 +- + .../rtl8723bs/include/osdep_service_linux.h | 10 +- + drivers/staging/rtl8723bs/include/recv_osdep.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8192c_rf.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8723b_dm.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 283 +- + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 10 +- + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_ap.h | 10 +- + .../staging/rtl8723bs/include/rtw_beamforming.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_br_ext.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_btcoex.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_byteorder.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_debug.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_efuse.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_event.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_ht.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_ioctl.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_mp.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_odm.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 35 +- + drivers/staging/rtl8723bs/include/rtw_qos.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_rf.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_security.h | 10 +- + drivers/staging/rtl8723bs/include/rtw_version.h | 1 + + drivers/staging/rtl8723bs/include/rtw_xmit.h | 10 +- + drivers/staging/rtl8723bs/include/sdio_hal.h | 10 +- + drivers/staging/rtl8723bs/include/sdio_ops.h | 10 +- + drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 10 +- + drivers/staging/rtl8723bs/include/sdio_osintf.h | 10 +- + drivers/staging/rtl8723bs/include/sta_info.h | 10 +- + drivers/staging/rtl8723bs/include/wifi.h | 22 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 10 +- + drivers/staging/rtl8723bs/include/xmit_osdep.h | 10 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 12 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 10 +- + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 10 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 10 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 10 +- + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 10 +- + drivers/staging/rtl8723bs/os_dep/rtw_proc.c | 10 +- + drivers/staging/rtl8723bs/os_dep/rtw_proc.h | 10 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 10 +- + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 10 +- + drivers/staging/rtlwifi/base.c | 13 +- + drivers/staging/rtlwifi/base.h | 13 +- + drivers/staging/rtlwifi/btcoexist/halbt_precomp.h | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.c | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.h | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.c | 13 +- + .../staging/rtlwifi/btcoexist/halbtc8822b2ant.h | 13 +- + .../rtlwifi/btcoexist/halbtc8822bwifionly.c | 13 +- + .../rtlwifi/btcoexist/halbtc8822bwifionly.h | 13 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 13 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.h | 13 +- + drivers/staging/rtlwifi/btcoexist/rtl_btc.c | 13 +- + drivers/staging/rtlwifi/btcoexist/rtl_btc.h | 13 +- + drivers/staging/rtlwifi/cam.c | 13 +- + drivers/staging/rtlwifi/cam.h | 13 +- + drivers/staging/rtlwifi/core.c | 13 +- + drivers/staging/rtlwifi/core.h | 13 +- + drivers/staging/rtlwifi/debug.c | 32 +- + drivers/staging/rtlwifi/debug.h | 13 +- + drivers/staging/rtlwifi/efuse.c | 13 +- + drivers/staging/rtlwifi/efuse.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_2_platform.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_8822b_cfg.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_8822b_phy.c | 13 +- + .../halmac_8822b/halmac_8822b_pwr_seq.c | 13 +- + .../halmac_8822b/halmac_8822b_pwr_seq.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_api_8822b.c | 13 +- + .../halmac_88xx/halmac_8822b/halmac_api_8822b.h | 13 +- + .../halmac_8822b/halmac_api_8822b_pcie.c | 13 +- + .../halmac_8822b/halmac_api_8822b_pcie.h | 13 +- + .../halmac_8822b/halmac_api_8822b_sdio.c | 13 +- + .../halmac_8822b/halmac_api_8822b_sdio.h | 13 +- + .../halmac_8822b/halmac_api_8822b_usb.c | 13 +- + .../halmac_8822b/halmac_api_8822b_usb.h | 13 +- + .../halmac_88xx/halmac_8822b/halmac_func_8822b.c | 13 +- + .../halmac_88xx/halmac_8822b/halmac_func_8822b.h | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_88xx_cfg.h | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.c | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_api_88xx.h | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_pcie.c | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_pcie.h | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_sdio.c | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_sdio.h | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_usb.c | 13 +- + .../halmac/halmac_88xx/halmac_api_88xx_usb.h | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.c | 13 +- + .../rtlwifi/halmac/halmac_88xx/halmac_func_88xx.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_api.c | 13 +- + drivers/staging/rtlwifi/halmac/halmac_api.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_bit2.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_bit_8822b.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_fw_info.h | 13 +- + .../rtlwifi/halmac/halmac_fw_offload_c2h_nic.h | 13 +- + .../rtlwifi/halmac/halmac_fw_offload_h2c_nic.h | 13 +- + .../rtlwifi/halmac/halmac_h2c_extra_info_nic.h | 13 +- + .../staging/rtlwifi/halmac/halmac_intf_phy_cmd.h | 13 +- + .../rtlwifi/halmac/halmac_original_c2h_nic.h | 13 +- + .../rtlwifi/halmac/halmac_original_h2c_nic.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_pcie_reg.h | 13 +- + .../staging/rtlwifi/halmac/halmac_pwr_seq_cmd.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_reg2.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_reg_8822b.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_rx_bd_chip.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_rx_bd_nic.h | 13 +- + .../staging/rtlwifi/halmac/halmac_rx_desc_chip.h | 13 +- + .../staging/rtlwifi/halmac/halmac_rx_desc_nic.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_sdio_reg.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_tx_bd_chip.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_tx_bd_nic.h | 13 +- + .../staging/rtlwifi/halmac/halmac_tx_desc_chip.h | 13 +- + .../staging/rtlwifi/halmac/halmac_tx_desc_nic.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_type.h | 13 +- + drivers/staging/rtlwifi/halmac/halmac_usb_reg.h | 13 +- + drivers/staging/rtlwifi/halmac/rtl_halmac.c | 13 +- + drivers/staging/rtlwifi/halmac/rtl_halmac.h | 13 +- + drivers/staging/rtlwifi/pci.c | 13 +- + drivers/staging/rtlwifi/pci.h | 13 +- + drivers/staging/rtlwifi/phydm/halphyrf_ce.c | 13 +- + drivers/staging/rtlwifi/phydm/halphyrf_ce.h | 13 +- + drivers/staging/rtlwifi/phydm/mp_precomp.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_acs.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_acs.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adaptivity.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adaptivity.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_antdiv.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_antdiv.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_beamforming.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_ccx.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_ccx.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_cfotracking.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_cfotracking.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_debug.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_debug.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_dfs.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_dig.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_dig.h | 13 +- + .../staging/rtlwifi/phydm/phydm_dynamic_rx_path.h | 13 +- + .../rtlwifi/phydm/phydm_dynamicbbpowersaving.c | 13 +- + .../rtlwifi/phydm/phydm_dynamicbbpowersaving.h | 13 +- + .../staging/rtlwifi/phydm/phydm_dynamictxpower.c | 13 +- + .../staging/rtlwifi/phydm/phydm_dynamictxpower.h | 13 +- + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.c | 13 +- + .../staging/rtlwifi/phydm/phydm_edcaturbocheck.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_features.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_interface.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_interface.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_iqk.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_kfree.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_kfree.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_noisemonitor.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_noisemonitor.h | 13 +- + .../staging/rtlwifi/phydm/phydm_powertracking_ce.c | 13 +- + .../staging/rtlwifi/phydm/phydm_powertracking_ce.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_pre_define.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_precomp.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_psd.c | 13 +- + drivers/staging/rtlwifi/phydm/phydm_psd.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 17 +- + drivers/staging/rtlwifi/phydm/phydm_rainfo.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_reg.h | 13 +- + .../staging/rtlwifi/phydm/phydm_regdefine11ac.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_regdefine11n.h | 13 +- + drivers/staging/rtlwifi/phydm/phydm_types.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.c | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_bb.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.c | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_mac.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.c | 13 +- + .../rtlwifi/phydm/rtl8822b/halhwimg8822b_rf.h | 13 +- + .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.c | 47 +- + .../rtlwifi/phydm/rtl8822b/halphyrf_8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_hal_api8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_iqk_8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_regconfig8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.c | 13 +- + .../rtlwifi/phydm/rtl8822b/phydm_rtl8822b.h | 13 +- + .../rtlwifi/phydm/rtl8822b/version_rtl8822b.h | 13 +- + drivers/staging/rtlwifi/phydm/rtl_phydm.c | 13 +- + drivers/staging/rtlwifi/phydm/rtl_phydm.h | 13 +- + drivers/staging/rtlwifi/phydm/txbf/halcomtxbf.h | 13 +- + drivers/staging/rtlwifi/phydm/txbf/haltxbf8822b.h | 13 +- + .../staging/rtlwifi/phydm/txbf/haltxbfinterface.h | 13 +- + drivers/staging/rtlwifi/phydm/txbf/haltxbfjaguar.h | 13 +- + .../rtlwifi/phydm/txbf/phydm_hal_txbf_api.h | 13 +- + drivers/staging/rtlwifi/ps.c | 13 +- + drivers/staging/rtlwifi/ps.h | 13 +- + drivers/staging/rtlwifi/pwrseqcmd.h | 13 +- + drivers/staging/rtlwifi/rc.c | 13 +- + drivers/staging/rtlwifi/rc.h | 13 +- + drivers/staging/rtlwifi/regd.c | 13 +- + drivers/staging/rtlwifi/regd.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/def.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/fw.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/fw.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/hw.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/hw.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/led.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/led.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/phy.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/phy.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/reg.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/sw.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/sw.h | 13 +- + drivers/staging/rtlwifi/rtl8822be/trx.c | 13 +- + drivers/staging/rtlwifi/rtl8822be/trx.h | 13 +- + drivers/staging/rtlwifi/stats.c | 13 +- + drivers/staging/rtlwifi/stats.h | 13 +- + drivers/staging/rtlwifi/wifi.h | 13 +- + drivers/staging/sm750fb/TODO | 5 +- + drivers/staging/speakup/buffers.c | 4 + + drivers/staging/speakup/main.c | 6 + + drivers/staging/speakup/speakup.h | 3 +- + drivers/staging/speakup/speakup_dummy.c | 1 + + drivers/staging/speakup/speakup_soft.c | 3 +- + drivers/staging/speakup/spk_types.h | 2 +- + drivers/staging/speakup/varhandlers.c | 1 + + drivers/staging/unisys/visornic/visornic_main.c | 25 +- + drivers/staging/vboxvideo/vbox_main.c | 3 +- + drivers/staging/vboxvideo/vbox_mode.c | 2 +- + drivers/staging/vc04_services/Kconfig | 1 - + drivers/staging/vc04_services/Makefile | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 64 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 43 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 12 + + drivers/staging/vc04_services/bcm2835-camera/TODO | 11 - + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 402 +- + .../vc04_services/bcm2835-camera/mmal-common.h | 9 +- + .../vc04_services/bcm2835-camera/mmal-msg-port.h | 2 +- + .../vc04_services/bcm2835-camera/mmal-parameters.h | 13 + + .../vc04_services/bcm2835-camera/mmal-vchiq.c | 345 +- + .../vc04_services/bcm2835-camera/mmal-vchiq.h | 15 +- + drivers/staging/vc04_services/interface/vchi/TODO | 9 +- + .../vc04_services/interface/vchi/vchi_common.h | 2 - + .../interface/vchiq_arm/vchiq_2835_arm.c | 6 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 96 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 55 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 1 - + .../interface/vchiq_arm/vchiq_debugfs.c | 137 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 1 - + drivers/staging/vt6655/card.c | 5 +- + drivers/staging/vt6655/device_main.c | 150 +- + drivers/staging/wilc1000/TODO | 12 +- + drivers/staging/wilc1000/coreconfigurator.c | 140 +- + drivers/staging/wilc1000/coreconfigurator.h | 37 +- + drivers/staging/wilc1000/host_interface.c | 549 ++- + drivers/staging/wilc1000/host_interface.h | 6 +- + drivers/staging/wilc1000/linux_mon.c | 90 +- + drivers/staging/wilc1000/linux_wlan.c | 378 +- + drivers/staging/wilc1000/wilc_debugfs.c | 2 - + drivers/staging/wilc1000/wilc_sdio.c | 109 +- + drivers/staging/wilc1000/wilc_spi.c | 99 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 1049 +++-- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.h | 18 +- + drivers/staging/wilc1000/wilc_wfi_netdevice.h | 83 +- + drivers/staging/wilc1000/wilc_wlan.c | 26 +- + drivers/staging/wilc1000/wilc_wlan.h | 37 +- + drivers/staging/wilc1000/wilc_wlan_cfg.c | 1 - + drivers/staging/wilc1000/wilc_wlan_if.h | 16 +- + drivers/staging/wlan-ng/hfa384x.h | 2 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 7 +- + drivers/staging/wlan-ng/p80211conv.c | 8 +- + drivers/staging/wlan-ng/p80211conv.h | 26 +- + drivers/staging/wlan-ng/p80211hdr.h | 2 +- + drivers/staging/wlan-ng/p80211ioctl.h | 2 +- + drivers/staging/wlan-ng/p80211metadef.h | 2 +- + drivers/staging/wlan-ng/p80211metastruct.h | 90 +- + drivers/staging/wlan-ng/p80211mgmt.h | 2 +- + drivers/staging/wlan-ng/p80211msg.h | 2 +- + drivers/staging/wlan-ng/p80211netdev.c | 8 +- + drivers/staging/wlan-ng/p80211netdev.h | 8 +- + drivers/staging/wlan-ng/p80211req.h | 2 +- + drivers/staging/wlan-ng/p80211types.h | 33 +- + drivers/staging/wlan-ng/prism2mgmt.h | 2 +- + drivers/staging/wlan-ng/prism2sta.c | 52 +- + include/linux/iio/adc/ad_sigma_delta.h | 24 +- + include/linux/iio/adc/stm32-dfsdm-adc.h | 2 + + .../linux/iio/common}/cros_ec_sensors_core.h | 3 + + include/linux/iio/iio.h | 24 +- + include/linux/kernel.h | 16 + + include/linux/platform_data/tsl2772.h | 101 + + tools/iio/iio_generic_buffer.c | 13 +- + 850 files changed, 19982 insertions(+), 25393 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt + create mode 100644 Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt + create mode 100644 Documentation/devicetree/bindings/iio/afe/voltage-divider.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ti,dac5571.txt + create mode 100644 drivers/iio/accel/adis16201.c + rename drivers/{staging => }/iio/accel/adis16209.c (92%) + create mode 100644 drivers/iio/afe/Kconfig + create mode 100644 drivers/iio/afe/Makefile + create mode 100644 drivers/iio/afe/iio-rescale.c + create mode 100644 drivers/iio/dac/ad5686-spi.c + create mode 100644 drivers/iio/dac/ad5686.h + create mode 100644 drivers/iio/dac/ad5696-i2c.c + create mode 100644 drivers/iio/dac/ti-dac5571.c + create mode 100644 drivers/iio/light/tsl2772.c + create mode 100644 drivers/iio/resolver/Kconfig + create mode 100644 drivers/iio/resolver/Makefile + rename drivers/{staging => }/iio/resolver/ad2s1200.c (52%) + create mode 100644 drivers/staging/android/uapi/vsoc_shm.h + create mode 100644 drivers/staging/android/vsoc.c + create mode 100644 drivers/staging/fbtft/TODO + create mode 100644 drivers/staging/fsl-dpaa2/rtc/Makefile + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc-cmd.h + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.c + create mode 100644 drivers/staging/fsl-dpaa2/rtc/dprtc.h + create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.c + create mode 100644 drivers/staging/fsl-dpaa2/rtc/rtc.h + delete mode 100644 drivers/staging/goldfish/goldfish_nand.c + delete mode 100644 drivers/staging/goldfish/goldfish_nand_reg.h + create mode 100644 drivers/staging/greybus/TODO + delete mode 100644 drivers/staging/iio/accel/adis16201.c + delete mode 100644 drivers/staging/iio/light/Kconfig + delete mode 100644 drivers/staging/iio/light/Makefile + delete mode 100644 drivers/staging/iio/light/tsl2x7x.c + delete mode 100644 drivers/staging/iio/light/tsl2x7x.h + delete mode 100644 drivers/staging/iio/meter/ade7753.c + delete mode 100644 drivers/staging/iio/meter/ade7754.c + delete mode 100644 drivers/staging/iio/meter/ade7758.h + delete mode 100644 drivers/staging/iio/meter/ade7758_core.c + delete mode 100644 drivers/staging/iio/meter/ade7758_ring.c + delete mode 100644 drivers/staging/iio/meter/ade7758_trigger.c + delete mode 100644 drivers/staging/iio/meter/ade7759.c + delete mode 100644 drivers/staging/ks7010/ks7010_sdio.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/curproc.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/libcfs_time.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/libcfs.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-cpu.h + delete mode 100644 drivers/staging/lustre/include/linux/libcfs/linux/linux-time.h + rename drivers/staging/lustre/lnet/libcfs/{linux => }/linux-crypto-adler.c (100%) + rename drivers/staging/lustre/lnet/libcfs/{linux => }/linux-crypto.c (98%) + rename drivers/staging/lustre/lnet/libcfs/{linux => }/linux-crypto.h (100%) + rename drivers/staging/lustre/lnet/libcfs/{linux => }/linux-debug.c (97%) + rename drivers/staging/lustre/lnet/libcfs/{linux => }/linux-tracefile.c (98%) + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-cpu.c + delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c + create mode 100644 drivers/staging/lustre/lustre/llite/acl.c + delete mode 100644 drivers/staging/most/dim2/dim2.h + create mode 100644 drivers/staging/mt7621-gpio/mediatek,mt7621-gpio.txt + rename drivers/staging/rtl8723bs/hal/{Hal8723BPwrSeq.c => hal_pwr_seq.c} (86%) + rename drivers/staging/rtl8723bs/include/{Hal8723BPhyCfg.h => hal_phy_cfg.h} (84%) + rename drivers/staging/rtl8723bs/include/{Hal8723BPhyReg.h => hal_phy_reg_8723b.h} (79%) + rename drivers/staging/rtl8723bs/include/{Hal8723BPwrSeq.h => hal_pwr_seq.h} (100%) + rename {drivers/iio/common/cros_ec_sensors => include/linux/iio/common}/cros_ec_sensors_core.h (98%) + create mode 100644 include/linux/platform_data/tsl2772.h +Merging mux/for-next (6a3d4baac84a mux: add mux_control_get_optional() API) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. + Documentation/driver-model/devres.txt | 1 + + drivers/mux/core.c | 104 +++++++++++++++++++++++++++------- + include/linux/mux/consumer.h | 4 ++ + 3 files changed, 89 insertions(+), 20 deletions(-) +Merging slave-dma/next (c79c2212f7c9 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Auto-merging drivers/dma/ti/omap-dma.c +Auto-merging drivers/dma/ti/edma.c +Auto-merging drivers/dma/ti/cppi41.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/dma/renesas,rcar-dmac.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/renesas,rcar-dmac.txt | 1 + + .../devicetree/bindings/dma/renesas,usb-dmac.txt | 2 + + MAINTAINERS | 8 + + drivers/dma/Kconfig | 31 +- + drivers/dma/Makefile | 5 +- + drivers/dma/at_hdmac.c | 9 +- + drivers/dma/at_xdmac.c | 9 +- + drivers/dma/dma-axi-dmac.c | 2 +- + drivers/dma/dmatest.c | 16 +- + drivers/dma/dw/platform.c | 6 +- + drivers/dma/fsldma.c | 6 +- + drivers/dma/idma64.c | 6 +- + drivers/dma/imx-dma.c | 26 +- + drivers/dma/imx-sdma.c | 29 +- + drivers/dma/mxs-dma.c | 14 +- + drivers/dma/pl330.c | 237 +++++++++----- + drivers/dma/qcom/bam_dma.c | 10 +- + drivers/dma/qcom/hidma.c | 3 +- + drivers/dma/qcom/hidma_mgmt_sys.c | 6 +- + drivers/dma/sh/shdmac.c | 50 ++- + drivers/dma/sprd-dma.c | 349 ++++++++++++--------- + drivers/dma/ste_dma40.c | 12 +- + drivers/dma/stm32-mdma.c | 100 +++--- + drivers/dma/ti/Kconfig | 37 +++ + drivers/dma/ti/Makefile | 5 + + drivers/dma/{ => ti}/cppi41.c | 2 +- + .../dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} | 0 + drivers/dma/{ => ti}/edma.c | 4 +- + drivers/dma/{ => ti}/omap-dma.c | 2 +- + drivers/dma/txx9dmac.c | 8 +- + include/linux/dma/sprd-dma.h | 61 ++++ + 31 files changed, 631 insertions(+), 425 deletions(-) + create mode 100644 drivers/dma/ti/Kconfig + create mode 100644 drivers/dma/ti/Makefile + rename drivers/dma/{ => ti}/cppi41.c (99%) + rename drivers/dma/{ti-dma-crossbar.c => ti/dma-crossbar.c} (100%) + rename drivers/dma/{ => ti}/edma.c (99%) + rename drivers/dma/{ => ti}/omap-dma.c (99%) + create mode 100644 include/linux/dma/sprd-dma.h +Merging cgroup/for-next (d8742e229021 cgroup: css_set_lock should nest inside tasklist_lock) +$ git merge cgroup/for-next +Removing kernel/cgroup/stat.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/cgroup/cgroup-internal.h +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 52 +++-- + include/linux/cgroup.h | 12 +- + kernel/cgroup/Makefile | 2 +- + kernel/cgroup/cgroup-internal.h | 11 +- + kernel/cgroup/cgroup.c | 105 +++++++--- + kernel/cgroup/rdma.c | 35 ++-- + kernel/cgroup/rstat.c | 416 ++++++++++++++++++++++++++++++++++++++++ + kernel/cgroup/stat.c | 338 -------------------------------- + 8 files changed, 554 insertions(+), 417 deletions(-) + create mode 100644 kernel/cgroup/rstat.c + delete mode 100644 kernel/cgroup/stat.c +Merging scsi/for-next (7ce1b53b1b5d Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging kernel/workqueue.c +Auto-merging include/linux/libata.h +Auto-merging include/linux/hyperv.h +Auto-merging drivers/target/target_core_pscsi.c +Auto-merging drivers/scsi/ufs/ufshcd.c +Auto-merging drivers/scsi/st.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/scsi/scsi_transport_sas.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/qedf/qedf_main.c +Auto-merging drivers/scsi/qedf/qedf_io.c +Auto-merging drivers/scsi/qedf/qedf_fip.c +Auto-merging drivers/scsi/qedf/qedf_debugfs.c +Auto-merging drivers/scsi/qedf/qedf.h +CONFLICT (content): Merge conflict in drivers/scsi/qedf/qedf.h +Auto-merging drivers/scsi/osd/osd_initiator.c +Auto-merging drivers/scsi/mvumi.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/megaraid.c +Auto-merging drivers/net/hyperv/netvsc_drv.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/hyperv/hyperv_net.h +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/message/fusion/mptbase.c +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Auto-merging Documentation/driver-api/index.rst +Resolved 'drivers/scsi/qedf/qedf.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f90946830b7e] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/scsi.rst | 2 +- + Documentation/driver-api/target.rst | 64 ++ + Documentation/ioctl/ioctl-number.txt | 2 +- + MAINTAINERS | 1 - + drivers/ata/libata-scsi.c | 12 + + drivers/hv/ring_buffer.c | 2 + + drivers/message/fusion/lsi/mpi_cnfg.h | 4 +- + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptfc.c | 2 +- + drivers/message/fusion/mptlan.c | 2 +- + drivers/message/fusion/mptsas.c | 2 +- + drivers/net/hyperv/hyperv_net.h | 1 - + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/hyperv/netvsc_drv.c | 3 - + drivers/s390/scsi/zfcp_dbf.c | 90 +- + drivers/s390/scsi/zfcp_dbf.h | 21 +- + drivers/s390/scsi/zfcp_erp.c | 194 ++-- + drivers/s390/scsi/zfcp_ext.h | 16 +- + drivers/s390/scsi/zfcp_fc.c | 11 +- + drivers/s390/scsi/zfcp_fc.h | 22 +- + drivers/s390/scsi/zfcp_fsf.c | 61 +- + drivers/s390/scsi/zfcp_fsf.h | 6 +- + drivers/s390/scsi/zfcp_scsi.c | 141 ++- + drivers/s390/scsi/zfcp_sysfs.c | 5 +- + drivers/scsi/3w-9xxx.c | 5 + + drivers/scsi/3w-xxxx.c | 3 + + drivers/scsi/Kconfig | 14 + + drivers/scsi/Makefile | 3 +- + drivers/scsi/a100u2w.c | 13 +- + drivers/scsi/am53c974.c | 13 +- + drivers/scsi/cxlflash/Kconfig | 2 +- + drivers/scsi/cxlflash/Makefile | 4 +- + drivers/scsi/cxlflash/backend.h | 55 +- + drivers/scsi/cxlflash/common.h | 12 +- + drivers/scsi/cxlflash/cxl_hw.c | 13 + + drivers/scsi/cxlflash/lunmgt.c | 4 +- + drivers/scsi/cxlflash/main.c | 97 +- + drivers/scsi/cxlflash/main.h | 21 + + drivers/scsi/cxlflash/ocxl_hw.c | 1436 +++++++++++++++++++++++++++ + drivers/scsi/cxlflash/ocxl_hw.h | 77 ++ + drivers/scsi/cxlflash/sislite.h | 41 +- + drivers/scsi/cxlflash/superpipe.c | 23 +- + drivers/scsi/cxlflash/vlun.c | 3 +- + drivers/scsi/dpt_i2o.c | 21 +- + drivers/scsi/esas2r/esas2r_init.c | 5 +- + drivers/scsi/esas2r/esas2r_ioctl.c | 2 +- + drivers/scsi/esas2r/esas2r_main.c | 2 +- + drivers/scsi/hisi_sas/hisi_sas.h | 52 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 638 ++++++++---- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 164 ++- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 284 +++--- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 452 ++++++--- + drivers/scsi/ipr.c | 2 + + drivers/scsi/ips.c | 78 +- + drivers/scsi/ips.h | 11 +- + drivers/scsi/isci/init.c | 3 - + drivers/scsi/iscsi_tcp.c | 1 - + drivers/scsi/libsas/sas_ata.c | 5 + + drivers/scsi/libsas/sas_discover.c | 1 + + drivers/scsi/lpfc/lpfc.h | 9 +- + drivers/scsi/lpfc/lpfc_attr.c | 124 ++- + drivers/scsi/lpfc/lpfc_bsg.c | 20 +- + drivers/scsi/lpfc/lpfc_ct.c | 10 + + drivers/scsi/lpfc/lpfc_debugfs.c | 98 +- + drivers/scsi/lpfc/lpfc_els.c | 1 - + drivers/scsi/lpfc/lpfc_hbadisc.c | 7 +- + drivers/scsi/lpfc/lpfc_hw4.h | 7 +- + drivers/scsi/lpfc/lpfc_init.c | 153 ++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 35 +- + drivers/scsi/lpfc/lpfc_nvme.c | 238 +++-- + drivers/scsi/lpfc/lpfc_nvme.h | 17 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 6 +- + drivers/scsi/lpfc/lpfc_scsi.c | 33 +- + drivers/scsi/lpfc/lpfc_scsi.h | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 116 ++- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/megaraid.c | 3 + + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 27 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 8 +- + drivers/scsi/mpt3sas/mpi/mpi2.h | 9 +- + drivers/scsi/mpt3sas/mpi/mpi2_cnfg.h | 30 +- + drivers/scsi/mpt3sas/mpi/mpi2_init.h | 2 +- + drivers/scsi/mpt3sas/mpi/mpi2_ioc.h | 7 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 477 ++++++--- + drivers/scsi/mpt3sas/mpt3sas_base.h | 60 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 33 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.h | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 491 ++++++--- + drivers/scsi/mpt3sas/mpt3sas_warpdrive.c | 3 +- + drivers/scsi/mvumi.c | 20 +- + drivers/scsi/osd/osd_initiator.c | 16 +- + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 2 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 2 +- + drivers/scsi/qedf/drv_scsi_fw_funcs.c | 2 +- + drivers/scsi/qedf/drv_scsi_fw_funcs.h | 2 +- + drivers/scsi/qedf/qedf.h | 6 +- + drivers/scsi/qedf/qedf_attr.c | 2 +- + drivers/scsi/qedf/qedf_dbg.c | 4 +- + drivers/scsi/qedf/qedf_dbg.h | 2 +- + drivers/scsi/qedf/qedf_debugfs.c | 2 +- + drivers/scsi/qedf/qedf_els.c | 35 +- + drivers/scsi/qedf/qedf_fip.c | 5 +- + drivers/scsi/qedf/qedf_hsi.h | 2 +- + drivers/scsi/qedf/qedf_io.c | 87 +- + drivers/scsi/qedf/qedf_main.c | 130 ++- + drivers/scsi/qedf/qedf_version.h | 6 +- + drivers/scsi/qla2xxx/qla_def.h | 4 +- + drivers/scsi/qla2xxx/qla_gbl.h | 3 +- + drivers/scsi/qla2xxx/qla_gs.c | 41 +- + drivers/scsi/qla2xxx/qla_init.c | 105 +- + drivers/scsi/qla2xxx/qla_os.c | 4 + + drivers/scsi/qla2xxx/qla_target.c | 192 +++- + drivers/scsi/qla2xxx/qla_target.h | 4 +- + drivers/scsi/qla2xxx/qla_version.h | 2 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 37 +- + drivers/scsi/qlogicpti.c | 6 +- + drivers/scsi/scsi_debugfs.c | 2 +- + drivers/scsi/scsi_devinfo.c | 31 +- + drivers/scsi/scsi_dh.c | 5 +- + drivers/scsi/scsi_error.c | 7 + + drivers/scsi/scsi_lib.c | 4 + + drivers/scsi/scsi_sysfs.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 4 - + drivers/scsi/sd.h | 12 +- + drivers/scsi/sd_zbc.c | 10 - + drivers/scsi/sg.c | 2 +- + drivers/scsi/snic/snic_scsi.c | 6 +- + drivers/scsi/st.c | 6 +- + drivers/scsi/storvsc_drv.c | 85 +- + drivers/scsi/ufs/ufs-qcom.c | 2 +- + drivers/scsi/ufs/ufshcd.c | 308 +++++- + drivers/scsi/ufs/ufshcd.h | 21 + + drivers/scsi/wd719x.c | 13 +- + drivers/scsi/zorro_esp.c | 1172 ++++++++++++++++++++++ + drivers/target/target_core_configfs.c | 25 + + drivers/target/target_core_file.c | 137 ++- + drivers/target/target_core_file.h | 1 + + drivers/target/target_core_internal.h | 1 + + drivers/target/target_core_pscsi.c | 26 +- + drivers/target/target_core_transport.c | 64 +- + drivers/target/target_core_user.c | 160 ++- + include/linux/hyperv.h | 12 + + include/linux/libata.h | 2 + + include/linux/log2.h | 35 +- + include/scsi/scsi_device.h | 2 +- + include/scsi/scsi_devinfo.h | 75 +- + include/target/target_core_base.h | 1 + + include/uapi/linux/target_core_user.h | 11 +- + kernel/workqueue.c | 1 + + 152 files changed, 7234 insertions(+), 2017 deletions(-) + create mode 100644 Documentation/driver-api/target.rst + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.c + create mode 100644 drivers/scsi/cxlflash/ocxl_hw.h + create mode 100644 drivers/scsi/zorro_esp.c +Merging scsi-mkp/for-next (1b5c2cb19668 scsi: lpfc: update driver version to 12.0.0.4) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (ed058253618e Merge branch 'for-4.17-fixes' into for-next) +$ git merge libata/for-next +Auto-merging include/linux/libata.h +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata-eh.c +Merge made by the 'recursive' strategy. + drivers/ata/acard-ahci.c | 4 +- + drivers/ata/ahci.h | 2 +- + drivers/ata/libahci.c | 8 ++-- + drivers/ata/libata-core.c | 64 ++++++++++++----------------- + drivers/ata/libata-eh.c | 56 ++++++++++++++++++++----- + drivers/ata/libata-scsi.c | 19 +++++---- + drivers/ata/libata-zpodd.c | 2 +- + drivers/ata/pata_hpt37x.c | 13 +++--- + drivers/ata/sata_dwc_460ex.c | 14 +++---- + drivers/ata/sata_fsl.c | 10 ++--- + drivers/ata/sata_mv.c | 26 ++++++------ + drivers/ata/sata_nv.c | 98 +++++++++++++++++++------------------------- + drivers/ata/sata_sil24.c | 6 +-- + include/linux/libata.h | 22 +++++----- + 14 files changed, 178 insertions(+), 166 deletions(-) +Merging vhost/linux-next (cfcde40e8ce3 ACPI: disable extra P_LVLx access on KVM) +$ git merge vhost/linux-next +Auto-merging mm/page_alloc.c +Auto-merging include/linux/mm.h +Merge made by the 'recursive' strategy. + drivers/acpi/processor_idle.c | 7 +- + drivers/virtio/virtio_balloon.c | 298 +++++++++++++++++++++++++++++++----- + include/linux/mm.h | 6 + + include/linux/ptr_ring.h | 79 +++++++++- + include/linux/virtio_ring.h | 4 +- + include/uapi/linux/virtio_balloon.h | 7 + + mm/page_alloc.c | 97 ++++++++++++ + mm/page_poison.c | 6 + + 8 files changed, 460 insertions(+), 44 deletions(-) +Merging rpmsg/for-next (1601c6923d66 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Removing include/linux/ste_modem_shm.h +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-bus-rpmsg | 20 ++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 1 + + .../devicetree/bindings/soc/qcom/qcom,smd.txt | 8 +- + drivers/hwspinlock/Kconfig | 1 + + drivers/hwspinlock/hwspinlock_core.c | 77 +++++--- + drivers/hwspinlock/hwspinlock_internal.h | 10 +- + drivers/hwspinlock/omap_hwspinlock.c | 10 +- + drivers/hwspinlock/qcom_hwspinlock.c | 10 +- + drivers/hwspinlock/sirf_hwspinlock.c | 3 +- + drivers/hwspinlock/sprd_hwspinlock.c | 10 +- + drivers/hwspinlock/u8500_hsem.c | 10 +- + drivers/remoteproc/Kconfig | 1 - + drivers/remoteproc/da8xx_remoteproc.c | 12 +- + drivers/remoteproc/qcom_q6v5_pil.c | 201 ++++++++++++++++++--- + drivers/rpmsg/Kconfig | 3 + + drivers/rpmsg/qcom_glink_native.c | 10 +- + drivers/rpmsg/qcom_glink_native.h | 10 +- + drivers/rpmsg/qcom_glink_rpm.c | 10 +- + drivers/rpmsg/qcom_glink_smem.c | 10 +- + drivers/rpmsg/qcom_smd.c | 96 ++++++---- + drivers/rpmsg/rpmsg_char.c | 10 +- + drivers/rpmsg/rpmsg_core.c | 49 ++++- + drivers/rpmsg/rpmsg_internal.h | 10 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 10 +- + include/linux/hwspinlock.h | 68 ++++++- + include/linux/rpmsg.h | 27 +-- + include/linux/rpmsg/qcom_glink.h | 2 + + include/linux/ste_modem_shm.h | 56 ------ + include/uapi/linux/rpmsg.h | 9 - + 29 files changed, 445 insertions(+), 309 deletions(-) + delete mode 100644 include/linux/ste_modem_shm.h +Merging gpio/for-next (84bf021ecee4 gpio: pxa: Include the right header) +$ git merge gpio/for-next +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/gpio-aspeed.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 34 +++++ + .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 3 + + .../devicetree/bindings/gpio/snps-dwapb-gpio.txt | 9 +- + Documentation/driver-api/gpio/board.rst | 16 +++ + Documentation/driver-api/gpio/drivers-on-gpio.rst | 4 + + drivers/gpio/Kconfig | 12 ++ + drivers/gpio/gpio-104-dio-48e.c | 2 +- + drivers/gpio/gpio-104-idi-48.c | 2 +- + drivers/gpio/gpio-74xx-mmio.c | 9 +- + drivers/gpio/gpio-aspeed.c | 24 +++- + drivers/gpio/gpio-dwapb.c | 57 ++++---- + drivers/gpio/gpio-eic-sprd.c | 73 +++++++++++ + drivers/gpio/gpio-ge.c | 4 +- + drivers/gpio/gpio-gpio-mm.c | 2 +- + drivers/gpio/gpio-ingenic.c | 4 +- + drivers/gpio/gpio-loongson.c | 116 ++++++++++------- + drivers/gpio/gpio-lp3943.c | 2 +- + drivers/gpio/gpio-lp873x.c | 2 +- + drivers/gpio/gpio-lpc32xx.c | 3 +- + drivers/gpio/gpio-lynxpoint.c | 2 +- + drivers/gpio/gpio-max730x.c | 2 +- + drivers/gpio/gpio-mc33880.c | 2 +- + drivers/gpio/gpio-mc9s08dz60.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 2 +- + drivers/gpio/gpio-mm-lantiq.c | 2 +- + drivers/gpio/gpio-mockup.c | 7 +- + drivers/gpio/gpio-msic.c | 2 +- + drivers/gpio/gpio-mvebu.c | 20 ++- + drivers/gpio/gpio-mxc.c | 54 ++++---- + drivers/gpio/gpio-mxs.c | 32 ++--- + drivers/gpio/gpio-octeon.c | 2 +- + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-palmas.c | 8 +- + drivers/gpio/gpio-pca953x.c | 81 ++++++++---- + drivers/gpio/gpio-pcf857x.c | 2 +- + drivers/gpio/gpio-pch.c | 2 +- + drivers/gpio/gpio-pl061.c | 2 +- + drivers/gpio/gpio-pmic-eic-sprd.c | 58 ++++++++- + drivers/gpio/gpio-pxa.c | 10 +- + drivers/gpio/gpio-stmpe.c | 9 +- + drivers/gpio/gpio-syscon.c | 9 +- + drivers/gpio/gpio-ts4900.c | 7 +- + drivers/gpio/gpio-vf610.c | 4 +- + drivers/gpio/gpio-xlp.c | 9 +- + drivers/gpio/gpio-xra1403.c | 15 +-- + drivers/gpio/gpio-zynq.c | 14 +- + drivers/gpio/gpiolib-of.c | 7 +- + drivers/gpio/gpiolib.c | 143 ++++++++++++++++++--- + drivers/gpio/gpiolib.h | 2 +- + drivers/mfd/intel_quark_i2c_gpio.c | 3 +- + include/linux/gpio/consumer.h | 10 +- + include/linux/gpio/machine.h | 31 +++++ + include/linux/platform_data/gpio-dwapb.h | 3 +- + 53 files changed, 647 insertions(+), 291 deletions(-) +Merging pinctrl/for-next (86c5dd6860a6 pinctrl: cherryview: limit Strago DMI workarounds to version 1.0) +$ git merge pinctrl/for-next +Removing drivers/pinctrl/samsung/pinctrl-exynos5440.c +Auto-merging drivers/pinctrl/meson/pinctrl-meson-axg.c +Auto-merging drivers/pinctrl/intel/pinctrl-cherryview.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/pinctrl/allwinner,sunxi-pinctrl.txt +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/actions,s900-pinctrl.txt | 16 + + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 1 + + .../bindings/pinctrl/brcm,bcm2835-gpio.txt | 18 + + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../bindings/pinctrl/pinctrl-mcp23s08.txt | 4 +- + .../devicetree/bindings/pinctrl/pinctrl-mt7622.txt | 10 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 2 + + .../bindings/pinctrl/rockchip,pinctrl.txt | 1 + + MAINTAINERS | 3 + + drivers/gpio/gpiolib.c | 10 + + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/actions/Kconfig | 15 + + drivers/pinctrl/actions/Makefile | 2 + + drivers/pinctrl/actions/pinctrl-owl.c | 785 ++++++ + drivers/pinctrl/actions/pinctrl-owl.h | 162 ++ + drivers/pinctrl/actions/pinctrl-s900.c | 1888 ++++++++++++++ + drivers/pinctrl/bcm/Kconfig | 1 + + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 100 +- + drivers/pinctrl/berlin/berlin-bg2.c | 5 +- + drivers/pinctrl/berlin/berlin-bg2cd.c | 5 +- + drivers/pinctrl/berlin/berlin-bg2q.c | 5 +- + drivers/pinctrl/berlin/berlin-bg4ct.c | 13 +- + drivers/pinctrl/berlin/berlin.c | 5 +- + drivers/pinctrl/berlin/berlin.h | 5 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 42 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 6 +- + drivers/pinctrl/freescale/pinctrl-imx1-core.c | 27 +- + drivers/pinctrl/freescale/pinctrl-imx1.c | 15 +- + drivers/pinctrl/freescale/pinctrl-imx1.h | 6 +- + drivers/pinctrl/freescale/pinctrl-imx21.c | 15 +- + drivers/pinctrl/freescale/pinctrl-imx23.c | 19 +- + drivers/pinctrl/freescale/pinctrl-imx25.c | 28 +- + drivers/pinctrl/freescale/pinctrl-imx27.c | 19 +- + drivers/pinctrl/freescale/pinctrl-imx28.c | 19 +- + drivers/pinctrl/freescale/pinctrl-imx35.c | 24 +- + drivers/pinctrl/freescale/pinctrl-imx50.c | 19 +- + drivers/pinctrl/freescale/pinctrl-imx51.c | 21 +- + drivers/pinctrl/freescale/pinctrl-imx53.c | 21 +- + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 16 +- + drivers/pinctrl/freescale/pinctrl-imx6q.c | 21 +- + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 16 +- + drivers/pinctrl/freescale/pinctrl-imx6sll.c | 8 +- + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 16 +- + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 16 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 16 +- + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 17 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 13 +- + drivers/pinctrl/freescale/pinctrl-mxs.h | 8 +- + drivers/pinctrl/freescale/pinctrl-vf610.c | 15 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 4 + + drivers/pinctrl/mediatek/Kconfig | 6 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/mtk-eint.c | 492 ++++ + drivers/pinctrl/mediatek/mtk-eint.h | 106 + + drivers/pinctrl/mediatek/pinctrl-mt2701.c | 25 +- + drivers/pinctrl/mediatek/pinctrl-mt2712.c | 25 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 143 ++ + drivers/pinctrl/mediatek/pinctrl-mt8127.c | 25 +- + drivers/pinctrl/mediatek/pinctrl-mt8135.c | 25 +- + drivers/pinctrl/mediatek/pinctrl-mt8173.c | 25 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 608 +---- + drivers/pinctrl/mediatek/pinctrl-mtk-common.h | 13 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 107 + + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 23 +- + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 32 +- + drivers/pinctrl/mvebu/pinctrl-armada-xp.c | 22 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 246 ++ + drivers/pinctrl/pinctrl-single.c | 72 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 92 +- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 114 +- + drivers/pinctrl/samsung/Kconfig | 10 +- + drivers/pinctrl/samsung/Makefile | 1 - + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 30 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 20 + + drivers/pinctrl/samsung/pinctrl-exynos.h | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 1005 -------- + drivers/pinctrl/samsung/pinctrl-samsung.c | 29 + + drivers/pinctrl/sh-pfc/Kconfig | 10 + + drivers/pinctrl/sh-pfc/Makefile | 2 + + drivers/pinctrl/sh-pfc/core.c | 12 + + drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 2343 +++++++++++++++++ + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 6 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 8 +- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 8 +- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 1592 +++++++++++- + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 32 +- + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 52 +- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 2695 ++++++++++++++++++++ + drivers/pinctrl/sh-pfc/sh_pfc.h | 10 +- + drivers/pinctrl/sunxi/Kconfig | 4 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c | 128 + + drivers/pinctrl/tegra/pinctrl-tegra.c | 11 - + drivers/pinctrl/tegra/pinctrl-tegra.h | 11 + + drivers/pinctrl/tegra/pinctrl-tegra20.c | 30 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 49 + + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 54 + + include/dt-bindings/pinctrl/mt7623-pinfunc.h | 90 +- + 102 files changed, 11832 insertions(+), 2134 deletions(-) + create mode 100644 drivers/pinctrl/actions/Kconfig + create mode 100644 drivers/pinctrl/actions/Makefile + create mode 100644 drivers/pinctrl/actions/pinctrl-owl.c + create mode 100644 drivers/pinctrl/actions/pinctrl-owl.h + create mode 100644 drivers/pinctrl/actions/pinctrl-s900.c + create mode 100644 drivers/pinctrl/mediatek/mtk-eint.c + create mode 100644 drivers/pinctrl/mediatek/mtk-eint.h + delete mode 100644 drivers/pinctrl/samsung/pinctrl-exynos5440.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a77470.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a77990.c + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c +Merging pinctrl-samsung/for-next (7c24e71c8a64 pinctrl: samsung: Fix suspend/resume for Exynos5433 GPF1..5 banks) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (692099cdcf27 pwm: simplify getting .drvdata) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + drivers/pwm/pwm-atmel-tcb.c | 6 ++---- + drivers/pwm/pwm-meson.c | 4 ++-- + drivers/pwm/pwm-rcar.c | 3 +-- + 3 files changed, 5 insertions(+), 8 deletions(-) +Merging userns/for-next (4b245b90065b Merge of my siginfo-next and userns-next trees for testing in linux-next) +$ git merge userns/for-next +Auto-merging security/integrity/evm/evm_crypto.c +Auto-merging kernel/signal.c +Auto-merging fs/signalfd.c +Auto-merging fs/namespace.c +Auto-merging fs/namei.c +Auto-merging fs/ioctl.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/kvm/mmu.c +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/parisc/kernel/traps.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm/vfp/vfpmodule.c +Auto-merging arch/arm/mm/fault.c +CONFLICT (content): Merge conflict in arch/arm/mm/fault.c +Auto-merging arch/arm/kernel/traps.c +Auto-merging arch/arm/kernel/swp_emulate.c +Resolved 'arch/arm/mm/fault.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 314ea68d166b] Merge remote-tracking branch 'userns/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/uapi/asm/siginfo.h | 14 --- + arch/alpha/kernel/osf_sys.c | 11 +- + arch/alpha/kernel/signal.c | 20 +--- + arch/alpha/kernel/traps.c | 79 ++++--------- + arch/alpha/mm/fault.c | 13 +-- + arch/arc/mm/fault.c | 2 + + arch/arm/kernel/ptrace.c | 1 + + arch/arm/kernel/swp_emulate.c | 1 + + arch/arm/kernel/traps.c | 5 + + arch/arm/mm/alignment.c | 1 + + arch/arm/mm/fault.c | 4 + + arch/arm/vfp/vfpmodule.c | 3 +- + arch/arm64/kernel/fpsimd.c | 2 +- + arch/arm64/kernel/sys_compat.c | 1 + + arch/arm64/kernel/traps.c | 1 + + arch/arm64/mm/fault.c | 18 ++- + arch/c6x/kernel/traps.c | 9 +- + arch/hexagon/kernel/traps.c | 9 +- + arch/hexagon/mm/vm_fault.c | 20 ++-- + arch/ia64/include/uapi/asm/siginfo.h | 7 -- + arch/ia64/kernel/brl_emu.c | 1 + + arch/ia64/kernel/signal.c | 2 + + arch/ia64/kernel/traps.c | 31 ++++- + arch/ia64/kernel/unaligned.c | 1 + + arch/ia64/mm/fault.c | 4 +- + arch/m68k/kernel/traps.c | 58 +++++----- + arch/m68k/mm/fault.c | 25 ++--- + arch/microblaze/kernel/exceptions.c | 8 +- + arch/microblaze/mm/fault.c | 12 +- + arch/mips/kernel/traps.c | 65 +++-------- + arch/mips/mm/fault.c | 18 +-- + arch/nds32/kernel/traps.c | 35 ++---- + arch/nds32/mm/fault.c | 18 +-- + arch/nios2/kernel/traps.c | 8 +- + arch/openrisc/kernel/traps.c | 30 +---- + arch/openrisc/mm/fault.c | 18 +-- + arch/parisc/kernel/ptrace.c | 10 +- + arch/parisc/kernel/traps.c | 61 ++++------ + arch/parisc/kernel/unaligned.c | 15 +-- + arch/parisc/math-emu/driver.c | 8 +- + arch/parisc/mm/fault.c | 54 +++++---- + arch/powerpc/include/uapi/asm/siginfo.h | 15 --- + arch/powerpc/kernel/process.c | 1 + + arch/powerpc/kernel/traps.c | 13 +-- + arch/powerpc/mm/fault.c | 1 + + arch/powerpc/platforms/cell/spufs/fault.c | 2 +- + arch/riscv/kernel/traps.c | 16 +-- + arch/s390/kernel/traps.c | 29 +---- + arch/s390/mm/fault.c | 21 +--- + arch/sh/kernel/hw_breakpoint.c | 9 +- + arch/sh/kernel/traps_32.c | 20 ++-- + arch/sh/math-emu/math.c | 8 +- + arch/sh/mm/fault.c | 9 +- + arch/sparc/include/uapi/asm/siginfo.h | 7 -- + arch/sparc/kernel/process_64.c | 9 +- + arch/sparc/kernel/sys_sparc_32.c | 8 +- + arch/sparc/kernel/sys_sparc_64.c | 8 +- + arch/sparc/kernel/traps_32.c | 104 ++++------------- + arch/sparc/kernel/traps_64.c | 131 +++++---------------- + arch/sparc/kernel/unaligned_32.c | 11 +- + arch/sparc/mm/fault_32.c | 12 +- + arch/sparc/mm/fault_64.c | 8 +- + arch/um/kernel/ptrace.c | 13 +-- + arch/um/kernel/trap.c | 62 ++++------ + arch/unicore32/kernel/fpu-ucf64.c | 8 +- + arch/unicore32/mm/fault.c | 3 + + arch/x86/entry/vsyscall/vsyscall_64.c | 2 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/signal_compat.c | 2 +- + arch/x86/kernel/traps.c | 3 + + arch/x86/kernel/umip.c | 1 + + arch/x86/kvm/mmu.c | 1 + + arch/x86/mm/fault.c | 1 + + arch/xtensa/kernel/traps.c | 9 +- + arch/xtensa/mm/fault.c | 18 +-- + fs/attr.c | 36 ++++-- + fs/ioctl.c | 4 +- + fs/namei.c | 16 ++- + fs/namespace.c | 4 +- + fs/signalfd.c | 93 +++++++-------- + include/linux/ptrace.h | 1 - + include/linux/signal.h | 3 + + include/linux/tracehook.h | 1 + + include/uapi/asm-generic/siginfo.h | 3 +- + include/uapi/linux/signalfd.h | 6 +- + kernel/signal.c | 181 +++++++++--------------------- + security/commoncap.c | 8 +- + security/integrity/evm/evm_crypto.c | 3 +- + virt/kvm/arm/mmu.c | 1 + + 89 files changed, 545 insertions(+), 1085 deletions(-) +Merging ktest/for-next (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (fa32156921da selftests: lib: fix prime_numbers module search and skip logic) +$ git merge kselftest/next +Removing tools/testing/selftests/timers/rtctest.c +Auto-merging tools/testing/selftests/net/rtnetlink.sh +Auto-merging tools/testing/selftests/net/pmtu.sh +Auto-merging tools/testing/selftests/net/fib_tests.sh +Auto-merging tools/testing/selftests/memfd/run_hugetlbfs_test.sh +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + tools/testing/selftests/Makefile | 5 +- + tools/testing/selftests/android/Makefile | 8 - + tools/testing/selftests/android/ion/ion_test.sh | 7 +- + .../breakpoints/step_after_suspend_test.c | 6 +- + tools/testing/selftests/cgroup/Makefile | 10 + + tools/testing/selftests/cgroup/cgroup_util.c | 331 +++++++ + tools/testing/selftests/cgroup/cgroup_util.h | 41 + + tools/testing/selftests/cgroup/test_memcontrol.c | 1015 ++++++++++++++++++++ + .../selftests/cpu-hotplug/cpu-on-off-test.sh | 14 +- + tools/testing/selftests/cpufreq/main.sh | 5 +- + tools/testing/selftests/efivarfs/efivarfs.sh | 7 +- + tools/testing/selftests/exec/execveat.c | 6 +- + tools/testing/selftests/filesystems/Makefile | 1 + + tools/testing/selftests/filesystems/devpts_pts.c | 15 +- + tools/testing/selftests/firmware/fw_fallback.sh | 4 +- + tools/testing/selftests/firmware/fw_filesystem.sh | 4 +- + tools/testing/selftests/firmware/fw_lib.sh | 7 +- + tools/testing/selftests/futex/Makefile | 12 - + tools/testing/selftests/gpio/gpio-mockup.sh | 12 +- + tools/testing/selftests/intel_pstate/aperf.c | 6 +- + tools/testing/selftests/intel_pstate/run.sh | 47 +- + tools/testing/selftests/ipc/msgque.c | 7 +- + tools/testing/selftests/kmod/kmod.sh | 13 +- + tools/testing/selftests/kselftest.h | 2 +- + tools/testing/selftests/kvm/.gitignore | 3 + + tools/testing/selftests/kvm/lib/assert.c | 9 +- + tools/testing/selftests/kvm/vmx_tsc_adjust_test.c | 2 + + tools/testing/selftests/lib.mk | 55 +- + tools/testing/selftests/lib/Makefile | 2 +- + tools/testing/selftests/lib/bitmap.sh | 8 +- + tools/testing/selftests/lib/prime_numbers.sh | 9 +- + tools/testing/selftests/lib/printf.sh | 8 +- + tools/testing/selftests/locking/Makefile | 10 + + tools/testing/selftests/locking/ww_mutex.sh | 8 + + tools/testing/selftests/media_tests/Makefile | 3 +- + .../selftests/media_tests/media_device_open.c | 8 +- + .../selftests/media_tests/media_device_test.c | 10 +- + .../testing/selftests/membarrier/membarrier_test.c | 7 +- + tools/testing/selftests/memfd/Makefile | 6 +- + .../memfd/{run_tests.sh => run_hugetlbfs_test.sh} | 18 +- + tools/testing/selftests/memory-hotplug/Makefile | 5 +- + .../selftests/memory-hotplug/mem-on-off-test.sh | 14 +- + tools/testing/selftests/mount/Makefile | 12 +- + tools/testing/selftests/mount/run_tests.sh | 12 + + tools/testing/selftests/mqueue/Makefile | 12 +- + tools/testing/selftests/mqueue/mq_open_tests.c | 37 +- + tools/testing/selftests/mqueue/mq_perf_tests.c | 8 +- + tools/testing/selftests/net/fib_tests.sh | 8 +- + tools/testing/selftests/net/netdevice.sh | 16 +- + tools/testing/selftests/net/pmtu.sh | 5 +- + tools/testing/selftests/net/psock_tpacket.c | 4 +- + tools/testing/selftests/net/rtnetlink.sh | 31 +- + tools/testing/selftests/rtc/.gitignore | 2 + + tools/testing/selftests/rtc/Makefile | 9 + + tools/testing/selftests/rtc/rtctest.c | 238 +++++ + .../{timers/rtctest_setdate.c => rtc/setdate.c} | 0 + tools/testing/selftests/timers/.gitignore | 3 +- + tools/testing/selftests/timers/Makefile | 4 +- + tools/testing/selftests/timers/rtcpie.c | 134 +++ + tools/testing/selftests/timers/rtctest.c | 403 -------- + tools/testing/selftests/x86/Makefile | 8 +- + tools/testing/selftests/x86/trivial_program.c | 10 + + 63 files changed, 2113 insertions(+), 615 deletions(-) + create mode 100644 tools/testing/selftests/cgroup/Makefile + create mode 100644 tools/testing/selftests/cgroup/cgroup_util.c + create mode 100644 tools/testing/selftests/cgroup/cgroup_util.h + create mode 100644 tools/testing/selftests/cgroup/test_memcontrol.c + create mode 100644 tools/testing/selftests/kvm/.gitignore + create mode 100644 tools/testing/selftests/locking/Makefile + mode change 100644 => 100755 tools/testing/selftests/locking/ww_mutex.sh + rename tools/testing/selftests/memfd/{run_tests.sh => run_hugetlbfs_test.sh} (88%) + create mode 100755 tools/testing/selftests/mount/run_tests.sh + create mode 100644 tools/testing/selftests/rtc/.gitignore + create mode 100644 tools/testing/selftests/rtc/Makefile + create mode 100644 tools/testing/selftests/rtc/rtctest.c + rename tools/testing/selftests/{timers/rtctest_setdate.c => rtc/setdate.c} (100%) + create mode 100644 tools/testing/selftests/timers/rtcpie.c + delete mode 100644 tools/testing/selftests/timers/rtctest.c + create mode 100644 tools/testing/selftests/x86/trivial_program.c +Merging y2038/y2038 (5dc0b1529d21 y2038: ipc: Redirect ipc(SEMTIMEDOP, ...) to compat_ksys_semtimedop) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d7ab8e67aa52 Merge branch 'for-4.18/upstream' into for-next) +$ git merge livepatching/for-next +Merge made by the 'recursive' strategy. + Documentation/livepatch/livepatch.txt | 24 ------------------------ + 1 file changed, 24 deletions(-) +Merging coresight/next (b66e01615a29 coresight: tmc: Add configuration support for trace buffer size) +$ git merge coresight/next +Auto-merging include/linux/coresight.h +Auto-merging drivers/hwtracing/coresight/coresight.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc.h +Auto-merging drivers/hwtracing/coresight/coresight-tmc.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etr.c +CONFLICT (content): Merge conflict in drivers/hwtracing/coresight/coresight-tmc-etr.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-etf.c +Auto-merging drivers/hwtracing/coresight/coresight-priv.h +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.h +Auto-merging drivers/hwtracing/coresight/coresight-etm4x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm4x-sysfs.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x.c +Auto-merging drivers/hwtracing/coresight/coresight-etm3x-sysfs.c +Auto-merging drivers/hwtracing/coresight/coresight-etm.h +Auto-merging drivers/hwtracing/coresight/coresight-etb10.c +Resolved 'drivers/hwtracing/coresight/coresight-tmc-etr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6ff12bb0dc3f] Merge remote-tracking branch 'coresight/next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 8 + + .../devicetree/bindings/arm/coresight.txt | 5 +- + drivers/hwtracing/coresight/coresight-etb10.c | 12 +- + drivers/hwtracing/coresight/coresight-etm.h | 3 - + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 43 +- + drivers/hwtracing/coresight/coresight-etm3x.c | 4 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 47 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 31 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 - + drivers/hwtracing/coresight/coresight-priv.h | 10 +- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 45 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 1010 ++++++++++++++++++-- + drivers/hwtracing/coresight/coresight-tmc.c | 83 +- + drivers/hwtracing/coresight/coresight-tmc.h | 110 ++- + drivers/hwtracing/coresight/coresight.c | 3 +- + include/linux/coresight.h | 20 - + 16 files changed, 1219 insertions(+), 218 deletions(-) +Merging rtc/rtc-next (7e9ab519410f rtc: cros-ec: Switch to SPDX identifier.) +$ git merge rtc/rtc-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 2 +- + .../devicetree/bindings/rtc/st,stm32-rtc.txt | 37 ++- + drivers/rtc/Kconfig | 2 +- + drivers/rtc/nvmem.c | 2 +- + drivers/rtc/rtc-88pm80x.c | 58 ++-- + drivers/rtc/rtc-ab-b5ze-s3.c | 30 +- + drivers/rtc/rtc-at91rm9200.c | 2 + + drivers/rtc/rtc-bq4802.c | 6 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 20 +- + drivers/rtc/rtc-cmos.c | 155 ++++++++-- + drivers/rtc/rtc-cros-ec.c | 21 +- + drivers/rtc/rtc-ds1216.c | 6 +- + drivers/rtc/rtc-ds1307.c | 2 + + drivers/rtc/rtc-ds1511.c | 9 +- + drivers/rtc/rtc-ds1553.c | 15 +- + drivers/rtc/rtc-ds1685.c | 66 ++-- + drivers/rtc/rtc-ds1742.c | 8 +- + drivers/rtc/rtc-lpc32xx.c | 16 +- + drivers/rtc/rtc-ls1x.c | 32 +- + drivers/rtc/rtc-m48t59.c | 41 +-- + drivers/rtc/rtc-mv.c | 3 +- + drivers/rtc/rtc-mxc.c | 34 +-- + drivers/rtc/rtc-mxc_v2.c | 29 +- + drivers/rtc/rtc-pcap.c | 15 +- + drivers/rtc/rtc-rx8581.c | 210 ++++--------- + drivers/rtc/rtc-sc27xx.c | 63 ++-- + drivers/rtc/rtc-sh.c | 15 +- + drivers/rtc/rtc-snvs.c | 13 +- + drivers/rtc/rtc-st-lpc.c | 26 +- + drivers/rtc/rtc-stk17ta8.c | 15 +- + drivers/rtc/rtc-stm32.c | 339 +++++++++++++++------ + drivers/rtc/rtc-sun6i.c | 4 +- + drivers/rtc/rtc-sunxi.c | 23 +- + drivers/rtc/rtc-test.c | 195 ++++++------ + drivers/rtc/rtc-tps6586x.c | 55 ++-- + drivers/rtc/rtc-tps65910.c | 26 +- + drivers/rtc/rtc-vr41xx.c | 35 ++- + drivers/rtc/rtc-zynqmp.c | 10 +- + include/linux/rtc.h | 2 +- + 39 files changed, 843 insertions(+), 799 deletions(-) +Merging nvdimm/libnvdimm-for-next (36fc96be57fa Merge branch 'for-4.18/dax-memory-failure' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging mm/huge_memory.c +Auto-merging mm/hmm.c +CONFLICT (content): Merge conflict in mm/hmm.c +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig +Auto-merging kernel/resource.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/dax.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/dax.c +Auto-merging fs/Kconfig +Auto-merging drivers/md/dm.c +Auto-merging drivers/dax/super.c +CONFLICT (content): Merge conflict in drivers/dax/super.c +Auto-merging arch/x86/kernel/cpu/mcheck/mce.c +Resolved 'drivers/dax/super.c' using previous resolution. +Resolved 'mm/hmm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d519a366d0d4] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + arch/x86/Kconfig.debug | 3 + + arch/x86/include/asm/mcsafe_test.h | 75 +++++++++++ + arch/x86/include/asm/set_memory.h | 29 +++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 15 --- + arch/x86/kernel/cpu/mcheck/mce.c | 38 +----- + arch/x86/lib/memcpy_64.S | 10 ++ + drivers/dax/device.c | 97 ++++++++------ + drivers/dax/super.c | 27 +++- + drivers/md/dm-linear.c | 16 +++ + drivers/md/dm-log-writes.c | 15 +++ + drivers/md/dm-stripe.c | 21 +++ + drivers/md/dm.c | 25 ++++ + drivers/nvdimm/bus.c | 19 ++- + drivers/nvdimm/e820.c | 41 +++--- + drivers/nvdimm/pfn_devs.c | 2 - + drivers/nvdimm/pmem.c | 58 +++++++++ + drivers/nvdimm/pmem.h | 13 ++ + drivers/s390/block/dcssblk.c | 7 + + fs/Kconfig | 1 + + fs/dax.c | 152 +++++++++++++++++---- + fs/xfs/xfs_file.c | 72 +++++++++- + fs/xfs/xfs_inode.h | 16 +++ + fs/xfs/xfs_ioctl.c | 8 +- + fs/xfs/xfs_iops.c | 16 ++- + fs/xfs/xfs_pnfs.c | 15 ++- + fs/xfs/xfs_pnfs.h | 5 +- + include/linux/dax.h | 12 ++ + include/linux/device-mapper.h | 5 +- + include/linux/huge_mm.h | 5 +- + include/linux/memremap.h | 36 ++--- + include/linux/mm.h | 72 +++++++--- + include/linux/set_memory.h | 14 ++ + include/linux/uio.h | 2 +- + kernel/Makefile | 3 +- + kernel/iomem.c | 167 ++++++++++++++++++++++++ + kernel/memremap.c | 210 +++++------------------------- + kernel/resource.c | 1 + + lib/Kconfig | 3 + + mm/Kconfig | 5 + + mm/gup.c | 36 +++-- + mm/hmm.c | 13 +- + mm/huge_memory.c | 4 +- + mm/madvise.c | 18 ++- + mm/memory-failure.c | 209 +++++++++++++++++++++++++---- + mm/swap.c | 3 +- + tools/testing/nvdimm/test/nfit.c | 104 +++++++++++++++ + 46 files changed, 1265 insertions(+), 453 deletions(-) + create mode 100644 arch/x86/include/asm/mcsafe_test.h + create mode 100644 kernel/iomem.c +Merging at24/at24/for-next (73b0d922cd5b eeprom: at24: provide a separate routine for creating dummy i2c clients) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (5e083738f65d ntb: ntb_transport: Replace GFP_ATOMIC with GFP_KERNEL in ntb_transport_create_queue) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/hw/intel/ntb_hw_gen1.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +- + drivers/ntb/hw/intel/Makefile | 1 + + .../ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} | 713 ++------------------- + drivers/ntb/hw/intel/ntb_hw_gen1.h | 182 ++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.c | 597 +++++++++++++++++ + drivers/ntb/hw/intel/ntb_hw_gen3.h | 110 ++++ + drivers/ntb/hw/intel/ntb_hw_intel.h | 203 ++---- + drivers/ntb/ntb_transport.c | 6 +- + 8 files changed, 1001 insertions(+), 813 deletions(-) + rename drivers/ntb/hw/intel/{ntb_hw_intel.c => ntb_hw_gen1.c} (74%) + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen1.h + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.c + create mode 100644 drivers/ntb/hw/intel/ntb_hw_gen3.h +Merging kspp/for-next/kspp (45888b40d2a6 rslib: Allocate decoder buffers to avoid VLAs) +$ git merge kspp/for-next/kspp +Auto-merging drivers/mtd/nand/raw/diskonchip.c +Auto-merging drivers/md/dm-verity-fec.c +Merge made by the 'recursive' strategy. + drivers/md/dm-verity-fec.c | 2 +- + drivers/mtd/nand/raw/cafe_nand.c | 7 +- + drivers/mtd/nand/raw/diskonchip.c | 67 +++++------ + include/linux/rslib.h | 74 +++++++----- + lib/reed_solomon/decode_rs.c | 34 +++--- + lib/reed_solomon/encode_rs.c | 15 +-- + lib/reed_solomon/reed_solomon.c | 240 ++++++++++++++++++++++---------------- + 7 files changed, 243 insertions(+), 196 deletions(-) +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging cisco/for-next (5997aab0a11e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge cisco/for-next +Already up to date. +Merging akpm-current/current (06a5af82ba13 ipc: use new return type vm_fault_t) +$ git merge --no-ff akpm-current/current +Auto-merging security/selinux/hooks.c +Auto-merging security/apparmor/lsm.c +Auto-merging scripts/tags.sh +Auto-merging scripts/checkpatch.pl +Auto-merging mm/vmscan.c +Auto-merging mm/vmalloc.c +Auto-merging mm/page_alloc.c +Auto-merging mm/mmap.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging mm/ksm.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging mm/hmm.c +Auto-merging mm/gup.c +Auto-merging mm/backing-dev.c +Auto-merging mm/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging kernel/sched/core.c +Auto-merging kernel/memremap.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/shm.c +Auto-merging ipc/sem.c +Auto-merging include/linux/swap.h +Auto-merging include/linux/sched/mm.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memremap.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/hmm.h +Auto-merging include/linux/fsnotify_backend.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/dax.h +Auto-merging include/linux/cgroup-defs.h +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/fd.c +Auto-merging fs/proc/base.c +CONFLICT (content): Merge conflict in fs/proc/base.c +Auto-merging fs/proc/array.c +Auto-merging fs/ocfs2/file.c +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/notify/inotify/inotify_fsnotify.c +Auto-merging fs/notify/group.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/fanotify/fanotify.c +Auto-merging fs/notify/dnotify/dnotify.c +Auto-merging fs/namei.c +Auto-merging fs/fcntl.c +Auto-merging fs/exofs/super.c +Auto-merging fs/exofs/ore.c +Auto-merging fs/exec.c +Auto-merging fs/dcache.c +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Auto-merging fs/autofs/waitq.c +Auto-merging fs/autofs/symlink.c +Auto-merging fs/autofs/root.c +Auto-merging fs/autofs/inode.c +Auto-merging fs/autofs/init.c +Auto-merging fs/autofs/expire.c +Auto-merging fs/autofs/dev-ioctl.c +Auto-merging fs/autofs/autofs_i.h +Auto-merging fs/Kconfig +Auto-merging block/genhd.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +CONFLICT (content): Merge conflict in arch/sh/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/include/asm/pte-common.h +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/boot/compressed/Makefile +Auto-merging arch/arm/Kconfig +Auto-merging arch/arc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/vm/hmm.rst +Auto-merging Documentation/filesystems/autofs.txt +Auto-merging Documentation/filesystems/autofs-mount-control.txt +Auto-merging Documentation/features/vm/pte_special/arch-support.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'arch/sh/Kconfig' using previous resolution. +Resolved 'fs/dax.c' using previous resolution. +Resolved 'fs/proc/base.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5f576ec27b3c] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/admin-guide/cgroup-v2.rst | 146 +++- + Documentation/blockdev/zram.txt | 25 + + .../features/vm/pte_special/arch-support.txt | 2 +- + Documentation/filesystems/00-INDEX | 4 +- + ...-mount-control.txt => autofs-mount-control.txt} | 8 +- + .../filesystems/{autofs4.txt => autofs.txt} | 10 +- + Documentation/filesystems/automount-support.txt | 2 +- + Documentation/filesystems/path-lookup.md | 2 +- + Documentation/sysctl/fs.txt | 36 + + Documentation/vm/hmm.rst | 1 - + MAINTAINERS | 4 +- + arch/arc/Kconfig | 1 + + arch/arc/include/asm/pgtable.h | 2 - + arch/arm/Kconfig | 4 +- + arch/arm/boot/compressed/Makefile | 3 + + arch/arm/include/asm/page.h | 2 + + arch/arm/include/asm/pgtable-3level.h | 1 - + arch/arm/kvm/hyp/Makefile | 8 + + arch/arm/vdso/Makefile | 3 + + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/pgtable.h | 2 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 - + arch/powerpc/include/asm/pte-common.h | 3 - + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/pgtable-bits.h | 3 - + arch/s390/Kconfig | 1 + + arch/s390/include/asm/pgtable.h | 1 - + arch/s390/mm/pgalloc.c | 21 +- + arch/sh/Kconfig | 5 +- + arch/sh/include/asm/pgtable.h | 2 - + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/pgtable_64.h | 3 - + arch/x86/Kconfig | 1 + + arch/x86/include/asm/pgtable_types.h | 1 - + arch/x86/mm/pgtable.c | 5 +- + block/genhd.c | 2 +- + drivers/block/zram/Kconfig | 14 +- + drivers/block/zram/zram_drv.c | 165 ++++- + drivers/block/zram/zram_drv.h | 14 +- + fs/9p/v9fs.c | 29 +- + fs/Kconfig | 4 + + fs/Makefile | 1 + + fs/autofs/Kconfig | 20 + + fs/autofs/Makefile | 7 + + fs/{autofs4 => autofs}/autofs_i.h | 92 +-- + fs/{autofs4 => autofs}/dev-ioctl.c | 31 +- + fs/{autofs4 => autofs}/expire.c | 132 ++-- + fs/{autofs4 => autofs}/init.c | 12 +- + fs/{autofs4 => autofs}/inode.c | 54 +- + fs/{autofs4 => autofs}/root.c | 277 ++++---- + fs/{autofs4 => autofs}/symlink.c | 16 +- + fs/{autofs4 => autofs}/waitq.c | 57 +- + fs/autofs4/Kconfig | 46 +- + fs/autofs4/Makefile | 4 +- + fs/bfs/inode.c | 9 +- + fs/binfmt_elf.c | 16 +- + fs/compat_ioctl.c | 2 - + fs/dax.c | 78 +- + fs/dcache.c | 3 +- + fs/exec.c | 4 +- + fs/exofs/ore.c | 84 ++- + fs/exofs/ore_raid.c | 75 +- + fs/exofs/super.c | 23 +- + fs/fcntl.c | 2 +- + fs/namei.c | 53 +- + fs/notify/dnotify/dnotify.c | 5 +- + fs/notify/fanotify/fanotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 5 +- + fs/notify/group.c | 4 + + fs/notify/inotify/inotify_fsnotify.c | 2 +- + fs/notify/inotify/inotify_user.c | 5 +- + fs/ocfs2/buffer_head_io.c | 77 +- + fs/ocfs2/dlmglue.c | 121 +++- + fs/ocfs2/dlmglue.h | 1 + + fs/ocfs2/file.c | 14 +- + fs/ocfs2/file.h | 2 - + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/journal.c | 51 +- + fs/ocfs2/namei.c | 3 +- + fs/ocfs2/ocfs2_fs.h | 8 +- + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/proc/array.c | 2 +- + fs/proc/base.c | 143 ++-- + fs/proc/fd.c | 2 +- + fs/proc/internal.h | 2 +- + fs/proc/page.c | 2 + + fs/proc/task_mmu.c | 26 +- + fs/userfaultfd.c | 22 +- + include/asm-generic/int-ll64.h | 19 +- + include/linux/cgroup-defs.h | 5 + + include/linux/dax.h | 4 +- + include/linux/fs.h | 2 + + include/linux/fsnotify_backend.h | 12 +- + include/linux/gfp.h | 10 +- + include/linux/hmm.h | 12 +- + include/linux/kcov.h | 14 + + include/linux/kernel.h | 1 + + include/linux/ksm.h | 17 - + include/linux/memcontrol.h | 97 ++- + include/linux/memfd.h | 16 + + include/linux/memory_hotplug.h | 1 - + include/linux/memremap.h | 1 + + include/linux/mm.h | 10 +- + include/linux/mm_types.h | 251 +++---- + include/linux/oom.h | 12 +- + include/linux/page-flags.h | 51 +- + include/linux/page_counter.h | 26 +- + include/linux/pfn_t.h | 4 +- + include/linux/sched.h | 5 +- + include/linux/sched/mm.h | 36 +- + include/linux/sched/signal.h | 3 + + include/linux/shmem_fs.h | 13 - + include/linux/slab.h | 61 ++ + include/linux/slab_def.h | 5 +- + include/linux/slub_def.h | 4 +- + include/linux/swap.h | 13 +- + include/linux/types.h | 34 +- + include/linux/userfaultfd_k.h | 6 +- + include/uapi/linux/auto_fs.h | 169 ++++- + include/uapi/linux/auto_fs4.h | 153 +--- + include/uapi/linux/kernel-page-flags.h | 2 +- + include/uapi/linux/prctl.h | 4 + + ipc/sem.c | 18 +- + ipc/shm.c | 2 +- + kernel/cgroup/cgroup.c | 13 +- + kernel/crash_core.c | 1 + + kernel/cred.c | 1 + + kernel/exit.c | 93 +-- + kernel/fork.c | 30 +- + kernel/hung_task.c | 11 +- + kernel/kcov.c | 21 +- + kernel/memremap.c | 39 +- + kernel/relay.c | 2 +- + kernel/sched/core.c | 4 + + kernel/sys.c | 21 +- + kernel/sysctl.c | 18 + + lib/Kconfig.debug | 36 +- + lib/bitmap.c | 5 +- + lib/idr.c | 10 +- + lib/nmi_backtrace.c | 5 +- + lib/percpu_ida.c | 63 +- + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/backing-dev.c | 39 +- + mm/debug.c | 4 +- + mm/filemap.c | 8 +- + mm/gup.c | 42 +- + mm/hmm.c | 297 ++------ + mm/huge_memory.c | 7 +- + mm/hugetlb.c | 62 +- + mm/hugetlb_cgroup.c | 6 +- + mm/init-mm.c | 1 + + mm/ksm.c | 25 +- + mm/list_lru.c | 7 + + mm/memblock.c | 27 +- + mm/memcontrol.c | 783 +++++++++++++++++---- + mm/memfd.c | 345 +++++++++ + mm/memory.c | 40 +- + mm/memory_hotplug.c | 23 + + mm/mincore.c | 12 +- + mm/mmap.c | 4 +- + mm/nommu.c | 2 +- + mm/oom_kill.c | 234 ++++-- + mm/page_alloc.c | 74 +- + mm/page_counter.c | 100 ++- + mm/page_owner.c | 4 +- + mm/shmem.c | 379 ++-------- + mm/slab.c | 8 +- + mm/slab.h | 6 +- + mm/slab_common.c | 122 +++- + mm/slob.c | 4 +- + mm/slub.c | 126 +--- + mm/sparse-vmemmap.c | 1 - + mm/sparse.c | 35 +- + mm/swap_slots.c | 10 +- + mm/swap_state.c | 19 +- + mm/swapfile.c | 156 +++- + mm/userfaultfd.c | 22 +- + mm/vmalloc.c | 41 +- + mm/vmpressure.c | 35 +- + mm/vmscan.c | 38 +- + net/9p/client.c | 13 +- + net/9p/trans_xen.c | 1 - + scripts/checkpatch.pl | 15 + + scripts/get_maintainer.pl | 13 +- + scripts/tags.sh | 6 +- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + tools/testing/selftests/proc/.gitignore | 3 + + tools/testing/selftests/proc/Makefile | 5 +- + tools/testing/selftests/proc/fd-001-lookup.c | 168 +++++ + tools/testing/selftests/proc/fd-002-posix-eq.c | 57 ++ + tools/testing/selftests/proc/fd-003-kthread.c | 178 +++++ + tools/testing/selftests/proc/proc-uptime.h | 16 +- + tools/testing/selftests/proc/proc.h | 39 + + tools/testing/selftests/proc/read.c | 17 +- + tools/vm/page-types.c | 1 + + 200 files changed, 4662 insertions(+), 2657 deletions(-) + rename Documentation/filesystems/{autofs4-mount-control.txt => autofs-mount-control.txt} (98%) + rename Documentation/filesystems/{autofs4.txt => autofs.txt} (98%) + create mode 100644 fs/autofs/Kconfig + create mode 100644 fs/autofs/Makefile + rename fs/{autofs4 => autofs}/autofs_i.h (67%) + rename fs/{autofs4 => autofs}/dev-ioctl.c (96%) + rename fs/{autofs4 => autofs}/expire.c (79%) + rename fs/{autofs4 => autofs}/init.c (78%) + rename fs/{autofs4 => autofs}/inode.c (85%) + rename fs/{autofs4 => autofs}/root.c (72%) + rename fs/{autofs4 => autofs}/symlink.c (59%) + rename fs/{autofs4 => autofs}/waitq.c (90%) + create mode 100644 include/linux/memfd.h + create mode 100644 mm/memfd.c + create mode 100644 tools/testing/selftests/proc/fd-001-lookup.c + create mode 100644 tools/testing/selftests/proc/fd-002-posix-eq.c + create mode 100644 tools/testing/selftests/proc/fd-003-kthread.c + create mode 100644 tools/testing/selftests/proc/proc.h +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: mm: use octal not symbolic permissions +Applying: treewide: use PHYS_ADDR_MAX to avoid type casting ULLONG_MAX +Applying: mm: fix oom_kill event handling +Applying: hexagon: fix printk format warning in setup.c +Applying: hexagon: drop the unused variable zero_page_mask +Applying: mm, memcg: propagate memory effective protection on setting memory.min/low +Applying: mm, memcg: don't skip memory guarantee calculations +Applying: selftests: cgroup: add test for memory.low corner cases +Applying: kernel/kexec_file.c: add walk_system_ram_res_rev() +Applying: kernel/kexec_file.c: load kernel at top of system RAM if required +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: sparc64: NG4 memset 32 bits overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 8b971c1d8a29...151e832642ed akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (151e832642ed sparc64: NG4 memset 32 bits overflow) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + arch/arm64/mm/init.c | 6 +- + arch/hexagon/include/asm/pgtable.h | 1 - + arch/hexagon/kernel/setup.c | 2 +- + arch/hexagon/mm/init.c | 3 - + arch/mips/kernel/setup.c | 4 +- + arch/powerpc/mm/mem.c | 2 +- + arch/sparc/lib/NG4memset.S | 26 ++--- + arch/sparc/mm/init_64.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + drivers/firmware/efi/arm-init.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/remoteproc/qcom_q6v5_pil.c | 2 +- + drivers/soc/qcom/mdt_loader.c | 4 +- + include/linux/ioport.h | 3 + + include/linux/memcontrol.h | 26 ++++- + kernel/kexec_file.c | 2 + + kernel/resource.c | 63 +++++++++++++ + mm/cleancache.c | 10 +- + mm/cma_debug.c | 25 ++--- + mm/compaction.c | 2 +- + mm/dmapool.c | 2 +- + mm/failslab.c | 2 +- + mm/frontswap.c | 11 +-- + mm/memblock.c | 9 +- + mm/memcontrol.c | 35 ++++--- + mm/oom_kill.c | 2 +- + mm/page_alloc.c | 2 +- + mm/page_idle.c | 2 +- + mm/page_owner.c | 4 +- + mm/shmem.c | 9 +- + mm/slab_common.c | 4 +- + mm/vmalloc.c | 4 +- + mm/zsmalloc.c | 5 +- + mm/zswap.c | 38 ++++---- + tools/testing/selftests/cgroup/test_memcontrol.c | 115 +++++++++++++++++++++++ + 36 files changed, 322 insertions(+), 115 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..5a4e5a9ccdce --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.17-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..8b0f6ea00069 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180605 |