diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-03 18:09:35 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-04-03 18:09:35 +1000 |
| commit | 58e756c897f45d6d22270644484264ade995ca27 (patch) | |
| tree | 9bb1a3c1abd58f12fc7778211a27bcf3f3d07cac | |
| parent | beb759ff2561430dba4b17072b1c01d9d434fb72 (diff) | |
Add linux-next specific files for 20170403next-20170403
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 257 | ||||
| -rw-r--r-- | Next/Trees | 259 | ||||
| -rw-r--r-- | Next/merge.log | 10881 | ||||
| -rw-r--r-- | Next/quilt-import.log | 4 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 11402 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ca46a6c216d7 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,257 @@ +Name SHA1 +---- ---- +origin 496dcc5091e4c79f18ebae514e0e79e44a72993a +fixes 97da3854c526d3a6ee05c849c96e48d21527606c +kbuild-current 9be3213b14d44f6328281941193d97f3b97e7d4c +arc-current 4c6fabda1ad1dec6d274c098ef0a91809c74f2e3 +arm-current 35512d9712748fdd5fca4cc3dd0e7ade5025936b +m68k-current e3b1ebd673876f2cdb0b84205e52a33b94a9860f +metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218 +powerpc-fixes 7ed23e1bae8bf7e37fd555066550a00b95a3a98b +sparc 0ae2d26ffe70c32d4a7fe77593f0a55ce416c09e +fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51 +net e5c1e5198068ed896a8a80b8ed9e202bbab18851 +ipsec 72ef9c4125c7b257e3a714d62d778ab46583d6a3 +netfilter 8f1f7eeb22c16a197159cf7b35d1350695193ead +ipvs 77c1c03c5b8ef28e55bb0aff29b1e006037ca645 +wireless-drivers d77facb88448cdeaaa3adba5b9704a48ac2ac8d6 +mac80211 7d65f82954dadbbe7b6e1aec7e07ad17bc6d958b +sound-current 2f726aec19a9d2c63bec9a8a53a3910ffdcd09f8 +pci-current 9abb27c7594a62bbf6385e20b7f5a90b4eceae2f +driver-core.current c02ed2e75ef4c74e41e421acb4ef1494671585e8 +tty.current e53e597fd4c4a0b6ae58e57d76a240927fd17eaa +usb.current a7f12a21f6b32bdd8d76d3af81eef9e72ce41ec0 +usb-gadget-fixes 25cd9721c2b16ee0d775e36ec3af31f392003f80 +usb-serial-fixes c02ed2e75ef4c74e41e421acb4ef1494671585e8 +usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9 +phy 1a09b6a7c10e22c489a8b212dd6862b1fd9674ad +staging.current c02ed2e75ef4c74e41e421acb4ef1494671585e8 +char-misc.current c02ed2e75ef4c74e41e421acb4ef1494671585e8 +input-current 5659495a7a1455665ce1466d156597ad1bda8772 +crypto-current 9df0eb180c2074451f25556eb566d89c7057c2ac +ide 96297aee8bce237961b0e1b99e22913c5726af12 +vfio-fixes 65b1adebfe43c642dfe3b109edb5d992db5fbe72 +kselftest-fixes c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f +ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600 +mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29 +v4l-dvb-fixes 24a47426066c8ba16a4db1b20a41d63187281195 +drm-intel-fixes ecf8e89917d600fe846ebda911a9e690c6babfd0 +drm-misc-fixes 6d6e500391875cc372336c88e9a8af377be19c36 +kbuild e68966e4f52e833b8bbb5f5e1bfc19fca46fc483 +asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c +arc d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c +arm 0c4441f0b7344369eda9719bd8dfd74906ed4384 +arm-perf c09adab01e4aeecfa3dfae0946409844400c5901 +arm-soc 60e1ed69406f0dc48c68bf07df7826afc87e61e4 +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic 585bfd0195ccfeec32a7fadf73a5690699ae23b0 +aspeed ab15e12960f12f8f9236c2d66c52fac8505f430c +at91 fabfb0f29bb53ec0b8e2d89868ca3b8ae037878b +bcm2835 7ea6e490ba7f0ded1f1a576733453db2f4576ffa +berlin 5153351425c92f3e89358c8eb62ca8d901437581 +cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4 +imx-mxs abffca6fb6212bc67899758f79879cb2cc7fedcb +keystone 9e07c85a01ec662fb1c2f0386a3bd11c17222a07 +mvebu d79ac966212b413e8f2b7cd9ce0f7332dcc644b4 +omap 272f590cf2cd753f01dcaa77bc65fb9b1a363506 +omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2 +qcom 9f514b0f9cf3017bd6d730ee0c5a704e8af36f30 +renesas a1aca88887e6484f9beaf3df9bc5e534fc04d47d +rockchip db2636b14ef17d353298287c89c961cf077618ac +rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590 +samsung 1001354ca34179f3db924eb66672442a173147dc +samsung-krzk 835ca053046074906bcae97d0fa58b3c401fa387 +tegra cc516494e180705fd79425a7ab2a0afafbeabb0c +arm64 29d981217a5d091fb423763d0a6c8e390b20237b +clk 6b265e5eec86cad021b3b7a80292a0eefb24ef1d +c6x ca3060d39ae7a0964f8c123a4833029981e86476 +cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76 +h8300 58c57526711f7c87046b7c5a650535acbab2d3fb +hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a +ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6 +m68k 3dfe33020ca8a5e4f72993cc792a4838c464c8b3 +m68knommu c02ed2e75ef4c74e41e421acb4ef1494671585e8 +metag f5d163aad31e4ec30f7258e655503824a2b03d45 +microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3 +mips d72c4a87e3df7639713a29b3423103139f4fb995 +nios2 744606c76c4a3a73eb34d21f265013426426c4b5 +openrisc a4d4426635804379d618dd28e29f574a2bc11184 +parisc-hd a9f6b6b8cd2f5c935e9cd78b322897c08fe3ad82 +powerpc 17bb69515c6dfbe282e8a9df08ffb719ff4dbc73 +fsl 75b824727680a9d12c34d78096a5ac642e53f5d0 +mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0 +s390 6fb81d69d0bb455e6dbb5bd99529e2dea74b93e7 +sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc +sh e61c10e468a42512f5fad74c00b62af5cc19f65f +tile 0af0bc38175d9859753a08f07af3aa767601265b +uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725 +unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5 +xtensa d0c32cdc395cc4edfb66ae9178733a37319a2291 +fscrypt 94840e3c802daa1a62985957f36ac48faf8ceedd +befs 0bbabf98dd76229db3a1a2f2903a25c611fd68ae +btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c +btrfs-kdave d701f24ae59255e7ff101b31083a851484f91999 +ceph 633ee407b9d15a75ac9740ba9d3338815e1fcb95 +cifs 70c1da060b51ff5661b6ab4cc5044c06ffeff894 +configfs e16769d4bca67218531505ad1a8365d227fedcf9 +ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c +ext3 ab4949640d6674b617b314ad3c2c00353304bab9 +ext4 d67d64f423147cf4fe8212658255e1160a4ef02c +f2fs 65f770f2ead7dfdf661b2da49af1aa814b662c93 +freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad +fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea +fuse 9a87ad3da905239413477ac0698734afc5cc30bd +gfs2 307c3320a929c6d57a6f9a0cd05bd5f96e5e8a4d +jfs 684666e51585f3b136a3f505f8173d7580bc52cd +nfs 97da3854c526d3a6ee05c849c96e48d21527606c +nfsd ed2a44f6407c4b8571e917732fd55ca115919654 +orangefs e98bdb3059cbf2b1cd4261e126b08429f64466c3 +overlayfs b1eaa950f7e905aaffca0454aa05101ce4f6446a +v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc +ubifs 1cb51a15b576ee325d527726afff40947218fd5e +xfs 0cbf8c9f4fe6dd244732717fa7e9c077ae7ec896 +file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69 +vfs 9e9c5ba8bd70714708bc9ae9b557eb8141f1de74 +vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +printk 64ca752dcbc018054bfea53b784d4c85d3ec896c +pci d7566c5014b8ec3a17a451aaa7a61a2beab22dd5 +pstore eec50d76a6ee6d7bd507c7aaaaee776178e2e08e +hid 7a10d0cf0121ad62f4fa02a3d3e2ac1fbac2cf6d +i2c aab817ebee6fedcf745920f4c16bdf6bd137b20b +jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225 +dmi 0c744ea4f77d72b3dcebb7a8f2684633ec79be88 +hwmon-staging 67043d1853d67e3a03038654ab51df3aa8f66ae4 +jc_docs 0e056eb5530da802c07f080d6bbd43c50e799efd +v4l-dvb c3d4fb0fb41f4b5eafeee51173c14e50be12f839 +v4l-dvb-next 432ac2d4acefbbc2e14c672718a70fd13ad8387c +fbdev 6f9655b1b81f2aa9207ec3837641299406a26b69 +pm d80f9e89239be45c94fac7679ede10e5ebd4de7e +idle 306899f94804aece6d8fa8b4223ede3b48dbb59c +thermal f7b553c688c3987833e78346de5d53aacd38638b +thermal-soc c64d1b57043ed22ff9e2eccb2d21df6b67a46619 +ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de +dlm c0ae148576778de958a0d5ff9a5ba00044e371a8 +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 88f913f5ee895fc595abd6564447fd740ca1f966 +ipsec-next 6c786bcb29dd684533ec165057f437d5bb34a4b2 +netfilter-next 592d42ac7fd36408979e09bf2f170f2595dab7b8 +ipvs-next e24113769960980579610ecfd657bb17f19373a3 +wireless-drivers-next 41977e86c984fcdddb454a3d7887de5d47b5f530 +bluetooth 733db4ccec579e027f54011573a2304c205e7b3d +mac80211-next a339e4c226c0f2ea0c138e9ffc419874d370f57b +rdma 9294000d6d895ad609f3cc4aff98c9c6175b466f +mtd d91f6cee98b6e0ef5a05209ca9b741d23086cdb2 +l2-mtd d91f6cee98b6e0ef5a05209ca9b741d23086cdb2 +nand a779475bdf565beb9db77dd349d1f7e648ed7c1d +spi-nor 0859c617ba1ffebb474e2698e5739981d1095ff7 +crypto 796b40c6171456274b02447e1dbbea97456403fe +drm 7558ab66424e61819cbf3d778d9f780f3aa205e9 +drm-panel eaeebffa90f35e0f92658249b0e5c49ddfa89915 +drm-intel 5f09ad8be7bc2d09f2248ad102f0024e6bdb4613 +drm-tegra 0725ed651da1762ef889d4d6e673da163f74cdf5 +drm-misc 50021ff1ad5da500a09ca4866467a12cf66f37cb +drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13 +drm-msm 849f0512efc94989dc9289a6fadfd33ab6db279c +hdlcd 1de3cd4fb49f3463679c49afe0aa9ceb133f3e49 +mali-dp cda0c3ce329716b399e467a46bd78eb0f97c964b +sunxi af4b31682bbe31726026ab72d8c89e343c1adb7a +kspp 9b5e50a16f0712576db6d272b35b54cf6db259ad +kconfig 5bcba792bb304e8341217d759ec486969a3b4258 +regmap bbbed19517040c8940e4fa49d399ccd049b0551b +sound d1600401faad4bc186bfdb291d8af644465e20bd +sound-asoc 3e01d2af9bc26cc0c318a515075c3dd879df1adf +modules 5bd933fe4481688d595ae1dd0440006c8675a1a8 +input f069b5a0b27ad4a87e9351e54fbcab3d3f8a9fd5 +block 6ecf5c70e165561b2e96ff2a4414b8314cc196ca +lightnvm e57ef816cf77f423035bd7c67016ec226db50d1e +device-mapper 3591b6613c18f0fe8327ff781d521369fda3d6cc +pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8 +mmc 72cc952b89542a4be5f7958084477ee99dd4fcdd +kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb +md 8fc04e6ea02d631fd344f462002078b8067793de +mfd 7ca7babfd27ffd1155b52d79be19e25d0a88d627 +backlight 80e5d455339ad15d0a5995c8b72d267ce1f70841 +battery 5782dcb20370b5e8e4c99e69d74c4c2a23abdeb3 +omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b +regulator 77b927bc409689257e8bcb4291bd596f1b9b46dc +security ddb99e118e37f324a4be65a411bb60ae62795cf9 +integrity 3dd0c8d06511c7c61c62305fcf431ca28884d263 +keys ed51e44e914c634bfd8435037474ebb0b47db956 +selinux cae303df3f379f04ce7efadb2e30de460918b302 +tpmdd 8c76c41d070083d3f904ef46fdcdd3caa68fe3af +watchdog 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869 +iommu 41346dad4de0d14b343ee97478604298a4e46c33 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio d9d84780f17cd9e25ddde10eb40357b96b7d6874 +trivial 4f6cce39105e63587e53361bb670786b52d533ae +audit 36fe46d172e52a37bf9293f130610129c1239f56 +devicetree 8654cb8d0371de3f119c657531abf2ee4423cb44 +mailbox 73874913d5044fb5d81d34b2c760a8df8521bd0f +spi bda8650e60edf5d204ed9d0dc8ca9cfbc11b5c3e +tip 1c85e08a067b13ac01d7f22dc90e945631ab42e3 +clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3 +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 41003396f932d7f027725c7acebb6a7caa41dc3e +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 65a50c656276b0846bea09dd011c0a3d35b77f3e +rcu fd6f7b882ba706c50c253c544afb9b76a7693ab3 +kvm e55fe3ccccc1efb8f20c99728c8863424ae9ee4a +kvm-arm 255905e4ff0f91bb09c6da421b0103071f7772cc +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc bcd3bb63dbc87a3bbb21e95a09cd26bb6479c332 +kvms390 4e0b1ab72b8af961bcaca9ec1475279c1cd9579c +xen-tip d825adb48cf9bf9e3f5cb1d927e2827f8c2abee4 +percpu 8a1df543de8ad879d3c80bdda4c67ac4f82e7ee0 +workqueues bacb71fc9187f288e98c3132e87f36c0362318df +drivers-x86 8731734c476a24028edd30cdb182c57ae3c5dc6b +chrome-platform 31b764171cb545cc1f750c573eef713329936660 +hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382 +leds aef13a5447a736778b4aaaeb165f989fff7bf2f8 +ipmi 31151bf07a5203310bb1f86292aae92886e36d3d +driver-core 96fb7e256a0650c2b37768c780bf0f680b0049b6 +usb d30eed1cd2b17f6140ec443f22a8e32f99cd99c1 +usb-gadget c02ed2e75ef4c74e41e421acb4ef1494671585e8 +usb-serial e1fdd5b2620198979b23abb679848a78461481e6 +usb-chipidea-next 4f4555cfe704913ce4ce836ab2707825d784a7cc +phy-next 4e38906cb2dabdd565f6cd127e138fdcdec23760 +tty abf1e0a98083fd0a1069ce68ad8c92bfb97a57db +char-misc 57c0eabbd57e1a0872122525f6eeefe1f6529c33 +extcon 8e45fd9e73266227ccf23b0c63aaec839530242f +staging a2e99e97393187a72b827b2e9880b9e4516b0893 +mux 5238347fea9262a4c0124a726dfe21b6f6be6aa2 +slave-dma 6d64f547d571511e601f31541e236291971fd994 +cgroup 2b29fbe02b7824a1e27e8e6449bcb41f6eacfb5a +scsi d95ded912cdf5c0d1bbd7d9ac0e5c419b051b95b +scsi-mkp dbd34a61c343f73f835539592fba4bdba8832e05 +target-updates 9f7ebfc64d2c4716087e637c8924d4d9770944c1 +target-merge 2994a75183173defc21f0d26ce23b63232211b88 +target-bva 762b6f00a995863afa274d6b5ffa3880dac1714b +libata 0a7d2635b8cff865f7936a606ef69289fd46bf3c +binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed +vhost f0bb2d50dfcc519f06f901aac88502be6ff1df2c +rpmsg 5e78de7eee7401362abceb2f2e182274c48c125f +gpio d85f6bb3075983993e5523dc9938f202d90e6c5c +pinctrl 7c795e971856ac48404c994e53a6c8bf43b58752 +pinctrl-samsung 786b1f7c95d7449ecc852ca8f4e2b006b36b3a56 +dma-mapping 1001354ca34179f3db924eb66672442a173147dc +pwm 38b0a526ec33314ee1d9926e3a347078f63eac8e +dma-buf 194cad44c4e1553fd8fcfbc940d27e756324ec3a +userns 040757f738e13caaa9c5078bca79aa97e11dde88 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random db61ffe3a71c697aaa91c42c862a5f7557a0e562 +aio b562e44f507e863c6792946e4e1b1449fbbac85d +kselftest c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +luto-misc 2dcd0af568b0cf583645c8a317dd12e344b1c72a +borntraeger e76d21c40bd6c67fd4e2c1540d77e113df962b4d +livepatching 8044e92eb7c2ec1bdf8097d081619ae909838dfa +coresight c749b99b9adefa6291977edef2349e5ea3a0a56a +rtc 65e9e65cebbea755db638875a44b227a1027570e +hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828 +nvdimm 22486cb6d9298b5fde2b8bb0e21f4ddc12275886 +dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +akpm-current 13ac25253bc1be25f104c9dc13a61758232d1578 +akpm 44af4ffd30cad96b48d53fba93b9580cf5f30bc7 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4578bf24ff15 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,259 @@ +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 +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +metag-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#fixes +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +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 +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 +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +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 +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next-urgent +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-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 +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 +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 +berlin git git://git.infradead.org/users/hesselba/linux-berlin.git#berlin/for-next +cortex-m git git://git.pengutronix.de/git/ukl/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +omap-pending git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +rpi git git://git.kernel.org/pub/scm/linux/kernel/git/rpi/linux-rpi.git#for-rpi-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +hexagon git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git#linux-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +metag git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.linux-mips.org/pub/scm/ralf/upstream-sfr.git#mips-for-linux-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +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 +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +mpc5xxx git git://git.denx.de/linux-denx-agust.git#next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +tile git git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +unicore32 git git://github.com/gxt/linux.git#unicore32 +xtensa git git://github.com/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://github.com/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 +freevxfs git git://git.infradead.org/users/hch/freevxfs.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +v9fs git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#for-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.samba.org/jlayton/linux.git#linux-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-jk git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#vfs +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 +jdelvare-hwmon quilt http://jdelvare.nerim.net/devel/linux/jdelvare-hwmon/ +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +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 +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/l2-mtd.git#master +nand git git://github.com/linux-nand/linux.git#nand/next +spi-nor git git://github.com/spi-nor/linux.git#next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://people.freedesktop.org/~airlied/linux.git#drm-next +drm-panel git git://anongit.freedesktop.org/tegra/linux.git#drm/panel/for-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git git://anongit.freedesktop.org/tegra/linux.git#drm/tegra/for-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#exynos-drm/for-next +drm-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi/for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +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/pcmcia.git#master +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 +omap_dss2 git git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.infradead.org/users/pcmoore/selinux#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.infradead.org/users/pcmoore/audit#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.infradead.org/users/jcooper/linux.git#irqchip/for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-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/users/dvhart/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://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-merge git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next-merge +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 +binfmt_misc git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/binfmt_misc.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 +dma-mapping git git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git#dma-mapping-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +dma-buf git git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +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 +luto-misc git git://git.kernel.org/pub/scm/linux/kernel/git/luto/linux.git#next +borntraeger git git://git.kernel.org/pub/scm/linux/kernel/git/borntraeger/linux.git#linux-next +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +hwspinlock git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git#for-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +dax-misc git git://git.kernel.org/cgit/linux/kernel/git/nvdimm/nvdimm.git#dax-misc +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +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..fa96186d78ae --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,10881 @@ +$ date -R +Mon, 03 Apr 2017 09:35:24 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 89970a04d70c Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux +Merging origin/master (496dcc5091e4 Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating 89970a04d70c..496dcc5091e4 +Fast-forward + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/devicetree/bindings/rng/omap_rng.txt | 3 +- + arch/arc/boot/dts/skeleton.dtsi | 1 + + arch/arc/boot/dts/skeleton_hs.dtsi | 1 + + arch/arc/boot/dts/skeleton_hs_idu.dtsi | 21 +- + arch/arc/boot/dts/vdk_axs10x_mb.dtsi | 20 +- + arch/arc/include/asm/kprobes.h | 4 +- + arch/arc/kernel/entry-arcv2.S | 12 +- + arch/arc/kernel/setup.c | 16 +- + arch/arc/mm/cache.c | 3 + + arch/arm/boot/dts/sun8i-a33.dtsi | 4 +- + arch/arm64/include/asm/current.h | 2 - + arch/arm64/kernel/smp.c | 2 +- + arch/arm64/kernel/vdso/.gitignore | 1 - + arch/parisc/include/asm/uaccess.h | 59 +-- + arch/parisc/kernel/parisc_ksyms.c | 10 - + arch/parisc/kernel/process.c | 2 + + arch/parisc/lib/Makefile | 2 +- + arch/parisc/lib/fixup.S | 98 ----- + arch/parisc/lib/lusercopy.S | 318 ++++++++++++++ + arch/parisc/lib/memcpy.c | 461 +-------------------- + arch/parisc/mm/fault.c | 17 + + arch/s390/include/asm/sections.h | 1 - + arch/s390/kernel/vmlinux.lds.S | 2 - + arch/x86/Makefile | 35 +- + arch/x86/Makefile_32.cpu | 18 - + arch/x86/boot/compressed/error.c | 1 + + arch/x86/events/core.c | 9 +- + arch/x86/include/asm/timer.h | 2 + + arch/x86/include/asm/uv/uv_hub.h | 8 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 3 +- + arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- + arch/x86/kernel/ftrace.c | 6 + + arch/x86/kernel/tsc.c | 4 +- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/mm/kaslr.c | 4 +- + arch/x86/purgatory/Makefile | 1 + + crypto/lrw.c | 7 +- + crypto/xts.c | 7 +- + drivers/acpi/Makefile | 1 - + drivers/acpi/acpi_platform.c | 8 +- + drivers/acpi/apei/ghes.c | 1 + + drivers/acpi/ioapic.c | 6 + + drivers/clocksource/clkevt-probe.c | 2 +- + drivers/cpufreq/cpufreq.c | 38 +- + drivers/cpuidle/cpuidle-powernv.c | 18 + + drivers/crypto/ccp/ccp-dev-v5.c | 1 + + drivers/crypto/ccp/ccp-dev.h | 5 + + drivers/crypto/ccp/ccp-dmaengine.c | 41 ++ + drivers/firmware/efi/efi.c | 1 - + drivers/firmware/efi/esrt.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 4 +- + drivers/gpu/drm/i915/gvt/edid.c | 3 +- + drivers/gpu/drm/i915/gvt/gtt.c | 8 +- + drivers/gpu/drm/i915/gvt/handlers.c | 10 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 + + drivers/gpu/drm/i915/gvt/render.c | 2 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 7 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 13 +- + drivers/hid/hid-core.c | 1 + + drivers/hid/hid-ids.h | 1 + + drivers/hid/hid-xinmo.c | 1 + + drivers/hid/wacom_sys.c | 18 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 34 +- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/irq-mips-gic.c | 4 + + drivers/mmc/host/sdhci-of-at91.c | 11 +- + drivers/mmc/host/sdhci.c | 6 + + drivers/pci/host/pci-thunder-pem.c | 58 ++- + drivers/pci/host/pcie-iproc-bcma.c | 24 +- + drivers/pci/host/pcie-iproc-platform.c | 19 +- + drivers/pci/host/pcie-iproc.h | 1 + + drivers/rapidio/devices/tsi721.c | 4 +- + drivers/rapidio/devices/tsi721.h | 4 +- + drivers/scsi/aacraid/commsup.c | 14 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 38 +- + drivers/scsi/hpsa.c | 1 + + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/lpfc/lpfc_debugfs.h | 22 +- + drivers/scsi/lpfc/lpfc_els.c | 3 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 4 +- + drivers/scsi/qedi/qedi_main.c | 1 + + drivers/scsi/qla2xxx/qla_os.c | 3 +- + drivers/scsi/sg.c | 2 + + drivers/scsi/ufs/ufshcd-pltfrm.c | 4 +- + drivers/scsi/ufs/ufshcd.c | 2 - + drivers/tty/serial/8250/Kconfig | 8 +- + drivers/tty/serial/amba-pl011.c | 23 +- + drivers/tty/serial/atmel_serial.c | 8 + + drivers/tty/serial/mxs-auart.c | 2 +- + drivers/tty/vt/keyboard.c | 1 - + drivers/usb/core/hcd.c | 7 +- + drivers/usb/host/xhci-plat.c | 1 + + drivers/usb/host/xhci-ring.c | 3 + + drivers/usb/host/xhci.c | 43 +- + drivers/usb/phy/phy-isp1301.c | 2 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/disk-io.c | 2 +- + fs/btrfs/extent_io.c | 46 +- + fs/btrfs/inode.c | 6 +- + fs/btrfs/qgroup.c | 10 +- + fs/btrfs/send.c | 7 +- + fs/hugetlbfs/inode.c | 25 +- + fs/nfs/dir.c | 9 +- + fs/nfs/filelayout/filelayout.c | 151 ++++--- + fs/nfs/filelayout/filelayout.h | 19 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 4 + + fs/nfs/nfs4proc.c | 9 +- + fs/nfsd/nfsctl.c | 43 +- + fs/nfsd/nfsproc.c | 1 + + fs/nfsd/nfssvc.c | 28 +- + include/asm-generic/sections.h | 6 +- + include/asm-generic/vmlinux.lds.h | 6 +- + include/linux/clockchips.h | 2 +- + include/linux/kasan.h | 3 + + include/linux/memcontrol.h | 6 + + include/linux/mm.h | 2 + + include/linux/sched/clock.h | 13 +- + init/main.c | 2 + + kernel/padata.c | 5 +- + kernel/sched/clock.c | 46 +- + lib/syscall.c | 1 + + lib/test_kasan.c | 10 + + mm/hugetlb.c | 10 +- + mm/kasan/kasan.h | 5 - + mm/kasan/report.c | 36 ++ + mm/kmemleak.c | 2 +- + mm/migrate.c | 7 +- + mm/rmap.c | 4 +- + mm/vmstat.c | 4 +- + mm/workingset.c | 2 +- + net/sunrpc/svcsock.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 1 + + scripts/Kbuild.include | 4 + + sound/core/seq/seq_fifo.c | 4 + + sound/pci/hda/patch_realtek.c | 12 +- + sound/soc/atmel/atmel-classd.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 16 +- + sound/soc/codecs/rt5665.c | 10 +- + sound/soc/codecs/rt5665.h | 2 +- + sound/soc/codecs/wm_adsp.c | 9 +- + sound/soc/generic/simple-card-utils.c | 1 + + sound/soc/intel/skylake/skl-topology.c | 2 +- + sound/soc/mediatek/Kconfig | 2 +- + sound/soc/sh/rcar/cmd.c | 36 +- + sound/soc/sh/rcar/dma.c | 18 +- + sound/soc/sh/rcar/ssiu.c | 6 +- + sound/soc/soc-core.c | 8 +- + sound/soc/sti/uniperif_reader.c | 3 + + sound/soc/sunxi/sun8i-codec.c | 67 ++- + 152 files changed, 1378 insertions(+), 1095 deletions(-) + delete mode 100644 arch/parisc/lib/fixup.S +Merging fixes/master (97da3854c526 Linux 4.11-rc3) +$ git merge fixes/master +Already up-to-date. +Merging kbuild-current/fixes (9be3213b14d4 gconfig: remove misleading parentheses around a condition) +$ git merge kbuild-current/fixes +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 4 ++-- + Makefile | 14 +++++++------- + scripts/Makefile.lib | 2 +- + scripts/kconfig/gconf.c | 2 +- + 4 files changed, 11 insertions(+), 11 deletions(-) +Merging arc-current/for-curr (4c6fabda1ad1 ARC: fix build warnings with !CONFIG_KPROBES) +$ git merge arc-current/for-curr +Already up-to-date. +Merging arm-current/fixes (35512d971274 Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes) +$ git merge arm-current/fixes +Merge made by the 'recursive' strategy. + arch/arm/include/asm/fixmap.h | 7 +----- + arch/arm/include/asm/mmu.h | 2 ++ + arch/arm/kernel/setup.c | 5 +--- + arch/arm/mm/dma-mapping.c | 20 ++++++++++++++- + arch/arm/mm/mmu.c | 12 +++++++-- + arch/arm/mm/nommu.c | 5 +++- + arch/arm/probes/kprobes/core.c | 49 ++++++++++++++++++++++++++++--------- + arch/arm/probes/kprobes/test-core.c | 11 ++++++--- + 8 files changed, 83 insertions(+), 28 deletions(-) +Merging m68k-current/for-linus (e3b1ebd67387 m68k: Wire up statx) +$ git merge m68k-current/for-linus +Already up-to-date. +Merging metag-fixes/fixes (35d04077ad96 metag: Only define atomic_dec_if_positive conditionally) +$ git merge metag-fixes/fixes +Already up-to-date. +Merging powerpc-fixes/fixes (7ed23e1bae8b powerpc: Disable HFSCR[TM] if TM is not supported) +$ git merge powerpc-fixes/fixes +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/setup_64.c | 9 +++++++++ + tools/testing/selftests/powerpc/Makefile | 10 +++++----- + 2 files changed, 14 insertions(+), 5 deletions(-) +Merging sparc/master (0ae2d26ffe70 arch/sparc: Avoid DCTI Couples) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + arch/sparc/include/asm/page_64.h | 3 ++- + arch/sparc/kernel/head_64.S | 4 ++++ + arch/sparc/kernel/misctrap.S | 1 + + arch/sparc/kernel/rtrap_64.S | 1 + + arch/sparc/kernel/spiterrs.S | 1 + + arch/sparc/kernel/sun4v_tlb_miss.S | 1 + + arch/sparc/kernel/urtt_fill.S | 1 + + arch/sparc/kernel/winfixup.S | 2 ++ + arch/sparc/lib/NG2memcpy.S | 4 ++++ + arch/sparc/lib/NG4memcpy.S | 1 + + arch/sparc/lib/NG4memset.S | 1 + + arch/sparc/lib/NGmemcpy.S | 1 + + arch/sparc/mm/hugetlbpage.c | 9 ++++++++- + arch/sparc/mm/init_64.c | 6 +++++- + 14 files changed, 33 insertions(+), 3 deletions(-) +Merging fscrypt-current/for-stable (42d97eb0ade3 fscrypt: fix renaming and linking special files) +$ git merge fscrypt-current/for-stable +Already up-to-date. +Merging net/master (e5c1e5198068 Merge branch 'l2tp_session_find-fixes') +$ git merge net/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 + + drivers/isdn/capi/kcapi.c | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 5 - + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 23 +- + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 3 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 4 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 4 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 30 ++- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 10 +- + drivers/net/ethernet/emulex/benet/be_cmds.c | 9 +- + drivers/net/ethernet/ezchip/nps_enet.c | 4 +- + drivers/net/ethernet/faraday/ftgmac100.c | 2 + + drivers/net/ethernet/hisilicon/hns/hns_dsaf_mac.c | 11 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 28 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/lag.c | 5 +- + drivers/net/ethernet/moxa/moxart_ether.c | 20 +- + drivers/net/ethernet/moxa/moxart_ether.h | 1 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 11 +- + drivers/net/irda/vlsi_ir.c | 8 +- + drivers/net/phy/mdio-boardinfo.c | 1 + + drivers/net/phy/phy.c | 2 +- + drivers/net/usb/cdc_ether.c | 15 ++ + drivers/net/usb/r8152.c | 21 +- + drivers/s390/net/qeth_core.h | 3 +- + drivers/s390/net/qeth_core_main.c | 5 +- + drivers/s390/net/qeth_l2_main.c | 5 +- + drivers/s390/net/qeth_l3_main.c | 20 +- + include/net/sctp/structs.h | 5 +- + kernel/bpf/verifier.c | 64 +++-- + net/core/neighbour.c | 3 +- + net/core/secure_seq.c | 31 ++- + net/core/sysctl_net_core.c | 6 +- + net/ipv4/ipconfig.c | 2 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 20 +- + net/ipv4/ping.c | 5 +- + net/kcm/kcmsock.c | 6 +- + net/l2tp/l2tp_core.c | 152 ++++++++--- + net/l2tp/l2tp_core.h | 6 +- + net/l2tp/l2tp_eth.c | 10 +- + net/l2tp/l2tp_ip.c | 22 +- + net/l2tp/l2tp_ip6.c | 23 +- + net/l2tp/l2tp_netlink.c | 45 ++-- + net/l2tp/l2tp_ppp.c | 82 +++--- + net/mac80211/iface.c | 3 +- + net/netfilter/nf_conntrack_ecache.c | 2 + + net/netfilter/nf_conntrack_extend.c | 13 +- + net/netfilter/nf_conntrack_netlink.c | 1 + + net/netfilter/nf_nat_core.c | 2 + + net/netfilter/nfnetlink_cthelper.c | 287 ++++++++++++-------- + net/netfilter/nfnetlink_cttimeout.c | 2 +- + net/netfilter/nfnetlink_queue.c | 9 +- + net/openvswitch/conntrack.c | 4 +- + net/openvswitch/flow.c | 10 +- + net/packet/af_packet.c | 8 +- + net/sctp/associola.c | 7 +- + net/sctp/output.c | 2 +- + net/sctp/outqueue.c | 3 +- + net/sctp/proc.c | 4 +- + net/sctp/sm_make_chunk.c | 9 +- + net/sctp/sm_statefuns.c | 6 +- + net/sctp/socket.c | 12 +- + net/sctp/stream.c | 43 ++- + net/wireless/sysfs.c | 10 +- + tools/include/linux/filter.h | 10 + + tools/testing/selftests/bpf/Makefile | 9 +- + tools/testing/selftests/bpf/test_verifier.c | 290 ++++++++++++++++++++- + 70 files changed, 1112 insertions(+), 395 deletions(-) +Merging ipsec/master (72ef9c4125c7 dccp: fix memory leak during tear-down of unsuccessful connection request) +$ git merge ipsec/master +Already up-to-date. +Merging netfilter/master (8f1f7eeb22c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf) +$ git merge netfilter/master +Already up-to-date. +Merging ipvs/master (77c1c03c5b8e netfilter: nfnetlink_queue: fix secctx memory leak) +$ git merge ipvs/master +Already up-to-date. +Merging wireless-drivers/master (d77facb88448 brcmfmac: use local iftype avoiding use-after-free of virtual interface) +$ git merge wireless-drivers/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 +++++--- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 2 ++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 9 ++++++--- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +++++-- + drivers/net/wireless/realtek/rtlwifi/base.c | 6 ++++-- + 7 files changed, 25 insertions(+), 12 deletions(-) +Merging mac80211/master (7d65f82954da mac80211: unconditionally start new netdev queues with iTXQ support) +$ git merge mac80211/master +Already up-to-date. +Merging sound-current/for-linus (2f726aec19a9 ALSA: hda - fix a problem for lineout on a Dell AIO machine) +$ git merge sound-current/for-linus +Already up-to-date. +Merging pci-current/for-linus (9abb27c7594a PCI: thunder-pem: Add legacy firmware support for Cavium ThunderX host controller) +$ git merge pci-current/for-linus +Already up-to-date. +Merging driver-core.current/driver-core-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge driver-core.current/driver-core-linus +Already up-to-date. +Merging tty.current/tty-linus (e53e597fd4c4 tty: pl011: fix earlycon work-around for QDF2400 erratum 44) +$ git merge tty.current/tty-linus +Already up-to-date. +Merging usb.current/usb-linus (a7f12a21f6b3 usb: phy: isp1301: Fix build warning when CONFIG_OF is disabled) +$ git merge usb.current/usb-linus +Already up-to-date. +Merging usb-gadget-fixes/fixes (25cd9721c2b1 usb: gadget: f_hid: fix: Don't access hidg->req without spinlock held) +$ git merge usb-gadget-fixes/fixes +Already up-to-date. +Merging usb-serial-fixes/usb-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge usb-serial-fixes/usb-linus +Already up-to-date. +Merging usb-chipidea-fixes/ci-for-usb-stable (c7fbb09b2ea1 usb: chipidea: move the lock initialization to core file) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Merge made by the 'recursive' strategy. +Merging phy/fixes (1a09b6a7c10e phy: qcom-usb-hs: Add depends on EXTCON) +$ git merge phy/fixes +Already up-to-date. +Merging staging.current/staging-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge staging.current/staging-linus +Already up-to-date. +Merging char-misc.current/char-misc-linus (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge char-misc.current/char-misc-linus +Already up-to-date. +Merging input-current/for-linus (5659495a7a14 uapi: add missing install of userio.h) +$ git merge input-current/for-linus +Auto-merging include/uapi/linux/Kbuild +Merge made by the 'recursive' strategy. + include/uapi/linux/Kbuild | 1 + + 1 file changed, 1 insertion(+) +Merging crypto-current/master (9df0eb180c20 crypto: xts,lrw - fix out-of-bounds write after kmalloc failure) +$ git merge crypto-current/master +Already up-to-date. +Merging ide/master (96297aee8bce ide: palm_bk3710: add __initdata to palm_bk3710_port_info) +$ git merge ide/master +Already up-to-date. +Merging vfio-fixes/for-linus (65b1adebfe43 vfio: Rework group release notifier warning) +$ git merge vfio-fixes/for-linus +Already up-to-date. +Merging kselftest-fixes/fixes (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge kselftest-fixes/fixes +Already up-to-date. +Merging backlight-fixes/for-backlight-fixes (68feaca0b13e backlight: pwm: Handle EPROBE_DEFER while requesting the PWM) +$ git merge backlight-fixes/for-backlight-fixes +Already up-to-date. +Merging ftrace-fixes/for-next-urgent (6224beb12e19 tracing: Have branch tracer use recursive field of task struct) +$ git merge ftrace-fixes/for-next-urgent +Already up-to-date. +Merging mfd-fixes/for-mfd-fixes (1a41741fd60b mfd: wm8994-core: Don't use managed regulator bulk get API) +$ git merge mfd-fixes/for-mfd-fixes +Already up-to-date. +Merging v4l-dvb-fixes/fixes (24a47426066c [media] exynos-gsc: Do not swap cb/cr for semi planar formats) +$ git merge v4l-dvb-fixes/fixes +Already up-to-date. +Merging drm-intel-fixes/for-linux-next-fixes (ecf8e89917d6 drm/i915: Use a dummy timeline name for a signaled fence) +$ git merge drm-intel-fixes/for-linux-next-fixes +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/kvmgt.c | 7 ---- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- + drivers/gpu/drm/i915/i915_drv.h | 1 + + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 4 ++- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- + drivers/gpu/drm/i915/i915_gem_request.c | 11 ++++++ + drivers/gpu/drm/i915/i915_pci.c | 5 +++ + drivers/gpu/drm/i915/i915_perf.c | 11 ++++-- + drivers/gpu/drm/i915/intel_lrc.c | 57 ++++++++++++++---------------- + drivers/gpu/drm/i915/intel_ringbuffer.h | 8 ++++- + 10 files changed, 64 insertions(+), 44 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (6d6e50039187 drm/vc4: Allocate the right amount of space for boot-time CRTC state.) +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up-to-date. +Merging kbuild/for-next (e68966e4f52e Merge branch 'uapi' into for-next) +$ git merge kbuild/for-next +Resolved 'include/uapi/linux/Kbuild' using previous resolution. +Removing include/video/Kbuild +Removing include/uapi/xen/Kbuild +Removing include/uapi/video/Kbuild +Removing include/uapi/sound/Kbuild +Removing include/uapi/scsi/fc/Kbuild +Removing include/uapi/scsi/Kbuild +Removing include/uapi/rdma/hfi/Kbuild +Removing include/uapi/rdma/Kbuild +Removing include/uapi/mtd/Kbuild +Removing include/uapi/misc/Kbuild +Removing include/uapi/linux/wimax/Kbuild +Removing include/uapi/linux/usb/Kbuild +Removing include/uapi/linux/tc_ematch/Kbuild +Removing include/uapi/linux/tc_act/Kbuild +Removing include/uapi/linux/sunrpc/Kbuild +Removing include/uapi/linux/spi/Kbuild +Removing include/uapi/linux/raid/Kbuild +Removing include/uapi/linux/nfsd/Kbuild +Removing include/uapi/linux/netfilter_ipv6/Kbuild +Removing include/uapi/linux/netfilter_ipv4/Kbuild +Removing include/uapi/linux/netfilter_bridge/Kbuild +Removing include/uapi/linux/netfilter_arp/Kbuild +Removing include/uapi/linux/netfilter/ipset/Kbuild +Removing include/uapi/linux/netfilter/Kbuild +Removing include/uapi/linux/mmc/Kbuild +Removing include/uapi/linux/isdn/Kbuild +Removing include/uapi/linux/iio/Kbuild +Removing include/uapi/linux/hsi/Kbuild +Removing include/uapi/linux/hdlc/Kbuild +Removing include/uapi/linux/dvb/Kbuild +Removing include/uapi/linux/can/Kbuild +Removing include/uapi/linux/caif/Kbuild +Removing include/uapi/linux/byteorder/Kbuild +Removing include/uapi/linux/android/Kbuild +Auto-merging include/uapi/linux/Kbuild +CONFLICT (content): Merge conflict in include/uapi/linux/Kbuild +Removing include/uapi/drm/Kbuild +Removing include/uapi/asm-generic/Kbuild +Removing include/uapi/Kbuild +Removing include/scsi/fc/Kbuild +Auto-merging include/rdma/ib_verbs.h +Removing include/asm-generic/Kbuild.asm +Removing include/Kbuild +Removing arch/tile/include/uapi/arch/Kbuild +Removing arch/tile/include/arch/Kbuild +Auto-merging arch/h8300/include/uapi/asm/bitsperlong.h +Removing arch/cris/include/uapi/arch-v32/arch/Kbuild +Removing arch/cris/include/uapi/arch-v10/arch/Kbuild +Removing arch/cris/include/arch-v32/arch/Kbuild +Removing arch/cris/include/arch-v10/arch/Kbuild +Auto-merging Makefile +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fec57fe7b998] Merge remote-tracking branch 'kbuild/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/kbuild/makefiles.txt | 74 ++-- + Makefile | 15 +- + arch/alpha/include/uapi/asm/Kbuild | 41 -- + arch/arc/Makefile | 4 +- + arch/arc/include/uapi/asm/Kbuild | 3 - + arch/arm/Makefile | 8 +- + arch/arm/include/uapi/asm/Kbuild | 17 - + arch/arm64/Makefile | 6 +- + arch/arm64/include/uapi/asm/Kbuild | 18 - + arch/avr32/include/uapi/asm/Kbuild | 20 - + arch/blackfin/include/uapi/asm/Kbuild | 17 - + arch/c6x/include/uapi/asm/Kbuild | 8 - + arch/cris/include/arch-v10/arch/Kbuild | 1 - + arch/cris/include/arch-v32/arch/Kbuild | 1 - + arch/cris/include/uapi/arch-v10/arch/Kbuild | 5 - + arch/cris/include/uapi/arch-v32/arch/Kbuild | 3 - + arch/cris/include/uapi/asm/Kbuild | 42 -- + arch/frv/include/uapi/asm/Kbuild | 33 -- + arch/h8300/include/uapi/asm/Kbuild | 28 -- + arch/h8300/include/{ => uapi}/asm/bitsperlong.h | 6 +- + arch/hexagon/include/asm/Kbuild | 3 - + arch/hexagon/include/uapi/asm/Kbuild | 13 - + arch/ia64/include/uapi/asm/Kbuild | 45 --- + arch/m32r/include/uapi/asm/Kbuild | 31 -- + arch/m68k/include/uapi/asm/Kbuild | 24 -- + arch/metag/include/uapi/asm/Kbuild | 8 - + arch/microblaze/include/uapi/asm/Kbuild | 32 -- + arch/mips/include/uapi/asm/Kbuild | 37 -- + arch/mn10300/include/uapi/asm/Kbuild | 32 -- + arch/nios2/include/uapi/asm/Kbuild | 4 +- + arch/openrisc/include/asm/Kbuild | 3 - + arch/openrisc/include/uapi/asm/Kbuild | 8 - + arch/parisc/include/uapi/asm/Kbuild | 28 -- + arch/powerpc/include/uapi/asm/Kbuild | 45 --- + arch/s390/include/uapi/asm/Kbuild | 53 --- + arch/score/include/asm/Kbuild | 3 - + arch/score/include/uapi/asm/Kbuild | 32 -- + arch/sh/Makefile | 7 +- + arch/sh/include/uapi/asm/Kbuild | 23 -- + arch/sparc/include/uapi/asm/Kbuild | 48 --- + arch/tile/include/arch/Kbuild | 1 - + arch/tile/include/asm/Kbuild | 3 - + arch/tile/include/uapi/arch/Kbuild | 17 - + arch/tile/include/uapi/asm/Kbuild | 17 - + arch/unicore32/Makefile | 4 +- + arch/unicore32/include/uapi/asm/Kbuild | 6 - + arch/x86/include/uapi/asm/Kbuild | 59 --- + arch/xtensa/include/uapi/asm/Kbuild | 23 -- + include/Kbuild | 2 - + include/asm-generic/Kbuild.asm | 1 - + include/linux/crypto.h | 2 +- + include/rdma/ib_verbs.h | 3 +- + include/scsi/fc/Kbuild | 0 + include/uapi/Kbuild | 15 - + include/uapi/asm-generic/Kbuild | 36 -- + include/uapi/asm-generic/Kbuild.asm | 76 ++-- + include/uapi/drm/Kbuild | 23 -- + include/uapi/linux/Kbuild | 492 +----------------------- + include/uapi/linux/android/Kbuild | 2 - + include/uapi/linux/bcache.h | 2 +- + include/uapi/linux/btrfs_tree.h | 3 + + include/uapi/linux/byteorder/Kbuild | 3 - + include/uapi/linux/caif/Kbuild | 3 - + include/uapi/linux/can/Kbuild | 6 - + include/uapi/linux/crypto.h | 14 + + include/uapi/linux/cryptouser.h | 8 + + include/uapi/linux/dvb/Kbuild | 9 - + include/uapi/linux/hdlc/Kbuild | 2 - + include/uapi/linux/hsi/Kbuild | 2 - + include/uapi/linux/iio/Kbuild | 3 - + include/uapi/linux/isdn/Kbuild | 2 - + include/uapi/linux/mmc/Kbuild | 2 - + include/uapi/linux/netfilter/Kbuild | 89 ----- + include/uapi/linux/netfilter/ipset/Kbuild | 5 - + include/uapi/linux/netfilter_arp/Kbuild | 3 - + include/uapi/linux/netfilter_bridge/Kbuild | 18 - + include/uapi/linux/netfilter_ipv4/Kbuild | 10 - + include/uapi/linux/netfilter_ipv6/Kbuild | 13 - + include/uapi/linux/nfsd/Kbuild | 6 - + include/uapi/linux/pr.h | 2 + + include/uapi/linux/qrtr.h | 1 + + include/uapi/linux/raid/Kbuild | 3 - + include/uapi/linux/smc_diag.h | 2 +- + include/uapi/linux/spi/Kbuild | 2 - + include/uapi/linux/sunrpc/Kbuild | 2 - + include/uapi/linux/tc_act/Kbuild | 16 - + include/uapi/linux/tc_ematch/Kbuild | 5 - + include/uapi/linux/usb/Kbuild | 12 - + include/uapi/linux/wimax/Kbuild | 2 - + include/uapi/misc/Kbuild | 2 - + include/uapi/mtd/Kbuild | 6 - + include/uapi/rdma/Kbuild | 20 - + include/uapi/rdma/bnxt_re-abi.h | 2 + + include/uapi/rdma/hfi/Kbuild | 3 - + include/uapi/rdma/ib_user_verbs.h | 2 + + include/uapi/scsi/Kbuild | 6 - + include/uapi/scsi/fc/Kbuild | 5 - + include/uapi/sound/Kbuild | 16 - + include/uapi/video/Kbuild | 4 - + include/uapi/xen/Kbuild | 5 - + include/video/Kbuild | 0 + scripts/Makefile.headersinst | 68 ++-- + scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++------------ + scripts/genksyms/parse.y | 2 - + scripts/objdiff | 5 +- + scripts/package/builddeb | 7 +- + 106 files changed, 400 insertions(+), 2088 deletions(-) + delete mode 100644 arch/cris/include/arch-v10/arch/Kbuild + delete mode 100644 arch/cris/include/arch-v32/arch/Kbuild + delete mode 100644 arch/cris/include/uapi/arch-v10/arch/Kbuild + delete mode 100644 arch/cris/include/uapi/arch-v32/arch/Kbuild + rename arch/h8300/include/{ => uapi}/asm/bitsperlong.h (67%) + delete mode 100644 arch/tile/include/arch/Kbuild + delete mode 100644 arch/tile/include/uapi/arch/Kbuild + delete mode 100644 include/Kbuild + delete mode 100644 include/asm-generic/Kbuild.asm + delete mode 100644 include/scsi/fc/Kbuild + delete mode 100644 include/uapi/Kbuild + delete mode 100644 include/uapi/asm-generic/Kbuild + delete mode 100644 include/uapi/drm/Kbuild + delete mode 100644 include/uapi/linux/android/Kbuild + delete mode 100644 include/uapi/linux/byteorder/Kbuild + delete mode 100644 include/uapi/linux/caif/Kbuild + delete mode 100644 include/uapi/linux/can/Kbuild + create mode 100644 include/uapi/linux/crypto.h + delete mode 100644 include/uapi/linux/dvb/Kbuild + delete mode 100644 include/uapi/linux/hdlc/Kbuild + delete mode 100644 include/uapi/linux/hsi/Kbuild + delete mode 100644 include/uapi/linux/iio/Kbuild + delete mode 100644 include/uapi/linux/isdn/Kbuild + delete mode 100644 include/uapi/linux/mmc/Kbuild + delete mode 100644 include/uapi/linux/netfilter/Kbuild + delete mode 100644 include/uapi/linux/netfilter/ipset/Kbuild + delete mode 100644 include/uapi/linux/netfilter_arp/Kbuild + delete mode 100644 include/uapi/linux/netfilter_bridge/Kbuild + delete mode 100644 include/uapi/linux/netfilter_ipv4/Kbuild + delete mode 100644 include/uapi/linux/netfilter_ipv6/Kbuild + delete mode 100644 include/uapi/linux/nfsd/Kbuild + delete mode 100644 include/uapi/linux/raid/Kbuild + delete mode 100644 include/uapi/linux/spi/Kbuild + delete mode 100644 include/uapi/linux/sunrpc/Kbuild + delete mode 100644 include/uapi/linux/tc_act/Kbuild + delete mode 100644 include/uapi/linux/tc_ematch/Kbuild + delete mode 100644 include/uapi/linux/usb/Kbuild + delete mode 100644 include/uapi/linux/wimax/Kbuild + delete mode 100644 include/uapi/misc/Kbuild + delete mode 100644 include/uapi/mtd/Kbuild + delete mode 100644 include/uapi/rdma/Kbuild + delete mode 100644 include/uapi/rdma/hfi/Kbuild + delete mode 100644 include/uapi/scsi/Kbuild + delete mode 100644 include/uapi/scsi/fc/Kbuild + delete mode 100644 include/uapi/sound/Kbuild + delete mode 100644 include/uapi/video/Kbuild + delete mode 100644 include/uapi/xen/Kbuild + delete mode 100644 include/video/Kbuild +Merging asm-generic/master (de4be6b87b6b asm-generic: page.h: fix comment typo) +$ git merge asm-generic/master +Resolved 'include/asm-generic/percpu.h' using previous resolution. +Auto-merging include/asm-generic/percpu.h +CONFLICT (content): Merge conflict in include/asm-generic/percpu.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9a4de6e114ae] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/page.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging arc/for-next (d5adbfcd5f7b Linux 4.10-rc7) +$ git merge arc/for-next +Already up-to-date. +Merging arm/for-next (0c4441f0b734 Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/l2c2x0.txt | 3 + + arch/arm/Kconfig | 1 + + arch/arm/boot/dts/r7s72100.dtsi | 11 +++ + arch/arm/include/asm/cpufeature.h | 38 +++++++++++ + arch/arm/include/asm/module.h | 9 ++- + arch/arm/kernel/module-plts.c | 87 ++++++++++++++++-------- + arch/arm/kernel/module.lds | 1 + + arch/arm/mach-shmobile/setup-r7s72100.c | 2 + + arch/arm/mm/cache-l2x0.c | 13 +++- + arch/arm/mm/dump.c | 54 ++++++++++++--- + 10 files changed, 178 insertions(+), 41 deletions(-) + create mode 100644 arch/arm/include/asm/cpufeature.h +Merging arm-perf/for-next/perf (c09adab01e4a drivers/perf: arm_pmu: split irq request from enable) +$ git merge arm-perf/for-next/perf +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/perf/arm_pmu.c | 487 +++++++++++++++++++++---------------------- + include/linux/perf/arm_pmu.h | 7 +- + 3 files changed, 238 insertions(+), 257 deletions(-) +Merging arm-soc/for-next (60e1ed69406f arm-soc: document merges) +$ git merge arm-soc/for-next +Resolved 'arch/arm/boot/dts/r7s72100.dtsi' using previous resolution. +Auto-merging arch/arm64/boot/dts/cavium/thunder2-99xx.dtsi +Auto-merging arch/arm64/boot/dts/cavium/thunder2-99xx.dts +Removing arch/arm/mach-gemini/time.c +Removing arch/arm/mach-gemini/reset.c +Removing arch/arm/mach-gemini/mm.c +Removing arch/arm/mach-gemini/irq.c +Removing arch/arm/mach-gemini/include/mach/uncompress.h +Removing arch/arm/mach-gemini/include/mach/irqs.h +Removing arch/arm/mach-gemini/include/mach/hardware.h +Removing arch/arm/mach-gemini/include/mach/global_reg.h +Removing arch/arm/mach-gemini/include/mach/entry-macro.S +Removing arch/arm/mach-gemini/idle.c +Removing arch/arm/mach-gemini/gpio.c +Removing arch/arm/mach-gemini/devices.c +Removing arch/arm/mach-gemini/common.h +Removing arch/arm/mach-gemini/board-wbd222.c +Removing arch/arm/mach-gemini/board-wbd111.c +Removing arch/arm/mach-gemini/board-rut1xx.c +Removing arch/arm/mach-gemini/board-nas4220b.c +Removing arch/arm/mach-gemini/Makefile.boot +Auto-merging arch/arm/boot/dts/r7s72100.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3bd1c67b0805] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/00-INDEX | 2 + + .../devicetree/bindings/arm/cavium-thunder2.txt | 8 + + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../bindings/arm/firmware/linaro,optee-tz.txt | 31 + + Documentation/devicetree/bindings/arm/gemini.txt | 86 ++ + Documentation/devicetree/bindings/arm/rockchip.txt | 23 + + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../devicetree/bindings/clock/mvebu-core-clock.txt | 7 + + .../bindings/clock/mvebu-gated-clock.txt | 11 + + .../devicetree/bindings/mtd/jedec,spi-nor.txt | 1 + + .../devicetree/bindings/net/marvell,prestera.txt | 13 +- + .../devicetree/bindings/reset/fsl,imx7-src.txt | 47 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/tee.txt | 118 +++ + MAINTAINERS | 29 +- + arch/arm/Kconfig | 9 - + arch/arm/arm-soc-for-next-contents.txt | 115 ++ + arch/arm/boot/dts/Makefile | 52 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 1 + + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 1 + + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 1 + + arch/arm/boot/dts/am335x-baltos-leds.dtsi | 50 + + arch/arm/boot/dts/am335x-boneblack.dts | 11 + + arch/arm/boot/dts/am335x-icev2.dts | 33 + + arch/arm/boot/dts/am33xx.dtsi | 87 +- + arch/arm/boot/dts/am3517.dtsi | 12 + + arch/arm/boot/dts/am4372.dtsi | 7 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 15 + + arch/arm/boot/dts/armada-385-linksys-caiman.dts | 1 + + arch/arm/boot/dts/armada-385-linksys-cobra.dts | 1 + + arch/arm/boot/dts/armada-385-linksys-shelby.dts | 114 ++ + arch/arm/boot/dts/armada-385-linksys.dtsi | 17 +- + arch/arm/boot/dts/armada-385-synology-ds116.dts | 321 ++++++ + arch/arm/boot/dts/armada-385.dtsi | 20 +- + arch/arm/boot/dts/armada-388.dtsi | 9 +- + arch/arm/boot/dts/armada-38x.dtsi | 41 +- + arch/arm/boot/dts/armada-xp-98dx3236.dtsi | 211 +++- + arch/arm/boot/dts/armada-xp-98dx3336.dtsi | 2 +- + arch/arm/boot/dts/armada-xp-98dx4251.dtsi | 2 +- + 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-linksys-mamba.dts | 18 +- + arch/arm/boot/dts/bcm-cygnus.dtsi | 4 +- + arch/arm/boot/dts/bcm-nsp.dtsi | 36 +- + arch/arm/boot/dts/bcm2835-rpi.dtsi | 14 + + arch/arm/boot/dts/bcm283x.dtsi | 60 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts | 17 +- + arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts | 14 +- + arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts | 5 - + arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts | 41 + + arch/arm/boot/dts/bcm4708-netgear-r6250.dts | 3 - + arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts | 15 +- + arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 10 - + arch/arm/boot/dts/bcm4708.dtsi | 8 + + arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts | 14 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-600dhp2.dts | 16 +- + arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts | 12 +- + arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts | 98 ++ + arch/arm/boot/dts/bcm47081.dtsi | 20 +- + arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts | 14 +- + arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts | 8 - + arch/arm/boot/dts/bcm4709-linksys-ea9200.dts | 42 + + arch/arm/boot/dts/bcm4709-netgear-r7000.dts | 19 +- + arch/arm/boot/dts/bcm4709-netgear-r8000.dts | 41 +- + arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts | 8 - + arch/arm/boot/dts/bcm47094-dlink-dir-885l.dts | 18 +- + arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 36 + + arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 8 - + arch/arm/boot/dts/bcm47094-netgear-r8500.dts | 6 - + arch/arm/boot/dts/bcm47189-tenda-ac9.dts | 39 +- + arch/arm/boot/dts/bcm5301x.dtsi | 79 +- + arch/arm/boot/dts/bcm53573.dtsi | 10 +- + arch/arm/boot/dts/bcm94708.dts | 8 - + arch/arm/boot/dts/bcm94709.dts | 8 - + arch/arm/boot/dts/bcm953012er.dts | 8 - + arch/arm/boot/dts/bcm953012hr.dts | 97 ++ + arch/arm/boot/dts/bcm953012k.dts | 62 +- + arch/arm/boot/dts/bcm958522er.dts | 10 +- + arch/arm/boot/dts/bcm958525er.dts | 10 +- + arch/arm/boot/dts/bcm958525xmc.dts | 10 + + arch/arm/boot/dts/bcm958622hr.dts | 10 +- + arch/arm/boot/dts/bcm958623hr.dts | 10 +- + arch/arm/boot/dts/bcm958625hr.dts | 8 + + arch/arm/boot/dts/bcm958625k.dts | 8 + + arch/arm/boot/dts/bcm988312hr.dts | 10 +- + arch/arm/boot/dts/da850-evm.dts | 31 +- + arch/arm/boot/dts/da850-lego-ev3.dts | 52 + + arch/arm/boot/dts/da850.dtsi | 25 +- + arch/arm/boot/dts/dm8168-evm.dts | 10 + + arch/arm/boot/dts/dm816x.dtsi | 7 + + arch/arm/boot/dts/dra7.dtsi | 41 +- + arch/arm/boot/dts/dra74x.dtsi | 5 + + arch/arm/boot/dts/gemini-nas4220b.dts | 102 ++ + arch/arm/boot/dts/gemini-rut1xx.dts | 65 ++ + arch/arm/boot/dts/gemini-sq201.dts | 118 +++ + arch/arm/boot/dts/gemini-wbd111.dts | 102 ++ + arch/arm/boot/dts/gemini-wbd222.dts | 102 ++ + arch/arm/boot/dts/gemini.dtsi | 156 +++ + arch/arm/boot/dts/include/arm | 1 + + arch/arm/boot/dts/include/arm64 | 1 + + arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 194 ++++ + arch/arm/boot/dts/moxart-uc7112lx.dts | 2 +- + arch/arm/boot/dts/moxart.dtsi | 21 +- + arch/arm/boot/dts/omap3-cpu-thermal.dtsi | 20 + + arch/arm/boot/dts/omap3-igep.dtsi | 52 + + arch/arm/boot/dts/omap3-n900.dts | 23 +- + arch/arm/boot/dts/omap3-n950-n9.dtsi | 32 + + arch/arm/boot/dts/omap34xx.dtsi | 8 +- + arch/arm/boot/dts/omap36xx.dtsi | 8 +- + arch/arm/boot/dts/omap4-droid4-xt894.dts | 370 ++++++- + arch/arm/boot/dts/omap443x.dtsi | 4 + + arch/arm/boot/dts/omap4460.dtsi | 4 + + arch/arm/boot/dts/omap5.dtsi | 9 + + arch/arm/boot/dts/r7s72100.dtsi | 24 +- + arch/arm/boot/dts/r8a73a4.dtsi | 19 +- + arch/arm/boot/dts/r8a7743.dtsi | 5 +- + arch/arm/boot/dts/r8a7745.dtsi | 5 +- + arch/arm/boot/dts/r8a7778-bockw.dts | 1 - + arch/arm/boot/dts/r8a7779-marzen.dts | 1 - + arch/arm/boot/dts/r8a7790-lager.dts | 1 - + arch/arm/boot/dts/r8a7790.dtsi | 19 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 2 - + arch/arm/boot/dts/r8a7791-porter.dts | 5 +- + arch/arm/boot/dts/r8a7791.dtsi | 16 +- + arch/arm/boot/dts/r8a7792.dtsi | 14 +- + arch/arm/boot/dts/r8a7793-gose.dts | 1 - + arch/arm/boot/dts/r8a7793.dtsi | 18 +- + arch/arm/boot/dts/r8a7794-alt.dts | 1 - + arch/arm/boot/dts/r8a7794-silk.dts | 1 - + arch/arm/boot/dts/r8a7794.dtsi | 12 +- + arch/arm/boot/dts/rk3036.dtsi | 6 + + arch/arm/boot/dts/rk3188.dtsi | 4 +- + arch/arm/boot/dts/rk322x.dtsi | 2 + + arch/arm/boot/dts/rk3288-miqi.dts | 12 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 2 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 41 + + arch/arm/boot/dts/rk3288-tinker.dts | 536 ++++++++++ + arch/arm/boot/dts/rk3288.dtsi | 8 + + arch/arm/boot/dts/rk3xxx.dtsi | 16 +- + arch/arm/boot/dts/uniphier-ld4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/uniphier-pro4-ace.dts | 11 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-pro4-sanji.dts | 11 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 4 +- + arch/arm/boot/dts/uniphier-pro5.dtsi | 4 +- + arch/arm/boot/dts/uniphier-pxs2-gentil.dts | 11 +- + arch/arm/boot/dts/uniphier-pxs2-vodka.dts | 10 +- + arch/arm/boot/dts/uniphier-pxs2.dtsi | 4 +- + arch/arm/boot/dts/uniphier-ref-daughter.dtsi | 4 +- + arch/arm/boot/dts/uniphier-sld3-ref.dts | 12 +- + arch/arm/boot/dts/uniphier-sld3.dtsi | 4 +- + arch/arm/boot/dts/uniphier-sld8-ref.dts | 10 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 4 +- + arch/arm/boot/dts/uniphier-support-card.dtsi | 5 +- + arch/arm/configs/bcm2835_defconfig | 5 +- + arch/arm/configs/davinci_all_defconfig | 7 +- + arch/arm/configs/multi_v7_defconfig | 9 +- + arch/arm/configs/stm32_defconfig | 1 + + arch/arm/include/debug/brcmstb.S | 18 +- + arch/arm/mach-bcm/Kconfig | 2 + + arch/arm/mach-davinci/board-da850-evm.c | 4 + + arch/arm/mach-davinci/da8xx-dt.c | 1 + + arch/arm/mach-davinci/pdata-quirks.c | 178 +++- + arch/arm/mach-davinci/pm.c | 1 - + arch/arm/mach-gemini/Kconfig | 53 +- + arch/arm/mach-gemini/Makefile | 15 +- + arch/arm/mach-gemini/Makefile.boot | 9 - + arch/arm/mach-gemini/board-dt.c | 62 ++ + arch/arm/mach-gemini/board-nas4220b.c | 106 -- + arch/arm/mach-gemini/board-rut1xx.c | 92 -- + arch/arm/mach-gemini/board-wbd111.c | 133 --- + arch/arm/mach-gemini/board-wbd222.c | 133 --- + arch/arm/mach-gemini/common.h | 33 - + arch/arm/mach-gemini/devices.c | 118 --- + arch/arm/mach-gemini/gpio.c | 231 ---- + arch/arm/mach-gemini/idle.c | 31 - + arch/arm/mach-gemini/include/mach/entry-macro.S | 33 - + arch/arm/mach-gemini/include/mach/global_reg.h | 278 ----- + arch/arm/mach-gemini/include/mach/hardware.h | 71 -- + arch/arm/mach-gemini/include/mach/irqs.h | 53 - + arch/arm/mach-gemini/include/mach/uncompress.h | 42 - + arch/arm/mach-gemini/irq.c | 105 -- + arch/arm/mach-gemini/mm.c | 82 -- + arch/arm/mach-gemini/reset.c | 25 - + arch/arm/mach-gemini/time.c | 239 ----- + arch/arm/mach-mmp/clock.c | 3 + + arch/arm/mach-omap1/pm.c | 1 - + arch/arm/mach-omap2/clockdomains81xx_data.c | 10 + + arch/arm/mach-omap2/cm81xx.h | 1 + + arch/arm/mach-omap2/devices.c | 2 +- + arch/arm/mach-omap2/omap_hwmod.c | 208 +--- + arch/arm/mach-omap2/omap_hwmod.h | 23 +- + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 - + 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 | 5 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 34 + + arch/arm/mach-omap2/pm.c | 1 - + arch/arm/mach-oxnas/Kconfig | 1 - + arch/arm/mach-w90x900/clock.c | 3 + + arch/arm64/boot/dts/broadcom/Makefile | 1 - + arch/arm64/boot/dts/broadcom/ns2-svk.dts | 38 +- + arch/arm64/boot/dts/broadcom/ns2-xmc.dts | 20 +- + arch/arm64/boot/dts/broadcom/ns2.dtsi | 24 + + arch/arm64/boot/dts/cavium/Makefile | 1 + + .../vulcan-eval.dts => cavium/thunder2-99xx.dts} | 9 +- + .../vulcan.dtsi => cavium/thunder2-99xx.dtsi} | 15 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 7 + + arch/arm64/boot/dts/include/arm | 1 + + arch/arm64/boot/dts/include/arm64 | 1 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 41 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 7 +- + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 25 + + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 10 + + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 16 + + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 9 + + .../boot/dts/marvell/armada-cp110-master.dtsi | 44 + + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 44 + + arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts | 29 +- + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 37 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 86 +- + arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts | 1 - + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 32 +- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 265 ++++- + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 94 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 306 ++++++ + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 1103 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 145 +++ + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 147 ++- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 10 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 13 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 10 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 4 +- + arch/arm64/configs/defconfig | 7 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/firmware/meson/meson_sm.c | 20 +- + drivers/nvmem/meson-efuse.c | 2 +- + drivers/reset/Kconfig | 14 + + drivers/reset/Makefile | 3 + + drivers/reset/reset-a10sr.c | 138 +++ + drivers/reset/reset-ath79.c | 27 +- + drivers/reset/reset-imx7.c | 158 +++ + drivers/reset/reset-meson.c | 12 +- + drivers/reset/reset-oxnas.c | 6 +- + drivers/reset/reset-pistachio.c | 9 +- + drivers/reset/reset-socfpga.c | 13 +- + drivers/reset/reset-sunxi.c | 18 +- + drivers/reset/reset-uniphier.c | 20 +- + drivers/soc/bcm/brcmstb/common.c | 9 + + drivers/soc/renesas/renesas-soc.c | 16 + + drivers/tee/Kconfig | 18 + + drivers/tee/Makefile | 5 + + drivers/tee/optee/Kconfig | 7 + + drivers/tee/optee/Makefile | 5 + + drivers/tee/optee/call.c | 444 ++++++++ + drivers/tee/optee/core.c | 622 +++++++++++ + drivers/tee/optee/optee_msg.h | 418 ++++++++ + drivers/tee/optee/optee_private.h | 183 ++++ + drivers/tee/optee/optee_smc.h | 450 ++++++++ + drivers/tee/optee/rpc.c | 396 +++++++ + drivers/tee/optee/supp.c | 273 +++++ + drivers/tee/tee_core.c | 893 ++++++++++++++++ + drivers/tee/tee_private.h | 129 +++ + drivers/tee/tee_shm.c | 358 +++++++ + drivers/tee/tee_shm_pool.c | 156 +++ + include/dt-bindings/clock/r7s72100-clock.h | 6 +- + include/dt-bindings/clock/r8a73a4-clock.h | 1 + + include/dt-bindings/clock/r8a7790-clock.h | 1 + + include/dt-bindings/clock/r8a7791-clock.h | 1 + + include/dt-bindings/clock/r8a7792-clock.h | 1 + + include/dt-bindings/clock/r8a7793-clock.h | 5 +- + include/dt-bindings/clock/r8a7794-clock.h | 1 + + include/dt-bindings/reset/altr,rst-mgr-a10sr.h | 33 + + include/dt-bindings/reset/imx7-reset.h | 62 ++ + include/linux/firmware/meson/meson_sm.h | 4 +- + include/linux/tee_drv.h | 277 +++++ + include/uapi/linux/tee.h | 346 ++++++ + 285 files changed, 12756 insertions(+), 2877 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/cavium-thunder2.txt + create mode 100644 Documentation/devicetree/bindings/arm/firmware/linaro,optee-tz.txt + create mode 100644 Documentation/devicetree/bindings/arm/gemini.txt + create mode 100644 Documentation/devicetree/bindings/reset/fsl,imx7-src.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt + create mode 100644 Documentation/tee.txt + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am335x-baltos-leds.dtsi + create mode 100644 arch/arm/boot/dts/armada-385-linksys-shelby.dts + create mode 100644 arch/arm/boot/dts/armada-385-synology-ds116.dts + create mode 100644 arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts + create mode 100644 arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts + create mode 100644 arch/arm/boot/dts/bcm4709-linksys-ea9200.dts + create mode 100644 arch/arm/boot/dts/bcm47094-linksys-panamera.dts + create mode 100644 arch/arm/boot/dts/bcm953012hr.dts + create mode 100644 arch/arm/boot/dts/gemini-nas4220b.dts + create mode 100644 arch/arm/boot/dts/gemini-rut1xx.dts + create mode 100644 arch/arm/boot/dts/gemini-sq201.dts + create mode 100644 arch/arm/boot/dts/gemini-wbd111.dts + create mode 100644 arch/arm/boot/dts/gemini-wbd222.dts + create mode 100644 arch/arm/boot/dts/gemini.dtsi + create mode 120000 arch/arm/boot/dts/include/arm + create mode 120000 arch/arm/boot/dts/include/arm64 + create mode 100644 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi + create mode 100644 arch/arm/boot/dts/omap3-cpu-thermal.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts + delete mode 100644 arch/arm/mach-gemini/Makefile.boot + create mode 100644 arch/arm/mach-gemini/board-dt.c + delete mode 100644 arch/arm/mach-gemini/board-nas4220b.c + delete mode 100644 arch/arm/mach-gemini/board-rut1xx.c + delete mode 100644 arch/arm/mach-gemini/board-wbd111.c + delete mode 100644 arch/arm/mach-gemini/board-wbd222.c + delete mode 100644 arch/arm/mach-gemini/common.h + delete mode 100644 arch/arm/mach-gemini/devices.c + delete mode 100644 arch/arm/mach-gemini/gpio.c + delete mode 100644 arch/arm/mach-gemini/idle.c + delete mode 100644 arch/arm/mach-gemini/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-gemini/include/mach/global_reg.h + delete mode 100644 arch/arm/mach-gemini/include/mach/hardware.h + delete mode 100644 arch/arm/mach-gemini/include/mach/irqs.h + delete mode 100644 arch/arm/mach-gemini/include/mach/uncompress.h + delete mode 100644 arch/arm/mach-gemini/irq.c + delete mode 100644 arch/arm/mach-gemini/mm.c + delete mode 100644 arch/arm/mach-gemini/reset.c + delete mode 100644 arch/arm/mach-gemini/time.c + rename arch/arm64/boot/dts/{broadcom/vulcan-eval.dts => cavium/thunder2-99xx.dts} (72%) + rename arch/arm64/boot/dts/{broadcom/vulcan.dtsi => cavium/thunder2-99xx.dtsi} (88%) + create mode 120000 arch/arm64/boot/dts/include/arm + create mode 120000 arch/arm64/boot/dts/include/arm64 + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi + create mode 100644 drivers/reset/reset-a10sr.c + create mode 100644 drivers/reset/reset-imx7.c + create mode 100644 drivers/tee/Kconfig + create mode 100644 drivers/tee/Makefile + create mode 100644 drivers/tee/optee/Kconfig + create mode 100644 drivers/tee/optee/Makefile + create mode 100644 drivers/tee/optee/call.c + create mode 100644 drivers/tee/optee/core.c + create mode 100644 drivers/tee/optee/optee_msg.h + create mode 100644 drivers/tee/optee/optee_private.h + create mode 100644 drivers/tee/optee/optee_smc.h + create mode 100644 drivers/tee/optee/rpc.c + create mode 100644 drivers/tee/optee/supp.c + create mode 100644 drivers/tee/tee_core.c + create mode 100644 drivers/tee/tee_private.h + create mode 100644 drivers/tee/tee_shm.c + create mode 100644 drivers/tee/tee_shm_pool.c + create mode 100644 include/dt-bindings/reset/altr,rst-mgr-a10sr.h + create mode 100644 include/dt-bindings/reset/imx7-reset.h + create mode 100644 include/linux/tee_drv.h + create mode 100644 include/uapi/linux/tee.h +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/alpine.dtsi | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) +Merging amlogic/for-next (585bfd0195cc Merge branch 'v4.12/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/amlogic.txt | 3 + + .../bindings/clock/amlogic,gxbb-clkc.txt | 3 +- + .../devicetree/bindings/vendor-prefixes.txt | 2 + + arch/arm/boot/dts/meson8.dtsi | 2 + + arch/arm/boot/dts/meson8b.dtsi | 2 + + arch/arm64/boot/dts/amlogic/Makefile | 2 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 40 +- + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 17 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 75 ++- + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 25 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 11 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p20x.dtsi | 6 - + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 21 +- + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 26 ++ + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 26 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 160 +++++-- + arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi | 43 ++ + .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 42 ++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905d.dtsi | 1 + + .../dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts | 164 +++++++ + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 114 +++++ + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 21 +- + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 173 +++++++ + arch/arm64/boot/dts/amlogic/meson-gxl-s905x.dtsi | 1 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 181 ++++++++ + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 + + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 42 ++ + drivers/clk/meson/clk-mpll.c | 152 ++++++- + drivers/clk/meson/clk-pll.c | 53 ++- + drivers/clk/meson/clkc.h | 29 +- + drivers/clk/meson/gxbb.c | 505 +++++++++++++++++++-- + drivers/clk/meson/gxbb.h | 23 +- + drivers/clk/meson/meson8b.c | 127 +++++- + drivers/clk/meson/meson8b.h | 20 +- + include/dt-bindings/clock/gxbb-clkc.h | 11 + + 35 files changed, 2011 insertions(+), 114 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-mali.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-hwacom-amazetv.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-p212.dtsi +Merging aspeed/for-next (ab15e12960f1 Merge branches 'defconfig-for-v4.11', 'soc-for-v4.11' and 'dt-for-v4.11' into for-next) +$ git merge aspeed/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (fabfb0f29bb5 Merge branch 'at91-dt' into at91-next) +$ git merge at91/at91-next +Removing arch/arm/mach-at91/soc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/atmel-at91.txt | 3 +- + MAINTAINERS | 2 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 + + arch/arm/boot/dts/at91-tse850-3.dts | 29 ++- + arch/arm/boot/dts/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +- + arch/arm/boot/dts/sama5d2.dtsi | 5 + + arch/arm/mach-at91/Makefile | 34 ++- + arch/arm/mach-at91/at91rm9200.c | 15 +- + arch/arm/mach-at91/at91sam9.c | 91 +------- + arch/arm/mach-at91/generic.h | 8 +- + arch/arm/mach-at91/pm.c | 199 +++++++++--------- + arch/arm/mach-at91/pm.h | 24 +-- + arch/arm/mach-at91/pm_data-offsets.c | 13 ++ + arch/arm/mach-at91/pm_suspend.S | 31 ++- + arch/arm/mach-at91/sama5.c | 52 +---- + arch/arm/mach-at91/soc.c | 142 ------------- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/atmel/Kconfig | 6 + + drivers/soc/atmel/Makefile | 1 + + drivers/soc/atmel/soc.c | 231 +++++++++++++++++++++ + {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h | 0 + 23 files changed, 454 insertions(+), 439 deletions(-) + create mode 100644 arch/arm/mach-at91/pm_data-offsets.c + delete mode 100644 arch/arm/mach-at91/soc.c + create mode 100644 drivers/soc/atmel/Kconfig + create mode 100644 drivers/soc/atmel/Makefile + create mode 100644 drivers/soc/atmel/soc.c + rename {arch/arm/mach-at91 => drivers/soc/atmel}/soc.h (100%) +Merging bcm2835/for-next (7ea6e490ba7f 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 berlin/berlin/for-next (5153351425c9 Merge branch 'berlin/dt' into berlin/for-next) +$ git merge berlin/berlin/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging cortex-m/for-next (f719a0d6a854 ARM: efm32: switch to vendor,device compatible strings) +$ git merge cortex-m/for-next +Already up-to-date. +Merging imx-mxs/for-next (abffca6fb621 Merge branch 'zte/dt64' into for-next) +$ git merge imx-mxs/for-next +Auto-merging drivers/soc/Makefile +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/fsl.txt | 11 + + Documentation/devicetree/bindings/arm/i2se.txt | 22 + + .../devicetree/bindings/power/fsl,imx-gpc.txt | 80 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 14 +- + .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 - + arch/arm/boot/dts/imx25-pdk.dts | 2 - + arch/arm/boot/dts/imx25-pinfunc.h | 5 +- + arch/arm/boot/dts/imx25.dtsi | 2 + + arch/arm/boot/dts/imx28-duckbill-2-485.dts | 189 +++++ + arch/arm/boot/dts/imx28-duckbill-2-enocean.dts | 220 +++++ + arch/arm/boot/dts/imx28-duckbill-2-spi.dts | 199 +++++ + arch/arm/boot/dts/imx28-duckbill-2.dts | 183 ++++ + arch/arm/boot/dts/imx28-duckbill.dts | 81 +- + arch/arm/boot/dts/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/imx28.dtsi | 28 +- + arch/arm/boot/dts/imx50.dtsi | 8 +- + arch/arm/boot/dts/imx53-qsb.dts | 4 +- + arch/arm/boot/dts/imx53-qsrb.dts | 4 +- + arch/arm/boot/dts/imx6dl-gw5904.dts | 55 ++ + arch/arm/boot/dts/imx6q-b450v3.dts | 7 + + arch/arm/boot/dts/imx6q-b650v3.dts | 7 + + arch/arm/boot/dts/imx6q-b850v3.dts | 70 ++ + arch/arm/boot/dts/imx6q-bx50v3.dtsi | 16 +- + arch/arm/boot/dts/imx6q-cm-fx6.dts | 83 ++ + arch/arm/boot/dts/imx6q-gw5904.dts | 59 ++ + arch/arm/boot/dts/imx6q-icore-ofcap10.dts | 76 ++ + arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 76 ++ + arch/arm/boot/dts/imx6q-icore.dts | 34 + + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 50 ++ + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 641 ++++++++++++++ + arch/arm/boot/dts/imx6qdl-icore.dtsi | 19 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 932 +++++++++++++++++++++ + arch/arm/boot/dts/imx6qdl.dtsi | 3 +- + arch/arm/boot/dts/imx6qp-nitrogen6_som2.dts | 55 ++ + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 50 ++ + arch/arm/boot/dts/imx6qp.dtsi | 99 ++- + arch/arm/boot/dts/imx6sx.dtsi | 21 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 5 - + arch/arm/boot/dts/imx6ul-geam.dtsi | 45 + + arch/arm/boot/dts/imx6ul-isiot-common.dtsi | 141 ++++ + arch/arm/boot/dts/imx6ul-isiot-emmc.dts | 1 + + arch/arm/boot/dts/imx6ul-isiot-nand.dts | 1 + + arch/arm/boot/dts/imx6ul-isiot.dtsi | 73 ++ + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 55 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 45 +- + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-sdb-sht11.dts | 74 ++ + arch/arm/boot/dts/imx7s.dtsi | 7 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 14 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 77 ++ + arch/arm/boot/dts/vf610-zii-dev.dtsi | 12 + + arch/arm/configs/imx_v6_v7_defconfig | 5 +- + arch/arm/mach-imx/gpc.c | 217 ----- + arch/arm/mach-imx/mach-mx31_3ds.c | 7 +- + arch/arm/mach-imx/mach-mx31moboard.c | 4 +- + arch/arm/mach-imx/mach-pcm037_eet.c | 4 +- + arch/arm/mach-imx/mmdc.c | 20 +- + arch/arm/mach-mxs/mach-mxs.c | 3 +- + arch/arm64/boot/dts/freescale/Makefile | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a-rdb.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 182 +++- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 123 +++ + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 107 +++ + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 275 ++++++ + arch/arm64/boot/dts/freescale/fsl-ls2080a-qds.dts | 155 +--- + arch/arm64/boot/dts/freescale/fsl-ls2080a-rdb.dts | 110 +-- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 863 ++----------------- + arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts | 64 ++ + arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts | 64 ++ + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 165 ++++ + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 196 +++++ + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 151 ++++ + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 737 ++++++++++++++++ + arch/arm64/boot/dts/zte/zx296718-evb.dts | 28 + + arch/arm64/boot/dts/zte/zx296718.dtsi | 126 ++- + drivers/soc/Makefile | 1 + + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/gpc.c | 465 ++++++++++ + drivers/soc/zte/zx296718_pm_domains.c | 1 - + drivers/soc/zte/zx2967_pm_domains.c | 4 +- + 85 files changed, 6595 insertions(+), 1468 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/i2se.txt + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2-485.dts + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2-enocean.dts + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2-spi.dts + create mode 100644 arch/arm/boot/dts/imx28-duckbill-2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-gw5904.dts + create mode 100644 arch/arm/boot/dts/imx6q-gw5904.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-ofcap10.dts + create mode 100644 arch/arm/boot/dts/imx6q-icore-ofcap12.dts + create mode 100644 arch/arm/boot/dts/imx6q-zii-rdu2.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-gw5904.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi + create mode 100644 arch/arm/boot/dts/imx6qp-nitrogen6_som2.dts + create mode 100644 arch/arm/boot/dts/imx6qp-zii-rdu2.dts + create mode 100644 arch/arm/boot/dts/imx6ul-isiot-common.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-sdb-sht11.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2088a-qds.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2088a-rdb.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi + create mode 100644 drivers/soc/imx/Makefile + create mode 100644 drivers/soc/imx/gpc.c +Merging keystone/next (9e07c85a01ec Merge branch 'for_4.11/keystone_dts' into next) +$ git merge keystone/next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (d79ac966212b Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/armada-388-clearfog.dts | 38 +++++++++++++++---------------- + 1 file changed, 19 insertions(+), 19 deletions(-) +Merging omap/for-next (272f590cf2cd Merge branch 'omap-for-v4.12/defconfig' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am335x-baltos.dtsi | 2 + + arch/arm/boot/dts/am335x-evmsk.dts | 1 + + arch/arm/boot/dts/dra7.dtsi | 2 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 2 +- + arch/arm/configs/omap2plus_defconfig | 2 + + arch/arm/mach-omap2/common.h | 1 + + arch/arm/mach-omap2/omap-hotplug.c | 2 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 22 ++++++-- + arch/arm/mach-omap2/omap-smc.S | 1 - + arch/arm/mach-omap2/omap-smp.c | 90 +++++++++++++++++++++++++----- + 10 files changed, 104 insertions(+), 21 deletions(-) +Merging omap-pending/for-next (c20c8f750d9f ARM: OMAP2+: hwmod: fix _idle() hwmod state sanity check sequence) +$ git merge omap-pending/for-next +Already up-to-date. +Merging qcom/for-next (9f514b0f9cf3 Merge branch 'drivers-for-4.12' into all-for-4.12) +$ git merge qcom/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/qcom-apq8060-dragonboard.dts | 6 +- + arch/arm/boot/dts/qcom-msm8660.dtsi | 30 +++ + arch/arm/boot/dts/qcom-msm8974.dtsi | 289 ++++++++++++++++++++++++- + arch/arm/configs/qcom_defconfig | 7 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 11 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 26 ++- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 46 +++- + arch/arm64/boot/dts/qcom/pm8994.dtsi | 7 + + drivers/firmware/qcom_scm-32.c | 18 ++ + drivers/firmware/qcom_scm-64.c | 58 +++++ + drivers/firmware/qcom_scm.c | 18 ++ + drivers/firmware/qcom_scm.h | 11 + + include/linux/qcom_scm.h | 6 + + 13 files changed, 514 insertions(+), 19 deletions(-) +Merging renesas/next (a1aca88887e6 Merge branch 'dt-for-v4.12' into next) +$ git merge renesas/next +Auto-merging arch/arm/boot/dts/r7s72100.dtsi +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/r7s72100.dtsi | 2 + + arch/arm/boot/dts/r8a7743.dtsi | 24 ++++++++ + arch/arm/boot/dts/r8a7745.dtsi | 24 ++++++++ + arch/arm/boot/dts/r8a7794-alt.dts | 2 +- + arch/arm/boot/dts/r8a7794-silk.dts | 2 +- + arch/arm/boot/dts/r8a7794.dtsi | 10 ++-- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 95 ++++++++++++++++++++++++++++++- + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 46 +++++++++++++++ + include/dt-bindings/clock/r8a7794-clock.h | 1 + + 9 files changed, 199 insertions(+), 7 deletions(-) +Merging rockchip/for-next (db2636b14ef1 Merge branch 'v4.12-armsoc/dts32' into for-next) +$ git merge rockchip/for-next +Auto-merging include/dt-bindings/clock/rv1108-cru.h +Auto-merging drivers/clk/rockchip/clk-rv1108.c +Auto-merging Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.txt +Merge made by the 'recursive' strategy. + ...chip,rk1108-cru.txt => rockchip,rv1108-cru.txt} | 12 +- + arch/arm/boot/dts/rk1108.dtsi | 2 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 21 ++ + drivers/clk/rockchip/Makefile | 2 +- + drivers/clk/rockchip/clk-pll.c | 3 + + drivers/clk/rockchip/clk-rk3328.c | 9 + + drivers/clk/rockchip/clk-rk3368.c | 27 +- + drivers/clk/rockchip/clk-rk3399.c | 8 +- + .../clk/rockchip/{clk-rk1108.c => clk-rv1108.c} | 414 ++++++++++----------- + drivers/clk/rockchip/clk.h | 28 +- + include/dt-bindings/clock/rk3328-cru.h | 1 + + include/dt-bindings/clock/rk3368-cru.h | 19 +- + .../clock/{rk1108-cru.h => rv1108-cru.h} | 6 +- + 13 files changed, 297 insertions(+), 255 deletions(-) + rename Documentation/devicetree/bindings/clock/{rockchip,rk1108-cru.txt => rockchip,rv1108-cru.txt} (83%) + rename drivers/clk/rockchip/{clk-rk1108.c => clk-rv1108.c} (57%) + rename include/dt-bindings/clock/{rk1108-cru.h => rv1108-cru.h} (97%) +Merging rpi/for-rpi-next (bc0195aad0da Linux 4.2-rc2) +$ git merge rpi/for-rpi-next +Already up-to-date. +Merging samsung/for-next (1001354ca341 Linux 4.9-rc1) +$ git merge samsung/for-next +Already up-to-date. +Merging samsung-krzk/for-next (835ca0530460 Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/exynos3250-rinato.dts | 2 + + arch/arm/boot/dts/exynos4.dtsi | 10 +---- + arch/arm/boot/dts/exynos4210-origen.dts | 4 -- + arch/arm/boot/dts/exynos4210-trats.dts | 2 + + arch/arm/boot/dts/exynos4210.dtsi | 8 ++++ + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 4 -- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 4 -- + arch/arm/boot/dts/exynos4412-origen.dts | 4 -- + arch/arm/boot/dts/exynos4412-trats2.dts | 2 + + arch/arm/boot/dts/exynos4412.dtsi | 9 +++++ + arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi | 25 +++++++++++++ + arch/arm/boot/dts/exynos5420.dtsi | 10 ++--- + arch/arm/boot/dts/exynos5440.dtsi | 32 ++++++++++------ + arch/arm/boot/dts/s3c64xx.dtsi | 3 +- + arch/arm/boot/dts/s5pv210.dtsi | 2 +- + arch/arm/configs/exynos_defconfig | 5 ++- + arch/arm64/Kconfig.platforms | 2 + + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 43 +++++++++++++++++++++- + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 17 +++++++++ + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 7 ++++ + arch/arm64/configs/defconfig | 11 ++++++ + drivers/soc/samsung/Kconfig | 8 +++- + drivers/soc/samsung/Makefile | 4 +- + drivers/soc/samsung/exynos-pmu.c | 22 ++++++++--- + drivers/soc/samsung/exynos-pmu.h | 3 ++ + 25 files changed, 187 insertions(+), 56 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi +Merging tegra/for-next (cc516494e180 Merge branch for-4.12/clk into for-next) +$ git merge tegra/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/tegra/nvidia,tegra186-pmc.txt | 34 ++ + MAINTAINERS | 3 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 91 ++++ + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 319 +++++++++++++- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 40 ++ + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 19 +- + drivers/clk/tegra/clk-id.h | 11 + + drivers/clk/tegra/clk-periph-gate.c | 3 + + drivers/clk/tegra/clk-periph.c | 6 +- + drivers/clk/tegra/clk-pll.c | 174 -------- + drivers/clk/tegra/clk-super.c | 87 +++- + drivers/clk/tegra/clk-tegra-audio.c | 85 +++- + drivers/clk/tegra/clk-tegra-periph.c | 35 +- + drivers/clk/tegra/clk-tegra114.c | 1 + + drivers/clk/tegra/clk-tegra124.c | 1 + + drivers/clk/tegra/clk-tegra210.c | 486 +++++++++++++++++++-- + drivers/clk/tegra/clk-tegra30.c | 1 + + drivers/clk/tegra/clk.c | 16 + + drivers/clk/tegra/clk.h | 15 +- + drivers/soc/tegra/Kconfig | 13 + + drivers/soc/tegra/Makefile | 3 +- + drivers/soc/tegra/pmc-tegra186.c | 169 +++++++ + include/dt-bindings/clock/tegra114-car.h | 2 +- + include/dt-bindings/clock/tegra124-car-common.h | 2 +- + include/dt-bindings/clock/tegra210-car.h | 17 +- + include/dt-bindings/clock/tegra30-car.h | 2 +- + include/dt-bindings/reset/tegra210-car.h | 13 + + include/linux/clk/tegra.h | 3 + + include/soc/tegra/pmc.h | 29 +- + 29 files changed, 1412 insertions(+), 268 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt + create mode 100644 drivers/soc/tegra/pmc-tegra186.c + create mode 100644 include/dt-bindings/reset/tegra210-car.h +Merging arm64/for-next/core (29d981217a5d arm64: drop unnecessary newlines in show_regs()) +$ git merge arm64/for-next/core +Auto-merging arch/arm64/kernel/smp.c +Removing arch/arm64/include/asm/cachetype.h +Merge made by the 'recursive' strategy. + Documentation/arm64/cpu-feature-registers.txt | 12 ++ + arch/arm64/include/asm/bug.h | 33 ++-- + arch/arm64/include/asm/cache.h | 38 +++- + arch/arm64/include/asm/cachetype.h | 100 ----------- + arch/arm64/include/asm/kvm_mmu.h | 11 +- + arch/arm64/include/asm/mmu.h | 1 + + arch/arm64/include/asm/module.h | 5 - + arch/arm64/include/asm/pgtable.h | 10 ++ + arch/arm64/include/asm/processor.h | 2 + + arch/arm64/include/asm/sections.h | 2 + + arch/arm64/include/asm/sysreg.h | 5 + + arch/arm64/include/uapi/asm/hwcap.h | 3 + + arch/arm64/kernel/alternative.c | 11 +- + arch/arm64/kernel/cacheinfo.c | 38 ---- + arch/arm64/kernel/cpufeature.c | 16 +- + arch/arm64/kernel/cpuinfo.c | 37 ++-- + arch/arm64/kernel/head.S | 52 +++--- + arch/arm64/kernel/process.c | 2 - + arch/arm64/kernel/smp.c | 1 + + arch/arm64/kernel/vmlinux.lds.S | 25 ++- + arch/arm64/kvm/hyp/tlb.c | 22 +++ + arch/arm64/mm/context.c | 3 - + arch/arm64/mm/dma-mapping.c | 63 +++++-- + arch/arm64/mm/flush.c | 4 +- + arch/arm64/mm/mmu.c | 246 ++++++++++++++++++-------- + virt/kvm/arm/vgic/vgic.c | 4 +- + 26 files changed, 419 insertions(+), 327 deletions(-) + delete mode 100644 arch/arm64/include/asm/cachetype.h +Merging clk/clk-next (6b265e5eec86 Merge branch 'clk-meson' into clk-next) +$ git merge clk/clk-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (ca3060d39ae7 c6x: Use generic clkdev.h header) +$ git merge c6x/for-linux-next +Already up-to-date. +Merging cris/for-next (8f50f2a1b46a cris: No need to append -O2 and $(LINUXINCLUDE)) +$ git merge cris/for-next +Already up-to-date. +Merging h8300/h8300-next (58c57526711f h8300: Add missing include file to asm/io.h) +$ git merge h8300/h8300-next +Merge made by the 'recursive' strategy. +Merging hexagon/linux-next (02cc2ccfe771 Revert "Hexagon: fix signal.c compile error") +$ git merge hexagon/linux-next +Already up-to-date. +Merging ia64/next (fbb0e4da96f4 ia64: salinfo: use a waitqueue instead a sema down/up combo) +$ git merge ia64/next +Already up-to-date. +Merging m68k/for-next (3dfe33020ca8 m68k/sun3: Remove dead code in paging_init()) +$ git merge m68k/for-next +Already up-to-date. +Merging m68knommu/for-next (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge m68knommu/for-next +Already up-to-date. +Merging metag/for-next (f5d163aad31e metag: perf: fix build on Meta1) +$ git merge metag/for-next +Already up-to-date. +Merging microblaze/next (3400606d8ffd microblaze: Add new fpga families) +$ git merge microblaze/next +Already up-to-date. +Merging mips/mips-for-linux-next (d72c4a87e3df Merge branch 'linus' into mips-for-linux-next) +$ git merge mips/mips-for-linux-next +Removing arch/mips/include/asm/octeon/cvmx-l2d-defs.h +Merge made by the 'recursive' strategy. + arch/mips/Kbuild | 2 + + arch/mips/Kconfig | 17 +- + arch/mips/cavium-octeon/Kconfig | 9 - + arch/mips/cavium-octeon/Platform | 4 - + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 139 +- + arch/mips/cavium-octeon/executive/octeon-model.c | 21 +- + arch/mips/cavium-octeon/octeon-platform.c | 113 +- + arch/mips/cavium-octeon/setup.c | 12 +- + arch/mips/include/asm/cache.h | 5 - + arch/mips/include/asm/cpu-info.h | 3 +- + arch/mips/include/asm/cpufeature.h | 26 + + arch/mips/include/asm/fpu.h | 1 + + arch/mips/include/asm/irq.h | 15 + + arch/mips/include/asm/octeon/cvmx-l2c-defs.h | 3193 +------------------ + arch/mips/include/asm/octeon/cvmx-l2c.h | 59 +- + arch/mips/include/asm/octeon/cvmx-l2d-defs.h | 526 ---- + arch/mips/include/asm/octeon/cvmx-l2t-defs.h | 286 +- + arch/mips/include/asm/octeon/cvmx-pciercx-defs.h | 3225 ++------------------ + arch/mips/include/asm/octeon/cvmx-sli-defs.h | 3541 +--------------------- + arch/mips/include/asm/octeon/cvmx.h | 3 +- + arch/mips/include/asm/pgalloc.h | 26 + + arch/mips/include/asm/pgtable-64.h | 88 +- + arch/mips/include/asm/spinlock.h | 8 +- + arch/mips/include/asm/uasm.h | 1 + + arch/mips/include/uapi/asm/unistd.h | 15 +- + arch/mips/kernel/asm-offsets.c | 1 + + arch/mips/kernel/cps-vec.S | 2 +- + arch/mips/kernel/cpu-probe.c | 9 +- + arch/mips/kernel/genex.S | 12 +- + arch/mips/kernel/mips-r2-to-r6-emul.c | 16 +- + arch/mips/kernel/process.c | 56 +- + arch/mips/kernel/scall32-o32.S | 1 + + arch/mips/kernel/scall64-64.S | 1 + + arch/mips/kernel/scall64-n32.S | 1 + + arch/mips/kernel/scall64-o32.S | 1 + + arch/mips/kernel/traps.c | 17 +- + arch/mips/lantiq/xway/sysctrl.c | 2 +- + arch/mips/math-emu/cp1emu.c | 10 +- + arch/mips/mm/c-r4k.c | 2 + + arch/mips/mm/init.c | 3 + + arch/mips/mm/pgtable-64.c | 33 +- + arch/mips/mm/tlbex.c | 47 +- + arch/mips/mm/uasm-mips.c | 1 + + arch/mips/mm/uasm.c | 3 +- + arch/mips/net/bpf_jit.c | 41 +- + arch/mips/net/bpf_jit_asm.S | 23 +- + arch/mips/pci/pcie-octeon.c | 4 +- + arch/mips/ralink/rt3883.c | 4 +- + 48 files changed, 1051 insertions(+), 10577 deletions(-) + create mode 100644 arch/mips/include/asm/cpufeature.h + delete mode 100644 arch/mips/include/asm/octeon/cvmx-l2d-defs.h +Merging nios2/for-next (744606c76c4a nios2: add screen_info) +$ git merge nios2/for-next +Already up-to-date. +Merging openrisc/for-next (a4d442663580 openrisc: head: Init r0 to 0 on start) +$ git merge openrisc/for-next +Already up-to-date. +Merging parisc-hd/for-next (a9f6b6b8cd2f Merge tag 'usb-4.11-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge parisc-hd/for-next +Already up-to-date. +Merging powerpc/next (17bb69515c6d powerpc/powernv: Handle OPAL_WRONG_STATE in opal_get_sensor_data()) +$ git merge powerpc/next +Auto-merging tools/testing/selftests/powerpc/Makefile +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 3 +- + arch/powerpc/Kconfig | 10 + + arch/powerpc/configs/powernv_defconfig | 6 +- + arch/powerpc/configs/ppc64_defconfig | 6 +- + arch/powerpc/configs/pseries_defconfig | 6 +- + arch/powerpc/include/asm/asm-prototypes.h | 4 + + arch/powerpc/include/asm/hvcall.h | 10 - + arch/powerpc/include/asm/mce.h | 91 --- + arch/powerpc/include/asm/thread_info.h | 10 +- + arch/powerpc/kernel/ftrace.c | 1 + + arch/powerpc/kernel/head_32.S | 16 +- + arch/powerpc/kernel/head_64.S | 3 +- + arch/powerpc/kernel/mce.c | 3 +- + arch/powerpc/kernel/mce_power.c | 772 ++++++++++----------- + arch/powerpc/kernel/setup_64.c | 4 +- + arch/powerpc/kernel/stacktrace.c | 9 +- + arch/powerpc/kernel/swsusp.c | 1 + + arch/powerpc/mm/fault.c | 82 ++- + arch/powerpc/mm/hash_low_32.S | 2 - + arch/powerpc/platforms/powernv/opal-sensor.c | 4 + + arch/powerpc/platforms/powernv/opal-wrappers.S | 53 +- + arch/powerpc/platforms/powernv/opal-xscom.c | 27 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 4 +- + arch/powerpc/platforms/powernv/pci.c | 2 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 10 + + arch/powerpc/xmon/xmon.c | 59 +- + drivers/pcmcia/electra_cf.c | 4 +- + tools/testing/selftests/powerpc/Makefile | 1 + + .../selftests/powerpc/cache_shape/.gitignore | 1 + + .../testing/selftests/powerpc/cache_shape/Makefile | 10 + + .../selftests/powerpc/cache_shape/cache_shape.c | 125 ++++ + tools/testing/selftests/powerpc/include/utils.h | 6 +- + tools/testing/selftests/powerpc/utils.c | 53 +- + 33 files changed, 725 insertions(+), 673 deletions(-) + create mode 100644 tools/testing/selftests/powerpc/cache_shape/.gitignore + create mode 100644 tools/testing/selftests/powerpc/cache_shape/Makefile + create mode 100644 tools/testing/selftests/powerpc/cache_shape/cache_shape.c +Merging fsl/next (75b824727680 powerpc/8xx: Perf events on PPC 8xx) +$ git merge fsl/next +Already up-to-date. +Merging mpc5xxx/next (39e69f55f857 powerpc: Introduce the use of the managed version of kzalloc) +$ git merge mpc5xxx/next +Already up-to-date. +Merging s390/features (6fb81d69d0bb Merge branch 'vfio-ccw-for-martin' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/vfio-ccw into features) +$ git merge s390/features +Resolved 'arch/s390/include/uapi/asm/Kbuild' using previous resolution. +Removing arch/s390/include/uapi/asm/termbits.h +Removing arch/s390/include/uapi/asm/sockios.h +Removing arch/s390/include/uapi/asm/resource.h +Removing arch/s390/include/uapi/asm/poll.h +Removing arch/s390/include/uapi/asm/param.h +Removing arch/s390/include/uapi/asm/mman.h +Removing arch/s390/include/uapi/asm/ioctl.h +Removing arch/s390/include/uapi/asm/fcntl.h +Removing arch/s390/include/uapi/asm/errno.h +Auto-merging arch/s390/include/uapi/asm/Kbuild +CONFLICT (content): Merge conflict in arch/s390/include/uapi/asm/Kbuild +Removing arch/s390/include/asm/local64.h +Removing arch/s390/include/asm/local.h +Removing arch/s390/include/asm/kmap_types.h +Removing arch/s390/include/asm/irq_regs.h +Removing arch/s390/include/asm/emergency-restart.h +Removing arch/s390/include/asm/div64.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 51711eebb1bb] Merge remote-tracking branch 's390/features' +$ git diff -M --stat --summary HEAD^.. + Documentation/s390/00-INDEX | 2 + + Documentation/s390/vfio-ccw.txt | 303 ++++++++++ + MAINTAINERS | 11 + + arch/s390/Kconfig | 22 +- + arch/s390/boot/compressed/misc.c | 35 +- + arch/s390/configs/default_defconfig | 1 + + arch/s390/configs/gcov_defconfig | 1 + + arch/s390/configs/performance_defconfig | 1 + + arch/s390/configs/zfcpdump_defconfig | 1 - + arch/s390/include/asm/Kbuild | 6 + + arch/s390/include/asm/bitops.h | 13 +- + arch/s390/include/asm/cio.h | 18 + + arch/s390/include/asm/cpu_mf.h | 6 +- + arch/s390/include/asm/div64.h | 1 - + arch/s390/include/asm/elf.h | 1 + + arch/s390/include/asm/emergency-restart.h | 6 - + arch/s390/include/asm/facility.h | 6 +- + arch/s390/include/asm/irq_regs.h | 1 - + arch/s390/include/asm/isc.h | 1 + + arch/s390/include/asm/kmap_types.h | 6 - + arch/s390/include/asm/local.h | 1 - + arch/s390/include/asm/local64.h | 1 - + arch/s390/include/asm/lowcore.h | 9 +- + arch/s390/include/asm/nmi.h | 12 +- + arch/s390/include/asm/perf_event.h | 4 +- + arch/s390/include/asm/pkey.h | 21 + + arch/s390/include/asm/processor.h | 5 + + arch/s390/include/asm/setup.h | 2 + + arch/s390/include/asm/sparsemem.h | 2 +- + arch/s390/include/asm/switch_to.h | 3 + + arch/s390/include/asm/sysinfo.h | 12 +- + arch/s390/include/asm/thread_info.h | 12 +- + arch/s390/include/uapi/asm/Kbuild | 10 + + arch/s390/include/uapi/asm/errno.h | 11 - + arch/s390/include/uapi/asm/fcntl.h | 1 - + arch/s390/include/uapi/asm/guarded_storage.h | 77 +++ + arch/s390/include/uapi/asm/ioctl.h | 1 - + arch/s390/include/uapi/asm/mman.h | 6 - + arch/s390/include/uapi/asm/param.h | 6 - + arch/s390/include/uapi/asm/pkey.h | 19 + + arch/s390/include/uapi/asm/poll.h | 1 - + arch/s390/include/uapi/asm/resource.h | 13 - + arch/s390/include/uapi/asm/sockios.h | 6 - + arch/s390/include/uapi/asm/termbits.h | 6 - + arch/s390/include/uapi/asm/unistd.h | 2 +- + arch/s390/kernel/Makefile | 6 +- + arch/s390/kernel/asm-offsets.c | 2 +- + arch/s390/kernel/compat_wrapper.c | 1 + + arch/s390/kernel/crash_dump.c | 15 + + arch/s390/kernel/early.c | 47 +- + arch/s390/kernel/entry.S | 26 +- + arch/s390/kernel/entry.h | 2 + + arch/s390/kernel/guarded_storage.c | 128 ++++ + arch/s390/kernel/head.S | 1 - + arch/s390/kernel/kdebugfs.c | 15 + + arch/s390/kernel/machine_kexec.c | 13 +- + arch/s390/kernel/nmi.c | 19 +- + arch/s390/kernel/perf_cpum_cf.c | 128 ++-- + arch/s390/kernel/perf_cpum_cf_events.c | 148 ++++- + arch/s390/kernel/process.c | 7 +- + arch/s390/kernel/processor.c | 16 +- + arch/s390/kernel/ptrace.c | 86 ++- + arch/s390/kernel/setup.c | 18 +- + arch/s390/kernel/smp.c | 48 +- + arch/s390/kernel/syscalls.S | 2 +- + arch/s390/kernel/sysinfo.c | 98 ++++ + arch/s390/kernel/topology.c | 6 +- + arch/s390/kvm/interrupt.c | 4 +- + arch/s390/mm/gmap.c | 35 +- + arch/s390/mm/pgalloc.c | 2 +- + drivers/iommu/Kconfig | 8 + + drivers/s390/block/dasd_3990_erp.c | 5 +- + drivers/s390/block/dasd_eckd.c | 16 +- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/cio/Makefile | 3 + + drivers/s390/cio/cio.c | 69 +++ + drivers/s390/cio/cio.h | 1 + + drivers/s390/cio/device_fsm.c | 54 +- + drivers/s390/cio/vfio_ccw_cp.c | 842 +++++++++++++++++++++++++++ + drivers/s390/cio/vfio_ccw_cp.h | 42 ++ + drivers/s390/cio/vfio_ccw_drv.c | 308 ++++++++++ + drivers/s390/cio/vfio_ccw_fsm.c | 207 +++++++ + drivers/s390/cio/vfio_ccw_ops.c | 447 ++++++++++++++ + drivers/s390/cio/vfio_ccw_private.h | 96 +++ + drivers/s390/crypto/pkey_api.c | 117 +++- + include/uapi/linux/elf.h | 1 + + include/uapi/linux/vfio.h | 18 + + include/uapi/linux/vfio_ccw.h | 24 + + 88 files changed, 3479 insertions(+), 339 deletions(-) + create mode 100644 Documentation/s390/vfio-ccw.txt + delete mode 100644 arch/s390/include/asm/div64.h + delete mode 100644 arch/s390/include/asm/emergency-restart.h + delete mode 100644 arch/s390/include/asm/irq_regs.h + delete mode 100644 arch/s390/include/asm/kmap_types.h + delete mode 100644 arch/s390/include/asm/local.h + delete mode 100644 arch/s390/include/asm/local64.h + delete mode 100644 arch/s390/include/uapi/asm/errno.h + delete mode 100644 arch/s390/include/uapi/asm/fcntl.h + create mode 100644 arch/s390/include/uapi/asm/guarded_storage.h + delete mode 100644 arch/s390/include/uapi/asm/ioctl.h + delete mode 100644 arch/s390/include/uapi/asm/mman.h + delete mode 100644 arch/s390/include/uapi/asm/param.h + delete mode 100644 arch/s390/include/uapi/asm/poll.h + delete mode 100644 arch/s390/include/uapi/asm/resource.h + delete mode 100644 arch/s390/include/uapi/asm/sockios.h + delete mode 100644 arch/s390/include/uapi/asm/termbits.h + create mode 100644 arch/s390/kernel/guarded_storage.c + create mode 100644 arch/s390/kernel/kdebugfs.c + create mode 100644 drivers/s390/cio/vfio_ccw_cp.c + create mode 100644 drivers/s390/cio/vfio_ccw_cp.h + create mode 100644 drivers/s390/cio/vfio_ccw_drv.c + create mode 100644 drivers/s390/cio/vfio_ccw_fsm.c + create mode 100644 drivers/s390/cio/vfio_ccw_ops.c + create mode 100644 drivers/s390/cio/vfio_ccw_private.h + create mode 100644 include/uapi/linux/vfio_ccw.h +Merging sparc-next/master (9f935675d41a Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input) +$ git merge sparc-next/master +Already up-to-date. +Merging sh/for-next (e61c10e468a4 sh: add device tree source for J2 FPGA on Mimas v2 board) +$ git merge sh/for-next +Already up-to-date. +Merging tile/master (0af0bc38175d mm, tile: drop arch_{add,remove}_memory) +$ git merge tile/master +Merge made by the 'recursive' strategy. + arch/tile/include/uapi/arch/abi.h | 49 +++---------------------- + arch/tile/include/uapi/arch/intreg.h | 70 ++++++++++++++++++++++++++++++++++++ + arch/tile/mm/init.c | 30 ---------------- + 3 files changed, 74 insertions(+), 75 deletions(-) + create mode 100644 arch/tile/include/uapi/arch/intreg.h +Merging uml/linux-next (f88f0bdfc32f um: UBD Improvements) +$ git merge uml/linux-next +Already up-to-date. +Merging unicore32/unicore32 (bc27113620ca unicore32-oldabi: add oldabi syscall interface) +$ git merge unicore32/unicore32 +Auto-merging arch/unicore32/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/unicore32/Kconfig | 14 + + arch/unicore32/include/asm/Kbuild | 3 - + arch/unicore32/include/asm/signal.h | 21 + + arch/unicore32/include/asm/syscalls.h | 25 + + arch/unicore32/include/uapi/asm/sigcontext.h | 14 + + arch/unicore32/include/uapi/asm/stat-oldabi.h | 71 +++ + arch/unicore32/include/uapi/asm/stat.h | 19 + + arch/unicore32/include/uapi/asm/unistd-oldabi.h | 770 ++++++++++++++++++++++++ + arch/unicore32/include/uapi/asm/unistd.h | 8 + + arch/unicore32/kernel/entry.S | 17 + + arch/unicore32/kernel/signal.c | 41 ++ + 11 files changed, 1000 insertions(+), 3 deletions(-) + create mode 100644 arch/unicore32/include/asm/signal.h + create mode 100644 arch/unicore32/include/asm/syscalls.h + create mode 100644 arch/unicore32/include/uapi/asm/stat-oldabi.h + create mode 100644 arch/unicore32/include/uapi/asm/stat.h + create mode 100644 arch/unicore32/include/uapi/asm/unistd-oldabi.h +Merging xtensa/xtensa-for-next (d0c32cdc395c Merge branch 'xtensa-dma-map-fix' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. + arch/xtensa/include/asm/page.h | 13 +++++++++++++ + arch/xtensa/include/uapi/asm/unistd.h | 5 ++++- + arch/xtensa/kernel/traps.c | 6 ++---- + 3 files changed, 19 insertions(+), 5 deletions(-) +Merging fscrypt/master (94840e3c802d fscrypt: eliminate ->prepare_context() operation) +$ git merge fscrypt/master +Already up-to-date. +Merging befs/for-next (0bbabf98dd76 befs: make export work with cold dcache) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/linuxvfs.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) +Merging btrfs/next (8b8b08cbfb90 Btrfs: fix delalloc accounting after copy_from_user faults) +$ git merge btrfs/next +Already up-to-date. +Merging btrfs-kdave/for-next (d701f24ae592 Merge branch 'for-next-next-v4.12-20170330' into for-next-20170330) +$ git merge btrfs-kdave/for-next +Recorded preimage for 'fs/btrfs/qgroup.c' +Auto-merging fs/btrfs/qgroup.c +CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/ctree.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'fs/btrfs/qgroup.c'. +[master e333bd3d8cfc] Merge remote-tracking branch 'btrfs-kdave/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 + + fs/btrfs/backref.c | 41 ++- + fs/btrfs/compression.c | 18 +- + fs/btrfs/ctree.c | 20 +- + fs/btrfs/ctree.h | 29 +- + fs/btrfs/delayed-inode.c | 46 +-- + fs/btrfs/delayed-inode.h | 6 +- + fs/btrfs/delayed-ref.c | 8 +- + fs/btrfs/delayed-ref.h | 8 +- + fs/btrfs/dev-replace.c | 7 +- + fs/btrfs/disk-io.c | 12 +- + fs/btrfs/disk-io.h | 4 +- + fs/btrfs/extent-tree.c | 55 +-- + fs/btrfs/extent_io.c | 21 +- + fs/btrfs/extent_io.h | 21 +- + fs/btrfs/extent_map.c | 10 +- + fs/btrfs/extent_map.h | 3 +- + fs/btrfs/file.c | 46 ++- + fs/btrfs/inode-map.c | 6 +- + fs/btrfs/inode.c | 265 ++++++++++---- + fs/btrfs/ioctl.c | 44 +-- + fs/btrfs/ordered-data.c | 20 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 298 +++++++++------ + fs/btrfs/qgroup.h | 59 ++- + fs/btrfs/raid56.c | 38 +- + fs/btrfs/reada.c | 89 ++--- + fs/btrfs/relocation.c | 13 +- + fs/btrfs/scrub.c | 72 ++-- + fs/btrfs/super.c | 3 +- + fs/btrfs/tests/btrfs-tests.c | 1 - + fs/btrfs/transaction.c | 44 ++- + fs/btrfs/transaction.h | 6 +- + fs/btrfs/tree-log.c | 2 +- + fs/btrfs/volumes.c | 843 +++++++++++++++++++++++-------------------- + fs/btrfs/volumes.h | 7 +- + include/trace/events/btrfs.h | 187 +++++++++- + include/uapi/linux/btrfs.h | 10 +- + 38 files changed, 1455 insertions(+), 911 deletions(-) +Merging ceph/master (633ee407b9d1 libceph: force GFP_NOIO for socket allocations) +$ git merge ceph/master +Already up-to-date. +Merging cifs/for-next (70c1da060b51 cifs: remove unused code) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifsglob.h | 11 ++++++++++ + fs/cifs/connect.c | 9 ++++++-- + fs/cifs/smb2misc.c | 47 +++++++++++++++++++++++++++++++++++++++ + fs/cifs/smb2ops.c | 4 ++++ + fs/cifs/smb2proto.h | 7 ++++++ + fs/cifs/smb2transport.c | 58 +++++++++++++++++++++++++++++++++++++++++++++---- + fs/cifs/transport.c | 3 +++ + 7 files changed, 133 insertions(+), 6 deletions(-) +Merging configfs/for-next (e16769d4bca6 fs: configfs: don't return anything from drop_link) +$ git merge configfs/for-next +Already up-to-date. +Merging ecryptfs/next (be280b25c328 ecryptfs: remove private bin2hex implementation) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/main.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 15 --------------- + fs/ecryptfs/ecryptfs_kernel.h | 9 ++++++++- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/main.c | 2 +- + fs/ecryptfs/miscdev.c | 2 +- + 5 files changed, 11 insertions(+), 19 deletions(-) +Merging ext3/for_next (ab4949640d66 reiserfs: avoid a -Wmaybe-uninitialized warning) +$ git merge ext3/for_next +Merge made by the 'recursive' strategy. + fs/reiserfs/lbalance.c | 2 +- + fs/reiserfs/reiserfs.h | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging ext4/dev (d67d64f42314 ext4: fix two spelling nits) +$ git merge ext4/dev +Already up-to-date. +Merging f2fs/dev (65f770f2ead7 f2fs: avoid IO split due to mixed WB_SYNC_ALL and WB_SYNC_NONE) +$ git merge f2fs/dev +Merge made by the 'recursive' strategy. + fs/f2fs/checkpoint.c | 58 ++++-- + fs/f2fs/data.c | 57 ++++-- + fs/f2fs/debug.c | 48 +++-- + fs/f2fs/dir.c | 25 +-- + fs/f2fs/f2fs.h | 70 +++++--- + fs/f2fs/file.c | 89 ++++++---- + fs/f2fs/gc.c | 15 +- + fs/f2fs/inline.c | 24 +-- + fs/f2fs/inode.c | 18 +- + fs/f2fs/namei.c | 33 +--- + fs/f2fs/node.c | 125 +++++++------ + fs/f2fs/node.h | 9 +- + fs/f2fs/segment.c | 424 +++++++++++++++++++++++++++----------------- + fs/f2fs/segment.h | 3 +- + fs/f2fs/super.c | 28 ++- + fs/f2fs/trace.c | 4 +- + fs/f2fs/xattr.c | 31 ++-- + fs/f2fs/xattr.h | 4 +- + include/trace/events/f2fs.h | 14 +- + 19 files changed, 650 insertions(+), 429 deletions(-) +Merging freevxfs/for-next (bf1bb4b460c8 freevxfs: update Kconfig information) +$ git merge freevxfs/for-next +Already up-to-date. +Merging fscache/fscache (d52bd54db8be Merge branch 'akpm' (patches from Andrew)) +$ git merge fscache/fscache +Already up-to-date. +Merging fuse/for-next (9a87ad3da905 fuse: release: private_data cannot be NULL) +$ git merge fuse/for-next +Already up-to-date. +Merging gfs2/for-next (307c3320a929 Revert "GFS2: Wait for iopen glock dequeues") +$ git merge gfs2/for-next +Resolved 'drivers/net/ethernet/broadcom/genet/bcmmii.c' using previous resolution. +Resolved 'drivers/net/hyperv/netvsc.c' using previous resolution. +Resolved 'drivers/net/usb/r8152.c' using previous resolution. +Resolved 'net/core/secure_seq.c' using previous resolution. +Auto-merging net/sctp/stream.c +Auto-merging net/sctp/socket.c +Auto-merging net/sctp/sm_statefuns.c +Auto-merging net/sched/sch_dsmark.c +Auto-merging net/netfilter/nft_nat.c +Auto-merging net/netfilter/nft_meta.c +Auto-merging net/netfilter/nft_ct.c +Auto-merging net/netfilter/nfnetlink_cttimeout.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/mpls/af_mpls.c +Auto-merging net/ipv6/udp.c +Auto-merging net/ipv4/tcp_minisocks.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/netfilter/nf_nat_snmp_basic.c +Auto-merging net/core/sock.c +Auto-merging net/core/secure_seq.c +CONFLICT (content): Merge conflict in net/core/secure_seq.c +Auto-merging net/bridge/br_netfilter_hooks.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/bpf/hashtab.c +Auto-merging include/net/netfilter/nf_tables.h +Auto-merging include/linux/hyperv.h +Auto-merging drivers/net/vrf.c +Auto-merging drivers/net/usb/r8152.c +CONFLICT (content): Merge conflict in drivers/net/usb/r8152.c +Auto-merging drivers/net/tun.c +Auto-merging drivers/net/hyperv/netvsc.c +CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/ibm/ibmvnic.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmmii.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/broadcom/genet/bcmmii.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-drv.c +Removing drivers/infiniband/hw/qedr/qedr_hsi.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 40f2554aaad4] Merge remote-tracking branch 'gfs2/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/net/brcm,bcmgenet.txt | 19 +- + .../devicetree/bindings/net/brcm,unimac-mdio.txt | 5 +- + .../devicetree/bindings/net/marvell-pp2.txt | 62 +- + Documentation/devicetree/bindings/net/stmmac.txt | 75 +- + Documentation/networking/ip-sysctl.txt | 13 +- + Documentation/networking/ipvs-sysctl.txt | 68 +- + Documentation/networking/mpls-sysctl.txt | 19 + + MAINTAINERS | 13 + + drivers/atm/ambassador.c | 5 +- + drivers/hv/ring_buffer.c | 94 +- + drivers/infiniband/hw/qedr/main.c | 5 +- + drivers/infiniband/hw/qedr/qedr.h | 3 +- + drivers/infiniband/hw/qedr/qedr_cm.c | 3 - + drivers/infiniband/hw/qedr/qedr_hsi.h | 56 - + drivers/infiniband/hw/qedr/verbs.c | 3 +- + drivers/isdn/hardware/mISDN/Kconfig | 6 +- + drivers/isdn/hardware/mISDN/hfc_multi_8xx.h | 2 +- + drivers/net/bonding/bond_3ad.c | 20 +- + drivers/net/bonding/bond_main.c | 53 +- + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 661 ++-- + drivers/net/dsa/mv88e6xxx/global1.h | 11 + + drivers/net/dsa/mv88e6xxx/global1_atu.c | 300 ++ + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 44 +- + drivers/net/dsa/mv88e6xxx/port.c | 78 +- + drivers/net/dsa/mv88e6xxx/port.h | 16 +- + drivers/net/dummy.c | 15 + + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 3 +- + drivers/net/ethernet/apm/Kconfig | 1 + + drivers/net/ethernet/apm/Makefile | 1 + + drivers/net/ethernet/apm/xgene-v2/Kconfig | 11 + + drivers/net/ethernet/apm/xgene-v2/Makefile | 6 + + drivers/net/ethernet/apm/xgene-v2/enet.c | 71 + + drivers/net/ethernet/apm/xgene-v2/enet.h | 43 + + drivers/net/ethernet/apm/xgene-v2/mac.c | 116 + + drivers/net/ethernet/apm/xgene-v2/mac.h | 110 + + drivers/net/ethernet/apm/xgene-v2/main.c | 756 +++++ + drivers/net/ethernet/apm/xgene-v2/main.h | 75 + + drivers/net/ethernet/apm/xgene-v2/ring.c | 81 + + drivers/net/ethernet/apm/xgene-v2/ring.h | 119 + + drivers/net/ethernet/apm/xgene/xgene_enet_hw.c | 3 +- + drivers/net/ethernet/apm/xgene/xgene_enet_hw.h | 2 + + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 74 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 1 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.c | 7 + + drivers/net/ethernet/apm/xgene/xgene_enet_xgmac.h | 5 + + drivers/net/ethernet/broadcom/Kconfig | 8 +- + drivers/net/ethernet/broadcom/bgmac-bcma.c | 103 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 34 + + drivers/net/ethernet/broadcom/bgmac.c | 51 + + drivers/net/ethernet/broadcom/bgmac.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 292 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.h | 16 +- + drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 15 +- + drivers/net/ethernet/broadcom/genet/bcmmii.c | 52 +- + drivers/net/ethernet/broadcom/tg3.c | 7 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 19 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 14 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 126 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 73 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 5 + + .../net/ethernet/cavium/liquidio/octeon_device.c | 4 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 3 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 10 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +- + .../net/ethernet/cavium/liquidio/octeon_network.h | 36 + + .../net/ethernet/cavium/liquidio/request_manager.c | 13 +- + .../ethernet/cavium/liquidio/response_manager.c | 39 +- + .../ethernet/cavium/liquidio/response_manager.h | 5 + + drivers/net/ethernet/ethoc.c | 4 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 182 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.h | 8 +- + drivers/net/ethernet/freescale/fman/fman.c | 23 +- + drivers/net/ethernet/freescale/fman/fman.h | 10 +- + drivers/net/ethernet/freescale/fman/fman_port.c | 76 +- + drivers/net/ethernet/freescale/fs_enet/mac-fec.c | 6 - + drivers/net/ethernet/freescale/fs_enet/mac-scc.c | 6 - + drivers/net/ethernet/ibm/ibmvnic.c | 320 +- + drivers/net/ethernet/ibm/ibmvnic.h | 1 + + drivers/net/ethernet/intel/fm10k/fm10k_netdev.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e.h | 32 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 65 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 457 +-- + drivers/net/ethernet/intel/i40e/i40e_client.h | 8 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 338 ++- + drivers/net/ethernet/intel/i40e/i40e_main.c | 163 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 131 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 3 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 10 +- + drivers/net/ethernet/intel/i40evf/Makefile | 2 +- + .../net/ethernet/intel/i40evf/i40e_adminq_cmd.h | 65 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 31 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 3 + + drivers/net/ethernet/intel/i40evf/i40e_virtchnl.h | 33 + + drivers/net/ethernet/intel/i40evf/i40evf.h | 29 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.c | 563 ++++ + drivers/net/ethernet/intel/i40evf/i40evf_client.h | 166 ++ + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 31 +- + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 89 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 13 +- + drivers/net/ethernet/intel/igb/igb.h | 58 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 65 +- + drivers/net/ethernet/intel/igb/igb_main.c | 514 ++-- + drivers/net/ethernet/intel/igb/igb_ptp.c | 3 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 168 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 6 +- + drivers/net/ethernet/marvell/Kconfig | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 61 +- + drivers/net/ethernet/marvell/mvpp2.c | 1186 ++++++-- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_port.c | 2 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 607 ++-- + drivers/net/ethernet/mellanox/mlx4/en_selftest.c | 6 - + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 30 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_stats.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlxsw/cmd.h | 12 - + .../mellanox/mlxsw/core_acl_flex_actions.c | 134 + + .../mellanox/mlxsw/core_acl_flex_actions.h | 4 + + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 6 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 2 - + drivers/net/ethernet/mellanox/mlxsw/reg.h | 69 +- + drivers/net/ethernet/mellanox/mlxsw/resources.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 767 ++--- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 85 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 172 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.h | 6 + + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 44 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 198 ++ + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h | 53 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 83 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 1313 ++++++-- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 4 +- + drivers/net/ethernet/micrel/ks8851.c | 41 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 159 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 1092 +++---- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 14 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 17 +- + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 127 +- + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 35 +- + .../net/ethernet/netronome/nfp/nfp_net_offload.c | 31 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 19 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.c | 65 +- + .../ethernet/netronome/nfp/nfpcore/nfp_nsp_eth.h | 15 +- + .../net/ethernet/qlogic/netxen/netxen_nic_init.c | 9 +- + drivers/net/ethernet/qlogic/qed/qed.h | 31 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 1566 ++++++---- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 186 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 825 ++++- + .../net/ethernet/qlogic/qed/qed_init_fw_funcs.c | 56 +- + drivers/net/ethernet/qlogic/qed/qed_init_ops.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_l2.c | 184 +- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 48 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 7 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 9 +- + drivers/net/ethernet/qlogic/qed/qed_ptp.c | 12 +- + drivers/net/ethernet/qlogic/qed/qed_reg_addr.h | 47 +- + drivers/net/ethernet/qlogic/qed/qed_roce.c | 220 +- + drivers/net/ethernet/qlogic/qed/qed_roce.h | 11 +- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 13 +- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 30 +- + drivers/net/ethernet/qlogic/qede/qede.h | 45 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 85 +- + drivers/net/ethernet/qlogic/qede/qede_main.c | 222 +- + .../ethernet/qualcomm/emac/emac-sgmii-qdf2400.c | 6 + + drivers/net/ethernet/realtek/8139cp.c | 14 +- + drivers/net/ethernet/realtek/8139too.c | 14 +- + drivers/net/ethernet/realtek/r8169.c | 45 +- + drivers/net/ethernet/rocker/rocker_main.c | 72 +- + drivers/net/ethernet/sfc/falcon/tx.c | 4 +- + drivers/net/ethernet/sfc/tx.c | 4 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 14 +- + drivers/net/ethernet/silan/sc92031.c | 83 +- + drivers/net/ethernet/sis/sis190.c | 14 +- + drivers/net/ethernet/sis/sis900.c | 18 +- + drivers/net/ethernet/smsc/epic100.c | 16 +- + drivers/net/ethernet/smsc/smc911x.c | 51 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 98 +- + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 77 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 371 ++- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 6 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 3 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 103 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 373 ++- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 225 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.h | 20 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_lib.c | 56 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac_lib.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 11 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1872 +++++++++--- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 11 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 149 +- + drivers/net/ethernet/sun/cassini.c | 98 +- + drivers/net/ethernet/sun/ldmvsw.c | 27 +- + drivers/net/ethernet/sun/niu.c | 37 +- + drivers/net/ethernet/sun/sungem.c | 99 +- + drivers/net/ethernet/sun/sunhme.c | 62 +- + drivers/net/ethernet/sun/sunvnet.c | 116 +- + drivers/net/ethernet/sun/sunvnet_common.c | 56 +- + drivers/net/ethernet/sun/sunvnet_common.h | 27 +- + drivers/net/ethernet/synopsys/Kconfig | 41 + + drivers/net/ethernet/synopsys/Makefile | 9 + + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 736 +++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 648 ++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 3146 ++++++++++++++++++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 1334 +++++++++ + drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 80 + + drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h | 746 +++++ + drivers/net/ethernet/synopsys/dwc-xlgmac.h | 651 ++++ + drivers/net/ethernet/ti/netcp_core.c | 12 +- + drivers/net/ethernet/toshiba/ps3_gelic_net.c | 51 +- + drivers/net/ethernet/toshiba/spider_net_ethtool.c | 24 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 14 +- + drivers/net/ethernet/via/via-rhine.c | 14 +- + drivers/net/ethernet/via/via-velocity.c | 62 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/fjes/fjes_ethtool.c | 19 +- + drivers/net/gtp.c | 531 ++-- + drivers/net/hyperv/hyperv_net.h | 5 +- + drivers/net/hyperv/netvsc.c | 198 +- + drivers/net/hyperv/netvsc_drv.c | 58 +- + drivers/net/hyperv/rndis_filter.c | 15 +- + drivers/net/loopback.c | 34 +- + drivers/net/ntb_netdev.c | 25 +- + drivers/net/phy/bcm-phy-lib.c | 6 +- + drivers/net/phy/bcm7xxx.c | 215 +- + drivers/net/phy/mdio-bcm-unimac.c | 3 +- + drivers/net/phy/mdio-xgene.c | 2 +- + drivers/net/tun.c | 24 +- + drivers/net/usb/asix_devices.c | 12 +- + drivers/net/usb/ax88179_178a.c | 14 +- + drivers/net/usb/catc.c | 31 +- + drivers/net/usb/cdc_ncm.c | 4 +- + drivers/net/usb/dm9601.c | 4 +- + drivers/net/usb/mcs7830.c | 4 +- + drivers/net/usb/pegasus.c | 14 +- + drivers/net/usb/r8152.c | 170 +- + drivers/net/usb/rtl8150.c | 35 +- + drivers/net/usb/sierra_net.c | 4 +- + drivers/net/usb/smsc75xx.c | 4 +- + drivers/net/usb/smsc95xx.c | 24 +- + drivers/net/usb/sr9700.c | 4 +- + drivers/net/usb/sr9800.c | 4 +- + drivers/net/usb/usbnet.c | 19 +- + drivers/net/vrf.c | 8 +- + drivers/net/vxlan.c | 2 +- + drivers/scsi/qedf/Makefile | 2 +- + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 190 ++ + drivers/scsi/qedf/drv_fcoe_fw_funcs.h | 93 + + drivers/scsi/qedf/drv_scsi_fw_funcs.c | 44 + + drivers/scsi/qedf/drv_scsi_fw_funcs.h | 85 + + drivers/scsi/qedf/qedf.h | 23 +- + drivers/scsi/qedf/qedf_els.c | 25 +- + drivers/scsi/qedf/qedf_io.c | 670 ++--- + drivers/scsi/qedi/Makefile | 2 +- + drivers/scsi/qedi/qedi_fw.c | 1068 +++---- + drivers/scsi/qedi/qedi_fw_api.c | 781 +++++ + drivers/scsi/qedi/qedi_fw_iscsi.h | 117 + + drivers/scsi/qedi/qedi_fw_scsi.h | 55 + + drivers/scsi/qedi/qedi_iscsi.c | 12 +- + drivers/scsi/qedi/qedi_iscsi.h | 2 +- + drivers/scsi/qedi/qedi_version.h | 4 +- + fs/gfs2/glock.c | 77 +- + fs/gfs2/incore.h | 8 +- + fs/gfs2/inode.c | 4 +- + fs/gfs2/super.c | 11 +- + include/linux/bpf.h | 1 + + include/linux/bpf_verifier.h | 5 +- + include/linux/brcmphy.h | 3 + + include/linux/etherdevice.h | 15 - + include/linux/ethtool.h | 2 + + include/linux/filter.h | 10 + + include/linux/hyperv.h | 96 +- + include/linux/ipv6.h | 1 + + include/linux/netdevice.h | 2 +- + include/linux/qed/common_hsi.h | 30 +- + include/linux/qed/eth_common.h | 3 + + include/linux/qed/fcoe_common.h | 180 +- + include/linux/qed/iscsi_common.h | 241 +- + include/linux/qed/qed_if.h | 48 +- + include/linux/qed/rdma_common.h | 3 +- + include/linux/qed/roce_common.h | 17 + + include/linux/qed/storage_common.h | 30 +- + include/linux/qed/tcp_common.h | 1 + + include/linux/rhashtable.h | 22 + + include/linux/stmmac.h | 41 + + include/linux/usb/usbnet.h | 8 +- + include/net/dsa.h | 9 + + include/net/fib_rules.h | 1 + + include/net/ip_fib.h | 38 +- + include/net/ip_vs.h | 16 +- + include/net/mpls_iptunnel.h | 2 + + include/net/netfilter/nf_conntrack_expect.h | 4 +- + include/net/netfilter/nf_conntrack_timeout.h | 3 +- + include/net/netfilter/nf_tables.h | 12 +- + include/net/netfilter/nft_fib.h | 2 +- + include/net/netns/ipv4.h | 2 +- + include/net/netns/mpls.h | 3 + + include/net/pkt_sched.h | 2 +- + include/net/route.h | 6 +- + include/net/sch_generic.h | 1 + + include/net/sctp/sm.h | 16 + + include/net/sctp/ulpevent.h | 8 + + include/net/secure_seq.h | 6 +- + include/net/sock.h | 7 +- + include/net/tc_act/tc_vlan.h | 5 + + include/net/tcp.h | 11 +- + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/mpls_iptunnel.h | 2 + + include/uapi/linux/netfilter/nf_tables.h | 26 +- + include/uapi/linux/pkt_sched.h | 8 + + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/sctp.h | 31 + + include/uapi/linux/snmp.h | 1 - + kernel/bpf/arraymap.c | 29 + + kernel/bpf/hashtab.c | 31 +- + kernel/bpf/syscall.c | 56 - + kernel/bpf/verifier.c | 129 +- + net/8021q/vlan_dev.c | 3 +- + net/atm/common.c | 22 +- + net/bridge/br_netfilter_hooks.c | 3 - + net/bridge/netfilter/ebt_log.c | 34 +- + net/bridge/netfilter/nft_reject_bridge.c | 6 +- + net/core/drop_monitor.c | 5 +- + net/core/ethtool.c | 1 + + net/core/fib_rules.c | 14 + + net/core/flow_dissector.c | 426 +-- + net/core/lwtunnel.c | 2 - + net/core/secure_seq.c | 13 +- + net/core/sock.c | 91 +- + net/decnet/af_decnet.c | 13 +- + net/dsa/slave.c | 12 +- + net/ipv4/Makefile | 2 +- + net/ipv4/devinet.c | 32 +- + net/ipv4/fib_notifier.c | 86 + + net/ipv4/fib_rules.c | 55 +- + net/ipv4/fib_semantics.c | 11 +- + net/ipv4/fib_trie.c | 108 +- + net/ipv4/icmp.c | 19 +- + net/ipv4/netfilter/arp_tables.c | 2 - + net/ipv4/netfilter/ipt_CLUSTERIP.c | 19 +- + net/ipv4/netfilter/nf_nat_snmp_basic.c | 15 +- + net/ipv4/netfilter/nf_reject_ipv4.c | 3 - + net/ipv4/netfilter/nft_fib_ipv4.c | 4 +- + net/ipv4/proc.c | 1 - + net/ipv4/route.c | 92 +- + net/ipv4/sysctl_net_ipv4.c | 16 +- + net/ipv4/tcp_input.c | 36 +- + net/ipv4/tcp_ipv4.c | 41 +- + net/ipv4/tcp_metrics.c | 147 +- + net/ipv4/tcp_minisocks.c | 22 +- + net/ipv4/tcp_westwood.c | 4 +- + net/ipv6/addrconf.c | 114 + + net/ipv6/netfilter/nft_fib_ipv6.c | 2 +- + net/ipv6/tcp_ipv6.c | 32 +- + net/ipv6/udp.c | 59 + + net/mpls/af_mpls.c | 98 +- + net/mpls/internal.h | 7 + + net/mpls/mpls_iptunnel.c | 73 +- + net/netfilter/ipvs/ip_vs_conn.c | 24 +- + net/netfilter/ipvs/ip_vs_core.c | 6 +- + net/netfilter/ipvs/ip_vs_ctl.c | 12 +- + net/netfilter/ipvs/ip_vs_lblc.c | 2 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 6 +- + net/netfilter/ipvs/ip_vs_nq.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 2 +- + net/netfilter/ipvs/ip_vs_proto_tcp.c | 2 +- + net/netfilter/ipvs/ip_vs_rr.c | 2 +- + net/netfilter/ipvs/ip_vs_sed.c | 2 +- + net/netfilter/ipvs/ip_vs_wlc.c | 2 +- + net/netfilter/ipvs/ip_vs_wrr.c | 2 +- + net/netfilter/nf_conntrack_core.c | 57 +- + net/netfilter/nf_conntrack_expect.c | 10 +- + net/netfilter/nf_conntrack_netlink.c | 4 +- + net/netfilter/nf_tables_api.c | 49 +- + net/netfilter/nfnetlink_acct.c | 15 +- + net/netfilter/nfnetlink_cttimeout.c | 12 +- + net/netfilter/nfnetlink_log.c | 14 +- + net/netfilter/nft_compat.c | 8 - + net/netfilter/nft_counter.c | 3 +- + net/netfilter/nft_ct.c | 171 ++ + net/netfilter/nft_dynset.c | 14 +- + net/netfilter/nft_exthdr.c | 13 +- + net/netfilter/nft_fib.c | 16 +- + net/netfilter/nft_hash.c | 133 +- + net/netfilter/nft_limit.c | 10 +- + net/netfilter/nft_lookup.c | 14 +- + net/netfilter/nft_masq.c | 4 - + net/netfilter/nft_meta.c | 4 - + net/netfilter/nft_nat.c | 4 - + net/netfilter/nft_objref.c | 14 +- + net/netfilter/nft_quota.c | 3 +- + net/netfilter/nft_redir.c | 4 - + net/netfilter/nft_reject.c | 5 - + net/netfilter/nft_reject_inet.c | 6 +- + net/netfilter/nft_set_rbtree.c | 31 +- + net/netfilter/xt_limit.c | 11 +- + net/rds/ib_cm.c | 5 +- + net/rds/ib_fmr.c | 38 +- + net/rds/ib_mr.h | 2 - + net/sched/act_ife.c | 4 +- + net/sched/sch_api.c | 42 +- + net/sched/sch_cbq.c | 5 + + net/sched/sch_drr.c | 2 + + net/sched/sch_dsmark.c | 2 + + net/sched/sch_fq_codel.c | 2 - + net/sched/sch_generic.c | 2 +- + net/sched/sch_hfsc.c | 4 + + net/sched/sch_htb.c | 2 + + net/sched/sch_mq.c | 2 +- + net/sched/sch_mqprio.c | 41 +- + net/sched/sch_multiq.c | 2 + + net/sched/sch_netem.c | 26 +- + net/sched/sch_prio.c | 5 +- + net/sched/sch_qfq.c | 2 + + net/sched/sch_red.c | 2 + + net/sched/sch_sfb.c | 2 + + net/sched/sch_tbf.c | 2 + + net/sctp/sm_statefuns.c | 15 +- + net/sctp/socket.c | 81 + + net/sctp/stream.c | 396 ++- + net/sctp/sysctl.c | 7 + + net/sctp/ulpevent.c | 56 + + samples/bpf/map_perf_test_kern.c | 33 + + samples/bpf/map_perf_test_user.c | 32 + + tools/hv/bondvf.sh | 18 + + 441 files changed, 28966 insertions(+), 10169 deletions(-) + delete mode 100644 drivers/infiniband/hw/qedr/qedr_hsi.h + create mode 100644 drivers/net/dsa/mv88e6xxx/global1_atu.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/Kconfig + create mode 100644 drivers/net/ethernet/apm/xgene-v2/Makefile + create mode 100644 drivers/net/ethernet/apm/xgene-v2/enet.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/enet.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/mac.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/mac.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/main.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/main.h + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ring.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ring.h + create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_client.c + create mode 100644 drivers/net/ethernet/intel/i40evf/i40evf_client.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h + create mode 100644 drivers/net/ethernet/synopsys/Kconfig + create mode 100644 drivers/net/ethernet/synopsys/Makefile + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-common.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-net.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h + create mode 100644 drivers/net/ethernet/synopsys/dwc-xlgmac.h + create mode 100644 drivers/scsi/qedf/drv_fcoe_fw_funcs.c + create mode 100644 drivers/scsi/qedf/drv_fcoe_fw_funcs.h + create mode 100644 drivers/scsi/qedf/drv_scsi_fw_funcs.c + create mode 100644 drivers/scsi/qedf/drv_scsi_fw_funcs.h + create mode 100644 drivers/scsi/qedi/qedi_fw_api.c + create mode 100644 drivers/scsi/qedi/qedi_fw_iscsi.h + create mode 100644 drivers/scsi/qedi/qedi_fw_scsi.h + create mode 100644 net/ipv4/fib_notifier.c +Merging jfs/jfs-next (684666e51585 jfs: atomically read inode size) +$ git merge jfs/jfs-next +Auto-merging fs/jfs/super.c +Merge made by the 'recursive' strategy. + fs/jfs/resize.c | 4 ++-- + fs/jfs/super.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging nfs/linux-next (97da3854c526 Linux 4.11-rc3) +$ git merge nfs/linux-next +Already up-to-date. +Merging nfsd/nfsd-next (ed2a44f6407c lockd: fix lockd shutdown race) +$ git merge nfsd/nfsd-next +Merge made by the 'recursive' strategy. + fs/lockd/svc.c | 6 ++++-- + fs/nfsd/nfs4state.c | 25 +++++++------------------ + fs/nfsd/vfs.c | 24 ++++++++++++++++++++---- + include/uapi/linux/nfsd/cld.h | 14 ++++++++------ + 4 files changed, 39 insertions(+), 30 deletions(-) +Merging orangefs/for-next (e98bdb3059cb Merge tag 'v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into for-next) +$ git merge orangefs/for-next +Already up-to-date. +Merging overlayfs/overlayfs-next (b1eaa950f7e9 ovl: lockdep annotate of nested stacked overlayfs inode lock) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/inode.c | 37 +++++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) +Merging v9fs/for-next (a333e4bf2556 fs/9p: use fscache mutex rather than spinlock) +$ git merge v9fs/for-next +Already up-to-date. +Merging ubifs/linux-next (1cb51a15b576 ubifs: Fix journal replay wrt. xattr nodes) +$ git merge ubifs/linux-next +Already up-to-date. +Merging xfs/for-next (0cbf8c9f4fe6 xfs: report realtime space information via the rtbitmap) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/Makefile | 1 + + fs/xfs/libxfs/xfs_alloc.c | 57 +++ + fs/xfs/libxfs/xfs_alloc.h | 12 + + fs/xfs/libxfs/xfs_alloc_btree.c | 172 ++++++-- + fs/xfs/libxfs/xfs_bmap.h | 12 + + fs/xfs/libxfs/xfs_bmap_btree.h | 1 - + fs/xfs/libxfs/xfs_btree.c | 15 + + fs/xfs/libxfs/xfs_btree.h | 2 + + fs/xfs/libxfs/xfs_dir2_priv.h | 3 +- + fs/xfs/libxfs/xfs_dir2_sf.c | 63 ++- + fs/xfs/libxfs/xfs_fs.h | 13 + + fs/xfs/libxfs/xfs_inode_buf.c | 2 +- + fs/xfs/libxfs/xfs_inode_fork.c | 35 +- + fs/xfs/libxfs/xfs_inode_fork.h | 2 +- + fs/xfs/libxfs/xfs_rmap.c | 56 ++- + fs/xfs/libxfs/xfs_rmap.h | 4 + + fs/xfs/libxfs/xfs_rtbitmap.c | 70 +++ + fs/xfs/xfs_aops.c | 8 +- + fs/xfs/xfs_bmap_util.c | 7 +- + fs/xfs/xfs_buf.h | 1 - + fs/xfs/xfs_fsmap.c | 940 ++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_fsmap.h | 53 +++ + fs/xfs/xfs_inode.c | 19 +- + fs/xfs/xfs_ioctl.c | 84 ++++ + fs/xfs/xfs_ioctl32.c | 2 + + fs/xfs/xfs_iomap.c | 4 +- + fs/xfs/xfs_log.c | 16 +- + fs/xfs/xfs_mount.h | 1 + + fs/xfs/xfs_reflink.c | 21 +- + fs/xfs/xfs_rtalloc.h | 22 +- + fs/xfs/xfs_super.c | 8 + + fs/xfs/xfs_trace.c | 1 + + fs/xfs/xfs_trace.h | 84 ++++ + fs/xfs/xfs_trans.c | 22 + + fs/xfs/xfs_trans.h | 2 + + include/uapi/linux/fsmap.h | 112 +++++ + 36 files changed, 1785 insertions(+), 142 deletions(-) + create mode 100644 fs/xfs/xfs_fsmap.c + create mode 100644 fs/xfs/xfs_fsmap.h + create mode 100644 include/uapi/linux/fsmap.h +Merging file-locks/linux-next (07d9a380680d Linux 4.9-rc2) +$ git merge file-locks/linux-next +Already up-to-date. +Merging vfs/for-next (9e9c5ba8bd70 Merge branch 'work.statx' into for-next) +$ git merge vfs/for-next +Resolved 'drivers/block/nbd.c' using previous resolution. +Resolved 'fs/f2fs/f2fs.h' using previous resolution. +Resolved 'fs/proc/base.c' using previous resolution. +Resolved 'samples/Kconfig' using previous resolution. +Auto-merging samples/Kconfig +CONFLICT (content): Merge conflict in samples/Kconfig +Auto-merging net/unix/af_unix.c +Auto-merging net/socket.c +Auto-merging net/kcm/kcmsock.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/core/skbuff.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/relay.c +Auto-merging include/net/tcp.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/net.h +Auto-merging include/linux/fs.h +Auto-merging fs/splice.c +Auto-merging fs/proc/base.c +CONFLICT (content): Merge conflict in fs/proc/base.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging drivers/block/nbd.c +CONFLICT (content): Merge conflict in drivers/block/nbd.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master aeddf5e0610a] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. + fs/splice.c | 22 ++++++---- + fs/xattr.c | 20 +++++---- + include/linux/fs.h | 1 + + include/linux/net.h | 2 +- + include/linux/skbuff.h | 3 +- + include/linux/splice.h | 4 +- + include/net/tcp.h | 2 +- + kernel/relay.c | 1 - + kernel/trace/trace.c | 2 - + net/core/skbuff.c | 4 +- + net/ipv4/tcp.c | 7 ++- + net/kcm/kcmsock.c | 5 ++- + net/socket.c | 4 +- + net/unix/af_unix.c | 113 +++++-------------------------------------------- + 14 files changed, 51 insertions(+), 139 deletions(-) +$ git am -3 ../patches/0001-smc-merge-fix-for-switch-socket-splice_read-to-struc.patch +Applying: smc: merge fix for "switch socket ->splice_read() to struct file *" +$ git reset HEAD^ +Unstaged changes after reset: +M net/smc/af_smc.c +$ git add -A . +$ git commit -v -a --amend +[master ca7caf8daffd] Merge remote-tracking branch 'vfs/for-next' + Date: Mon Apr 3 11:08:58 2017 +1000 +Merging vfs-jk/vfs (030b533c4fd4 fs: Avoid premature clearing of capabilities) +$ git merge vfs-jk/vfs +Already up-to-date. +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 (64ca752dcbc0 printk: use console_trylock() in console_cpu_notify()) +$ git merge printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'recursive' strategy. + kernel/printk/printk.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) +Merging pci/next (d7566c5014b8 Merge branch 'pci/host-mvebu' into next) +$ git merge pci/next +Auto-merging MAINTAINERS +Auto-merging Documentation/ioctl/ioctl-number.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-switchtec | 96 ++ + .../devicetree/bindings/pci/faraday,ftpci100.txt | 129 ++ + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/switchtec.txt | 80 + + MAINTAINERS | 11 + + drivers/of/of_pci.c | 45 - + drivers/pci/Kconfig | 1 + + drivers/pci/Makefile | 1 + + drivers/pci/access.c | 56 + + drivers/pci/host/Kconfig | 6 + + drivers/pci/host/Makefile | 1 + + drivers/pci/host/pci-aardvark.c | 173 +-- + drivers/pci/host/pci-ftpci100.c | 562 +++++++ + drivers/pci/host/pci-hyperv.c | 24 +- + drivers/pci/host/pci-mvebu.c | 22 +- + drivers/pci/hotplug/pciehp_pci.c | 6 + + drivers/pci/msi.c | 17 +- + drivers/pci/pci-driver.c | 2 - + drivers/pci/pci.c | 8 +- + drivers/pci/pci.h | 14 + + drivers/pci/pcie/pcie-dpc.c | 5 + + drivers/pci/switch/Kconfig | 13 + + drivers/pci/switch/Makefile | 1 + + drivers/pci/switch/switchtec.c | 1600 ++++++++++++++++++++ + include/linux/of_pci.h | 11 - + include/linux/pci.h | 38 +- + include/uapi/linux/switchtec_ioctl.h | 132 ++ + 27 files changed, 2832 insertions(+), 223 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-switchtec + create mode 100644 Documentation/devicetree/bindings/pci/faraday,ftpci100.txt + create mode 100644 Documentation/switchtec.txt + create mode 100644 drivers/pci/host/pci-ftpci100.c + create mode 100644 drivers/pci/switch/Kconfig + create mode 100644 drivers/pci/switch/Makefile + create mode 100644 drivers/pci/switch/switchtec.c + create mode 100644 include/uapi/linux/switchtec_ioctl.h +Merging pstore/for-next/pstore (eec50d76a6ee pstore: Drop needless inode lock during population) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + arch/powerpc/kernel/nvram_64.c | 88 +++++------- + drivers/acpi/apei/erst.c | 64 ++++----- + drivers/firmware/efi/efi-pstore.c | 148 ++++++++----------- + fs/pstore/ftrace.c | 11 +- + fs/pstore/inode.c | 122 ++++++++-------- + fs/pstore/internal.h | 5 +- + fs/pstore/platform.c | 289 ++++++++++++++++++++++---------------- + fs/pstore/pmsg.c | 11 +- + fs/pstore/ram.c | 130 ++++++++--------- + fs/pstore/ram_core.c | 2 +- + include/linux/pstore.h | 156 ++++++++++++++++---- + 11 files changed, 573 insertions(+), 453 deletions(-) +Merging hid/for-next (7a10d0cf0121 Merge branches 'for-4.12/wacom' and 'for-4.11/upstream-fixes' into for-next) +$ git merge hid/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 ++ + drivers/hid/Kconfig | 9 ++-- + drivers/hid/hid-asus.c | 67 +++++++++++++++++++++++-- + drivers/hid/hid-core.c | 6 ++- + drivers/hid/hid-debug.c | 2 + + drivers/hid/hid-ids.h | 6 ++- + drivers/hid/usbhid/hid-core.c | 34 ++++++++----- + drivers/hid/usbhid/hid-quirks.c | 11 ++-- + drivers/hid/wacom.h | 5 ++ + drivers/hid/wacom_sys.c | 53 ++++++++++++++++++- + drivers/hid/wacom_wac.c | 49 ++++++++++++++++-- + drivers/hid/wacom_wac.h | 9 ++++ + include/linux/hid.h | 2 + + include/uapi/linux/input-event-codes.h | 1 + + 14 files changed, 222 insertions(+), 35 deletions(-) +Merging i2c/i2c/for-next (aab817ebee6f Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/i2c-meson.txt | 2 + + Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 1 + + arch/x86/include/asm/iosf_mbi.h | 87 +++++++++++++ + arch/x86/platform/intel/iosf_mbi.c | 49 ++++++++ + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/i915_drv.c | 6 +- + drivers/gpu/drm/i915/i915_drv.h | 7 +- + drivers/gpu/drm/i915/intel_uncore.c | 53 +++++++- + drivers/i2c/busses/Kconfig | 3 +- + drivers/i2c/busses/i2c-designware-baytrail.c | 85 +++++++++---- + drivers/i2c/busses/i2c-designware-core.c | 25 ++-- + drivers/i2c/busses/i2c-designware-core.h | 17 ++- + drivers/i2c/busses/i2c-designware-pcidrv.c | 26 ++-- + drivers/i2c/busses/i2c-designware-platdrv.c | 33 +++-- + drivers/i2c/busses/i2c-meson.c | 134 ++++++++------------- + drivers/i2c/busses/i2c-mv64xxx.c | 15 +-- + drivers/i2c/busses/i2c-thunderx-pcidrv.c | 24 ++-- + drivers/i2c/busses/i2c-xlp9xx.c | 1 + + 18 files changed, 399 insertions(+), 170 deletions(-) +Merging jdelvare-hwmon/master (08d27eb20666 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge jdelvare-hwmon/master +Already up-to-date. +Merging dmi/master (0c744ea4f77d Linux 4.10-rc2) +$ git merge dmi/master +Already up-to-date. +Merging hwmon-staging/hwmon-next (67043d1853d6 hwmon: (lm87) Allow channel data to be set from dts file) +$ git merge hwmon-staging/hwmon-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/ads7828.txt | 25 ++++++ + Documentation/devicetree/bindings/hwmon/lm87.txt | 30 +++++++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/hwmon/tc654 | 2 +- + drivers/hwmon/ad7414.c | 7 ++ + drivers/hwmon/adc128d818.c | 7 ++ + drivers/hwmon/ads1015.c | 22 ++++- + drivers/hwmon/ads7828.c | 39 +++++++- + drivers/hwmon/adt7475.c | 31 ++++++- + drivers/hwmon/dell-smm-hwmon.c | 7 ++ + drivers/hwmon/hwmon.c | 2 +- + drivers/hwmon/ina209.c | 7 ++ + drivers/hwmon/ina2xx.c | 35 +++++++- + drivers/hwmon/lm63.c | 23 +++++ + drivers/hwmon/lm75.c | 98 +++++++++++++++++++- + drivers/hwmon/lm85.c | 56 +++++++++++- + drivers/hwmon/lm87.c | 23 ++++- + drivers/hwmon/lm90.c | 100 ++++++++++++++++++++- + drivers/hwmon/lm95245.c | 8 ++ + drivers/hwmon/max6697.c | 52 ++++++++++- + drivers/hwmon/pmbus/adm1275.c | 4 +- + drivers/hwmon/pmbus/ucd9000.c | 39 +++++++- + drivers/hwmon/pmbus/ucd9200.c | 48 +++++++++- + drivers/hwmon/stts751.c | 7 ++ + drivers/hwmon/tmp102.c | 7 ++ + drivers/hwmon/tmp103.c | 7 ++ + drivers/hwmon/tmp421.c | 35 +++++++- + drivers/hwmon/w83627ehf.c | 35 +++++--- + include/linux/hwmon.h | 2 +- + 29 files changed, 729 insertions(+), 30 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/ads7828.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/lm87.txt +Merging jc_docs/docs-next (0e056eb5530d kernel-api.rst: fix a series of errors when parsing C files) +$ git merge jc_docs/docs-next +Auto-merging mm/vmalloc.c +Auto-merging mm/page_alloc.c +Auto-merging block/genhd.c +Auto-merging Makefile +Removing Documentation/cpu-freq/user-guide.txt +Removing Documentation/cpu-freq/governors.txt +Removing Documentation/cpu-freq/boost.txt +Removing Documentation/DocBook/kernel-api.tmpl +Removing Documentation/DocBook/genericirq.tmpl +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/vdso | 3 +- + Documentation/ABI/testing/sysfs-bus-pci | 2 +- + Documentation/DocBook/Makefile | 4 +- + Documentation/DocBook/genericirq.tmpl | 520 --------------- + Documentation/DocBook/kernel-api.tmpl | 331 ---------- + Documentation/PCI/pci-error-recovery.txt | 12 +- + Documentation/acpi/aml-debugger.txt | 2 +- + Documentation/acpi/enumeration.txt | 6 +- + Documentation/acpi/linuxized-acpica.txt | 6 +- + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/kernel-parameters.rst | 2 +- + Documentation/admin-guide/pm/cpufreq.rst | 700 +++++++++++++++++++++ + Documentation/admin-guide/pm/index.rst | 15 + + Documentation/admin-guide/ras.rst | 12 +- + Documentation/admin-guide/security-bugs.rst | 39 +- + Documentation/admin-guide/sysrq.rst | 3 +- + Documentation/conf.py | 6 +- + Documentation/core-api/flexible-arrays.rst | 130 ++++ + Documentation/core-api/genericirq.rst | 440 +++++++++++++ + Documentation/core-api/index.rst | 3 + + Documentation/core-api/kernel-api.rst | 346 ++++++++++ + Documentation/cpu-freq/boost.txt | 93 --- + Documentation/cpu-freq/cpu-drivers.txt | 2 +- + Documentation/cpu-freq/governors.txt | 301 --------- + Documentation/cpu-freq/index.txt | 7 - + Documentation/cpu-freq/user-guide.txt | 228 ------- + Documentation/device-mapper/cache.txt | 2 +- + Documentation/doc-guide/hello.dot | 3 + + Documentation/doc-guide/sphinx.rst | 115 +++- + Documentation/doc-guide/svg_image.svg | 10 + + Documentation/driver-api/firmware/index.rst | 1 + + .../driver-api/firmware/other_interfaces.rst | 15 + + Documentation/driver-api/index.rst | 2 + + Documentation/driver-api/misc_devices.rst | 5 + + Documentation/driver-api/pci.rst | 50 ++ + Documentation/early-userspace/README | 2 +- + Documentation/filesystems/ext4.txt | 2 +- + Documentation/filesystems/nfs/nfs-rdma.txt | 4 +- + Documentation/hid/hidraw.txt | 2 +- + Documentation/input/ff.txt | 6 +- + Documentation/input/input-programming.txt | 4 +- + Documentation/leds/leds-lp55xx.txt | 2 +- + Documentation/md/md-cluster.txt | 2 +- + Documentation/media/Makefile | 47 +- + Documentation/media/intro.rst | 6 +- + Documentation/media/uapi/dvb/intro.rst | 6 +- + Documentation/media/uapi/v4l/crop.rst | 4 +- + Documentation/media/uapi/v4l/dev-raw-vbi.rst | 22 +- + Documentation/media/uapi/v4l/dev-subdev.rst | 22 +- + Documentation/media/uapi/v4l/field-order.rst | 11 +- + Documentation/media/uapi/v4l/pixfmt-nv12mt.rst | 8 +- + Documentation/media/uapi/v4l/selection-api-003.rst | 6 +- + Documentation/media/uapi/v4l/subdev-formats.rst | 4 +- + Documentation/mmc/mmc-dev-attrs.txt | 4 +- + Documentation/networking/e100.txt | 2 +- + Documentation/networking/e1000.txt | 2 +- + Documentation/networking/e1000e.txt | 2 +- + Documentation/networking/igb.txt | 2 +- + Documentation/networking/igbvf.txt | 2 +- + Documentation/networking/ixgb.txt | 2 +- + Documentation/networking/ixgbe.txt | 2 +- + Documentation/phy.txt | 2 +- + Documentation/process/applying-patches.rst | 12 +- + Documentation/process/changes.rst | 17 +- + Documentation/sphinx/cdomain.py | 2 +- + Documentation/sphinx/kfigure.py | 551 ++++++++++++++++ + Documentation/sync_file.txt | 2 +- + Documentation/translations/zh_CN/sparse.txt | 4 +- + Documentation/vfio-mediated-device.txt | 2 +- + Makefile | 4 +- + block/genhd.c | 7 +- + drivers/pci/irq.c | 2 +- + include/linux/clk.h | 4 +- + include/linux/flex_array.h | 67 ++ + ipc/util.c | 12 +- + lib/Kconfig.debug | 9 +- + lib/bitmap.c | 28 +- + lib/string.c | 2 +- + lib/vsprintf.c | 6 +- + mm/filemap.c | 18 +- + mm/page_alloc.c | 3 +- + mm/vmalloc.c | 2 +- + scripts/kernel-doc | 19 +- + security/security.c | 12 +- + 84 files changed, 2678 insertions(+), 1704 deletions(-) + delete mode 100644 Documentation/DocBook/genericirq.tmpl + delete mode 100644 Documentation/DocBook/kernel-api.tmpl + create mode 100644 Documentation/admin-guide/pm/cpufreq.rst + create mode 100644 Documentation/admin-guide/pm/index.rst + create mode 100644 Documentation/core-api/flexible-arrays.rst + create mode 100644 Documentation/core-api/genericirq.rst + create mode 100644 Documentation/core-api/kernel-api.rst + delete mode 100644 Documentation/cpu-freq/boost.txt + delete mode 100644 Documentation/cpu-freq/governors.txt + delete mode 100644 Documentation/cpu-freq/user-guide.txt + create mode 100644 Documentation/doc-guide/hello.dot + create mode 100644 Documentation/doc-guide/svg_image.svg + create mode 100644 Documentation/driver-api/firmware/other_interfaces.rst + create mode 100644 Documentation/driver-api/misc_devices.rst + create mode 100644 Documentation/driver-api/pci.rst + create mode 100644 Documentation/sphinx/kfigure.py +Merging v4l-dvb/master (c3d4fb0fb41f [media] rc: sunxi-cir: simplify optional reset handling) +$ git merge v4l-dvb/master +Auto-merging drivers/media/rc/serial_ir.c +Auto-merging drivers/media/rc/rc-main.c +Auto-merging drivers/media/rc/lirc_dev.c +Removing drivers/media/rc/keymaps/rc-lirc.c +Auto-merging drivers/media/platform/exynos-gsc/gsc-core.c +Auto-merging arch/arm/mach-davinci/board-da850-evm.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/media/mediatek-jpeg-decoder.txt | 37 + + .../devicetree/bindings/media/ti,da850-vpif.txt | 50 +- + Documentation/media/kapi/cec-core.rst | 7 +- + Documentation/media/lirc.h.rst.exceptions | 1 - + Documentation/media/uapi/cec/cec-func-ioctl.rst | 2 +- + Documentation/media/uapi/cec/cec-func-open.rst | 2 +- + Documentation/media/uapi/cec/cec-func-poll.rst | 4 +- + .../media/uapi/cec/cec-ioc-adap-g-log-addrs.rst | 13 + + .../media/uapi/cec/cec-ioc-adap-g-phys-addr.rst | 13 + + Documentation/media/uapi/cec/cec-ioc-dqevent.rst | 13 +- + Documentation/media/uapi/cec/cec-ioc-g-mode.rst | 12 + + Documentation/media/uapi/cec/cec-ioc-receive.rst | 55 +- + Documentation/media/uapi/mediactl/media-types.rst | 3 +- + Documentation/media/uapi/rc/lirc-dev-intro.rst | 53 +- + Documentation/media/uapi/rc/lirc-get-features.rst | 13 +- + Documentation/media/uapi/rc/lirc-get-length.rst | 3 +- + Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 4 +- + Documentation/media/uapi/rc/lirc-get-send-mode.rst | 7 +- + Documentation/media/uapi/rc/lirc-read.rst | 16 +- + .../media/uapi/rc/lirc-set-rec-carrier-range.rst | 2 +- + .../media/uapi/rc/lirc-set-rec-timeout-reports.rst | 2 + + Documentation/media/uapi/rc/lirc-write.rst | 17 +- + Documentation/media/uapi/v4l/pixfmt-007.rst | 13 +- + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 16 +- + Documentation/media/v4l-drivers/vivid.rst | 8 + + MAINTAINERS | 7 + + arch/arm/mach-davinci/board-da850-evm.c | 1 + + drivers/media/cec/cec-adap.c | 137 +- + drivers/media/cec/cec-api.c | 21 +- + drivers/media/common/tveeprom.c | 4 +- + drivers/media/dvb-frontends/si2168.c | 4 + + drivers/media/dvb-frontends/si2168_priv.h | 2 + + drivers/media/i2c/ad5820.c | 4 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 + + drivers/media/i2c/soc_camera/imx074.c | 6 +- + drivers/media/i2c/soc_camera/mt9m001.c | 6 +- + drivers/media/i2c/soc_camera/mt9t031.c | 6 +- + drivers/media/i2c/soc_camera/mt9t112.c | 6 +- + drivers/media/i2c/soc_camera/mt9v022.c | 6 +- + drivers/media/i2c/soc_camera/ov2640.c | 6 +- + drivers/media/i2c/soc_camera/ov5642.c | 15 +- + drivers/media/i2c/soc_camera/ov6650.c | 8 +- + drivers/media/i2c/soc_camera/ov772x.c | 6 +- + drivers/media/i2c/soc_camera/ov9640.c | 6 +- + drivers/media/i2c/soc_camera/ov9740.c | 6 +- + drivers/media/i2c/soc_camera/rj54n1cb0c.c | 6 +- + drivers/media/i2c/soc_camera/tw9910.c | 6 +- + drivers/media/i2c/tc358743.c | 50 +- + drivers/media/pci/bt8xx/bttv-cards.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 3 +- + drivers/media/pci/cx88/cx88-cards.c | 2 +- + drivers/media/pci/ivtv/ivtv-driver.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 4 +- + drivers/media/pci/saa7134/saa7134-cards.c | 2 +- + drivers/media/pci/saa7164/saa7164-cards.c | 4 +- + drivers/media/pci/solo6x10/solo6x10-v4l2-enc.c | 5 +- + drivers/media/pci/solo6x10/solo6x10-v4l2.c | 11 + + drivers/media/pci/tw5864/tw5864-video.c | 11 +- + drivers/media/platform/Kconfig | 17 +- + drivers/media/platform/Makefile | 2 + + drivers/media/platform/atmel/atmel-isc-regs.h | 102 +- + drivers/media/platform/atmel/atmel-isc.c | 627 ++++++++-- + drivers/media/platform/coda/coda-bit.c | 100 +- + drivers/media/platform/coda/coda-common.c | 124 +- + drivers/media/platform/coda/coda-h264.c | 87 +- + drivers/media/platform/coda/coda.h | 8 +- + drivers/media/platform/coda/coda_regs.h | 1 + + drivers/media/platform/davinci/vpif_display.c | 2 +- + drivers/media/platform/exynos-gsc/gsc-core.c | 27 + + drivers/media/platform/mtk-jpeg/Makefile | 2 + + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c | 1306 ++++++++++++++++++++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h | 139 +++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c | 417 +++++++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h | 91 ++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.c | 160 +++ + drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.h | 25 + + drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h | 58 + + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 33 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 2 + + .../media/platform/mtk-vcodec/mtk_vcodec_enc_drv.c | 5 - + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 26 + + drivers/media/platform/mtk-vcodec/vdec_drv_if.h | 2 + + drivers/media/platform/soc_camera/Kconfig | 1 - + .../platform/soc_camera/sh_mobile_ceu_camera.c | 13 +- + drivers/media/platform/soc_camera/soc_camera.c | 103 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 11 +- + drivers/media/platform/ti-vpe/vpdma.c | 14 +- + drivers/media/platform/ti-vpe/vpdma.h | 6 +- + drivers/media/platform/ti-vpe/vpe.c | 34 +- + drivers/media/platform/vivid/Kconfig | 2 + + drivers/media/platform/vivid/vivid-core.c | 32 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 13 +- + drivers/media/platform/vivid/vivid-vid-out.c | 26 +- + drivers/media/radio/si4713/si4713.c | 9 + + drivers/media/rc/gpio-ir-recv.c | 2 +- + drivers/media/rc/igorplugusb.c | 2 +- + drivers/media/rc/ir-lirc-codec.c | 34 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 49 +- + drivers/media/rc/keymaps/Makefile | 1 - + drivers/media/rc/keymaps/rc-dvico-mce.c | 92 +- + drivers/media/rc/keymaps/rc-dvico-portable.c | 74 +- + drivers/media/rc/keymaps/rc-lirc.c | 42 - + drivers/media/rc/lirc_dev.c | 122 +- + drivers/media/rc/mceusb.c | 4 +- + drivers/media/rc/rc-core-priv.h | 2 +- + drivers/media/rc/rc-ir-raw.c | 6 +- + drivers/media/rc/rc-main.c | 8 +- + drivers/media/rc/serial_ir.c | 4 +- + drivers/media/rc/st_rc.c | 15 +- + drivers/media/rc/sunxi-cir.c | 21 +- + drivers/media/rc/winbond-cir.c | 4 +- + drivers/media/tuners/si2157.c | 70 +- + drivers/media/tuners/si2157_priv.h | 2 + + drivers/media/usb/au0828/au0828-cards.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 3 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 16 +- + drivers/media/usb/dvb-usb-v2/mxl111sf.c | 16 +- + drivers/media/usb/dvb-usb/cxusb.c | 163 ++- + drivers/media/usb/em28xx/em28xx-camera.c | 42 +- + drivers/media/usb/em28xx/em28xx-cards.c | 3 +- + drivers/media/usb/go7007/go7007-v4l2.c | 5 +- + drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 13 +- + drivers/media/v4l2-core/v4l2-device.c | 3 + + drivers/media/v4l2-core/videobuf2-core.c | 14 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 16 +- + drivers/staging/media/lirc/lirc_sasem.c | 2 +- + drivers/staging/media/lirc/lirc_sir.c | 8 +- + drivers/staging/media/omap4iss/iss_video.c | 41 +- + include/media/davinci/vpif_types.h | 1 + + include/media/rc-map.h | 79 +- + include/media/soc_camera.h | 14 +- + include/media/tveeprom.h | 2 +- + include/uapi/linux/cec.h | 2 +- + include/uapi/linux/videodev2.h | 3 +- + 135 files changed, 4451 insertions(+), 912 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt + create mode 100644 drivers/media/platform/mtk-jpeg/Makefile + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_core.h + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_hw.h + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.c + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_parse.h + create mode 100644 drivers/media/platform/mtk-jpeg/mtk_jpeg_reg.h + delete mode 100644 drivers/media/rc/keymaps/rc-lirc.c +Merging v4l-dvb-next/master (432ac2d4acef Merge branch 'v4l_for_linus' into to_next) +$ git merge v4l-dvb-next/master +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging fbdev/fbdev-for-next (6f9655b1b81f drivers/video: Convert remaining uses of pr_warning to pr_warn) +$ git merge fbdev/fbdev-for-next +Merge made by the 'recursive' strategy. + drivers/video/fbdev/aty/radeon_base.c | 4 ++-- + drivers/video/fbdev/core/fbmon.c | 4 ++-- + drivers/video/fbdev/i810/i810_main.c | 6 +++--- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 16 +++++++++++----- + drivers/video/fbdev/pmag-aa-fb.c | 4 ++-- + drivers/video/fbdev/pmag-ba-fb.c | 4 ++-- + drivers/video/fbdev/pmagb-b-fb.c | 4 ++-- + drivers/video/fbdev/pxafb.c | 7 +++---- + drivers/video/logo/logo.c | 2 +- + 9 files changed, 28 insertions(+), 23 deletions(-) +Merging pm/linux-next (d80f9e89239b Merge branches 'acpi-hotplug-fixes', 'acpi-build-fixes' and 'acpi-apei-fixes' into linux-next) +$ git merge pm/linux-next +Removing drivers/thermal/db8500_cpufreq_cooling.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/power/rockchip-io-domain.txt | 1 + + MAINTAINERS | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 5 - + drivers/cpufreq/dbx500-cpufreq.c | 20 ++ + drivers/cpufreq/intel_pstate.c | 287 ++++++++++----------- + drivers/cpufreq/mt8173-cpufreq.c | 23 +- + drivers/cpufreq/qoriq-cpufreq.c | 24 +- + drivers/power/avs/rockchip-io-domain.c | 41 +++ + drivers/thermal/Kconfig | 12 - + drivers/thermal/Makefile | 1 - + drivers/thermal/db8500_cpufreq_cooling.c | 105 -------- + include/linux/tick.h | 1 + + kernel/sched/cpufreq_schedutil.c | 64 +++-- + kernel/time/tick-sched.c | 12 + + 14 files changed, 296 insertions(+), 301 deletions(-) + delete mode 100644 drivers/thermal/db8500_cpufreq_cooling.c +Merging idle/next (306899f94804 x86 tsc: Add the Intel Denverton Processor to native_calibrate_tsc()) +$ git merge idle/next +Merge made by the 'recursive' strategy. +Merging thermal/next (f7b553c688c3 Merge branches 'for-rc' and 'thermal-core' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + drivers/thermal/devfreq_cooling.c | 123 ++++++++++++++++++++++++++------------ + include/linux/devfreq_cooling.h | 17 ++++++ + include/trace/events/thermal.h | 11 ++-- + 3 files changed, 110 insertions(+), 41 deletions(-) +Merging thermal-soc/next (c64d1b57043e Merge branch 'work-linus' into work-next) +$ git merge thermal-soc/next +Auto-merging drivers/thermal/Makefile +Auto-merging drivers/thermal/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/thermal/brcm,bcm2835-thermal.txt | 32 ++- + drivers/thermal/Kconfig | 8 + + drivers/thermal/Makefile | 1 + + drivers/thermal/bcm2835_thermal.c | 314 +++++++++++++++++++++ + drivers/thermal/rcar_gen3_thermal.c | 199 ++++++++++++- + .../thermal/ti-soc-thermal/dra752-thermal-data.c | 10 - + .../thermal/ti-soc-thermal/omap3-thermal-data.c | 4 - + .../thermal/ti-soc-thermal/omap4-thermal-data.c | 6 - + .../thermal/ti-soc-thermal/omap5-thermal-data.c | 4 - + drivers/thermal/ti-soc-thermal/ti-bandgap.h | 4 - + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 158 +---------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 16 -- + 12 files changed, 540 insertions(+), 216 deletions(-) + create mode 100644 drivers/thermal/bcm2835_thermal.c +Merging ieee1394/for-next (72f3c27aa646 firewire: net: max MTU off by one) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/net.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging dlm/next (c0ae14857677 dlm: Fix kernel memory disclosure) +$ git merge dlm/next +Auto-merging fs/dlm/user.c +Merge made by the 'recursive' strategy. + fs/dlm/user.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging swiotlb/linux-next (69369f52d28a swiotlb-xen: implement xen_swiotlb_get_sgtable callback) +$ git merge swiotlb/linux-next +Already up-to-date. +Merging net-next/master (88f913f5ee89 Merge branch 'phylib-EEE-updates') +$ git merge net-next/master +Recorded preimage for 'tools/testing/selftests/bpf/Makefile' +Recorded preimage for 'tools/testing/selftests/bpf/test_verifier.c' +Auto-merging tools/testing/selftests/bpf/test_verifier.c +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/test_verifier.c +Auto-merging tools/testing/selftests/bpf/Makefile +CONFLICT (content): Merge conflict in tools/testing/selftests/bpf/Makefile +Auto-merging net/sctp/socket.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/ipconfig.c +Auto-merging net/core/neighbour.c +Auto-merging kernel/bpf/verifier.c +Auto-merging include/net/tcp.h +Removing include/linux/soc/qcom/smd.h +Auto-merging fs/cifs/connect.c +Removing drivers/soc/qcom/smd.c +Auto-merging drivers/net/phy/phy.c +Auto-merging drivers/net/phy/mdio-boardinfo.c +Auto-merging drivers/net/hyperv/netvsc.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_main.c +Auto-merging drivers/net/ethernet/ezchip/nps_enet.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'tools/testing/selftests/bpf/Makefile'. +Recorded resolution for 'tools/testing/selftests/bpf/test_verifier.c'. +[master 28156aec8cff] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-class-net-qmi | 27 + + Documentation/networking/i40e.txt | 72 + + Documentation/networking/ip-sysctl.txt | 24 +- + arch/alpha/include/uapi/asm/socket.h | 4 + + arch/avr32/include/uapi/asm/socket.h | 4 + + arch/frv/include/uapi/asm/socket.h | 4 + + arch/ia64/include/uapi/asm/socket.h | 4 + + arch/m32r/include/uapi/asm/socket.h | 4 + + arch/mips/include/uapi/asm/socket.h | 4 + + arch/mn10300/include/uapi/asm/socket.h | 4 + + arch/parisc/include/uapi/asm/socket.h | 4 + + arch/powerpc/include/uapi/asm/socket.h | 4 + + arch/s390/include/uapi/asm/socket.h | 4 + + arch/sparc/include/uapi/asm/socket.h | 4 + + arch/xtensa/include/uapi/asm/socket.h | 4 + + drivers/bluetooth/Kconfig | 2 +- + drivers/bluetooth/btqcomsmd.c | 32 +- + drivers/infiniband/hw/nes/nes.h | 1 + + drivers/isdn/divert/isdn_divert.c | 9 +- + drivers/isdn/hardware/eicon/divasi.c | 5 +- + drivers/isdn/hardware/mISDN/hfcmulti.c | 10 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 9 +- + drivers/isdn/hardware/mISDN/mISDNipac.c | 5 +- + drivers/isdn/hardware/mISDN/mISDNisar.c | 10 +- + drivers/isdn/hardware/mISDN/w6692.c | 5 +- + drivers/isdn/hisax/amd7930_fn.c | 4 +- + drivers/isdn/hisax/arcofi.c | 4 +- + drivers/isdn/hisax/diva.c | 5 +- + drivers/isdn/hisax/elsa.c | 4 +- + drivers/isdn/hisax/fsm.c | 4 +- + drivers/isdn/hisax/hfc4s8s_l1.c | 5 +- + drivers/isdn/hisax/hfc_2bds0.c | 4 +- + drivers/isdn/hisax/hfc_pci.c | 8 +- + drivers/isdn/hisax/hfc_sx.c | 8 +- + drivers/isdn/hisax/hfc_usb.c | 8 +- + drivers/isdn/hisax/hfcscard.c | 4 +- + drivers/isdn/hisax/icc.c | 4 +- + drivers/isdn/hisax/ipacx.c | 4 +- + drivers/isdn/hisax/isac.c | 4 +- + drivers/isdn/hisax/isar.c | 10 +- + drivers/isdn/hisax/isdnl3.c | 4 +- + drivers/isdn/hisax/teleint.c | 4 +- + drivers/isdn/hisax/w6692.c | 5 +- + drivers/isdn/i4l/isdn_ppp.c | 5 +- + drivers/isdn/i4l/isdn_tty.c | 5 +- + drivers/isdn/mISDN/dsp_core.c | 4 +- + drivers/isdn/mISDN/fsm.c | 4 +- + drivers/isdn/mISDN/l1oip_core.c | 4 +- + drivers/net/Makefile | 2 +- + drivers/net/bonding/bond_3ad.c | 6 +- + drivers/net/bonding/bond_main.c | 60 +- + drivers/net/cris/eth_v10.c | 32 +- + drivers/net/dsa/Kconfig | 10 +- + drivers/net/dsa/Makefile | 2 +- + drivers/net/dsa/bcm_sf2_cfp.c | 3 +- + drivers/net/dsa/dsa_loop.c | 328 ++++ + drivers/net/dsa/dsa_loop.h | 19 + + drivers/net/dsa/dsa_loop_bdinfo.c | 34 + + drivers/net/dsa/mv88e6xxx/chip.c | 399 +++-- + drivers/net/dsa/mv88e6xxx/global1.c | 3 +- + drivers/net/dsa/mv88e6xxx/global1.h | 3 +- + drivers/net/dsa/mv88e6xxx/global1_atu.c | 13 +- + drivers/net/dsa/mv88e6xxx/global2.c | 81 +- + drivers/net/dsa/mv88e6xxx/global2.h | 18 +- + drivers/net/dsa/mv88e6xxx/mv88e6xxx.h | 38 +- + drivers/net/dsa/mv88e6xxx/port.c | 3 +- + drivers/net/dsa/mv88e6xxx/port.h | 3 +- + drivers/net/ethernet/adi/bfin_mac.h | 7 - + drivers/net/ethernet/aeroflex/greth.c | 10 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-i2c.c | 1 + + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 1 + + drivers/net/ethernet/apm/xgene-v2/Makefile | 2 +- + drivers/net/ethernet/apm/xgene-v2/enet.c | 24 +- + drivers/net/ethernet/apm/xgene-v2/enet.h | 2 + + drivers/net/ethernet/apm/xgene-v2/ethtool.c | 121 ++ + drivers/net/ethernet/apm/xgene-v2/mac.c | 2 +- + drivers/net/ethernet/apm/xgene-v2/mac.h | 2 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 67 +- + drivers/net/ethernet/apm/xgene-v2/main.h | 5 + + drivers/net/ethernet/apm/xgene-v2/mdio.c | 167 ++ + drivers/net/ethernet/broadcom/bcmsysport.c | 82 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 5 + + drivers/net/ethernet/broadcom/bgmac.c | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 + + .../ethernet/cavium/liquidio/cn23xx_pf_device.h | 2 + + drivers/net/ethernet/cavium/liquidio/lio_core.c | 56 + + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 447 +++--- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 91 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 45 +- + .../net/ethernet/cavium/liquidio/liquidio_common.h | 27 +- + .../net/ethernet/cavium/liquidio/octeon_device.h | 13 +- + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 26 + + drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 2 + + .../net/ethernet/cavium/liquidio/octeon_network.h | 7 + + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 75 +- + drivers/net/ethernet/chelsio/cxgb4/t4_values.h | 4 + + drivers/net/ethernet/ezchip/nps_enet.c | 1 + + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_dtsec.c | 8 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 5 +- + drivers/net/ethernet/freescale/fman/fman_memac.h | 1 + + drivers/net/ethernet/hisilicon/hns/hnae.c | 2 +- + drivers/net/ethernet/ibm/ibmveth.h | 1 - + drivers/net/ethernet/ibm/ibmvnic.c | 1184 ++++---------- + drivers/net/ethernet/ibm/ibmvnic.h | 31 - + drivers/net/ethernet/intel/Kconfig | 11 - + drivers/net/ethernet/intel/e1000/e1000_ethtool.c | 117 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 111 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 1 + + drivers/net/ethernet/intel/i40e/Makefile | 1 - + drivers/net/ethernet/intel/i40e/i40e.h | 202 ++- + drivers/net/ethernet/intel/i40e/i40e_client.c | 2 + + drivers/net/ethernet/intel/i40e/i40e_common.c | 35 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 19 - + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 1204 ++++++++++++-- + drivers/net/ethernet/intel/i40e/i40e_main.c | 387 +---- + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 3 - + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 3 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 408 +++-- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 28 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 138 -- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 43 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 1 - + drivers/net/ethernet/intel/i40evf/i40e_common.c | 8 +- + drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 339 ++-- + drivers/net/ethernet/intel/i40evf/i40e_txrx.h | 37 +- + drivers/net/ethernet/intel/i40evf/i40evf.h | 6 +- + drivers/net/ethernet/intel/i40evf/i40evf_client.c | 9 +- + drivers/net/ethernet/intel/i40evf/i40evf_ethtool.c | 104 ++ + drivers/net/ethernet/intel/i40evf/i40evf_main.c | 16 +- + .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 18 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 138 +- + drivers/net/ethernet/intel/igbvf/ethtool.c | 38 +- + drivers/net/ethernet/intel/ixgb/ixgb_ethtool.c | 39 +- + drivers/net/ethernet/marvell/mvneta.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 421 +++-- + drivers/net/ethernet/mellanox/mlx5/core/en_arfs.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en_clock.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/en_common.c | 26 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 336 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 18 +- + .../ethernet/mellanox/mlx5/core/en_fs_ethtool.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1672 +++++++++++--------- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 83 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 146 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 473 +++++- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 156 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 73 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 5 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 28 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 67 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 1 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 223 +-- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 + + drivers/net/ethernet/mellanox/mlxsw/pci.c | 138 -- + drivers/net/ethernet/mellanox/mlxsw/port.h | 10 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 178 +++ + drivers/net/ethernet/mellanox/mlxsw/resources.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 117 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 55 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_acl.c | 17 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 187 ++- + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 9 + + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.h | 1 + + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 351 ++++ + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.h | 43 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_kvdl.c | 6 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 231 ++- + .../net/ethernet/mellanox/mlxsw/spectrum_router.h | 58 + + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 2 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 7 +- + drivers/net/ethernet/netronome/nfp/Makefile | 1 + + drivers/net/ethernet/netronome/nfp/nfp_net.h | 8 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 50 +- + .../net/ethernet/netronome/nfp/nfp_net_debugfs.c | 15 +- + drivers/net/ethernet/netronome/nfp/nfpcore/nfp.h | 9 +- + .../ethernet/netronome/nfp/nfpcore/nfp6000_pcie.c | 29 +- + .../ethernet/netronome/nfp/nfpcore/nfp_cppcore.c | 467 +----- + .../net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c | 345 ++++ + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 12 +- + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 15 +- + drivers/net/ethernet/qlogic/qed/qed.h | 33 +- + drivers/net/ethernet/qlogic/qed/qed_dcbx.h | 3 - + drivers/net/ethernet/qlogic/qed/qed_dev.c | 617 ++++---- + drivers/net/ethernet/qlogic/qed/qed_dev_api.h | 73 +- + drivers/net/ethernet/qlogic/qed/qed_fcoe.c | 30 +- + drivers/net/ethernet/qlogic/qed/qed_hsi.h | 87 +- + drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 32 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 50 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.c | 1314 ++++++++++++--- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 196 ++- + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 286 ++-- + drivers/net/ethernet/qlogic/qed/qed_sriov.h | 10 +- + drivers/net/ethernet/qlogic/qed/qed_vf.c | 18 +- + drivers/net/ethernet/qlogic/qed/qed_vf.h | 4 + + drivers/net/ethernet/qualcomm/emac/emac-sgmii.c | 1 + + drivers/net/ethernet/stmicro/stmmac/chain_mode.c | 45 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 53 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 1 + + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 1 + + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 39 +- + drivers/net/ethernet/stmicro/stmmac/ring_mode.c | 46 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 49 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1325 +++++----------- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 7 + + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 8 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-desc.c | 12 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 7 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 6 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 6 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-reg.h | 6 +- + drivers/net/ethernet/synopsys/dwc-xlgmac.h | 6 +- + drivers/net/ethernet/tehuti/tehuti.c | 43 +- + drivers/net/gtp.c | 64 +- + drivers/net/hyperv/hyperv_net.h | 12 +- + drivers/net/hyperv/netvsc.c | 70 +- + drivers/net/hyperv/netvsc_drv.c | 129 +- + drivers/net/hyperv/rndis_filter.c | 96 +- + drivers/net/ieee802154/mrf24j40.c | 1 + + drivers/net/phy/Kconfig | 62 +- + drivers/net/phy/Makefile | 17 +- + drivers/net/phy/bcm-phy-lib.c | 12 +- + drivers/net/phy/dp83867.c | 25 +- + drivers/net/phy/intel-xway.c | 26 +- + drivers/net/phy/mdio-boardinfo.c | 21 +- + drivers/net/phy/mdio-boardinfo.h | 5 +- + drivers/net/phy/mdio_bus.c | 41 +- + drivers/net/phy/micrel.c | 13 +- + drivers/net/phy/microchip.c | 5 +- + drivers/net/phy/phy-core.c | 101 ++ + drivers/net/phy/phy.c | 145 +- + drivers/net/phy/phy_device.c | 4 +- + drivers/net/phy/smsc.c | 1 + + drivers/net/usb/lan78xx.c | 11 +- + drivers/net/usb/qmi_wwan.c | 317 +++- + drivers/net/veth.c | 19 +- + drivers/net/virtio_net.c | 48 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 25 +- + drivers/net/vrf.c | 172 +- + drivers/net/vxlan.c | 8 + + drivers/net/wireless/ath/wcn36xx/Kconfig | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 6 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 10 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 6 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 + + drivers/net/wireless/st/cw1200/cw1200_sdio.c | 1 + + drivers/remoteproc/Kconfig | 6 +- + drivers/rpmsg/Kconfig | 1 - + drivers/scsi/qedf/drv_fcoe_fw_funcs.c | 6 +- + drivers/soc/qcom/Kconfig | 14 +- + drivers/soc/qcom/Makefile | 1 - + drivers/soc/qcom/smd-rpm.c | 44 +- + drivers/soc/qcom/smd.c | 1560 ------------------ + drivers/soc/qcom/wcnss_ctrl.c | 50 +- + drivers/usb/gadget/function/f_ncm.c | 1 + + fs/cifs/cifsfs.c | 1 + + fs/cifs/connect.c | 1 + + fs/cifs/smb2pdu.c | 1 + + fs/eventpoll.c | 93 ++ + fs/select.c | 16 +- + include/linux/bpf.h | 10 + + include/linux/filter.h | 3 +- + include/linux/inetdevice.h | 4 +- + include/linux/ipv6.h | 1 + + include/linux/mlx5/driver.h | 1 + + include/linux/mlx5/fs.h | 6 +- + include/linux/mlx5/mlx5_ifc.h | 113 +- + include/linux/netdevice.h | 12 +- + include/linux/of_mdio.h | 4 +- + include/linux/phy.h | 101 +- + include/linux/rpmsg/qcom_smd.h | 2 +- + include/linux/soc/qcom/smd.h | 139 -- + include/linux/soc/qcom/wcnss_ctrl.h | 11 +- + include/linux/sock_diag.h | 1 + + include/linux/stmmac.h | 4 +- + include/net/addrconf.h | 4 +- + include/net/bonding.h | 22 +- + include/net/busy_poll.h | 102 +- + include/net/devlink.h | 259 +++ + include/net/dsa.h | 22 + + include/net/ndisc.h | 2 + + include/net/neighbour.h | 3 +- + include/net/netns/ipv4.h | 2 + + include/net/protocol.h | 7 +- + include/net/sock.h | 7 +- + include/net/tc_act/tc_pedit.h | 45 + + include/net/tcp.h | 8 +- + include/net/udp.h | 1 + + include/uapi/asm-generic/socket.h | 4 + + include/uapi/linux/bpf.h | 31 +- + include/uapi/linux/devlink.h | 67 +- + include/uapi/linux/gtp.h | 3 +- + include/uapi/linux/if_link.h | 7 + + include/uapi/linux/ipv6.h | 1 + + include/uapi/linux/openvswitch.h | 15 + + include/uapi/linux/rtnetlink.h | 2 + + include/uapi/linux/sysctl.h | 1 + + kernel/bpf/Makefile | 2 +- + kernel/bpf/arraymap.c | 74 +- + kernel/bpf/hashtab.c | 121 ++ + kernel/bpf/map_in_map.c | 97 ++ + kernel/bpf/map_in_map.h | 23 + + kernel/bpf/syscall.c | 40 +- + kernel/bpf/verifier.c | 57 +- + net/Makefile | 2 +- + net/atm/clip.c | 4 +- + net/bpf/Makefile | 1 + + net/bpf/test_run.c | 172 ++ + net/bridge/br_fdb.c | 5 + + net/bridge/br_if.c | 1 + + net/core/datagram.c | 8 +- + net/core/dev.c | 41 +- + net/core/devlink.c | 836 ++++++++++ + net/core/filter.c | 61 +- + net/core/neighbour.c | 32 +- + net/core/netprio_cgroup.c | 1 + + net/core/rtnetlink.c | 1 + + net/core/sock.c | 55 +- + net/core/sock_diag.c | 12 +- + net/core/utils.c | 2 +- + net/dsa/dsa.c | 3 +- + net/dsa/dsa2.c | 50 +- + net/dsa/slave.c | 1 + + net/dsa/switch.c | 15 +- + net/dsa/tag_brcm.c | 1 + + net/dsa/tag_dsa.c | 1 + + net/dsa/tag_edsa.c | 1 + + net/dsa/tag_qca.c | 1 + + net/dsa/tag_trailer.c | 1 + + net/ipv4/af_inet.c | 8 +- + net/ipv4/arp.c | 6 +- + net/ipv4/devinet.c | 64 +- + net/ipv4/ip_input.c | 5 +- + net/ipv4/ipconfig.c | 1 + + net/ipv4/ipmr.c | 12 +- + net/ipv4/protocol.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 67 + + net/ipv4/tcp.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 - + net/ipv4/tcp_minisocks.c | 4 + + net/ipv4/tcp_output.c | 8 +- + net/ipv6/Kconfig | 1 + + net/ipv6/addrconf.c | 63 +- + net/ipv6/af_inet6.c | 8 +- + net/ipv6/ip6_input.c | 6 +- + net/ipv6/ip6mr.c | 9 +- + net/ipv6/mcast.c | 49 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/protocol.c | 2 +- + net/ipv6/seg6_iptunnel.c | 41 +- + net/ipv6/tcp_ipv6.c | 5 +- + net/ipv6/udp.c | 3 +- + net/mac802154/ieee802154_i.h | 1 + + net/mpls/af_mpls.c | 49 +- + net/openvswitch/actions.c | 271 ++-- + net/openvswitch/datapath.h | 2 - + net/openvswitch/flow_netlink.c | 141 +- + net/qrtr/Kconfig | 2 +- + net/qrtr/smd.c | 42 +- + net/sched/act_csum.c | 12 + + net/sched/cls_flow.c | 5 +- + net/sched/sch_choke.c | 51 - + net/sched/sch_sfq.c | 5 +- + net/sctp/socket.c | 9 +- + net/smc/smc_ib.h | 1 + + net/tipc/name_table.c | 2 + + net/tipc/socket.c | 28 +- + net/tipc/subscr.c | 17 +- + net/tipc/subscr.h | 3 + + net/vmw_vsock/vmci_transport.c | 22 +- + samples/bpf/Makefile | 7 + + samples/bpf/bpf_helpers.h | 1 + + samples/bpf/bpf_load.c | 22 +- + samples/bpf/cookie_uid_helper_example.c | 217 +++ + samples/bpf/libbpf.h | 10 + + samples/bpf/run_cookie_uid_helper_example.sh | 14 + + samples/bpf/test_map_in_map_kern.c | 173 ++ + samples/bpf/test_map_in_map_user.c | 116 ++ + security/selinux/nlmsgtab.c | 1 + + tools/include/uapi/linux/bpf.h | 31 +- + tools/lib/bpf/bpf.c | 41 + + tools/lib/bpf/bpf.h | 6 +- + tools/lib/bpf/libbpf.c | 3 +- + tools/lib/bpf/libbpf.h | 2 + + tools/testing/selftests/bpf/Makefile | 17 +- + tools/testing/selftests/bpf/test_iptunnel_common.h | 37 + + tools/testing/selftests/bpf/test_l4lb.c | 474 ++++++ + tools/testing/selftests/bpf/test_pkt_access.c | 64 + + tools/testing/selftests/bpf/test_progs.c | 284 ++++ + tools/testing/selftests/bpf/test_verifier.c | 131 +- + tools/testing/selftests/bpf/test_xdp.c | 236 +++ + 401 files changed, 16965 insertions(+), 10003 deletions(-) + create mode 100644 drivers/net/dsa/dsa_loop.c + create mode 100644 drivers/net/dsa/dsa_loop.h + create mode 100644 drivers/net/dsa/dsa_loop_bdinfo.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/ethtool.c + create mode 100644 drivers/net/ethernet/apm/xgene-v2/mdio.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.c + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_dpipe.h + create mode 100644 drivers/net/ethernet/mellanox/mlxsw/spectrum_router.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nfpcore/nfp_mutex.c + create mode 100644 drivers/net/phy/phy-core.c + delete mode 100644 drivers/soc/qcom/smd.c + delete mode 100644 include/linux/soc/qcom/smd.h + create mode 100644 kernel/bpf/map_in_map.c + create mode 100644 kernel/bpf/map_in_map.h + create mode 100644 net/bpf/Makefile + create mode 100644 net/bpf/test_run.c + create mode 100644 samples/bpf/cookie_uid_helper_example.c + create mode 100644 samples/bpf/run_cookie_uid_helper_example.sh + create mode 100644 samples/bpf/test_map_in_map_kern.c + create mode 100644 samples/bpf/test_map_in_map_user.c + create mode 100644 tools/testing/selftests/bpf/test_iptunnel_common.h + create mode 100644 tools/testing/selftests/bpf/test_l4lb.c + create mode 100644 tools/testing/selftests/bpf/test_pkt_access.c + create mode 100644 tools/testing/selftests/bpf/test_progs.c + create mode 100644 tools/testing/selftests/bpf/test_xdp.c +Merging ipsec-next/master (6c786bcb29dd xfrm: branchless addr4_match() on 64-bit) +$ git merge ipsec-next/master +Auto-merging net/xfrm/xfrm_user.c +Merge made by the 'recursive' strategy. + include/net/xfrm.h | 11 +++++------ + net/key/af_key.c | 1 - + net/xfrm/xfrm_hash.h | 4 ++-- + net/xfrm/xfrm_user.c | 1 - + 4 files changed, 7 insertions(+), 10 deletions(-) +Merging netfilter-next/master (592d42ac7fd3 Merge branch 'qed-IOV-cleanups') +$ git merge netfilter-next/master +Already up-to-date. +Merging ipvs-next/master (e24113769960 ipvs: remove unused variable) +$ git merge ipvs-next/master +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_ftp.c | 7 ++----- + net/netfilter/ipvs/ip_vs_sync.c | 4 ++-- + 2 files changed, 4 insertions(+), 7 deletions(-) +Merging wireless-drivers-next/master (41977e86c984 rt2x00: add support for MT7620) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/marvell/mwifiex/pcie.c +Auto-merging drivers/net/wireless/marvell/mwifiex/main.c +Merge made by the 'recursive' strategy. + drivers/bcma/driver_gpio.c | 3 +- + drivers/bcma/main.c | 10 +- + drivers/net/wireless/atmel/atmel.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 51 + + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 3 + + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 5 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 7 + + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 56 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.c | 26 +- + .../wireless/broadcom/brcm80211/brcmfmac/debug.h | 18 + + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 27 + + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 8 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 3 - + drivers/net/wireless/marvell/mwifiex/11h.c | 3 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 4 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 36 +- + drivers/net/wireless/marvell/mwifiex/ie.c | 15 +- + drivers/net/wireless/marvell/mwifiex/main.c | 3 + + drivers/net/wireless/marvell/mwifiex/main.h | 2 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 58 +- + drivers/net/wireless/marvell/mwifiex/scan.c | 37 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 27 +- + drivers/net/wireless/marvell/mwifiex/sta_cmd.c | 49 +- + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 4 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 8 +- + drivers/net/wireless/marvell/mwifiex/tdls.c | 10 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 2 +- + drivers/net/wireless/marvell/mwifiex/usb.h | 4 +- + drivers/net/wireless/marvell/mwifiex/util.c | 6 +- + drivers/net/wireless/marvell/mwifiex/util.h | 5 + + drivers/net/wireless/ralink/rt2x00/Kconfig | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 212 ++- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 1490 +++++++++++++++- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 31 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 18 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 5 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 232 ++- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 4 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 16 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 64 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.h | 4 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 69 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.h | 4 + + .../net/wireless/realtek/rtlwifi/rtl8723be/sw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 165 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.h | 2 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 385 ++-- + .../net/wireless/realtek/rtlwifi/rtl8821ae/sw.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.c | 1858 ++++++-------------- + .../net/wireless/realtek/rtlwifi/rtl8821ae/table.h | 28 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 18 + + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 3 + + 60 files changed, 3206 insertions(+), 1964 deletions(-) +Merging bluetooth/master (733db4ccec57 Bluetooth: btmrvl: remove unnecessary wakeup interrupt number sanity check) +$ git merge bluetooth/master +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/ieee802154/ca8210.txt | 28 + + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 9 + + drivers/bluetooth/bluecard_cs.c | 5 +- + drivers/bluetooth/btmrvl_sdio.c | 32 +- + drivers/bluetooth/btrtl.c | 13 +- + drivers/bluetooth/btusb.c | 15 +- + drivers/bluetooth/hci_bcm.c | 59 +- + drivers/bluetooth/hci_intel.c | 47 +- + drivers/net/ieee802154/Kconfig | 22 + + drivers/net/ieee802154/Makefile | 1 + + drivers/net/ieee802154/ca8210.c | 3242 ++++++++++++++++++++ + include/net/6lowpan.h | 15 + + include/net/bluetooth/l2cap.h | 2 +- + include/net/bluetooth/rfcomm.h | 8 +- + net/6lowpan/core.c | 11 +- + net/6lowpan/iphc.c | 57 +- + net/bluetooth/6lowpan.c | 161 +- + net/bluetooth/af_bluetooth.c | 26 + + net/bluetooth/amp.c | 10 +- + net/bluetooth/hci_core.c | 4 +- + net/bluetooth/rfcomm/core.c | 4 +- + net/ipv6/addrconf.c | 23 +- + 23 files changed, 3579 insertions(+), 216 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/ieee802154/ca8210.txt + create mode 100644 drivers/net/ieee802154/ca8210.c +Merging mac80211-next/master (a339e4c226c0 cfg80211: add intro to documentation) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Auto-merging drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c +Auto-merging drivers/net/wireless/ralink/rt2x00/rt2x00dev.c +Auto-merging drivers/net/wireless/marvell/mwifiex/tdls.c +Auto-merging drivers/net/wireless/ath/wcn36xx/main.c +Merge made by the 'recursive' strategy. + Documentation/driver-api/80211/cfg80211.rst | 9 + + drivers/net/wireless/admtek/adm8211.c | 2 + + drivers/net/wireless/ath/ar5523/ar5523.c | 2 + + drivers/net/wireless/ath/ath10k/mac.c | 2 + + drivers/net/wireless/ath/ath5k/base.c | 2 + + drivers/net/wireless/ath/ath9k/htc_drv_init.c | 2 + + drivers/net/wireless/ath/ath9k/init.c | 2 + + drivers/net/wireless/ath/carl9170/main.c | 2 + + drivers/net/wireless/ath/wcn36xx/main.c | 3 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 2 + + drivers/net/wireless/broadcom/b43/main.c | 2 + + drivers/net/wireless/broadcom/b43legacy/main.c | 2 + + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 2 + + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 + + drivers/net/wireless/intel/iwlegacy/3945-rs.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 + + drivers/net/wireless/intel/iwlegacy/4965-rs.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 2 + + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 2 +- + drivers/net/wireless/mac80211_hwsim.c | 81 +++++- + drivers/net/wireless/mac80211_hwsim.h | 4 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 2 + + drivers/net/wireless/marvell/mwifiex/tdls.c | 2 +- + drivers/net/wireless/marvell/mwl8k.c | 2 + + drivers/net/wireless/mediatek/mt7601u/init.c | 2 + + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 3 + + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 2 + + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 + + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 + + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 2 + + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 + + include/linux/ieee80211.h | 20 +- + include/net/cfg80211.h | 173 +++++++++++- + include/net/mac80211.h | 10 +- + include/uapi/linux/nl80211.h | 100 ++++++- + net/mac80211/agg-rx.c | 12 +- + net/mac80211/agg-tx.c | 12 +- + net/mac80211/cfg.c | 46 ++- + net/mac80211/mesh.c | 10 +- + net/mac80211/mesh_hwmp.c | 23 +- + net/mac80211/mesh_pathtbl.c | 8 +- + net/mac80211/mlme.c | 41 ++- + net/mac80211/rate.c | 37 ++- + net/mac80211/rate.h | 3 +- + net/mac80211/spectmgmt.c | 4 +- + net/mac80211/sta_info.c | 11 +- + net/mac80211/sta_info.h | 18 +- + net/mac80211/tx.c | 8 - + net/mac80211/util.c | 22 +- + net/wireless/ap.c | 5 + + net/wireless/chan.c | 117 ++++++++ + net/wireless/core.c | 68 ++++- + net/wireless/core.h | 45 +-- + net/wireless/ibss.c | 1 + + net/wireless/mesh.c | 1 + + net/wireless/mlme.c | 70 +++-- + net/wireless/nl80211.c | 308 ++++++++++++++++++--- + net/wireless/nl80211.h | 7 +- + net/wireless/rdev-ops.h | 12 + + net/wireless/reg.c | 148 ++++++++++ + net/wireless/reg.h | 36 +++ + net/wireless/sme.c | 172 +++++++----- + net/wireless/trace.h | 22 ++ + net/wireless/util.c | 82 +++--- + 65 files changed, 1506 insertions(+), 301 deletions(-) +Merging rdma/for-next (9294000d6d89 IB/srp: Drain the send queue before destroying a QP) +$ git merge rdma/for-next +Already up-to-date. +Merging mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()) +$ git merge mtd/master +Already up-to-date. +Merging l2-mtd/master (d91f6cee98b6 mtd: aspeed: remove redundant dev_err call in aspeed_smc_probe()) +$ git merge l2-mtd/master +Already up-to-date. +Merging nand/nand/next (a779475bdf56 mtd: nand: allow drivers to request minimum alignment for passed buffer) +$ git merge nand/nand/next +Removing drivers/mtd/nand/atmel_nand_nfc.h +Removing drivers/mtd/nand/atmel_nand_ecc.h +Removing drivers/mtd/nand/atmel_nand.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mtd/atmel-nand.txt | 107 +- + .../devicetree/bindings/mtd/denali-nand.txt | 7 +- + MAINTAINERS | 2 +- + arch/cris/arch-v32/drivers/Kconfig | 1 - + drivers/memory/Kconfig | 2 +- + drivers/mtd/nand/Kconfig | 23 +- + drivers/mtd/nand/Makefile | 11 +- + drivers/mtd/nand/atmel/Makefile | 4 + + drivers/mtd/nand/atmel/nand-controller.c | 2198 +++++++++++++++++ + drivers/mtd/nand/atmel/pmecc.c | 1020 ++++++++ + drivers/mtd/nand/atmel/pmecc.h | 73 + + drivers/mtd/nand/atmel_nand.c | 2479 -------------------- + drivers/mtd/nand/atmel_nand_ecc.h | 163 -- + drivers/mtd/nand/atmel_nand_nfc.h | 103 - + drivers/mtd/nand/denali.c | 567 +++-- + drivers/mtd/nand/denali.h | 192 +- + drivers/mtd/nand/denali_dt.c | 74 +- + drivers/mtd/nand/fsmc_nand.c | 236 +- + drivers/mtd/nand/gpio.c | 18 +- + drivers/mtd/nand/nand_amd.c | 51 + + drivers/mtd/nand/nand_base.c | 511 ++-- + drivers/mtd/nand/nand_hynix.c | 631 +++++ + drivers/mtd/nand/nand_ids.c | 39 +- + drivers/mtd/nand/nand_macronix.c | 30 + + drivers/mtd/nand/nand_micron.c | 86 + + drivers/mtd/nand/nand_samsung.c | 112 + + drivers/mtd/nand/nand_toshiba.c | 51 + + drivers/mtd/nand/nandsim.c | 2 +- + drivers/mtd/nand/orion_nand.c | 48 +- + drivers/mtd/nand/sunxi_nand.c | 20 +- + drivers/mtd/nand/tango_nand.c | 8 +- + include/linux/mtd/nand.h | 96 +- + 32 files changed, 5191 insertions(+), 3774 deletions(-) + create mode 100644 drivers/mtd/nand/atmel/Makefile + create mode 100644 drivers/mtd/nand/atmel/nand-controller.c + create mode 100644 drivers/mtd/nand/atmel/pmecc.c + create mode 100644 drivers/mtd/nand/atmel/pmecc.h + delete mode 100644 drivers/mtd/nand/atmel_nand.c + delete mode 100644 drivers/mtd/nand/atmel_nand_ecc.h + delete mode 100644 drivers/mtd/nand/atmel_nand_nfc.h + create mode 100644 drivers/mtd/nand/nand_amd.c + create mode 100644 drivers/mtd/nand/nand_hynix.c + create mode 100644 drivers/mtd/nand/nand_macronix.c + create mode 100644 drivers/mtd/nand/nand_micron.c + create mode 100644 drivers/mtd/nand/nand_samsung.c + create mode 100644 drivers/mtd/nand/nand_toshiba.c +Merging spi-nor/next (0859c617ba1f mtd: spi-nor: Add support for N25Q256A11) +$ git merge spi-nor/next +Auto-merging drivers/mtd/spi-nor/spi-nor.c +Merge made by the 'recursive' strategy. + drivers/mtd/devices/m25p80.c | 132 ++++++--- + drivers/mtd/spi-nor/aspeed-smc.c | 23 +- + drivers/mtd/spi-nor/atmel-quadspi.c | 83 ++++-- + drivers/mtd/spi-nor/cadence-quadspi.c | 18 +- + drivers/mtd/spi-nor/fsl-quadspi.c | 6 +- + drivers/mtd/spi-nor/hisi-sfc.c | 36 ++- + drivers/mtd/spi-nor/intel-spi.c | 11 +- + drivers/mtd/spi-nor/mtk-quadspi.c | 15 +- + drivers/mtd/spi-nor/nxp-spifi.c | 22 +- + drivers/mtd/spi-nor/spi-nor.c | 522 ++++++++++++++++++++++++++-------- + include/linux/mtd/spi-nor.h | 166 ++++++++++- + 11 files changed, 804 insertions(+), 230 deletions(-) +Merging crypto/master (796b40c61714 crypto: ixp4xx - Use sg_virt()) +$ git merge crypto/master +Removing lib/md5.c +Auto-merging include/linux/ccp.h +Auto-merging include/dt-bindings/clock/gxbb-clkc.h +Auto-merging drivers/crypto/ccp/ccp-dev.h +Auto-merging drivers/crypto/ccp/ccp-dev-v5.c +Auto-merging drivers/clk/meson/gxbb.h +Auto-merging arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +Auto-merging arch/arm64/boot/dts/amlogic/meson-gx.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/crypto/api-samples.rst | 6 +- + .../devicetree/bindings/rng/amlogic,meson-rng.txt | 11 +- + MAINTAINERS | 8 + + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/aes-neonbs-glue.c | 60 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 5 + + arch/powerpc/crypto/Makefile | 3 + + arch/powerpc/crypto/crc-vpmsum_test.c | 137 ++ + arch/powerpc/crypto/crc32-vpmsum_core.S | 755 +++++++ + arch/powerpc/crypto/crc32c-vpmsum_asm.S | 715 +----- + arch/powerpc/crypto/crct10dif-vpmsum_asm.S | 850 +++++++ + arch/powerpc/crypto/crct10dif-vpmsum_glue.c | 125 + + arch/x86/crypto/aes_ctrby8_avx-x86_64.S | 7 +- + crypto/Kconfig | 17 + + crypto/algapi.c | 4 +- + crypto/cbc.c | 15 +- + crypto/ctr.c | 23 +- + crypto/dh.c | 3 +- + crypto/drbg.c | 5 +- + crypto/ecdh.c | 3 +- + crypto/gf128mul.c | 86 +- + crypto/md5.c | 95 +- + crypto/testmgr.c | 72 +- + crypto/testmgr.h | 512 ++--- + drivers/char/hw_random/meson-rng.c | 22 + + drivers/char/hw_random/omap-rng.c | 22 +- + drivers/clk/meson/gxbb.h | 2 +- + drivers/crypto/Kconfig | 7 + + drivers/crypto/Makefile | 1 + + drivers/crypto/bcm/util.c | 2 +- + drivers/crypto/caam/Kconfig | 20 +- + drivers/crypto/caam/Makefile | 5 + + drivers/crypto/caam/caamalg.c | 9 +- + drivers/crypto/caam/caamalg_desc.c | 77 +- + drivers/crypto/caam/caamalg_desc.h | 15 +- + drivers/crypto/caam/caamalg_qi.c | 2387 ++++++++++++++++++++ + drivers/crypto/caam/ctrl.c | 58 +- + drivers/crypto/caam/desc_constr.h | 5 + + drivers/crypto/caam/intern.h | 24 + + drivers/crypto/caam/qi.c | 805 +++++++ + drivers/crypto/caam/qi.h | 201 ++ + drivers/crypto/caam/sg_sw_qm.h | 108 + + drivers/crypto/cavium/Makefile | 4 + + drivers/crypto/cavium/zip/Makefile | 11 + + drivers/crypto/cavium/zip/common.h | 202 ++ + drivers/crypto/cavium/zip/zip_crypto.c | 313 +++ + drivers/crypto/cavium/zip/zip_crypto.h | 79 + + drivers/crypto/cavium/zip/zip_deflate.c | 200 ++ + drivers/crypto/cavium/zip/zip_deflate.h | 62 + + drivers/crypto/cavium/zip/zip_device.c | 202 ++ + drivers/crypto/cavium/zip/zip_device.h | 108 + + drivers/crypto/cavium/zip/zip_inflate.c | 223 ++ + drivers/crypto/cavium/zip/zip_inflate.h | 62 + + drivers/crypto/cavium/zip/zip_main.c | 729 ++++++ + drivers/crypto/cavium/zip/zip_main.h | 121 + + drivers/crypto/cavium/zip/zip_mem.c | 114 + + drivers/crypto/cavium/zip/zip_mem.h | 78 + + drivers/crypto/cavium/zip/zip_regs.h | 1347 +++++++++++ + drivers/crypto/ccp/Makefile | 2 + + drivers/crypto/ccp/ccp-crypto-aes-galois.c | 252 +++ + drivers/crypto/ccp/ccp-crypto-des3.c | 254 +++ + drivers/crypto/ccp/ccp-crypto-main.c | 22 + + drivers/crypto/ccp/ccp-crypto-sha.c | 22 + + drivers/crypto/ccp/ccp-crypto.h | 44 +- + drivers/crypto/ccp/ccp-dev-v3.c | 1 + + drivers/crypto/ccp/ccp-dev-v5.c | 54 + + drivers/crypto/ccp/ccp-dev.h | 14 +- + drivers/crypto/ccp/ccp-ops.c | 522 +++++ + drivers/crypto/ixp4xx_crypto.c | 2 +- + drivers/crypto/mediatek/mtk-aes.c | 421 ++-- + drivers/crypto/mediatek/mtk-platform.c | 15 +- + drivers/crypto/mediatek/mtk-platform.h | 56 +- + drivers/crypto/mediatek/mtk-sha.c | 309 +-- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 2 +- + drivers/crypto/s5p-sss.c | 35 +- + drivers/soc/fsl/qbman/qman.c | 4 +- + drivers/soc/fsl/qbman/qman_ccsr.c | 6 +- + drivers/soc/fsl/qbman/qman_priv.h | 97 - + include/crypto/gf128mul.h | 32 +- + include/crypto/kpp.h | 6 +- + include/dt-bindings/clock/gxbb-clkc.h | 3 +- + include/linux/ccp.h | 68 +- + include/linux/cryptohash.h | 5 - + include/soc/fsl/qman.h | 109 + + lib/Makefile | 2 +- + lib/md5.c | 95 - + 87 files changed, 11803 insertions(+), 1797 deletions(-) + create mode 100644 arch/powerpc/crypto/crc-vpmsum_test.c + create mode 100644 arch/powerpc/crypto/crc32-vpmsum_core.S + create mode 100644 arch/powerpc/crypto/crct10dif-vpmsum_asm.S + create mode 100644 arch/powerpc/crypto/crct10dif-vpmsum_glue.c + create mode 100644 drivers/crypto/caam/caamalg_qi.c + create mode 100644 drivers/crypto/caam/qi.c + create mode 100644 drivers/crypto/caam/qi.h + create mode 100644 drivers/crypto/caam/sg_sw_qm.h + create mode 100644 drivers/crypto/cavium/Makefile + create mode 100644 drivers/crypto/cavium/zip/Makefile + create mode 100644 drivers/crypto/cavium/zip/common.h + create mode 100644 drivers/crypto/cavium/zip/zip_crypto.c + create mode 100644 drivers/crypto/cavium/zip/zip_crypto.h + create mode 100644 drivers/crypto/cavium/zip/zip_deflate.c + create mode 100644 drivers/crypto/cavium/zip/zip_deflate.h + create mode 100644 drivers/crypto/cavium/zip/zip_device.c + create mode 100644 drivers/crypto/cavium/zip/zip_device.h + create mode 100644 drivers/crypto/cavium/zip/zip_inflate.c + create mode 100644 drivers/crypto/cavium/zip/zip_inflate.h + create mode 100644 drivers/crypto/cavium/zip/zip_main.c + create mode 100644 drivers/crypto/cavium/zip/zip_main.h + create mode 100644 drivers/crypto/cavium/zip/zip_mem.c + create mode 100644 drivers/crypto/cavium/zip/zip_mem.h + create mode 100644 drivers/crypto/cavium/zip/zip_regs.h + create mode 100644 drivers/crypto/ccp/ccp-crypto-aes-galois.c + create mode 100644 drivers/crypto/ccp/ccp-crypto-des3.c + delete mode 100644 lib/md5.c +Merging drm/drm-next (7558ab66424e Merge branch 'drm-vmwgfx-next' of git://people.freedesktop.org/~syeh/repos_linux into drm-next) +$ git merge drm/drm-next +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_ringbuffer.h' using previous resolution. +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/intel_dsi_vbt.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.c +Auto-merging drivers/gpu/drm/i915/i915_gem_gtt.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Removing drivers/gpu/drm/drm_platform.c +Auto-merging drivers/gpu/drm/drm_file.c +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.h +Auto-merging drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +Removing drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h +Removing drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c1adfc071ef1] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/display/brcm,bcm-vc4.txt | 3 + + .../bindings/display/bridge/lvds-transmitter.txt | 64 + + .../bridge/megachips-stdpxxxx-ge-b850v3-fw.txt | 94 + + .../bindings/display/imx/fsl-imx-drm.txt | 59 +- + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 7 +- + .../devicetree/bindings/vendor-prefixes.txt | 1 + + Documentation/gpu/drm-internals.rst | 65 +- + Documentation/gpu/drm-kms-helpers.rst | 40 +- + Documentation/gpu/drm-kms.rst | 264 +- + Documentation/gpu/drm-mm.rst | 41 +- + Documentation/gpu/drm-uapi.rst | 4 + + Documentation/gpu/i915.rst | 9 + + Documentation/gpu/index.rst | 2 + + Documentation/gpu/introduction.rst | 10 + + Documentation/gpu/todo.rst | 334 + + Documentation/gpu/vc4.rst | 89 + + MAINTAINERS | 22 +- + arch/x86/kernel/early-quirks.c | 1 + + drivers/char/agp/intel-gtt.c | 16 +- + drivers/dma-buf/dma-fence-array.c | 26 + + drivers/dma-buf/dma-fence.c | 2 + + drivers/gpu/drm/Kconfig | 9 + + drivers/gpu/drm/Makefile | 7 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 307 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 112 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 33 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 483 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 122 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 114 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 146 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 243 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_powerplay.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 481 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 127 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 61 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_test.c | 81 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 94 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 112 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 19 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 21 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1014 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 56 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 90 +- + drivers/gpu/drm/amd/amdgpu/atom.h | 2 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 305 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.h | 7 + + drivers/gpu/drm/amd/amdgpu/cik.c | 8 + + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 31 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 941 + + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 31 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 60 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 473 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4140 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 458 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 81 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 99 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 208 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 842 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 40 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 615 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h | 35 + + drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h | 87 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 207 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 47 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 102 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.h | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 266 + + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 54 + + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 269 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 521 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.h | 50 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 34 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 1616 + + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/si.c | 7 + + drivers/gpu/drm/amd/amdgpu/si_dma.c | 22 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 45 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 871 + + drivers/gpu/drm/amd/amdgpu/soc15.h | 35 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 57 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 288 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 5 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 11 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 1543 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 1141 + + drivers/gpu/drm/amd/amdgpu/vce_v4_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 424 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.h | 30 + + drivers/gpu/drm/amd/amdgpu/vega10_sdma_pkt_open.h | 3335 + + drivers/gpu/drm/amd/amdgpu/vi.c | 67 +- + drivers/gpu/drm/amd/amdgpu/vi.h | 112 - + drivers/gpu/drm/amd/amdgpu/vid.h | 1 + + drivers/gpu/drm/amd/include/amd_acpi.h | 12 + + drivers/gpu/drm/amd/include/amd_pcie_helpers.h | 4 +- + drivers/gpu/drm/amd/include/amd_shared.h | 20 + + .../drm/amd/include/asic_reg/gmc/gmc_6_0_sh_mask.h | 4 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_2_d.h | 1 + + .../gpu/drm/amd/include/asic_reg/smu/smu_7_1_3_d.h | 2 + + .../asic_reg/vega10/ATHUB/athub_1_0_default.h | 241 + + .../asic_reg/vega10/ATHUB/athub_1_0_offset.h | 453 + + .../asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h | 2045 + + .../include/asic_reg/vega10/DC/dce_12_0_default.h | 9868 ++ + .../include/asic_reg/vega10/DC/dce_12_0_offset.h | 18193 +++ + .../include/asic_reg/vega10/DC/dce_12_0_sh_mask.h | 64636 +++++++++ + .../include/asic_reg/vega10/GC/gc_9_0_default.h | 3873 + + .../amd/include/asic_reg/vega10/GC/gc_9_0_offset.h | 7230 + + .../include/asic_reg/vega10/GC/gc_9_0_sh_mask.h | 29868 ++++ + .../include/asic_reg/vega10/HDP/hdp_4_0_default.h | 117 + + .../include/asic_reg/vega10/HDP/hdp_4_0_offset.h | 209 + + .../include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h | 601 + + .../asic_reg/vega10/MMHUB/mmhub_1_0_default.h | 1011 + + .../asic_reg/vega10/MMHUB/mmhub_1_0_offset.h | 1967 + + .../asic_reg/vega10/MMHUB/mmhub_1_0_sh_mask.h | 10127 ++ + .../include/asic_reg/vega10/MP/mp_9_0_default.h | 342 + + .../amd/include/asic_reg/vega10/MP/mp_9_0_offset.h | 375 + + .../include/asic_reg/vega10/MP/mp_9_0_sh_mask.h | 1463 + + .../asic_reg/vega10/NBIF/nbif_6_1_default.h | 1271 + + .../include/asic_reg/vega10/NBIF/nbif_6_1_offset.h | 1688 + + .../asic_reg/vega10/NBIF/nbif_6_1_sh_mask.h | 10281 ++ + .../asic_reg/vega10/NBIO/nbio_6_1_default.h | 22340 +++ + .../include/asic_reg/vega10/NBIO/nbio_6_1_offset.h | 3649 + + .../asic_reg/vega10/NBIO/nbio_6_1_sh_mask.h | 133884 ++++++++++++++++++ + .../asic_reg/vega10/OSSSYS/osssys_4_0_default.h | 176 + + .../asic_reg/vega10/OSSSYS/osssys_4_0_offset.h | 327 + + .../asic_reg/vega10/OSSSYS/osssys_4_0_sh_mask.h | 1196 + + .../asic_reg/vega10/SDMA0/sdma0_4_0_default.h | 286 + + .../asic_reg/vega10/SDMA0/sdma0_4_0_offset.h | 547 + + .../asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h | 1852 + + .../asic_reg/vega10/SDMA1/sdma1_4_0_default.h | 282 + + .../asic_reg/vega10/SDMA1/sdma1_4_0_offset.h | 539 + + .../asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h | 1810 + + .../asic_reg/vega10/SMUIO/smuio_9_0_default.h | 100 + + .../asic_reg/vega10/SMUIO/smuio_9_0_offset.h | 175 + + .../asic_reg/vega10/SMUIO/smuio_9_0_sh_mask.h | 258 + + .../include/asic_reg/vega10/THM/thm_9_0_default.h | 194 + + .../include/asic_reg/vega10/THM/thm_9_0_offset.h | 363 + + .../include/asic_reg/vega10/THM/thm_9_0_sh_mask.h | 1314 + + .../include/asic_reg/vega10/UVD/uvd_7_0_default.h | 127 + + .../include/asic_reg/vega10/UVD/uvd_7_0_offset.h | 222 + + .../include/asic_reg/vega10/UVD/uvd_7_0_sh_mask.h | 811 + + .../include/asic_reg/vega10/VCE/vce_4_0_default.h | 122 + + .../include/asic_reg/vega10/VCE/vce_4_0_offset.h | 208 + + .../include/asic_reg/vega10/VCE/vce_4_0_sh_mask.h | 488 + + .../gpu/drm/amd/include/asic_reg/vega10/soc15ip.h | 1343 + + .../drm/amd/include/asic_reg/vega10/vega10_enum.h | 22531 +++ + drivers/gpu/drm/amd/include/atomfirmware.h | 2385 + + drivers/gpu/drm/amd/include/atomfirmwareid.h | 86 + + drivers/gpu/drm/amd/include/cgs_linux.h | 19 +- + drivers/gpu/drm/amd/include/displayobject.h | 249 + + drivers/gpu/drm/amd/include/dm_pp_interface.h | 83 + + .../drm/amd/include/ivsrcid/ivsrcid_vislands30.h | 99 + + drivers/gpu/drm/amd/include/v9_structs.h | 743 + + drivers/gpu/drm/amd/include/vi_structs.h | 106 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 439 +- + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 34 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 73 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 9 + + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr_ppt.h | 16 +- + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 396 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h | 140 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 170 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 4450 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 434 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h | 44 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c | 137 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h | 65 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h | 331 + + .../amd/powerplay/hwmgr/vega10_processpptables.c | 1056 + + .../amd/powerplay/hwmgr/vega10_processpptables.h | 34 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 761 + + .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 83 + + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 46 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 43 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 137 +- + drivers/gpu/drm/amd/powerplay/inc/pp_debug.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/pp_instance.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 48 + + drivers/gpu/drm/amd/powerplay/inc/smu7_ppsmc.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/smu9.h | 147 + + drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h | 418 + + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 8 + + drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h | 131 + + drivers/gpu/drm/amd/powerplay/smumgr/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 103 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 3 +- + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c | 14 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 68 +- + .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.h | 2 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 1 + + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 19 + + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c | 67 +- + drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.h | 2 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 564 + + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h | 70 + + drivers/gpu/drm/amd/scheduler/gpu_scheduler.c | 6 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 11 +- + drivers/gpu/drm/arc/arcpgu_drv.c | 1 - + drivers/gpu/drm/arm/hdlcd_crtc.c | 20 + + drivers/gpu/drm/arm/hdlcd_drv.c | 33 +- + drivers/gpu/drm/arm/malidp_crtc.c | 21 + + drivers/gpu/drm/arm/malidp_drv.c | 36 +- + drivers/gpu/drm/armada/armada_crtc.c | 56 +- + drivers/gpu/drm/armada/armada_crtc.h | 2 - + drivers/gpu/drm/armada/armada_debugfs.c | 65 +- + drivers/gpu/drm/armada/armada_drm.h | 1 - + drivers/gpu/drm/armada/armada_drv.c | 34 +- + drivers/gpu/drm/armada/armada_fbdev.c | 2 - + drivers/gpu/drm/ast/ast_fb.c | 9 +- + drivers/gpu/drm/atmel-hlcdc/Makefile | 1 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 93 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 147 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 369 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c | 666 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h | 399 - + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 642 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 14 +- + drivers/gpu/drm/bridge/Kconfig | 38 +- + drivers/gpu/drm/bridge/Makefile | 6 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 22 + + drivers/gpu/drm/bridge/dumb-vga-dac.c | 1 + + drivers/gpu/drm/bridge/lvds-encoder.c | 210 + + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 428 + + drivers/gpu/drm/bridge/sil-sii8620.c | 4 + + drivers/gpu/drm/bridge/synopsys/Kconfig | 23 + + drivers/gpu/drm/bridge/synopsys/Makefile | 5 + + .../drm/bridge/{ => synopsys}/dw-hdmi-ahb-audio.c | 0 + .../gpu/drm/bridge/{ => synopsys}/dw-hdmi-audio.h | 0 + .../drm/bridge/{ => synopsys}/dw-hdmi-i2s-audio.c | 0 + drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.c | 558 +- + drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.h | 4 + + drivers/gpu/drm/bridge/ti-tfp410.c | 2 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 1 - + drivers/gpu/drm/drm_atomic.c | 206 +- + drivers/gpu/drm/drm_atomic_helper.c | 647 +- + drivers/gpu/drm/drm_blend.c | 23 +- + drivers/gpu/drm/drm_cache.c | 12 +- + drivers/gpu/drm/drm_connector.c | 132 +- + drivers/gpu/drm/drm_crtc.c | 12 +- + drivers/gpu/drm/drm_crtc_helper.c | 42 +- + drivers/gpu/drm/drm_crtc_internal.h | 14 +- + drivers/gpu/drm/drm_debugfs.c | 29 +- + drivers/gpu/drm/drm_dp_dual_mode_helper.c | 2 + + drivers/gpu/drm/drm_dp_helper.c | 127 + + drivers/gpu/drm/drm_edid.c | 94 +- + drivers/gpu/drm/drm_edid_load.c | 17 +- + drivers/gpu/drm/drm_encoder.c | 8 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 20 +- + drivers/gpu/drm/drm_fb_helper.c | 138 +- + drivers/gpu/drm/{drm_fops.c => drm_file.c} | 75 +- + drivers/gpu/drm/drm_fourcc.c | 8 + + drivers/gpu/drm/drm_framebuffer.c | 45 +- + drivers/gpu/drm/drm_gem.c | 44 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 13 +- + drivers/gpu/drm/drm_internal.h | 2 +- + drivers/gpu/drm/drm_ioc32.c | 3 +- + drivers/gpu/drm/drm_irq.c | 124 +- + drivers/gpu/drm/drm_kms_helper_common.c | 3 +- + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_config.c | 22 +- + drivers/gpu/drm/drm_mode_object.c | 44 +- + drivers/gpu/drm/drm_modes.c | 2 +- + drivers/gpu/drm/drm_pci.c | 7 + + drivers/gpu/drm/drm_plane.c | 14 +- + drivers/gpu/drm/drm_plane_helper.c | 9 +- + drivers/gpu/drm/drm_platform.c | 87 - + drivers/gpu/drm/drm_prime.c | 13 +- + drivers/gpu/drm/drm_print.c | 2 +- + drivers/gpu/drm/drm_probe_helper.c | 20 +- + drivers/gpu/drm/drm_property.c | 52 +- + drivers/gpu/drm/drm_scdc_helper.c | 244 + + drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- + drivers/gpu/drm/drm_trace.h | 20 +- + drivers/gpu/drm/exynos/exynos_dp.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 40 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_drv.c | 245 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 8 - + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 8 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 26 + + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 38 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 9 +- + drivers/gpu/drm/gma500/framebuffer.c | 9 +- + drivers/gpu/drm/gma500/oaktrail_lvds.c | 18 +- + drivers/gpu/drm/gma500/psb_drv.h | 5 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 7 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 20 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 23 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 2 - + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 12 +- + drivers/gpu/drm/i915/Kconfig | 1 + + drivers/gpu/drm/i915/Kconfig.debug | 29 + + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 36 +- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 25 +- + drivers/gpu/drm/i915/i915_debugfs.c | 713 +- + drivers/gpu/drm/i915/i915_drv.c | 139 +- + drivers/gpu/drm/i915/i915_drv.h | 297 +- + drivers/gpu/drm/i915/i915_gem.c | 488 +- + drivers/gpu/drm/i915/i915_gem.h | 9 + + drivers/gpu/drm/i915/i915_gem_batch_pool.c | 37 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 189 + + drivers/gpu/drm/i915/i915_gem_clflush.h | 37 + + drivers/gpu/drm/i915/i915_gem_context.c | 165 +- + drivers/gpu/drm/i915/i915_gem_context.h | 2 - + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 5 + + drivers/gpu/drm/i915/i915_gem_evict.c | 16 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 107 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 11 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 2086 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 124 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 7 +- + drivers/gpu/drm/i915/i915_gem_object.h | 41 +- + drivers/gpu/drm/i915/i915_gem_request.c | 499 +- + drivers/gpu/drm/i915/i915_gem_request.h | 96 +- + drivers/gpu/drm/i915/i915_gem_shrinker.c | 7 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 42 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 25 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 9 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 75 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 321 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 290 +- + drivers/gpu/drm/i915/i915_irq.c | 317 +- + drivers/gpu/drm/i915/i915_params.c | 16 +- + drivers/gpu/drm/i915/i915_params.h | 83 +- + drivers/gpu/drm/i915/i915_pci.c | 32 +- + drivers/gpu/drm/i915/i915_perf.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 107 +- + drivers/gpu/drm/i915/i915_selftest.h | 106 + + drivers/gpu/drm/i915/i915_sw_fence.c | 8 +- + drivers/gpu/drm/i915/i915_sysfs.c | 63 +- + drivers/gpu/drm/i915/i915_trace.h | 472 +- + drivers/gpu/drm/i915/i915_utils.h | 13 + + drivers/gpu/drm/i915/i915_vgpu.c | 17 +- + drivers/gpu/drm/i915/i915_vma.c | 34 +- + drivers/gpu/drm/i915/i915_vma.h | 4 +- + drivers/gpu/drm/i915/intel_atomic.c | 15 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 17 +- + drivers/gpu/drm/i915/intel_audio.c | 4 +- + drivers/gpu/drm/i915/intel_bios.c | 46 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 589 +- + drivers/gpu/drm/i915/intel_cdclk.c | 1891 + + drivers/gpu/drm/i915/intel_color.c | 104 +- + drivers/gpu/drm/i915/intel_crt.c | 21 +- + drivers/gpu/drm/i915/intel_csr.c | 8 +- + drivers/gpu/drm/i915/intel_ddi.c | 513 +- + drivers/gpu/drm/i915/intel_device_info.c | 17 +- + drivers/gpu/drm/i915/intel_display.c | 3538 +- + drivers/gpu/drm/i915/intel_dp.c | 307 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 37 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 54 +- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 16 - + drivers/gpu/drm/i915/intel_drv.h | 226 +- + drivers/gpu/drm/i915/intel_dsi.c | 614 +- + drivers/gpu/drm/i915/intel_dsi.h | 13 +- + drivers/gpu/drm/i915/intel_dsi_pll.c | 135 +- + .../{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} | 133 +- + drivers/gpu/drm/i915/intel_dvo.c | 1 + + drivers/gpu/drm/i915/intel_engine_cs.c | 701 +- + drivers/gpu/drm/i915/intel_fbc.c | 13 +- + drivers/gpu/drm/i915/intel_fbdev.c | 73 +- + drivers/gpu/drm/i915/intel_fifo_underrun.c | 25 +- + drivers/gpu/drm/i915/intel_frontbuffer.c | 3 +- + drivers/gpu/drm/i915/intel_frontbuffer.h | 8 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 462 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 4 + + drivers/gpu/drm/i915/intel_hdmi.c | 17 +- + drivers/gpu/drm/i915/intel_hotplug.c | 45 +- + drivers/gpu/drm/i915/intel_huc.c | 120 +- + drivers/gpu/drm/i915/intel_i2c.c | 4 +- + drivers/gpu/drm/i915/intel_lrc.c | 913 +- + drivers/gpu/drm/i915/intel_lrc.h | 4 - + drivers/gpu/drm/i915/intel_lspcon.c | 17 +- + drivers/gpu/drm/i915/intel_lvds.c | 8 +- + drivers/gpu/drm/i915/intel_mocs.c | 55 +- + drivers/gpu/drm/i915/intel_opregion.c | 26 +- + drivers/gpu/drm/i915/intel_overlay.c | 87 +- + drivers/gpu/drm/i915/intel_panel.c | 4 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 70 +- + drivers/gpu/drm/i915/intel_pm.c | 1029 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 1163 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 182 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 625 +- + drivers/gpu/drm/i915/intel_sdvo.c | 1 + + drivers/gpu/drm/i915/intel_sideband.c | 34 +- + drivers/gpu/drm/i915/intel_sprite.c | 290 +- + drivers/gpu/drm/i915/intel_tv.c | 1 + + drivers/gpu/drm/i915/intel_uc.c | 287 + + drivers/gpu/drm/i915/intel_uc.h | 25 +- + drivers/gpu/drm/i915/intel_uncore.c | 218 +- + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 135 + + drivers/gpu/drm/i915/selftests/huge_gem_object.h | 45 + + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 385 + + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 463 + + drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 303 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 350 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1562 + + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 600 + + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 882 + + .../gpu/drm/i915/selftests/i915_live_selftests.h | 19 + + .../gpu/drm/i915/selftests/i915_mock_selftests.h | 20 + + drivers/gpu/drm/i915/selftests/i915_random.c | 63 + + drivers/gpu/drm/i915/selftests/i915_random.h | 50 + + drivers/gpu/drm/i915/selftests/i915_selftest.c | 250 + + drivers/gpu/drm/i915/selftests/i915_vma.c | 746 + + drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c | 481 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 543 + + drivers/gpu/drm/i915/selftests/intel_uncore.c | 182 + + drivers/gpu/drm/i915/selftests/mock_context.c | 78 + + drivers/gpu/drm/i915/selftests/mock_context.h | 34 + + drivers/gpu/drm/i915/selftests/mock_dmabuf.c | 176 + + drivers/gpu/drm/i915/selftests/mock_dmabuf.h | 41 + + drivers/gpu/drm/i915/selftests/mock_drm.c | 54 + + drivers/gpu/drm/i915/selftests/mock_drm.h | 31 + + drivers/gpu/drm/i915/selftests/mock_engine.c | 207 + + drivers/gpu/drm/i915/selftests/mock_engine.h | 54 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 226 + + drivers/gpu/drm/i915/selftests/mock_gem_device.h | 9 + + drivers/gpu/drm/i915/selftests/mock_gem_object.h | 8 + + drivers/gpu/drm/i915/selftests/mock_gtt.c | 138 + + drivers/gpu/drm/i915/selftests/mock_gtt.h | 35 + + drivers/gpu/drm/i915/selftests/mock_request.c | 63 + + drivers/gpu/drm/i915/selftests/mock_request.h | 46 + + drivers/gpu/drm/i915/selftests/scatterlist.c | 355 + + drivers/gpu/drm/imx/dw_hdmi-imx.c | 2 - + drivers/gpu/drm/imx/imx-drm-core.c | 145 +- + drivers/gpu/drm/imx/imx-drm.h | 16 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 82 +- + drivers/gpu/drm/imx/ipuv3-plane.c | 344 +- + drivers/gpu/drm/imx/ipuv3-plane.h | 6 + + drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 - + drivers/gpu/drm/meson/meson_crtc.c | 22 + + drivers/gpu/drm/meson/meson_drv.c | 35 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 5 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 2 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 1 + + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 7 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mdss.c | 2 +- + drivers/gpu/drm/msm/msm_debugfs.c | 17 - + drivers/gpu/drm/msm/msm_debugfs.h | 1 - + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_drv.h | 6 +- + drivers/gpu/drm/msm/msm_fbdev.c | 1 - + drivers/gpu/drm/msm/msm_kms.h | 1 - + drivers/gpu/drm/msm/msm_perf.c | 34 +- + drivers/gpu/drm/msm/msm_rd.c | 36 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 18 +- + drivers/gpu/drm/nouveau/include/nvif/class.h | 2 + + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 7 +- + .../gpu/drm/nouveau/include/nvkm/core/msgqueue.h | 47 + + .../gpu/drm/nouveau/include/nvkm/engine/falcon.h | 9 + + drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h | 1 + + .../gpu/drm/nouveau/include/nvkm/engine/nvdec.h | 8 + + drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h | 13 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 7 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/pmu.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/secboot.h | 7 +- + drivers/gpu/drm/nouveau/nouveau_acpi.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 62 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.h | 6 - + drivers/gpu/drm/nouveau/nouveau_display.c | 113 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 1 - + drivers/gpu/drm/nouveau/nouveau_usif.c | 1 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 4 +- + drivers/gpu/drm/nouveau/nv50_display.c | 111 +- + drivers/gpu/drm/nouveau/nvkm/core/mm.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/core/subdev.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgf100.h | 4 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp100.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c | 98 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 29 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.h | 4 + + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c | 66 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/Kbuild | 3 +- + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c | 59 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c | 30 + + drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h | 6 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild | 2 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c | 108 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c | 30 + + drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h | 9 + + drivers/gpu/drm/nouveau/nvkm/falcon/Kbuild | 3 + + drivers/gpu/drm/nouveau/nvkm/falcon/base.c | 40 +- + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c | 552 + + drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.h | 207 + + .../drm/nouveau/nvkm/falcon/msgqueue_0137c63d.c | 323 + + .../drm/nouveau/nvkm/falcon/msgqueue_0148cdec.c | 263 + + drivers/gpu/drm/nouveau/nvkm/falcon/v1.c | 124 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild | 3 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 42 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm200.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h | 33 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf100.c | 148 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c | 62 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 70 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm107.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c | 68 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgp100.c | 68 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/anx9805.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxg94.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/auxgm200.c | 11 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gf100.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/ibus/gk104.c | 6 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/base.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c | 25 +- + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/Kbuild | 6 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr.h | 11 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.c | 589 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r352.h | 143 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.c | 149 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.h | 72 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r364.c | 117 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.c | 388 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.h | 35 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/acr_r375.c | 165 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/base.c | 11 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.c | 23 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm200.h | 3 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gm20b.c | 8 +- + .../gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c | 252 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.c | 97 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.h | 81 + + .../gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode.h | 8 +- + .../nvkm/subdev/secboot/ls_ucode_msgqueue.c | 149 + + drivers/gpu/drm/nouveau/nvkm/subdev/secboot/priv.h | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/top/gk104.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 17 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 3 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 15 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 2 + + drivers/gpu/drm/omapdrm/omap_drv.c | 3 - + drivers/gpu/drm/omapdrm/omap_drv.h | 4 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 - + drivers/gpu/drm/omapdrm/omap_gem.c | 5 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 18 +- + drivers/gpu/drm/qxl/qxl_debugfs.c | 22 - + drivers/gpu/drm/qxl/qxl_display.c | 822 +- + drivers/gpu/drm/qxl/qxl_drv.c | 32 +- + drivers/gpu/drm/qxl/qxl_drv.h | 12 +- + drivers/gpu/drm/qxl/qxl_fb.c | 39 +- + drivers/gpu/drm/qxl/qxl_kms.c | 28 +- + drivers/gpu/drm/qxl/qxl_object.c | 41 +- + drivers/gpu/drm/r128/r128_cce.c | 7 +- + drivers/gpu/drm/radeon/atom.c | 46 +- + drivers/gpu/drm/radeon/cik.c | 63 +- + drivers/gpu/drm/radeon/cikd.h | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 2 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 7 +- + drivers/gpu/drm/radeon/ni.c | 22 +- + drivers/gpu/drm/radeon/r100.c | 18 +- + drivers/gpu/drm/radeon/r200.c | 3 +- + drivers/gpu/drm/radeon/r300.c | 13 +- + drivers/gpu/drm/radeon/r420.c | 9 +- + drivers/gpu/drm/radeon/r520.c | 3 +- + drivers/gpu/drm/radeon/r600.c | 21 +- + drivers/gpu/drm/radeon/r600_cs.c | 7 +- + drivers/gpu/drm/radeon/r600_dpm.c | 71 +- + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_acpi.h | 12 + + drivers/gpu/drm/radeon/radeon_atpx_handler.c | 4 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/radeon/radeon_clocks.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 13 +- + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 3 +- + drivers/gpu/drm/radeon/radeon_drv.c | 6 +- + drivers/gpu/drm/radeon/radeon_fb.c | 14 +- + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_kms.c | 42 +- + drivers/gpu/drm/radeon/radeon_test.c | 6 +- + drivers/gpu/drm/radeon/rs400.c | 4 +- + drivers/gpu/drm/radeon/rs690.c | 3 +- + drivers/gpu/drm/radeon/rv515.c | 9 +- + drivers/gpu/drm/radeon/si.c | 45 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 29 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 1 - + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 32 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 5 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.c | 6 +- + drivers/gpu/drm/rockchip/cdn-dp-reg.h | 13 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 479 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 1 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 52 - + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 14 - + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 68 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 12 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 58 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.h | 1 - + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 236 +- + drivers/gpu/drm/sti/sti_drv.c | 17 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 24 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 40 +- + drivers/gpu/drm/tegra/dc.c | 15 +- + drivers/gpu/drm/tegra/drm.c | 38 - + drivers/gpu/drm/tegra/drm.h | 3 - + drivers/gpu/drm/tegra/fb.c | 5 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 11 + + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 26 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 2 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 69 +- + drivers/gpu/drm/udl/udl_fb.c | 5 +- + drivers/gpu/drm/vc4/Kconfig | 4 + + drivers/gpu/drm/vc4/vc4_bo.c | 26 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 15 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 16 +- + drivers/gpu/drm/vc4/vc4_drv.c | 41 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 - + drivers/gpu/drm/vc4/vc4_dsi.c | 21 +- + drivers/gpu/drm/vc4/vc4_gem.c | 26 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 517 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 12 +- + drivers/gpu/drm/vc4/vc4_irq.c | 3 +- + drivers/gpu/drm/vc4/vc4_plane.c | 23 +- + drivers/gpu/drm/vc4/vc4_regs.h | 107 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 4 + + drivers/gpu/drm/vc4/vc4_validate.c | 34 +- + drivers/gpu/drm/vc4/vc4_validate_shaders.c | 21 +- + drivers/gpu/drm/vc4/vc4_vec.c | 6 + + drivers/gpu/drm/vgem/vgem_drv.c | 4 +- + drivers/gpu/drm/via/via_dmablit.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 8 - + drivers/gpu/drm/virtio/virtgpu_display.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 5 +- + drivers/gpu/drm/virtio/virtgpu_fb.c | 5 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 1 + + drivers/gpu/drm/virtio/virtgpu_vq.c | 57 +- + drivers/gpu/drm/vmwgfx/Makefile | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 1111 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 143 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 373 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 258 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource_priv.h | 40 + + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 510 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 256 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 937 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_va.c | 168 + + drivers/gpu/drm/zte/zx_drm_drv.c | 17 +- + drivers/gpu/drm/zte/zx_vou.c | 61 +- + drivers/gpu/drm/zte/zx_vou.h | 3 - + drivers/gpu/ipu-v3/Makefile | 2 +- + drivers/gpu/ipu-v3/ipu-common.c | 43 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 78 +- + drivers/gpu/ipu-v3/ipu-dc.c | 61 +- + drivers/gpu/ipu-v3/ipu-dp.c | 15 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 7 +- + drivers/gpu/ipu-v3/ipu-pre.c | 289 + + drivers/gpu/ipu-v3/ipu-prg.c | 424 + + drivers/gpu/ipu-v3/ipu-prv.h | 27 +- + drivers/gpu/vga/vga_switcheroo.c | 28 +- + drivers/of/platform.c | 71 + + include/drm/bridge/analogix_dp.h | 3 + + include/drm/bridge/dw_hdmi.h | 33 +- + include/drm/drmP.h | 219 +- + include/drm/drm_atomic.h | 189 +- + include/drm/drm_atomic_helper.h | 28 +- + include/drm/drm_auth.h | 17 + + include/drm/drm_connector.h | 127 +- + include/drm/drm_crtc.h | 61 +- + include/drm/drm_dp_helper.h | 66 + + include/drm/drm_drv.h | 98 +- + include/drm/drm_edid.h | 8 +- + include/drm/drm_fb_helper.h | 16 +- + include/drm/drm_file.h | 375 + + include/drm/drm_framebuffer.h | 49 +- + include/drm/drm_gem.h | 110 +- + include/drm/drm_gem_cma_helper.h | 26 + + include/drm/drm_irq.h | 1 - + include/drm/drm_mm.h | 5 +- + include/drm/drm_mode_config.h | 13 +- + include/drm/drm_mode_object.h | 36 +- + include/drm/drm_pci.h | 75 + + include/drm/drm_prime.h | 80 + + include/drm/drm_print.h | 3 + + include/drm/drm_property.h | 35 +- + include/drm/drm_scdc_helper.h | 159 + + include/drm/drm_vma_manager.h | 1 - + include/drm/i915_pciids.h | 11 +- + include/drm/ttm/ttm_bo_api.h | 60 +- + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/linux/dma-fence-array.h | 2 + + include/linux/hdmi.h | 1 + + include/linux/of_platform.h | 11 + + include/linux/reservation.h | 20 + + include/uapi/drm/amdgpu_drm.h | 69 +- + include/uapi/drm/drm_fourcc.h | 14 + + include/uapi/drm/drm_mode.h | 4 + + include/uapi/drm/i915_drm.h | 65 +- + include/uapi/drm/vmwgfx_drm.h | 24 + + include/video/imx-ipu-v3.h | 39 +- + kernel/locking/lockdep.c | 2 + + scripts/coccinelle/api/drm-get-put.cocci | 92 + + tools/testing/selftests/drivers/gpu/i915.sh | 1 + + 766 files changed, 436618 insertions(+), 19126 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/bridge/lvds-transmitter.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt + create mode 100644 Documentation/gpu/todo.rst + create mode 100644 Documentation/gpu/vc4.rst + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v9_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmsch_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v3_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v3_1.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15_common.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc15d.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/uvd_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vce_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_ih.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_ih.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_sdma_pkt_open.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/GC/gc_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/GC/gc_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/GC/gc_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MMHUB/mmhub_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIO/nbio_6_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/THM/thm_9_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/THM/thm_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/THM/thm_9_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/VCE/vce_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/VCE/vce_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/VCE/vce_4_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/soc15ip.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/vega10_enum.h + create mode 100644 drivers/gpu/drm/amd/include/atomfirmware.h + create mode 100644 drivers/gpu/drm/amd/include/atomfirmwareid.h + create mode 100644 drivers/gpu/drm/amd/include/displayobject.h + create mode 100644 drivers/gpu/drm/amd/include/dm_pp_interface.h + create mode 100644 drivers/gpu/drm/amd/include/v9_structs.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_processpptables.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu9.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu9_driver_if.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/vega10_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c + create mode 100644 drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.h + delete mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c + delete mode 100644 drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.h + create mode 100644 drivers/gpu/drm/bridge/lvds-encoder.c + create mode 100644 drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c + create mode 100644 drivers/gpu/drm/bridge/synopsys/Kconfig + create mode 100644 drivers/gpu/drm/bridge/synopsys/Makefile + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi-ahb-audio.c (100%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi-audio.h (100%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi-i2s-audio.c (100%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.c (85%) + rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.h (99%) + rename drivers/gpu/drm/{drm_fops.c => drm_file.c} (90%) + delete mode 100644 drivers/gpu/drm/drm_platform.c + create mode 100644 drivers/gpu/drm/drm_scdc_helper.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.c + create mode 100644 drivers/gpu/drm/i915/i915_gem_clflush.h + create mode 100644 drivers/gpu/drm/i915/i915_selftest.h + create mode 100644 drivers/gpu/drm/i915/intel_cdclk.c + rename drivers/gpu/drm/i915/{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} (89%) + create mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.c + create mode 100644 drivers/gpu/drm/i915/selftests/huge_gem_object.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_coherency.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_context.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_evict.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_gtt.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_object.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_gem_request.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_live_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_mock_selftests.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_random.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_random.h + create mode 100644 drivers/gpu/drm/i915/selftests/i915_selftest.c + create mode 100644 drivers/gpu/drm/i915/selftests/i915_vma.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_breadcrumbs.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_hangcheck.c + create mode 100644 drivers/gpu/drm/i915/selftests/intel_uncore.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_context.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_context.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_dmabuf.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_drm.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_engine.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_engine.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gem_device.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gem_device.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gem_object.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gtt.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_gtt.h + create mode 100644 drivers/gpu/drm/i915/selftests/mock_request.c + create mode 100644 drivers/gpu/drm/i915/selftests/mock_request.h + create mode 100644 drivers/gpu/drm/i915/selftests/scatterlist.c + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/core/msgqueue.h + create mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/sec2.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/ctxgp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/gr/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/nvdec/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/Kbuild + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/base.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/sec2/priv.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue_0137c63d.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/falcon/msgqueue_0148cdec.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgf108.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgm200.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r361.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r364.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r367.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/acr_r375.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/gp102.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/hs_ucode.h + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/secboot/ls_ucode_msgqueue.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_va.c + create mode 100644 drivers/gpu/ipu-v3/ipu-pre.c + create mode 100644 drivers/gpu/ipu-v3/ipu-prg.c + create mode 100644 include/drm/drm_file.h + create mode 100644 include/drm/drm_pci.h + create mode 100644 include/drm/drm_prime.h + create mode 100644 include/drm/drm_scdc_helper.h + create mode 100644 scripts/coccinelle/api/drm-get-put.cocci +Merging drm-panel/drm/panel/for-next (eaeebffa90f3 drm/panel: simple: Specify bus width and flags for EDT displays) +$ git merge drm-panel/drm/panel/for-next +Already up-to-date. +Merging drm-intel/for-linux-next (5f09ad8be7bc drm/i915: Clear gt.active_requests before checking idle status) +$ git merge drm-intel/for-linux-next +Recorded preimage for 'drivers/gpu/drm/i915/gvt/vgpu.c' +Resolved 'drivers/gpu/drm/i915/intel_lrc.c' using previous resolution. +Resolved 'drivers/gpu/drm/i915/intel_ringbuffer.h' using previous resolution. +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_ringbuffer.h +Auto-merging drivers/gpu/drm/i915/intel_ringbuffer.c +Auto-merging drivers/gpu/drm/i915/intel_lrc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/gvt/vgpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gvt/vgpu.c +Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c +Auto-merging drivers/gpu/drm/i915/gvt/render.c +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/gtt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/gpu/drm/i915/gvt/vgpu.c'. +[master 487f4d542e25] Merge remote-tracking branch 'drm-intel/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/i915/gvt/cmd_parser.c | 42 +- + drivers/gpu/drm/i915/gvt/display.c | 22 +- + drivers/gpu/drm/i915/gvt/execlist.c | 9 +- + drivers/gpu/drm/i915/gvt/gtt.c | 3 +- + drivers/gpu/drm/i915/gvt/gvt.c | 19 +- + drivers/gpu/drm/i915/gvt/gvt.h | 13 + + drivers/gpu/drm/i915/gvt/handlers.c | 427 +++++------ + drivers/gpu/drm/i915/gvt/interrupt.c | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 38 +- + drivers/gpu/drm/i915/gvt/mmio.h | 19 +- + drivers/gpu/drm/i915/gvt/render.c | 23 +- + drivers/gpu/drm/i915/gvt/sched_policy.c | 229 ++++-- + drivers/gpu/drm/i915/gvt/sched_policy.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 3 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 1 - + drivers/gpu/drm/i915/gvt/vgpu.c | 85 ++- + drivers/gpu/drm/i915/i915_debugfs.c | 50 +- + drivers/gpu/drm/i915/i915_drv.c | 10 +- + drivers/gpu/drm/i915/i915_drv.h | 93 +-- + drivers/gpu/drm/i915/i915_gem.c | 71 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/i915_gem_context.c | 18 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 2 - + drivers/gpu/drm/i915/i915_gem_request.c | 22 +- + drivers/gpu/drm/i915/i915_guc_submission.c | 828 ++++++++++++---------- + drivers/gpu/drm/i915/i915_irq.c | 4 +- + drivers/gpu/drm/i915/i915_reg.h | 7 + + drivers/gpu/drm/i915/i915_utils.h | 18 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 5 +- + drivers/gpu/drm/i915/intel_cdclk.c | 29 +- + drivers/gpu/drm/i915/intel_csr.c | 2 +- + drivers/gpu/drm/i915/intel_ddi.c | 100 +-- + drivers/gpu/drm/i915/intel_display.c | 429 +++++------ + drivers/gpu/drm/i915/intel_drv.h | 27 +- + drivers/gpu/drm/i915/intel_engine_cs.c | 33 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 71 +- + drivers/gpu/drm/i915/intel_guc_loader.c | 49 +- + drivers/gpu/drm/i915/intel_guc_log.c | 386 +++++----- + drivers/gpu/drm/i915/intel_gvt.c | 2 + + drivers/gpu/drm/i915/intel_hdmi.c | 65 ++ + drivers/gpu/drm/i915/intel_huc.c | 18 - + drivers/gpu/drm/i915/intel_lpe_audio.c | 1 + + drivers/gpu/drm/i915/intel_lrc.c | 74 +- + drivers/gpu/drm/i915/intel_opregion.c | 63 +- + drivers/gpu/drm/i915/intel_pm.c | 88 ++- + drivers/gpu/drm/i915/intel_ringbuffer.c | 29 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 57 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 12 +- + drivers/gpu/drm/i915/intel_sprite.c | 286 ++++---- + drivers/gpu/drm/i915/intel_uc.c | 342 +++++---- + drivers/gpu/drm/i915/intel_uc.h | 84 ++- + drivers/gpu/drm/i915/intel_uncore.c | 150 ++-- + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 6 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 1 - + drivers/gpu/drm/i915/selftests/mock_engine.c | 1 - + drivers/gpu/drm/i915/selftests/scatterlist.c | 11 +- + 56 files changed, 2534 insertions(+), 1952 deletions(-) +Merging drm-tegra/drm/tegra/for-next (0725ed651da1 drm/tegra: Add tiling FB modifiers) +$ git merge drm-tegra/drm/tegra/for-next +Resolved 'drivers/gpu/drm/tegra/drm.c' using previous resolution. +Auto-merging include/uapi/drm/drm_fourcc.h +Auto-merging drivers/gpu/drm/tegra/fb.c +Auto-merging drivers/gpu/drm/tegra/drm.h +Auto-merging drivers/gpu/drm/tegra/drm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tegra/drm.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 29833f58b840] Merge remote-tracking branch 'drm-tegra/drm/tegra/for-next' +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/tegra/drm.c | 167 ++++++++++++++++++++++++++++++------------ + drivers/gpu/drm/tegra/drm.h | 3 +- + drivers/gpu/drm/tegra/fb.c | 23 +++++- + drivers/gpu/drm/tegra/gem.c | 12 ++- + drivers/gpu/host1x/syncpt.c | 2 +- + include/uapi/drm/drm_fourcc.h | 45 ++++++++++++ + 6 files changed, 198 insertions(+), 54 deletions(-) +Merging drm-misc/for-linux-next (50021ff1ad5d drm/fb-helper: Improve code readability) +$ git merge drm-misc/for-linux-next +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c' using previous resolution. +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c' using previous resolution. +Resolved 'drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c' using previous resolution. +Auto-merging include/linux/pci.h +Auto-merging drivers/pci/pci.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/radeon/radeon_kms.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Auto-merging drivers/gpu/drm/i915/intel_display.c +Auto-merging drivers/gpu/drm/i915/i915_drv.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9d2ce70b2002] Merge remote-tracking branch 'drm-misc/for-linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/EDID/edid.S | 6 +- + .../display/rockchip/dw_mipi_dsi_rockchip.txt | 2 +- + Documentation/gpu/drm-uapi.rst | 12 ++ + Documentation/gpu/introduction.rst | 25 +++ + Documentation/gpu/kms-properties.csv | 5 - + Documentation/gpu/todo.rst | 96 ++++++++++++ + Documentation/process/index.rst | 1 + + MAINTAINERS | 10 ++ + drivers/dma-buf/dma-buf.c | 34 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 6 +- + drivers/gpu/drm/armada/armada_crtc.c | 3 +- + drivers/gpu/drm/armada/armada_overlay.c | 6 +- + drivers/gpu/drm/bochs/bochs_fbdev.c | 4 +- + drivers/gpu/drm/bochs/bochs_kms.c | 3 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 72 ++++++++- + drivers/gpu/drm/drm_atomic_helper.c | 171 ++++++++------------- + drivers/gpu/drm/drm_crtc.c | 73 ++++++--- + drivers/gpu/drm/drm_crtc_helper.c | 4 +- + drivers/gpu/drm/drm_debugfs.c | 56 ++----- + drivers/gpu/drm/drm_debugfs_crc.c | 17 +- + drivers/gpu/drm/drm_dp_mst_topology.c | 35 ++--- + drivers/gpu/drm/drm_fb_cma_helper.c | 2 +- + drivers/gpu/drm/drm_fb_helper.c | 120 ++++++++------- + drivers/gpu/drm/drm_fourcc.c | 25 +++ + drivers/gpu/drm/drm_framebuffer.c | 45 ++++-- + drivers/gpu/drm/drm_internal.h | 2 +- + drivers/gpu/drm/drm_ioctl.c | 1 + + drivers/gpu/drm/drm_irq.c | 90 +++++++---- + drivers/gpu/drm/drm_modeset_helper.c | 2 +- + drivers/gpu/drm/drm_plane.c | 91 +++++++++-- + drivers/gpu/drm/drm_plane_helper.c | 11 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 4 +- + drivers/gpu/drm/gma500/gma_display.c | 7 +- + drivers/gpu/drm/gma500/gma_display.h | 3 +- + drivers/gpu/drm/i915/i915_drv.c | 20 +-- + drivers/gpu/drm/i915/intel_display.c | 5 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 8 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 7 +- + drivers/gpu/drm/nouveau/dispnv04/overlay.c | 18 ++- + drivers/gpu/drm/nouveau/nouveau_display.c | 11 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 10 +- + drivers/gpu/drm/nouveau/nv50_display.c | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 7 +- + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 4 +- + drivers/gpu/drm/radeon/radeon_kms.c | 3 +- + drivers/gpu/drm/rockchip/Kconfig | 10 +- + drivers/gpu/drm/rockchip/Makefile | 16 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 9 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 8 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi.c | 50 ++++-- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 10 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 10 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 141 +++++++++++------ + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 6 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 8 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 3 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 8 +- + drivers/gpu/drm/tegra/dc.c | 8 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 12 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 19 +-- + drivers/gpu/drm/tinydrm/mi0283qt.c | 3 + + drivers/gpu/drm/udl/udl_modeset.c | 3 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 5 +- + drivers/gpu/drm/vc4/vc4_plane.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 3 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 3 +- + drivers/gpu/drm/zte/zx_hdmi.c | 1 - + drivers/pci/pci.h | 2 + + drivers/pci/probe.c | 21 +++ + drivers/platform/x86/apple-gmux.c | 31 +++- + include/drm/drmP.h | 106 +------------ + include/drm/drm_atomic.h | 159 ++++++++++++++++++- + include/drm/drm_atomic_helper.h | 16 +- + include/drm/drm_connector.h | 17 +- + include/drm/drm_crtc.h | 28 +++- + include/drm/drm_crtc_helper.h | 39 ++--- + include/drm/drm_debugfs.h | 101 ++++++++++++ + include/drm/drm_dp_mst_helper.h | 15 +- + include/drm/drm_drv.h | 4 +- + include/drm/drm_fourcc.h | 6 + + include/drm/drm_global.h | 8 +- + include/drm/drm_hashtab.h | 20 +-- + include/drm/drm_ioctl.h | 102 ++++++++++++ + include/drm/drm_mode_config.h | 154 +++++++++++++++---- + include/drm/drm_of.h | 24 +-- + include/drm/drm_pci.h | 22 +-- + include/drm/drm_plane.h | 43 ++++-- + include/drm/drm_plane_helper.h | 6 +- + include/drm/drm_prime.h | 30 ++-- + include/drm/drm_scdc_helper.h | 2 + + include/drm/drm_simple_kms_helper.h | 2 +- + include/drm/drm_sysfs.h | 4 +- + include/drm/tinydrm/tinydrm.h | 4 +- + include/linux/pci.h | 23 +++ + 101 files changed, 1690 insertions(+), 817 deletions(-) + create mode 100644 include/drm/drm_debugfs.h + create mode 100644 include/drm/drm_ioctl.h +$ git am -3 ../patches/0001-drm-vmwgfx-merge-fixup-for-set_config-API-change.patch +Applying: drm/vmwgfx: merge fixup for set_config API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +M drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +$ git add -A . +$ git commit -v -a --amend +[master 602a51bf9b4a] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Mon Apr 3 13:14:29 2017 +1000 +$ git am -3 ../patches/0001-drm-vmwgfx-merge-fixup-for-page_flip-API-change.patch +Applying: drm/vmwgfx: merge fixup for page_flip API change +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +M drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +$ git add -A . +$ git commit -v -a --amend +[master 8a2398eb335c] Merge remote-tracking branch 'drm-misc/for-linux-next' + Date: Mon Apr 3 13:14:29 2017 +1000 +Merging drm-exynos/exynos-drm/for-next (7d1e04231461 Merge tag 'usercopy-v4.8-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge drm-exynos/exynos-drm/for-next +Already up-to-date. +Merging drm-msm/msm-next (849f0512efc9 msm/drm: gpu: Dynamically locate the clocks from the device tree) +$ git merge drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 - + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 4 - + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 28 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 126 +++++-- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 70 ++-- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 7 - + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 12 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.c | 81 ++++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cfg.h | 8 + + drivers/gpu/drm/msm/mdp/mdp5/mdp5_cmd_encoder.c | 30 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 466 +++++++++++++++++++----- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.c | 192 ++++++---- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_ctl.h | 21 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_encoder.c | 66 ++-- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 123 +++++-- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.h | 53 ++- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c | 172 +++++++++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h | 47 +++ + drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.c | 2 - + drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h | 4 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 340 ++++++++++++----- + drivers/gpu/drm/msm/mdp/mdp_kms.h | 6 + + drivers/gpu/drm/msm/msm_debugfs.c | 2 + + drivers/gpu/drm/msm/msm_drv.c | 13 +- + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 6 + + drivers/gpu/drm/msm/msm_gem.h | 2 + + drivers/gpu/drm/msm/msm_gem_submit.c | 39 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 35 +- + drivers/gpu/drm/msm/msm_gpu.c | 186 +++++----- + drivers/gpu/drm/msm/msm_gpu.h | 18 +- + drivers/gpu/drm/msm/msm_iommu.c | 69 +--- + drivers/gpu/drm/msm/msm_rd.c | 4 +- + include/uapi/drm/msm_drm.h | 1 + + 38 files changed, 1600 insertions(+), 645 deletions(-) + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.c + create mode 100644 drivers/gpu/drm/msm/mdp/mdp5/mdp5_mixer.h +Merging hdlcd/for-upstream/hdlcd (1de3cd4fb49f drm: hdlcd: Fix the calculation of the scanout start address) +$ git merge hdlcd/for-upstream/hdlcd +Auto-merging drivers/gpu/drm/arm/hdlcd_crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/hdlcd_crtc.c | 47 ++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 16 deletions(-) +Merging mali-dp/for-upstream/mali-dp (cda0c3ce3297 drm: mali-dp: remove unused variable) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + drivers/gpu/drm/arm/malidp_crtc.c | 14 +++- + drivers/gpu/drm/arm/malidp_drv.c | 140 +++++++++++++++++++++++++++++------- + drivers/gpu/drm/arm/malidp_drv.h | 1 + + drivers/gpu/drm/arm/malidp_hw.h | 5 ++ + drivers/gpu/drm/arm/malidp_planes.c | 12 ++++ + 5 files changed, 145 insertions(+), 27 deletions(-) +Merging sunxi/sunxi/for-next (af4b31682bbe Merge branch 'sunxi/dt-for-4.12' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Auto-merging drivers/gpu/drm/sun4i/sun4i_drv.c +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/boot/dts/sun8i-a33.dtsi +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/clock/sunxi-ccu.txt | 1 + + .../bindings/display/sunxi/sun4i-drm.txt | 2 + + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 8 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/axp209.dtsi | 5 + + arch/arm/boot/dts/axp22x.dtsi | 5 + + arch/arm/boot/dts/sun4i-a10-a1000.dts | 1 - + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 1 - + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 1 - + arch/arm/boot/dts/sun4i-a10-hackberry.dts | 1 - + arch/arm/boot/dts/sun4i-a10-inet1.dts | 1 - + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 1 - + arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts | 1 - + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 1 - + arch/arm/boot/dts/sun4i-a10-mini-xplus.dts | 1 - + arch/arm/boot/dts/sun4i-a10-mk802.dts | 1 - + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 1 - + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 1 - + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 1 - + arch/arm/boot/dts/sun4i-a10.dtsi | 1 - + arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts | 1 - + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 1 - + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 5 +- + arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts | 1 - + arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts | 3 +- + arch/arm/boot/dts/sun5i-a10s.dtsi | 77 +-- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 1 - + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 1 - + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 1 - + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 1 - + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 1 - + arch/arm/boot/dts/sun5i-a13.dtsi | 140 ----- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 4 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 4 +- + arch/arm/boot/dts/sun5i-gr8.dtsi | 618 +-------------------- + arch/arm/boot/dts/sun5i-r8-chip.dts | 6 +- + arch/arm/boot/dts/sun5i-r8.dtsi | 40 -- + arch/arm/boot/dts/sun5i.dtsi | 284 +++++++++- + arch/arm/boot/dts/sun6i-a31-app4-evb1.dts | 1 - + arch/arm/boot/dts/sun6i-a31-colombus.dts | 1 - + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 1 - + arch/arm/boot/dts/sun6i-a31-i7.dts | 1 - + arch/arm/boot/dts/sun6i-a31-m9.dts | 1 - + arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts | 1 - + arch/arm/boot/dts/sun6i-a31.dtsi | 1 - + arch/arm/boot/dts/sun6i-a31s-cs908.dts | 2 - + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 1 - + arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi | 1 - + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 23 + + arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts | 57 ++ + .../dts/sun6i-a31s-yones-toptech-bs1078-v2.dts | 1 - + .../boot/dts/sun6i-reference-design-tablet.dtsi | 1 - + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 1 - + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 1 - + arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 1 - + arch/arm/boot/dts/sun7i-a20-hummingbird.dts | 1 - + arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts | 1 - + arch/arm/boot/dts/sun7i-a20-icnova-swac.dts | 1 - + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 1 - + arch/arm/boot/dts/sun7i-a20-m3.dts | 1 - + arch/arm/boot/dts/sun7i-a20-mk808c.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 1 - + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 36 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 1 - + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 1 - + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 1 - + arch/arm/boot/dts/sun7i-a20.dtsi | 1 - + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 1 - + arch/arm/boot/dts/sun8i-a23-evb.dts | 1 - + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 10 - + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 9 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 84 ++- + arch/arm/boot/dts/sun8i-a83t.dtsi | 2 - + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 21 +- + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 1 - + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 11 +- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 96 ++++ + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 1 - + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 1 - + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 1 - + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 23 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 1 - + arch/arm/boot/dts/sun8i-h3.dtsi | 602 ++------------------ + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 1 - + arch/arm/boot/dts/sun9i-a80-optimus.dts | 1 - + arch/arm/boot/dts/sun9i-a80.dtsi | 2 - + arch/arm/boot/dts/sunxi-common-regulators.dtsi | 1 - + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 618 +++++++++++++++++++++ + .../boot/dts/sunxi-reference-design-tablet.dtsi | 1 - + arch/arm/configs/multi_v7_defconfig | 10 +- + arch/arm/configs/sunxi_defconfig | 2 + + arch/arm/mach-sunxi/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 1 - + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 188 +++++++ + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 124 +++++ + arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 + + arch/arm64/configs/defconfig | 1 + + drivers/clk/sunxi-ng/Kconfig | 11 +- + drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 327 ++++++++++- + drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 3 +- + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 3 +- + drivers/clk/sunxi-ng/ccu_gate.c | 47 ++ + drivers/clk/sunxi-ng/ccu_nk.c | 8 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 8 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 8 +- + drivers/clk/sunxi-ng/ccu_nm.c | 4 +- + drivers/gpu/drm/sun4i/Makefile | 4 +- + drivers/gpu/drm/sun4i/sun4i_backend.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 70 ++- + drivers/gpu/drm/sun4i/sun4i_crtc.h | 8 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 47 +- + drivers/gpu/drm/sun4i/sun4i_drv.h | 4 - + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 1 - + drivers/gpu/drm/sun4i/sun4i_layer.c | 32 +- + drivers/gpu/drm/sun4i/sun4i_layer.h | 4 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 30 +- + drivers/gpu/drm/sun4i/sun4i_rgb.h | 2 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 36 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 3 + + drivers/gpu/drm/sun4i/sun4i_tv.c | 27 +- + include/dt-bindings/clock/sun8i-h3-ccu.h | 5 +- + include/dt-bindings/reset/sun8i-h3-ccu.h | 5 +- + 126 files changed, 2240 insertions(+), 1649 deletions(-) + create mode 100644 arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts + create mode 100644 arch/arm/boot/dts/sunxi-h3-h5.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi + create mode 120000 arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi +Merging kspp/for-next/kspp (9b5e50a16f07 security/Kconfig: further restrict HARDENED_USERCOPY) +$ git merge kspp/for-next/kspp +Resolved 'include/drm/drm_drv.h' using previous resolution. +Auto-merging security/Kconfig +Auto-merging scripts/Makefile.gcc-plugins +Auto-merging mm/util.c +Auto-merging mm/kasan/kasan.c +Auto-merging lib/vsprintf.c +Auto-merging lib/string.c +Auto-merging include/linux/printk.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/compiler.h +Auto-merging include/linux/compiler-gcc.h +Auto-merging include/linux/audit.h +Auto-merging include/drm/drm_drv.h +CONFLICT (content): Merge conflict in include/drm/drm_drv.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/acpi/acpixf.h +Auto-merging drivers/acpi/acpica/acutils.h +Auto-merging arch/x86/kernel/hpet.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d290cce63c1c] Merge remote-tracking branch 'kspp/for-next/kspp' +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 40 + + arch/arm/include/asm/string.h | 10 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/string.h | 25 +- + arch/powerpc/include/asm/string.h | 19 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/string_32.h | 25 +- + arch/x86/include/asm/string_64.h | 23 +- + arch/x86/kernel/hpet.c | 2 +- + arch/x86/lib/Makefile | 4 + + drivers/acpi/acpica/acutils.h | 2 +- + fs/char_dev.c | 2 +- + fs/ntfs/debug.h | 6 +- + fs/ocfs2/cluster/masklog.h | 2 +- + include/acpi/acpixf.h | 2 +- + include/asm-generic/asm-prototypes.h | 8 +- + include/asm-generic/bug.h | 7 +- + include/asm-generic/vmlinux.lds.h | 2 + + include/drm/drm_drv.h | 2 +- + include/linux/audit.h | 5 +- + include/linux/compiler-gcc.h | 22 + + include/linux/compiler.h | 8 + + include/linux/fs.h | 8 +- + include/linux/printk.h | 2 +- + include/linux/ratelimit.h | 3 +- + include/linux/string.h | 75 +- + lib/string.c | 3 +- + lib/vsprintf.c | 6 +- + mm/kasan/kasan.c | 2 + + mm/util.c | 10 +- + scripts/Makefile.gcc-plugins | 14 + + scripts/gcc-plugins/initify_plugin.c | 1865 ++++++++++++++++++++++++++++++++++ + security/Kconfig | 2 + + security/integrity/integrity.h | 2 +- + 34 files changed, 2092 insertions(+), 118 deletions(-) + create mode 100644 scripts/gcc-plugins/initify_plugin.c +Merging kconfig/for-next (5bcba792bb30 localmodconfig: Fix whitespace repeat count after "tristate") +$ git merge kconfig/for-next +Already up-to-date. +Merging regmap/for-next (bbbed1951704 Merge remote-tracking branches 'regmap/topic/doc' and 'regmap/topic/rbtree' into regmap-next) +$ git merge regmap/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging sound/for-next (d1600401faad ALSA: hda/ca0132: Limit values for chip addresses to 32-bit) +$ git merge sound/for-next +Auto-merging sound/pci/hda/patch_realtek.c +Merge made by the 'recursive' strategy. + include/uapi/sound/asound.h | 3 +- + include/uapi/sound/firewire.h | 10 +- + sound/core/timer.c | 19 +- + sound/drivers/vx/vx_core.c | 4 +- + sound/firewire/Kconfig | 12 + + sound/firewire/Makefile | 1 + + sound/firewire/amdtp-stream.c | 36 ++- + sound/firewire/amdtp-stream.h | 9 +- + sound/firewire/motu/Makefile | 4 + + sound/firewire/motu/amdtp-motu.c | 388 ++++++++++++++++++++++++++++++++ + sound/firewire/motu/motu-hwdep.c | 198 ++++++++++++++++ + sound/firewire/motu/motu-midi.c | 169 ++++++++++++++ + sound/firewire/motu/motu-pcm.c | 398 +++++++++++++++++++++++++++++++++ + sound/firewire/motu/motu-proc.c | 118 ++++++++++ + sound/firewire/motu/motu-protocol-v2.c | 237 ++++++++++++++++++++ + sound/firewire/motu/motu-protocol-v3.c | 312 ++++++++++++++++++++++++++ + sound/firewire/motu/motu-stream.c | 381 +++++++++++++++++++++++++++++++ + sound/firewire/motu/motu-transaction.c | 137 ++++++++++++ + sound/firewire/motu/motu.c | 264 ++++++++++++++++++++++ + sound/firewire/motu/motu.h | 161 +++++++++++++ + sound/isa/es1688/es1688_lib.c | 2 +- + sound/pci/au88x0/au88x0_a3d.c | 2 +- + sound/pci/au88x0/au88x0_core.c | 3 + + sound/pci/au88x0/au88x0_eq.c | 6 +- + sound/pci/au88x0/au88x0_pcm.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 2 +- + sound/pci/bt87x.c | 6 +- + sound/pci/ca0106/ca0106_mixer.c | 4 +- + sound/pci/cmipci.c | 6 +- + sound/pci/cs4281.c | 4 +- + sound/pci/echoaudio/echoaudio.c | 26 +-- + sound/pci/emu10k1/emu10k1x.c | 6 +- + sound/pci/emu10k1/emumixer.c | 30 +-- + sound/pci/emu10k1/emupcm.c | 2 +- + sound/pci/ens1370.c | 4 +- + sound/pci/hda/hda_codec.c | 4 +- + sound/pci/hda/patch_ca0132.c | 10 +- + sound/pci/hda/patch_hdmi.c | 2 +- + sound/pci/hda/patch_realtek.c | 101 +++++++++ + sound/pci/ice1712/delta.c | 2 +- + sound/pci/ice1712/ews.c | 4 +- + sound/pci/ice1712/ice1712.c | 30 +-- + sound/pci/ice1712/ice1724.c | 20 +- + sound/pci/lola/lola_mixer.c | 2 +- + sound/pci/lx6464es/lx6464es.c | 2 +- + sound/pci/mixart/mixart_mixer.c | 6 +- + sound/pci/oxygen/oxygen.c | 6 +- + sound/pci/pcxhr/pcxhr_mix22.c | 6 +- + sound/pci/pcxhr/pcxhr_mixer.c | 22 +- + sound/pci/trident/trident_main.c | 22 +- + sound/pci/via82xx.c | 6 +- + sound/pci/vx222/vx222_ops.c | 4 +- + sound/pci/ymfpci/ymfpci_main.c | 14 +- + sound/synth/emux/emux_oss.c | 4 +- + sound/usb/card.c | 6 +- + sound/usb/mixer_scarlett.c | 12 +- + 56 files changed, 3081 insertions(+), 170 deletions(-) + create mode 100644 sound/firewire/motu/Makefile + create mode 100644 sound/firewire/motu/amdtp-motu.c + create mode 100644 sound/firewire/motu/motu-hwdep.c + create mode 100644 sound/firewire/motu/motu-midi.c + create mode 100644 sound/firewire/motu/motu-pcm.c + create mode 100644 sound/firewire/motu/motu-proc.c + create mode 100644 sound/firewire/motu/motu-protocol-v2.c + create mode 100644 sound/firewire/motu/motu-protocol-v3.c + create mode 100644 sound/firewire/motu/motu-stream.c + create mode 100644 sound/firewire/motu/motu-transaction.c + create mode 100644 sound/firewire/motu/motu.c + create mode 100644 sound/firewire/motu/motu.h +Merging sound-asoc/for-next (3e01d2af9bc2 Merge remote-tracking branch 'asoc/topic/zte-tdm' into asoc-next) +$ git merge sound-asoc/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/sound/cs35l35.txt | 176 +++ + .../devicetree/bindings/sound/dioo,dio2125.txt | 12 + + .../devicetree/bindings/sound/everest,es7134.txt | 10 + + .../devicetree/bindings/sound/mt2701-wm8960.txt | 24 + + .../devicetree/bindings/sound/rockchip-i2s.txt | 1 + + .../devicetree/bindings/sound/tas2552.txt | 3 + + Documentation/devicetree/bindings/sound/wm8903.txt | 13 + + .../devicetree/bindings/sound/zte,tdm.txt | 30 + + include/sound/cs35l35.h | 105 ++ + include/sound/soc.h | 2 +- + sound/hda/hdac_controller.c | 2 +- + sound/soc/blackfin/bfin-eval-adau1373.c | 2 +- + sound/soc/blackfin/bfin-eval-adav80x.c | 2 +- + sound/soc/codecs/Kconfig | 20 +- + sound/soc/codecs/Makefile | 6 + + sound/soc/codecs/cs35l35.c | 1548 ++++++++++++++++++++ + sound/soc/codecs/cs35l35.h | 288 ++++ + sound/soc/codecs/da7213.c | 13 + + sound/soc/codecs/dio2125.c | 120 ++ + sound/soc/codecs/es7134.c | 116 ++ + sound/soc/codecs/es8328.c | 51 +- + sound/soc/codecs/hdac_hdmi.c | 4 +- + sound/soc/codecs/rt5665.c | 216 ++- + sound/soc/codecs/tlv320aic23.c | 7 +- + sound/soc/codecs/wm8903.c | 31 + + sound/soc/codecs/wm8960.c | 90 +- + sound/soc/fsl/eukrea-tlv320.c | 2 +- + sound/soc/fsl/imx-mc13783.c | 2 +- + sound/soc/fsl/imx-pcm-dma.c | 28 - + sound/soc/fsl/imx-pcm-fiq.c | 2 +- + sound/soc/fsl/imx-wm8962.c | 41 +- + sound/soc/fsl/mpc8610_hpcd.c | 2 +- + sound/soc/fsl/mx27vis-aic32x4.c | 2 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/fsl/p1022_rdk.c | 2 +- + sound/soc/fsl/phycore-ac97.c | 2 +- + sound/soc/fsl/wm1133-ev1.c | 2 +- + sound/soc/generic/simple-card.c | 43 +- + sound/soc/generic/simple-scu-card.c | 37 +- + sound/soc/intel/Kconfig | 24 + + sound/soc/intel/atom/sst/sst_acpi.c | 25 +- + sound/soc/intel/atom/sst/sst_ipc.c | 4 +- + sound/soc/intel/boards/Makefile | 4 + + sound/soc/intel/boards/bdw-rt5677.c | 5 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 97 +- + sound/soc/intel/boards/bxt_rt298.c | 3 + + sound/soc/intel/boards/bytcht_da7213.c | 283 ++++ + sound/soc/intel/boards/bytcht_nocodec.c | 208 +++ + sound/soc/intel/haswell/sst-haswell-ipc.c | 6 - + sound/soc/intel/skylake/bxt-sst.c | 98 +- + sound/soc/intel/skylake/skl-messages.c | 14 +- + sound/soc/intel/skylake/skl-nhlt.c | 7 +- + sound/soc/intel/skylake/skl-pcm.c | 104 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 26 +- + sound/soc/intel/skylake/skl-sst-cldma.h | 2 +- + sound/soc/intel/skylake/skl-sst-dsp.c | 6 +- + sound/soc/intel/skylake/skl-sst-dsp.h | 27 +- + sound/soc/intel/skylake/skl-sst-ipc.c | 66 +- + sound/soc/intel/skylake/skl-sst-ipc.h | 15 + + sound/soc/intel/skylake/skl-sst-utils.c | 60 +- + sound/soc/intel/skylake/skl-sst.c | 58 +- + sound/soc/intel/skylake/skl-topology.c | 126 +- + sound/soc/intel/skylake/skl-topology.h | 15 +- + sound/soc/mediatek/Kconfig | 10 + + sound/soc/mediatek/mt2701/Makefile | 1 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 16 + + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 176 +++ + sound/soc/mediatek/mt8173/mt8173-max98090.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 2 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 2 +- + sound/soc/omap/am3517evm.c | 2 +- + sound/soc/omap/n810.c | 2 +- + sound/soc/omap/omap-abe-twl6040.c | 2 +- + sound/soc/omap/omap-twl4030.c | 2 +- + sound/soc/omap/omap3pandora.c | 2 +- + sound/soc/omap/osk5912.c | 2 +- + sound/soc/omap/rx51.c | 7 +- + sound/soc/pxa/brownstone.c | 2 +- + sound/soc/pxa/corgi.c | 2 +- + sound/soc/pxa/e750_wm9705.c | 2 +- + sound/soc/pxa/e800_wm9712.c | 2 +- + sound/soc/pxa/em-x270.c | 2 +- + sound/soc/pxa/hx4700.c | 2 +- + sound/soc/pxa/imote2.c | 2 +- + sound/soc/pxa/magician.c | 4 +- + sound/soc/pxa/mioa701_wm9713.c | 2 +- + sound/soc/pxa/mmp-pcm.c | 1 - + sound/soc/pxa/mmp-sspa.c | 1 - + sound/soc/pxa/poodle.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 15 +- + sound/soc/pxa/pxa2xx-ac97.c | 5 +- + sound/soc/pxa/pxa2xx-i2s.c | 8 +- + sound/soc/pxa/pxa2xx-pcm.c | 2 +- + sound/soc/pxa/raumfeld.c | 8 +- + sound/soc/pxa/spitz.c | 6 +- + sound/soc/pxa/tosa.c | 4 +- + sound/soc/pxa/z2.c | 6 +- + sound/soc/pxa/zylonite.c | 2 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 3 + + sound/soc/samsung/bells.c | 1 - + sound/soc/samsung/i2s-regs.h | 2 - + sound/soc/samsung/i2s.c | 1 - + sound/soc/samsung/s3c-i2s-v2.c | 1 - + sound/soc/sh/rcar/adg.c | 24 +- + sound/soc/sh/rcar/core.c | 13 +- + sound/soc/sh/rcar/dvc.c | 16 - + sound/soc/sh/rcar/rsnd.h | 3 - + sound/soc/sh/rcar/ssi.c | 9 + + sound/soc/sirf/sirf-audio-port.c | 1 + + sound/soc/sirf/sirf-audio.c | 1 + + sound/soc/sirf/sirf-usp.c | 3 + + sound/soc/soc-core.c | 17 +- + sound/soc/soc-jack.c | 30 + + sound/soc/sunxi/sun8i-codec-analog.c | 168 ++- + sound/soc/sunxi/sun8i-codec.c | 10 +- + sound/soc/tegra/tegra20_ac97.c | 1 - + sound/soc/tegra/tegra20_das.c | 2 +- + sound/soc/tegra/tegra20_i2s.c | 1 - + sound/soc/tegra/tegra20_spdif.c | 5 +- + sound/soc/tegra/tegra30_ahub.c | 5 +- + sound/soc/tegra/tegra30_i2s.c | 1 - + sound/soc/tegra/tegra_alc5632.c | 4 +- + sound/soc/tegra/tegra_max98090.c | 4 +- + sound/soc/tegra/tegra_rt5640.c | 4 +- + sound/soc/tegra/tegra_sgtl5000.c | 4 +- + sound/soc/tegra/tegra_wm8753.c | 4 +- + sound/soc/tegra/tegra_wm8903.c | 4 +- + sound/soc/tegra/tegra_wm9712.c | 4 +- + sound/soc/tegra/trimslice.c | 4 +- + sound/soc/txx9/txx9aclc.c | 5 +- + sound/soc/ux500/mop500.c | 4 - + sound/soc/ux500/ux500_msp_dai.c | 4 +- + sound/soc/ux500/ux500_msp_i2s.c | 1 - + sound/soc/zte/Kconfig | 8 + + sound/soc/zte/Makefile | 1 + + sound/soc/zte/zx-tdm.c | 461 ++++++ + 138 files changed, 4742 insertions(+), 746 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/cs35l35.txt + create mode 100644 Documentation/devicetree/bindings/sound/dioo,dio2125.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es7134.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt2701-wm8960.txt + create mode 100644 Documentation/devicetree/bindings/sound/zte,tdm.txt + create mode 100644 include/sound/cs35l35.h + create mode 100644 sound/soc/codecs/cs35l35.c + create mode 100644 sound/soc/codecs/cs35l35.h + create mode 100644 sound/soc/codecs/dio2125.c + create mode 100644 sound/soc/codecs/es7134.c + create mode 100644 sound/soc/intel/boards/bytcht_da7213.c + create mode 100644 sound/soc/intel/boards/bytcht_nocodec.c + create mode 100644 sound/soc/mediatek/mt2701/mt2701-wm8960.c + create mode 100644 sound/soc/zte/zx-tdm.c +Merging modules/modules-next (5bd933fe4481 module: set .init_array alignment to 8) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + scripts/module-common.lds | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging input/next (f069b5a0b27a Input: bma150 - remove support for bma150) +$ git merge input/next +Auto-merging drivers/input/touchscreen/tsc2007_core.c +Auto-merging drivers/input/mouse/alps.h +Auto-merging drivers/input/mouse/alps.c +Merge made by the 'recursive' strategy. + .../bindings/input/gpio-matrix-keypad.txt | 2 + + .../devicetree/bindings/input/pwm-beeper.txt | 1 + + .../bindings/input/touchscreen/ad7879.txt | 19 + + .../bindings/input/{ => touchscreen}/ads7846.txt | 0 + .../bindings/input/touchscreen/max11801-ts.txt | 18 + + drivers/input/gameport/gameport.c | 4 +- + drivers/input/joystick/gamecon.c | 3 +- + drivers/input/keyboard/matrix_keypad.c | 13 +- + drivers/input/keyboard/qt1070.c | 9 + + drivers/input/keyboard/tca8418_keypad.c | 2 - + drivers/input/misc/apanel.c | 3 +- + drivers/input/misc/axp20x-pek.c | 62 +- + drivers/input/misc/bma150.c | 11 +- + drivers/input/misc/dm355evm_keys.c | 79 +- + drivers/input/misc/drv260x.c | 4 +- + drivers/input/misc/pwm-beeper.c | 15 +- + drivers/input/misc/soc_button_array.c | 182 ++++- + drivers/input/misc/wistron_btns.c | 5 +- + drivers/input/misc/xen-kbdfront.c | 8 +- + drivers/input/mouse/Kconfig | 16 + + drivers/input/mouse/Makefile | 2 + + drivers/input/mouse/alps.c | 76 +- + drivers/input/mouse/alps.h | 6 +- + drivers/input/mouse/psmouse-base.c | 216 ++++-- + drivers/input/mouse/psmouse-smbus.c | 294 +++++++ + drivers/input/mouse/psmouse.h | 102 ++- + drivers/input/mouse/synaptics.c | 850 ++++++++++++++------- + drivers/input/mouse/synaptics.h | 39 +- + drivers/input/mouse/synaptics_i2c.c | 9 + + drivers/input/serio/serio.c | 30 +- + drivers/input/sparse-keymap.c | 39 +- + drivers/input/touchscreen/Kconfig | 12 + + drivers/input/touchscreen/Makefile | 2 + + drivers/input/touchscreen/ad7879-i2c.c | 67 +- + drivers/input/touchscreen/ad7879-spi.c | 131 +--- + drivers/input/touchscreen/ad7879.c | 152 ++-- + drivers/input/touchscreen/ad7879.h | 14 +- + drivers/input/touchscreen/ads7846.c | 2 +- + drivers/input/touchscreen/max11801_ts.c | 7 + + drivers/input/touchscreen/melfas_mip4.c | 11 + + drivers/input/touchscreen/silead.c | 13 + + drivers/input/touchscreen/tps6507x-ts.c | 33 +- + drivers/input/touchscreen/tsc2007.h | 101 +++ + .../touchscreen/{tsc2007.c => tsc2007_core.c} | 102 +-- + drivers/input/touchscreen/tsc2007_iio.c | 140 ++++ + include/linux/input/matrix_keypad.h | 3 + + include/linux/serio.h | 1 + + 47 files changed, 1951 insertions(+), 959 deletions(-) + rename Documentation/devicetree/bindings/input/{ => touchscreen}/ads7846.txt (100%) + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/max11801-ts.txt + create mode 100644 drivers/input/mouse/psmouse-smbus.c + create mode 100644 drivers/input/touchscreen/tsc2007.h + rename drivers/input/touchscreen/{tsc2007.c => tsc2007_core.c} (83%) + create mode 100644 drivers/input/touchscreen/tsc2007_iio.c +Merging block/for-next (6ecf5c70e165 Merge branch 'for-4.12/block' into for-next) +$ git merge block/for-next +Auto-merging drivers/block/nbd.c +Auto-merging block/genhd.c +Auto-merging block/blk-mq.c +Merge made by the 'recursive' strategy. + Documentation/block/queue-sysfs.txt | 6 + + block/Kconfig | 12 + + block/bio.c | 5 +- + block/blk-cgroup.c | 123 ++++- + block/blk-core.c | 27 +- + block/blk-flush.c | 3 +- + block/blk-integrity.c | 2 +- + block/blk-lib.c | 2 +- + block/blk-mq-debugfs.c | 99 ++-- + block/blk-mq-pci.c | 2 +- + block/blk-mq.c | 354 ++++++------- + block/blk-mq.h | 1 - + block/blk-stat.c | 327 ++++++------ + block/blk-stat.h | 214 +++++++- + block/blk-sysfs.c | 55 +- + block/blk-throttle.c | 977 +++++++++++++++++++++++++++++++++--- + block/blk-wbt.c | 61 +-- + block/blk-wbt.h | 12 +- + block/blk.h | 12 + + block/genhd.c | 2 +- + block/sed-opal.c | 2 +- + block/t10-pi.c | 8 +- + drivers/block/floppy.c | 4 +- + drivers/block/hd.c | 62 ++- + drivers/block/loop.c | 2 +- + drivers/block/mg_disk.c | 4 +- + drivers/block/mtip32xx/mtip32xx.c | 4 +- + drivers/block/nbd.c | 2 +- + drivers/block/null_blk.c | 11 +- + drivers/block/paride/pcd.c | 57 ++- + drivers/block/paride/pd.c | 50 +- + drivers/block/paride/pf.c | 57 ++- + drivers/block/rbd.c | 2 +- + drivers/block/swim.c | 55 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/md/dm-rq.c | 2 +- + drivers/mtd/ubi/block.c | 2 +- + drivers/nvme/host/core.c | 2 +- + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/pci.c | 4 +- + drivers/nvme/host/rdma.c | 4 +- + drivers/nvme/target/loop.c | 4 +- + drivers/sbus/char/jsflash.c | 50 +- + drivers/scsi/scsi_lib.c | 2 +- + fs/block_dev.c | 15 +- + include/linux/backing-dev-defs.h | 6 +- + include/linux/bio.h | 2 +- + include/linux/blk-mq.h | 3 +- + include/linux/blk_types.h | 15 +- + include/linux/blkdev.h | 11 +- + include/linux/genhd.h | 10 +- + include/linux/kobject.h | 2 + + include/linux/t10-pi.h | 8 +- + include/linux/writeback.h | 1 + + lib/kobject.c | 5 +- + mm/backing-dev.c | 107 ++-- + 57 files changed, 2032 insertions(+), 847 deletions(-) +Merging lightnvm/for-next (e57ef816cf77 Merge branch 'for-4.11/block' into for-next) +$ git merge lightnvm/for-next +Already up-to-date! +Merge made by the 'recursive' strategy. +Merging device-mapper/for-next (3591b6613c18 Merge branch 'dm-4.11' into dm-next) +$ git merge device-mapper/for-next +Removing drivers/md/dm-cache-policy-cleaner.c +Auto-merging drivers/md/dm-bio-prison-v1.h +Auto-merging drivers/md/dm-bio-prison-v1.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-crypt.txt | 53 +- + Documentation/device-mapper/dm-integrity.txt | 194 ++ + Documentation/device-mapper/dm-raid.txt | 14 +- + drivers/md/Kconfig | 19 +- + drivers/md/Makefile | 7 +- + drivers/md/{dm-bio-prison.c => dm-bio-prison-v1.c} | 46 +- + drivers/md/{dm-bio-prison.h => dm-bio-prison-v1.h} | 2 +- + drivers/md/dm-bio-prison-v2.c | 369 +++ + drivers/md/dm-bio-prison-v2.h | 152 + + drivers/md/dm-bufio.c | 51 +- + drivers/md/dm-bufio.h | 7 + + drivers/md/dm-cache-background-tracker.c | 238 ++ + drivers/md/dm-cache-background-tracker.h | 46 + + drivers/md/dm-cache-metadata.c | 8 +- + drivers/md/dm-cache-metadata.h | 2 + + drivers/md/dm-cache-policy-cleaner.c | 469 --- + drivers/md/dm-cache-policy-internal.h | 76 +- + drivers/md/dm-cache-policy-smq.c | 821 +++--- + drivers/md/dm-cache-policy.h | 187 +- + drivers/md/dm-cache-target.c | 2535 +++++++--------- + drivers/md/dm-crypt.c | 1203 ++++++-- + drivers/md/dm-integrity.c | 3112 ++++++++++++++++++++ + drivers/md/dm-raid.c | 166 +- + drivers/md/dm-table.c | 11 + + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-verity-fec.c | 18 +- + drivers/md/dm-verity-fec.h | 4 + + drivers/md/raid5-cache.c | 62 +- + drivers/md/raid5.h | 11 + + include/linux/device-mapper.h | 6 + + 30 files changed, 7144 insertions(+), 2747 deletions(-) + create mode 100644 Documentation/device-mapper/dm-integrity.txt + rename drivers/md/{dm-bio-prison.c => dm-bio-prison-v1.c} (94%) + rename drivers/md/{dm-bio-prison.h => dm-bio-prison-v1.h} (99%) + create mode 100644 drivers/md/dm-bio-prison-v2.c + create mode 100644 drivers/md/dm-bio-prison-v2.h + create mode 100644 drivers/md/dm-cache-background-tracker.c + create mode 100644 drivers/md/dm-cache-background-tracker.h + delete mode 100644 drivers/md/dm-cache-policy-cleaner.c + create mode 100644 drivers/md/dm-integrity.c +Merging pcmcia/master (e8e68fd86d22 pcmcia: do not break rsrc_nonstatic when handling anonymous cards) +$ git merge pcmcia/master +Already up-to-date. +Merging mmc/next (72cc952b8954 Merge branch 'fixes' into next) +$ git merge mmc/next +Merge made by the 'recursive' strategy. + .../bindings/mmc/brcm,bcm2835-sdhost.txt | 23 + + Documentation/devicetree/bindings/mmc/mtk-sd.txt | 12 + + .../bindings/mmc/nvidia,tegra20-sdhci.txt | 12 +- + .../devicetree/bindings/mmc/renesas,mmcif.txt | 8 + + .../devicetree/bindings/mmc/sdhci-cadence.txt | 48 + + drivers/mmc/core/sdio_io.c | 54 +- + drivers/mmc/core/sdio_ops.c | 9 +- + drivers/mmc/host/Kconfig | 14 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/android-goldfish.c | 10 +- + drivers/mmc/host/atmel-mci.c | 30 +- + drivers/mmc/host/bcm2835.c | 1466 ++++++++++++++++++++ + drivers/mmc/host/davinci_mmc.c | 14 +- + drivers/mmc/host/dw_mmc.c | 397 +++--- + drivers/mmc/host/jz4740_mmc.c | 9 +- + drivers/mmc/host/meson-gx-mmc.c | 362 +++-- + drivers/mmc/host/mmc_spi.c | 5 +- + drivers/mmc/host/mmci.c | 20 +- + drivers/mmc/host/moxart-mmc.c | 8 +- + drivers/mmc/host/mtk-sd.c | 176 ++- + drivers/mmc/host/mvsdio.c | 11 +- + drivers/mmc/host/omap_hsmmc.c | 17 +- + drivers/mmc/host/s3cmci.c | 4 +- + drivers/mmc/host/sdhci-acpi.c | 18 +- + drivers/mmc/host/sdhci-brcmstb.c | 3 + + drivers/mmc/host/sdhci-cadence.c | 127 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 6 + + drivers/mmc/host/sdhci-msm.c | 8 - + drivers/mmc/host/sdhci-of-arasan.c | 26 +- + drivers/mmc/host/sdhci-of-at91.c | 5 +- + drivers/mmc/host/sdhci-of-esdhc.c | 3 + + drivers/mmc/host/sdhci-pci-core.c | 562 ++++---- + drivers/mmc/host/sdhci-pci-data.c | 3 - + drivers/mmc/host/sdhci-pci-o2micro.c | 4 +- + drivers/mmc/host/sdhci-pci.h | 24 +- + drivers/mmc/host/sdhci-pltfm.c | 3 + + drivers/mmc/host/sdhci-pxav2.c | 9 +- + drivers/mmc/host/sdhci-pxav3.c | 12 +- + drivers/mmc/host/sdhci-s3c.c | 10 +- + drivers/mmc/host/sdhci-sirf.c | 3 + + drivers/mmc/host/sdhci-spear.c | 3 + + drivers/mmc/host/sdhci-st.c | 8 +- + drivers/mmc/host/sdhci-tegra.c | 59 +- + drivers/mmc/host/sdhci.c | 431 +++--- + drivers/mmc/host/sdhci.h | 59 +- + drivers/mmc/host/sunxi-mmc.c | 16 +- + drivers/mmc/host/tmio_mmc.h | 12 +- + drivers/mmc/host/tmio_mmc_dma.c | 61 +- + drivers/mmc/host/tmio_mmc_pio.c | 36 +- + include/linux/mmc/host.h | 6 + + 50 files changed, 3119 insertions(+), 1108 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/brcm,bcm2835-sdhost.txt + create mode 100644 drivers/mmc/host/bcm2835.c +Merging kgdb/kgdb-next (7a6653fca500 kdb: Fix handling of kallsyms_symbol_next() return value) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_io.c +Merge made by the 'recursive' strategy. + kernel/debug/kdb/kdb_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging md/for-next (8fc04e6ea02d md: raid1: kill warning on powerpc_pseries) +$ git merge md/for-next +Resolved 'drivers/md/raid5.h' using previous resolution. +Auto-merging include/linux/bio.h +Auto-merging drivers/md/raid5.h +CONFLICT (content): Merge conflict in drivers/md/raid5.h +Auto-merging drivers/md/raid5-cache.c +Auto-merging drivers/md/Makefile +Auto-merging block/bio.c +Auto-merging Documentation/md/md-cluster.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 38c6d59372e5] Merge remote-tracking branch 'md/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/md.rst | 32 +- + Documentation/md/md-cluster.txt | 2 +- + Documentation/md/raid5-ppl.txt | 44 ++ + block/bio.c | 121 ++-- + drivers/md/Makefile | 2 +- + drivers/md/bitmap.c | 59 +- + drivers/md/bitmap.h | 3 + + drivers/md/md-cluster.c | 223 ++++++- + drivers/md/md-cluster.h | 1 + + drivers/md/md.c | 314 +++++++--- + drivers/md/md.h | 72 ++- + drivers/md/raid0.c | 3 +- + drivers/md/raid1.c | 371 ++++++------ + drivers/md/raid1.h | 10 +- + drivers/md/raid10.c | 481 +++++++-------- + drivers/md/raid5-cache.c | 362 ++++++++--- + drivers/md/raid5-log.h | 114 ++++ + drivers/md/raid5-ppl.c | 1239 ++++++++++++++++++++++++++++++++++++++ + drivers/md/raid5.c | 569 +++++++++++------ + drivers/md/raid5.h | 105 +--- + include/linux/bio.h | 13 +- + include/linux/percpu-refcount.h | 1 + + include/uapi/linux/raid/md_p.h | 45 +- + lib/percpu-refcount.c | 17 + + 24 files changed, 3210 insertions(+), 993 deletions(-) + create mode 100644 Documentation/md/raid5-ppl.txt + create mode 100644 drivers/md/raid5-log.h + create mode 100644 drivers/md/raid5-ppl.c +Merging mfd/for-mfd-next (7ca7babfd27f mfd: palmas: Reset the POWERHOLD mux during power off) +$ git merge mfd/for-mfd-next +Auto-merging include/linux/mfd/intel_soc_pmic_bxtwc.h +Auto-merging drivers/input/touchscreen/Makefile +Auto-merging drivers/input/touchscreen/Kconfig +Removing drivers/iio/adc/mxs-lradc.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/mfd/altera-a10sr.txt | 11 + + Documentation/devicetree/bindings/mfd/axp20x.txt | 3 + + Documentation/devicetree/bindings/mfd/mt6397.txt | 1 + + .../bindings/{iio/adc => mfd}/mxs-lradc.txt | 0 + Documentation/devicetree/bindings/mfd/ti-lmu.txt | 243 +++ + Documentation/devicetree/bindings/mfd/wm831x.txt | 81 + + MAINTAINERS | 1 + + drivers/gpio/gpio-wm831x.c | 5 +- + drivers/iio/adc/Kconfig | 27 +- + drivers/iio/adc/Makefile | 2 +- + drivers/iio/adc/mxs-lradc-adc.c | 843 ++++++++++ + drivers/iio/adc/mxs-lradc.c | 1750 -------------------- + drivers/input/touchscreen/Kconfig | 10 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/mxs-lradc-ts.c | 714 ++++++++ + drivers/mfd/Kconfig | 29 + + drivers/mfd/Makefile | 7 +- + drivers/mfd/altera-a10sr.c | 4 + + drivers/mfd/arizona-core.c | 44 +- + drivers/mfd/asic3.c | 56 +- + drivers/mfd/axp20x.c | 41 +- + drivers/mfd/cros_ec.c | 15 +- + drivers/mfd/cros_ec_acpi_gpe.c | 103 ++ + drivers/mfd/cros_ec_spi.c | 9 +- + drivers/mfd/db8500-prcmu.c | 2 +- + drivers/mfd/exynos-lpass.c | 4 +- + drivers/mfd/intel-lpss-acpi.c | 4 - + drivers/mfd/intel_soc_pmic_bxtwc.c | 3 +- + drivers/mfd/intel_soc_pmic_core.c | 26 +- + drivers/mfd/lpc_ich.c | 6 + + drivers/mfd/mt6397-core.c | 3 +- + drivers/mfd/mxs-lradc.c | 267 +++ + drivers/mfd/palmas.c | 14 + + drivers/mfd/rtsx_pcr.c | 2 +- + drivers/mfd/sta2x11-mfd.c | 4 +- + drivers/mfd/stm32-timers.c | 10 +- + drivers/mfd/t7l66xb.c | 20 +- + drivers/mfd/tc6393xb.c | 52 +- + drivers/mfd/ti-lmu.c | 259 +++ + drivers/mfd/tps65912-spi.c | 4 +- + drivers/mfd/twl4030-power.c | 8 +- + drivers/mfd/wm831x-core.c | 29 +- + drivers/mfd/wm831x-i2c.c | 19 +- + drivers/mfd/wm831x-irq.c | 6 +- + drivers/mfd/wm831x-spi.c | 18 +- + include/linux/mfd/axp20x.h | 4 +- + include/linux/mfd/cros_ec.h | 18 + + .../mfd/{intel_bxtwc.h => intel_soc_pmic_bxtwc.h} | 4 +- + include/linux/mfd/mxs-lradc.h | 187 +++ + include/linux/mfd/ti-lmu-register.h | 280 ++++ + include/linux/mfd/ti-lmu.h | 87 + + include/linux/mfd/wm831x/core.h | 9 +- + 52 files changed, 3411 insertions(+), 1938 deletions(-) + rename Documentation/devicetree/bindings/{iio/adc => mfd}/mxs-lradc.txt (100%) + create mode 100644 Documentation/devicetree/bindings/mfd/ti-lmu.txt + create mode 100644 Documentation/devicetree/bindings/mfd/wm831x.txt + create mode 100644 drivers/iio/adc/mxs-lradc-adc.c + delete mode 100644 drivers/iio/adc/mxs-lradc.c + create mode 100644 drivers/input/touchscreen/mxs-lradc-ts.c + create mode 100644 drivers/mfd/cros_ec_acpi_gpe.c + create mode 100644 drivers/mfd/mxs-lradc.c + create mode 100644 drivers/mfd/ti-lmu.c + rename include/linux/mfd/{intel_bxtwc.h => intel_soc_pmic_bxtwc.h} (94%) + create mode 100644 include/linux/mfd/mxs-lradc.h + create mode 100644 include/linux/mfd/ti-lmu-register.h + create mode 100644 include/linux/mfd/ti-lmu.h +Merging backlight/for-backlight-next (80e5d455339a MAINTAINERS: Rework entry for Backlight) +$ git merge backlight/for-backlight-next +Already up-to-date. +Merging battery/for-next (5782dcb20370 power: supply: bq24190_charger: Don't spam the logs on charger plug / unplug) +$ git merge battery/for-next +Removing include/linux/power/bq24190_charger.h +Merge made by the 'recursive' strategy. + .../bindings/power/reset/gemini-poweroff.txt | 17 + + .../bindings/power/reset/syscon-poweroff.txt | 11 +- + .../{max8925_batter.txt => max8925_battery.txt} | 0 + drivers/power/reset/Kconfig | 9 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/gemini-poweroff.c | 160 ++++++++ + drivers/power/reset/syscon-poweroff.c | 19 +- + drivers/power/supply/Kconfig | 1 + + drivers/power/supply/ab8500_bmdata.c | 8 +- + drivers/power/supply/bq24190_charger.c | 417 ++++++++++++++------- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/max17040_battery.c | 8 + + drivers/power/supply/sbs-charger.c | 5 +- + drivers/power/supply/twl4030_charger.c | 4 +- + include/linux/power/bq24190_charger.h | 16 - + 15 files changed, 519 insertions(+), 159 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/gemini-poweroff.txt + rename Documentation/devicetree/bindings/power/supply/{max8925_batter.txt => max8925_battery.txt} (100%) + create mode 100644 drivers/power/reset/gemini-poweroff.c + delete mode 100644 include/linux/power/bq24190_charger.h +Merging omap_dss2/for-next (c456a2f30de5 video: smscufx: remove unused variable) +$ git merge omap_dss2/for-next +Already up-to-date. +Merging regulator/for-next (77b927bc4096 Merge remote-tracking branches 'regulator/topic/ltc3676', 'regulator/topic/notifier', 'regulator/topic/pfuze100' and 'regulator/topic/twl6030' into regulator-next) +$ git merge regulator/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/regulator/lm363x-regulator.txt | 78 +++++++++++++++++++++- + .../devicetree/bindings/regulator/pfuze100.txt | 8 ++- + MAINTAINERS | 1 + + drivers/regulator/arizona-ldo1.c | 9 +-- + drivers/regulator/arizona-micsupp.c | 9 +-- + drivers/regulator/core.c | 21 +++--- + drivers/regulator/internal.h | 2 +- + drivers/regulator/lm363x-regulator.c | 4 +- + drivers/regulator/ltc3589.c | 25 ++++++- + drivers/regulator/ltc3676.c | 7 ++ + drivers/regulator/max1586.c | 4 +- + drivers/regulator/max77693-regulator.c | 2 +- + drivers/regulator/max8660.c | 4 +- + drivers/regulator/pfuze100-regulator.c | 24 +++++++ + drivers/regulator/rk808-regulator.c | 2 +- + drivers/regulator/s2mpa01.c | 14 ++-- + drivers/regulator/s2mps11.c | 16 ++--- + drivers/regulator/s5m8767.c | 4 +- + drivers/regulator/twl6030-regulator.c | 2 - + include/linux/regulator/consumer.h | 1 + + include/linux/regulator/driver.h | 2 + + include/linux/regulator/pfuze100.h | 1 + + 22 files changed, 192 insertions(+), 48 deletions(-) +Merging security/next (ddb99e118e37 security, keys: convert key_user.usage from atomic_t to refcount_t) +$ git merge security/next +Auto-merging security/security.c +Auto-merging security/Kconfig +Merge made by the 'recursive' strategy. + include/linux/init_task.h | 7 + + include/linux/key.h | 5 +- + include/linux/lsm_hooks.h | 34 +++- + include/linux/sched.h | 4 + + include/linux/security.h | 20 ++ + kernel/fork.c | 7 +- + kernel/sys.c | 30 +-- + security/Kconfig | 5 + + security/apparmor/lsm.c | 2 +- + security/commoncap.c | 2 +- + security/keys/gc.c | 2 +- + security/keys/internal.h | 3 +- + security/keys/key.c | 12 +- + security/keys/keyring.c | 8 +- + security/keys/proc.c | 4 +- + security/keys/process_keys.c | 2 +- + security/keys/request_key_auth.c | 2 +- + security/loadpin/loadpin.c | 2 +- + security/security.c | 370 ++---------------------------------- + security/selinux/Kconfig | 6 + + security/selinux/hooks.c | 18 +- + security/selinux/include/classmap.h | 2 +- + security/smack/smack_lsm.c | 2 +- + security/tomoyo/file.c | 12 +- + security/tomoyo/tomoyo.c | 22 +-- + security/yama/yama_lsm.c | 2 +- + 26 files changed, 174 insertions(+), 411 deletions(-) +Merging integrity/next (3dd0c8d06511 ima: provide ">" and "<" operators for fowner/uid/euid rules.) +$ git merge integrity/next +Merge made by the 'recursive' strategy. + security/integrity/ima/ima_appraise.c | 5 +- + security/integrity/ima/ima_policy.c | 123 +++++++++++++++++++++++++--------- + 2 files changed, 94 insertions(+), 34 deletions(-) +Merging keys/keys-next (ed51e44e914c Merge branch 'keys-asym-keyctl' into keys-next) +$ git merge keys/keys-next +Auto-merging security/keys/keyctl.c +Auto-merging security/keys/internal.h +Auto-merging crypto/asymmetric_keys/x509_cert_parser.c +Auto-merging crypto/asymmetric_keys/public_key.c +Auto-merging Documentation/security/keys.txt +Merge made by the 'recursive' strategy. + Documentation/crypto/asymmetric-keys.txt | 26 ++- + Documentation/security/keys.txt | 217 ++++++++++++++++++++ + certs/Kconfig | 18 ++ + certs/Makefile | 6 + + certs/blacklist.c | 174 ++++++++++++++++ + certs/blacklist.h | 3 + + certs/blacklist_hashes.c | 6 + + certs/blacklist_nohashes.c | 5 + + crypto/asymmetric_keys/Kconfig | 10 + + crypto/asymmetric_keys/Makefile | 13 ++ + crypto/asymmetric_keys/asymmetric_keys.h | 3 + + crypto/asymmetric_keys/asymmetric_type.c | 59 +++++- + crypto/asymmetric_keys/pkcs7_parser.c | 1 + + crypto/asymmetric_keys/pkcs7_parser.h | 1 + + crypto/asymmetric_keys/pkcs7_verify.c | 32 ++- + crypto/asymmetric_keys/pkcs8.asn1 | 24 +++ + crypto/asymmetric_keys/pkcs8_parser.c | 184 +++++++++++++++++ + crypto/asymmetric_keys/public_key.c | 195 ++++++++++++++++-- + crypto/asymmetric_keys/signature.c | 95 +++++++++ + crypto/asymmetric_keys/x509_cert_parser.c | 21 +- + crypto/asymmetric_keys/x509_parser.h | 1 + + crypto/asymmetric_keys/x509_public_key.c | 15 ++ + include/crypto/public_key.h | 14 +- + include/keys/asymmetric-subtype.h | 9 + + include/keys/system_keyring.h | 12 ++ + include/linux/key-type.h | 11 + + include/linux/keyctl.h | 46 +++++ + include/uapi/linux/keyctl.h | 30 +++ + security/keys/Makefile | 1 + + security/keys/compat.c | 18 ++ + security/keys/internal.h | 39 ++++ + security/keys/keyctl.c | 24 +++ + security/keys/keyctl_pkey.c | 323 ++++++++++++++++++++++++++++++ + 33 files changed, 1584 insertions(+), 52 deletions(-) + create mode 100644 certs/blacklist.c + create mode 100644 certs/blacklist.h + create mode 100644 certs/blacklist_hashes.c + create mode 100644 certs/blacklist_nohashes.c + create mode 100644 crypto/asymmetric_keys/pkcs8.asn1 + create mode 100644 crypto/asymmetric_keys/pkcs8_parser.c + create mode 100644 include/linux/keyctl.h + create mode 100644 security/keys/keyctl_pkey.c +Merging selinux/next (cae303df3f37 selinux: Fix an uninitialized variable bug) +$ git merge selinux/next +Auto-merging security/selinux/nlmsgtab.c +Merge made by the 'recursive' strategy. + fs/namei.c | 20 +++++------ + scripts/selinux/genheaders/genheaders.c | 1 + + scripts/selinux/mdp/mdp.c | 1 + + security/selinux/hooks.c | 8 +++++ + security/selinux/nlmsgtab.c | 10 +++--- + security/selinux/selinuxfs.c | 8 ++--- + security/selinux/ss/conditional.c | 14 ++++---- + security/selinux/ss/hashtab.c | 10 +++--- + security/selinux/ss/policydb.c | 59 ++++++++++++++------------------- + security/selinux/ss/services.c | 2 +- + security/selinux/ss/sidtab.c | 6 ++-- + 11 files changed, 69 insertions(+), 70 deletions(-) +Merging tpmdd/next (8c76c41d0700 tpm/tpm_crb: Enable TPM CRB interface for ARM64) +$ git merge tpmdd/next +Merge made by the 'recursive' strategy. + drivers/char/tpm/Kconfig | 3 +- + drivers/char/tpm/Makefile | 3 +- + drivers/char/tpm/st33zp24/i2c.c | 23 +- + drivers/char/tpm/st33zp24/spi.c | 23 +- + drivers/char/tpm/st33zp24/st33zp24.c | 12 +- + drivers/char/tpm/tpm-chip.c | 70 ++++- + drivers/char/tpm/tpm-dev-common.c | 148 ++++++++++ + drivers/char/tpm/tpm-dev.c | 143 +--------- + drivers/char/tpm/tpm-dev.h | 27 ++ + drivers/char/tpm/tpm-interface.c | 147 +++++++--- + drivers/char/tpm/tpm-sysfs.c | 2 +- + drivers/char/tpm/tpm.h | 52 +++- + drivers/char/tpm/tpm2-cmd.c | 173 ++++++++---- + drivers/char/tpm/tpm2-space.c | 532 +++++++++++++++++++++++++++++++++++ + drivers/char/tpm/tpm_crb.c | 280 ++++++++++++++---- + drivers/char/tpm/tpm_i2c_infineon.c | 12 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 24 +- + drivers/char/tpm/tpm_ibmvtpm.c | 8 +- + drivers/char/tpm/tpm_tis_core.c | 26 +- + drivers/char/tpm/tpm_tis_spi.c | 160 +++++------ + drivers/char/tpm/tpmrm-dev.c | 65 +++++ + include/acpi/actbl2.h | 3 + + include/linux/tpm.h | 3 +- + 23 files changed, 1535 insertions(+), 404 deletions(-) + create mode 100644 drivers/char/tpm/tpm-dev-common.c + create mode 100644 drivers/char/tpm/tpm-dev.h + create mode 100644 drivers/char/tpm/tpm2-space.c + create mode 100644 drivers/char/tpm/tpmrm-dev.c +Merging watchdog/master (00ea1ceebe0d ipv6: release dst on error in ip6_dst_lookup_tail) +$ git merge watchdog/master +Already up-to-date. +Merging iommu/next (41346dad4de0 Merge branches 'x86/vt-d', 'arm/core', 'core' and 'iommu/fixes' into next) +$ git merge iommu/next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 + + drivers/iommu/arm-smmu-v3.c | 2 + + drivers/iommu/arm-smmu.c | 2 + + drivers/iommu/dma-iommu.c | 109 ++++++++++++++++++++++++++++++++++++++------ + drivers/iommu/dmar.c | 35 +++++++------- + drivers/iommu/iova.c | 87 ++++++++++++++--------------------- + include/linux/dma-iommu.h | 5 ++ + include/linux/intel-iommu.h | 18 +------- + include/linux/iova.h | 91 ++++++++++++++++++++++++++++++++++++ + 9 files changed, 249 insertions(+), 102 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up-to-date. +Merging vfio/next (d9d84780f17c vfio: fix a typo in comment of function vfio_pin_pages) +$ git merge vfio/next +Already up-to-date. +Merging trivial/for-next (4f6cce39105e Fix dead URLs to ftp.kernel.org) +$ git merge trivial/for-next +Auto-merging tools/testing/selftests/powerpc/Makefile +Auto-merging scripts/package/builddeb +Auto-merging include/linux/sched.h +Auto-merging drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c +Auto-merging drivers/md/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/trace/ftrace.txt | 2 +- + MAINTAINERS | 2 +- + drivers/block/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 2 +- + drivers/hid/hid-picolcd_debugfs.c | 2 +- + drivers/macintosh/via-macii.c | 2 +- + drivers/md/Kconfig | 2 +- + drivers/media/dvb-frontends/horus3a.c | 2 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/misc/cxl/flash.c | 2 +- + drivers/mtd/ubi/Kconfig | 2 +- + drivers/mtd/ubi/io.c | 2 +- + drivers/mtd/ubi/ubi.h | 3 +-- + drivers/net/ethernet/freescale/fec_main.c | 4 ++-- + drivers/net/phy/dp83848.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 2 +- + drivers/scsi/mac_esp.c | 2 +- + drivers/scsi/snic/snic_scsi.c | 2 +- + fs/autofs4/Kconfig | 2 +- + include/linux/sched.h | 2 +- + kernel/sched/fair.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/time/timer.c | 2 +- + scripts/ksymoops/README | 5 ++--- + scripts/package/builddeb | 4 ++-- + tools/perf/builtin-probe.c | 2 +- + tools/testing/selftests/powerpc/Makefile | 2 +- + tools/testing/selftests/timers/Makefile | 4 ++-- + 29 files changed, 33 insertions(+), 35 deletions(-) +Merging audit/next (36fe46d172e5 audit: normalize NETFILTER_PKT) +$ git merge audit/next +Resolved 'net/netfilter/xt_AUDIT.c' using previous resolution. +Auto-merging net/netfilter/xt_AUDIT.c +CONFLICT (content): Merge conflict in net/netfilter/xt_AUDIT.c +Auto-merging kernel/module.c +Auto-merging kernel/audit_watch.c +Auto-merging kernel/audit_fsnotify.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 93f17f0c8f40] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + kernel/audit_fsnotify.c | 2 +- + kernel/audit_watch.c | 2 +- + kernel/auditfilter.c | 4 +- + kernel/module.c | 2 + + net/netfilter/xt_AUDIT.c | 126 +++++++++++------------------------------------ + 5 files changed, 34 insertions(+), 102 deletions(-) +Merging devicetree/for-next (8654cb8d0371 dtc: update warning settings for new bus and node/property name checks) +$ git merge devicetree/for-next +Auto-merging scripts/Makefile.lib +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/net/faraday,ftmac.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/atmel/hlcdc-dc.txt | 2 +- + .../devicetree/bindings/mfd/atmel-hlcdc.txt | 2 +- + .../net/{moxa,moxart-mac.txt => faraday,ftmac.txt} | 7 +- + .../bindings/{i2c => }/trivial-devices.txt | 0 + .../devicetree/bindings/vendor-prefixes.txt | 1 + + arch/powerpc/platforms/pseries/ibmebus.c | 5 +- + drivers/base/platform.c | 2 +- + drivers/macintosh/macio_sysfs.c | 7 +- + drivers/of/device.c | 20 +- + drivers/tty/serdev/core.c | 5 +- + drivers/usb/common/ulpi.c | 2 +- + include/linux/of_device.h | 7 +- + scripts/Makefile.lib | 12 +- + scripts/dtc/checks.c | 361 ++++++++++++++++++--- + scripts/dtc/data.c | 16 +- + scripts/dtc/dtc-lexer.l | 3 +- + scripts/dtc/dtc-lexer.lex.c_shipped | 77 ++--- + scripts/dtc/dtc-parser.tab.c_shipped | 6 +- + scripts/dtc/dtc-parser.y | 6 +- + scripts/dtc/dtc.c | 9 +- + scripts/dtc/dtc.h | 11 +- + scripts/dtc/flattree.c | 58 ++-- + scripts/dtc/libfdt/fdt_rw.c | 3 +- + scripts/dtc/libfdt/libfdt.h | 51 ++- + scripts/dtc/libfdt/libfdt_env.h | 26 +- + scripts/dtc/livetree.c | 22 +- + scripts/dtc/srcpos.c | 2 +- + scripts/dtc/srcpos.h | 11 +- + scripts/dtc/treesource.c | 6 +- + scripts/dtc/update-dtc-source.sh | 20 +- + scripts/dtc/util.c | 11 +- + scripts/dtc/util.h | 24 +- + scripts/dtc/version_gen.h | 2 +- + 33 files changed, 586 insertions(+), 211 deletions(-) + rename Documentation/devicetree/bindings/net/{moxa,moxart-mac.txt => faraday,ftmac.txt} (68%) + rename Documentation/devicetree/bindings/{i2c => }/trivial-devices.txt (100%) +Merging mailbox/mailbox-for-next (73874913d504 mailbox: Remove depends on COMPILE_TEST for BCM_FLEXRM_MBOX) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../bindings/mailbox/brcm,iproc-flexrm-mbox.txt | 59 + + .../bindings/mailbox/brcm,iproc-pdc-mbox.txt | 6 +- + drivers/mailbox/Kconfig | 18 +- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/bcm-flexrm-mailbox.c | 1595 ++++++++++++++++++++ + drivers/mailbox/bcm-pdc-mailbox.c | 61 +- + drivers/mailbox/hi6220-mailbox.c | 2 +- + drivers/mailbox/mailbox-xgene-slimpro.c | 2 +- + drivers/mailbox/mailbox.c | 6 + + include/linux/mailbox/brcm-message.h | 14 +- + 10 files changed, 1738 insertions(+), 27 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,iproc-flexrm-mbox.txt + create mode 100644 drivers/mailbox/bcm-flexrm-mailbox.c +Merging spi/for-next (bda8650e60ed Merge remote-tracking branches 'spi/topic/test', 'spi/topic/ti-qspi' and 'spi/topic/xlp' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/spi/spi-bcm63xx-hsspi.txt | 33 ++ + .../devicetree/bindings/spi/spi-bcm63xx.txt | 33 ++ + .../devicetree/bindings/spi/spi_pl022.txt | 8 +- + drivers/acpi/acpi_apd.c | 1 + + drivers/spi/Kconfig | 2 +- + drivers/spi/spi-bcm63xx-hsspi.c | 35 +- + drivers/spi/spi-bcm63xx.c | 51 ++- + drivers/spi/spi-davinci.c | 95 ++--- + drivers/spi/spi-fsl-dspi.c | 3 +- + drivers/spi/spi-fsl-spi.c | 3 +- + drivers/spi/spi-lantiq-ssc.c | 438 +++++++++++---------- + drivers/spi/spi-loopback-test.c | 154 +++++--- + drivers/spi/spi-omap2-mcspi.c | 9 +- + drivers/spi/spi-sc18is602.c | 24 +- + drivers/spi/spi-sun6i.c | 94 ++++- + drivers/spi/spi-test.h | 21 +- + drivers/spi/spi-ti-qspi.c | 4 +- + drivers/spi/spi-xlp.c | 1 + + drivers/spi/spi.c | 34 +- + drivers/spi/spidev.c | 1 + + include/linux/spi/spi.h | 6 +- + tools/spi/spidev_test.c | 93 ++++- + 22 files changed, 765 insertions(+), 378 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx-hsspi.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-bcm63xx.txt +Merging tip/auto-latest (1c85e08a067b Merge branch 'x86/vdso') +$ git merge tip/auto-latest +Resolved 'arch/arm64/include/asm/bug.h' using previous resolution. +Auto-merging tools/perf/builtin-probe.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/module.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/linux/mm.h +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/asm-generic/bug.h +Removing arch/x86/um/bug.c +Removing arch/x86/mm/gup.c +Auto-merging arch/x86/kernel/ftrace_64.S +Auto-merging arch/x86/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/arm64/include/asm/bug.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/bug.h +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6699b4a5b283] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 7 + + Documentation/trace/kprobetrace.txt | 5 +- + Documentation/usb/usb3-debug-port.rst | 100 ++ + Documentation/x86/x86_64/mm.txt | 5 +- + arch/Kconfig | 7 + + arch/arm/Kconfig | 2 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/bug.h | 3 +- + arch/parisc/include/asm/bug.h | 8 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/bug.h | 4 +- + arch/powerpc/include/asm/mmu_context.h | 6 - + arch/s390/include/asm/bug.h | 4 +- + arch/s390/include/asm/mmu_context.h | 6 - + arch/sh/include/asm/bug.h | 4 +- + arch/um/Kconfig.common | 5 - + arch/um/include/asm/mmu_context.h | 6 - + arch/um/include/shared/os.h | 4 +- + arch/unicore32/include/asm/mmu_context.h | 6 - + arch/x86/Kconfig | 16 +- + arch/x86/Kconfig.debug | 27 +- + arch/x86/entry/entry_32.S | 171 +--- + arch/x86/entry/entry_64.S | 15 +- + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/vdso/vclock_gettime.c | 24 + + arch/x86/entry/vdso/vdso-layout.lds.S | 3 +- + arch/x86/entry/vdso/vdso2c.c | 3 + + arch/x86/entry/vdso/vma.c | 9 +- + arch/x86/events/amd/iommu.c | 325 +++---- + arch/x86/events/amd/iommu.h | 18 +- + arch/x86/events/intel/bts.c | 16 +- + arch/x86/events/intel/core.c | 22 + + arch/x86/events/intel/pt.c | 129 ++- + arch/x86/events/intel/pt.h | 2 +- + arch/x86/hyperv/hv_init.c | 48 +- + arch/x86/include/asm/apic.h | 7 +- + arch/x86/include/asm/atomic.h | 33 +- + arch/x86/include/asm/atomic64_64.h | 46 +- + arch/x86/include/asm/bug.h | 80 +- + arch/x86/include/asm/clocksource.h | 3 +- + arch/x86/include/asm/cmpxchg.h | 70 ++ + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/desc.h | 147 ++- + arch/x86/include/asm/elf.h | 28 +- + arch/x86/include/asm/fixmap.h | 4 + + arch/x86/include/asm/kexec.h | 1 + + arch/x86/include/asm/mce.h | 12 +- + arch/x86/include/asm/mmu_context.h | 16 - + arch/x86/include/asm/mshyperv.h | 54 ++ + arch/x86/include/asm/msr-index.h | 11 +- + arch/x86/include/asm/page_64.h | 16 +- + arch/x86/include/asm/paravirt.h | 33 +- + arch/x86/include/asm/paravirt_types.h | 12 +- + arch/x86/include/asm/pgalloc.h | 35 +- + arch/x86/include/asm/pgtable-2level_types.h | 1 + + arch/x86/include/asm/pgtable-3level.h | 47 + + arch/x86/include/asm/pgtable-3level_types.h | 1 + + arch/x86/include/asm/pgtable.h | 137 ++- + arch/x86/include/asm/pgtable_32.h | 1 - + arch/x86/include/asm/pgtable_64.h | 28 +- + arch/x86/include/asm/pgtable_64_types.h | 4 +- + arch/x86/include/asm/pgtable_types.h | 38 +- + arch/x86/include/asm/processor.h | 19 +- + arch/x86/include/asm/proto.h | 4 +- + arch/x86/include/asm/reboot.h | 1 + + arch/x86/include/asm/stackprotector.h | 2 +- + arch/x86/include/asm/thread_info.h | 6 +- + arch/x86/include/asm/tlbflush.h | 10 + + arch/x86/include/asm/uv/uv_bau.h | 82 +- + arch/x86/include/asm/vdso.h | 1 + + arch/x86/include/asm/xen/page.h | 8 +- + arch/x86/include/uapi/asm/prctl.h | 11 +- + arch/x86/kernel/Makefile | 5 +- + arch/x86/kernel/acpi/sleep.c | 2 +- + arch/x86/kernel/apic/apic.c | 6 +- + arch/x86/kernel/apm_32.c | 6 +- + arch/x86/kernel/cpu/common.c | 59 +- + arch/x86/kernel/cpu/intel.c | 40 +- + arch/x86/kernel/cpu/mcheck/Makefile | 2 + + arch/x86/kernel/cpu/mcheck/dev-mcelog.c | 397 ++++++++ + arch/x86/kernel/cpu/mcheck/mce-internal.h | 8 + + arch/x86/kernel/cpu/mcheck/mce.c | 549 +++-------- + arch/x86/kernel/cpu/microcode/amd.c | 2 - + arch/x86/kernel/cpu/proc.c | 5 +- + arch/x86/kernel/dumpstack.c | 3 - + arch/x86/kernel/dumpstack_32.c | 12 - + arch/x86/kernel/dumpstack_64.c | 10 - + arch/x86/kernel/early_printk.c | 5 + + arch/x86/kernel/ftrace_32.S | 244 +++++ + arch/x86/kernel/{mcount_64.S => ftrace_64.S} | 6 - + arch/x86/kernel/head_64.S | 10 +- + arch/x86/kernel/machine_kexec_32.c | 4 +- + arch/x86/kernel/machine_kexec_64.c | 14 +- + arch/x86/kernel/paravirt.c | 10 +- + arch/x86/kernel/process.c | 151 ++- + arch/x86/kernel/process_32.c | 7 + + arch/x86/kernel/process_64.c | 48 +- + arch/x86/kernel/ptrace.c | 8 +- + arch/x86/kernel/reboot.c | 5 +- + arch/x86/kernel/setup.c | 52 +- + arch/x86/kernel/setup_percpu.c | 23 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/sys_x86_64.c | 15 +- + arch/x86/kernel/tboot.c | 6 +- + arch/x86/kernel/tls.c | 11 +- + arch/x86/kernel/traps.c | 46 +- + arch/x86/kernel/vm86_32.c | 6 +- + arch/x86/kvm/svm.c | 4 +- + arch/x86/kvm/vmx.c | 12 +- + arch/x86/lib/clear_page_64.S | 17 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/mm/dump_pagetables.c | 59 +- + arch/x86/mm/fault.c | 66 +- + arch/x86/mm/gup.c | 475 --------- + arch/x86/mm/hugetlbpage.c | 9 +- + arch/x86/mm/ident_map.c | 51 +- + arch/x86/mm/init_32.c | 66 +- + arch/x86/mm/init_64.c | 183 +++- + arch/x86/mm/ioremap.c | 3 +- + arch/x86/mm/kasan_init_64.c | 15 +- + arch/x86/mm/mmap.c | 125 ++- + arch/x86/mm/pageattr.c | 54 +- + arch/x86/mm/pgtable.c | 4 +- + arch/x86/mm/pgtable_32.c | 8 +- + arch/x86/platform/efi/efi_32.c | 4 +- + arch/x86/platform/efi/efi_64.c | 41 +- + arch/x86/platform/uv/tlb_uv.c | 195 ++-- + arch/x86/power/cpu.c | 7 +- + arch/x86/power/hibernate_32.c | 7 +- + arch/x86/power/hibernate_64.c | 47 +- + arch/x86/ras/Kconfig | 14 + + arch/x86/um/Makefile | 4 +- + arch/x86/um/asm/ptrace.h | 2 +- + arch/x86/um/bug.c | 21 - + arch/x86/um/os-Linux/prctl.c | 4 +- + arch/x86/um/syscalls_32.c | 7 + + arch/x86/um/syscalls_64.c | 20 +- + arch/x86/xen/enlighten.c | 3 +- + arch/x86/xen/mmu.c | 398 +++++--- + arch/x86/xen/mmu.h | 1 + + arch/x86/xen/smp.c | 2 +- + drivers/hv/Kconfig | 3 + + drivers/hwtracing/coresight/coresight-etb10.c | 9 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 9 +- + drivers/hwtracing/coresight/coresight-priv.h | 2 - + drivers/hwtracing/coresight/coresight-tmc-etf.c | 7 +- + drivers/iommu/amd_iommu.c | 6 +- + drivers/iommu/amd_iommu_init.c | 101 +- + drivers/iommu/amd_iommu_proto.h | 8 +- + drivers/iommu/amd_iommu_types.h | 3 - + drivers/lguest/x86/core.c | 6 +- + drivers/pnp/pnpbios/bioscalls.c | 10 +- + drivers/ras/Makefile | 3 +- + drivers/ras/cec.c | 532 ++++++++++ + drivers/ras/debugfs.c | 2 +- + drivers/ras/debugfs.h | 8 + + drivers/ras/ras.c | 11 + + drivers/usb/Makefile | 2 +- + drivers/usb/early/Makefile | 1 + + drivers/usb/early/xhci-dbc.c | 1014 ++++++++++++++++++++ + drivers/usb/early/xhci-dbc.h | 211 ++++ + drivers/usb/serial/usb_debug.c | 28 +- + fs/exec.c | 1 + + include/asm-generic/bug.h | 18 +- + include/asm-generic/mm_hooks.h | 6 - + include/asm-generic/pgtable.h | 25 + + include/asm-generic/vmlinux.lds.h | 5 +- + include/linux/atomic.h | 46 + + include/linux/bug.h | 2 +- + include/linux/compat.h | 2 + + include/linux/coresight.h | 2 +- + include/linux/hrtimer.h | 4 - + include/linux/kprobes.h | 2 + + include/linux/lockdep.h | 3 + + include/linux/mm.h | 4 + + include/linux/mm_types.h | 5 + + include/linux/module.h | 6 + + include/linux/pagemap.h | 4 +- + include/linux/percpu.h | 1 + + include/linux/perf_event.h | 17 +- + include/linux/ras.h | 13 +- + include/linux/refcount.h | 19 + + include/linux/smp.h | 12 + + include/linux/thread_info.h | 4 + + include/linux/usb/xhci-dbgp.h | 29 + + include/trace/events/xen.h | 28 +- + include/uapi/linux/perf_event.h | 33 +- + kernel/cpu.c | 6 + + kernel/events/core.c | 139 +++ + kernel/events/ring_buffer.c | 34 +- + kernel/fork.c | 2 + + kernel/futex.c | 502 ++++++---- + kernel/irq/chip.c | 5 +- + kernel/kprobes.c | 46 +- + kernel/locking/lockdep.c | 242 +++-- + kernel/locking/rtmutex-debug.c | 9 - + kernel/locking/rtmutex-debug.h | 3 - + kernel/locking/rtmutex.c | 205 ++-- + kernel/locking/rtmutex.h | 2 - + kernel/locking/rtmutex_common.h | 22 +- + kernel/locking/rwsem.c | 6 +- + kernel/locking/test-ww_mutex.c | 29 +- + kernel/module.c | 42 +- + kernel/nsproxy.c | 3 + + kernel/sched/core.c | 201 ++-- + kernel/sched/fair.c | 385 +++++--- + kernel/sched/features.h | 7 + + kernel/sched/rt.c | 81 ++ + kernel/sched/sched.h | 65 +- + kernel/time/hrtimer.c | 5 +- + kernel/time/posix-cpu-timers.c | 9 +- + kernel/trace/Kconfig | 2 +- + kernel/trace/trace.c | 1 + + kernel/trace/trace_kprobe.c | 9 +- + lib/bug.c | 28 +- + lib/refcount.c | 169 +++- + mm/Kconfig | 2 +- + mm/gup.c | 158 ++- + mm/percpu.c | 40 +- + scripts/checksyscalls.sh | 1 + + tools/arch/arm/include/uapi/asm/kvm.h | 13 + + tools/arch/arm64/include/uapi/asm/kvm.h | 13 + + tools/arch/powerpc/include/uapi/asm/kvm.h | 22 + + tools/arch/x86/include/asm/atomic.h | 7 + + tools/arch/x86/include/asm/cmpxchg.h | 89 ++ + tools/arch/x86/include/asm/cpufeatures.h | 8 +- + tools/build/Makefile.feature | 1 + + tools/build/feature/Makefile | 10 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-sched_getcpu.c | 7 + + tools/include/asm-generic/atomic-gcc.h | 8 + + tools/include/linux/atomic.h | 6 + + tools/include/linux/compiler-gcc.h | 4 + + tools/include/linux/compiler.h | 4 + + tools/include/linux/kernel.h | 4 + + tools/include/linux/refcount.h | 151 +++ + tools/include/uapi/linux/perf_event.h | 33 +- + tools/lib/api/fs/fs.c | 29 + + tools/lib/api/fs/fs.h | 1 + + tools/perf/.gitignore | 2 + + tools/perf/Documentation/perf-ftrace.txt | 18 + + tools/perf/Documentation/perf-list.txt | 8 +- + tools/perf/Documentation/perf-record.txt | 3 + + tools/perf/Documentation/perf-report.txt | 13 +- + tools/perf/Documentation/perf-sched.txt | 4 + + tools/perf/Documentation/perf-script.txt | 16 +- + tools/perf/Documentation/perf-stat.txt | 6 +- + tools/perf/MANIFEST | 2 + + tools/perf/Makefile.config | 4 + + tools/perf/arch/powerpc/util/sym-handling.c | 14 +- + tools/perf/arch/x86/util/perf_regs.c | 103 ++ + tools/perf/bench/bench.h | 20 +- + tools/perf/bench/futex-hash.c | 4 +- + tools/perf/bench/futex-lock-pi.c | 4 +- + tools/perf/bench/futex-requeue.c | 4 +- + tools/perf/bench/futex-wake-parallel.c | 4 +- + tools/perf/bench/futex-wake.c | 4 +- + tools/perf/bench/futex.h | 10 +- + tools/perf/bench/mem-functions.c | 4 +- + tools/perf/bench/numa.c | 5 +- + tools/perf/bench/sched-messaging.c | 3 +- + tools/perf/bench/sched-pipe.c | 2 +- + tools/perf/builtin-annotate.c | 3 +- + tools/perf/builtin-bench.c | 12 +- + tools/perf/builtin-buildid-cache.c | 3 +- + tools/perf/builtin-buildid-list.c | 3 +- + tools/perf/builtin-c2c.c | 8 +- + tools/perf/builtin-config.c | 2 +- + tools/perf/builtin-data.c | 9 +- + tools/perf/builtin-diff.c | 3 +- + tools/perf/builtin-evlist.c | 2 +- + tools/perf/builtin-ftrace.c | 154 ++- + tools/perf/builtin-help.c | 2 +- + tools/perf/builtin-inject.c | 15 +- + tools/perf/builtin-kallsyms.c | 2 +- + tools/perf/builtin-kmem.c | 5 +- + tools/perf/builtin-kvm.c | 18 +- + tools/perf/builtin-list.c | 16 +- + tools/perf/builtin-lock.c | 29 +- + tools/perf/builtin-mem.c | 7 +- + tools/perf/builtin-probe.c | 12 +- + tools/perf/builtin-record.c | 37 +- + tools/perf/builtin-report.c | 8 +- + tools/perf/builtin-sched.c | 32 +- + tools/perf/builtin-script.c | 309 +++++- + tools/perf/builtin-stat.c | 192 +++- + tools/perf/builtin-timechart.c | 23 +- + tools/perf/builtin-top.c | 2 +- + tools/perf/builtin-trace.c | 28 +- + tools/perf/builtin-version.c | 3 +- + tools/perf/builtin.h | 58 +- + tools/perf/command-list.txt | 1 + + tools/perf/perf.c | 11 +- + tools/perf/perf.h | 1 + + .../arch/x86/broadwellde/uncore-cache.json | 28 +- + .../arch/x86/broadwellde/uncore-memory.json | 26 +- + .../arch/x86/broadwellde/uncore-power.json | 26 +- + .../arch/x86/broadwellx/uncore-cache.json | 28 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 6 +- + .../arch/x86/broadwellx/uncore-memory.json | 21 +- + .../arch/x86/broadwellx/uncore-power.json | 26 +- + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 28 +- + .../arch/x86/haswellx/uncore-interconnect.json | 6 +- + .../arch/x86/haswellx/uncore-memory.json | 21 +- + .../pmu-events/arch/x86/haswellx/uncore-power.json | 26 +- + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 22 +- + .../arch/x86/ivytown/uncore-interconnect.json | 12 +- + .../pmu-events/arch/x86/ivytown/uncore-memory.json | 19 +- + .../pmu-events/arch/x86/ivytown/uncore-power.json | 53 +- + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 13 +- + .../arch/x86/jaketown/uncore-interconnect.json | 12 +- + .../arch/x86/jaketown/uncore-memory.json | 21 +- + .../pmu-events/arch/x86/jaketown/uncore-power.json | 53 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 1 + + tools/perf/pmu-events/jevents.c | 26 +- + tools/perf/pmu-events/jevents.h | 3 +- + tools/perf/pmu-events/pmu-events.h | 2 + + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 6 +- + tools/perf/tests/cpumap.c | 2 +- + tools/perf/tests/expr.c | 56 ++ + tools/perf/tests/sdt.c | 2 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/thread-map.c | 6 +- + tools/perf/tests/thread-mg-share.c | 12 +- + tools/perf/ui/browsers/hists.c | 183 +++- + tools/perf/ui/stdio/hist.c | 86 +- + tools/perf/util/Build | 8 + + tools/perf/util/annotate.c | 31 +- + tools/perf/util/auxtrace.c | 4 +- + tools/perf/util/build-id.c | 8 +- + tools/perf/util/callchain.c | 52 +- + tools/perf/util/callchain.h | 3 +- + tools/perf/util/cgroup.c | 6 +- + tools/perf/util/cgroup.h | 4 +- + tools/perf/util/cloexec.h | 6 - + tools/perf/util/comm.c | 15 +- + tools/perf/util/cpumap.c | 62 +- + tools/perf/util/cpumap.h | 5 +- + tools/perf/util/data-convert-bt.c | 1 + + tools/perf/util/dso.c | 6 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/dump-insn.c | 14 + + tools/perf/util/dump-insn.h | 22 + + tools/perf/util/event.c | 159 ++- + tools/perf/util/event.h | 20 + + tools/perf/util/evlist.c | 31 +- + tools/perf/util/evlist.h | 4 +- + tools/perf/util/evsel.c | 7 + + tools/perf/util/evsel.h | 5 + + tools/perf/util/expr.h | 25 + + tools/perf/util/expr.y | 173 ++++ + tools/perf/util/header.c | 8 +- + tools/perf/util/hist.c | 12 + + tools/perf/util/hist.h | 2 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 26 + + tools/perf/util/machine.c | 36 +- + tools/perf/util/machine.h | 3 + + tools/perf/util/map.c | 13 +- + tools/perf/util/map.h | 10 +- + tools/perf/util/namespaces.c | 36 + + tools/perf/util/namespaces.h | 26 + + tools/perf/util/parse-events.c | 83 +- + tools/perf/util/parse-events.h | 30 +- + tools/perf/util/parse-events.y | 73 +- + tools/perf/util/perf_regs.c | 6 + + tools/perf/util/perf_regs.h | 6 + + tools/perf/util/pmu.c | 32 +- + tools/perf/util/pmu.h | 6 +- + tools/perf/util/probe-event.c | 24 +- + tools/perf/util/probe-file.c | 268 +++++- + tools/perf/util/probe-file.h | 2 + + tools/perf/util/session.c | 34 +- + tools/perf/util/sort.c | 103 +- + tools/perf/util/sort.h | 9 + + tools/perf/util/srcline.c | 246 ++++- + tools/perf/util/stat-shadow.c | 197 ++++ + tools/perf/util/stat.h | 2 + + tools/perf/util/symbol-elf.c | 30 +- + tools/perf/util/symbol-minimal.c | 7 + + tools/perf/util/symbol.h | 6 +- + tools/perf/util/thread.c | 50 +- + tools/perf/util/thread.h | 10 +- + tools/perf/util/thread_map.c | 20 +- + tools/perf/util/thread_map.h | 4 +- + tools/perf/util/tool.h | 2 + + tools/perf/util/trace-event-read.c | 4 +- + tools/perf/util/util.h | 24 +- + tools/scripts/Makefile.include | 9 + + tools/testing/selftests/x86/ldt_gdt.c | 46 + + 390 files changed, 11297 insertions(+), 3860 deletions(-) + create mode 100644 Documentation/usb/usb3-debug-port.rst + create mode 100644 arch/x86/kernel/cpu/mcheck/dev-mcelog.c + create mode 100644 arch/x86/kernel/ftrace_32.S + rename arch/x86/kernel/{mcount_64.S => ftrace_64.S} (98%) + delete mode 100644 arch/x86/mm/gup.c + delete mode 100644 arch/x86/um/bug.c + create mode 100644 arch/x86/um/syscalls_32.c + create mode 100644 drivers/ras/cec.c + create mode 100644 drivers/ras/debugfs.h + create mode 100644 drivers/usb/early/xhci-dbc.c + create mode 100644 drivers/usb/early/xhci-dbc.h + create mode 100644 include/linux/usb/xhci-dbgp.h + create mode 100644 tools/arch/x86/include/asm/cmpxchg.h + create mode 100644 tools/build/feature/test-sched_getcpu.c + create mode 100644 tools/include/linux/refcount.h + create mode 100644 tools/perf/tests/expr.c + create mode 100644 tools/perf/util/dump-insn.c + create mode 100644 tools/perf/util/dump-insn.h + create mode 100644 tools/perf/util/expr.h + create mode 100644 tools/perf/util/expr.y + create mode 100644 tools/perf/util/namespaces.c + create mode 100644 tools/perf/util/namespaces.h +Merging clockevents/clockevents/next (f947ee147e08 clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map()) +$ 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 (41003396f932 EDAC, thunderx: Add Cavium ThunderX EDAC driver) +$ git merge edac-amd/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/edac/Kconfig | 11 + + drivers/edac/Makefile | 1 + + drivers/edac/thunderx_edac.c | 2183 ++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 2196 insertions(+) + create mode 100644 drivers/edac/thunderx_edac.c +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up-to-date. +Merging ftrace/for-next (65a50c656276 ftrace/graph: Add ftrace_graph_max_depth kernel parameter) +$ git merge ftrace/for-next +Already up-to-date. +Merging rcu/rcu/next (fd6f7b882ba7 srcu: Introduce CLASSIC_SRCU Kconfig option) +$ git merge rcu/rcu/next +Auto-merging net/smc/af_smc.c +Auto-merging net/netfilter/nf_conntrack_core.c +Auto-merging net/llc/af_llc.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/dccp/ipv6.c +Auto-merging net/dccp/ipv4.c +Auto-merging mm/rmap.c +Auto-merging mm/kasan/kasan.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/locking/rtmutex-debug.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/net/sock.h +Auto-merging include/linux/sched.h +Auto-merging fs/jbd2/journal.c +Auto-merging drivers/gpu/drm/i915/i915_gem_request.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Merge made by the 'recursive' strategy. + Documentation/RCU/00-INDEX | 2 +- + .../Design/Data-Structures/Data-Structures.html | 26 +- + .../Expedited-Grace-Periods.html | 47 +- + .../RCU/Design/Requirements/Requirements.html | 81 +-- + Documentation/RCU/rcu_dereference.txt | 9 + + Documentation/RCU/rculist_nulls.txt | 6 +- + Documentation/RCU/stallwarn.txt | 191 +++--- + Documentation/RCU/whatisRCU.txt | 28 +- + arch/Kconfig | 3 + + arch/powerpc/Kconfig | 1 + + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 2 +- + fs/jbd2/journal.c | 2 +- + fs/signalfd.c | 2 +- + include/linux/dma-fence.h | 4 +- + include/linux/rcu_node_tree.h | 99 +++ + include/linux/rcu_segcblist.h | 668 ++++++++++++++++++++ + include/linux/rculist.h | 3 +- + include/linux/rcupdate.h | 6 +- + include/linux/rcutiny.h | 11 +- + include/linux/sched.h | 3 +- + include/linux/slab.h | 6 +- + include/linux/srcu.h | 84 +-- + include/linux/srcuclassic.h | 101 ++++ + include/linux/srcutiny.h | 81 +++ + include/linux/srcutree.h | 91 +++ + include/linux/types.h | 2 +- + include/net/sock.h | 2 +- + init/Kconfig | 37 +- + kernel/fork.c | 4 +- + kernel/locking/lockdep.c | 86 +-- + kernel/locking/rtmutex-debug.c | 9 +- + kernel/rcu/Makefile | 4 +- + kernel/rcu/rcu.h | 153 ++++- + kernel/rcu/rcutorture.c | 15 +- + kernel/rcu/srcu.c | 2 +- + kernel/rcu/srcutiny.c | 215 +++++++ + kernel/rcu/srcutree.c | 613 +++++++++++++++++++ + kernel/rcu/tiny.c | 20 +- + kernel/rcu/tiny_plugin.h | 13 +- + kernel/rcu/tree.c | 671 ++++++++------------- + kernel/rcu/tree.h | 156 +---- + kernel/rcu/tree_exp.h | 26 +- + kernel/rcu/tree_plugin.h | 72 +-- + kernel/rcu/tree_trace.c | 26 +- + kernel/rcu/update.c | 52 +- + kernel/sched/core.c | 1 + + kernel/signal.c | 2 +- + mm/kasan/kasan.c | 6 +- + mm/kmemcheck.c | 2 +- + mm/mmu_notifier.c | 14 +- + mm/rmap.c | 4 +- + mm/slab.c | 6 +- + mm/slab.h | 4 +- + mm/slab_common.c | 6 +- + mm/slob.c | 6 +- + mm/slub.c | 12 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/llc/af_llc.c | 2 +- + net/llc/llc_conn.c | 4 +- + net/llc/llc_sap.c | 2 +- + net/netfilter/nf_conntrack_core.c | 8 +- + net/smc/af_smc.c | 2 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 +- + 68 files changed, 2839 insertions(+), 991 deletions(-) + create mode 100644 include/linux/rcu_node_tree.h + create mode 100644 include/linux/rcu_segcblist.h + create mode 100644 include/linux/srcuclassic.h + create mode 100644 include/linux/srcutiny.h + create mode 100644 include/linux/srcutree.h + create mode 100644 kernel/rcu/srcutiny.c + create mode 100644 kernel/rcu/srcutree.c +$ git am -3 ../patches/0001-drm-i915-merge-fix-for-mm-Rename-SLAB_DESTROY_BY_RCU.patch +Applying: drm/i915: merge fix for "mm: Rename SLAB_DESTROY_BY_RCU to SLAB_TYPESAFE_BY_RCU" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/i915/selftests/mock_gem_device.c +$ git add -A . +$ git commit -v -a --amend +[master 423112bcec46] Merge remote-tracking branch 'rcu/rcu/next' + Date: Mon Apr 3 15:06:14 2017 +1000 +Merging kvm/linux-next (e55fe3ccccc1 tools/kvm_stat: add '%Total' column) +$ git merge kvm/linux-next +Merge made by the 'recursive' strategy. + tools/kvm/kvm_stat/kvm_stat | 381 +++++++++++++++++++++++++++++++++------- + tools/kvm/kvm_stat/kvm_stat.txt | 26 +++ + 2 files changed, 343 insertions(+), 64 deletions(-) +Merging kvm-arm/next (255905e4ff0f KVM: arm/arm64: vgic: Improve sync_hwstate performance) +$ git merge kvm-arm/next +Auto-merging virt/kvm/arm/vgic/vgic.c +Merge made by the 'recursive' strategy. + arch/arm/include/asm/kvm_asm.h | 3 + + arch/arm/kvm/arm.c | 14 +++-- + arch/arm/kvm/mmu.c | 31 ++++------ + arch/arm64/include/asm/kvm_asm.h | 2 + + include/kvm/arm_vgic.h | 10 ++- + virt/kvm/arm/hyp/vgic-v2-sr.c | 78 +++--------------------- + virt/kvm/arm/hyp/vgic-v3-sr.c | 79 ++++++------------------ + virt/kvm/arm/vgic/vgic-init.c | 127 +++++++++++++++++++++++++++------------ + virt/kvm/arm/vgic/vgic-v2.c | 93 ++++++++++++++-------------- + virt/kvm/arm/vgic/vgic-v3.c | 80 ++++++++++++------------ + virt/kvm/arm/vgic/vgic.c | 60 +++++++++++++----- + virt/kvm/arm/vgic/vgic.h | 10 ++- + 12 files changed, 281 insertions(+), 306 deletions(-) +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Auto-merging arch/mips/mm/init.c +Auto-merging arch/mips/kernel/cpu-probe.c +Auto-merging arch/mips/include/asm/cpu-info.h +Auto-merging arch/mips/Kconfig +Auto-merging Documentation/virtual/kvm/api.txt +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 90 +- + Documentation/virtual/kvm/hypercalls.txt | 5 + + arch/mips/Kconfig | 1 + + arch/mips/include/asm/cpu-features.h | 10 + + arch/mips/include/asm/cpu-info.h | 2 + + arch/mips/include/asm/cpu.h | 1 + + arch/mips/include/asm/kvm_host.h | 467 ++++- + arch/mips/include/asm/maar.h | 10 +- + arch/mips/include/asm/mipsregs.h | 62 +- + arch/mips/include/asm/tlb.h | 6 +- + arch/mips/include/uapi/asm/inst.h | 2 +- + arch/mips/include/uapi/asm/kvm.h | 20 +- + arch/mips/kernel/cpu-probe.c | 13 +- + arch/mips/kernel/time.c | 1 + + arch/mips/kvm/Kconfig | 27 +- + arch/mips/kvm/Makefile | 9 +- + arch/mips/kvm/emulate.c | 500 +++-- + arch/mips/kvm/entry.c | 132 +- + arch/mips/kvm/hypcall.c | 53 + + arch/mips/kvm/interrupt.h | 5 + + arch/mips/kvm/mips.c | 120 +- + arch/mips/kvm/mmu.c | 20 + + arch/mips/kvm/tlb.c | 441 ++++ + arch/mips/kvm/trace.h | 74 +- + arch/mips/kvm/trap_emul.c | 73 +- + arch/mips/kvm/vz.c | 3223 ++++++++++++++++++++++++++++++ + arch/mips/mm/cache.c | 1 + + arch/mips/mm/init.c | 2 +- + include/uapi/linux/kvm.h | 7 + + 29 files changed, 5010 insertions(+), 367 deletions(-) + create mode 100644 arch/mips/kvm/hypcall.c + create mode 100644 arch/mips/kvm/vz.c +Merging kvm-ppc/kvm-ppc-next (bcd3bb63dbc8 KVM: PPC: Book3S HV: Disable HPT resizing on POWER9 for now) +$ git merge kvm-ppc/kvm-ppc-next +Already up-to-date. +Merging kvms390/next (4e0b1ab72b8a KVM: s390: gs support for kvm guests) +$ git merge kvms390/next +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging Documentation/virtual/kvm/api.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 42f552a055a9] Merge remote-tracking branch 'kvms390/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 9 ++++ + arch/s390/include/asm/kvm_host.h | 29 +++++++++- + arch/s390/include/uapi/asm/kvm.h | 14 ++++- + arch/s390/kvm/gaccess.c | 6 +-- + arch/s390/kvm/intercept.c | 24 ++++----- + arch/s390/kvm/interrupt.c | 33 +++++++++++- + arch/s390/kvm/kvm-s390.c | 108 ++++++++++++++++++++++++++++++-------- + arch/s390/kvm/kvm-s390.h | 3 +- + arch/s390/kvm/priv.c | 31 ++++++++++- + arch/s390/kvm/sthyi.c | 3 ++ + arch/s390/kvm/vsie.c | 72 +++++++++++++++++++------ + include/uapi/linux/kvm.h | 1 + + 12 files changed, 272 insertions(+), 61 deletions(-) +Merging xen-tip/linux-next (d825adb48cf9 xenbus: Remove duplicate inclusion of linux/init.h) +$ git merge xen-tip/linux-next +Already up-to-date. +Merging percpu/for-next (8a1df543de8a percpu: remove unused chunk_alloc parameter from pcpu_get_pages()) +$ git merge percpu/for-next +Already up-to-date. +Merging workqueues/for-next (bacb71fc9187 Merge branch 'for-4.12' into for-next) +$ git merge workqueues/for-next +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging drivers-x86/for-next (8731734c476a platform/x86: fujitsu-laptop: remove keycode fields from struct fujitsu_bl) +$ git merge drivers-x86/for-next +Auto-merging drivers/platform/x86/dell-wmi-led.c +Merge made by the 'recursive' strategy. + drivers/leds/Kconfig | 9 - + drivers/leds/Makefile | 1 - + drivers/leds/trigger/ledtrig-cpu.c | 33 +- + drivers/platform/x86/Kconfig | 9 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/acer-wmi.c | 5 +- + drivers/platform/x86/asus-laptop.c | 8 +- + drivers/platform/x86/asus-wmi.c | 8 +- + drivers/platform/x86/dell-laptop.c | 217 +++++-- + drivers/platform/x86/dell-smbios.c | 20 + + drivers/platform/x86/dell-smbios.h | 11 + + drivers/platform/x86/dell-wmi-aio.c | 6 +- + .../dell-led.c => platform/x86/dell-wmi-led.c} | 141 +---- + drivers/platform/x86/dell-wmi.c | 20 +- + drivers/platform/x86/eeepc-laptop.c | 10 +- + drivers/platform/x86/fujitsu-laptop.c | 670 ++++++++------------- + drivers/platform/x86/hp-wmi.c | 5 +- + drivers/platform/x86/ideapad-laptop.c | 12 +- + drivers/platform/x86/intel-hid.c | 50 +- + drivers/platform/x86/msi-laptop.c | 14 +- + drivers/platform/x86/msi-wmi.c | 9 +- + drivers/platform/x86/panasonic-laptop.c | 18 +- + drivers/platform/x86/silead_dmi.c | 27 +- + drivers/platform/x86/thinkpad_acpi.c | 99 ++- + drivers/platform/x86/topstar-laptop.c | 5 +- + drivers/platform/x86/toshiba-wmi.c | 5 +- + drivers/platform/x86/toshiba_acpi.c | 8 +- + include/linux/dell-led.h | 6 +- + sound/pci/hda/dell_wmi_helper.c | 30 +- + 29 files changed, 704 insertions(+), 753 deletions(-) + rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (56%) +Merging chrome-platform/for-next (31b764171cb5 Revert "platform/chrome: chromeos_laptop: Add Leon Touch") +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. +Merging hsi/for-next (7ac5d7b1a125 HSI: hsi_char.h: use __u32 from linux/types.h) +$ git merge hsi/for-next +Already up-to-date. +Merging leds/for-next (aef13a5447a7 leds: pca9532: Extend pca9532 device tree support) +$ git merge leds/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/leds/leds-cpcap.txt | 29 ++ + .../devicetree/bindings/leds/leds-mt6323.txt | 60 +++ + .../devicetree/bindings/leds/leds-pca9532.txt | 10 + + drivers/leds/Kconfig | 18 +- + drivers/leds/Makefile | 2 + + drivers/leds/led-class.c | 26 +- + drivers/leds/leds-cpcap.c | 239 ++++++++++ + drivers/leds/leds-gpio.c | 12 +- + drivers/leds/leds-lp3952.c | 18 +- + drivers/leds/leds-mt6323.c | 502 +++++++++++++++++++++ + drivers/leds/leds-pca9532.c | 31 +- + include/linux/leds-pca9532.h | 4 +- + include/linux/leds.h | 14 +- + include/linux/mfd/motorola-cpcap.h | 3 + + 14 files changed, 930 insertions(+), 38 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/leds-cpcap.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-mt6323.txt + create mode 100644 drivers/leds/leds-cpcap.c + create mode 100644 drivers/leds/leds-mt6323.c +Merging ipmi/for-next (31151bf07a52 ipmi: bt-bmc: Add ast2500 compatible string) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ipmi/aspeed,ast2400-ibt-bmc.txt | 4 +++- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/acpi_ipmi.c | 3 +-- + drivers/char/ipmi/bt-bmc.c | 1 + + drivers/char/ipmi/ipmi_ssif.c | 9 +++++---- + 5 files changed, 11 insertions(+), 8 deletions(-) +Merging driver-core/driver-core-next (96fb7e256a06 Merge 4.11-rc4 into driver-core-next) +$ git merge driver-core/driver-core-next +Merge made by the 'recursive' strategy. + include/uapi/linux/eventpoll.h | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) +Merging usb/usb-next (d30eed1cd2b1 cdc-acm: remove unused element of struct acm) +$ git merge usb/usb-next +Auto-merging lib/string.c +Auto-merging include/linux/string.h +Auto-merging drivers/usb/host/xhci.c +Auto-merging drivers/usb/host/xhci-plat.c +Auto-merging drivers/usb/core/hcd.c +Auto-merging drivers/usb/Makefile +Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi +Auto-merging arch/arm64/boot/dts/marvell/armada-3720-db.dts +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-typec | 276 +++++ + .../devicetree/bindings/usb/ehci-orion.txt | 4 +- + Documentation/devicetree/bindings/usb/generic.txt | 1 + + Documentation/usb/typec.rst | 184 +++ + MAINTAINERS | 9 + + arch/arm64/boot/dts/marvell/armada-3720-db.dts | 6 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 7 + + drivers/usb/Kconfig | 14 +- + drivers/usb/Makefile | 4 +- + drivers/usb/atm/cxacru.c | 2 +- + drivers/usb/chipidea/Kconfig | 2 +- + drivers/usb/chipidea/core.c | 3 - + drivers/usb/chipidea/host.c | 3 +- + drivers/usb/chipidea/udc.c | 10 +- + drivers/usb/class/cdc-acm.c | 151 ++- + drivers/usb/class/cdc-acm.h | 4 +- + drivers/usb/class/usblp.c | 35 +- + drivers/usb/class/usbtmc.c | 56 +- + drivers/usb/core/Makefile | 2 +- + drivers/usb/core/buffer.c | 12 +- + drivers/usb/core/driver.c | 21 + + drivers/usb/core/file.c | 9 +- + drivers/usb/core/hcd.c | 80 +- + drivers/usb/core/hub.c | 11 +- + drivers/usb/core/of.c | 23 + + drivers/usb/core/usb.c | 152 ++- + drivers/usb/dwc2/Kconfig | 2 +- + drivers/usb/dwc3/Kconfig | 2 +- + drivers/usb/gadget/function/f_fs.c | 8 +- + drivers/usb/gadget/function/u_fs.h | 3 +- + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/udc/Kconfig | 8 +- + drivers/usb/gadget/udc/amd5536udc.c | 8 +- + drivers/usb/gadget/udc/amd5536udc.h | 4 +- + drivers/usb/gadget/udc/bdc/Kconfig | 2 +- + drivers/usb/gadget/udc/net2272.c | 8 +- + drivers/usb/gadget/udc/net2272.h | 2 +- + drivers/usb/gadget/udc/net2280.c | 12 +- + drivers/usb/gadget/udc/net2280.h | 2 +- + drivers/usb/gadget/udc/pch_udc.c | 32 +- + drivers/usb/host/Kconfig | 12 +- + drivers/usb/host/Makefile | 4 +- + drivers/usb/host/ehci-dbg.c | 2 +- + drivers/usb/host/ehci-fsl.c | 4 +- + drivers/usb/host/ehci-hcd.c | 2 +- + drivers/usb/host/ehci-mem.c | 12 +- + drivers/usb/host/ehci-orion.c | 36 + + drivers/usb/host/ehci-platform.c | 10 + + drivers/usb/host/fotg210-hcd.c | 2 +- + drivers/usb/host/ohci-hcd.c | 5 +- + drivers/usb/host/ohci-pci.c | 16 + + drivers/usb/host/ohci-platform.c | 3 + + drivers/usb/host/ohci.h | 3 +- + drivers/usb/host/oxu210hp-hcd.c | 2 +- + drivers/usb/host/pci-quirks.h | 4 +- + drivers/usb/host/uhci-hcd.c | 2 +- + drivers/usb/host/uhci-hcd.h | 2 +- + drivers/usb/host/xhci-mem.c | 12 +- + drivers/usb/host/xhci-plat.c | 35 +- + drivers/usb/host/xhci.c | 17 +- + drivers/usb/isp1760/isp1760-if.c | 8 +- + drivers/usb/misc/adutux.c | 55 +- + drivers/usb/misc/appledisplay.c | 19 +- + drivers/usb/misc/chaoskey.c | 22 +- + drivers/usb/misc/ftdi-elan.c | 42 +- + drivers/usb/misc/idmouse.c | 28 +- + drivers/usb/misc/iowarrior.c | 25 +- + drivers/usb/misc/ldusb.c | 53 +- + drivers/usb/misc/legousbtower.c | 29 +- + drivers/usb/misc/lvstest.c | 12 +- + drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +- + drivers/usb/misc/usblcd.c | 47 +- + drivers/usb/misc/uss720.c | 10 +- + drivers/usb/misc/yurex.c | 16 +- + drivers/usb/phy/Kconfig | 7 - + drivers/usb/phy/Makefile | 1 - + drivers/usb/storage/karma.c | 6 +- + drivers/usb/storage/usb.c | 40 +- + drivers/usb/typec/Kconfig | 22 + + drivers/usb/typec/Makefile | 2 + + drivers/usb/typec/typec.c | 1262 ++++++++++++++++++++ + drivers/usb/typec/typec_wcove.c | 377 ++++++ + drivers/usb/usb-skeleton.c | 59 +- + include/linux/string.h | 10 + + include/linux/usb.h | 71 ++ + include/linux/usb/hcd.h | 7 +- + include/linux/usb/of.h | 5 + + include/linux/usb/typec.h | 243 ++++ + lib/string.c | 26 + + tools/usb/.gitignore | 2 + + tools/usb/usbip/libsrc/usbip_common.c | 9 +- + tools/usb/usbip/libsrc/usbip_host_common.c | 28 +- + tools/usb/usbip/src/usbip.c | 2 + + 93 files changed, 3336 insertions(+), 587 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-typec + create mode 100644 Documentation/usb/typec.rst + create mode 100644 drivers/usb/typec/Kconfig + create mode 100644 drivers/usb/typec/Makefile + create mode 100644 drivers/usb/typec/typec.c + create mode 100644 drivers/usb/typec/typec_wcove.c + create mode 100644 include/linux/usb/typec.h + create mode 100644 tools/usb/.gitignore +Merging usb-gadget/next (c02ed2e75ef4 Linux 4.11-rc4) +$ git merge usb-gadget/next +Already up-to-date. +Merging usb-serial/usb-next (e1fdd5b26201 USB: serial: drop obsolete open-race workaround) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/aircable.c | 36 ++---- + drivers/usb/serial/ark3116.c | 17 +-- + drivers/usb/serial/cyberjack.c | 11 +- + drivers/usb/serial/digi_acceleport.c | 23 +--- + drivers/usb/serial/f81534.c | 137 +++++--------------- + drivers/usb/serial/ftdi_sio.c | 53 ++++++-- + drivers/usb/serial/generic.c | 32 ++++- + drivers/usb/serial/io_edgeport.c | 22 ++-- + drivers/usb/serial/io_ti.c | 49 ++++---- + drivers/usb/serial/ipaq.c | 51 ++++---- + drivers/usb/serial/iuu_phoenix.c | 13 +- + drivers/usb/serial/keyspan_pda.c | 16 +-- + drivers/usb/serial/kobil_sct.c | 13 +- + drivers/usb/serial/mos7720.c | 73 ++++------- + drivers/usb/serial/mos7840.c | 36 ++---- + drivers/usb/serial/mxuport.c | 133 +++++--------------- + drivers/usb/serial/omninet.c | 130 ++++--------------- + drivers/usb/serial/opticon.c | 12 +- + drivers/usb/serial/oti6858.c | 19 +-- + drivers/usb/serial/pl2303.c | 82 ++++++++++-- + drivers/usb/serial/quatech2.c | 3 +- + drivers/usb/serial/sierra.c | 3 +- + drivers/usb/serial/spcp8x5.c | 16 +-- + drivers/usb/serial/symbolserial.c | 12 +- + drivers/usb/serial/ti_usb_3410_5052.c | 10 +- + drivers/usb/serial/usb-serial.c | 230 +++++++++++++--------------------- + drivers/usb/serial/visor.c | 146 ++++++++------------- + drivers/usb/serial/whiteheat.c | 32 +---- + include/linux/usb/serial.h | 42 +++++-- + 29 files changed, 533 insertions(+), 919 deletions(-) +Merging usb-chipidea-next/ci-for-usb-next (4f4555cfe704 usb: chipidea: udc: update gadget state after bus resume) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/udc.c +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci.h | 2 ++ + drivers/usb/chipidea/udc.c | 21 +++++++++++++-------- + 2 files changed, 15 insertions(+), 8 deletions(-) +Merging phy-next/next (4e38906cb2da phy: exynos: Use one define for enable bit) +$ git merge phy-next/next +Auto-merging drivers/phy/phy-exynos-pcie.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/phy/sun4i-usb-phy.txt | 1 + + drivers/phy/phy-exynos-dp-video.c | 6 +- + drivers/phy/phy-exynos-mipi-video.c | 71 +++++++++++----------- + drivers/phy/phy-exynos-pcie.c | 8 +-- + drivers/phy/phy-exynos5-usbdrd.c | 6 +- + drivers/phy/phy-meson8b-usb2.c | 6 +- + drivers/phy/phy-sun4i-usb.c | 57 ++++++++++------- + include/linux/mfd/syscon/exynos5-pmu.h | 30 --------- + include/linux/soc/samsung/exynos-regs-pmu.h | 16 ++++- + 9 files changed, 98 insertions(+), 103 deletions(-) +Merging tty/tty-next (abf1e0a98083 tty: serial: fsl_lpuart: lock port on console write) +$ git merge tty/tty-next +Auto-merging drivers/tty/serial/atmel_serial.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvcs.c | 2 +- + drivers/tty/n_gsm.c | 21 +++----- + drivers/tty/pty.c | 7 +-- + drivers/tty/serial/8250/8250_core.c | 2 +- + drivers/tty/serial/8250/8250_dw.c | 13 ++--- + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_fintek.c | 43 +++++++++++++-- + drivers/tty/serial/8250/8250_lpss.c | 3 +- + drivers/tty/serial/Kconfig | 11 ++++ + drivers/tty/serial/altera_jtaguart.c | 20 +++++++ + drivers/tty/serial/altera_uart.c | 32 +++++++++++ + drivers/tty/serial/atmel_serial.c | 7 ++- + .../linux => drivers/tty/serial}/atmel_serial.h | 0 + drivers/tty/serial/fsl_lpuart.c | 20 +++++++ + drivers/tty/serial/sb1250-duart.c | 18 +++---- + drivers/tty/serial/serial_core.c | 24 ++++----- + drivers/tty/serial/sh-sci.c | 43 ++++++++++----- + drivers/tty/serial/st-asc.c | 10 ++-- + drivers/tty/serial/uartlite.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 59 +++++++++++++++----- + drivers/tty/tty_io.c | 62 ++++++++++++---------- + drivers/tty/vt/vt.c | 2 +- + include/linux/serdev.h | 4 +- + include/linux/serial_core.h | 1 + + kernel/printk/braille.c | 15 +++--- + kernel/printk/braille.h | 13 +++-- + 28 files changed, 300 insertions(+), 142 deletions(-) + rename {include/linux => drivers/tty/serial}/atmel_serial.h (100%) +Merging char-misc/char-misc-next (57c0eabbd57e Merge 4.11-rc4 into char-misc-next) +$ git merge char-misc/char-misc-next +Resolved 'drivers/char/tpm/tpm-chip.c' using previous resolution. +Auto-merging include/linux/hyperv.h +Auto-merging fs/char_dev.c +Auto-merging drivers/hv/ring_buffer.c +Auto-merging drivers/char/tpm/tpm-chip.c +CONFLICT (content): Merge conflict in drivers/char/tpm/tpm-chip.c +Auto-merging arch/x86/hyperv/hv_init.c +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 128a0630e403] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/DocBook/rapidio.tmpl | 3 - + .../devicetree/bindings/auxdisplay/hit,hd44780.txt | 44 ++ + .../devicetree/bindings/fpga/fpga-region.txt | 1 + + .../bindings/fpga/lattice-ice40-fpga-mgr.txt | 21 + + Documentation/driver-api/vme.rst | 363 +++------ + Documentation/w1/slaves/00-INDEX | 4 + + Documentation/w1/slaves/w1_ds2413 | 50 ++ + Documentation/w1/slaves/w1_ds2438 | 63 ++ + MAINTAINERS | 1 - + arch/arm/mach-ep93xx/ts72xx.c | 26 + + arch/x86/hyperv/hv_init.c | 2 +- + arch/x86/include/uapi/asm/hyperv.h | 7 +- + drivers/android/Kconfig | 2 +- + drivers/auxdisplay/Kconfig | 14 + + drivers/auxdisplay/Makefile | 2 + + drivers/auxdisplay/charlcd.c | 818 ++++++++++++++++++++ + drivers/auxdisplay/hd44780.c | 325 ++++++++ + drivers/char/hpet.c | 2 +- + drivers/char/mspec.c | 9 +- + drivers/char/tpm/tpm-chip.c | 41 +- + drivers/char/virtio_console.c | 2 +- + drivers/dax/dax.c | 33 +- + drivers/firewire/core-topology.c | 2 +- + drivers/firewire/core.h | 8 +- + drivers/fpga/Kconfig | 13 + + drivers/fpga/Makefile | 2 + + drivers/fpga/fpga-bridge.c | 17 +- + drivers/fpga/fpga-mgr.c | 2 +- + drivers/fpga/fpga-region.c | 8 +- + drivers/fpga/ice40-spi.c | 207 ++++++ + drivers/fpga/ts73xx-fpga.c | 156 ++++ + drivers/fpga/zynq-fpga.c | 28 +- + drivers/gpio/gpiolib.c | 23 +- + drivers/hv/channel.c | 10 +- + drivers/hv/channel_mgmt.c | 48 +- + drivers/hv/connection.c | 65 +- + drivers/hv/hv.c | 5 +- + drivers/hv/hv_balloon.c | 2 - + drivers/hv/hv_fcopy.c | 2 - + drivers/hv/hv_kvp.c | 12 +- + drivers/hv/hv_snapshot.c | 2 - + drivers/hv/hyperv_vmbus.h | 29 +- + drivers/hv/ring_buffer.c | 22 +- + drivers/hv/vmbus_drv.c | 4 +- + drivers/iio/industrialio-core.c | 15 +- + drivers/infiniband/core/ucm.c | 35 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 2 +- + drivers/input/evdev.c | 11 +- + drivers/input/joydev.c | 11 +- + drivers/input/mousedev.c | 11 +- + drivers/media/cec/cec-core.c | 16 +- + drivers/media/media-devnode.c | 20 +- + drivers/misc/Kconfig | 9 + + drivers/misc/Makefile | 1 + + drivers/misc/aspeed-lpc-ctrl.c | 267 +++++++ + drivers/misc/panel.c | 827 +++------------------ + drivers/mtd/ubi/build.c | 91 +-- + drivers/mtd/ubi/vmt.c | 49 +- + drivers/platform/chrome/cros_ec_dev.c | 31 +- + drivers/pps/pps.c | 123 ++- + drivers/rapidio/devices/rio_mport_cdev.c | 24 +- + drivers/rapidio/rio-sysfs.c | 76 +- + drivers/rapidio/rio.c | 3 - + drivers/rapidio/rio.h | 2 - + drivers/rtc/class.c | 14 +- + drivers/rtc/rtc-core.h | 10 - + drivers/rtc/rtc-dev.c | 17 - + drivers/scsi/osd/osd_uld.c | 56 +- + drivers/vme/vme.c | 469 +++++++++++- + drivers/w1/slaves/Kconfig | 6 + + drivers/w1/slaves/Makefile | 1 + + drivers/w1/slaves/w1_ds2438.c | 390 ++++++++++ + drivers/w1/slaves/w1_ds2760.h | 10 +- + drivers/w1/w1_family.h | 1 + + drivers/zorro/zorro-driver.c | 15 +- + drivers/zorro/zorro-sysfs.c | 76 +- + drivers/zorro/zorro.c | 3 - + drivers/zorro/zorro.h | 3 +- + fs/char_dev.c | 86 +++ + include/linux/cdev.h | 5 + + include/linux/fpga/fpga-mgr.h | 1 + + include/linux/hyperv.h | 31 +- + include/linux/vme.h | 12 +- + include/misc/charlcd.h | 42 ++ + include/uapi/linux/aspeed-lpc-ctrl.h | 60 ++ + include/uapi/linux/pps.h | 19 + + 88 files changed, 3769 insertions(+), 1688 deletions(-) + create mode 100644 Documentation/devicetree/bindings/auxdisplay/hit,hd44780.txt + create mode 100644 Documentation/devicetree/bindings/fpga/lattice-ice40-fpga-mgr.txt + create mode 100644 Documentation/w1/slaves/w1_ds2413 + create mode 100644 Documentation/w1/slaves/w1_ds2438 + create mode 100644 drivers/auxdisplay/charlcd.c + create mode 100644 drivers/auxdisplay/hd44780.c + create mode 100644 drivers/fpga/ice40-spi.c + create mode 100644 drivers/fpga/ts73xx-fpga.c + create mode 100644 drivers/misc/aspeed-lpc-ctrl.c + create mode 100644 drivers/w1/slaves/w1_ds2438.c + create mode 100644 include/misc/charlcd.h + create mode 100644 include/uapi/linux/aspeed-lpc-ctrl.h +Merging extcon/extcon-next (8e45fd9e7326 extcon: Remove porting compatibility of swich class) +$ git merge extcon/extcon-next +Removing Documentation/extcon/porting-android-switch-class +Merge made by the 'recursive' strategy. + Documentation/extcon/porting-android-switch-class | 123 -------- + drivers/extcon/Kconfig | 7 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-arizona.c | 46 +++ + drivers/extcon/extcon-intel-cht-wc.c | 353 ++++++++++++++++++++++ + drivers/extcon/extcon-palmas.c | 6 + + drivers/extcon/extcon-usb-gpio.c | 10 +- + drivers/extcon/extcon.c | 20 -- + 8 files changed, 417 insertions(+), 149 deletions(-) + delete mode 100644 Documentation/extcon/porting-android-switch-class + create mode 100644 drivers/extcon/extcon-intel-cht-wc.c +Merging staging/staging-next (a2e99e973931 Staging: lustre: lnet: code style fix) +$ git merge staging/staging-next +Auto-merging include/linux/sched.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-vchiq.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-parameters.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-msg.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-msg-port.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-msg-format.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/mmal-encodings.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/controls.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.h +Auto-merging drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c +Auto-merging drivers/staging/vc04_services/bcm2835-camera/Kconfig +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-pcm.c +Auto-merging drivers/staging/vc04_services/bcm2835-audio/bcm2835-ctl.c +Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c +Removing drivers/staging/lustre/lustre/include/lustre_eacl.h +Removing drivers/staging/iio/meter/ade7759.h +Removing drivers/staging/iio/meter/ade7754.h +Removing drivers/staging/iio/meter/ade7753.h +Removing drivers/staging/iio/accel/adis16240.h +Auto-merging drivers/staging/iio/accel/adis16240.c +Removing drivers/staging/iio/accel/adis16209.h +Auto-merging drivers/staging/iio/accel/adis16209.c +Removing drivers/staging/iio/accel/adis16203.h +Auto-merging drivers/staging/iio/accel/adis16203.c +Removing drivers/staging/iio/accel/adis16201.h +Auto-merging drivers/staging/iio/accel/adis16201.c +Removing drivers/staging/bcm2835-audio/bcm2835.c +Removing drivers/staging/bcm2835-audio/Kconfig +Removing drivers/staging/android/lowmemorykiller.c +Auto-merging drivers/iio/adc/lpc32xx_adc.c +Auto-merging drivers/iio/adc/Makefile +Auto-merging drivers/iio/adc/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-bus-iio | 19 +- + .../ABI/testing/sysfs-bus-iio-counter-104-quad-8 | 24 +- + .../devicetree/bindings/iio/accel/adxl345.txt | 38 + + .../bindings/iio/adc/amlogic,meson-saradc.txt | 2 + + .../devicetree/bindings/iio/dac/ltc2632.txt | 23 + + .../devicetree/bindings/iio/health/max30102.txt | 30 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 + + .../bindings/iio/proximity/devantech-srf04.txt | 28 + + MAINTAINERS | 13 +- + drivers/iio/accel/Kconfig | 31 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adxl345.h | 18 + + drivers/iio/accel/adxl345_core.c | 179 + + drivers/iio/accel/adxl345_i2c.c | 73 + + drivers/iio/accel/adxl345_spi.c | 81 + + drivers/iio/accel/bma180.c | 32 +- + drivers/iio/accel/mma7455_i2c.c | 8 + + drivers/iio/accel/mma7660.c | 7 + + drivers/iio/adc/Kconfig | 42 +- + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ina2xx-adc.c | 34 +- + drivers/{staging => }/iio/adc/lpc32xx_adc.c | 100 +- + drivers/iio/adc/max11100.c | 1 - + drivers/iio/adc/meson_saradc.c | 90 +- + drivers/{staging => }/iio/adc/spear_adc.c | 0 + drivers/iio/adc/stx104.c | 1 + + drivers/iio/adc/sun4i-gpadc-iio.c | 613 + + drivers/iio/adc/ti-ads1015.c | 24 +- + .../iio/common/hid-sensors/hid-sensor-attributes.c | 3 + + drivers/iio/counter/104-quad-8.c | 1 + + drivers/iio/counter/Kconfig | 2 +- + drivers/iio/dac/Kconfig | 10 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/cio-dac.c | 1 + + drivers/iio/dac/ltc2632.c | 314 + + drivers/iio/dac/max5821.c | 1 + + drivers/iio/dac/mcp4725.c | 24 +- + drivers/iio/gyro/itg3200_core.c | 7 + + drivers/iio/health/Kconfig | 13 + + drivers/iio/health/Makefile | 1 + + drivers/iio/health/max30100.c | 1 + + drivers/iio/health/max30102.c | 486 + + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 38 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 7 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 9 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 40 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 10 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 10 + + drivers/iio/light/Kconfig | 10 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9960.c | 7 + + drivers/iio/light/cros_ec_light_prox.c | 289 + + drivers/iio/light/hid-sensor-prox.c | 7 + + drivers/iio/light/tsl2563.c | 10 + + drivers/iio/light/us5182d.c | 7 + + drivers/iio/magnetometer/bmc150_magn_i2c.c | 9 + + drivers/iio/magnetometer/mag3110.c | 7 + + drivers/iio/potentiostat/lmp91000.c | 1 + + drivers/iio/pressure/hp03.c | 7 + + drivers/iio/pressure/mpl3115.c | 7 + + drivers/iio/proximity/Kconfig | 11 + + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 1 + + drivers/iio/proximity/srf04.c | 304 + + drivers/iio/temperature/Kconfig | 14 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/hid-sensor-temperature.c | 311 + + drivers/iio/temperature/maxim_thermocouple.c | 1 + + drivers/iio/temperature/mlx90614.c | 7 + + drivers/iio/temperature/tmp007.c | 277 +- + drivers/media/dvb-frontends/drxk_hard.c | 1 - + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/android/Kconfig | 10 - + drivers/staging/android/Makefile | 1 - + drivers/staging/android/ion/ion_dummy_driver.c | 1 - + drivers/staging/android/ion/ion_test.c | 2 +- + drivers/staging/android/lowmemorykiller.c | 212 - + drivers/staging/bcm2835-audio/Kconfig | 7 - + drivers/staging/bcm2835-audio/bcm2835.c | 250 - + drivers/staging/comedi/Kconfig | 1 - + drivers/staging/comedi/comedi_fops.c | 7 +- + drivers/staging/comedi/drivers/addi_apci_3xxx.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci224.c | 12 +- + drivers/staging/comedi/drivers/cb_pcidas64.c | 6 +- + drivers/staging/comedi/drivers/comedi_test.c | 8 +- + drivers/staging/comedi/drivers/jr3_pci.c | 330 +- + drivers/staging/comedi/drivers/jr3_pci.h | 18 +- + drivers/staging/comedi/drivers/ni_atmio.c | 2 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 2 +- + drivers/staging/comedi/drivers/s626.c | 48 +- + drivers/staging/dgnc/TODO | 3 - + drivers/staging/dgnc/dgnc_cls.c | 154 +- + drivers/staging/dgnc/dgnc_cls.h | 42 +- + drivers/staging/dgnc/dgnc_driver.c | 109 +- + drivers/staging/dgnc/dgnc_driver.h | 340 +- + drivers/staging/dgnc/dgnc_mgmt.c | 67 +- + drivers/staging/dgnc/dgnc_mgmt.h | 7 +- + drivers/staging/dgnc/dgnc_neo.c | 228 +- + drivers/staging/dgnc/dgnc_neo.h | 85 +- + drivers/staging/dgnc/dgnc_pci.h | 13 +- + drivers/staging/dgnc/dgnc_tty.c | 577 +- + drivers/staging/dgnc/dgnc_tty.h | 6 +- + drivers/staging/dgnc/dgnc_utils.c | 9 +- + drivers/staging/dgnc/dgnc_utils.h | 6 +- + drivers/staging/dgnc/digi.h | 134 +- + drivers/staging/emxx_udc/emxx_udc.h | 2 +- + drivers/staging/fbtft/Kconfig | 6 + + drivers/staging/fbtft/Makefile | 1 + + drivers/staging/fbtft/fb_agm1264k-fl.c | 2 +- + drivers/staging/fbtft/fb_ili9163.c | 2 +- + drivers/staging/fbtft/fb_ili9325.c | 2 +- + drivers/staging/fbtft/fb_ili9481.c | 2 +- + drivers/staging/fbtft/fb_ili9486.c | 2 +- + drivers/staging/fbtft/fb_ra8875.c | 2 +- + drivers/staging/fbtft/fb_s6d02a1.c | 2 +- + drivers/staging/fbtft/fb_sh1106.c | 195 + + drivers/staging/fbtft/fb_ssd1289.c | 2 +- + drivers/staging/fbtft/fb_ssd1331.c | 8 +- + drivers/staging/fbtft/fb_st7735r.c | 2 +- + drivers/staging/fbtft/fb_watterott.c | 6 +- + drivers/staging/fbtft/fbtft-bus.c | 31 +- + drivers/staging/fbtft/fbtft-core.c | 74 +- + drivers/staging/fbtft/fbtft-sysfs.c | 2 +- + drivers/staging/fbtft/fbtft.h | 5 +- + drivers/staging/fbtft/fbtft_device.c | 23 +- + drivers/staging/fbtft/flexfb.c | 20 +- + drivers/staging/fsl-mc/bus/Kconfig | 10 + + drivers/staging/fsl-mc/bus/Makefile | 3 + + drivers/staging/fsl-mc/bus/dpio/Makefile | 9 + + drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h | 75 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 296 + + drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt | 135 + + drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 618 + + drivers/staging/fsl-mc/bus/dpio/dpio.c | 224 + + drivers/staging/fsl-mc/bus/dpio/dpio.h | 109 + + drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 1033 ++ + drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 469 + + .../staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c | 4 +- + drivers/staging/fsl-mc/include/dpaa2-fd.h | 448 + + drivers/staging/fsl-mc/include/dpaa2-global.h | 202 + + drivers/staging/fsl-mc/include/dpaa2-io.h | 139 + + drivers/staging/gdm724x/gdm_lte.c | 17 +- + drivers/staging/gdm724x/gdm_lte.h | 2 +- + drivers/staging/gdm724x/gdm_mux.c | 4 +- + drivers/staging/gdm724x/gdm_tty.c | 3 +- + drivers/staging/goldfish/goldfish_nand.c | 16 +- + .../greybus/Documentation/firmware/authenticate.c | 2 +- + .../greybus/Documentation/firmware/firmware.c | 21 +- + drivers/staging/greybus/gbphy.c | 1 - + drivers/staging/greybus/loopback.c | 5 +- + drivers/staging/greybus/tools/loopback_test.c | 6 +- + drivers/staging/greybus/uart.c | 2 +- + drivers/staging/iio/accel/Makefile | 7 - + .../iio/accel/{adis16201_core.c => adis16201.c} | 150 +- + drivers/staging/iio/accel/adis16201.h | 144 - + .../iio/accel/{adis16203_core.c => adis16203.c} | 140 +- + drivers/staging/iio/accel/adis16203.h | 125 - + .../iio/accel/{adis16209_core.c => adis16209.c} | 150 +- + drivers/staging/iio/accel/adis16209.h | 144 - + .../iio/accel/{adis16240_core.c => adis16240.c} | 200 +- + drivers/staging/iio/accel/adis16240.h | 179 - + drivers/staging/iio/adc/Kconfig | 22 - + drivers/staging/iio/adc/Makefile | 2 - + drivers/staging/iio/adc/ad7192.c | 20 +- + drivers/staging/iio/adc/ad7280a.c | 22 +- + drivers/staging/iio/adc/ad7780.c | 2 +- + drivers/staging/iio/addac/adt7316.c | 108 +- + drivers/staging/iio/cdc/ad7152.c | 22 +- + drivers/staging/iio/cdc/ad7746.c | 32 +- + drivers/staging/iio/frequency/ad9832.c | 99 +- + drivers/staging/iio/frequency/ad9832.h | 92 - + drivers/staging/iio/frequency/ad9834.c | 86 +- + drivers/staging/iio/frequency/ad9834.h | 72 - + drivers/staging/iio/gyro/adis16060_core.c | 2 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 16 +- + drivers/staging/iio/light/isl29028.c | 37 +- + drivers/staging/iio/meter/ade7753.c | 82 +- + drivers/staging/iio/meter/ade7753.h | 72 - + drivers/staging/iio/meter/ade7754.c | 91 +- + drivers/staging/iio/meter/ade7754.h | 90 - + drivers/staging/iio/meter/ade7759.c | 50 +- + drivers/staging/iio/meter/ade7759.h | 53 - + drivers/staging/iio/meter/ade7854.c | 4 +- + drivers/staging/iio/meter/meter.h | 60 +- + drivers/staging/iio/resolver/ad2s1200.c | 2 +- + drivers/staging/iio/resolver/ad2s1210.c | 28 +- + drivers/staging/iio/resolver/ad2s90.c | 2 +- + drivers/staging/ks7010/TODO | 2 - + drivers/staging/ks7010/eap_packet.h | 9 +- + drivers/staging/ks7010/ks7010_sdio.c | 466 +- + drivers/staging/ks7010/ks7010_sdio.h | 2 +- + drivers/staging/ks7010/ks_hostif.c | 552 +- + drivers/staging/ks7010/ks_hostif.h | 394 +- + drivers/staging/ks7010/ks_wlan.h | 46 +- + drivers/staging/ks7010/ks_wlan_ioctl.h | 68 +- + drivers/staging/ks7010/ks_wlan_net.c | 1003 +- + drivers/staging/ks7010/michael_mic.c | 12 +- + drivers/staging/ks7010/michael_mic.h | 6 +- + drivers/staging/lustre/include/linux/lnet/api.h | 65 +- + .../staging/lustre/include/linux/lnet/lib-lnet.h | 232 +- + .../staging/lustre/include/linux/lnet/lib-types.h | 137 +- + drivers/staging/lustre/include/linux/lnet/lnetst.h | 12 +- + drivers/staging/lustre/include/linux/lnet/nidstr.h | 2 +- + .../staging/lustre/include/linux/lnet/socklnd.h | 14 +- + drivers/staging/lustre/include/linux/lnet/types.h | 155 +- + drivers/staging/lustre/lnet/Kconfig | 1 - + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 109 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.h | 24 +- + .../staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c | 88 +- + .../lustre/lnet/klnds/o2iblnd/o2iblnd_modparams.c | 14 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.c | 69 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd.h | 76 +- + .../staging/lustre/lnet/klnds/socklnd/socklnd_cb.c | 62 +- + .../lustre/lnet/klnds/socklnd/socklnd_lib.c | 4 +- + .../lustre/lnet/klnds/socklnd/socklnd_proto.c | 38 +- + drivers/staging/lustre/lnet/libcfs/debug.c | 8 +- + drivers/staging/lustre/lnet/libcfs/tracefile.c | 51 +- + drivers/staging/lustre/lnet/lnet/acceptor.c | 2 +- + drivers/staging/lustre/lnet/lnet/api-ni.c | 151 +- + drivers/staging/lustre/lnet/lnet/config.c | 8 +- + drivers/staging/lustre/lnet/lnet/lib-eq.c | 26 +- + drivers/staging/lustre/lnet/lnet/lib-md.c | 29 +- + drivers/staging/lustre/lnet/lnet/lib-me.c | 28 +- + drivers/staging/lustre/lnet/lnet/lib-move.c | 195 +- + drivers/staging/lustre/lnet/lnet/lib-msg.c | 41 +- + drivers/staging/lustre/lnet/lnet/lib-ptl.c | 32 +- + drivers/staging/lustre/lnet/lnet/lo.c | 12 +- + drivers/staging/lustre/lnet/lnet/nidstrings.c | 2 +- + drivers/staging/lustre/lnet/lnet/peer.c | 38 +- + drivers/staging/lustre/lnet/lnet/router.c | 164 +- + drivers/staging/lustre/lnet/lnet/router_proc.c | 34 +- + drivers/staging/lustre/lnet/selftest/brw_test.c | 4 +- + drivers/staging/lustre/lnet/selftest/conrpc.c | 17 +- + drivers/staging/lustre/lnet/selftest/console.c | 39 +- + drivers/staging/lustre/lnet/selftest/console.h | 14 +- + drivers/staging/lustre/lnet/selftest/framework.c | 4 +- + drivers/staging/lustre/lnet/selftest/ping_test.c | 2 +- + drivers/staging/lustre/lnet/selftest/rpc.c | 31 +- + drivers/staging/lustre/lnet/selftest/rpc.h | 2 +- + drivers/staging/lustre/lnet/selftest/selftest.h | 42 +- + drivers/staging/lustre/lustre/include/cl_object.h | 13 +- + .../staging/lustre/lustre/include/lprocfs_status.h | 120 +- + drivers/staging/lustre/lustre/include/lu_object.h | 10 +- + drivers/staging/lustre/lustre/include/lustre_dlm.h | 11 +- + .../lustre/lustre/include/lustre_dlm_flags.h | 3 + + .../staging/lustre/lustre/include/lustre_eacl.h | 74 - + drivers/staging/lustre/lustre/include/lustre_net.h | 32 +- + .../staging/lustre/lustre/include/obd_support.h | 1 + + drivers/staging/lustre/lustre/ldlm/interval_tree.c | 13 +- + drivers/staging/lustre/lustre/ldlm/ldlm_internal.h | 5 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lock.c | 47 +- + drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c | 178 +- + drivers/staging/lustre/lustre/ldlm/ldlm_pool.c | 7 +- + drivers/staging/lustre/lustre/ldlm/ldlm_request.c | 14 +- + drivers/staging/lustre/lustre/ldlm/ldlm_resource.c | 2 +- + drivers/staging/lustre/lustre/llite/file.c | 49 +- + drivers/staging/lustre/lustre/llite/glimpse.c | 4 +- + drivers/staging/lustre/lustre/llite/lcommon_cl.c | 8 +- + drivers/staging/lustre/lustre/llite/lcommon_misc.c | 2 +- + .../staging/lustre/lustre/llite/llite_internal.h | 3 +- + drivers/staging/lustre/lustre/llite/llite_lib.c | 16 +- + drivers/staging/lustre/lustre/llite/llite_mmap.c | 4 +- + drivers/staging/lustre/lustre/llite/lproc_llite.c | 4 +- + drivers/staging/lustre/lustre/llite/range_lock.c | 2 +- + drivers/staging/lustre/lustre/llite/rw.c | 2 +- + drivers/staging/lustre/lustre/llite/rw26.c | 26 - + drivers/staging/lustre/lustre/llite/super25.c | 2 +- + drivers/staging/lustre/lustre/llite/vvp_dev.c | 10 +- + drivers/staging/lustre/lustre/llite/vvp_io.c | 1 + + drivers/staging/lustre/lustre/llite/xattr.c | 3 +- + drivers/staging/lustre/lustre/lmv/lmv_obd.c | 4 +- + .../staging/lustre/lustre/lov/lov_cl_internal.h | 41 +- + drivers/staging/lustre/lustre/lov/lov_io.c | 24 +- + drivers/staging/lustre/lustre/lov/lov_object.c | 2 +- + drivers/staging/lustre/lustre/obdclass/cl_object.c | 6 +- + .../lustre/lustre/obdclass/lprocfs_status.c | 111 + + .../staging/lustre/lustre/obdclass/obd_config.c | 3 +- + .../staging/lustre/lustre/obdecho/echo_client.c | 6 +- + drivers/staging/lustre/lustre/osc/lproc_osc.c | 2 +- + drivers/staging/lustre/lustre/osc/osc_cache.c | 3 +- + .../staging/lustre/lustre/osc/osc_cl_internal.h | 4 +- + drivers/staging/lustre/lustre/osc/osc_internal.h | 3 +- + drivers/staging/lustre/lustre/osc/osc_io.c | 48 +- + drivers/staging/lustre/lustre/osc/osc_lock.c | 60 +- + drivers/staging/lustre/lustre/osc/osc_object.c | 12 +- + drivers/staging/lustre/lustre/osc/osc_page.c | 77 +- + drivers/staging/lustre/lustre/osc/osc_request.c | 17 +- + drivers/staging/lustre/lustre/ptlrpc/client.c | 7 +- + drivers/staging/lustre/lustre/ptlrpc/connection.c | 6 +- + drivers/staging/lustre/lustre/ptlrpc/events.c | 18 +- + drivers/staging/lustre/lustre/ptlrpc/niobuf.c | 26 +- + drivers/staging/lustre/lustre/ptlrpc/pers.c | 2 +- + .../staging/lustre/lustre/ptlrpc/ptlrpc_internal.h | 2 +- + drivers/staging/lustre/lustre/ptlrpc/sec_bulk.c | 2 +- + drivers/staging/media/Kconfig | 3 +- + drivers/staging/media/Makefile | 2 +- + drivers/staging/media/atomisp/Kconfig | 11 + + drivers/staging/media/atomisp/Makefile | 6 + + drivers/staging/media/atomisp/TODO | 64 + + drivers/staging/media/atomisp/i2c/Kconfig | 106 + + drivers/staging/media/atomisp/i2c/Makefile | 23 + + drivers/staging/media/atomisp/i2c/ap1302.c | 1260 ++ + drivers/staging/media/atomisp/i2c/ap1302.h | 198 + + drivers/staging/media/atomisp/i2c/gc0310.c | 1490 +++ + drivers/staging/media/atomisp/i2c/gc0310.h | 459 + + drivers/staging/media/atomisp/i2c/gc2235.c | 1219 ++ + drivers/staging/media/atomisp/i2c/gc2235.h | 672 ++ + drivers/staging/media/atomisp/i2c/imx/Kconfig | 9 + + drivers/staging/media/atomisp/i2c/imx/Makefile | 8 + + drivers/staging/media/atomisp/i2c/imx/ad5816g.c | 225 + + drivers/staging/media/atomisp/i2c/imx/ad5816g.h | 49 + + drivers/staging/media/atomisp/i2c/imx/common.h | 65 + + drivers/staging/media/atomisp/i2c/imx/drv201.c | 218 + + drivers/staging/media/atomisp/i2c/imx/drv201.h | 38 + + drivers/staging/media/atomisp/i2c/imx/dw9714.c | 235 + + drivers/staging/media/atomisp/i2c/imx/dw9714.h | 63 + + drivers/staging/media/atomisp/i2c/imx/dw9718.c | 238 + + drivers/staging/media/atomisp/i2c/imx/dw9718.h | 64 + + drivers/staging/media/atomisp/i2c/imx/dw9719.c | 209 + + drivers/staging/media/atomisp/i2c/imx/dw9719.h | 58 + + drivers/staging/media/atomisp/i2c/imx/imx.c | 2512 ++++ + drivers/staging/media/atomisp/i2c/imx/imx.h | 766 ++ + drivers/staging/media/atomisp/i2c/imx/imx132.h | 566 + + drivers/staging/media/atomisp/i2c/imx/imx134.h | 2464 ++++ + drivers/staging/media/atomisp/i2c/imx/imx135.h | 3374 ++++++ + drivers/staging/media/atomisp/i2c/imx/imx175.h | 1959 ++++ + drivers/staging/media/atomisp/i2c/imx/imx208.h | 550 + + drivers/staging/media/atomisp/i2c/imx/imx219.h | 227 + + drivers/staging/media/atomisp/i2c/imx/imx227.h | 726 ++ + drivers/staging/media/atomisp/i2c/imx/otp.c | 39 + + .../media/atomisp/i2c/imx/otp_brcc064_e2prom.c | 80 + + drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c | 89 + + drivers/staging/media/atomisp/i2c/imx/otp_imx.c | 191 + + drivers/staging/media/atomisp/i2c/imx/vcm.c | 45 + + .../staging/media/atomisp/i2c/libmsrlisthelper.c | 209 + + drivers/staging/media/atomisp/i2c/lm3554.c | 1009 ++ + drivers/staging/media/atomisp/i2c/mt9m114.c | 1963 ++++ + drivers/staging/media/atomisp/i2c/mt9m114.h | 1786 +++ + drivers/staging/media/atomisp/i2c/ov2680.c | 1559 +++ + drivers/staging/media/atomisp/i2c/ov2680.h | 940 ++ + drivers/staging/media/atomisp/i2c/ov2722.c | 1373 +++ + drivers/staging/media/atomisp/i2c/ov2722.h | 1267 +++ + drivers/staging/media/atomisp/i2c/ov5693/Kconfig | 11 + + drivers/staging/media/atomisp/i2c/ov5693/Makefile | 3 + + drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 67 + + drivers/staging/media/atomisp/i2c/ov5693/ov5693.c | 2066 ++++ + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1381 +++ + drivers/staging/media/atomisp/i2c/ov8858.c | 2221 ++++ + drivers/staging/media/atomisp/i2c/ov8858.h | 1482 +++ + drivers/staging/media/atomisp/i2c/ov8858_btns.h | 1284 +++ + .../atomisp/include/asm/intel_mid_pcihelpers.h | 37 + + .../staging/media/atomisp/include/linux/atomisp.h | 1367 +++ + .../atomisp/include/linux/atomisp_gmin_platform.h | 40 + + .../media/atomisp/include/linux/atomisp_platform.h | 262 + + .../media/atomisp/include/linux/libmsrlisthelper.h | 32 + + .../media/atomisp/include/linux/vlv2_plat_clock.h | 30 + + .../staging/media/atomisp/include/media/lm3554.h | 136 + + .../staging/media/atomisp/include/media/lm3642.h | 153 + + drivers/staging/media/atomisp/pci/Kconfig | 13 + + drivers/staging/media/atomisp/pci/Makefile | 5 + + .../staging/media/atomisp/pci/atomisp2/Makefile | 374 + + .../media/atomisp/pci/atomisp2/atomisp-regs.h | 209 + + .../media/atomisp/pci/atomisp2/atomisp_acc.c | 608 + + .../media/atomisp/pci/atomisp2/atomisp_acc.h | 124 + + .../media/atomisp/pci/atomisp2/atomisp_cmd.c | 6764 +++++++++++ + .../media/atomisp/pci/atomisp2/atomisp_cmd.h | 457 + + .../media/atomisp/pci/atomisp2/atomisp_common.h | 79 + + .../media/atomisp/pci/atomisp2/atomisp_compat.h | 668 ++ + .../atomisp/pci/atomisp2/atomisp_compat_css20.c | 4729 ++++++++ + .../atomisp/pci/atomisp2/atomisp_compat_css20.h | 282 + + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.c | 1263 ++ + .../atomisp/pci/atomisp2/atomisp_compat_ioctl32.h | 369 + + .../media/atomisp/pci/atomisp2/atomisp_csi2.c | 446 + + .../media/atomisp/pci/atomisp2/atomisp_csi2.h | 61 + + .../atomisp/pci/atomisp2/atomisp_dfs_tables.h | 412 + + .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 209 + + .../media/atomisp/pci/atomisp2/atomisp_drvfs.h | 29 + + .../media/atomisp/pci/atomisp2/atomisp_file.c | 245 + + .../media/atomisp/pci/atomisp2/atomisp_file.h | 47 + + .../media/atomisp/pci/atomisp2/atomisp_fops.c | 1304 +++ + .../media/atomisp/pci/atomisp2/atomisp_fops.h | 54 + + .../media/atomisp/pci/atomisp2/atomisp_helper.h | 33 + + .../media/atomisp/pci/atomisp2/atomisp_internal.h | 331 + + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 3130 +++++ + .../media/atomisp/pci/atomisp2/atomisp_ioctl.h | 73 + + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 1437 +++ + .../media/atomisp/pci/atomisp2/atomisp_subdev.h | 471 + + .../media/atomisp/pci/atomisp2/atomisp_tables.h | 191 + + .../media/atomisp/pci/atomisp2/atomisp_tpg.c | 181 + + .../media/atomisp/pci/atomisp2/atomisp_tpg.h | 42 + + .../atomisp/pci/atomisp2/atomisp_trace_event.h | 133 + + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 1618 +++ + .../media/atomisp/pci/atomisp2/atomisp_v4l2.h | 44 + + .../media/atomisp/pci/atomisp2/css2400/Makefile | 4 + + .../base/circbuf/interface/ia_css_circbuf.h | 377 + + .../base/circbuf/interface/ia_css_circbuf_comm.h | 56 + + .../base/circbuf/interface/ia_css_circbuf_desc.h | 170 + + .../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 | 883 ++ + .../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 | 3218 ++++++ + .../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_regs_defs.h | 22 + + .../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 + + .../atomisp2/css2400/css_2400_system/hrt/sp_hrt.h | 24 + + .../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 | 3217 ++++++ + .../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_regs_defs.h | 22 + + .../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 + + .../css2400/css_2401_csi2p_system/hrt/sp_hrt.h | 24 + + .../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 | 3217 ++++++ + .../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_regs_defs.h | 22 + + .../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 + + .../atomisp2/css2400/css_2401_system/hrt/sp_hrt.h | 24 + + .../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 ++++++ + .../atomisp/pci/atomisp2/css2400/css_api_version.h | 673 ++ + .../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 + + .../host/hive_isp_css_ddr_hrt_modified.h | 148 + + .../host/hive_isp_css_hrt_modified.h | 79 + + .../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 | 227 + + .../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 | 130 + + .../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/resource_global.h | 35 + + .../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_common/xmem_global.h | 20 + + .../css2400/hive_isp_css_include/assert_support.h | 103 + + .../atomisp2/css2400/hive_isp_css_include/bamem.h | 47 + + .../css2400/hive_isp_css_include/bbb_config.h | 27 + + .../css2400/hive_isp_css_include/bitop_support.h | 25 + + .../css2400/hive_isp_css_include/cpu_mem_support.h | 59 + + .../atomisp2/css2400/hive_isp_css_include/csi_rx.h | 48 + + .../atomisp2/css2400/hive_isp_css_include/debug.h | 48 + + .../device_access/device_access.h | 194 + + .../atomisp2/css2400/hive_isp_css_include/dma.h | 48 + + .../css2400/hive_isp_css_include/error_support.h | 70 + + .../css2400/hive_isp_css_include/event_fifo.h | 47 + + .../css2400/hive_isp_css_include/fifo_monitor.h | 47 + + .../css2400/hive_isp_css_include/gdc_device.h | 49 + + .../css2400/hive_isp_css_include/gp_device.h | 47 + + .../css2400/hive_isp_css_include/gp_timer.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/gpio.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/hmem.h | 47 + + .../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 + + .../hive_isp_css_include/host/isp2400_config.h | 24 + + .../hive_isp_css_include/host/isp2500_config.h | 29 + + .../hive_isp_css_include/host/isp2600_config.h | 34 + + .../hive_isp_css_include/host/isp2601_config.h | 70 + + .../css2400/hive_isp_css_include/host/isp_config.h | 24 + + .../css2400/hive_isp_css_include/host/isp_op1w.h | 845 ++ + .../hive_isp_css_include/host/isp_op1w_types.h | 54 + + .../css2400/hive_isp_css_include/host/isp_op2w.h | 675 ++ + .../hive_isp_css_include/host/isp_op2w_types.h | 49 + + .../hive_isp_css_include/host/isp_op_count.h | 226 + + .../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/osys_public.h | 20 + + .../hive_isp_css_include/host/pipeline_public.h | 18 + + .../hive_isp_css_include/host/pixelgen_public.h | 79 + + .../hive_isp_css_include/host/ref_vector_func.h | 1222 ++ + .../host/ref_vector_func_types.h | 385 + + .../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 | 49 + + .../css2400/hive_isp_css_include/input_formatter.h | 47 + + .../css2400/hive_isp_css_include/input_system.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/irq.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/isp.h | 47 + + .../css2400/hive_isp_css_include/isys_dma.h | 49 + + .../css2400/hive_isp_css_include/isys_irq.h | 40 + + .../hive_isp_css_include/isys_stream2mmio.h | 49 + + .../css2400/hive_isp_css_include/math_support.h | 224 + + .../memory_access/memory_access.h | 180 + + .../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 | 49 + + .../atomisp2/css2400/hive_isp_css_include/mpmath.h | 330 + + .../atomisp2/css2400/hive_isp_css_include/osys.h | 48 + + .../css2400/hive_isp_css_include/pixelgen.h | 49 + + .../hive_isp_css_include/platform_support.h | 42 + + .../css2400/hive_isp_css_include/print_support.h | 45 + + .../atomisp2/css2400/hive_isp_css_include/queue.h | 47 + + .../css2400/hive_isp_css_include/resource.h | 48 + + .../atomisp2/css2400/hive_isp_css_include/socket.h | 48 + + .../pci/atomisp2/css2400/hive_isp_css_include/sp.h | 47 + + .../css2400/hive_isp_css_include/storage_class.h | 34 + + .../css2400/hive_isp_css_include/stream_buffer.h | 48 + + .../css2400/hive_isp_css_include/string_support.h | 167 + + .../css2400/hive_isp_css_include/system_types.h | 25 + + .../atomisp2/css2400/hive_isp_css_include/tag.h | 46 + + .../css2400/hive_isp_css_include/timed_ctrl.h | 47 + + .../css2400/hive_isp_css_include/type_support.h | 82 + + .../atomisp2/css2400/hive_isp_css_include/vamem.h | 47 + + .../css2400/hive_isp_css_include/vector_func.h | 39 + + .../css2400/hive_isp_css_include/vector_ops.h | 32 + + .../atomisp2/css2400/hive_isp_css_include/vmem.h | 47 + + .../atomisp2/css2400/hive_isp_css_include/xmem.h | 47 + + .../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/socket_global.h | 53 + + .../hive_isp_css_shared/stream_buffer_global.h | 26 + + .../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 | 111 + + .../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 | 365 + + .../pci/atomisp2/css2400/ia_css_host_data.h | 46 + + .../pci/atomisp2/css2400/ia_css_input_port.h | 66 + + .../atomisp/pci/atomisp2/css2400/ia_css_irq.h | 235 + + .../pci/atomisp2/css2400/ia_css_memory_access.c | 101 + + .../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 | 31 + + .../atomisp/pci/atomisp2/css2400/ia_css_morph.h | 39 + + .../atomisp/pci/atomisp2/css2400/ia_css_pipe.h | 228 + + .../pci/atomisp2/css2400/ia_css_pipe_public.h | 659 ++ + .../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 | 94 + + .../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 | 654 ++ + .../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_state.h | 41 + + .../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 + + .../bayer_ls_1.0/ia_css_bayer_load_param.h | 20 + + .../bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h | 42 + + .../bayer_ls_1.0/ia_css_bayer_store_param.h | 21 + + .../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 | 41 + + .../isp/kernels/bnlm/ia_css_bnlm_default.host.c | 71 + + .../isp/kernels/bnlm/ia_css_bnlm_default.host.h | 22 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm_param.h | 63 + + .../css2400/isp/kernels/bnlm/ia_css_bnlm_state.h | 31 + + .../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_1.0/ia_css_cnr_state.h | 33 + + .../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 + + .../isp/kernels/cnr/cnr_2/ia_css_cnr_state.h | 33 + + .../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_state.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 | 40 + + .../isp/kernels/dpc2/ia_css_dpc2_default.host.c | 26 + + .../isp/kernels/dpc2/ia_css_dpc2_default.host.h | 23 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2_param.h | 53 + + .../css2400/isp/kernels/dpc2/ia_css_dpc2_state.h | 30 + + .../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 | 46 + + .../kernels/eed1_8/ia_css_eed1_8_default.host.c | 94 + + .../kernels/eed1_8/ia_css_eed1_8_default.host.h | 22 + + .../isp/kernels/eed1_8/ia_css_eed1_8_param.h | 154 + + .../isp/kernels/eed1_8/ia_css_eed1_8_state.h | 40 + + .../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.host.c | 47 + + .../fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h | 37 + + .../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/plane_io_ls/ia_css_plane_io_param.h | 22 + + .../io_ls/plane_io_ls/ia_css_plane_io_types.h | 30 + + .../io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h | 22 + + .../io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h | 22 + + .../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 + + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h | 22 + + .../ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h | 30 + + .../yuv420_io_ls/ia_css_yuv420_io_param.h | 22 + + .../yuv420_io_ls/ia_css_yuv420_io_types.h | 22 + + .../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 + + .../isp/kernels/norm/norm_1.0/ia_css_norm_types.h | 21 + + .../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 | 266 + + .../kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h | 45 + + .../s3a_stat_ls/ia_css_s3a_stat_store_param.h | 21 + + .../css2400/isp/kernels/satm/ia_css_satm.host.c | 27 + + .../css2400/isp/kernels/satm/ia_css_satm.host.h | 29 + + .../css2400/isp/kernels/satm/ia_css_satm_param.h | 30 + + .../css2400/isp/kernels/satm/ia_css_satm_types.h | 35 + + .../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/scale/scale_1.0/ia_css_scale_param.h | 20 + + .../kernels/sdis/common/ia_css_sdis_common.host.h | 99 + + .../kernels/sdis/common/ia_css_sdis_common_types.h | 232 + + .../isp/kernels/sdis/common/ia_css_sdis_param.h | 22 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c | 424 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h | 101 + + .../isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h | 21 + + .../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/sdis/sdis_2/ia_css_sdis_param.h | 21 + + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c | 76 + + .../isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h | 39 + + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c | 36 + + .../kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h | 23 + + .../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.host.c | 35 + + .../isp/kernels/uds/uds_1.0/ia_css_uds.host.h | 33 + + .../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 + + .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c | 155 + + .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h | 58 + + .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h | 50 + + .../kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h | 33 + + .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c | 154 + + .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h | 59 + + .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h | 50 + + .../kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h | 33 + + .../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 + + .../xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h | 20 + + .../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 + + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h | 20 + + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h | 39 + + .../yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h | 21 + + .../css2400/isp/modes/interface/input_buf.isp.h | 73 + + .../css2400/isp/modes/interface/isp_const.h | 498 + + .../css2400/isp/modes/interface/isp_exprs.h | 309 + + .../css2400/isp/modes/interface/isp_types.h | 128 + + .../atomisp/pci/atomisp2/css2400/memory_realloc.c | 81 + + .../runtime/binary/interface/ia_css_binary.h | 333 + + .../atomisp2/css2400/runtime/binary/src/binary.c | 1873 +++ + .../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 | 590 + + .../css2400/runtime/debug/interface/ia_css_debug.h | 508 + + .../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 | 3611 ++++++ + .../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 | 568 + + .../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 | 107 + + .../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 | 141 + + .../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 | 141 + + .../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 | 308 + + .../pipeline/interface/ia_css_pipeline_common.h | 42 + + .../css2400/runtime/pipeline/src/pipeline.c | 806 ++ + .../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 | 89 + + .../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 | 199 + + .../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 | 11375 +++++++++++++++++++ + .../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 | 339 + + .../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 | 1105 ++ + .../atomisp/pci/atomisp2/css2400/sh_css_irq.c | 16 + + .../atomisp/pci/atomisp2/css2400/sh_css_legacy.h | 88 + + .../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 | 76 + + .../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 | 62 + + .../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 | 5268 +++++++++ + .../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 | 1814 +++ + .../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 | 738 ++ + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 1543 +++ + .../media/atomisp/pci/atomisp2/hmm/hmm_bo_dev.c | 333 + + .../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 241 + + .../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 258 + + .../media/atomisp/pci/atomisp2/hmm/hmm_vm.c | 218 + + .../media/atomisp/pci/atomisp2/hrt/device_access.c | 116 + + .../atomisp2/hrt/hive_isp_css_custom_host_hrt.h | 107 + + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c | 193 + + .../atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h | 88 + + .../media/atomisp/pci/atomisp2/hrt/memory_access.c | 129 + + .../media/atomisp/pci/atomisp2/include/hmm/hmm.h | 106 + + .../atomisp/pci/atomisp2/include/hmm/hmm_bo.h | 323 + + .../atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h | 130 + + .../atomisp/pci/atomisp2/include/hmm/hmm_common.h | 100 + + .../atomisp/pci/atomisp2/include/hmm/hmm_pool.h | 119 + + .../atomisp/pci/atomisp2/include/hmm/hmm_vm.h | 68 + + .../atomisp/pci/atomisp2/include/mmu/isp_mmu.h | 175 + + .../atomisp/pci/atomisp2/include/mmu/sh_mmu.h | 76 + + .../pci/atomisp2/include/mmu/sh_mmu_mrfld.h | 28 + + drivers/staging/media/atomisp/pci/atomisp2/list | 182 + + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 594 + + .../media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c | 93 + + drivers/staging/media/atomisp/platform/Makefile | 6 + + .../staging/media/atomisp/platform/clock/Makefile | 6 + + .../platform/clock/platform_vlv2_plat_clk.c | 40 + + .../platform/clock/platform_vlv2_plat_clk.h | 27 + + .../media/atomisp/platform/clock/vlv2_plat_clock.c | 266 + + .../media/atomisp/platform/intel-mid/Makefile | 5 + + .../platform/intel-mid/atomisp_gmin_platform.c | 758 ++ + .../platform/intel-mid/intel_mid_pcihelpers.c | 297 + + drivers/staging/media/cxd2099/cxd2099.c | 101 +- + .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 24 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 12 +- + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 4 +- + .../staging/media/davinci_vpfe/dm365_isif_regs.h | 20 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 6 +- + .../staging/media/davinci_vpfe/vpfe_mc_capture.c | 4 +- + drivers/staging/media/lirc/lirc_zilog.c | 6 +- + drivers/staging/most/hdm-dim2/dim2_hal.c | 7 +- + drivers/staging/nvec/nvec_kbd.c | 2 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_ap.c | 23 +- + drivers/staging/rtl8188eu/core/rtw_ioctl_set.c | 4 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 135 +- + drivers/staging/rtl8188eu/core/rtw_mlme_ext.c | 25 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 12 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 11 +- + drivers/staging/rtl8188eu/core/rtw_xmit.c | 24 +- + .../staging/rtl8188eu/hal/Hal8188ERateAdaptive.c | 2 +- + drivers/staging/rtl8188eu/hal/odm.c | 3 + + drivers/staging/rtl8188eu/hal/odm_RTL8188E.c | 5 +- + drivers/staging/rtl8188eu/hal/phy.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188e_cmd.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 1 + + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 1 + + drivers/staging/rtl8188eu/hal/usb_halinit.c | 17 +- + drivers/staging/rtl8188eu/include/Hal8188EPhyReg.h | 2 +- + drivers/staging/rtl8188eu/include/hal_intf.h | 1 - + .../staging/rtl8188eu/include/odm_RegDefine11N.h | 4 +- + drivers/staging/rtl8188eu/include/odm_debug.h | 2 +- + drivers/staging/rtl8188eu/include/pwrseq.h | 2 +- + drivers/staging/rtl8188eu/include/rtl8188e_spec.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_cmd.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_mlme.h | 1 - + .../staging/rtl8188eu/include/rtw_mp_phy_regdef.h | 2 +- + drivers/staging/rtl8188eu/include/rtw_recv.h | 4 +- + drivers/staging/rtl8188eu/os_dep/xmit_linux.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 34 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 2 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 80 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 17 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 2 +- + drivers/staging/rtl8192e/rtl819x_BA.h | 2 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 2 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- + drivers/staging/rtl8192e/rtllib.h | 6 +- + drivers/staging/rtl8192e/rtllib_debug.h | 2 +- + drivers/staging/rtl8192e/rtllib_module.c | 52 +- + drivers/staging/rtl8192e/rtllib_wx.c | 54 +- + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 6 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 2 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 2 +- + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 3 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 60 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 4 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 4 - + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 6 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_HTProc.c | 15 +- + drivers/staging/rtl8192u/r8192U.h | 4 +- + drivers/staging/rtl8192u/r8192U_core.c | 10 +- + drivers/staging/rtl8192u/r8192U_dm.c | 21 +- + drivers/staging/rtl8192u/r819xU_cmdpkt.c | 2 +- + drivers/staging/rtl8712/ieee80211.c | 5 +- + drivers/staging/rtl8712/os_intfs.c | 14 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 11 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8712/rtl871x_event.h | 8 +- + drivers/staging/rtl8712/rtl871x_io.h | 14 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 143 +- + drivers/staging/rtl8712/rtl871x_ioctl_rtl.c | 10 +- + drivers/staging/rtl8712/rtl871x_mlme.h | 16 +- + drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 191 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.h | 10 +- + drivers/staging/rtl8712/rtl871x_recv.h | 12 +- + drivers/staging/rtl8712/wifi.h | 12 +- + drivers/staging/rtl8712/wlan_bssdef.h | 6 +- + drivers/staging/rts5208/rtsx_chip.c | 4 +- + drivers/staging/rts5208/rtsx_transport.c | 3 +- + drivers/staging/sm750fb/ddk750_chip.c | 16 +- + drivers/staging/sm750fb/ddk750_chip.h | 2 +- + drivers/staging/sm750fb/ddk750_display.h | 7 +- + drivers/staging/sm750fb/ddk750_dvi.c | 6 +- + drivers/staging/sm750fb/ddk750_hwi2c.c | 2 +- + drivers/staging/sm750fb/ddk750_mode.c | 107 +- + drivers/staging/sm750fb/ddk750_mode.h | 21 +- + drivers/staging/sm750fb/ddk750_power.c | 5 - + drivers/staging/sm750fb/ddk750_power.h | 3 +- + drivers/staging/sm750fb/ddk750_reg.h | 4 - + drivers/staging/sm750fb/sm750.c | 27 +- + drivers/staging/sm750fb/sm750.h | 6 +- + drivers/staging/sm750fb/sm750_accel.c | 9 +- + drivers/staging/sm750fb/sm750_cursor.c | 21 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/speakup/buffers.c | 36 +- + drivers/staging/speakup/fakekey.c | 2 +- + drivers/staging/speakup/i18n.c | 77 +- + drivers/staging/speakup/keyhelp.c | 14 +- + drivers/staging/speakup/kobjects.c | 96 +- + drivers/staging/speakup/main.c | 309 +- + drivers/staging/speakup/selection.c | 6 +- + drivers/staging/speakup/serialio.c | 85 +- + drivers/staging/speakup/speakup.h | 15 +- + drivers/staging/speakup/speakup_acntpc.c | 21 +- + drivers/staging/speakup/speakup_acntsa.c | 5 +- + drivers/staging/speakup/speakup_apollo.c | 12 +- + drivers/staging/speakup/speakup_audptr.c | 7 +- + drivers/staging/speakup/speakup_bns.c | 3 +- + drivers/staging/speakup/speakup_decext.c | 24 +- + drivers/staging/speakup/speakup_decpc.c | 119 +- + drivers/staging/speakup/speakup_dectlk.c | 22 +- + drivers/staging/speakup/speakup_dtlk.c | 6 +- + drivers/staging/speakup/speakup_dtlk.h | 10 +- + drivers/staging/speakup/speakup_dummy.c | 3 +- + drivers/staging/speakup/speakup_keypc.c | 9 +- + drivers/staging/speakup/speakup_ltlk.c | 7 +- + drivers/staging/speakup/speakup_soft.c | 93 +- + drivers/staging/speakup/speakup_spkout.c | 3 +- + drivers/staging/speakup/speakup_txprt.c | 3 +- + drivers/staging/speakup/spk_priv.h | 17 +- + drivers/staging/speakup/spk_types.h | 9 +- + drivers/staging/speakup/synth.c | 105 +- + drivers/staging/speakup/varhandlers.c | 18 +- + drivers/staging/unisys/include/channel.h | 213 +- + drivers/staging/unisys/include/iochannel.h | 87 +- + drivers/staging/unisys/include/visorbus.h | 8 +- + drivers/staging/unisys/visorbus/controlvmchannel.h | 208 +- + drivers/staging/unisys/visorbus/vbuschannel.h | 57 +- + drivers/staging/unisys/visorbus/visorbus_main.c | 384 +- + drivers/staging/unisys/visorbus/visorbus_private.h | 26 +- + drivers/staging/unisys/visorbus/visorchannel.c | 60 +- + drivers/staging/unisys/visorbus/visorchipset.c | 835 +- + drivers/staging/unisys/visorbus/vmcallinterface.h | 73 +- + drivers/staging/unisys/visorhba/visorhba_main.c | 87 +- + drivers/staging/unisys/visorinput/visorinput.c | 21 +- + drivers/staging/unisys/visornic/visornic_main.c | 254 +- + drivers/staging/vc04_services/Kconfig | 32 +- + drivers/staging/vc04_services/Makefile | 3 + + .../staging/vc04_services/bcm2835-audio/Kconfig | 8 + + .../{ => vc04_services}/bcm2835-audio/Makefile | 0 + .../staging/{ => vc04_services}/bcm2835-audio/TODO | 0 + .../bcm2835-audio/bcm2835-ctl.c | 111 +- + .../bcm2835-audio/bcm2835-pcm.c | 51 +- + .../bcm2835-audio/bcm2835-vchiq.c | 143 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 472 + + .../{ => vc04_services}/bcm2835-audio/bcm2835.h | 34 +- + .../bcm2835-audio/vc_vchi_audioserv_defs.h | 0 + .../bcm2835-camera}/Kconfig | 7 +- + .../bcm2835-camera}/Makefile | 0 + .../bcm2835 => vc04_services/bcm2835-camera}/TODO | 0 + .../bcm2835-camera}/bcm2835-camera.c | 82 +- + .../bcm2835-camera}/bcm2835-camera.h | 6 +- + .../bcm2835-camera}/controls.c | 34 +- + .../bcm2835-camera}/mmal-common.h | 0 + .../bcm2835-camera}/mmal-encodings.h | 1 - + .../bcm2835-camera}/mmal-msg-common.h | 0 + .../bcm2835-camera}/mmal-msg-format.h | 30 +- + .../bcm2835-camera}/mmal-msg-port.h | 16 +- + .../bcm2835-camera}/mmal-msg.h | 47 +- + .../bcm2835-camera}/mmal-parameters.h | 2 - + .../bcm2835-camera}/mmal-vchiq.c | 261 +- + .../bcm2835-camera}/mmal-vchiq.h | 10 +- + drivers/staging/vc04_services/interface/vchi/TODO | 21 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 550 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 259 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 7 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 4 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 2 +- + .../interface/vchiq_arm/vchiq_kern_lib.c | 4 + + .../interface/vchiq_arm/vchiq_memdrv.h | 12 - + .../interface/vchiq_arm/vchiq_pagelist.h | 3 - + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 56 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 2 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.h | 2 - + .../interface/vchiq_arm/vchiq_version.c | 16 +- + drivers/staging/vme/devices/vme_user.c | 10 +- + drivers/staging/vt6655/baseband.h | 12 +- + drivers/staging/vt6655/card.c | 25 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/vt6655/rxtx.h | 10 +- + drivers/staging/vt6656/usbpipe.c | 4 +- + drivers/staging/vt6656/wcmd.c | 3 - + drivers/staging/wilc1000/coreconfigurator.h | 19 +- + drivers/staging/wilc1000/host_interface.c | 57 +- + drivers/staging/wilc1000/wilc_sdio.c | 21 +- + drivers/staging/wilc1000/wilc_spi.c | 78 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 54 +- + drivers/staging/wilc1000/wilc_wlan.c | 10 +- + drivers/staging/wilc1000/wilc_wlan.h | 6 +- + drivers/staging/wlan-ng/hfa384x.h | 54 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 4 +- + drivers/staging/wlan-ng/p80211conv.c | 2 +- + drivers/staging/wlan-ng/p80211conv.h | 28 +- + drivers/staging/wlan-ng/prism2mgmt.c | 1 - + drivers/staging/wlan-ng/prism2sta.c | 2 +- + drivers/staging/xgifb/XGI_main_26.c | 54 +- + drivers/staging/xgifb/vb_init.h | 3 +- + drivers/staging/xgifb/vb_setmode.c | 12 +- + include/linux/hid-sensor-ids.h | 4 + + include/linux/mfd/sun4i-gpadc.h | 2 + + include/linux/sched.h | 4 - + 1430 files changed, 218571 insertions(+), 9850 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/accel/adxl345.txt + create mode 100644 Documentation/devicetree/bindings/iio/dac/ltc2632.txt + create mode 100644 Documentation/devicetree/bindings/iio/health/max30102.txt + create mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt + create mode 100644 drivers/iio/accel/adxl345.h + create mode 100644 drivers/iio/accel/adxl345_core.c + create mode 100644 drivers/iio/accel/adxl345_i2c.c + create mode 100644 drivers/iio/accel/adxl345_spi.c + rename drivers/{staging => }/iio/adc/lpc32xx_adc.c (68%) + rename drivers/{staging => }/iio/adc/spear_adc.c (100%) + create mode 100644 drivers/iio/adc/sun4i-gpadc-iio.c + create mode 100644 drivers/iio/dac/ltc2632.c + create mode 100644 drivers/iio/health/max30102.c + create mode 100644 drivers/iio/light/cros_ec_light_prox.c + create mode 100644 drivers/iio/proximity/srf04.c + create mode 100644 drivers/iio/temperature/hid-sensor-temperature.c + delete mode 100644 drivers/staging/android/lowmemorykiller.c + delete mode 100644 drivers/staging/bcm2835-audio/Kconfig + delete mode 100644 drivers/staging/bcm2835-audio/bcm2835.c + create mode 100644 drivers/staging/fbtft/fb_sh1106.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/Makefile + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-service.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.h + create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c + create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.h + create mode 100644 drivers/staging/fsl-mc/include/dpaa2-fd.h + create mode 100644 drivers/staging/fsl-mc/include/dpaa2-global.h + create mode 100644 drivers/staging/fsl-mc/include/dpaa2-io.h + rename drivers/staging/iio/accel/{adis16201_core.c => adis16201.c} (63%) + delete mode 100644 drivers/staging/iio/accel/adis16201.h + rename drivers/staging/iio/accel/{adis16203_core.c => adis16203.c} (64%) + delete mode 100644 drivers/staging/iio/accel/adis16203.h + rename drivers/staging/iio/accel/{adis16209_core.c => adis16209.c} (63%) + delete mode 100644 drivers/staging/iio/accel/adis16209.h + rename drivers/staging/iio/accel/{adis16240_core.c => adis16240.c} (60%) + delete mode 100644 drivers/staging/iio/accel/adis16240.h + delete mode 100644 drivers/staging/iio/meter/ade7753.h + delete mode 100644 drivers/staging/iio/meter/ade7754.h + delete mode 100644 drivers/staging/iio/meter/ade7759.h + delete mode 100644 drivers/staging/lustre/lustre/include/lustre_eacl.h + create mode 100644 drivers/staging/media/atomisp/Kconfig + create mode 100644 drivers/staging/media/atomisp/Makefile + create mode 100644 drivers/staging/media/atomisp/TODO + create mode 100644 drivers/staging/media/atomisp/i2c/Kconfig + create mode 100644 drivers/staging/media/atomisp/i2c/Makefile + create mode 100644 drivers/staging/media/atomisp/i2c/ap1302.c + create mode 100644 drivers/staging/media/atomisp/i2c/ap1302.h + create mode 100644 drivers/staging/media/atomisp/i2c/gc0310.c + create mode 100644 drivers/staging/media/atomisp/i2c/gc0310.h + create mode 100644 drivers/staging/media/atomisp/i2c/gc2235.c + create mode 100644 drivers/staging/media/atomisp/i2c/gc2235.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/Kconfig + create mode 100644 drivers/staging/media/atomisp/i2c/imx/Makefile + create mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/ad5816g.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/common.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/drv201.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9714.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9718.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/dw9719.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx132.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx134.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx135.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx175.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx208.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx219.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/imx227.h + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_brcc064_e2prom.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_e2prom.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/otp_imx.c + create mode 100644 drivers/staging/media/atomisp/i2c/imx/vcm.c + create mode 100644 drivers/staging/media/atomisp/i2c/libmsrlisthelper.c + create mode 100644 drivers/staging/media/atomisp/i2c/lm3554.c + create mode 100644 drivers/staging/media/atomisp/i2c/mt9m114.c + create mode 100644 drivers/staging/media/atomisp/i2c/mt9m114.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov2680.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov2680.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov2722.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov2722.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Kconfig + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov8858.c + create mode 100644 drivers/staging/media/atomisp/i2c/ov8858.h + create mode 100644 drivers/staging/media/atomisp/i2c/ov8858_btns.h + create mode 100644 drivers/staging/media/atomisp/include/asm/intel_mid_pcihelpers.h + create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp.h + create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_gmin_platform.h + create mode 100644 drivers/staging/media/atomisp/include/linux/atomisp_platform.h + create mode 100644 drivers/staging/media/atomisp/include/linux/libmsrlisthelper.h + create mode 100644 drivers/staging/media/atomisp/include/linux/vlv2_plat_clock.h + create mode 100644 drivers/staging/media/atomisp/include/media/lm3554.h + create mode 100644 drivers/staging/media/atomisp/include/media/lm3642.h + create mode 100644 drivers/staging/media/atomisp/pci/Kconfig + create mode 100644 drivers/staging/media/atomisp/pci/Makefile + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/Makefile + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp-regs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_acc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_cmd.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_css20.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_compat_ioctl32.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_csi2.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_dfs_tables.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_drvfs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_file.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_helper.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_subdev.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tables.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_tpg.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_trace_event.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/Makefile + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/interface/ia_css_circbuf_desc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/circbuf/src/circbuf.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/interface/ia_css_refcount.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/base/refcount/src/refcount.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_binarydesc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_stagedesc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/interface/ia_css_pipe_util.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_binarydesc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_stagedesc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/pipe/src/pipe_util.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/interface/ia_css_util.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/camera/util/src/util.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_configs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hive_isp_css_2400_system_generated/ia_css_isp_states.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/bits.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/cell_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/css_receiver_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/dma_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gdc_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_regs_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gp_timer_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/gpio_block_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_host_ids_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_irq_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/hive_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/if_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_formatter_subsystem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_selector_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_switch_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_ctrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/input_system_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/irq_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_mamoiada_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp2400_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_acquisition_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/isp_capture_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/mmu_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/scalar_processor_2400_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/sp_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/str2mem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/streaming_to_mipi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/timed_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/var.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/hrt/version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2400_system/spmem_dump.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/csi_rx_global.h + create 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 + create 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 + create 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 + create 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 + create 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 + create 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 + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/csi_rx_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/ibuf_ctrl_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/input_system_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_dma_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_irq_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/isys_stream2mmio_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/pixelgen_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/host/system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/PixelGen_SysBlock_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/bits.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/cell_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/css_receiver_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/dma_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gdc_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_regs_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gp_timer_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/gpio_block_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_2401_irq_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_host_ids_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/hive_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/ibuf_cntrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/if_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_formatter_subsystem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_selector_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_switch_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_ctrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/input_system_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/irq_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2400_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp2401_mamoiada_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_acquisition_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/isp_capture_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mipi_backend_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/mmu_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/rx_csi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/scalar_processor_2400_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/sp_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/str2mem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/stream2mmio_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/streaming_to_mipi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/timed_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/var.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/hrt/version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/ibuf_ctrl_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/input_system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_dma_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_irq_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/isys_stream2mmio_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/pixelgen_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/spmem_dump.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_csi2p_system/system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_configs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hive_isp_css_2401_system_generated/ia_css_isp_states.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/bits.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/cell_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_common_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/css_receiver_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/dma_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gdc_v2_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_regs_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gp_timer_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/gpio_block_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_2401_irq_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_host_ids_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_isp_css_streaming_to_mipi_types_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/hive_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/if_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_formatter_subsystem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_selector_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_switch_2400_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_ctrl_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/input_system_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/irq_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2400_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp2401_mamoiada_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_acquisition_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/isp_capture_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/mmu_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/scalar_processor_2400_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/sp_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/str2mem_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/streaming_to_mipi_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/timed_controller_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/var.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/hrt/version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_2401_system/spmem_dump.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_api_version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/css_trace.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/debug_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/dma_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/event_fifo_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/fifo_monitor_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gdc_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_device_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gp_timer_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/gpio_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/hmem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/debug_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/dma_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/event_fifo_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/fifo_monitor_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gdc_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_device_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gp_timer_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/gpio_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_ddr_hrt_modified.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hive_isp_css_hrt_modified.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/hmem_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_formatter_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/input_system_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/irq_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/isp_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/mmu_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/sp_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/system_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/timed_ctrl_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vamem_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/host/vmem_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_formatter_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/input_system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/irq_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/isp_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/mmu_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/resource_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/sp_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/system_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/timed_ctrl_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vamem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/vmem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_common/xmem_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/assert_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bamem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bbb_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/bitop_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/cpu_mem_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/csi_rx.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/debug.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/device_access/device_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/dma.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/error_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/event_fifo.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/fifo_monitor.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gdc_device.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_device.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gp_timer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/gpio.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/hmem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/csi_rx_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/debug_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/dma_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/event_fifo_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/fifo_monitor_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gdc_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_device_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gp_timer_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/gpio_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/hmem_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ibuf_ctrl_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_formatter_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/input_system_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/irq_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2400_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2500_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2600_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp2601_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_config.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op1w_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op2w_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_op_count.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isp_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_dma_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_irq_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/isys_stream2mmio_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/mmu_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/osys_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pipeline_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/pixelgen_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/ref_vector_func_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/sp_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/tag_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/timed_ctrl_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vamem_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/host/vmem_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/ibuf_ctrl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_formatter.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/input_system.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/irq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_dma.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_irq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/isys_stream2mmio.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/math_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_access/memory_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/memory_realloc.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/misc_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mmu_device.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/mpmath.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/osys.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/pixelgen.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/platform_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/print_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/queue.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/resource.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/socket.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/sp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/storage_class.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/stream_buffer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/string_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/system_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/tag.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/timed_ctrl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/type_support.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vamem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_func.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vector_ops.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/vmem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_include/xmem.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/queue_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_local.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/host/tag_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/queue_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/socket_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/stream_buffer_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/sw_event_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/hive_isp_css_shared/tag_global.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_3a.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_acc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_buffer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_control.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_device_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_dvs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_env.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_err.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_event_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_firmware.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frac.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_format.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_frame_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_host_data.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_input_port.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_irq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_memory_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_metadata.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mipi.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_mmu_private.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_morph.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_pipe_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_prbs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_properties.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_shading.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_format.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_stream_public.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_timer.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_tpg.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/ia_css_version_data.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/aa/aa_2/ia_css_aa2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_1.0/ia_css_anr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/anr/anr_2/ia_css_anr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_load_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_ls_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bayer_ls/bayer_ls_1.0/ia_css_bayer_store_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bh/bh_2/ia_css_bh_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnlm/ia_css_bnlm_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr2_2/ia_css_bnr2_2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/bnr/bnr_1.0/ia_css_bnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_1.0/ia_css_cnr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/cnr/cnr_2/ia_css_cnr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/conversion/conversion_1.0/ia_css_conversion_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/copy_output/copy_output_1.0/ia_css_copy_output_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/crop/crop_1.0/ia_css_crop_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/csc/csc_1.0/ia_css_csc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc1_5_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc1_5/ia_css_ctc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc2/ia_css_ctc2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ctc/ctc_1.0/ia_css_ctc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_1.0/ia_css_de_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/de/de_2/ia_css_de_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dp/dp_1.0/ia_css_dp_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dpc2/ia_css_dpc2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/dvs/dvs_1.0/ia_css_dvs_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/eed1_8/ia_css_eed1_8_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fc/fc_1.0/ia_css_formats_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fixedbds/fixedbds_1.0/ia_css_fixedbds_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/fpn/fpn_1.0/ia_css_fpn_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_1.0/ia_css_gc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/gc/gc_2/ia_css_gc2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/hdr/ia_css_hdr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/bayer_io_ls/ia_css_bayer_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/common/ia_css_common_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/plane_io_ls/ia_css_plane_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/bayer_io_ls/ia_css_bayer_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/common/ia_css_common_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/plane_io_ls/ia_css_plane_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv420_io_ls/ia_css_yuv420_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ipu2_io_ls/yuv444_io_ls/ia_css_yuv444_io_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iterator/iterator_1.0/ia_css_iterator_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc1_5/ia_css_macc1_5_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/macc/macc_1.0/ia_css_macc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/norm/norm_1.0/ia_css_norm_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob2/ia_css_ob2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ob/ob_1.0/ia_css_ob_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/output/output_1.0/ia_css_output_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/qplane/qplane_2/ia_css_qplane_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw/raw_1.0/ia_css_raw_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/raw_aa_binning/raw_aa_binning_1.0/ia_css_raa.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ref/ref_1.0/ia_css_ref_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_ls_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/s3a_stat_ls/ia_css_s3a_stat_store_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/satm/ia_css_satm_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sc/sc_1.0/ia_css_sc_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/scale/scale_1.0/ia_css_scale_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_common_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/common/ia_css_sdis_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_1.0/ia_css_sdis_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/sdis/sdis_2/ia_css_sdis_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_default.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tdf/tdf_1.0/ia_css_tdf_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr3/ia_css_tnr3_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/tnr/tnr_1.0/ia_css_tnr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/uds/uds_1.0/ia_css_uds_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/vf/vf_1.0/ia_css_vf_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/wb/wb_1.0/ia_css_wb_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_11/ia_css_xnr3_0_11_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr3_0_5/ia_css_xnr3_0_5_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_table.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_1.0/ia_css_xnr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/xnr/xnr_3.0/ia_css_xnr3_wrapper_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_1.0/ia_css_ynr_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2.host.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr2_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/ynr/ynr_2/ia_css_ynr_state.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_load_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_ls_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/yuv_ls/yuv_ls_1.0/ia_css_yuv_store_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/input_buf.isp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_const.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_exprs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/modes/interface/isp_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/memory_realloc.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/interface/ia_css_binary.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/binary/src/binary.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/interface/ia_css_bufq_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/interface/ia_css_debug_pipe.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/debug/src/ia_css_debug.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/interface/ia_css_event.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/event/src/event.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/interface/ia_css_eventq.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/eventq/src/eventq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/interface/ia_css_frame_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/frame/src/frame.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/interface/ia_css_ifmtr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/ifmtr/src/ifmtr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/interface/ia_css_inputfifo.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/inputfifo/src/inputfifo.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/interface/ia_css_isp_param_types.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isp_param/src/isp_param.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/interface/ia_css_isys_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/csi_rx_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/ibuf_ctrl_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_dma_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_stream2mmio_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/rx.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/virtual_isys.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/interface/ia_css_pipeline_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/pipeline/src/pipeline.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/interface/ia_css_queue_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/queue/src/queue_access.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/interface/ia_css_rmgr_vbuf.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/rmgr/src/rmgr_vbuf.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/interface/ia_css_spctrl_comm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/spctrl/src/spctrl.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/tagger/interface/ia_css_tagger_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/timer/src/timer.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_defs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_dvs_info.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_firmware.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_frac.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_host_data.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_irq.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_legacy.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metadata.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_metrics.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mipi.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_mmu.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_morph.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_dvs.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_param_shading.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_params_internal.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_pipe.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_properties.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_shading.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_sp.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_stream_format.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_struct.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_uds.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/sh_css_version.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_bo_dev.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hmm/hmm_vm.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/device_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_custom_host_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/hive_isp_css_mm_hrt.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/hrt/memory_access.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_bo_dev.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_common.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_pool.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/hmm/hmm_vm.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/isp_mmu.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/include/mmu/sh_mmu_mrfld.h + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/list + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/mmu/isp_mmu.c + create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/mmu/sh_mmu_mrfld.c + create mode 100644 drivers/staging/media/atomisp/platform/Makefile + create mode 100644 drivers/staging/media/atomisp/platform/clock/Makefile + create mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.c + create mode 100644 drivers/staging/media/atomisp/platform/clock/platform_vlv2_plat_clk.h + create mode 100644 drivers/staging/media/atomisp/platform/clock/vlv2_plat_clock.c + create mode 100644 drivers/staging/media/atomisp/platform/intel-mid/Makefile + create mode 100644 drivers/staging/media/atomisp/platform/intel-mid/atomisp_gmin_platform.c + create mode 100644 drivers/staging/media/atomisp/platform/intel-mid/intel_mid_pcihelpers.c + create mode 100644 drivers/staging/vc04_services/bcm2835-audio/Kconfig + rename drivers/staging/{ => vc04_services}/bcm2835-audio/Makefile (100%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/TODO (100%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-ctl.c (78%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-pcm.c (93%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-vchiq.c (91%) + create mode 100644 drivers/staging/vc04_services/bcm2835-audio/bcm2835.c + rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.h (81%) + rename drivers/staging/{ => vc04_services}/bcm2835-audio/vc_vchi_audioserv_defs.h (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/Kconfig (75%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/Makefile (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/TODO (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.c (97%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/bcm2835-camera.h (98%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/controls.c (98%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-common.h (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-encodings.h (99%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-common.h (100%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-format.h (74%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg-port.h (88%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-msg.h (94%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-parameters.h (99%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.c (89%) + rename drivers/staging/{media/platform/bcm2835 => vc04_services/bcm2835-camera}/mmal-vchiq.h (99%) +Merging mux/for-next (5238347fea92 mux: adg792a: add mux controller driver for ADG792A/G) +$ git merge mux/for-next +Resolved 'drivers/Kconfig' using previous resolution. +Resolved 'drivers/Makefile' using previous resolution. +Auto-merging drivers/Makefile +CONFLICT (content): Merge conflict in drivers/Makefile +Auto-merging drivers/Kconfig +CONFLICT (content): Merge conflict in drivers/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a0f425b7cc72] Merge remote-tracking branch 'mux/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/i2c/i2c-mux-gpmux.txt | 99 +++++ + .../bindings/iio/multiplexer/io-channel-mux.txt | 39 ++ + .../devicetree/bindings/mux/adi,adg792a.txt | 75 ++++ + Documentation/devicetree/bindings/mux/gpio-mux.txt | 69 ++++ + .../devicetree/bindings/mux/mux-controller.txt | 157 +++++++ + Documentation/driver-model/devres.txt | 10 +- + MAINTAINERS | 15 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/i2c/muxes/Kconfig | 13 + + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/i2c-mux-gpmux.c | 173 ++++++++ + drivers/iio/Kconfig | 1 + + drivers/iio/Makefile | 1 + + drivers/iio/inkern.c | 60 +++ + drivers/iio/multiplexer/Kconfig | 18 + + drivers/iio/multiplexer/Makefile | 6 + + drivers/iio/multiplexer/iio-mux.c | 459 +++++++++++++++++++++ + drivers/mux/Kconfig | 46 +++ + drivers/mux/Makefile | 7 + + drivers/mux/mux-adg792a.c | 140 +++++++ + drivers/mux/mux-core.c | 422 +++++++++++++++++++ + drivers/mux/mux-gpio.c | 114 +++++ + include/dt-bindings/mux/mux.h | 16 + + include/linux/iio/consumer.h | 37 ++ + include/linux/mux.h | 252 +++++++++++ + 26 files changed, 2232 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/i2c/i2c-mux-gpmux.txt + create mode 100644 Documentation/devicetree/bindings/iio/multiplexer/io-channel-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/adi,adg792a.txt + create mode 100644 Documentation/devicetree/bindings/mux/gpio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/mux-controller.txt + create mode 100644 drivers/i2c/muxes/i2c-mux-gpmux.c + create mode 100644 drivers/iio/multiplexer/Kconfig + create mode 100644 drivers/iio/multiplexer/Makefile + create mode 100644 drivers/iio/multiplexer/iio-mux.c + create mode 100644 drivers/mux/Kconfig + create mode 100644 drivers/mux/Makefile + create mode 100644 drivers/mux/mux-adg792a.c + create mode 100644 drivers/mux/mux-core.c + create mode 100644 drivers/mux/mux-gpio.c + create mode 100644 include/dt-bindings/mux/mux.h + create mode 100644 include/linux/mux.h +Merging slave-dma/next (6d64f547d571 Merge branch 'topic/pl08x' into next) +$ git merge slave-dma/next +Removing include/linux/amba/pl330.h +Auto-merging Makefile +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/da8xx-usb.txt | 41 ++++- + Makefile | 2 +- + arch/arm/plat-samsung/devs.c | 1 - + drivers/dma/Kconfig | 6 +- + drivers/dma/amba-pl08x.c | 20 +-- + drivers/dma/bcm2835-dma.c | 5 +- + drivers/dma/cppi41.c | 168 ++++++++++++--------- + drivers/dma/dmaengine.c | 2 + + drivers/dma/imx-sdma.c | 19 ++- + drivers/dma/mv_xor.c | 5 - + drivers/dma/pl330.c | 42 +----- + drivers/dma/qcom/hidma.c | 15 ++ + drivers/dma/qcom/hidma_ll.c | 6 + + drivers/dma/sh/rcar-dmac.c | 52 ++++--- + drivers/dma/stm32-dma.c | 2 +- + drivers/dma/xilinx/xilinx_dma.c | 63 ++++---- + include/linux/amba/pl080.h | 50 +++--- + include/linux/amba/pl330.h | 35 ----- + 18 files changed, 290 insertions(+), 244 deletions(-) + delete mode 100644 include/linux/amba/pl330.h +Merging cgroup/for-next (2b29fbe02b78 Merge branch 'for-4.12' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + include/linux/cgroup-defs.h | 3 ++- + include/linux/cgroup.h | 29 +++++++++++++++++++++++++---- + include/linux/sched.h | 4 ++++ + kernel/cgroup/cgroup-internal.h | 5 +++-- + kernel/cgroup/cgroup-v1.c | 4 ++-- + kernel/cgroup/cgroup.c | 17 +++++++++-------- + kernel/cgroup/cpuset.c | 9 +++------ + kernel/cgroup/namespace.c | 2 +- + kernel/kthread.c | 3 +++ + 9 files changed, 52 insertions(+), 24 deletions(-) +Merging scsi/for-next (d95ded912cdf Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Auto-merging drivers/scsi/qedi/qedi_iscsi.c +Auto-merging drivers/scsi/osd/osd_uld.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 - + drivers/scsi/be2iscsi/be.h | 12 +- + drivers/scsi/be2iscsi/be_cmds.c | 17 +- + drivers/scsi/be2iscsi/be_cmds.h | 74 ++-- + drivers/scsi/be2iscsi/be_iscsi.c | 111 ++--- + drivers/scsi/be2iscsi/be_iscsi.h | 13 +- + drivers/scsi/be2iscsi/be_main.c | 270 +++++------ + drivers/scsi/be2iscsi/be_main.h | 28 +- + drivers/scsi/be2iscsi/be_mgmt.c | 140 +++--- + drivers/scsi/be2iscsi/be_mgmt.h | 43 +- + drivers/scsi/esas2r/esas2r_log.c | 5 - + drivers/scsi/fnic/fnic.h | 3 +- + drivers/scsi/fnic/fnic_fcs.c | 23 +- + drivers/scsi/fnic/fnic_isr.c | 41 +- + drivers/scsi/fnic/fnic_scsi.c | 105 +++-- + drivers/scsi/fnic/fnic_stats.h | 16 + + drivers/scsi/fnic/fnic_trace.c | 49 +- + drivers/scsi/hisi_sas/Kconfig | 1 + + drivers/scsi/hisi_sas/hisi_sas.h | 15 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 436 +++++++++++++----- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 19 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 788 ++++++++++++++++++++++++--------- + drivers/scsi/hpsa.c | 6 +- + drivers/scsi/ipr.c | 259 ++++++++--- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/libfc/fc_fcp.c | 6 +- + drivers/scsi/libiscsi.c | 8 +- + drivers/scsi/osd/osd_uld.c | 7 +- + drivers/scsi/qedi/qedi_iscsi.c | 2 +- + drivers/scsi/scsi_transport_iscsi.c | 3 +- + drivers/scsi/sgiwd93.c | 2 +- + drivers/scsi/sni_53c710.c | 2 +- + drivers/scsi/stex.c | 287 +++++++++--- + drivers/scsi/ufs/ufshcd.c | 87 +--- + drivers/scsi/ufs/ufshci.h | 2 + + drivers/scsi/zalon.c | 2 +- + include/scsi/libfc.h | 3 +- + include/scsi/libiscsi.h | 3 +- + 38 files changed, 1873 insertions(+), 1020 deletions(-) +Merging scsi-mkp/for-next (dbd34a61c343 Revert "scsi: ufs: add queries retry mechanism") +$ git merge scsi-mkp/for-next +Already up-to-date. +Merging target-updates/for-next (9f7ebfc64d2c tcm: make pi data verification configurable) +$ git merge target-updates/for-next +Merge made by the 'recursive' strategy. + drivers/target/iscsi/iscsi_target_util.c | 13 +++--- + drivers/target/target_core_configfs.c | 34 +++++++++++++++ + drivers/target/target_core_file.c | 29 +++++++++---- + drivers/target/target_core_iblock.c | 12 +++--- + drivers/target/target_core_iblock.h | 3 +- + drivers/target/target_core_pr.h | 9 ++-- + drivers/target/target_core_rd.c | 17 ++++---- + drivers/target/target_core_sbc.c | 71 ++++++++++++++++++++++++++++---- + include/target/target_core_base.h | 1 + + 9 files changed, 147 insertions(+), 42 deletions(-) +Merging target-merge/for-next-merge (2994a7518317 cxgb4: update Kconfig and Makefile) +$ git merge target-merge/for-next-merge +Already up-to-date. +Merging target-bva/for-next (762b6f00a995 uapi: fix linux/target_core_user.h userspace compilation errors) +$ git merge target-bva/for-next +Already up-to-date. +Merging libata/for-next (0a7d2635b8cf Merge branch 'for-4.12' into for-next) +$ git merge libata/for-next +Removing drivers/ata/pata_at91.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/ata/ahci-dm816.txt | 21 + + drivers/ata/Kconfig | 18 +- + drivers/ata/Makefile | 2 +- + drivers/ata/ahci_dm816.c | 200 ++++++++ + drivers/ata/ahci_octeon.c | 5 - + drivers/ata/libata-core.c | 8 +- + drivers/ata/pata_at91.c | 503 --------------------- + drivers/ata/pata_atiixp.c | 5 - + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_mpc52xx.c | 2 +- + drivers/ata/pata_of_platform.c | 2 +- + drivers/ata/sata_fsl.c | 2 +- + drivers/ata/sata_mv.c | 2 +- + 13 files changed, 240 insertions(+), 532 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ata/ahci-dm816.txt + create mode 100644 drivers/ata/ahci_dm816.c + delete mode 100644 drivers/ata/pata_at91.c +Merging binfmt_misc/for-next (4af75df6a410 binfmt_misc: add F option description to documentation) +$ git merge binfmt_misc/for-next +Already up-to-date. +Merging vhost/linux-next (d01047cb281d virtio_console: fix uninitialized variable use) +$ git merge vhost/linux-next +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/char/virtio_console.c +Auto-merging drivers/block/virtio_blk.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 3 +- + drivers/char/virtio_console.c | 12 +- + drivers/crypto/virtio/virtio_crypto_core.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 3 +- + drivers/misc/mic/vop/vop_main.c | 9 +- + drivers/net/caif/caif_virtio.c | 3 +- + drivers/net/virtio_net.c | 281 ++++++++++++++++++++--------- + drivers/remoteproc/remoteproc_virtio.c | 10 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + drivers/s390/virtio/kvm_virtio.c | 6 +- + drivers/s390/virtio/virtio_ccw.c | 7 +- + drivers/scsi/virtio_scsi.c | 3 +- + drivers/virtio/virtio.c | 6 + + drivers/virtio/virtio_balloon.c | 3 +- + drivers/virtio/virtio_input.c | 3 +- + drivers/virtio/virtio_mmio.c | 8 +- + drivers/virtio/virtio_pci_common.c | 20 +- + drivers/virtio/virtio_pci_common.h | 4 +- + drivers/virtio/virtio_pci_legacy.c | 4 +- + drivers/virtio/virtio_pci_modern.c | 12 +- + drivers/virtio/virtio_ring.c | 77 ++++++-- + include/linux/virtio.h | 10 + + include/linux/virtio_config.h | 25 ++- + include/linux/virtio_ring.h | 3 + + net/vmw_vsock/virtio_transport.c | 6 +- + 25 files changed, 367 insertions(+), 156 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 17e15e190691 Merge remote-tracking branch 'libata/for-next' +Merging next-20170329 version of vhost +$ git merge -m next-20170329/vhost f0bb2d50dfcc519f06f901aac88502be6ff1df2c +Already up-to-date. +Merging rpmsg/for-next (5e78de7eee74 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + drivers/rpmsg/qcom_smd.c | 11 +++++++++++ + drivers/rpmsg/virtio_rpmsg_bus.c | 9 +++++++++ + 2 files changed, 20 insertions(+) +Merging gpio/for-next (d85f6bb30759 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +Resolved 'drivers/input/misc/soc_button_array.c' using previous resolution. +Auto-merging drivers/input/misc/soc_button_array.c +CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c +Auto-merging drivers/gpio/gpiolib.c +Removing drivers/gpio/gpio-moxart.c +Auto-merging drivers/gpio/gpio-ftgpio010.c +Removing Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt +Auto-merging Documentation/devicetree/bindings/gpio/faraday,ftgpio010.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master cdb586e32953] Merge remote-tracking branch 'gpio/for-next' +$ git diff -M --stat --summary HEAD^.. + ...rtina,gemini-gpio.txt => faraday,ftgpio010.txt} | 9 +- + .../devicetree/bindings/gpio/gpio-thunderx.txt | 27 +++ + .../devicetree/bindings/gpio/moxa,moxart-gpio.txt | 19 -- + .../bindings/gpio/ni,169445-nand-gpio.txt | 38 ++++ + Documentation/gpio/consumer.txt | 6 + + drivers/gpio/Kconfig | 33 ++-- + drivers/gpio/Makefile | 4 +- + drivers/gpio/devres.c | 2 +- + drivers/gpio/gpio-104-dio-48e.c | 38 ++-- + drivers/gpio/gpio-104-idi-48.c | 18 +- + drivers/gpio/gpio-104-idio-16.c | 24 +-- + drivers/gpio/gpio-altera.c | 24 +-- + drivers/gpio/gpio-ath79.c | 28 +-- + drivers/gpio/gpio-bcm-kona.c | 48 ++--- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-dwapb.c | 91 +++++++-- + drivers/gpio/gpio-etraxfs.c | 24 +-- + drivers/gpio/gpio-exar.c | 23 +-- + drivers/gpio/{gpio-gemini.c => gpio-ftgpio010.c} | 72 +++---- + drivers/gpio/gpio-merrifield.c | 2 +- + drivers/gpio/gpio-ml-ioh.c | 28 +-- + drivers/gpio/gpio-mmio.c | 1 + + drivers/gpio/gpio-mockup.c | 16 +- + drivers/gpio/gpio-moxart.c | 84 -------- + drivers/gpio/gpio-mvebu.c | 108 ++++++----- + drivers/gpio/gpio-mxc.c | 6 +- + drivers/gpio/gpio-mxs.c | 6 +- + drivers/gpio/gpio-omap.c | 3 +- + drivers/gpio/gpio-pca953x.c | 37 +++- + drivers/gpio/gpio-pch.c | 14 +- + drivers/gpio/gpio-pci-idio-16.c | 28 +-- + drivers/gpio/gpio-pl061.c | 28 +-- + drivers/gpio/gpio-pxa.c | 2 +- + drivers/gpio/gpio-reg.c | 185 ++++++++++++++++++ + drivers/gpio/gpio-sa1100.c | 216 +++++++++++++-------- + drivers/gpio/gpio-sodaville.c | 28 ++- + drivers/gpio/gpio-sta2x11.c | 17 +- + drivers/gpio/gpio-twl4030.c | 3 +- + drivers/gpio/gpio-ws16c48.c | 46 ++--- + drivers/gpio/gpio-xlp.c | 9 +- + drivers/gpio/gpio-zx.c | 24 +-- + drivers/gpio/gpiolib-acpi.c | 63 +++++- + drivers/gpio/gpiolib.c | 6 +- + drivers/input/misc/soc_button_array.c | 5 +- + drivers/platform/x86/surface3_button.c | 5 +- + drivers/usb/dwc3/dwc3-pci.c | 5 +- + include/linux/acpi.h | 11 ++ + include/linux/gpio/consumer.h | 12 +- + include/linux/gpio/gpio-reg.h | 13 ++ + 49 files changed, 940 insertions(+), 601 deletions(-) + rename Documentation/devicetree/bindings/gpio/{cortina,gemini-gpio.txt => faraday,ftgpio010.txt} (70%) + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-thunderx.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/moxa,moxart-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/ni,169445-nand-gpio.txt + rename drivers/gpio/{gpio-gemini.c => gpio-ftgpio010.c} (73%) + delete mode 100644 drivers/gpio/gpio-moxart.c + create mode 100644 drivers/gpio/gpio-reg.c + create mode 100644 include/linux/gpio/gpio-reg.h +Merging pinctrl/for-next (7c795e971856 Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging arch/arm/boot/dts/rk1108.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 3 +- + .../bindings/pinctrl/rockchip,pinctrl.txt | 17 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/rk1108.dtsi | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 14 +- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 44 +- + drivers/pinctrl/bcm/pinctrl-nsp-gpio.c | 46 +-- + drivers/pinctrl/core.c | 4 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 47 +++ + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 49 +++ + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 186 ++++++++- + drivers/pinctrl/meson/pinctrl-meson.c | 14 +- + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinconf.c | 4 +- + drivers/pinctrl/pinctrl-amd.c | 66 +-- + drivers/pinctrl/pinctrl-amd.h | 2 +- + drivers/pinctrl/pinctrl-rockchip.c | 443 ++++++++++++++++----- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 14 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 - + drivers/pinctrl/sh-pfc/core.c | 3 + + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 175 ++++---- + drivers/pinctrl/sirf/pinctrl-atlas7.c | 44 +- + drivers/pinctrl/sunxi/Kconfig | 13 +- + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c | 125 ++++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 26 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 2 +- + drivers/pinctrl/uniphier/Kconfig | 16 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 48 +-- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 11 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld20.c | 11 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld4.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-ld6b.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro4.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pro5.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-pxs2.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-sld8.c | 13 +- + drivers/pinctrl/uniphier/pinctrl-uniphier.h | 11 +- + 38 files changed, 1053 insertions(+), 472 deletions(-) + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c +Merging pinctrl-samsung/for-next (786b1f7c95d7 Merge branch 'pinctrl-next' into for-next) +$ git merge pinctrl-samsung/for-next +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Merge made by the 'recursive' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 143 +++++++++++++++++++++--------- + drivers/pinctrl/samsung/pinctrl-exynos.h | 11 --- + drivers/pinctrl/samsung/pinctrl-samsung.c | 45 +++++----- + 3 files changed, 123 insertions(+), 76 deletions(-) +Merging dma-mapping/dma-mapping-next (1001354ca341 Linux 4.9-rc1) +$ git merge dma-mapping/dma-mapping-next +Already up-to-date. +Merging pwm/for-next (38b0a526ec33 Merge branch 'for-4.11/drivers' into for-next) +$ git merge pwm/for-next +Already up-to-date. +Merging dma-buf/for-next (194cad44c4e1 dma-buf/sync_file: improve Kconfig description for Sync Files) +$ git merge dma-buf/for-next +Resolved 'drivers/dma-buf/Kconfig' using previous resolution. +Auto-merging drivers/dma-buf/Kconfig +CONFLICT (content): Merge conflict in drivers/dma-buf/Kconfig +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 232792b581b6] Merge remote-tracking branch 'dma-buf/for-next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 11 +++++++++++ + 1 file changed, 11 insertions(+) +Merging userns/for-next (040757f738e1 ucount: Remove the atomicity from ucount->count) +$ git merge userns/for-next +Already up-to-date. +Merging ktest/for-next (f7c6401ff84a ktest: Make sure wait_for_input does honor the timeout) +$ git merge ktest/for-next +Already up-to-date. +Merging random/dev (db61ffe3a71c random: move random_min_urandom_seed into CONFIG_SYSCTL ifdef block) +$ git merge random/dev +Already up-to-date. +Merging aio/master (b562e44f507e Linux 4.5) +$ git merge aio/master +Already up-to-date. +Merging kselftest/next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge kselftest/next +Already up-to-date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up-to-date. +Merging luto-misc/next (2dcd0af568b0 Linux 4.6) +$ git merge luto-misc/next +Already up-to-date. +Merging borntraeger/linux-next (e76d21c40bd6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge borntraeger/linux-next +Already up-to-date. +Merging livepatching/for-next (8044e92eb7c2 Merge branch 'for-4.12/upstream' into for-next) +$ git merge livepatching/for-next +Resolved 'arch/s390/include/asm/thread_info.h' using previous resolution. +Resolved 'arch/s390/kernel/entry.S' using previous resolution. +Resolved 'arch/x86/include/asm/thread_info.h' using previous resolution. +Resolved 'include/linux/init_task.h' using previous resolution. +Resolved 'include/linux/sched.h' using previous resolution. +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +CONFLICT (content): Merge conflict in include/linux/sched.h +Auto-merging include/linux/init_task.h +CONFLICT (content): Merge conflict in include/linux/init_task.h +Auto-merging arch/x86/kernel/unwind_frame.c +Auto-merging arch/x86/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/thread_info.h +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kernel/entry.S +CONFLICT (content): Merge conflict in arch/s390/kernel/entry.S +Auto-merging arch/s390/include/asm/thread_info.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/thread_info.h +Auto-merging arch/powerpc/include/asm/thread_info.h +Auto-merging arch/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6becba852636] Merge remote-tracking branch 'livepatching/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-livepatch | 8 + + Documentation/filesystems/proc.txt | 18 + + Documentation/livepatch/livepatch.txt | 214 +++++++-- + arch/Kconfig | 6 + + arch/powerpc/include/asm/thread_info.h | 4 +- + arch/powerpc/kernel/signal.c | 4 + + arch/s390/include/asm/thread_info.h | 24 +- + arch/s390/kernel/entry.S | 30 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/common.c | 9 +- + arch/x86/include/asm/thread_info.h | 13 +- + arch/x86/include/asm/unwind.h | 6 + + arch/x86/kernel/stacktrace.c | 96 +++- + arch/x86/kernel/unwind_frame.c | 2 + + fs/proc/base.c | 15 + + include/linux/init_task.h | 9 + + include/linux/livepatch.h | 68 ++- + include/linux/sched.h | 3 + + include/linux/stacktrace.h | 9 +- + kernel/fork.c | 3 + + kernel/livepatch/Makefile | 2 +- + kernel/livepatch/core.c | 442 +++++++---------- + kernel/livepatch/core.h | 6 + + kernel/livepatch/patch.c | 272 +++++++++++ + kernel/livepatch/patch.h | 33 ++ + kernel/livepatch/transition.c | 573 +++++++++++++++++++++++ + kernel/livepatch/transition.h | 14 + + kernel/sched/idle.c | 4 + + kernel/stacktrace.c | 12 +- + samples/livepatch/livepatch-sample.c | 18 +- + 30 files changed, 1563 insertions(+), 355 deletions(-) + create mode 100644 kernel/livepatch/core.h + create mode 100644 kernel/livepatch/patch.c + create mode 100644 kernel/livepatch/patch.h + create mode 100644 kernel/livepatch/transition.c + create mode 100644 kernel/livepatch/transition.h +Merging coresight/next (c749b99b9ade coresight: Fix reference count for software sources) +$ git merge coresight/next +Auto-merging drivers/hwtracing/coresight/coresight-etm-perf.c +Auto-merging drivers/hwtracing/coresight/coresight-etb10.c +Merge made by the 'recursive' strategy. + drivers/hwtracing/coresight/coresight-etb10.c | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 2 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 80 ++++++++++++---------- + drivers/hwtracing/coresight/coresight-funnel.c | 4 +- + drivers/hwtracing/coresight/coresight-stm.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc.c | 2 +- + drivers/hwtracing/coresight/coresight.c | 34 ++++++--- + drivers/hwtracing/coresight/of_coresight.c | 2 +- + 8 files changed, 78 insertions(+), 50 deletions(-) +Merging rtc/rtc-next (65e9e65cebbe rtc: cpcap: kfreeing devm allocated memory) +$ git merge rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/rtc/cpcap-rtc.txt | 18 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/rtc/Kconfig | 7 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-bq32k.c | 7 + + drivers/rtc/rtc-cpcap.c | 330 +++++++++++++++++++++ + drivers/rtc/rtc-ds1307.c | 68 ++++- + drivers/rtc/rtc-ds1374.c | 1 + + drivers/rtc/rtc-ds1672.c | 9 +- + drivers/rtc/rtc-ds3232.c | 7 + + drivers/rtc/rtc-isl1208.c | 12 +- + drivers/rtc/rtc-m41t80.c | 63 +++- + drivers/rtc/rtc-omap.c | 22 +- + drivers/rtc/rtc-rs5c372.c | 37 ++- + drivers/rtc/rtc-rv3029c2.c | 9 + + drivers/rtc/rtc-rv8803.c | 21 +- + drivers/rtc/rtc-rx8010.c | 7 + + drivers/rtc/rtc-rx8581.c | 7 + + drivers/rtc/rtc-s35390a.c | 8 + + drivers/rtc/rtc-wm8350.c | 2 - + 20 files changed, 611 insertions(+), 26 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/cpcap-rtc.txt + create mode 100644 drivers/rtc/rtc-cpcap.c +Merging hwspinlock/for-next (bd5717a4632c hwspinlock: qcom: Correct msb in regmap_field) +$ git merge hwspinlock/for-next +Already up-to-date. +Merging nvdimm/libnvdimm-for-next (22486cb6d929 acpi, nfit: remove unnecessary newline) +$ git merge nvdimm/libnvdimm-for-next +Merge made by the 'recursive' strategy. + drivers/acpi/nfit/core.c | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) +Merging dax-misc/dax-misc (4d9a2c874667 dax: Remove i_mmap_lock protection) +$ git merge dax-misc/dax-misc +Already up-to-date. +Merging idr/idr-4.11 (f0f3f2d0a3e0 radix tree test suite: Specify -m32 in LDFLAGS too) +$ git merge idr/idr-4.11 +Already up-to-date. +Merging akpm-current/current (13ac25253bc1 initramfs: use vfs_stat/lstat directly) +$ git merge --no-ff akpm-current/current +Recorded preimage for 'mm/vmstat.c' +Auto-merging mm/vmstat.c +CONFLICT (content): Merge conflict in mm/vmstat.c +Auto-merging mm/rmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/migrate.c +Auto-merging mm/kasan/report.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/kasan/kasan.c +Auto-merging mm/filemap.c +Auto-merging lib/vsprintf.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/printk/printk.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/fork.c +Auto-merging include/uapi/linux/sysctl.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/printk.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/memcontrol.h +Auto-merging fs/xfs/xfs_trans.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/xfs/libxfs/xfs_btree.c +Auto-merging fs/proc/base.c +Auto-merging fs/jbd2/journal.c +Auto-merging block/genhd.c +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/init_32.c +Auto-merging arch/x86/kernel/machine_kexec_64.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/filesystems/proc.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'mm/vmstat.c'. +[master 65a138dc2169] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/cgroup-v2.txt | 5 + + Documentation/fault-injection/fault-injection.txt | 78 ++++ + Documentation/filesystems/proc.txt | 6 + + Documentation/powerpc/firmware-assisted-dump.txt | 23 +- + arch/Kconfig | 4 + + arch/arm/include/asm/page.h | 2 + + arch/ia64/kernel/crash.c | 22 -- + arch/ia64/mm/init.c | 10 +- + arch/mips/kernel/perf_event_mipsxx.c | 2 +- + arch/powerpc/Kconfig | 10 +- + arch/powerpc/include/asm/fadump.h | 2 + + arch/powerpc/kernel/crash.c | 2 - + arch/powerpc/kernel/fadump.c | 57 +-- + arch/powerpc/kernel/setup-common.c | 5 + + arch/powerpc/mm/mem.c | 12 +- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/mm/init.c | 32 +- + arch/sh/mm/init.c | 10 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/mm/init_32.c | 7 +- + arch/x86/mm/init_64.c | 11 +- + block/genhd.c | 2 +- + drivers/base/memory.c | 52 +-- + drivers/block/zram/zram_drv.c | 267 +++++++++---- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 10 +- + drivers/virt/fsl_hypervisor.c | 7 +- + firmware/Makefile | 3 +- + fs/dax.c | 44 ++- + fs/jbd2/journal.c | 9 + + fs/jbd2/transaction.c | 12 + + fs/nsfs.c | 4 +- + fs/ocfs2/cluster/heartbeat.c | 8 +- + fs/ocfs2/cluster/tcp.c | 5 +- + fs/ocfs2/dlm/dlmmaster.c | 66 +++- + fs/ocfs2/dlm/dlmrecovery.c | 40 +- + fs/proc/base.c | 52 +++ + fs/proc/inode.c | 2 +- + fs/proc/namespaces.c | 1 + + fs/proc/task_mmu.c | 17 +- + fs/reiserfs/item_ops.c | 24 +- + fs/xfs/kmem.c | 12 +- + fs/xfs/kmem.h | 2 +- + fs/xfs/libxfs/xfs_btree.c | 2 +- + fs/xfs/xfs_aops.c | 6 +- + fs/xfs/xfs_buf.c | 8 +- + fs/xfs/xfs_trans.c | 12 +- + include/linux/cpumask.h | 4 +- + include/linux/crash_core.h | 71 ++++ + include/linux/elf.h | 2 + + include/linux/gfp.h | 18 +- + include/linux/jbd2.h | 2 + + include/linux/kexec.h | 57 +-- + include/linux/ksm.h | 5 +- + include/linux/memcontrol.h | 1 + + include/linux/memory_hotplug.h | 17 +- + include/linux/migrate.h | 5 +- + include/linux/mm.h | 1 - + include/linux/mmu_notifier.h | 13 - + include/linux/mmzone.h | 23 +- + include/linux/page-isolation.h | 5 +- + include/linux/printk.h | 4 +- + include/linux/proc_ns.h | 2 + + include/linux/reboot.h | 4 + + include/linux/rmap.h | 47 +-- + include/linux/rodata_test.h | 1 - + include/linux/sched.h | 7 +- + include/linux/sched/mm.h | 26 +- + include/linux/swap.h | 2 +- + include/linux/vm_event_item.h | 2 +- + include/trace/events/fs_dax.h | 130 +++++++ + include/uapi/linux/sysctl.h | 4 + + init/do_mounts.h | 22 +- + init/initramfs.c | 14 +- + kernel/Makefile | 1 + + kernel/crash_core.c | 439 ++++++++++++++++++++++ + kernel/fork.c | 4 + + kernel/hung_task.c | 8 +- + kernel/kcov.c | 9 +- + kernel/kexec_core.c | 431 --------------------- + kernel/ksysfs.c | 8 +- + kernel/locking/lockdep.c | 11 +- + kernel/memremap.c | 5 +- + kernel/pid_namespace.c | 25 ++ + kernel/printk/printk.c | 6 +- + kernel/reboot.c | 27 ++ + kernel/sysctl.c | 2 +- + kernel/taskstats.c | 14 + + lib/Kconfig.debug | 14 +- + lib/Makefile | 1 + + lib/fault-inject.c | 9 +- + lib/list_sort.c | 149 -------- + lib/radix-tree.c | 2 + + lib/test_list_sort.c | 150 ++++++++ + lib/test_sort.c | 11 +- + lib/vsprintf.c | 3 + + mm/Kconfig.debug | 1 - + mm/compaction.c | 89 +++-- + mm/filemap.c | 16 +- + mm/huge_memory.c | 99 +++-- + mm/internal.h | 36 +- + mm/kasan/kasan.c | 3 +- + mm/kasan/kasan.h | 2 +- + mm/kasan/report.c | 187 +++++---- + mm/khugepaged.c | 12 +- + mm/ksm.c | 16 +- + mm/madvise.c | 11 +- + mm/memcontrol.c | 28 +- + mm/memory-failure.c | 28 +- + mm/memory_hotplug.c | 425 ++++++--------------- + mm/migrate.c | 10 +- + mm/mlock.c | 6 +- + mm/page-writeback.c | 5 +- + mm/page_alloc.c | 253 ++++++++----- + mm/page_ext.c | 13 +- + mm/page_idle.c | 4 +- + mm/page_isolation.c | 11 +- + mm/page_owner.c | 4 +- + mm/page_poison.c | 77 +--- + mm/rmap.c | 145 +++---- + mm/rodata_test.c | 17 +- + mm/sparse.c | 8 +- + mm/swap.c | 76 ++-- + mm/swap_slots.c | 4 +- + mm/swap_state.c | 12 +- + mm/swapfile.c | 33 +- + mm/vmscan.c | 431 +++++++++++---------- + mm/vmstat.c | 87 ++--- + scripts/checkpatch.pl | 54 ++- + scripts/gdb/linux/constants.py.in | 7 + + scripts/gdb/linux/proc.py | 73 ++++ + tools/testing/selftests/vm/Makefile | 11 +- + tools/testing/selftests/vm/run_vmtests | 6 +- + tools/testing/selftests/vm/userfaultfd.c | 207 +++++----- + usr/Kconfig | 10 + + 134 files changed, 2933 insertions(+), 2372 deletions(-) + create mode 100644 include/linux/crash_core.h + create mode 100644 kernel/crash_core.c + create mode 100644 lib/test_list_sort.c +$ git am -3 ../mmotm/broken-out/linux-next-rejects.patch +Applying: linux-next-rejects +$ git reset HEAD^ +Unstaged changes after reset: +M fs/buffer.c +M fs/dax.c +M fs/internal.h +M fs/iomap.c +$ git add -A . +$ git commit -v -a --amend +[master 7424d6eadf97] Merge branch 'akpm-current/current' + Date: Mon Apr 3 17:02:05 2017 +1000 +$ git clone -s -l -n -q . ../rebase-tmp +$ cd ../rebase-tmp +$ git checkout -b akpm remotes/origin/akpm/master +Switched to a new branch 'akpm' +$ git rebase --onto master remotes/origin/akpm/master-base +First, rewinding head to replay your work on top of it... +Applying: drivers/net/ethernet/mellanox/mlx5/core/en_main.c: fix build with gcc-4.4.4 +Applying: sparc64: NG4 memset 32 bits overflow +Applying: mm: zero hash tables in allocator +Applying: mm: update callers to use HASH_ZERO flag +Applying: mm: adaptive hash table scaling +Applying: mm: introduce kv[mz]alloc helpers +Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up +Applying: mm: support __GFP_REPEAT in kvmalloc_node for >32kB +Applying: lib/rhashtable.c: simplify a strange allocation pattern +Applying: net/ipv6/ila/ila_xlat.c: simplify a strange allocation pattern +Applying: fs/xattr.c: zero out memory copied to userspace in getxattr +Applying: treewide: use kv[mz]alloc* rather than opencoded variants +Applying: net: use kvmalloc with __GFP_REPEAT rather than open coded variant +Applying: drivers/md/dm-ioctl.c: use kvmalloc rather than opencoded variant +Applying: drivers/md/bcache/super.c: use kvmalloc +Applying: mm, vmalloc: use __GFP_HIGHMEM implicitly +Applying: scripts/spelling.txt: add "memory" pattern and fix typos +Applying: scripts/spelling.txt: Add regsiter -> register spelling mistake +Applying: scripts/spelling.txt: add "intialise(d)" pattern and fix typo instances +Applying: treewide: move set_memory_* functions away from cacheflush.h +Applying: arm: use set_memory.h header +Applying: arm64: use set_memory.h header +Applying: s390: use set_memory.h header +Applying: x86: use set_memory.h header +Applying: agp: use set_memory.h header +Applying: drm: use set_memory.h header +Applying: drm-use-set_memoryh-header-fix +Applying: drivers/hwtracing/intel_th/msu.c: use set_memory.h header +Applying: drivers/watchdog/hpwdt.c: use set_memory.h header +Applying: include/linux/filter.h: use set_memory.h header +Applying: kernel/module.c: use set_memory.h header +Applying: kernel/power/snapshot.c: use set_memory.h header +Applying: alsa: use set_memory.h header +Applying: drivers/misc/sram-exec.c: use set_memory.h header +Applying: drivers/video/fbdev/vermilion/vermilion.c: use set_memory.h header +Applying: drivers/staging/media/atomisp/pci/atomisp2: use set_memory.h +Applying: treewide: decouple cacheflush.h and set_memory.h +Applying: kernel/sched/fair.c: uninline __update_load_avg() +Applying: kref: remove WARN_ON for NULL release functions +Applying: drivers/scsi/megaraid: remove expensive inline from megasas_return_cmd +Applying: include/linux/uaccess.h: remove expensive WARN_ON in pagefault_disabled_dec +Applying: tracing: move trace_handle_return() out of line +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 1ddb5fef1cac...44af4ffd30ca akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (44af4ffd30ca tracing: move trace_handle_return() out of line) +$ git merge --no-ff akpm/master +Auto-merging arch/s390/include/asm/set_memory.h +Merge made by the 'recursive' strategy. + arch/arc/kernel/unwind.c | 2 +- + arch/arm/include/asm/cacheflush.h | 20 ----- + arch/arm/include/asm/set_memory.h | 32 ++++++++ + arch/arm/kernel/ftrace.c | 1 + + arch/arm/kernel/kgdb.c | 2 +- + arch/arm/kernel/machine_kexec.c | 1 + + arch/arm/mach-ixp4xx/common-pci.c | 4 +- + arch/arm/mm/pageattr.c | 1 + + arch/arm/net/bpf_jit_32.c | 1 + + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/cacheflush.h | 5 -- + arch/arm64/mm/pageattr.c | 1 + + arch/arm64/net/bpf_jit_comp.c | 1 + + arch/m68k/ifpsp060/src/ilsp.S | 2 +- + arch/m68k/ifpsp060/src/isp.S | 2 +- + .../cavium-octeon/executive/cvmx-helper-rgmii.c | 2 +- + arch/mips/include/asm/octeon/cvmx-helper-rgmii.h | 2 +- + arch/parisc/kernel/entry.S | 2 +- + arch/parisc/kernel/module.c | 2 +- + arch/powerpc/mm/icswx.c | 2 +- + arch/s390/include/asm/Kbuild | 1 + + .../include/asm/{cacheflush.h => set_memory.h} | 9 +-- + arch/s390/kernel/ftrace.c | 1 + + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/machine_kexec.c | 1 + + arch/s390/kvm/kvm-s390.c | 10 +-- + arch/s390/mm/init.c | 1 + + arch/s390/mm/pageattr.c | 1 + + arch/s390/mm/vmem.c | 1 + + arch/s390/net/bpf_jit_comp.c | 1 + + arch/sparc/lib/NG4memset.S | 26 +++---- + arch/x86/include/asm/cacheflush.h | 85 --------------------- + arch/x86/include/asm/set_memory.h | 87 ++++++++++++++++++++++ + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 2 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kernel/machine_kexec_32.c | 2 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/x86/kernel/module.c | 2 +- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/page_track.c | 4 +- + arch/x86/kvm/x86.c | 4 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/init_32.c | 2 +- + arch/x86/mm/init_64.c | 2 +- + arch/x86/mm/ioremap.c | 2 +- + arch/x86/mm/pageattr.c | 1 + + arch/x86/net/bpf_jit_comp.c | 1 + + arch/x86/pci/pcbios.c | 2 +- + arch/x86/platform/efi/efi.c | 2 +- + arch/x86/realmode/init.c | 2 +- + certs/blacklist.c | 2 +- + crypto/lzo.c | 4 +- + drivers/acpi/apei/erst.c | 8 +- + drivers/acpi/cppc_acpi.c | 2 +- + drivers/block/drbd/drbd_bitmap.c | 2 +- + drivers/char/agp/amd-k7-agp.c | 1 + + drivers/char/agp/ati-agp.c | 1 + + drivers/char/agp/generic.c | 12 +-- + drivers/char/agp/intel-gtt.c | 1 + + drivers/char/agp/sworks-agp.c | 1 + + drivers/clk/qcom/common.c | 2 +- + drivers/cpufreq/sti-cpufreq.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 + + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 4 +- + drivers/gpu/drm/gma500/gtt.c | 1 + + drivers/gpu/drm/gma500/psb_drv.c | 1 + + drivers/gpu/drm/i915/i915_gem_gtt.c | 2 + + drivers/gpu/drm/nouveau/nouveau_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_gart.c | 3 + + drivers/gpu/drm/ttm/ttm_page_alloc.c | 3 + + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 3 + + drivers/gpu/drm/ttm/ttm_tt.c | 3 + + drivers/hwtracing/intel_th/msu.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 2 +- + drivers/leds/leds-lp5521.c | 2 +- + drivers/leds/leds-lp5523.c | 2 +- + drivers/leds/leds-lp5562.c | 2 +- + drivers/md/bcache/super.c | 8 +- + drivers/md/bcache/util.h | 12 +-- + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-ioctl.c | 13 +--- + drivers/md/dm-stats.c | 7 +- + drivers/misc/sram-exec.c | 3 +- + drivers/net/can/rcar/rcar_canfd.c | 2 +- + drivers/net/ethernet/amd/amd8111e.h | 4 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_defs.h | 3 - + drivers/net/ethernet/chelsio/cxgb3/cxgb3_offload.c | 29 +------- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 8 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 1 - + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.c | 12 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 3 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_debugfs.c | 10 +-- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 8 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 31 ++------ + drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_u32.c | 14 ++-- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sched.c | 12 +-- + drivers/net/ethernet/intel/igb/e1000_phy.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 9 +-- + drivers/net/ethernet/mellanox/mlx4/mr.c | 9 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 16 +++- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 8 +- + drivers/nvdimm/dimm_devs.c | 5 +- + drivers/scsi/isci/registers.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- + .../staging/lustre/lnet/libcfs/linux/linux-mem.c | 11 +-- + .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 3 +- + .../atomisp/pci/atomisp2/hmm/hmm_dynamic_pool.c | 2 +- + .../atomisp/pci/atomisp2/hmm/hmm_reserved_pool.c | 3 +- + .../media/atomisp/pci/atomisp2/mmu/isp_mmu.c | 5 +- + drivers/vhost/net.c | 9 +-- + drivers/vhost/vhost.c | 15 +--- + drivers/vhost/vsock.c | 9 +-- + drivers/video/fbdev/intelfb/intelfbdrv.c | 2 +- + drivers/video/fbdev/vermilion/vermilion.c | 2 +- + drivers/watchdog/hpwdt.c | 2 +- + drivers/xen/evtchn.c | 14 +--- + fs/btrfs/ctree.c | 9 +-- + fs/btrfs/free-space-tree.c | 3 +- + fs/btrfs/ioctl.c | 9 +-- + fs/btrfs/send.c | 27 +++---- + fs/ceph/file.c | 9 +-- + fs/dcache.c | 18 +---- + fs/ext4/mballoc.c | 2 +- + fs/ext4/super.c | 4 +- + fs/f2fs/f2fs.h | 20 ----- + fs/f2fs/file.c | 4 +- + fs/f2fs/node.c | 6 +- + fs/f2fs/segment.c | 14 ++-- + fs/file.c | 2 +- + fs/inode.c | 16 +--- + fs/namespace.c | 10 +-- + fs/select.c | 5 +- + fs/seq_file.c | 16 +--- + fs/xattr.c | 27 +++---- + fs/xfs/kmem.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/asm-generic/set_memory.h | 12 +++ + include/drm/drm_mem_util.h | 9 +-- + include/linux/bcma/bcma_driver_pci.h | 2 +- + include/linux/bootmem.h | 2 + + include/linux/filter.h | 4 +- + include/linux/ftrace.h | 2 +- + include/linux/kref.h | 6 -- + include/linux/kvm_host.h | 2 - + include/linux/mlx5/driver.h | 7 +- + include/linux/mm.h | 22 ++++++ + include/linux/trace_events.h | 11 +-- + include/linux/uaccess.h | 1 - + include/linux/vmalloc.h | 1 + + include/uapi/linux/ipmi.h | 2 +- + ipc/util.c | 7 +- + kernel/bpf/core.c | 9 +-- + kernel/bpf/syscall.c | 3 +- + kernel/fork.c | 2 +- + kernel/groups.c | 2 +- + kernel/locking/qspinlock_paravirt.h | 3 +- + kernel/module.c | 5 +- + kernel/pid.c | 7 +- + kernel/power/snapshot.c | 3 + + kernel/sched/fair.c | 2 +- + kernel/trace/trace.c | 12 +++ + lib/iov_iter.c | 5 +- + lib/rhashtable.c | 13 +--- + mm/frame_vector.c | 5 +- + mm/kasan/kasan.c | 2 +- + mm/nommu.c | 8 +- + mm/page_alloc.c | 31 +++++++- + mm/util.c | 57 ++++++++++++++ + mm/vmalloc.c | 23 ++++-- + net/ceph/ceph_common.c | 2 +- + net/core/dev.c | 24 +++--- + net/ipv4/inet_hashtables.c | 6 +- + net/ipv4/tcp_metrics.c | 5 +- + net/ipv6/ila/ila_xlat.c | 8 +- + net/mpls/af_mpls.c | 5 +- + net/netfilter/x_tables.c | 24 ++---- + net/netfilter/xt_recent.c | 5 +- + net/sched/sch_choke.c | 5 +- + net/sched/sch_fq.c | 12 +-- + net/sched/sch_fq_codel.c | 26 ++----- + net/sched/sch_hhf.c | 33 +++----- + net/sched/sch_netem.c | 6 +- + net/sched/sch_sfq.c | 6 +- + scripts/spelling.txt | 5 ++ + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/include/lib.h | 11 --- + security/apparmor/lib.c | 30 -------- + security/apparmor/match.c | 2 +- + security/apparmor/policy_unpack.c | 2 +- + security/keys/keyctl.c | 22 ++---- + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/intel8x0.c | 4 +- + sound/soc/soc-core.c | 2 +- + sound/x86/intel_hdmi_audio.c | 2 +- + virt/kvm/kvm_main.c | 18 +---- + 201 files changed, 648 insertions(+), 862 deletions(-) + create mode 100644 arch/arm/include/asm/set_memory.h + rename arch/s390/include/asm/{cacheflush.h => set_memory.h} (80%) + create mode 100644 arch/x86/include/asm/set_memory.h + create mode 100644 include/asm-generic/set_memory.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..339069419c85 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,4 @@ +Importing jdelvare-hwmon based on 08d27eb2066622cd659b91d877d0406ebd651225 +Unchanged quilt series jdelvare-hwmon +Importing dmi based on 4.10-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..ce4963738803 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20170403 |