summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Next/SHA1s255
-rw-r--r--Next/Trees257
-rw-r--r--Next/merge.log7922
-rw-r--r--Next/quilt-import.log4
-rw-r--r--localversion-next1
5 files changed, 8439 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s
new file mode 100644
index 000000000000..a4bcc4e3ff70
--- /dev/null
+++ b/Next/SHA1s
@@ -0,0 +1,255 @@
+Name SHA1
+---- ----
+origin 93afaa4513bb08e69a3d6988ab4c3bf6c7cf07d3
+fixes c470abd4fde40ea6a0846a2beab642a578c0b8cd
+kbuild-current b334e19ae9381f12a7521976883022385d2b7eef
+arc-current 7f35144cea219104fe42e7c6cd0ee5103016da2e
+arm-current a1016e94cce9fb6ea56d7602263783e2d95d6e92
+m68k-current b5bb8f3120a7812002ccd0c45a89502f97a5b3f7
+metag-fixes 35d04077ad96ed33ceea2501f5a4f1eacda77218
+powerpc-fixes 8971e1c79d3f6c9a5e6f7a65c50c41f434a4dae6
+sparc f8e6859ea9d06ae1565b21278c4e10fbce5f1eab
+fscrypt-current 42d97eb0ade31e1bc537d086842f5d6e766d9d51
+net db7f00b8dba6d687b6ab1f2e9309acfd214fcb4b
+ipsec 72ef9c4125c7b257e3a714d62d778ab46583d6a3
+netfilter 5371bbf4b295eea334ed453efa286afa2c3ccff3
+ipvs 5371bbf4b295eea334ed453efa286afa2c3ccff3
+wireless-drivers cf8c44d42c4f4f38468a53e9ce2a0314e7ebeaa1
+mac80211 ea90e0dc8cecba6359b481e24d9c37160f6f524f
+sound-current f3ac9f737603da80c2da3e84b89e74429836bb6d
+pci-current 6e347b5e05ea2ac4ac467a5a1cfaebb2c7f06f80
+driver-core.current 966fa72a716ceafc69de901a31f7cc1f52b35f81
+tty.current a4a3e061149f09c075f108b6f1cf04d9739a6bc2
+usb.current 7b2db29fbb4e766fcd02207eb2e2087170bd6ebc
+usb-gadget-fixes 35b2719e72d375f3e32c819858165668d948d5f2
+usb-serial-fixes 436ecf5519d892397af133a79ccd38a17c25fa51
+usb-chipidea-fixes c7fbb09b2ea13e283b9b0fd18a778f918ceb17b9
+phy 1a09b6a7c10e22c489a8b212dd6862b1fd9674ad
+staging.current 4495c08e84729385774601b5146d51d9e5849f81
+char-misc.current c3423563c68fc454b805b46cb69fd4816db933e2
+input-current 47e6fb4212d09f325c0847d05985dd3d71553095
+crypto-current 8c75704ebcac2ffa31ee7bcc359baf701b52bf00
+ide 96297aee8bce237961b0e1b99e22913c5726af12
+vfio-fixes 930a42ded3fede7ca3acafc9153f4f2d0f56a92c
+kselftest-fixes c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+backlight-fixes 68feaca0b13e453aa14ee064c1736202b48b342f
+ftrace-fixes 6224beb12e190ff11f3c7d4bf50cb2922878f600
+mfd-fixes 1a41741fd60b0a2d1102c3d1ff9d58cb324a8d29
+v4l-dvb-fixes 8c71fff434e5ecf5ff27bd61db1bc9ac4c2b2a1b
+drm-intel-fixes b7048ea12fbb2724ee0cd30752d4fac43cab0651
+drm-misc-fixes 3f81e1340706e9a7f854808e2f580c3106805d0c
+kbuild bdd825363ba890182daff9f9b20803a6a236e7de
+asm-generic de4be6b87b6b8816b61c9ba798d21ae8075d955c
+arc d5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
+arm 2bc6cdda1e328b579087964a99a231596467f026
+arm-perf 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+arm-soc d39492dd7b87497090a58f59859b20a0168c4419
+amlogic d58ee0087d379bfeb0074f35ba76ffb68f998bd0
+aspeed ab15e12960f12f8f9236c2d66c52fac8505f430c
+at91 982b07d2b5f3036bb21df639604041a8333fd377
+bcm2835 7ea6e490ba7f0ded1f1a576733453db2f4576ffa
+berlin 5153351425c92f3e89358c8eb62ca8d901437581
+cortex-m f719a0d6a8541b383c506aaa4b4fa6b4109669f4
+imx-mxs e614bd77248688c18a1b094eb1875a99534d9640
+keystone 9e07c85a01ec662fb1c2f0386a3bd11c17222a07
+mvebu 462826aeae710d0aed29ea2342bb48d4d559e9ec
+omap 5f603c805c4cfdaaf4dd05e0b919b3c4a77cde12
+omap-pending c20c8f750d9f8f8617f07ee2352d3ff560e66bc2
+qcom a844f941617c929b29c583f6abf1783d13f37de3
+renesas 28974e8727fd51eda98b524220b9e38e0bc35e26
+rockchip f62b8445b0a4c056565970df87a95e2d273793da
+rpi bc0195aad0daa2ad5b0d76cce22b167bc3435590
+samsung 1001354ca34179f3db924eb66672442a173147dc
+samsung-krzk 5a69f622e0379f985adaeac74fd61bffb713e129
+tegra 7f632c598cf1a04037a2b0f64c59e67cf6b6fdcb
+arm64 ffe7afd1713558d73483834c2e2d03a1e39a4062
+clk f8ba2d68e54fbca340ad0fce97397291ba9637bc
+c6x ca3060d39ae7a0964f8c123a4833029981e86476
+cris 8f50f2a1b46a11a9a9fb46c5d8325dfc88281a76
+h8300 58c57526711f7c87046b7c5a650535acbab2d3fb
+hexagon 02cc2ccfe771677db3cd40a71837e1467ebc839a
+ia64 fbb0e4da96f4503e65bc4fb627cf4e1d7c8c64e6
+m68k 3dfe33020ca8a5e4f72993cc792a4838c464c8b3
+m68knommu 4495c08e84729385774601b5146d51d9e5849f81
+metag f5d163aad31e4ec30f7258e655503824a2b03d45
+microblaze 3400606d8ffd64ea7ffb5969f7c96daebeff36f3
+mips afba1896993a0b74aa2ad3076d594e455b3af301
+nios2 744606c76c4a3a73eb34d21f265013426426c4b5
+openrisc a4d4426635804379d618dd28e29f574a2bc11184
+parisc-hd c470abd4fde40ea6a0846a2beab642a578c0b8cd
+powerpc 9f3768e02335ddd6ebe1d85d5cb3a68ee6264004
+fsl 75b824727680a9d12c34d78096a5ac642e53f5d0
+mpc5xxx 39e69f55f85731d9c0320c03212a4d1f149464f0
+s390 d03bd0454b101adb94d0b5a9cc11396182943cb4
+sparc-next 9f935675d41aa51ebf929fc977cf530ff7d1a7fc
+sh e61c10e468a42512f5fad74c00b62af5cc19f65f
+tile 14e73e78ee982710292248536aa84cba41e974f4
+uml f88f0bdfc32f3d1e2fd03ec8a7f7b456df4db725
+unicore32 bc27113620ca6b67320b8a57e70d801dc94221d5
+xtensa ec59c4ad070d82850f5e429b267abfb91a46ac27
+fscrypt 94840e3c802daa1a62985957f36ac48faf8ceedd
+befs c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+btrfs 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c
+btrfs-kdave e162345e07e17eca18d0180f03e5b49b6fd1ed63
+ceph 7cc5e38f2f0b0b58a22a4c18a56348dd99a71270
+cifs 70c1da060b51ff5661b6ab4cc5044c06ffeff894
+configfs e16769d4bca67218531505ad1a8365d227fedcf9
+ecryptfs be280b25c3288824ed4c201b452c3e87a7074d7c
+ext3 6c71100db53e4a0bc0cefce7d9180f5ec10f0f27
+ext4 14ae5f6a5dbed51088831d43a9ea218a9939e8f9
+f2fs d468595610a51c8c1af4e9ebff19b54691a84358
+freevxfs bf1bb4b460c8dc3a33793bff21464a9d816697ad
+fscache d52bd54db8be8999df6df5a776f38c4f8b5e9cea
+fuse 9a87ad3da905239413477ac0698734afc5cc30bd
+gfs2 972b044eeca582ef173d063773e292bd9e8633d6
+jfs 684666e51585f3b136a3f505f8173d7580bc52cd
+nfs 4495c08e84729385774601b5146d51d9e5849f81
+nfsd 4544f5d6f1659865e5ec7bb77379db186c383b06
+orangefs e98bdb3059cbf2b1cd4261e126b08429f64466c3
+overlayfs b1eaa950f7e905aaffca0454aa05101ce4f6446a
+v9fs a333e4bf2556b93c908e56b39be7bbd555f1b6cc
+ubifs 1cb51a15b576ee325d527726afff40947218fd5e
+xfs 8d242e932fb7660c24b3a534197e69c241067e0d
+file-locks 07d9a380680d1c0eb51ef87ff2eab5c994949e69
+vfs 9e9c5ba8bd70714708bc9ae9b557eb8141f1de74
+vfs-jk 030b533c4fd4d2ec3402363323de4bb2983c9cee
+vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58
+printk d9c23523ed98a3acaa0bfd8fef143595d6aa631d
+pci d0ec4e67c9241cd074edbdbe4996d0f5222be96b
+pstore 30800d9977ec271a7836d777848dba6773d12a3b
+hid 93afcfed4ab55c5c925ba938016eca44b8d16f0b
+i2c 4495c08e84729385774601b5146d51d9e5849f81
+jdelvare-hwmon 08d27eb2066622cd659b91d877d0406ebd651225
+dmi 0c744ea4f77d72b3dcebb7a8f2684633ec79be88
+hwmon-staging ffab6ca0bee6a43da63877f54a675ca11c88eab4
+jc_docs 3f816bac24f0d3c139c740f22d6c945645ca9eed
+v4l-dvb 700ea5e0e0dd70420a04e703ff264cc133834cba
+v4l-dvb-next 432ac2d4acefbbc2e14c672718a70fd13ad8387c
+fbdev c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+pm e6c0da43db980823c73a0565a3020da939363c07
+idle 306899f94804aece6d8fa8b4223ede3b48dbb59c
+thermal 6fefe19f583625ca4ea3ecc9128baa51c31c60a4
+thermal-soc 4f47aff5201c018408f197d2ff43283a451f0547
+ieee1394 72f3c27aa6460196ec0261bb780fbba036eef6de
+dlm c0ae148576778de958a0d5ff9a5ba00044e371a8
+swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a
+net-next fe723dff0fa4181ddb8116e72bc67d00d4239cb6
+ipsec-next 62a9fa01add88082b32096211e0a88016e996713
+netfilter-next b54ab92b84b6161f91b1ad9160199422b3699009
+ipvs-next 3c679cba588a46ba81a264673e192bbd3c92455b
+wireless-drivers-next 3e062eb21df80977a63e630d7da326c9b1e9ab51
+bluetooth 3c66d1c7ed4131bbaea128803cfa247defa2c376
+mac80211-next 335d534938d327d5ba266564b7e6beaf5d456dd2
+rdma 9294000d6d895ad609f3cc4aff98c9c6175b466f
+mtd d91f6cee98b6e0ef5a05209ca9b741d23086cdb2
+l2-mtd d91f6cee98b6e0ef5a05209ca9b741d23086cdb2
+nand 44dd182861f99f04171256f29b9dc51940757e5d
+spi-nor ca1fa1a8a6dae3e10c73bc5f1da728e662ee9d8b
+crypto 28845b079b9611b3082aa53e2dae2ea10a16a1c2
+drm b7d6c8db498cdbbd0004970d02c86210ce3a6cbc
+drm-panel eaeebffa90f35e0f92658249b0e5c49ddfa89915
+drm-intel be062fa42738822b8b91351752ff89275e25b516
+drm-tegra 7b1d4185050d204d638166e62b85c26c81326eff
+drm-misc 7b34734816d5170f40329598390de22d0166e4e9
+drm-exynos 7d1e042314619115153a0f6f06e4552c09a50e13
+drm-msm 56b1776d13a6312aac5a344fe0b61a189cf9c2cc
+hdlcd 747e5a5ff2a2ae84715c33d6679ac3c5220a3aec
+mali-dp 751c5fae19401272f08d0f46c4a6cd9ba58a48d2
+sunxi 26aa76e045b817452a89db572d6d82f9823c4172
+kspp 9b5e50a16f0712576db6d272b35b54cf6db259ad
+kconfig 5bcba792bb304e8341217d759ec486969a3b4258
+regmap bbbed19517040c8940e4fa49d399ccd049b0551b
+sound f3ac9f737603da80c2da3e84b89e74429836bb6d
+sound-asoc 2b0f53c7f0d405d603e8e2b8c1a201783fd384cb
+modules 5bd933fe4481688d595ae1dd0440006c8675a1a8
+input fef5f569db06ea80ae3a864b1ba4bda6e359311d
+block d111d2a90084262b7cf5a0545ac4b5d7b6dea7c0
+lightnvm e57ef816cf77f423035bd7c67016ec226db50d1e
+device-mapper cff87c4efc1f8719815e12e2520655d5bee41e05
+pcmcia e8e68fd86d22fa5bd9c7bed16043e27ac86998f8
+mmc 5aa25d971ab43847ce278e139366a46f78ff78f9
+kgdb 7a6653fca50077f342bcdc39222d78928e3f0feb
+md 48df498daf62e1292868005675331929305067f0
+mfd 8edd4b2c706771ad74c56a6c63fa74d25f6855c4
+backlight 80e5d455339ad15d0a5995c8b72d267ce1f70841
+battery 82f62d6982dab4dc4473e20907a0ba4ed4368e9b
+omap_dss2 c456a2f30de53e77a2eb8eeb4202d742516aa76b
+regulator a6a01bd92b39e0e89e8704129e8594b1d35ea28c
+security ca97d939db114c8d1619e10a3b82af8615372dae
+integrity 3dd0c8d06511c7c61c62305fcf431ca28884d263
+keys ed51e44e914c634bfd8435037474ebb0b47db956
+selinux e2f586bd83177d22072b275edd4b8b872daba924
+tpmdd d0e4a409ba10a44b5803da9d4132fa15deb8026a
+watchdog 00ea1ceebe0d9f2dc1cc2b7bd575a00100c27869
+iommu 8d2932dd0634ebeb0a42df896976772bdb569bfe
+dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98
+vfio d9d84780f17cd9e25ddde10eb40357b96b7d6874
+trivial 74dcba3589fc184c7118905eda22b3a4aaef95ff
+audit f68d952c918489ee3f8f1270954fd797bdf5b905
+devicetree 4e29ccdb240ec833f172a34fcf405e077b51066b
+mailbox db4d22c07e3e652eeec82abcc1399e6305edd838
+spi 8d3ab6cc95513320216ea830ad29e902201a617d
+tip f0283cb726d040fe7d2b0947e0ebeb39efa5a202
+clockevents f947ee147e0895d5c0ef18e81ca7a4e4219739e3
+edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755
+edac-amd 5c71ad17f97e84d6d7e11a8e193d5d96890ed2ed
+irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+ftrace 65a50c656276b0846bea09dd011c0a3d35b77f3e
+rcu 196136c7c64521b3ea228109027bd487493e1c01
+kvm 4495c08e84729385774601b5146d51d9e5849f81
+kvm-arm 7b6b46311a8562fb3a9e035ed6ffab6d49c28886
+kvm-mips 12ed1faece3f141c2604b5b3a8377ba71d23ec9d
+kvm-ppc bcd3bb63dbc87a3bbb21e95a09cd26bb6479c332
+kvms390 0c9d86833dfdafaf580cc49735661d002ef07ee3
+xen-tip d825adb48cf9bf9e3f5cb1d927e2827f8c2abee4
+percpu 8a1df543de8ad879d3c80bdda4c67ac4f82e7ee0
+workqueues bacb71fc9187f288e98c3132e87f36c0362318df
+drivers-x86 1fe55309462cc9b2dcefe6eb91e7adeba5e59e89
+chrome-platform 31b764171cb545cc1f750c573eef713329936660
+hsi 7ac5d7b1a1254ceb4be19ba93ef7a6ee4e7ac382
+leds 7ea79ae86c28e729d51fa5703b093d27cca25217
+ipmi ea6200e84182989a3cce9687cf79a23ac44ec4db
+driver-core 7e040726850a106587485c21bdacc0bfc8a0cbed
+usb d3d6ef1fb908b286a610fe063613e519bc50178b
+usb-gadget c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201
+usb-serial 2ac8fc51ddf152fdd2344c6d286976803183d59c
+usb-chipidea-next 4f4555cfe704913ce4ce836ab2707825d784a7cc
+phy-next fe0134d07127e64a6fe4332e84f6623c371737e3
+tty acbdad8dd1abd98b216d8c37ff9c6de4aa595534
+char-misc d47d88361feea2ce11f39bd70467ffc19a61d2d3
+extcon 16b11f258b4563a8d18b9e35344540ca41a5550b
+staging 7bc49cb9b9b8bad32536c4b6d1aff1824c1adc6c
+mux 9920ed1461bbe072a815c352f016cd08c756fba3
+slave-dma 7c2a156dd13688c8d67e4fed7544251ca0c064c2
+cgroup b4eba5f81324378704a02b1beaba9d6d3d4aa3b6
+scsi ca4a213db0b66513ba384d5f397fa60f1d0550d0
+scsi-mkp 33bd712be7d2e3bd60262957052abc19c71c4765
+target-updates c87ba9c49c1fa86261448b09c5f1b2223bf7efd9
+target-merge 2994a75183173defc21f0d26ce23b63232211b88
+target-bva 762b6f00a995863afa274d6b5ffa3880dac1714b
+libata 9332bd9ef480dffa775947188d35a9298818bb39
+binfmt_misc 4af75df6a410ce76d9f60f27b07e5645ecc2c5ed
+vhost 80363894995b24fd79af2718f917f23595c72bfd
+rpmsg 349709ba5bea715c03ebf7fe7ac84b7baacab0b5
+gpio acac0e697c5e58a47851b396fa1be60e63779bea
+pinctrl fec6696b0769fe0ce0f078437684aaaaa01b72a5
+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 10517429b5ac242498d7d847f79f10c21d7eedb0
+coresight 6de8ad2f92ea640f715142201653c66564eb055a
+rtc 65e9e65cebbea755db638875a44b227a1027570e
+hwspinlock bd5717a4632cdecafe82d03de7dcb3b1876e2828
+nvdimm 52084f89b38cdd896b59627c629915ef1a7bf615
+dax-misc 4d9a2c8746671efbb0c27d3ae28c7474597a7aad
+idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371
+akpm-current 20518a1747d56d33dd3419569d25334b096c3974
+akpm d12bc4bff0a0d1f8851c0ed9791656709eeefda5
diff --git a/Next/Trees b/Next/Trees
new file mode 100644
index 000000000000..ece23898a02e
--- /dev/null
+++ b/Next/Trees
@@ -0,0 +1,257 @@
+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
+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
+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..6b0552313920
--- /dev/null
+++ b/Next/merge.log
@@ -0,0 +1,7922 @@
+$ date -R
+Mon, 20 Mar 2017 09:34:52 +1100
+$ git checkout master
+Already on 'master'
+$ git reset --hard stable
+HEAD is now at ea6200e84182 Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
+Merging origin/master (93afaa4513bb Merge tag 'openrisc-for-linus' of git://github.com/openrisc/linux)
+$ git merge origin/master
+Updating ea6200e84182..93afaa4513bb
+Fast-forward
+ Documentation/admin-guide/kernel-parameters.txt | 3 +
+ Documentation/arm64/silicon-errata.txt | 1 +
+ Documentation/cgroup-v2.txt | 11 +-
+ Documentation/dev-tools/kcov.rst | 2 +-
+ .../devicetree/bindings/powerpc/4xx/emac.txt | 62 ++-
+ .../bindings/regulator/ti-abb-regulator.txt | 2 +-
+ Documentation/devicetree/bindings/usb/usb251xb.txt | 53 +--
+ Documentation/networking/ip-sysctl.txt | 3 +-
+ Documentation/virtual/kvm/api.txt | 4 +
+ Documentation/vm/userfaultfd.txt | 4 -
+ MAINTAINERS | 1 -
+ Makefile | 2 +-
+ arch/arc/include/asm/hugepage.h | 1 +
+ arch/arc/include/asm/pgtable.h | 1 +
+ arch/arm/include/asm/kvm_arm.h | 1 +
+ arch/arm/include/asm/kvm_host.h | 1 -
+ arch/arm/include/asm/pgtable.h | 1 +
+ arch/arm/kvm/arm.c | 3 +
+ arch/arm/kvm/handle_exit.c | 19 +-
+ arch/arm/tools/syscall.tbl | 1 +
+ arch/arm64/Kconfig | 14 +
+ arch/arm64/include/asm/cpufeature.h | 2 +-
+ arch/arm64/include/asm/kvm_host.h | 3 +-
+ arch/arm64/include/asm/pgtable-types.h | 4 +
+ arch/arm64/kernel/cpuidle.c | 2 +-
+ arch/arm64/kernel/probes/kprobes.c | 6 -
+ arch/arm64/kvm/handle_exit.c | 19 +-
+ arch/arm64/kvm/hyp/tlb.c | 64 ++-
+ arch/arm64/mm/kasan_init.c | 2 +-
+ arch/avr32/include/asm/pgtable-2level.h | 1 +
+ arch/cris/arch-v32/drivers/cryptocop.c | 2 +-
+ arch/cris/include/asm/pgtable.h | 1 +
+ arch/frv/include/asm/pgtable.h | 1 +
+ arch/h8300/include/asm/pgtable.h | 1 +
+ arch/hexagon/include/asm/pgtable.h | 1 +
+ arch/ia64/include/asm/pgtable.h | 2 +
+ arch/metag/include/asm/pgtable.h | 1 +
+ arch/microblaze/include/asm/page.h | 3 +-
+ arch/mips/include/asm/pgtable-32.h | 1 +
+ arch/mips/include/asm/pgtable-64.h | 1 +
+ arch/mn10300/include/asm/page.h | 1 +
+ arch/nios2/include/asm/pgtable.h | 1 +
+ arch/openrisc/include/asm/cmpxchg.h | 8 +-
+ arch/openrisc/include/asm/pgtable.h | 1 +
+ arch/openrisc/include/asm/uaccess.h | 2 +-
+ arch/openrisc/kernel/or32_ksyms.c | 4 +
+ arch/openrisc/kernel/process.c | 1 +
+ arch/powerpc/boot/zImage.lds.S | 1 +
+ arch/powerpc/crypto/crc32c-vpmsum_glue.c | 2 +-
+ arch/powerpc/include/asm/bitops.h | 4 +
+ arch/powerpc/include/asm/book3s/32/pgtable.h | 1 +
+ arch/powerpc/include/asm/book3s/64/pgtable.h | 88 ++--
+ arch/powerpc/include/asm/mce.h | 108 ++++-
+ arch/powerpc/include/asm/nohash/32/pgtable.h | 1 +
+ arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 3 +
+ arch/powerpc/include/asm/nohash/64/pgtable-64k.h | 1 +
+ arch/powerpc/kernel/cputable.c | 3 +
+ arch/powerpc/kernel/mce.c | 88 +++-
+ arch/powerpc/kernel/mce_power.c | 237 +++++++++++
+ arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +-
+ arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +-
+ arch/powerpc/perf/core-book3s.c | 2 +
+ arch/powerpc/perf/isa207-common.c | 43 +-
+ arch/powerpc/perf/isa207-common.h | 1 +
+ arch/powerpc/platforms/powernv/opal.c | 21 +-
+ arch/powerpc/platforms/powernv/pci-ioda.c | 20 +-
+ arch/powerpc/purgatory/trampoline.S | 12 +-
+ arch/powerpc/sysdev/axonram.c | 5 +-
+ arch/s390/crypto/paes_s390.c | 5 +-
+ arch/s390/include/asm/cputime.h | 20 +-
+ arch/s390/include/asm/pgtable.h | 1 +
+ arch/s390/include/asm/timex.h | 12 +-
+ arch/s390/include/uapi/asm/unistd.h | 4 +-
+ arch/s390/kernel/compat_wrapper.c | 1 +
+ arch/s390/kernel/entry.S | 10 +-
+ arch/s390/kernel/ipl.c | 2 +
+ arch/s390/kernel/process.c | 3 +
+ arch/s390/kernel/syscalls.S | 2 +
+ arch/s390/kernel/vtime.c | 2 +-
+ arch/s390/mm/pgtable.c | 19 +-
+ arch/score/include/asm/pgtable.h | 1 +
+ arch/score/kernel/traps.c | 1 +
+ arch/score/mm/extable.c | 2 +
+ arch/sh/boards/mach-cayman/setup.c | 2 -
+ arch/sh/include/asm/pgtable-2level.h | 1 +
+ arch/sh/include/asm/pgtable-3level.h | 1 +
+ arch/sparc/include/asm/pgtable_64.h | 1 +
+ arch/tile/include/asm/pgtable_32.h | 1 +
+ arch/tile/include/asm/pgtable_64.h | 1 +
+ arch/um/include/asm/pgtable-2level.h | 1 +
+ arch/um/include/asm/pgtable-3level.h | 1 +
+ arch/unicore32/include/asm/pgtable.h | 1 +
+ arch/x86/events/core.c | 16 +-
+ arch/x86/include/asm/cpufeatures.h | 3 +-
+ arch/x86/include/asm/pgtable-3level.h | 3 -
+ arch/x86/include/asm/pgtable.h | 2 +-
+ arch/x86/include/asm/pgtable_types.h | 4 +
+ arch/x86/include/asm/purgatory.h | 20 +
+ arch/x86/include/asm/tlbflush.h | 2 +-
+ arch/x86/kernel/acpi/boot.c | 9 +-
+ arch/x86/kernel/apic/apic.c | 26 +-
+ arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 2 +-
+ arch/x86/kernel/ftrace.c | 2 +-
+ arch/x86/kernel/head64.c | 1 +
+ arch/x86/kernel/machine_kexec_64.c | 9 +-
+ arch/x86/kernel/nmi.c | 6 +-
+ arch/x86/kernel/reboot.c | 2 +-
+ arch/x86/kernel/tsc.c | 2 +
+ arch/x86/kernel/unwind_frame.c | 36 +-
+ arch/x86/kvm/vmx.c | 30 +-
+ arch/x86/mm/gup.c | 37 +-
+ arch/x86/mm/kasan_init_64.c | 1 +
+ arch/x86/mm/mpx.c | 2 +-
+ arch/x86/pci/xen.c | 23 +-
+ arch/x86/platform/intel-mid/device_libs/Makefile | 1 +
+ .../device_libs/platform_mrfld_power_btn.c | 82 ++++
+ .../intel-mid/device_libs/platform_mrfld_wdt.c | 2 +-
+ arch/x86/platform/intel-mid/mfld.c | 15 +-
+ arch/x86/purgatory/purgatory.c | 35 +-
+ arch/x86/purgatory/purgatory.h | 8 -
+ arch/x86/purgatory/setup-x86_64.S | 2 +-
+ arch/x86/purgatory/sha256.h | 1 -
+ arch/xtensa/include/asm/pgtable.h | 1 +
+ block/bio.c | 12 +-
+ block/blk-core.c | 41 +-
+ block/blk-mq-sysfs.c | 40 +-
+ block/blk-mq-tag.c | 3 +
+ block/blk-mq.c | 37 +-
+ block/blk-mq.h | 2 +
+ block/genhd.c | 37 +-
+ block/sed-opal.c | 10 +-
+ crypto/af_alg.c | 9 +-
+ crypto/algif_hash.c | 9 +-
+ drivers/acpi/acpi_processor.c | 57 ++-
+ drivers/acpi/bus.c | 1 -
+ drivers/acpi/processor_core.c | 133 +-----
+ drivers/ata/ahci_qoriq.c | 6 +-
+ drivers/ata/libata-sff.c | 1 -
+ drivers/ata/libata-transport.c | 9 +-
+ drivers/base/core.c | 5 -
+ drivers/block/paride/pcd.c | 2 +-
+ drivers/block/paride/pd.c | 2 +-
+ drivers/block/paride/pf.c | 2 +-
+ drivers/block/paride/pg.c | 2 +-
+ drivers/block/paride/pt.c | 2 +-
+ drivers/block/rbd.c | 16 +-
+ drivers/block/zram/zram_drv.c | 2 +
+ drivers/char/hw_random/omap-rng.c | 16 +-
+ drivers/char/random.c | 129 +++---
+ drivers/clocksource/tcb_clksrc.c | 16 +-
+ drivers/cpufreq/cpufreq.c | 9 +-
+ drivers/cpufreq/intel_pstate.c | 131 +++---
+ drivers/crypto/s5p-sss.c | 132 +++---
+ drivers/crypto/ux500/cryp/cryp.c | 2 +-
+ drivers/gpu/drm/amd/acp/Makefile | 2 -
+ drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 +
+ drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 21 +
+ drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +-
+ drivers/gpu/drm/amd/amdgpu/si_dpm.c | 6 +
+ drivers/gpu/drm/amd/amdgpu/vi.c | 2 +-
+ .../amd/powerplay/hwmgr/smu7_clockpowergating.c | 2 +-
+ drivers/gpu/drm/arm/malidp_crtc.c | 3 +-
+ drivers/gpu/drm/arm/malidp_hw.c | 2 +-
+ drivers/gpu/drm/arm/malidp_planes.c | 18 +-
+ drivers/gpu/drm/arm/malidp_regs.h | 1 +
+ drivers/gpu/drm/drm_edid.c | 3 +
+ drivers/gpu/drm/i915/gvt/cfg_space.c | 57 ++-
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 10 +-
+ drivers/gpu/drm/i915/gvt/display.c | 139 +++++--
+ drivers/gpu/drm/i915/gvt/display.h | 20 +-
+ drivers/gpu/drm/i915/gvt/firmware.c | 2 +-
+ drivers/gpu/drm/i915/gvt/gtt.c | 40 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 12 +-
+ drivers/gpu/drm/i915/gvt/handlers.c | 439 ++++++++++++++------
+ drivers/gpu/drm/i915/gvt/kvmgt.c | 12 +-
+ drivers/gpu/drm/i915/gvt/mmio.c | 66 ++-
+ drivers/gpu/drm/i915/gvt/opregion.c | 5 +-
+ drivers/gpu/drm/i915/gvt/render.c | 16 +
+ drivers/gpu/drm/i915/gvt/scheduler.c | 52 ++-
+ drivers/gpu/drm/i915/gvt/vgpu.c | 72 ++--
+ drivers/gpu/drm/i915/i915_drv.h | 1 +
+ drivers/gpu/drm/i915/i915_gem.c | 97 ++++-
+ drivers/gpu/drm/i915/i915_gem_evict.c | 8 +-
+ drivers/gpu/drm/i915/i915_gem_object.h | 3 +
+ drivers/gpu/drm/i915/i915_vma.c | 57 ++-
+ drivers/gpu/drm/i915/intel_display.c | 58 +--
+ drivers/gpu/drm/i915/intel_fbdev.c | 10 +-
+ drivers/gpu/drm/i915/intel_pm.c | 18 +-
+ drivers/gpu/drm/i915/intel_sprite.c | 3 -
+ drivers/gpu/drm/i915/intel_uncore.c | 13 +-
+ drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 49 ++-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +
+ drivers/gpu/drm/mxsfb/mxsfb_out.c | 4 +
+ drivers/gpu/drm/mxsfb/mxsfb_regs.h | 1 +
+ drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 3 -
+ drivers/gpu/drm/radeon/si_dpm.c | 6 +
+ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 8 +-
+ drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 37 +-
+ drivers/hv/channel.c | 2 +-
+ drivers/i2c/busses/i2c-brcmstb.c | 27 +-
+ drivers/i2c/busses/i2c-designware-core.h | 1 +
+ drivers/i2c/busses/i2c-designware-platdrv.c | 28 +-
+ drivers/i2c/busses/i2c-exynos5.c | 3 +-
+ drivers/i2c/busses/i2c-meson.c | 2 +-
+ drivers/i2c/busses/i2c-mt65xx.c | 9 -
+ drivers/i2c/busses/i2c-riic.c | 6 +-
+ drivers/i2c/i2c-mux.c | 2 +
+ drivers/irqchip/irq-crossbar.c | 8 +-
+ drivers/irqchip/irq-gic-v3-its.c | 16 +
+ drivers/isdn/gigaset/bas-gigaset.c | 3 +
+ drivers/isdn/hisax/st5481_b.c | 2 +-
+ drivers/macintosh/macio_asic.c | 1 +
+ drivers/md/bcache/util.h | 1 -
+ drivers/md/dm.c | 29 +-
+ drivers/md/md-cluster.c | 2 +-
+ drivers/md/md.c | 27 +-
+ drivers/md/md.h | 6 -
+ drivers/md/raid1.c | 29 +-
+ drivers/md/raid10.c | 44 +-
+ drivers/md/raid5.c | 5 +-
+ drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 8 +-
+ drivers/media/platform/vsp1/vsp1_drm.c | 33 +-
+ drivers/media/rc/lirc_dev.c | 4 +-
+ drivers/media/rc/nuvoton-cir.c | 5 +-
+ drivers/media/rc/rc-main.c | 26 +-
+ drivers/media/rc/serial_ir.c | 123 +++---
+ drivers/media/usb/dvb-usb/dw2102.c | 244 ++++++-----
+ drivers/misc/sgi-gru/grufault.c | 9 +-
+ drivers/mtd/spi-nor/spi-nor.c | 2 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 10 +-
+ .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 36 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 24 +-
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 +
+ drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 40 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.c | 25 +-
+ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 +
+ drivers/net/ethernet/broadcom/bnxt/bnxt_dcb.c | 2 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 206 +++++++---
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 16 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 110 ++---
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 104 ++---
+ .../net/ethernet/cavium/liquidio/octeon_config.h | 6 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 17 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_droq.h | 4 +-
+ drivers/net/ethernet/cavium/liquidio/octeon_main.h | 42 --
+ .../net/ethernet/cavium/liquidio/octeon_network.h | 43 +-
+ drivers/net/ethernet/cavium/thunder/nic.h | 1 +
+ drivers/net/ethernet/cavium/thunder/nicvf_main.c | 12 +-
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.c | 184 +++++++--
+ drivers/net/ethernet/cavium/thunder/nicvf_queues.h | 4 +-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 64 ++-
+ drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 1 -
+ drivers/net/ethernet/ibm/emac/core.c | 25 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 43 +-
+ drivers/net/ethernet/ibm/ibmvnic.h | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 +
+ drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c | 10 +-
+ .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 5 +-
+ drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 33 +-
+ drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 2 +-
+ drivers/net/ethernet/mellanox/mlx5/core/main.c | 5 +-
+ drivers/net/ethernet/mellanox/mlxsw/reg.h | 4 +-
+ .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 4 +-
+ drivers/net/ethernet/qlogic/qed/qed_cxt.c | 3 +-
+ drivers/net/ethernet/qlogic/qed/qed_dev.c | 5 +-
+ drivers/net/ethernet/qlogic/qed/qed_iscsi.c | 31 ++
+ drivers/net/ethernet/qlogic/qed/qed_ll2.c | 13 +-
+ drivers/net/ethernet/qlogic/qed/qed_ooo.c | 2 +
+ drivers/net/ethernet/qlogic/qlge/qlge.h | 4 +-
+ drivers/net/ethernet/smsc/smc91x.c | 47 ++-
+ drivers/net/hyperv/hyperv_net.h | 3 +-
+ drivers/net/hyperv/netvsc.c | 8 +-
+ drivers/net/hyperv/netvsc_drv.c | 11 +-
+ drivers/net/phy/marvell.c | 15 -
+ drivers/net/phy/phy_device.c | 2 +-
+ drivers/net/phy/spi_ks8995.c | 3 +-
+ drivers/net/team/team.c | 1 +
+ drivers/net/tun.c | 19 +-
+ drivers/net/vrf.c | 3 +-
+ drivers/net/vxlan.c | 73 ++--
+ drivers/net/wan/fsl_ucc_hdlc.c | 4 +-
+ drivers/net/wimax/i2400m/usb.c | 3 +
+ drivers/net/xen-netback/interface.c | 26 +-
+ drivers/net/xen-netback/netback.c | 2 +-
+ drivers/net/xen-netback/xenbus.c | 20 +-
+ drivers/pci/dwc/pci-exynos.c | 8 +-
+ drivers/pci/pcie/aspm.c | 5 +-
+ drivers/pci/quirks.c | 1 +
+ drivers/pinctrl/qcom/pinctrl-msm.c | 15 +
+ drivers/pinctrl/uniphier/pinctrl-uniphier-ld11.c | 12 +-
+ drivers/platform/x86/asus-nb-wmi.c | 49 +--
+ drivers/platform/x86/asus-wmi.c | 22 +-
+ drivers/platform/x86/asus-wmi.h | 1 -
+ drivers/platform/x86/fujitsu-laptop.c | 451 ++++++++++-----------
+ drivers/scsi/Kconfig | 19 +-
+ drivers/scsi/aacraid/src.c | 2 +-
+ drivers/scsi/aic7xxx/aic79xx_core.c | 2 +-
+ drivers/scsi/libiscsi.c | 26 +-
+ drivers/scsi/lpfc/lpfc.h | 4 +-
+ drivers/scsi/lpfc/lpfc_attr.c | 9 +-
+ drivers/scsi/lpfc/lpfc_crtn.h | 4 +-
+ drivers/scsi/lpfc/lpfc_ct.c | 2 +-
+ drivers/scsi/lpfc/lpfc_debugfs.c | 22 -
+ drivers/scsi/lpfc/lpfc_els.c | 22 +-
+ drivers/scsi/lpfc/lpfc_hbadisc.c | 24 +-
+ drivers/scsi/lpfc/lpfc_hw4.h | 4 +-
+ drivers/scsi/lpfc/lpfc_init.c | 128 ++++--
+ drivers/scsi/lpfc/lpfc_mem.c | 2 +-
+ drivers/scsi/lpfc/lpfc_nvme.c | 107 +++--
+ drivers/scsi/lpfc/lpfc_nvme.h | 1 +
+ drivers/scsi/lpfc/lpfc_nvmet.c | 43 +-
+ drivers/scsi/lpfc/lpfc_scsi.c | 4 +-
+ drivers/scsi/lpfc/lpfc_sli.c | 68 +++-
+ drivers/scsi/lpfc/lpfc_sli4.h | 6 +
+ drivers/scsi/lpfc/lpfc_version.h | 2 +-
+ drivers/scsi/mpt3sas/mpt3sas_base.h | 3 -
+ drivers/scsi/mpt3sas/mpt3sas_scsih.c | 19 +-
+ drivers/scsi/qedf/qedf_dbg.h | 13 +-
+ drivers/scsi/qedf/qedf_fip.c | 2 +-
+ drivers/scsi/qedf/qedf_io.c | 4 +-
+ drivers/scsi/qedf/qedf_main.c | 4 +-
+ drivers/scsi/qedi/qedi_debugfs.c | 16 +-
+ drivers/scsi/qedi/qedi_fw.c | 4 +-
+ drivers/scsi/qedi/qedi_gbl.h | 8 +-
+ drivers/scsi/qedi/qedi_iscsi.c | 8 +-
+ drivers/scsi/qedi/qedi_main.c | 2 +-
+ drivers/scsi/qla2xxx/qla_dbg.c | 12 +-
+ drivers/scsi/scsi_lib.c | 14 +-
+ drivers/scsi/scsi_priv.h | 3 -
+ drivers/scsi/sd.c | 58 ++-
+ drivers/scsi/storvsc_drv.c | 27 +-
+ drivers/scsi/ufs/ufs.h | 22 +-
+ drivers/scsi/ufs/ufshcd.c | 231 ++++++++---
+ drivers/scsi/ufs/ufshcd.h | 15 +
+ drivers/scsi/vmw_pvscsi.c | 2 +-
+ drivers/staging/lustre/lnet/lnet/lib-socket.c | 4 +-
+ drivers/staging/octeon/ethernet-rx.c | 1 -
+ drivers/staging/vc04_services/Kconfig | 1 +
+ drivers/tty/n_hdlc.c | 132 +++---
+ drivers/tty/serial/samsung.c | 6 +-
+ drivers/usb/dwc3/dwc3-omap.c | 3 +-
+ drivers/usb/dwc3/gadget.c | 76 +++-
+ drivers/usb/dwc3/gadget.h | 14 +-
+ drivers/usb/gadget/configfs.c | 1 +
+ drivers/usb/gadget/function/f_fs.c | 17 +-
+ drivers/usb/gadget/function/f_uvc.c | 7 -
+ drivers/usb/gadget/legacy/inode.c | 7 +-
+ drivers/usb/gadget/udc/atmel_usba_udc.c | 4 +-
+ drivers/usb/gadget/udc/dummy_hcd.c | 2 +
+ drivers/usb/gadget/udc/net2280.c | 25 +-
+ drivers/usb/gadget/udc/pxa27x_udc.c | 5 +-
+ drivers/usb/host/ohci-at91.c | 4 +-
+ drivers/usb/host/xhci-dbg.c | 2 +-
+ drivers/usb/host/xhci-mtk.c | 7 +-
+ drivers/usb/host/xhci-plat.c | 2 +
+ drivers/usb/host/xhci-tegra.c | 1 -
+ drivers/usb/host/xhci.c | 4 +-
+ drivers/usb/misc/iowarrior.c | 21 +-
+ drivers/usb/misc/usb251xb.c | 59 ++-
+ drivers/usb/phy/phy-isp1301.c | 7 +
+ drivers/usb/serial/digi_acceleport.c | 2 +-
+ drivers/usb/serial/io_ti.c | 8 +-
+ drivers/usb/serial/omninet.c | 13 -
+ drivers/usb/serial/safe_serial.c | 5 +
+ drivers/usb/storage/unusual_devs.h | 14 +
+ drivers/xen/gntdev.c | 11 +-
+ drivers/xen/xenbus/xenbus_dev_frontend.c | 1 -
+ fs/afs/callback.c | 7 +-
+ fs/afs/cmservice.c | 11 +-
+ fs/afs/file.c | 20 +-
+ fs/afs/fsclient.c | 77 ++--
+ fs/afs/inode.c | 42 +-
+ fs/afs/internal.h | 23 +-
+ fs/afs/misc.c | 2 +
+ fs/afs/mntpt.c | 53 ---
+ fs/afs/rxrpc.c | 149 ++++---
+ fs/afs/security.c | 9 +-
+ fs/afs/server.c | 6 +-
+ fs/afs/vlocation.c | 16 +-
+ fs/afs/write.c | 76 +++-
+ fs/dlm/lowcomms.c | 2 +-
+ fs/fat/inode.c | 13 +-
+ fs/fs-writeback.c | 35 +-
+ fs/gfs2/incore.h | 2 +-
+ fs/iomap.c | 17 +-
+ fs/nfs/callback.c | 4 +-
+ fs/nfs/client.c | 25 +-
+ fs/nfs/filelayout/filelayoutdev.c | 8 +-
+ fs/nfs/flexfilelayout/flexfilelayout.h | 14 +-
+ fs/nfs/flexfilelayout/flexfilelayoutdev.c | 5 +-
+ fs/nfs/internal.h | 2 +
+ fs/nfs/nfs4client.c | 4 +-
+ fs/nfs/nfs4proc.c | 11 +-
+ fs/nfs/nfs4xdr.c | 2 +-
+ fs/nfs/pnfs.h | 2 +-
+ fs/nfs/pnfs_nfs.c | 31 +-
+ fs/nfs/write.c | 6 +-
+ fs/ocfs2/cluster/tcp.c | 2 +-
+ fs/userfaultfd.c | 75 ++--
+ fs/xfs/kmem.c | 18 -
+ fs/xfs/kmem.h | 2 -
+ fs/xfs/libxfs/xfs_bmap.c | 34 +-
+ fs/xfs/libxfs/xfs_bmap_btree.c | 6 +-
+ fs/xfs/libxfs/xfs_dir2_priv.h | 2 +
+ fs/xfs/libxfs/xfs_dir2_sf.c | 87 ++++
+ fs/xfs/libxfs/xfs_inode_fork.c | 26 +-
+ fs/xfs/libxfs/xfs_inode_fork.h | 2 +-
+ fs/xfs/xfs_aops.c | 59 ++-
+ fs/xfs/xfs_dir2_readdir.c | 11 -
+ fs/xfs/xfs_icache.c | 2 +-
+ fs/xfs/xfs_inode.c | 14 +-
+ fs/xfs/xfs_iomap.c | 25 +-
+ fs/xfs/xfs_itable.c | 6 +-
+ fs/xfs/xfs_mount.c | 3 +-
+ fs/xfs/xfs_reflink.c | 23 +-
+ fs/xfs/xfs_reflink.h | 4 +-
+ fs/xfs/xfs_super.c | 2 +-
+ include/asm-generic/4level-fixup.h | 3 +-
+ include/asm-generic/5level-fixup.h | 41 ++
+ include/asm-generic/pgtable-nop4d-hack.h | 62 +++
+ include/asm-generic/pgtable-nop4d.h | 56 +++
+ include/asm-generic/pgtable-nopud.h | 48 ++-
+ include/asm-generic/pgtable.h | 48 ++-
+ include/asm-generic/tlb.h | 14 +-
+ include/crypto/if_alg.h | 2 +-
+ include/dt-bindings/sound/cs42l42.h | 2 +-
+ include/linux/acpi.h | 5 +-
+ include/linux/blkdev.h | 1 -
+ include/linux/ceph/libceph.h | 2 +
+ include/linux/ceph/osd_client.h | 1 +
+ include/linux/dccp.h | 1 +
+ include/linux/device.h | 1 -
+ include/linux/filter.h | 16 +-
+ include/linux/fs.h | 2 +-
+ include/linux/genhd.h | 8 -
+ include/linux/hugetlb.h | 5 +-
+ include/linux/irqchip/arm-gic-v3.h | 2 +
+ include/linux/irqdomain.h | 4 +
+ include/linux/kasan.h | 2 +
+ include/linux/list_nulls.h | 5 +
+ include/linux/mm.h | 34 +-
+ include/linux/net.h | 2 +-
+ include/linux/phy.h | 4 +
+ include/linux/purgatory.h | 23 ++
+ include/linux/random.h | 18 +-
+ include/linux/rculist_nulls.h | 14 +
+ include/linux/regulator/machine.h | 2 +-
+ include/linux/userfaultfd_k.h | 13 +-
+ include/linux/vm_event_item.h | 3 +
+ include/media/vsp1.h | 13 +-
+ include/net/inet_common.h | 3 +-
+ include/net/inet_connection_sock.h | 2 +-
+ include/net/irda/timer.h | 2 +-
+ include/net/sctp/structs.h | 3 +-
+ include/net/sock.h | 9 +-
+ include/scsi/libiscsi.h | 1 +
+ include/scsi/scsi_device.h | 4 +
+ include/uapi/drm/omap_drm.h | 38 +-
+ include/uapi/linux/packet_diag.h | 2 +-
+ include/uapi/linux/userfaultfd.h | 5 +-
+ init/main.c | 1 -
+ kernel/bpf/hashtab.c | 119 ++++--
+ kernel/bpf/lpm_trie.c | 6 +
+ kernel/cgroup/cgroup-v1.c | 2 +-
+ kernel/cgroup/cgroup.c | 2 +-
+ kernel/cgroup/pids.c | 2 +-
+ kernel/cpu.c | 28 +-
+ kernel/events/core.c | 66 ++-
+ kernel/exit.c | 1 -
+ kernel/futex.c | 22 +-
+ kernel/kexec_file.c | 8 +-
+ kernel/kexec_internal.h | 6 +-
+ kernel/locking/rwsem-spinlock.c | 16 +-
+ kernel/memremap.c | 4 -
+ kernel/sched/cpufreq_schedutil.c | 19 +-
+ kernel/sched/deadline.c | 63 ++-
+ kernel/sched/loadavg.c | 20 +-
+ kernel/trace/trace_stack.c | 2 +-
+ kernel/workqueue.c | 1 +
+ lib/ioremap.c | 39 +-
+ mm/backing-dev.c | 43 +-
+ mm/gup.c | 46 ++-
+ mm/huge_memory.c | 9 +-
+ mm/hugetlb.c | 29 +-
+ mm/kasan/kasan_init.c | 44 +-
+ mm/kasan/quarantine.c | 51 ++-
+ mm/madvise.c | 44 +-
+ mm/memblock.c | 5 +-
+ mm/memcontrol.c | 18 +-
+ mm/memory.c | 230 +++++++++--
+ mm/memory_hotplug.c | 6 +-
+ mm/mlock.c | 10 +-
+ mm/mprotect.c | 26 +-
+ mm/mremap.c | 13 +-
+ mm/page_vma_mapped.c | 6 +-
+ mm/pagewalk.c | 32 +-
+ mm/percpu-vm.c | 7 +-
+ mm/percpu.c | 5 +-
+ mm/pgtable-generic.c | 6 +
+ mm/rmap.c | 20 +-
+ mm/sparse-vmemmap.c | 22 +-
+ mm/swapfile.c | 26 +-
+ mm/userfaultfd.c | 23 +-
+ mm/vmalloc.c | 84 +++-
+ mm/vmstat.c | 3 +
+ mm/z3fold.c | 1 +
+ net/atm/svc.c | 5 +-
+ net/ax25/af_ax25.c | 3 +-
+ net/bluetooth/l2cap_sock.c | 2 +-
+ net/bluetooth/rfcomm/sock.c | 3 +-
+ net/bluetooth/sco.c | 2 +-
+ net/bridge/br_input.c | 1 +
+ net/bridge/br_netfilter_hooks.c | 21 -
+ net/ceph/ceph_common.c | 15 +
+ net/ceph/osd_client.c | 36 +-
+ net/ceph/osdmap.c | 4 +-
+ net/core/dev.c | 1 +
+ net/core/net-sysfs.c | 6 +-
+ net/core/skbuff.c | 30 +-
+ net/core/sock.c | 106 ++---
+ net/dccp/ccids/ccid2.c | 1 +
+ net/dccp/ipv4.c | 3 +-
+ net/dccp/ipv6.c | 8 +-
+ net/dccp/minisocks.c | 24 +-
+ net/decnet/af_decnet.c | 5 +-
+ net/ipv4/af_inet.c | 9 +-
+ net/ipv4/inet_connection_sock.c | 2 +-
+ net/ipv4/ip_output.c | 2 +-
+ net/ipv4/tcp_ipv4.c | 10 +-
+ net/ipv4/tcp_timer.c | 6 +-
+ net/ipv6/af_inet6.c | 10 +-
+ net/ipv6/ip6_fib.c | 2 +
+ net/ipv6/ip6_offload.c | 4 +-
+ net/ipv6/ip6_output.c | 9 +-
+ net/ipv6/ip6_vti.c | 8 +-
+ net/ipv6/route.c | 11 +-
+ net/ipv6/tcp_ipv6.c | 8 +-
+ net/irda/af_irda.c | 5 +-
+ net/iucv/af_iucv.c | 2 +-
+ net/llc/af_llc.c | 4 +-
+ net/mpls/af_mpls.c | 4 +-
+ net/netrom/af_netrom.c | 3 +-
+ net/nfc/llcp_sock.c | 2 +-
+ net/phonet/pep.c | 6 +-
+ net/phonet/socket.c | 4 +-
+ net/rds/connection.c | 1 +
+ net/rds/ib_cm.c | 47 ++-
+ net/rds/rds.h | 6 +-
+ net/rds/tcp.c | 38 +-
+ net/rds/tcp.h | 2 +-
+ net/rds/tcp_listen.c | 11 +-
+ net/rose/af_rose.c | 3 +-
+ net/rxrpc/input.c | 27 +-
+ net/rxrpc/recvmsg.c | 4 +-
+ net/rxrpc/sendmsg.c | 49 ++-
+ net/sched/act_connmark.c | 3 +
+ net/sched/act_skbmod.c | 1 -
+ net/sctp/ipv6.c | 5 +-
+ net/sctp/protocol.c | 5 +-
+ net/sctp/socket.c | 4 +-
+ net/smc/af_smc.c | 2 +-
+ net/socket.c | 5 +-
+ net/sunrpc/xprtrdma/verbs.c | 3 +-
+ net/tipc/socket.c | 8 +-
+ net/unix/af_unix.c | 5 +-
+ net/vmw_vsock/af_vsock.c | 3 +-
+ net/x25/af_x25.c | 3 +-
+ net/xfrm/xfrm_policy.c | 19 +-
+ scripts/gcc-plugins/sancov_plugin.c | 2 +-
+ scripts/spelling.txt | 3 +
+ sound/soc/amd/acp-pcm-dma.c | 2 +-
+ tools/include/uapi/linux/bpf_perf_event.h | 18 +
+ tools/lguest/lguest.c | 2 +-
+ tools/lib/bpf/Makefile | 2 +-
+ tools/lib/traceevent/Makefile | 2 +-
+ tools/lib/traceevent/event-parse.h | 2 +-
+ tools/perf/util/symbol.c | 2 +-
+ tools/testing/selftests/bpf/Makefile | 4 +-
+ tools/testing/selftests/bpf/test_verifier.c | 4 +
+ tools/testing/selftests/powerpc/include/vsx_asm.h | 48 +--
+ tools/testing/selftests/vm/Makefile | 4 +
+ virt/kvm/arm/vgic/vgic-its.c | 109 +++--
+ virt/kvm/arm/vgic/vgic-mmio.c | 32 +-
+ virt/kvm/arm/vgic/vgic-v3.c | 5 +-
+ 587 files changed, 7621 insertions(+), 3914 deletions(-)
+ create mode 100644 arch/x86/include/asm/purgatory.h
+ create mode 100644 arch/x86/platform/intel-mid/device_libs/platform_mrfld_power_btn.c
+ delete mode 100644 arch/x86/purgatory/purgatory.h
+ create mode 100644 include/asm-generic/5level-fixup.h
+ create mode 100644 include/asm-generic/pgtable-nop4d-hack.h
+ create mode 100644 include/asm-generic/pgtable-nop4d.h
+ create mode 100644 include/linux/purgatory.h
+ create mode 100644 tools/include/uapi/linux/bpf_perf_event.h
+Merging fixes/master (c470abd4fde4 Linux 4.10)
+$ git merge fixes/master
+Already up-to-date.
+Merging kbuild-current/fixes (b334e19ae938 Kbuild: use cc-disable-warning consistently for maybe-uninitialized)
+$ git merge kbuild-current/fixes
+Auto-merging Makefile
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 4 ++--
+ Makefile | 2 +-
+ scripts/Makefile.lib | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+Merging arc-current/for-curr (7f35144cea21 ARC: get rate from clk driver instead of reading device tree)
+$ git merge arc-current/for-curr
+Merge made by the 'recursive' strategy.
+ 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/kernel/setup.c | 16 ++++++++++++----
+ 4 files changed, 34 insertions(+), 5 deletions(-)
+Merging arm-current/fixes (a1016e94cce9 ARM: wire up statx syscall)
+$ git merge arm-current/fixes
+Already up-to-date.
+Merging m68k-current/for-linus (b5bb8f3120a7 m68k/bitops: Correct signature of test_bit())
+$ git merge m68k-current/for-linus
+Merge made by the 'recursive' strategy.
+ arch/m68k/include/asm/bitops.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+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 (8971e1c79d3f powerpc/pseries: Don't give a warning when HPT resizing isn't available)
+$ git merge powerpc-fixes/fixes
+Merge made by the 'recursive' strategy.
+ arch/powerpc/include/asm/systbl.h | 1 +
+ arch/powerpc/include/asm/unistd.h | 2 +-
+ arch/powerpc/include/uapi/asm/unistd.h | 1 +
+ arch/powerpc/platforms/pseries/lpar.c | 4 +++-
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+Merging sparc/master (f8e6859ea9d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc)
+$ git merge sparc/master
+Already up-to-date.
+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 (db7f00b8dba6 tcp: tcp_get_info() should read tcp_time_stamp later)
+$ git merge net/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 15 ---
+ drivers/net/ethernet/amd/xgbe/xgbe-common.h | 6 +-
+ drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 20 +--
+ drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 102 ++++++++------
+ drivers/net/ethernet/aquantia/atlantic/aq_main.c | 1 +
+ drivers/net/ethernet/broadcom/genet/bcmgenet.c | 6 +-
+ drivers/net/ethernet/ibm/ibmvnic.c | 2 +
+ drivers/net/ethernet/mellanox/mlx4/cmd.c | 11 ++
+ drivers/net/ethernet/mellanox/mlx4/main.c | 11 ++
+ drivers/net/fjes/fjes_main.c | 2 +-
+ drivers/net/hyperv/netvsc.c | 7 +-
+ include/linux/mlx4/device.h | 1 +
+ include/net/netfilter/nf_conntrack.h | 2 +-
+ include/net/netfilter/nf_tables.h | 30 ++++-
+ include/net/netfilter/nf_tables_ipv6.h | 6 +-
+ net/batman-adv/bat_iv_ogm.c | 11 ++
+ net/batman-adv/bat_v.c | 14 +-
+ net/batman-adv/fragmentation.c | 20 ++-
+ net/batman-adv/gateway_common.c | 5 +
+ net/batman-adv/soft-interface.c | 1 -
+ net/batman-adv/types.h | 2 +
+ net/bridge/br_fdb.c | 2 +-
+ net/bridge/br_netfilter_hooks.c | 12 +-
+ net/bridge/br_private.h | 9 --
+ net/core/sock.c | 10 +-
+ net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 4 +
+ net/ipv4/netfilter/nf_nat_l3proto_ipv4.c | 5 -
+ net/ipv4/netfilter/nft_masq_ipv4.c | 8 +-
+ net/ipv4/netfilter/nft_redir_ipv4.c | 8 +-
+ net/ipv4/tcp.c | 3 +-
+ net/ipv6/netfilter/nft_masq_ipv6.c | 8 +-
+ net/ipv6/netfilter/nft_redir_ipv6.c | 8 +-
+ net/ipv6/route.c | 2 +
+ net/mpls/af_mpls.c | 13 +-
+ net/netfilter/nf_conntrack_core.c | 6 +-
+ net/netfilter/nf_nat_proto_sctp.c | 13 +-
+ net/netfilter/nf_tables_api.c | 4 -
+ net/netfilter/nft_ct.c | 21 +--
+ net/netfilter/nft_meta.c | 40 +++---
+ net/netfilter/nft_nat.c | 8 +-
+ net/netfilter/nft_set_bitmap.c | 165 +++++++++++------------
+ net/openvswitch/flow_netlink.c | 4 +-
+ net/rxrpc/conn_event.c | 4 +
+ net/wireless/nl80211.c | 127 ++++++++---------
+ 44 files changed, 433 insertions(+), 326 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 (5371bbf4b295 net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled)
+$ git merge netfilter/master
+Already up-to-date.
+Merging ipvs/master (5371bbf4b295 net: bcmgenet: Do not suspend PHY if Wake-on-LAN is enabled)
+$ git merge ipvs/master
+Already up-to-date.
+Merging wireless-drivers/master (cf8c44d42c4f MAINTAINERS: update for mwifiex driver maintainers)
+$ git merge wireless-drivers/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 ++
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 5 +--
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 11 +++---
+ drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 +-
+ drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 41 ++++++++++-------------
+ drivers/net/wireless/marvell/mwifiex/main.c | 11 +++---
+ drivers/net/wireless/marvell/mwifiex/pcie.c | 38 ++++++++++-----------
+ 7 files changed, 56 insertions(+), 54 deletions(-)
+Merging mac80211/master (ea90e0dc8cec nl80211: fix dumpit error path RTNL deadlocks)
+$ git merge mac80211/master
+Already up-to-date.
+Merging sound-current/for-linus (f3ac9f737603 ALSA: seq: Fix link corruption by event error handling)
+$ git merge sound-current/for-linus
+Already up-to-date.
+Merging pci-current/for-linus (6e347b5e05ea PCI: iproc: Save host bridge window resource in struct iproc_pcie)
+$ git merge pci-current/for-linus
+Merge made by the 'recursive' strategy.
+ drivers/pci/host/pcie-iproc-bcma.c | 24 ++++++++++++------------
+ drivers/pci/host/pcie-iproc-platform.c | 19 ++++++++++---------
+ drivers/pci/host/pcie-iproc.h | 1 +
+ 3 files changed, 23 insertions(+), 21 deletions(-)
+Merging driver-core.current/driver-core-linus (966fa72a716c kernfs: Check KERNFS_HAS_RELEASE before calling kernfs_release_file())
+$ git merge driver-core.current/driver-core-linus
+Merge made by the 'recursive' strategy.
+ fs/kernfs/file.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+Merging tty.current/tty-linus (a4a3e061149f tty: fix data race in tty_ldisc_ref_wait())
+$ git merge tty.current/tty-linus
+Merge made by the 'recursive' strategy.
+ drivers/acpi/spcr.c | 2 +-
+ drivers/tty/serial/8250/8250_dw.c | 9 +++-
+ drivers/tty/serial/amba-pl011.c | 2 +-
+ drivers/tty/tty_ldisc.c | 92 +++++++++------------------------------
+ 4 files changed, 30 insertions(+), 75 deletions(-)
+Merging usb.current/usb-linus (7b2db29fbb4e usb: hub: Fix crash after failure to read BOS descriptor)
+$ git merge usb.current/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/class/usbtmc.c | 18 +++++++++++++++---
+ drivers/usb/core/config.c | 10 ++++++++++
+ drivers/usb/core/hub.c | 2 +-
+ drivers/usb/core/quirks.c | 8 ++++++++
+ drivers/usb/gadget/function/f_acm.c | 4 +++-
+ drivers/usb/misc/idmouse.c | 3 +++
+ drivers/usb/misc/lvstest.c | 4 ++++
+ drivers/usb/misc/uss720.c | 5 +++++
+ drivers/usb/musb/musb_core.c | 2 +-
+ drivers/usb/musb/musb_cppi41.c | 23 +++++++++++++++++++++--
+ drivers/usb/musb/musb_dsps.c | 5 ++++-
+ drivers/usb/wusbcore/wa-hc.c | 3 +++
+ drivers/uwb/hwa-rc.c | 3 +++
+ drivers/uwb/i1480/dfu/usb.c | 3 +++
+ include/linux/usb/quirks.h | 6 ++++++
+ 15 files changed, 90 insertions(+), 9 deletions(-)
+Merging usb-gadget-fixes/fixes (35b2719e72d3 usb: dwc3: gadget: make to increment req->remaining in all cases)
+$ git merge usb-gadget-fixes/fixes
+Already up-to-date.
+Merging usb-serial-fixes/usb-linus (436ecf5519d8 USB: serial: qcserial: add Dell DW5811e)
+$ git merge usb-serial-fixes/usb-linus
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/option.c | 17 ++++++++++++++++-
+ drivers/usb/serial/qcserial.c | 2 ++
+ 2 files changed, 18 insertions(+), 1 deletion(-)
+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
+Removing drivers/phy/phy-bcm-nsp-usb3.c
+Removing Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/phy/brcm,nsp-usb3-phy.txt | 39 -----
+ drivers/phy/Kconfig | 9 +-
+ drivers/phy/Makefile | 1 -
+ drivers/phy/phy-bcm-nsp-usb3.c | 177 ---------------------
+ drivers/phy/phy-exynos-pcie.c | 4 +-
+ 5 files changed, 3 insertions(+), 227 deletions(-)
+ delete mode 100644 Documentation/devicetree/bindings/phy/brcm,nsp-usb3-phy.txt
+ delete mode 100644 drivers/phy/phy-bcm-nsp-usb3.c
+Merging staging.current/staging-linus (4495c08e8472 Linux 4.11-rc2)
+$ git merge staging.current/staging-linus
+Already up-to-date.
+Merging char-misc.current/char-misc-linus (c3423563c68f vmw_vmci: handle the return value from pci_alloc_irq_vectors correctly)
+$ git merge char-misc.current/char-misc-linus
+Merge made by the 'recursive' strategy.
+ drivers/auxdisplay/img-ascii-lcd.c | 1 +
+ drivers/char/ppdev.c | 11 +++++++++--
+ drivers/hv/channel.c | 25 ++++++++++++-------------
+ drivers/hv/channel_mgmt.c | 27 +++++----------------------
+ drivers/hv/hv_fcopy.c | 4 ----
+ drivers/hv/hv_kvp.c | 4 ----
+ drivers/hv/hv_snapshot.c | 4 ----
+ drivers/hv/hv_util.c | 2 ++
+ drivers/hv/hv_utils_transport.c | 12 ++++++++----
+ drivers/hv/hv_utils_transport.h | 1 +
+ drivers/hv/vmbus_drv.c | 6 +++++-
+ drivers/hwtracing/intel_th/core.c | 4 +++-
+ drivers/hwtracing/intel_th/pci.c | 10 ++++++++++
+ drivers/misc/mei/bus-fixup.c | 14 ++------------
+ drivers/misc/mei/init.c | 8 ++++++--
+ drivers/misc/vmw_vmci/vmci_guest.c | 4 ++--
+ drivers/parport/share.c | 6 ++++--
+ include/linux/hyperv.h | 10 +++++++---
+ 18 files changed, 77 insertions(+), 76 deletions(-)
+Merging input-current/for-linus (47e6fb4212d0 Input: ALPS - fix trackstick button handling on V8 devices)
+$ git merge input-current/for-linus
+Auto-merging drivers/input/rmi4/rmi_f30.c
+Merge made by the 'recursive' strategy.
+ drivers/input/joystick/iforce/iforce-usb.c | 3 ++
+ drivers/input/misc/cm109.c | 4 ++
+ drivers/input/misc/ims-pcu.c | 4 ++
+ drivers/input/misc/yealink.c | 4 ++
+ drivers/input/mouse/alps.c | 72 +++++++++++++++++++++---------
+ drivers/input/mouse/alps.h | 11 +++++
+ drivers/input/mouse/elan_i2c_core.c | 20 +++++----
+ drivers/input/rmi4/rmi_f30.c | 4 ++
+ drivers/input/serio/i8042-x86ia64io.h | 14 ++++++
+ drivers/input/tablet/hanwang.c | 3 ++
+ drivers/input/tablet/kbtab.c | 3 ++
+ drivers/input/touchscreen/sur40.c | 3 ++
+ 12 files changed, 116 insertions(+), 29 deletions(-)
+Merging crypto-current/master (8c75704ebcac hwrng: geode - Revert managed API changes)
+$ git merge crypto-current/master
+Merge made by the 'recursive' strategy.
+ drivers/char/hw_random/amd-rng.c | 42 ++++++++++++++++++++++++++------
+ drivers/char/hw_random/geode-rng.c | 50 ++++++++++++++++++++++++++------------
+ drivers/crypto/ccp/ccp-dev.c | 5 +++-
+ drivers/crypto/ccp/ccp-dmaengine.c | 1 +
+ include/linux/ccp.h | 2 +-
+ 5 files changed, 75 insertions(+), 25 deletions(-)
+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 (930a42ded3fe vfio/spapr_tce: Set window when adding additional groups to container)
+$ 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 (8c71fff434e5 [media] v4l: vsp1: Adapt vsp1_du_setup_lif() interface to use a structure)
+$ git merge v4l-dvb-fixes/fixes
+Already up-to-date.
+Merging drm-intel-fixes/for-linux-next-fixes (b7048ea12fbb drm/i915: Do .init_clock_gating() earlier to avoid it clobbering watermarks)
+$ git merge drm-intel-fixes/for-linux-next-fixes
+Merge made by the 'recursive' strategy.
+ drivers/gpu/drm/i915/i915_drv.c | 7 ++-
+ drivers/gpu/drm/i915/i915_drv.h | 5 +-
+ drivers/gpu/drm/i915/i915_gem.c | 24 +++++++--
+ drivers/gpu/drm/i915/i915_gem_execbuffer.c | 52 +------------------
+ drivers/gpu/drm/i915/i915_irq.c | 83 ++++++++++++++----------------
+ drivers/gpu/drm/i915/intel_csr.c | 1 -
+ drivers/gpu/drm/i915/intel_display.c | 9 ++--
+ drivers/gpu/drm/i915/intel_hdmi.c | 24 +++++++--
+ drivers/gpu/drm/i915/intel_hotplug.c | 14 ++---
+ drivers/gpu/drm/i915/intel_pm.c | 5 +-
+ 10 files changed, 101 insertions(+), 123 deletions(-)
+Merging drm-misc-fixes/for-linux-next-fixes (3f81e1340706 drm: mxsfb: Implement drm_panel handling)
+$ git merge drm-misc-fixes/for-linux-next-fixes
+Already up-to-date.
+Merging kbuild/for-next (bdd825363ba8 Merge branches 'fixes' and 'kbuild' into for-next)
+$ git merge kbuild/for-next
+Auto-merging Makefile
+Merge made by the 'recursive' strategy.
+ Makefile | 6 +-
+ scripts/genksyms/parse.tab.c_shipped | 474 +++++++++++++++++------------------
+ scripts/genksyms/parse.y | 2 -
+ scripts/objdiff | 5 +-
+ 4 files changed, 241 insertions(+), 246 deletions(-)
+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 39a90cfc91dd] 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 (2bc6cdda1e32 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/boot/dts/r7s72100.dtsi | 11 +++
+ 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 +++-
+ 7 files changed, 95 insertions(+), 31 deletions(-)
+Merging arm-perf/for-next/perf (0c744ea4f77d Linux 4.10-rc2)
+$ git merge arm-perf/for-next/perf
+Already up-to-date.
+Merging arm-soc/for-next (d39492dd7b87 ARM: SoC: Document merges)
+$ git merge arm-soc/for-next
+Removing arch/arm/mach-omap2/gpmc-nand.c
+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
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/gemini.txt | 86 +++++++
+ .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 ++
+ arch/arm/Kconfig | 9 -
+ arch/arm/arm-soc-for-next-contents.txt | 30 +++
+ arch/arm/boot/dts/Makefile | 6 +
+ arch/arm/boot/dts/am335x-pcm-953.dtsi | 4 +-
+ arch/arm/boot/dts/am57xx-idk-common.dtsi | 14 +-
+ arch/arm/boot/dts/bcm5301x.dtsi | 4 +-
+ arch/arm/boot/dts/bcm953012k.dts | 5 +-
+ arch/arm/boot/dts/gemini-nas4220b.dts | 102 ++++++++
+ arch/arm/boot/dts/gemini-rut1xx.dts | 65 +++++
+ arch/arm/boot/dts/gemini-sq201.dts | 96 +++++++
+ arch/arm/boot/dts/gemini-wbd111.dts | 102 ++++++++
+ arch/arm/boot/dts/gemini-wbd222.dts | 102 ++++++++
+ arch/arm/boot/dts/gemini.dtsi | 108 ++++++++
+ arch/arm/boot/dts/ste-dbx5x0.dtsi | 19 ++
+ arch/arm/boot/dts/ste-href.dtsi | 9 -
+ arch/arm/boot/dts/ste-snowball.dts | 9 -
+ arch/arm/configs/omap2plus_defconfig | 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-omap2/Makefile | 3 -
+ arch/arm/mach-omap2/gpmc-nand.c | 154 ------------
+ arch/arm/mach-omap2/gpmc-onenand.c | 10 +-
+ arch/arm/mach-omap2/omap-headsmp.S | 3 +-
+ arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 45 +++-
+ arch/arm64/configs/defconfig | 1 +
+ drivers/memory/omap-gpmc.c | 4 +-
+ include/linux/omap-gpmc.h | 16 +-
+ 48 files changed, 874 insertions(+), 2094 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/gemini.txt
+ create mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt
+ create mode 100644 arch/arm/arm-soc-for-next-contents.txt
+ 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
+ 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
+ delete mode 100644 arch/arm/mach-omap2/gpmc-nand.c
+Merging amlogic/for-next (d58ee0087d37 Merge branch 'v4.12/defconfig' into tmp/aml-rebuild)
+$ git merge amlogic/for-next
+Auto-merging arch/arm64/configs/defconfig
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 1 -
+ .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 17 ++++++++++++++
+ .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 7 ++++++
+ 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 ++++++++++++++++++++++
+ .../boot/dts/amlogic/meson-gxl-s905d-p230.dts | 2 ++
+ .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 2 ++
+ arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 2 ++
+ arch/arm64/configs/defconfig | 2 ++
+ 14 files changed, 141 insertions(+), 8 deletions(-)
+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 (982b07d2b5f3 Merge tag 'at91-ab-4.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux 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 | 1 -
+ arch/arm/boot/dts/at91-sama5d2_xplained.dts | 1 +
+ arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
+ arch/arm/boot/dts/at91sam9x5ek.dtsi | 2 +-
+ arch/arm/boot/dts/sama5d2.dtsi | 7 +-
+ arch/arm/mach-at91/Makefile | 1 -
+ arch/arm/mach-at91/at91rm9200.c | 15 +-
+ arch/arm/mach-at91/at91sam9.c | 46 +---
+ arch/arm/mach-at91/pm.c | 18 +-
+ 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
+ 18 files changed, 271 insertions(+), 259 deletions(-)
+ 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
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +-
+ arch/arm/boot/dts/bcm2835-rpi.dtsi | 14 +++++++++
+ arch/arm/boot/dts/bcm283x.dtsi | 60 +++++++++++++++++++++++++++++++++++--
+ arch/arm/configs/bcm2835_defconfig | 5 ++--
+ arch/arm/configs/multi_v7_defconfig | 1 +
+ arch/arm64/configs/defconfig | 1 +
+ 6 files changed, 77 insertions(+), 6 deletions(-)
+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 (e614bd772486 Merge branch 'zte/drivers' 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 | 7 +
+ .../boot/dts/imx25-eukrea-mbimxsd25-baseboard.dts | 2 -
+ arch/arm/boot/dts/imx25-pdk.dts | 2 -
+ 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/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-icore-ofcap10.dts | 76 ++
+ arch/arm/boot/dts/imx6q-icore-ofcap12.dts | 76 ++
+ arch/arm/boot/dts/imx6q-icore.dts | 25 +
+ arch/arm/boot/dts/imx6qdl-icore.dtsi | 19 +
+ arch/arm/boot/dts/imx6qp.dtsi | 53 +-
+ arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 5 -
+ arch/arm/boot/dts/imx6sx.dtsi | 18 +-
+ arch/arm/boot/dts/imx6ul-14x14-evk.dts | 5 -
+ 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 | 12 -
+ 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 | 2 +
+ arch/arm/mach-imx/gpc.c | 217 ------
+ arch/arm/mach-imx/mmdc.c | 20 +-
+ arch/arm/mach-mxs/mach-mxs.c | 3 +-
+ arch/arm64/boot/dts/freescale/Makefile | 2 +
+ 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 | 82 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 4 +-
+ arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 4 +-
+ 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 ++++++++++++++++++
+ drivers/soc/Makefile | 1 +
+ drivers/soc/imx/Makefile | 1 +
+ drivers/soc/imx/gpc.c | 487 ++++++++++++
+ drivers/soc/zte/zx296718_pm_domains.c | 1 -
+ drivers/soc/zte/zx2967_pm_domains.c | 4 +-
+ 61 files changed, 3626 insertions(+), 1406 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/imx6q-icore-ofcap10.dts
+ create mode 100644 arch/arm/boot/dts/imx6q-icore-ofcap12.dts
+ create mode 100644 arch/arm/boot/dts/imx7d-sdb-sht11.dts
+ 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 (462826aeae71 Merge branch 'mvebu/dt64' into mvebu/for-next)
+$ git merge mvebu/for-next
+Auto-merging arch/arm64/configs/defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/mvebu-core-clock.txt | 7 +
+ .../bindings/clock/mvebu-gated-clock.txt | 11 +
+ .../devicetree/bindings/net/marvell,prestera.txt | 13 +-
+ arch/arm/boot/dts/Makefile | 2 +
+ 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-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 | 1 +
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 18 ++
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 4 +
+ arch/arm64/boot/dts/marvell/armada-8020.dtsi | 10 +
+ arch/arm64/boot/dts/marvell/armada-8040.dtsi | 9 +
+ .../boot/dts/marvell/armada-cp110-master.dtsi | 7 +
+ .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 7 +
+ arch/arm64/configs/defconfig | 2 +
+ 24 files changed, 715 insertions(+), 102 deletions(-)
+ create mode 100644 arch/arm/boot/dts/armada-385-linksys-shelby.dts
+ create mode 100644 arch/arm/boot/dts/armada-385-synology-ds116.dts
+Merging omap/for-next (5f603c805c4c Merge branch 'omap-for-v4.12/dt-droid4' into for-next)
+$ git merge omap/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/am3517.dtsi | 12 +
+ arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi | 194 ++++++++++++++
+ arch/arm/boot/dts/omap3-igep.dtsi | 52 ++++
+ arch/arm/boot/dts/omap4-droid4-xt894.dts | 354 ++++++++++++++++++++++++-
+ 4 files changed, 598 insertions(+), 14 deletions(-)
+ create mode 100644 arch/arm/boot/dts/motorola-cpcap-mapphone.dtsi
+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 (a844f941617c Merge tag 'qcom-arm64-for-4.11-2' into final-for-4.11)
+$ git merge qcom/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging renesas/next (28974e8727fd Merge branches 'arm64-dt-for-v4.12', 'drivers-for-v4.12', 'dt-bindings-for-v4.12' and 'dt-for-v4.12' into next)
+$ git merge renesas/next
+Recorded preimage for 'arch/arm/boot/dts/r7s72100.dtsi'
+Auto-merging arch/arm/boot/dts/r7s72100.dtsi
+CONFLICT (content): Merge conflict in arch/arm/boot/dts/r7s72100.dtsi
+Auto-merging arch/arm/boot/dts/Makefile
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'arch/arm/boot/dts/r7s72100.dtsi'.
+[master dd9a4131bc09] Merge remote-tracking branch 'renesas/next'
+$ git diff -M --stat --summary HEAD^..
+ Documentation/devicetree/bindings/arm/shmobile.txt | 4 +
+ arch/arm/boot/dts/Makefile | 38 +--
+ 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/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 ++++++++++++++++++++-
+ drivers/soc/renesas/renesas-soc.c | 16 ++
+ 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 +
+ 33 files changed, 517 insertions(+), 152 deletions(-)
+Merging rockchip/for-next (f62b8445b0a4 Merge branch 'v4.12-armsoc/dts64' into for-next)
+$ git merge rockchip/for-next
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ Documentation/devicetree/bindings/arm/rockchip.txt | 3 +
+ arch/arm/boot/dts/Makefile | 1 +
+ arch/arm/boot/dts/rk3036.dtsi | 6 +
+ 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 | 6 +
+ arch/arm64/boot/dts/rockchip/rk3368.dtsi | 88 +++-
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 142 ++++--
+ drivers/clk/rockchip/clk-rk3328.c | 9 +
+ drivers/clk/rockchip/clk-rk3368.c | 27 +-
+ drivers/clk/rockchip/clk-rk3399.c | 8 +-
+ include/dt-bindings/clock/rk3328-cru.h | 1 +
+ include/dt-bindings/clock/rk3368-cru.h | 19 +-
+ 17 files changed, 813 insertions(+), 98 deletions(-)
+ create mode 100644 arch/arm/boot/dts/rk3288-tinker.dts
+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 (5a69f622e037 Merge branch 'next/dt' into for-next)
+$ git merge samsung-krzk/for-next
+Merge made by the 'recursive' strategy.
+ arch/arm/boot/dts/exynos3250-rinato.dts | 2 +
+ arch/arm/boot/dts/exynos4.dtsi | 9 -----
+ 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 | 30 ++++++++++-----
+ arch/arm/boot/dts/s3c64xx.dtsi | 1 -
+ arch/arm/configs/exynos_defconfig | 5 ++-
+ .../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 ++++
+ 18 files changed, 141 insertions(+), 45 deletions(-)
+ create mode 100644 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi
+Merging tegra/for-next (7f632c598cf1 Merge branch for-4.12/arm64/dt 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 +++
+ drivers/soc/tegra/Kconfig | 13 +
+ drivers/soc/tegra/Makefile | 3 +-
+ drivers/soc/tegra/pmc-tegra186.c | 169 +++++++++++
+ 8 files changed, 668 insertions(+), 4 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra186-pmc.txt
+ create mode 100644 drivers/soc/tegra/pmc-tegra186.c
+Merging arm64/for-next/core (ffe7afd17135 arm64/kprobes: consistently handle MRS/MSR with XZR)
+$ git merge arm64/for-next/core
+Already up-to-date.
+Merging clk/clk-next (f8ba2d68e54f clk: rockchip: Make uartpll a child of the gpll on rk3036)
+$ git merge clk/clk-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/arm/marvell/cp110-system-controller0.txt | 6 +++---
+ drivers/clk/clk.c | 3 ++-
+ drivers/clk/rockchip/clk-rk3036.c | 9 ++++++++-
+ 3 files changed, 13 insertions(+), 5 deletions(-)
+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 (4495c08e8472 Linux 4.11-rc2)
+$ 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 (afba1896993a MIPS: Add 48-bit VA space (and 4-level page tables) for 4K pages.)
+$ git merge mips/mips-for-linux-next
+Auto-merging arch/mips/include/asm/pgtable-64.h
+Auto-merging arch/mips/include/asm/fpu.h
+Merge made by the 'recursive' strategy.
+ arch/mips/Kconfig | 16 ++++---
+ arch/mips/cavium-octeon/Kconfig | 9 ----
+ arch/mips/cavium-octeon/Platform | 4 --
+ arch/mips/cavium-octeon/setup.c | 12 +----
+ arch/mips/include/asm/cpufeature.h | 26 +++++++++++
+ arch/mips/include/asm/fpu.h | 1 +
+ 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/cpu-probe.c | 7 +++
+ 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/mm/init.c | 3 ++
+ arch/mips/mm/pgtable-64.c | 33 ++++++++++++--
+ arch/mips/mm/tlbex.c | 22 ++++++++++
+ 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/ralink/rt3883.c | 4 +-
+ 24 files changed, 275 insertions(+), 72 deletions(-)
+ create mode 100644 arch/mips/include/asm/cpufeature.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 (c470abd4fde4 Linux 4.10)
+$ git merge parisc-hd/for-next
+Already up-to-date.
+Merging powerpc/next (9f3768e02335 powerpc: Remove leftover cputime_to_nsecs call causing build error)
+$ git merge powerpc/next
+Already up-to-date.
+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 (d03bd0454b10 s390/timex: micro optimization for tod_to_ns)
+$ git merge s390/features
+Already up-to-date.
+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 (14e73e78ee98 tile: use __ro_after_init instead of tile-specific __write_once)
+$ git merge tile/master
+Already up-to-date.
+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 (ec59c4ad070d Merge branch 'xtensa-boot' into xtensa-for-next)
+$ git merge xtensa/xtensa-for-next
+Merge made by the 'recursive' strategy.
+Merging fscrypt/master (94840e3c802d fscrypt: eliminate ->prepare_context() operation)
+$ git merge fscrypt/master
+Recorded preimage for 'fs/crypto/keyinfo.c'
+Auto-merging fs/crypto/keyinfo.c
+CONFLICT (content): Merge conflict in fs/crypto/keyinfo.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'fs/crypto/keyinfo.c'.
+[master 4381be1b41ed] Merge remote-tracking branch 'fscrypt/master'
+$ git diff -M --stat --summary HEAD^..
+ fs/crypto/crypto.c | 10 +-------
+ fs/crypto/fname.c | 2 +-
+ fs/crypto/fscrypt_private.h | 4 ----
+ fs/crypto/keyinfo.c | 52 ++++++++----------------------------------
+ fs/crypto/policy.c | 7 ------
+ fs/ext4/super.c | 10 ++++----
+ include/linux/fscrypt_common.h | 1 -
+ 7 files changed, 15 insertions(+), 71 deletions(-)
+Merging befs/for-next (c1ae3cfa0e89 Linux 4.11-rc1)
+$ git merge befs/for-next
+Already up-to-date.
+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 (e162345e07e1 Merge branch 'for-next-next-v4.12-20170314' into for-next-20170314)
+$ git merge btrfs-kdave/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 2 +
+ fs/btrfs/backref.c | 2 +-
+ fs/btrfs/compression.c | 18 +--
+ fs/btrfs/ctree.h | 19 +--
+ 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/disk-io.c | 8 +-
+ fs/btrfs/disk-io.h | 4 +-
+ fs/btrfs/extent-tree.c | 54 +++++----
+ 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 | 281 +++++++++++++++++++++++++++++++------------
+ fs/btrfs/ioctl.c | 11 +-
+ fs/btrfs/ordered-data.c | 20 +--
+ fs/btrfs/ordered-data.h | 2 +-
+ fs/btrfs/qgroup.c | 268 +++++++++++++++++++++++++----------------
+ fs/btrfs/qgroup.h | 58 +++++++--
+ fs/btrfs/raid56.c | 19 ++-
+ fs/btrfs/relocation.c | 13 +-
+ fs/btrfs/scrub.c | 36 +++---
+ fs/btrfs/super.c | 3 +-
+ fs/btrfs/transaction.c | 41 ++++---
+ fs/btrfs/transaction.h | 4 +-
+ fs/btrfs/tree-log.c | 2 +-
+ fs/btrfs/volumes.c | 22 ++--
+ fs/btrfs/volumes.h | 2 +-
+ include/trace/events/btrfs.h | 187 +++++++++++++++++++++++++++-
+ include/uapi/linux/btrfs.h | 37 +-----
+ 34 files changed, 871 insertions(+), 417 deletions(-)
+Merging ceph/master (7cc5e38f2f0b libceph: osd_request_timeout option)
+$ 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 (6c71100db53e fanotify: simplify the code of fanotify_merge)
+$ git merge ext3/for_next
+Already up-to-date.
+Merging ext4/dev (14ae5f6a5dbe jbd2: don't leak memory if setting up journal fails)
+$ git merge ext4/dev
+Merge made by the 'recursive' strategy.
+ fs/ext4/inline.c | 5 ++---
+ fs/ext4/xattr.c | 31 ++++++++++++++-----------------
+ fs/jbd2/journal.c | 22 +++++++++++-----------
+ fs/jbd2/revoke.c | 1 +
+ 4 files changed, 28 insertions(+), 31 deletions(-)
+Merging f2fs/dev (d468595610a5 f2fs: fix stale ATOMIC_WRITTEN_PAGE private pointer)
+$ git merge f2fs/dev
+Auto-merging fs/f2fs/file.c
+Auto-merging fs/f2fs/f2fs.h
+Auto-merging fs/f2fs/data.c
+Merge made by the 'recursive' strategy.
+ fs/f2fs/checkpoint.c | 3 +-
+ fs/f2fs/data.c | 2 +-
+ fs/f2fs/debug.c | 1 +
+ fs/f2fs/dir.c | 2 +-
+ fs/f2fs/f2fs.h | 3 +
+ fs/f2fs/file.c | 5 +-
+ fs/f2fs/inode.c | 18 +++---
+ fs/f2fs/namei.c | 4 +-
+ fs/f2fs/node.c | 163 ++++++++++++++++++++++++---------------------------
+ fs/f2fs/segment.c | 37 +++++++++---
+ fs/f2fs/super.c | 10 ++--
+ fs/f2fs/xattr.c | 4 +-
+ 12 files changed, 138 insertions(+), 114 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 (972b044eeca5 gfs2: Don't pack struct lm_lockname)
+$ git merge gfs2/for-next
+Merge made by the 'recursive' strategy.
+ fs/gfs2/glock.c | 32 +++++++++++++-------------------
+ fs/gfs2/incore.h | 8 ++++++--
+ fs/gfs2/super.c | 3 ++-
+ 3 files changed, 21 insertions(+), 22 deletions(-)
+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 (4495c08e8472 Linux 4.11-rc2)
+$ git merge nfs/linux-next
+Already up-to-date.
+Merging nfsd/nfsd-next (4544f5d6f165 uapi: fix linux/nfsd/cld.h userspace compilation errors)
+$ git merge nfsd/nfsd-next
+Merge made by the 'recursive' strategy.
+ fs/nfsd/nfsproc.c | 1 +
+ include/uapi/linux/nfsd/cld.h | 14 ++++++++------
+ net/sunrpc/svcsock.c | 1 +
+ 3 files changed, 10 insertions(+), 6 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 (8d242e932fb7 xfs: remove XFS_ALLOCTYPE_ANY_AG and XFS_ALLOCTYPE_START_AG)
+$ git merge xfs/for-next
+Already up-to-date.
+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 '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
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+[master 4da179f35aac] 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 7c07f47be86d] Merge remote-tracking branch 'vfs/for-next'
+ Date: Mon Mar 20 10:30:28 2017 +1100
+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 (d9c23523ed98 printk: drop call_console_drivers() unused param)
+$ git merge printk/for-next
+Already up-to-date.
+Merging pci/next (d0ec4e67c924 Merge branch 'pci/switchtec' into next)
+$ git merge pci/next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/testing/sysfs-class-switchtec | 96 ++
+ Documentation/ioctl/ioctl-number.txt | 1 +
+ Documentation/switchtec.txt | 80 ++
+ MAINTAINERS | 11 +
+ drivers/pci/Kconfig | 1 +
+ drivers/pci/Makefile | 1 +
+ drivers/pci/switch/Kconfig | 13 +
+ drivers/pci/switch/Makefile | 1 +
+ drivers/pci/switch/switchtec.c | 1600 +++++++++++++++++++++++
+ include/uapi/linux/switchtec_ioctl.h | 132 ++
+ 10 files changed, 1936 insertions(+)
+ create mode 100644 Documentation/ABI/testing/sysfs-class-switchtec
+ create mode 100644 Documentation/switchtec.txt
+ 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 (30800d9977ec pstore: simplify write_user_compat())
+$ 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 | 112 ++++++++-------
+ 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, 571 insertions(+), 445 deletions(-)
+Merging hid/for-next (93afcfed4ab5 Merge branches 'for-4.11/upstream-fixes', 'for-4.12/asus', 'for-4.12/i2c-hid', 'for-4.12/innomedia', 'for-4.12/multitouch', 'for-4.12/nti', 'for-4.12/sony', 'for-4.12/upstream' and 'for-4.12/wacom' 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 ++
+ .../devicetree/bindings/input/hid-over-i2c.txt | 16 ++++++
+ drivers/hid/Kconfig | 16 ++++--
+ drivers/hid/Makefile | 1 +
+ drivers/hid/hid-asus.c | 38 ++++++++++++++
+ drivers/hid/hid-chicony.c | 1 +
+ drivers/hid/hid-core.c | 4 ++
+ drivers/hid/hid-ids.h | 9 ++++
+ drivers/hid/hid-input.c | 1 +
+ drivers/hid/hid-multitouch.c | 18 +++++--
+ drivers/hid/hid-nti.c | 59 ++++++++++++++++++++++
+ drivers/hid/hid-sony.c | 47 +++++++----------
+ drivers/hid/i2c-hid/i2c-hid.c | 42 ++++++++++++++-
+ drivers/hid/usbhid/hid-core.c | 34 ++++++++-----
+ drivers/hid/usbhid/hid-quirks.c | 12 ++---
+ drivers/hid/wacom.h | 5 ++
+ drivers/hid/wacom_sys.c | 53 ++++++++++++++++++-
+ drivers/hid/wacom_wac.c | 47 ++++++++++++++++-
+ drivers/hid/wacom_wac.h | 9 ++++
+ include/linux/i2c/i2c-hid.h | 6 +++
+ include/uapi/linux/input-event-codes.h | 1 +
+ 21 files changed, 360 insertions(+), 62 deletions(-)
+ create mode 100644 drivers/hid/hid-nti.c
+Merging i2c/i2c/for-next (4495c08e8472 Linux 4.11-rc2)
+$ git merge i2c/i2c/for-next
+Already up-to-date.
+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 (ffab6ca0bee6 hwmon: (dell-smm) Add Dell XPS 15 9560 into DMI list)
+$ git merge hwmon-staging/hwmon-next
+Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt
+Merge made by the 'recursive' strategy.
+ .../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 | 24 ++++-
+ 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/it87.c | 31 +++++--
+ drivers/hwmon/lm63.c | 23 +++++
+ drivers/hwmon/lm75.c | 98 +++++++++++++++++++-
+ drivers/hwmon/lm85.c | 56 +++++++++++-
+ drivers/hwmon/lm90.c | 100 ++++++++++++++++++++-
+ drivers/hwmon/lm95245.c | 8 ++
+ drivers/hwmon/max31790.c | 2 +-
+ drivers/hwmon/max6697.c | 52 ++++++++++-
+ 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 | 3 +-
+ 27 files changed, 660 insertions(+), 36 deletions(-)
+Merging jc_docs/docs-next (3f816bac24f0 Documentation: device-mapper: cache.txt: Fix typos)
+$ git merge jc_docs/docs-next
+Removing Documentation/cpu-freq/user-guide.txt
+Removing Documentation/cpu-freq/governors.txt
+Removing Documentation/cpu-freq/boost.txt
+Merge made by the 'recursive' strategy.
+ Documentation/ABI/stable/vdso | 3 +-
+ Documentation/ABI/testing/sysfs-bus-pci | 2 +-
+ 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 | 2 +-
+ 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/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/phy.txt | 2 +-
+ Documentation/process/changes.rst | 7 +-
+ Documentation/sphinx/kfigure.py | 551 ++++++++++++++++
+ Documentation/sync_file.txt | 2 +-
+ Documentation/vfio-mediated-device.txt | 2 +-
+ lib/Kconfig.debug | 9 +-
+ 44 files changed, 1515 insertions(+), 768 deletions(-)
+ create mode 100644 Documentation/admin-guide/pm/cpufreq.rst
+ create mode 100644 Documentation/admin-guide/pm/index.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/sphinx/kfigure.py
+Merging v4l-dvb/master (700ea5e0e0dd Merge tag 'v4.11-rc1' into patchwork)
+$ git merge v4l-dvb/master
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/media/mediatek-jpeg-decoder.txt | 37 +
+ .../media/uapi/v4l/vidioc-g-dv-timings.rst | 16 +-
+ Documentation/media/v4l-drivers/vivid.rst | 8 +
+ MAINTAINERS | 7 +
+ drivers/media/common/tveeprom.c | 4 +-
+ drivers/media/dvb-frontends/si2168.c | 4 +
+ drivers/media/dvb-frontends/si2168_priv.h | 2 +
+ drivers/media/i2c/tc358743.c | 46 +-
+ 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/saa7134/saa7134-cards.c | 2 +-
+ drivers/media/pci/saa7164/saa7164-cards.c | 4 +-
+ drivers/media/platform/Kconfig | 15 +
+ 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/imx-vdoa.c | 2 +-
+ drivers/media/platform/exynos-gsc/gsc-core.c | 29 +-
+ 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/sti/bdisp/bdisp-v4l2.c | 2 +-
+ 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/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 | 139 ++-
+ drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 22 +-
+ drivers/media/usb/em28xx/em28xx-cards.c | 3 +-
+ drivers/media/usb/pvrusb2/pvrusb2-eeprom.c | 13 +-
+ drivers/staging/media/bcm2048/radio-bcm2048.c | 12 +-
+ drivers/staging/media/omap4iss/iss_video.c | 41 +-
+ include/media/tveeprom.h | 2 +-
+ include/uapi/linux/cec.h | 2 +-
+ 49 files changed, 3311 insertions(+), 238 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
+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 (c1ae3cfa0e89 Linux 4.11-rc1)
+$ git merge fbdev/fbdev-for-next
+Already up-to-date.
+Merging pm/linux-next (e6c0da43db98 Merge branches 'intel_pstate-fixes' and 'pm-cpufreq-fixes' into linux-next)
+$ git merge pm/linux-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../bindings/power/rockchip-io-domain.txt | 1 +
+ MAINTAINERS | 1 +
+ drivers/cpufreq/intel_pstate.c | 153 ++++++---------------
+ drivers/cpufreq/mt8173-cpufreq.c | 23 +++-
+ drivers/cpufreq/qoriq-cpufreq.c | 24 +++-
+ drivers/power/avs/rockchip-io-domain.c | 41 ++++++
+ kernel/sched/cpufreq_schedutil.c | 29 ++--
+ 7 files changed, 137 insertions(+), 135 deletions(-)
+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 (6fefe19f5836 Merge branches 'thermal-core', 'thermal-soc', 'thermal-intel' and 'ida-conversion' into next)
+$ git merge thermal/next
+Already up-to-date.
+Merging thermal-soc/next (4f47aff5201c Merge branch 'work-linus' into work-next)
+$ git merge thermal-soc/next
+Merge made by the 'recursive' strategy.
+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 (fe723dff0fa4 liquidio: fix wrong information about link modes reported to ethtool)
+$ git merge net-next/master
+Recorded preimage for 'drivers/net/hyperv/netvsc.c'
+Auto-merging net/mpls/af_mpls.c
+Auto-merging net/core/sock.c
+Auto-merging include/net/tcp.h
+Auto-merging include/linux/hyperv.h
+Auto-merging drivers/net/hyperv/netvsc.c
+CONFLICT (content): Merge conflict in drivers/net/hyperv/netvsc.c
+Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.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
+Recorded resolution for 'drivers/net/hyperv/netvsc.c'.
+[master e9f623687222] Merge remote-tracking branch 'net-next/master'
+$ 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 | 64 +-
+ Documentation/networking/ip-sysctl.txt | 5 -
+ 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/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 | 215 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet.h | 10 +-
+ drivers/net/ethernet/broadcom/genet/bcmgenet_wol.c | 15 +-
+ drivers/net/ethernet/broadcom/genet/bcmmii.c | 62 +-
+ drivers/net/ethernet/broadcom/tg3.c | 7 +
+ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 14 +-
+ drivers/net/ethernet/cavium/liquidio/lio_main.c | 83 +-
+ drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 37 +-
+ .../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/request_manager.c | 13 +-
+ .../ethernet/cavium/liquidio/response_manager.c | 26 +-
+ 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/intel/fm10k/fm10k_netdev.c | 4 +-
+ drivers/net/ethernet/intel/i40e/i40e.h | 16 +-
+ 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 | 15 +-
+ drivers/net/ethernet/intel/i40e/i40e_main.c | 122 +-
+ drivers/net/ethernet/intel/i40e/i40e_nvm.c | 12 +-
+ drivers/net/ethernet/intel/i40e/i40e_txrx.c | 51 +-
+ 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_main.c | 89 +-
+ .../net/ethernet/intel/i40evf/i40evf_virtchnl.c | 13 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 168 +-
+ drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 4 +-
+ 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 | 757 ++---
+ drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 83 +-
+ 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 | 1243 ++++++--
+ 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/common.h | 56 +-
+ .../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 | 74 +-
+ drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 302 +-
+ 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 +-
+ .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 11 +-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 521 +++-
+ drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 4 +
+ .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 119 +-
+ 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 | 98 +-
+ 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/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/ax88179_178a.c | 14 +-
+ drivers/net/usb/catc.c | 31 +-
+ drivers/net/usb/r8152.c | 64 +-
+ drivers/net/usb/rtl8150.c | 35 +-
+ 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 +-
+ 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/stmmac.h | 36 +
+ include/net/dsa.h | 9 +
+ include/net/fib_rules.h | 1 +
+ include/net/ip_fib.h | 24 +
+ include/net/mpls_iptunnel.h | 2 +
+ include/net/netns/ipv4.h | 1 -
+ include/net/netns/mpls.h | 3 +
+ include/net/pkt_sched.h | 2 +-
+ 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/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/atm/common.c | 22 +-
+ 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_trie.c | 108 +-
+ net/ipv4/proc.c | 1 -
+ net/ipv4/sysctl_net_ipv4.c | 7 -
+ 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/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/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 +
+ 348 files changed, 25741 insertions(+), 8502 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 ipsec-next/master (62a9fa01add8 Merge branch 'bcmgenet-add-support-for-GENETv5')
+$ git merge ipsec-next/master
+Already up-to-date.
+Merging netfilter-next/master (b54ab92b84b6 netfilter: refcounter conversions)
+$ git merge netfilter-next/master
+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/nf_tables_api.c
+Auto-merging net/netfilter/nf_conntrack_core.c
+Auto-merging net/bridge/br_netfilter_hooks.c
+Auto-merging include/net/netfilter/nf_tables.h
+Merge made by the 'recursive' strategy.
+ Documentation/networking/ipvs-sysctl.txt | 68 +++++++++--
+ include/net/ip_vs.h | 16 +--
+ 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/uapi/linux/netfilter/nf_tables.h | 26 +++-
+ net/bridge/br_netfilter_hooks.c | 3 -
+ net/bridge/netfilter/ebt_log.c | 34 +++---
+ net/bridge/netfilter/nft_reject_bridge.c | 6 +-
+ 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/ipv6/netfilter/nft_fib_ipv6.c | 2 +-
+ 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 | 16 +--
+ 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 +-
+ 54 files changed, 616 insertions(+), 297 deletions(-)
+Merging ipvs-next/master (3c679cba588a ipvs: Document sysctl pmtu_disc)
+$ git merge ipvs-next/master
+Already up-to-date.
+Merging wireless-drivers-next/master (3e062eb21df8 rtlwifi: fix spelling mistake: "conuntry" -> "country")
+$ git merge wireless-drivers-next/master
+Merge made by the 'recursive' strategy.
+ drivers/bcma/driver_gpio.c | 3 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800.h | 27 +--
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 69 +++++-
+ drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 27 ++-
+ drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 2 +-
+ drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 18 +-
+ drivers/net/wireless/ralink/rt2x00/rt2x00.h | 4 +-
+ 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 +-
+ 12 files changed, 270 insertions(+), 141 deletions(-)
+Merging bluetooth/master (3c66d1c7ed41 Merge branch 'mlxsw-cosmetics')
+$ git merge bluetooth/master
+Already up-to-date.
+Merging mac80211-next/master (335d534938d3 nl80211: Use signed function for a signed variable)
+$ 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
+Merge made by the 'recursive' strategy.
+ 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 | 79 +++++++--
+ 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 | 7 +-
+ include/net/cfg80211.h | 13 ++
+ include/net/mac80211.h | 10 +-
+ include/uapi/linux/nl80211.h | 14 +-
+ net/mac80211/agg-rx.c | 12 +-
+ net/mac80211/agg-tx.c | 12 +-
+ net/mac80211/cfg.c | 46 ++++-
+ 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 | 58 ++++++-
+ net/wireless/core.h | 25 +++
+ net/wireless/ibss.c | 1 +
+ net/wireless/mesh.c | 1 +
+ net/wireless/mlme.c | 50 +++++-
+ net/wireless/nl80211.c | 192 +++++++++++++++++++--
+ net/wireless/rdev-ops.h | 12 ++
+ net/wireless/reg.c | 148 ++++++++++++++++
+ net/wireless/reg.h | 36 ++++
+ net/wireless/trace.h | 22 +++
+ net/wireless/util.c | 70 ++++----
+ 61 files changed, 1014 insertions(+), 156 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 (44dd182861f9 mtd: nand: gpio: make nCE GPIO optional)
+$ git merge nand/nand/next
+Merge made by the 'recursive' strategy.
+ arch/cris/arch-v32/drivers/Kconfig | 1 -
+ drivers/memory/Kconfig | 2 +-
+ drivers/mtd/nand/Kconfig | 6 +-
+ drivers/mtd/nand/Makefile | 9 +-
+ drivers/mtd/nand/gpio.c | 18 +-
+ drivers/mtd/nand/nand_amd.c | 51 +++
+ drivers/mtd/nand/nand_base.c | 408 +++++++++---------------
+ drivers/mtd/nand/nand_hynix.c | 629 +++++++++++++++++++++++++++++++++++++
+ 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/sunxi_nand.c | 20 +-
+ drivers/mtd/nand/tango_nand.c | 8 +-
+ include/linux/mtd/nand.h | 88 ++++--
+ 17 files changed, 1238 insertions(+), 322 deletions(-)
+ 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 (ca1fa1a8a6da mtd: spi-nor: Add support for ESMT F25L32QA and F25L64QA)
+$ git merge spi-nor/next
+Auto-merging drivers/mtd/spi-nor/spi-nor.c
+Merge made by the 'recursive' strategy.
+ drivers/mtd/spi-nor/hisi-sfc.c | 5 ++++-
+ drivers/mtd/spi-nor/intel-spi.c | 4 ++--
+ drivers/mtd/spi-nor/spi-nor.c | 2 ++
+ 3 files changed, 8 insertions(+), 3 deletions(-)
+Merging crypto/master (28845b079b96 MAINTAINERS: Add maintianer entry for crypto/s5p-sss)
+$ git merge crypto/master
+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 +
+ crypto/algapi.c | 4 +-
+ crypto/cbc.c | 15 +-
+ crypto/ctr.c | 23 +-
+ crypto/dh.c | 3 +-
+ crypto/ecdh.c | 3 +-
+ crypto/gf128mul.c | 86 +-
+ crypto/testmgr.c | 71 +-
+ 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/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/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 +-
+ include/crypto/gf128mul.h | 32 +-
+ include/crypto/kpp.h | 6 +-
+ include/dt-bindings/clock/gxbb-clkc.h | 3 +-
+ 45 files changed, 4747 insertions(+), 819 deletions(-)
+ 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
+Merging drm/drm-next (b7d6c8db498c drm/nouveau/secboot: fix NULL pointer dereference)
+$ git merge drm/drm-next
+Recorded preimage for 'drivers/gpu/drm/i915/i915_gem.c'
+Recorded preimage for 'drivers/gpu/drm/i915/i915_irq.c'
+Recorded preimage for 'drivers/gpu/drm/i915/intel_csr.c'
+Recorded preimage for 'drivers/gpu/drm/i915/intel_pm.c'
+Auto-merging drivers/gpu/drm/tilcdc/tilcdc_crtc.c
+Auto-merging drivers/gpu/drm/mxsfb/mxsfb_drv.c
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/intel_sprite.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_hotplug.c
+Auto-merging drivers/gpu/drm/i915/intel_hdmi.c
+Auto-merging drivers/gpu/drm/i915/intel_fbdev.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/intel_csr.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_csr.c
+Auto-merging drivers/gpu/drm/i915/i915_vma.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_object.h
+Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_evict.c
+Auto-merging drivers/gpu/drm/i915/i915_gem.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_gem.c
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.c
+Auto-merging drivers/gpu/drm/i915/gvt/cmd_parser.c
+Removing drivers/gpu/drm/drm_platform.c
+Auto-merging drivers/gpu/drm/drm_file.c
+Auto-merging drivers/gpu/drm/drm_edid.c
+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 drivers/gpu/drm/arm/malidp_crtc.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
+Recorded resolution for 'drivers/gpu/drm/i915/i915_gem.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/i915_irq.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/intel_csr.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/intel_pm.c'.
+[master 39f819c4f343] Merge remote-tracking branch 'drm/drm-next'
+$ git diff -M --stat --summary HEAD^..
+ .../bindings/display/bridge/lvds-transmitter.txt | 64 +
+ .../bridge/megachips-stdpxxxx-ge-b850v3-fw.txt | 94 +
+ .../display/rockchip/dw_mipi_dsi_rockchip.txt | 7 +-
+ .../devicetree/bindings/vendor-prefixes.txt | 1 +
+ Documentation/gpu/drm-internals.rst | 7 +-
+ Documentation/gpu/drm-mm.rst | 17 +-
+ 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.c | 2 +
+ drivers/gpu/drm/Kconfig | 9 +
+ drivers/gpu/drm/Makefile | 4 +-
+ drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 11 +-
+ drivers/gpu/drm/arc/arcpgu_drv.c | 1 -
+ drivers/gpu/drm/arm/hdlcd_crtc.c | 20 +
+ drivers/gpu/drm/arm/hdlcd_drv.c | 21 -
+ drivers/gpu/drm/arm/malidp_crtc.c | 21 +
+ drivers/gpu/drm/arm/malidp_drv.c | 24 +-
+ 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 | 23 +-
+ 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 | 60 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 104 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 361 ++-
+ 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 | 5 +-
+ 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 | 467 +--
+ drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.h | 0
+ 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 | 34 +-
+ 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} | 8 +-
+ drivers/gpu/drm/drm_framebuffer.c | 45 +-
+ drivers/gpu/drm/drm_gem.c | 44 +-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 10 +-
+ drivers/gpu/drm/drm_internal.h | 2 +-
+ drivers/gpu/drm/drm_ioc32.c | 3 +-
+ drivers/gpu/drm/drm_irq.c | 81 +-
+ 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_simple_kms_helper.c | 4 +-
+ 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 | 26 -
+ 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/i915/Kconfig | 1 +
+ drivers/gpu/drm/i915/Kconfig.debug | 29 +
+ drivers/gpu/drm/i915/Makefile | 5 +
+ drivers/gpu/drm/i915/gvt/cmd_parser.c | 36 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 437 +--
+ drivers/gpu/drm/i915/i915_drv.c | 103 +-
+ drivers/gpu/drm/i915/i915_drv.h | 229 +-
+ drivers/gpu/drm/i915/i915_gem.c | 414 ++-
+ drivers/gpu/drm/i915/i915_gem.h | 9 +
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 4 +-
+ 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 | 163 +-
+ 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_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 | 91 +-
+ 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_gpu_error.c | 321 ++-
+ drivers/gpu/drm/i915/i915_guc_submission.c | 37 +-
+ drivers/gpu/drm/i915/i915_irq.c | 243 +-
+ drivers/gpu/drm/i915/i915_params.c | 6 +-
+ drivers/gpu/drm/i915/i915_params.h | 81 +-
+ drivers/gpu/drm/i915/i915_pci.c | 32 +-
+ drivers/gpu/drm/i915/i915_perf.c | 2 +-
+ drivers/gpu/drm/i915/i915_reg.h | 102 +-
+ drivers/gpu/drm/i915/i915_selftest.h | 106 +
+ drivers/gpu/drm/i915/i915_sw_fence.c | 8 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 35 +-
+ drivers/gpu/drm/i915/i915_trace.h | 472 ++-
+ drivers/gpu/drm/i915/i915_utils.h | 11 +
+ drivers/gpu/drm/i915/i915_vgpu.c | 9 +-
+ 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_breadcrumbs.c | 528 ++--
+ 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 | 9 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 449 +--
+ drivers/gpu/drm/i915/intel_device_info.c | 8 +-
+ drivers/gpu/drm/i915/intel_display.c | 3027 +++++---------------
+ 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 | 199 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 562 +++-
+ drivers/gpu/drm/i915/intel_dsi.h | 5 +
+ drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 89 +-
+ drivers/gpu/drm/i915/intel_dsi_pll.c | 135 +-
+ drivers/gpu/drm/i915/intel_dvo.c | 1 +
+ drivers/gpu/drm/i915/intel_engine_cs.c | 686 ++++-
+ drivers/gpu/drm/i915/intel_fbc.c | 11 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 71 +-
+ 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 | 23 +-
+ drivers/gpu/drm/i915/intel_hangcheck.c | 4 +
+ drivers/gpu/drm/i915/intel_hdmi.c | 17 +-
+ drivers/gpu/drm/i915/intel_hotplug.c | 17 +-
+ drivers/gpu/drm/i915/intel_huc.c | 15 +-
+ drivers/gpu/drm/i915/intel_i2c.c | 4 +-
+ drivers/gpu/drm/i915/intel_lrc.c | 880 ++----
+ drivers/gpu/drm/i915/intel_lrc.h | 3 -
+ 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_overlay.c | 79 +-
+ drivers/gpu/drm/i915/intel_panel.c | 4 +-
+ drivers/gpu/drm/i915/intel_pipe_crc.c | 70 +-
+ drivers/gpu/drm/i915/intel_pm.c | 906 +++---
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 1147 ++------
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 174 +-
+ 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 | 17 +-
+ drivers/gpu/drm/i915/intel_tv.c | 1 +
+ drivers/gpu/drm/i915/intel_uncore.c | 166 +-
+ 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 | 459 +++
+ drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 303 ++
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 260 ++
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1556 ++++++++++
+ 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 | 537 ++++
+ 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 | 104 +-
+ drivers/gpu/drm/imx/imx-drm.h | 13 -
+ drivers/gpu/drm/imx/ipuv3-crtc.c | 58 +-
+ 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 | 21 -
+ 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 | 4 +-
+ 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 | 4 +-
+ 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_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 | 820 +++---
+ 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/radeon_fb.c | 11 +-
+ 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 | 20 -
+ 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 | 224 +-
+ drivers/gpu/drm/sti/sti_drv.c | 6 +-
+ drivers/gpu/drm/sun4i/sun4i_crtc.c | 24 +
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 28 -
+ 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 | 14 -
+ drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 2 +-
+ drivers/gpu/drm/ttm/ttm_bo.c | 2 +-
+ drivers/gpu/drm/udl/udl_fb.c | 5 +-
+ 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 | 19 +-
+ 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 | 23 +-
+ drivers/gpu/drm/vc4/vc4_hvs.c | 12 +-
+ drivers/gpu/drm/vc4/vc4_irq.c | 3 +-
+ drivers/gpu/drm/vc4/vc4_plane.c | 12 +-
+ 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/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/vmwgfx_fence.c | 6 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 3 +-
+ drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 4 +-
+ drivers/gpu/drm/zte/zx_drm_drv.c | 3 -
+ drivers/gpu/drm/zte/zx_vou.c | 61 +-
+ drivers/gpu/drm/zte/zx_vou.h | 3 -
+ 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 | 75 +-
+ include/drm/drm_crtc.h | 61 +-
+ include/drm/drm_dp_helper.h | 66 +
+ include/drm/drm_drv.h | 17 +-
+ include/drm/drm_edid.h | 7 +-
+ include/drm/drm_fb_helper.h | 16 +-
+ include/drm/drm_file.h | 172 ++
+ include/drm/drm_framebuffer.h | 49 +-
+ include/drm/drm_gem.h | 84 +-
+ 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_vma_manager.h | 1 -
+ include/drm/i915_pciids.h | 3 +-
+ include/linux/of_platform.h | 11 +
+ include/linux/reservation.h | 20 +
+ include/uapi/drm/drm_mode.h | 4 +
+ include/uapi/drm/i915_drm.h | 65 +-
+ scripts/coccinelle/api/drm-get-put.cocci | 92 +
+ tools/testing/selftests/drivers/gpu/i915.sh | 1 +
+ 458 files changed, 29790 insertions(+), 14218 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
+ 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 (88%)
+ rename drivers/gpu/drm/bridge/{ => synopsys}/dw-hdmi.h (100%)
+ rename drivers/gpu/drm/{drm_fops.c => drm_file.c} (99%)
+ delete mode 100644 drivers/gpu/drm/drm_platform.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
+ 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 include/drm/drm_file.h
+ create mode 100644 include/drm/drm_pci.h
+ create mode 100644 include/drm/drm_prime.h
+ create mode 100644 scripts/coccinelle/api/drm-get-put.cocci
+$ git am -3 ../patches/0001-drm-i915-for-up-for-bad-merge-resolution.patch
+Applying: drm/i915: for up for bad merge resolution
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/gpu/drm/i915/i915_irq.c
+M drivers/gpu/drm/i915/intel_pm.c
+$ git add -A .
+$ git commit -v -a --amend
+[master adeec71e7b8a] Merge remote-tracking branch 'drm/drm-next'
+ Date: Mon Mar 20 11:22:55 2017 +1100
+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 (be062fa42738 drm/i915: Initialise i915_gem_object_create_from_data() directly)
+$ git merge drm-intel/for-linux-next
+Recorded preimage for 'drivers/gpu/drm/i915/i915_irq.c'
+Recorded preimage for 'drivers/gpu/drm/i915/intel_uncore.c'
+Auto-merging kernel/locking/lockdep.c
+Auto-merging drivers/i2c/busses/i2c-designware-platdrv.c
+Auto-merging drivers/i2c/busses/i2c-designware-core.h
+Auto-merging drivers/gpu/drm/i915/intel_uncore.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_uncore.c
+Auto-merging drivers/gpu/drm/i915/intel_sprite.c
+Auto-merging drivers/gpu/drm/i915/intel_pm.c
+Auto-merging drivers/gpu/drm/i915/intel_dsi_vbt.c
+Auto-merging drivers/gpu/drm/i915/intel_display.c
+Auto-merging drivers/gpu/drm/i915/i915_irq.c
+CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/i915_irq.c
+Auto-merging drivers/gpu/drm/i915/i915_gem_object.h
+Auto-merging drivers/gpu/drm/i915/i915_drv.h
+Auto-merging drivers/gpu/drm/i915/gvt/scheduler.c
+Auto-merging drivers/gpu/drm/i915/gvt/gvt.h
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/gpu/drm/i915/i915_irq.c'.
+Recorded resolution for 'drivers/gpu/drm/i915/intel_uncore.c'.
+[master d4912feb010a] Merge remote-tracking branch 'drm-intel/for-linux-next'
+$ git diff -M --stat --summary HEAD^..
+ 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/Makefile | 2 +-
+ drivers/gpu/drm/i915/gvt/gvt.h | 2 +-
+ drivers/gpu/drm/i915/gvt/scheduler.c | 47 +-
+ drivers/gpu/drm/i915/i915_cmd_parser.c | 25 +-
+ drivers/gpu/drm/i915/i915_debugfs.c | 278 ++++++----
+ drivers/gpu/drm/i915/i915_drv.c | 42 +-
+ drivers/gpu/drm/i915/i915_drv.h | 81 ++-
+ drivers/gpu/drm/i915/i915_gem.c | 260 +++++++--
+ drivers/gpu/drm/i915/i915_gem_batch_pool.c | 37 +-
+ drivers/gpu/drm/i915/i915_gem_context.c | 3 +-
+ drivers/gpu/drm/i915/i915_gem_context.h | 3 -
+ drivers/gpu/drm/i915/i915_gem_fence_reg.c | 11 +-
+ drivers/gpu/drm/i915/i915_gem_object.h | 6 -
+ drivers/gpu/drm/i915/i915_gem_request.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_request.h | 5 +-
+ drivers/gpu/drm/i915/i915_gem_shrinker.c | 2 +-
+ drivers/gpu/drm/i915/i915_gem_userptr.c | 75 +--
+ drivers/gpu/drm/i915/i915_guc_submission.c | 257 +++++++--
+ drivers/gpu/drm/i915/i915_irq.c | 154 +++---
+ drivers/gpu/drm/i915/i915_params.c | 10 +
+ drivers/gpu/drm/i915/i915_params.h | 2 +
+ drivers/gpu/drm/i915/i915_reg.h | 5 +-
+ drivers/gpu/drm/i915/i915_sysfs.c | 28 +-
+ drivers/gpu/drm/i915/i915_trace.h | 8 +-
+ drivers/gpu/drm/i915/i915_utils.h | 2 +
+ drivers/gpu/drm/i915/i915_vgpu.c | 8 +-
+ drivers/gpu/drm/i915/intel_bios.c | 46 +-
+ drivers/gpu/drm/i915/intel_breadcrumbs.c | 101 ++--
+ drivers/gpu/drm/i915/intel_cdclk.c | 6 +-
+ drivers/gpu/drm/i915/intel_color.c | 4 +-
+ drivers/gpu/drm/i915/intel_csr.c | 5 +-
+ drivers/gpu/drm/i915/intel_ddi.c | 70 +--
+ drivers/gpu/drm/i915/intel_device_info.c | 9 +-
+ drivers/gpu/drm/i915/intel_display.c | 611 +++++++++++----------
+ drivers/gpu/drm/i915/intel_drv.h | 29 +-
+ drivers/gpu/drm/i915/intel_dsi.c | 76 +--
+ drivers/gpu/drm/i915/intel_dsi.h | 14 +-
+ .../{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} | 46 +-
+ drivers/gpu/drm/i915/intel_engine_cs.c | 17 +-
+ drivers/gpu/drm/i915/intel_fbc.c | 2 +-
+ drivers/gpu/drm/i915/intel_fbdev.c | 4 +-
+ drivers/gpu/drm/i915/intel_guc_loader.c | 447 ++-------------
+ drivers/gpu/drm/i915/intel_hotplug.c | 28 +-
+ drivers/gpu/drm/i915/intel_huc.c | 113 ++--
+ drivers/gpu/drm/i915/intel_lrc.c | 36 +-
+ drivers/gpu/drm/i915/intel_lrc.h | 1 -
+ drivers/gpu/drm/i915/intel_opregion.c | 26 +-
+ drivers/gpu/drm/i915/intel_overlay.c | 8 +-
+ drivers/gpu/drm/i915/intel_pm.c | 128 ++++-
+ drivers/gpu/drm/i915/intel_ringbuffer.c | 16 +-
+ drivers/gpu/drm/i915/intel_ringbuffer.h | 11 +
+ drivers/gpu/drm/i915/intel_sprite.c | 285 ++++++----
+ drivers/gpu/drm/i915/intel_uc.c | 287 ++++++++++
+ drivers/gpu/drm/i915/intel_uc.h | 25 +-
+ drivers/gpu/drm/i915/intel_uncore.c | 129 +++--
+ drivers/gpu/drm/i915/selftests/i915_gem_context.c | 6 +-
+ drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 90 +++
+ drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 22 +-
+ drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 +-
+ drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 18 +-
+ drivers/i2c/busses/i2c-designware-baytrail.c | 83 ++-
+ drivers/i2c/busses/i2c-designware-core.c | 14 +-
+ drivers/i2c/busses/i2c-designware-core.h | 13 +-
+ drivers/i2c/busses/i2c-designware-pcidrv.c | 26 +-
+ drivers/i2c/busses/i2c-designware-platdrv.c | 8 +-
+ include/drm/i915_pciids.h | 8 +
+ kernel/locking/lockdep.c | 2 +
+ 70 files changed, 2596 insertions(+), 1770 deletions(-)
+ rename drivers/gpu/drm/i915/{intel_dsi_panel_vbt.c => intel_dsi_vbt.c} (95%)
+Merging drm-tegra/drm/tegra/for-next (7b1d4185050d gpu: host1x: Set OF node for new host1x devices)
+$ git merge drm-tegra/drm/tegra/for-next
+Already up-to-date.
+Merging drm-misc/for-linux-next (7b34734816d5 drm: vc4: remove redundant check of plane being non-null)
+$ git merge drm-misc/for-linux-next
+Auto-merging drivers/gpu/drm/mxsfb/mxsfb_drv.c
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/display/brcm,bcm-vc4.txt | 3 +
+ Documentation/gpu/drm-internals.rst | 58 +--
+ Documentation/gpu/drm-kms-helpers.rst | 28 +-
+ Documentation/gpu/drm-kms.rst | 264 ++++++++++-
+ Documentation/gpu/drm-mm.rst | 24 +-
+ Documentation/gpu/drm-uapi.rst | 4 +
+ drivers/dma-buf/dma-fence-array.c | 26 ++
+ drivers/gpu/drm/arm/hdlcd_drv.c | 12 +-
+ drivers/gpu/drm/arm/malidp_drv.c | 12 +-
+ drivers/gpu/drm/armada/armada_drv.c | 11 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 33 --
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 43 +-
+ drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 8 +-
+ drivers/gpu/drm/drm_file.c | 67 ++-
+ drivers/gpu/drm/drm_gem_cma_helper.c | 3 +
+ drivers/gpu/drm/drm_irq.c | 43 +-
+ drivers/gpu/drm/drm_trace.h | 20 +-
+ drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 12 +-
+ drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 12 +-
+ drivers/gpu/drm/imx/imx-drm-core.c | 11 +-
+ drivers/gpu/drm/meson/meson_drv.c | 14 +-
+ drivers/gpu/drm/mxsfb/mxsfb_drv.c | 14 +-
+ drivers/gpu/drm/nouveau/nouveau_usif.c | 1 -
+ drivers/gpu/drm/qxl/qxl_display.c | 2 +
+ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 12 +-
+ 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/shmobile/shmob_drm_drv.c | 12 +-
+ drivers/gpu/drm/sti/sti_drv.c | 11 +-
+ drivers/gpu/drm/sun4i/sun4i_drv.c | 12 +-
+ drivers/gpu/drm/tilcdc/tilcdc_drv.c | 12 +-
+ drivers/gpu/drm/tinydrm/mipi-dbi.c | 4 +-
+ drivers/gpu/drm/vc4/Kconfig | 4 +
+ drivers/gpu/drm/vc4/vc4_drv.c | 22 +-
+ drivers/gpu/drm/vc4/vc4_hdmi.c | 494 ++++++++++++++++++++-
+ drivers/gpu/drm/vc4/vc4_plane.c | 11 +-
+ drivers/gpu/drm/vc4/vc4_regs.h | 107 ++++-
+ drivers/gpu/drm/vgem/vgem_drv.c | 4 +-
+ drivers/gpu/drm/virtio/virtgpu_vq.c | 4 +-
+ drivers/gpu/drm/zte/zx_drm_drv.c | 14 +-
+ include/drm/drm_drv.h | 81 +++-
+ include/drm/drm_file.h | 267 +++++++++--
+ include/drm/drm_gem.h | 26 ++
+ include/drm/drm_gem_cma_helper.h | 26 ++
+ include/linux/dma-fence-array.h | 2 +
+ 46 files changed, 1431 insertions(+), 443 deletions(-)
+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 (56b1776d13a6 drm/msm/mdp5: Update SSPP_MAX value)
+$ git merge drm-msm/msm-next
+Merge made by the 'recursive' strategy.
+ 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 | 36 ++++++++---
+ drivers/gpu/drm/msm/adreno/adreno_gpu.c | 33 +++++-----
+ drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +-
+ drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 12 +---
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 12 +---
+ drivers/gpu/drm/msm/mdp/mdp5/mdp5_pipe.h | 3 +-
+ drivers/gpu/drm/msm/msm_debugfs.c | 2 +
+ drivers/gpu/drm/msm/msm_drv.c | 13 ++--
+ drivers/gpu/drm/msm/msm_gem.c | 6 ++
+ drivers/gpu/drm/msm/msm_gem_submit.c | 39 ++++++------
+ drivers/gpu/drm/msm/msm_gpu.c | 99 ++++++++----------------------
+ drivers/gpu/drm/msm/msm_gpu.h | 12 ++--
+ drivers/gpu/drm/msm/msm_iommu.c | 69 ++++++---------------
+ drivers/gpu/drm/msm/msm_rd.c | 4 +-
+ 17 files changed, 155 insertions(+), 221 deletions(-)
+Merging hdlcd/for-upstream/hdlcd (747e5a5ff2a2 drm: hdlcd: Fix cleanup order)
+$ git merge hdlcd/for-upstream/hdlcd
+Already up-to-date.
+Merging mali-dp/for-upstream/mali-dp (751c5fae1940 drm: mali-dp: Fix smart layer not going to composition)
+$ git merge mali-dp/for-upstream/mali-dp
+Merge made by the 'recursive' strategy.
+Merging sunxi/sunxi/for-next (26aa76e045b8 Merge branches 'sunxi/drm-for-4.12' and '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/arm/configs/multi_v7_defconfig
+Auto-merging arch/arm/boot/dts/Makefile
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/clock/sunxi-ccu.txt | 1 +
+ .../devicetree/bindings/gpu/arm,mali-utgard.txt | 8 +
+ arch/arm/boot/dts/Makefile | 1 +
+ 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 | 2 +-
+ arch/arm/boot/dts/sun5i-r8.dtsi | 40 --
+ arch/arm/boot/dts/sun5i.dtsi | 283 +++++++++-
+ 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-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 | 5 +-
+ 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 | 3 +-
+ 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 | 1 -
+ arch/arm/boot/dts/sun8i-a33.dtsi | 20 +
+ arch/arm/boot/dts/sun8i-a83t.dtsi | 2 -
+ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 1 -
+ 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 | 1 -
+ 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 | 586 +++++++++++++++++++
+ .../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/boot/dts/allwinner/Makefile | 1 +
+ .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 163 ++++++
+ arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 124 +++++
+ arch/arm64/boot/dts/allwinner/sunxi-h3-h5.dtsi | 1 +
+ drivers/clk/sunxi-ng/Kconfig | 11 +-
+ drivers/clk/sunxi-ng/ccu-sun5i.c | 2 +-
+ drivers/clk/sunxi-ng/ccu-sun6i-a31.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_gate.c | 47 ++
+ drivers/clk/sunxi-ng/ccu_mp.c | 8 +
+ 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 +-
+ 117 files changed, 2003 insertions(+), 1623 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
+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 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
+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
+Merge made by the 'recursive' strategy.
+ 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 (f3ac9f737603 ALSA: seq: Fix link corruption by event error handling)
+$ git merge sound/for-next
+Already up-to-date.
+Merging sound-asoc/for-next (2b0f53c7f0d4 Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320aic23', 'asoc/topic/txx9', 'asoc/topic/ux500' and '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/rockchip-i2s.txt | 1 +
+ .../devicetree/bindings/sound/tas2552.txt | 3 +
+ .../devicetree/bindings/sound/zte,tdm.txt | 30 +
+ include/sound/cs35l35.h | 105 ++
+ sound/soc/atmel/atmel-classd.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 | 16 +-
+ sound/soc/codecs/rt5665.c | 217 ++-
+ sound/soc/codecs/rt5665.h | 2 +-
+ sound/soc/codecs/tlv320aic23.c | 7 +-
+ sound/soc/codecs/wm_adsp.c | 9 +-
+ 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/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/boards/Makefile | 4 +
+ sound/soc/intel/boards/bdw-rt5677.c | 5 +-
+ sound/soc/intel/boards/bytcht_da7213.c | 283 ++++
+ sound/soc/intel/boards/bytcht_nocodec.c | 208 +++
+ sound/soc/intel/skylake/bxt-sst.c | 96 +-
+ sound/soc/intel/skylake/skl-messages.c | 12 +-
+ sound/soc/intel/skylake/skl-pcm.c | 21 +-
+ 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 | 3 +
+ sound/soc/intel/skylake/skl-sst-ipc.c | 66 +-
+ sound/soc/intel/skylake/skl-sst-ipc.h | 7 +
+ sound/soc/intel/skylake/skl-sst.c | 53 +-
+ sound/soc/intel/skylake/skl-topology.c | 78 +-
+ sound/soc/mediatek/Kconfig | 2 +-
+ sound/soc/omap/rx51.c | 5 +-
+ 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 | 5 +-
+ sound/soc/sh/rcar/cmd.c | 36 +-
+ sound/soc/sh/rcar/core.c | 2 -
+ sound/soc/sh/rcar/dma.c | 18 +-
+ sound/soc/sh/rcar/ssiu.c | 6 +-
+ 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 | 10 +-
+ sound/soc/sunxi/sun8i-codec-analog.c | 168 ++-
+ sound/soc/sunxi/sun8i-codec.c | 65 +-
+ 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 ++++++
+ 110 files changed, 4216 insertions(+), 522 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/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/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 (fef5f569db06 Input: convert remaining uses of pr_warning to pr_warn)
+$ 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.
+ .../devicetree/bindings/input/pwm-beeper.txt | 1 +
+ .../bindings/input/touchscreen/ad7879.txt | 19 +++
+ .../bindings/input/{ => touchscreen}/ads7846.txt | 0
+ drivers/input/gameport/gameport.c | 4 +-
+ drivers/input/joystick/gamecon.c | 3 +-
+ drivers/input/keyboard/tca8418_keypad.c | 2 -
+ drivers/input/misc/apanel.c | 3 +-
+ drivers/input/misc/axp20x-pek.c | 62 ++++---
+ 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/alps.c | 76 +++++----
+ drivers/input/mouse/alps.h | 6 +-
+ drivers/input/serio/serio.c | 8 +-
+ 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/tps6507x-ts.c | 33 +---
+ drivers/input/touchscreen/tsc2007.h | 101 ++++++++++++
+ .../touchscreen/{tsc2007.c => tsc2007_core.c} | 102 ++++--------
+ drivers/input/touchscreen/tsc2007_iio.c | 140 ++++++++++++++++
+ 28 files changed, 741 insertions(+), 529 deletions(-)
+ rename Documentation/devicetree/bindings/input/{ => touchscreen}/ads7846.txt (100%)
+ 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 (d111d2a90084 Merge branch 'for-linus' into for-next)
+$ git merge block/for-next
+Merge made by the 'recursive' strategy.
+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 (cff87c4efc1f 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 ++
+ drivers/md/Kconfig | 18 +-
+ 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.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 | 2485 +++++++---------
+ drivers/md/dm-crypt.c | 1200 ++++++--
+ drivers/md/dm-integrity.c | 3111 ++++++++++++++++++++
+ drivers/md/dm-table.c | 11 +
+ drivers/md/dm-thin.c | 2 +-
+ drivers/md/dm-verity-fec.c | 12 +-
+ drivers/md/dm-verity-fec.h | 4 +
+ include/linux/device-mapper.h | 6 +
+ 25 files changed, 6922 insertions(+), 2647 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 (5aa25d971ab4 mmc: bcm2835: Add new driver for the sdhost controller.)
+$ git merge mmc/next
+Merge made by the 'recursive' strategy.
+ .../bindings/mmc/brcm,bcm2835-sdhost.txt | 23 +
+ .../bindings/mmc/nvidia,tegra20-sdhci.txt | 12 +-
+ .../devicetree/bindings/mmc/rockchip-dw-mshc.txt | 2 +-
+ drivers/mmc/core/block.c | 7 +-
+ drivers/mmc/core/mmc.c | 2 +-
+ drivers/mmc/core/sdio_io.c | 54 +-
+ drivers/mmc/host/Kconfig | 14 +
+ drivers/mmc/host/Makefile | 1 +
+ drivers/mmc/host/bcm2835.c | 1465 ++++++++++++++++++++
+ drivers/mmc/host/dw_mmc.c | 397 +++---
+ drivers/mmc/host/meson-gx-mmc.c | 125 +-
+ drivers/mmc/host/mtk-sd.c | 4 +-
+ drivers/mmc/host/sdhci-cadence.c | 57 +-
+ drivers/mmc/host/sdhci-of-arasan.c | 14 +-
+ drivers/mmc/host/sdhci-of-at91.c | 19 +
+ drivers/mmc/host/sdhci-pxav2.c | 9 +-
+ drivers/mmc/host/sdhci-pxav3.c | 2 -
+ drivers/mmc/host/sdhci-st.c | 21 +-
+ drivers/mmc/host/sdhci-tegra.c | 59 +-
+ drivers/mmc/host/sunxi-mmc.c | 18 +-
+ drivers/mmc/host/tmio_mmc.h | 12 +-
+ drivers/mmc/host/tmio_mmc_dma.c | 58 +-
+ drivers/mmc/host/tmio_mmc_pio.c | 20 +-
+ drivers/mmc/host/ushc.c | 3 +
+ 24 files changed, 1985 insertions(+), 413 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 (48df498daf62 md: move bitmap_destroy to the beginning of __md_stop)
+$ git merge md/for-next
+Auto-merging drivers/md/Makefile
+Auto-merging Documentation/md/md-cluster.txt
+Merge made by the 'recursive' strategy.
+ Documentation/admin-guide/md.rst | 32 +-
+ Documentation/md/md-cluster.txt | 2 +-
+ Documentation/md/raid5-ppl.txt | 44 ++
+ drivers/md/Makefile | 2 +-
+ drivers/md/bitmap.c | 57 +-
+ drivers/md/bitmap.h | 3 +
+ drivers/md/md-cluster.c | 223 ++++++-
+ drivers/md/md-cluster.h | 1 +
+ drivers/md/md.c | 178 +++++-
+ drivers/md/md.h | 13 +-
+ drivers/md/raid0.c | 3 +-
+ drivers/md/raid1.c | 3 +-
+ drivers/md/raid5-cache.c | 336 +++++++++--
+ drivers/md/raid5-log.h | 114 ++++
+ drivers/md/raid5-ppl.c | 1239 ++++++++++++++++++++++++++++++++++++++
+ drivers/md/raid5.c | 368 ++++++++---
+ drivers/md/raid5.h | 56 +-
+ include/uapi/linux/raid/md_p.h | 45 +-
+ 18 files changed, 2491 insertions(+), 228 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 (8edd4b2c7067 mfd: tps65912: Fix variable name for SPI remove)
+$ git merge mfd/for-mfd-next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/mfd/altera-a10sr.txt | 11 +
+ Documentation/devicetree/bindings/mfd/axp20x.txt | 3 +
+ Documentation/devicetree/bindings/mfd/ti-lmu.txt | 243 ++++++++++++++++++
+ drivers/mfd/Kconfig | 12 +
+ drivers/mfd/Makefile | 6 +-
+ drivers/mfd/altera-a10sr.c | 4 +
+ drivers/mfd/axp20x.c | 21 +-
+ drivers/mfd/cros_ec.c | 15 +-
+ drivers/mfd/cros_ec_acpi_gpe.c | 103 ++++++++
+ drivers/mfd/cros_ec_spi.c | 9 +-
+ drivers/mfd/exynos-lpass.c | 4 +-
+ drivers/mfd/intel-lpss-acpi.c | 4 -
+ drivers/mfd/intel_soc_pmic_core.c | 26 +-
+ drivers/mfd/lpc_ich.c | 6 +
+ drivers/mfd/rtsx_pcr.c | 2 +-
+ drivers/mfd/stm32-timers.c | 10 +-
+ drivers/mfd/ti-lmu.c | 259 +++++++++++++++++++
+ drivers/mfd/tps65912-spi.c | 4 +-
+ drivers/mfd/twl4030-power.c | 1 +
+ include/linux/mfd/cros_ec.h | 18 ++
+ include/linux/mfd/ti-lmu-register.h | 280 +++++++++++++++++++++
+ include/linux/mfd/ti-lmu.h | 87 +++++++
+ 22 files changed, 1078 insertions(+), 50 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/mfd/ti-lmu.txt
+ create mode 100644 drivers/mfd/cros_ec_acpi_gpe.c
+ create mode 100644 drivers/mfd/ti-lmu.c
+ 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 (82f62d6982da power: supply: sbs-charger: simplified bool function)
+$ git merge battery/for-next
+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/ab8500_bmdata.c | 8 +-
+ drivers/power/supply/bq24190_charger.c | 214 ++++++++++++++++-----
+ 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 +-
+ 13 files changed, 392 insertions(+), 66 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
+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 (a6a01bd92b39 Merge remote-tracking branch 'regulator/topic/pfuze100' into regulator-next)
+$ git merge regulator/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/regulator/lm363x-regulator.txt | 78 +++++++++++++++++++++-
+ .../devicetree/bindings/regulator/pfuze100.txt | 8 ++-
+ drivers/regulator/core.c | 8 +--
+ 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/s2mpa01.c | 14 ++--
+ drivers/regulator/s2mps11.c | 16 ++---
+ drivers/regulator/s5m8767.c | 4 +-
+ include/linux/regulator/pfuze100.h | 1 +
+ 15 files changed, 168 insertions(+), 33 deletions(-)
+Merging security/next (ca97d939db11 security: mark LSM hooks as __ro_after_init)
+$ git merge security/next
+Auto-merging security/Kconfig
+Merge made by the 'recursive' strategy.
+ include/linux/lsm_hooks.h | 25 ++++++++++++++++++++++---
+ include/linux/security.h | 13 +++++++++++++
+ kernel/sys.c | 30 ++++++++++++++++++------------
+ security/Kconfig | 5 +++++
+ security/apparmor/lsm.c | 2 +-
+ security/commoncap.c | 2 +-
+ security/loadpin/loadpin.c | 2 +-
+ security/security.c | 10 +++++++++-
+ security/selinux/Kconfig | 6 ++++++
+ security/selinux/hooks.c | 18 +++++++++++++++++-
+ security/selinux/include/classmap.h | 2 +-
+ security/smack/smack_lsm.c | 2 +-
+ security/tomoyo/tomoyo.c | 2 +-
+ security/yama/yama_lsm.c | 2 +-
+ 14 files changed, 97 insertions(+), 24 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 (e2f586bd8317 selinux: check for address length in selinux_socket_bind())
+$ git merge selinux/next
+Merge made by the 'recursive' strategy.
+ scripts/selinux/genheaders/genheaders.c | 1 +
+ scripts/selinux/mdp/mdp.c | 1 +
+ security/selinux/hooks.c | 8 ++++++++
+ security/selinux/nlmsgtab.c | 10 +++++-----
+ 4 files changed, 15 insertions(+), 5 deletions(-)
+Merging tpmdd/next (d0e4a409ba10 tpm: add sleep only for retry in i2c_nuvoton_write_status())
+$ git merge tpmdd/next
+Merge made by the 'recursive' strategy.
+ drivers/char/tpm/Kconfig | 1 +
+ drivers/char/tpm/Makefile | 3 +-
+ drivers/char/tpm/st33zp24/i2c.c | 23 +-
+ drivers/char/tpm/st33zp24/spi.c | 23 +-
+ drivers/char/tpm/tpm-chip.c | 112 ++++++--
+ 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 | 131 ++++++---
+ drivers/char/tpm/tpm-sysfs.c | 2 +-
+ drivers/char/tpm/tpm.h | 49 +++-
+ drivers/char/tpm/tpm2-cmd.c | 173 ++++++++----
+ drivers/char/tpm/tpm2-space.c | 532 +++++++++++++++++++++++++++++++++++++
+ drivers/char/tpm/tpm_crb.c | 169 ++++++++----
+ drivers/char/tpm/tpm_i2c_nuvoton.c | 24 +-
+ drivers/char/tpm/tpm_ibmvtpm.c | 8 +-
+ drivers/char/tpm/tpm_tis_core.c | 6 +-
+ drivers/char/tpm/tpm_tis_spi.c | 160 +++++------
+ drivers/char/tpm/tpmrm-dev.c | 65 +++++
+ 19 files changed, 1403 insertions(+), 396 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 (8d2932dd0634 Merge branches 'iommu/fixes', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'arm/mediatek', 'arm/core', 'x86/vt-d' and 'core' into next)
+$ git merge iommu/next
+Already up-to-date.
+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 (74dcba3589fc NTB: correct ntb_spad_count comment typo)
+$ git merge trivial/for-next
+Already up-to-date.
+Merging audit/next (f68d952c9184 audit: log module name on delete_module)
+$ git merge audit/next
+Auto-merging kernel/module.c
+Auto-merging kernel/audit_watch.c
+Auto-merging kernel/audit_fsnotify.c
+Merge made by the 'recursive' strategy.
+ kernel/audit_fsnotify.c | 2 +-
+ kernel/audit_watch.c | 2 +-
+ kernel/auditfilter.c | 4 ++--
+ kernel/module.c | 2 ++
+ 4 files changed, 6 insertions(+), 4 deletions(-)
+Merging devicetree/for-next (4e29ccdb240e DT: add Faraday Tec. as vendor)
+$ git merge devicetree/for-next
+Already up-to-date.
+Merging mailbox/mailbox-for-next (db4d22c07e3e mailbox: mailbox-test: allow reserved areas in SRAM)
+$ git merge mailbox/mailbox-for-next
+Already up-to-date.
+Merging spi/for-next (8d3ab6cc9551 Merge remote-tracking branches 'spi/topic/test' 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 ++
+ 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 | 153 ++++---
+ drivers/spi/spi-sc18is602.c | 24 +-
+ drivers/spi/spi-sun6i.c | 90 ++++-
+ drivers/spi/spi-test.h | 21 +-
+ drivers/spi/spi-xlp.c | 1 +
+ drivers/spi/spi.c | 34 +-
+ drivers/spi/spidev.c | 1 +
+ include/linux/spi/spi.h | 4 +
+ 18 files changed, 664 insertions(+), 358 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 (f0283cb726d0 Merge branch 'x86/vdso')
+$ git merge tip/auto-latest
+Auto-merging kernel/trace/trace.c
+Auto-merging kernel/module.c
+Auto-merging kernel/locking/lockdep.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ Documentation/trace/kprobetrace.txt | 5 +-
+ Documentation/x86/x86_64/mm.txt | 5 +-
+ arch/Kconfig | 7 +
+ arch/x86/Kconfig | 1 +
+ arch/x86/entry/entry_32.S | 2 +-
+ arch/x86/entry/entry_64.S | 15 +-
+ 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/intel/bts.c | 16 +-
+ arch/x86/events/intel/core.c | 22 ++
+ arch/x86/events/intel/pt.c | 55 ++--
+ arch/x86/events/intel/pt.h | 1 -
+ arch/x86/hyperv/hv_init.c | 48 +---
+ arch/x86/include/asm/apic.h | 7 +-
+ arch/x86/include/asm/clocksource.h | 3 +-
+ arch/x86/include/asm/desc.h | 162 ++++++++---
+ arch/x86/include/asm/elf.h | 28 +-
+ arch/x86/include/asm/fixmap.h | 4 +
+ arch/x86/include/asm/mshyperv.h | 54 ++++
+ arch/x86/include/asm/msr-index.h | 1 +
+ arch/x86/include/asm/page_64.h | 16 +-
+ arch/x86/include/asm/pgtable-2level_types.h | 1 +
+ arch/x86/include/asm/pgtable-3level_types.h | 1 +
+ arch/x86/include/asm/pgtable.h | 26 +-
+ arch/x86/include/asm/pgtable_64_types.h | 4 +-
+ arch/x86/include/asm/pgtable_types.h | 30 +-
+ arch/x86/include/asm/processor.h | 17 +-
+ arch/x86/include/asm/reboot.h | 1 +
+ arch/x86/include/asm/stackprotector.h | 2 +-
+ 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/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 | 51 +++-
+ arch/x86/kernel/cpu/mcheck/mce.c | 18 +-
+ arch/x86/kernel/cpu/proc.c | 5 +-
+ arch/x86/kernel/head_64.S | 10 +-
+ arch/x86/kernel/module.c | 1 +
+ arch/x86/kernel/process.c | 79 +++---
+ arch/x86/kernel/reboot.c | 5 +-
+ arch/x86/kernel/setup.c | 11 +-
+ arch/x86/kernel/setup_percpu.c | 2 +-
+ arch/x86/kernel/smpboot.c | 2 +-
+ arch/x86/kernel/sys_x86_64.c | 15 +-
+ arch/x86/kernel/tboot.c | 6 +-
+ 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/dump_pagetables.c | 1 +
+ arch/x86/mm/fault.c | 66 ++++-
+ arch/x86/mm/gup.c | 33 ++-
+ arch/x86/mm/hugetlbpage.c | 9 +-
+ arch/x86/mm/ident_map.c | 51 +++-
+ arch/x86/mm/init_32.c | 31 ++-
+ arch/x86/mm/ioremap.c | 3 +-
+ arch/x86/mm/kasan_init_64.c | 1 +
+ arch/x86/mm/mmap.c | 125 ++++++---
+ 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 | 13 +-
+ 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/xen/enlighten.c | 6 +-
+ arch/x86/xen/mmu.c | 1 +
+ arch/x86/xen/smp.c | 2 +-
+ drivers/firmware/efi/efi.c | 1 -
+ drivers/firmware/efi/esrt.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/lguest/x86/core.c | 6 +-
+ drivers/pnp/pnpbios/bioscalls.c | 10 +-
+ include/linux/coresight.h | 2 +-
+ include/linux/hrtimer.h | 4 -
+ include/linux/kprobes.h | 2 +
+ include/linux/lockdep.h | 3 +
+ include/linux/mm_types.h | 5 +
+ include/linux/module.h | 6 +
+ include/linux/percpu.h | 1 +
+ include/linux/perf_event.h | 10 +-
+ include/linux/refcount.h | 19 ++
+ include/uapi/linux/perf_event.h | 33 ++-
+ kernel/events/core.c | 139 ++++++++++
+ kernel/events/ring_buffer.c | 34 ++-
+ kernel/fork.c | 2 +
+ kernel/irq/chip.c | 5 +-
+ kernel/kprobes.c | 46 +++-
+ kernel/locking/lockdep.c | 242 ++++++++++------
+ kernel/locking/rwsem.c | 6 +-
+ kernel/locking/test-ww_mutex.c | 15 +-
+ kernel/module.c | 36 ++-
+ kernel/nsproxy.c | 3 +
+ kernel/sched/core.c | 207 +++++++-------
+ kernel/sched/fair.c | 77 +++---
+ 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/refcount.c | 122 ++++++++-
+ mm/percpu.c | 37 ++-
+ mm/vmalloc.c | 4 +
+ tools/arch/x86/include/asm/atomic.h | 7 +
+ tools/arch/x86/include/asm/cmpxchg.h | 89 ++++++
+ tools/arch/x86/include/asm/cpufeatures.h | 5 +-
+ 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 | 32 ++-
+ tools/perf/.gitignore | 2 +
+ tools/perf/Documentation/perf-ftrace.txt | 18 ++
+ tools/perf/Documentation/perf-record.txt | 3 +
+ tools/perf/Documentation/perf-report.txt | 8 +-
+ tools/perf/Documentation/perf-sched.txt | 4 +
+ tools/perf/Documentation/perf-script.txt | 16 +-
+ tools/perf/MANIFEST | 2 +
+ tools/perf/Makefile.config | 4 +
+ tools/perf/arch/powerpc/util/sym-handling.c | 14 +-
+ tools/perf/bench/futex-hash.c | 1 +
+ tools/perf/bench/futex-lock-pi.c | 1 +
+ tools/perf/bench/futex-requeue.c | 1 +
+ tools/perf/bench/futex-wake-parallel.c | 1 +
+ tools/perf/bench/futex-wake.c | 1 +
+ tools/perf/bench/futex.h | 10 +-
+ tools/perf/bench/numa.c | 3 +-
+ tools/perf/builtin-annotate.c | 1 +
+ tools/perf/builtin-c2c.c | 4 +-
+ tools/perf/builtin-diff.c | 1 +
+ tools/perf/builtin-ftrace.c | 152 ++++++++--
+ tools/perf/builtin-inject.c | 13 +
+ tools/perf/builtin-kmem.c | 1 +
+ tools/perf/builtin-kvm.c | 2 +
+ tools/perf/builtin-lock.c | 1 +
+ tools/perf/builtin-mem.c | 1 +
+ tools/perf/builtin-record.c | 35 ++-
+ tools/perf/builtin-report.c | 4 +-
+ tools/perf/builtin-sched.c | 26 +-
+ tools/perf/builtin-script.c | 305 ++++++++++++++++++++-
+ tools/perf/builtin-stat.c | 44 ++-
+ tools/perf/builtin-trace.c | 3 +-
+ tools/perf/command-list.txt | 1 +
+ tools/perf/perf.h | 1 +
+ tools/perf/pmu-events/arch/x86/mapfile.csv | 1 +
+ tools/perf/tests/cpumap.c | 2 +-
+ tools/perf/tests/thread-map.c | 6 +-
+ tools/perf/tests/thread-mg-share.c | 12 +-
+ tools/perf/ui/browsers/hists.c | 2 +-
+ tools/perf/util/Build | 2 +
+ 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 | 154 ++++++++++-
+ tools/perf/util/event.h | 19 ++
+ tools/perf/util/evlist.c | 31 ++-
+ tools/perf/util/evlist.h | 4 +-
+ tools/perf/util/evsel.c | 3 +
+ tools/perf/util/hist.c | 7 +
+ 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 | 10 +-
+ tools/perf/util/map.h | 10 +-
+ tools/perf/util/namespaces.c | 36 +++
+ tools/perf/util/namespaces.h | 26 ++
+ tools/perf/util/parse-events.c | 5 +-
+ tools/perf/util/parse-events.h | 20 ++
+ tools/perf/util/probe-event.c | 21 +-
+ tools/perf/util/probe-file.c | 95 ++++---
+ tools/perf/util/probe-file.h | 2 +
+ tools/perf/util/session.c | 7 +
+ tools/perf/util/sort.c | 87 ++++++
+ tools/perf/util/sort.h | 8 +
+ 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/util.h | 4 +-
+ tools/scripts/Makefile.include | 9 +
+ 208 files changed, 3693 insertions(+), 1031 deletions(-)
+ 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/util/dump-insn.c
+ create mode 100644 tools/perf/util/dump-insn.h
+ 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 (5c71ad17f97e EDAC, pnd2_edac: Add new EDAC driver for Intel SoC platforms)
+$ git merge edac-amd/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ MAINTAINERS | 6 +
+ drivers/edac/Kconfig | 9 +
+ drivers/edac/Makefile | 1 +
+ drivers/edac/i5000_edac.c | 2 +-
+ drivers/edac/i5400_edac.c | 5 +-
+ drivers/edac/pnd2_edac.c | 1542 +++++++++++++++++++++++++++++++++++++++++++++
+ drivers/edac/pnd2_edac.h | 301 +++++++++
+ drivers/edac/xgene_edac.c | 2 +-
+ 8 files changed, 1864 insertions(+), 4 deletions(-)
+ create mode 100644 drivers/edac/pnd2_edac.c
+ create mode 100644 drivers/edac/pnd2_edac.h
+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 (196136c7c645 srcu: Fix bogus try_check_zero() comment)
+$ 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/kasan/kasan.c
+Auto-merging kernel/sched/core.c
+Auto-merging kernel/locking/lockdep.c
+Auto-merging kernel/fork.c
+Auto-merging include/net/sock.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/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/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 | 35 +-
+ include/linux/types.h | 2 +-
+ include/net/sock.h | 2 +-
+ init/Kconfig | 8 +-
+ kernel/fork.c | 4 +-
+ kernel/locking/lockdep.c | 86 +--
+ kernel/locking/rtmutex-debug.c | 9 +-
+ kernel/rcu/rcu.h | 122 +++-
+ kernel/rcu/srcu.c | 264 +++-----
+ kernel/rcu/tiny.c | 20 +-
+ kernel/rcu/tiny_plugin.h | 13 +-
+ kernel/rcu/tree.c | 628 +++++++------------
+ kernel/rcu/tree.h | 156 +----
+ kernel/rcu/tree_exp.h | 17 +-
+ kernel/rcu/tree_plugin.h | 70 ++-
+ 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/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 +-
+ 58 files changed, 1708 insertions(+), 1076 deletions(-)
+ create mode 100644 include/linux/rcu_node_tree.h
+ create mode 100644 include/linux/rcu_segcblist.h
+$ 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 ec8286d9073f] Merge remote-tracking branch 'rcu/rcu/next'
+ Date: Mon Mar 20 12:58:04 2017 +1100
+Merging kvm/linux-next (4495c08e8472 Linux 4.11-rc2)
+$ git merge kvm/linux-next
+Already up-to-date.
+Merging kvm-arm/next (7b6b46311a85 KVM: arm/arm64: Emulate the EL1 phys timer registers)
+$ git merge kvm-arm/next
+Already up-to-date.
+Merging kvm-mips/next (12ed1faece3f KVM: MIPS: Allow multiple VCPUs to be created)
+$ git merge kvm-mips/next
+Already up-to-date.
+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 (0c9d86833dfd KVM: s390: use defines for execution controls)
+$ git merge kvms390/next
+Merge made by the 'recursive' strategy.
+ arch/s390/include/asm/kvm_host.h | 18 +++++++++++++++-
+ arch/s390/kvm/gaccess.c | 6 +++---
+ arch/s390/kvm/intercept.c | 3 +--
+ arch/s390/kvm/kvm-s390.c | 46 +++++++++++++++++++++-------------------
+ arch/s390/kvm/kvm-s390.h | 2 +-
+ arch/s390/kvm/priv.c | 4 +++-
+ arch/s390/kvm/sthyi.c | 3 +++
+ arch/s390/kvm/vsie.c | 33 ++++++++++++++--------------
+ 8 files changed, 68 insertions(+), 47 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 (1fe55309462c platform/x86: intel-hid: do not set parents of input devices explicitly)
+$ git merge drivers-x86/for-next
+Merge made by the 'recursive' strategy.
+ 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-wmi-aio.c | 6 +-
+ drivers/platform/x86/dell-wmi.c | 16 +---
+ drivers/platform/x86/eeepc-laptop.c | 8 +-
+ drivers/platform/x86/fujitsu-laptop.c | 162 +++++++++++++++-----------------
+ 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/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 +-
+ 17 files changed, 207 insertions(+), 231 deletions(-)
+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 (7ea79ae86c28 leds: gpio: use OF variant of LED registering function)
+$ git merge leds/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/led-class.c | 26 ++--
+ drivers/leds/leds-gpio.c | 12 +-
+ drivers/leds/trigger/ledtrig-cpu.c | 33 ++++-
+ drivers/platform/x86/Kconfig | 8 ++
+ drivers/platform/x86/Makefile | 1 +
+ drivers/platform/x86/dell-laptop.c | 28 ++++
+ .../dell-led.c => platform/x86/dell-wmi-led.c} | 141 +++++----------------
+ include/linux/dell-led.h | 6 +-
+ include/linux/leds.h | 14 +-
+ sound/pci/hda/dell_wmi_helper.c | 30 ++---
+ 12 files changed, 149 insertions(+), 160 deletions(-)
+ rename drivers/{leds/dell-led.c => platform/x86/dell-wmi-led.c} (56%)
+Merging ipmi/for-next (ea6200e84182 Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip)
+$ git merge ipmi/for-next
+Already up-to-date.
+Merging driver-core/driver-core-next (7e040726850a eventpoll.h: add missing epoll event masks)
+$ 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 (d3d6ef1fb908 usb: host: ohci-platform: set hcd->phy to avoid phy_get() in usb_add_hcd())
+$ git merge usb/usb-next
+Auto-merging drivers/usb/misc/lvstest.c
+Auto-merging arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+Auto-merging arch/arm64/boot/dts/marvell/armada-3720-db.dts
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/ehci-orion.txt | 4 ++-
+ Documentation/devicetree/bindings/usb/generic.txt | 1 +
+ arch/arm64/boot/dts/marvell/armada-3720-db.dts | 6 ++++
+ arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 7 +++++
+ drivers/usb/Kconfig | 12 +++++++-
+ drivers/usb/Makefile | 2 +-
+ drivers/usb/atm/cxacru.c | 2 +-
+ drivers/usb/chipidea/Kconfig | 2 +-
+ drivers/usb/core/Makefile | 2 +-
+ drivers/usb/core/of.c | 23 ++++++++++++++
+ 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 | 31 +++++++++----------
+ drivers/usb/host/Kconfig | 12 ++++----
+ drivers/usb/host/Makefile | 4 +--
+ drivers/usb/host/ehci-dbg.c | 2 +-
+ drivers/usb/host/ehci-hcd.c | 2 +-
+ 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 | 2 +-
+ drivers/usb/host/ohci-platform.c | 3 ++
+ drivers/usb/host/ohci.h | 2 +-
+ 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.c | 2 +-
+ drivers/usb/isp1760/isp1760-if.c | 8 ++---
+ drivers/usb/misc/ldusb.c | 30 +++++++++---------
+ drivers/usb/misc/lvstest.c | 5 +--
+ drivers/usb/misc/sisusbvga/sisusb_con.c | 2 +-
+ drivers/usb/storage/karma.c | 6 ++--
+ include/linux/usb/hcd.h | 4 +--
+ include/linux/usb/of.h | 5 +++
+ 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 ++
+ 50 files changed, 245 insertions(+), 113 deletions(-)
+ create mode 100644 tools/usb/.gitignore
+Merging usb-gadget/next (c1ae3cfa0e89 Linux 4.11-rc1)
+$ git merge usb-gadget/next
+Already up-to-date.
+Merging usb-serial/usb-next (2ac8fc51ddf1 USB: serial: whiteheat: simplify endpoint check)
+$ git merge usb-serial/usb-next
+Merge made by the 'recursive' strategy.
+ drivers/usb/serial/ark3116.c | 17 +---
+ drivers/usb/serial/cyberjack.c | 11 +-
+ drivers/usb/serial/digi_acceleport.c | 23 +----
+ drivers/usb/serial/ftdi_sio.c | 53 ++++++++--
+ drivers/usb/serial/io_edgeport.c | 17 +++-
+ 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 | 7 +-
+ drivers/usb/serial/omninet.c | 14 +--
+ drivers/usb/serial/opticon.c | 12 +--
+ drivers/usb/serial/oti6858.c | 19 +---
+ drivers/usb/serial/pl2303.c | 11 +-
+ drivers/usb/serial/spcp8x5.c | 16 +--
+ drivers/usb/serial/symbolserial.c | 12 +--
+ drivers/usb/serial/usb-serial.c | 190 ++++++++++++++++++-----------------
+ drivers/usb/serial/whiteheat.c | 32 +-----
+ include/linux/usb/serial.h | 22 ++--
+ 18 files changed, 201 insertions(+), 297 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
+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 (fe0134d07127 phy: phy-exynos-pcie: make it explicitly non-modular)
+$ git merge phy-next/next
+Auto-merging drivers/phy/phy-exynos-pcie.c
+Merge made by the 'recursive' strategy.
+ drivers/phy/phy-exynos-pcie.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+Merging tty/tty-next (acbdad8dd1ab serial: 8250_dw: simplify optional reset handling)
+$ git merge tty/tty-next
+Recorded preimage for 'drivers/tty/tty_ldisc.c'
+Auto-merging drivers/tty/tty_ldisc.c
+CONFLICT (content): Merge conflict in drivers/tty/tty_ldisc.c
+Auto-merging drivers/tty/serial/8250/8250_dw.c
+Auto-merging MAINTAINERS
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/tty/tty_ldisc.c'.
+[master e5b1cee1bb9d] Merge remote-tracking branch 'tty/tty-next'
+$ git diff -M --stat --summary HEAD^..
+ MAINTAINERS | 2 +-
+ 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/Kconfig | 10 ++++
+ drivers/tty/serial/altera_jtaguart.c | 20 ++++++++
+ drivers/tty/serial/atmel_serial.c | 7 ++-
+ .../linux => drivers/tty/serial}/atmel_serial.h | 0
+ drivers/tty/serial/sb1250-duart.c | 18 +++----
+ drivers/tty/serial/serial_core.c | 17 ++-----
+ drivers/tty/serial/sh-sci.c | 10 ++--
+ drivers/tty/serial/uartlite.c | 2 +-
+ drivers/tty/serial/xilinx_uartps.c | 59 +++++++++++++++++-----
+ drivers/tty/tty_io.c | 4 +-
+ drivers/tty/tty_ldisc.c | 11 ++--
+ include/linux/serdev.h | 4 +-
+ 20 files changed, 163 insertions(+), 91 deletions(-)
+ rename {include/linux => drivers/tty/serial}/atmel_serial.h (100%)
+Merging char-misc/char-misc-next (d47d88361fee auxdisplay: Add HD44780 Character LCD support)
+$ git merge char-misc/char-misc-next
+Auto-merging include/linux/hyperv.h
+Auto-merging drivers/hv/vmbus_drv.c
+Auto-merging drivers/hv/ring_buffer.c
+Auto-merging drivers/hv/hv_snapshot.c
+Auto-merging drivers/hv/hv_kvp.c
+Auto-merging drivers/hv/hv_fcopy.c
+Auto-merging drivers/hv/channel_mgmt.c
+Auto-merging drivers/hv/channel.c
+Auto-merging arch/x86/hyperv/hv_init.c
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ 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/virtio_console.c | 2 +-
+ 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/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/misc/Kconfig | 9 +
+ drivers/misc/Makefile | 1 +
+ drivers/misc/aspeed-lpc-ctrl.c | 267 +++++++
+ drivers/misc/panel.c | 827 +++------------------
+ drivers/pps/pps.c | 123 ++-
+ drivers/rapidio/rio-sysfs.c | 76 +-
+ drivers/rapidio/rio.c | 3 -
+ drivers/rapidio/rio.h | 2 -
+ 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 +-
+ 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 +
+ 62 files changed, 3518 insertions(+), 1313 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
+$ git am -3 ../patches/0001-drivers-misc-Aspeed-LPC-control-driver-will-only-bui.patch
+Applying: drivers/misc: Aspeed LPC control driver will only build on arm
+$ git reset HEAD^
+Unstaged changes after reset:
+M drivers/misc/Kconfig
+$ git add -A .
+$ git commit -v -a --amend
+[master 2e33fe42a4c1] Merge remote-tracking branch 'char-misc/char-misc-next'
+ Date: Mon Mar 20 13:29:44 2017 +1100
+Merging extcon/extcon-next (16b11f258b45 extcon: int3496: Set the id pin to direction-input if necessary)
+$ git merge extcon/extcon-next
+Merge made by the 'recursive' strategy.
+ Documentation/extcon/intel-int3496.txt | 5 ++++
+ drivers/extcon/Kconfig | 2 +-
+ drivers/extcon/extcon-arizona.c | 46 ++++++++++++++++++++++++++++++++++
+ drivers/extcon/extcon-intel-int3496.c | 39 ++++++++++++++++++++--------
+ drivers/extcon/extcon-palmas.c | 6 +++++
+ drivers/extcon/extcon-usb-gpio.c | 7 +++---
+ 6 files changed, 89 insertions(+), 16 deletions(-)
+Merging staging/staging-next (7bc49cb9b9b8 staging: gdm724x: fix checkpatch.pl camelCase warning)
+$ 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/vc04_services/Kconfig
+Auto-merging drivers/staging/lustre/lustre/ldlm/ldlm_lockd.c
+Removing drivers/staging/lustre/lustre/include/lustre_eacl.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/Kconfig
+Removing drivers/staging/android/lowmemorykiller.c
+Auto-merging drivers/iio/adc/lpc32xx_adc.c
+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/health/max30102.txt | 30 +
+ .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 2 +
+ .../bindings/iio/proximity/devantech-srf04.txt | 28 +
+ MAINTAINERS | 12 +
+ 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/adc/Kconfig | 23 +
+ drivers/iio/adc/Makefile | 2 +
+ drivers/{staging => }/iio/adc/lpc32xx_adc.c | 100 +-
+ drivers/iio/adc/meson_saradc.c | 90 +-
+ drivers/{staging => }/iio/adc/spear_adc.c | 0
+ drivers/iio/adc/stx104.c | 1 +
+ .../iio/common/hid-sensors/hid-sensor-attributes.c | 3 +
+ drivers/iio/counter/104-quad-8.c | 1 +
+ drivers/iio/dac/cio-dac.c | 1 +
+ 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/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/cros_ec_light_prox.c | 289 +
+ drivers/iio/light/hid-sensor-prox.c | 7 +
+ drivers/iio/potentiostat/lmp91000.c | 1 +
+ 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/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/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 | 1 -
+ drivers/staging/dgnc/dgnc_cls.c | 6 +-
+ drivers/staging/dgnc/dgnc_driver.c | 21 +-
+ drivers/staging/dgnc/dgnc_mgmt.c | 36 +-
+ drivers/staging/dgnc/dgnc_tty.c | 204 +-
+ drivers/staging/emxx_udc/emxx_udc.h | 2 +-
+ drivers/staging/fbtft/Kconfig | 6 +
+ drivers/staging/fbtft/Makefile | 1 +
+ 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_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 +-
+ .../greybus/Documentation/firmware/authenticate.c | 2 +-
+ .../greybus/Documentation/firmware/firmware.c | 21 +-
+ drivers/staging/greybus/gbphy.c | 1 -
+ 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} | 140 +-
+ drivers/staging/iio/accel/adis16201.h | 144 -
+ .../iio/accel/{adis16203_core.c => adis16203.c} | 136 +-
+ drivers/staging/iio/accel/adis16203.h | 125 -
+ .../iio/accel/{adis16209_core.c => adis16209.c} | 140 +-
+ drivers/staging/iio/accel/adis16209.h | 144 -
+ .../iio/accel/{adis16240_core.c => adis16240.c} | 177 +-
+ 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 | 8 +-
+ drivers/staging/iio/addac/adt7316.c | 108 +-
+ drivers/staging/iio/cdc/ad7152.c | 8 +-
+ drivers/staging/iio/frequency/ad9832.c | 92 +
+ drivers/staging/iio/frequency/ad9832.h | 92 -
+ drivers/staging/iio/frequency/ad9834.c | 72 +
+ drivers/staging/iio/frequency/ad9834.h | 72 -
+ 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/ade7854.c | 4 +-
+ drivers/staging/iio/meter/meter.h | 60 +-
+ drivers/staging/iio/resolver/ad2s1210.c | 24 +-
+ drivers/staging/ks7010/TODO | 2 -
+ drivers/staging/ks7010/eap_packet.h | 9 +-
+ drivers/staging/ks7010/ks7010_sdio.c | 310 +-
+ drivers/staging/ks7010/ks7010_sdio.h | 2 +-
+ drivers/staging/ks7010/ks_hostif.c | 501 +-
+ 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 | 978 +-
+ drivers/staging/ks7010/michael_mic.c | 8 +-
+ 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 | 54 +-
+ .../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/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 | 30 +-
+ 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 | 2 +-
+ drivers/staging/lustre/lustre/llite/range_lock.c | 2 +-
+ drivers/staging/lustre/lustre/llite/rw.c | 2 +-
+ 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 | 105 +
+ 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 | 2510 ++++
+ 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 | 1558 +++
+ 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 | 2089 ++++
+ 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 | 378 +
+ .../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 | 6775 +++++++++++
+ .../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 | 4795 ++++++++
+ .../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 | 416 +
+ .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 214 +
+ .../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 | 1622 +++
+ .../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 | 3238 ++++++
+ .../ia_css_isp_params.h | 399 +
+ .../ia_css_isp_states.c | 217 +
+ .../ia_css_isp_states.h | 74 +
+ .../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 | 3239 ++++++
+ .../ia_css_isp_params.h | 399 +
+ .../ia_css_isp_states.c | 218 +
+ .../ia_css_isp_states.h | 74 +
+ .../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 | 3239 ++++++
+ .../ia_css_isp_params.h | 399 +
+ .../ia_css_isp_states.c | 218 +
+ .../ia_css_isp_states.h | 74 +
+ .../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 | 238 +
+ .../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 | 58 +
+ .../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 | 85 +
+ .../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 | 159 +
+ .../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_lace_stat.h | 37 +
+ .../pci/atomisp2/css2400/ia_css_memory_access.c | 107 +
+ .../pci/atomisp2/css2400/ia_css_memory_access.h | 24 +
+ .../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 | 66 +
+ .../css2400/isp/kernels/aa/aa_2/ia_css_aa2.host.h | 50 +
+ .../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 | 78 +
+ .../css2400/isp/kernels/bh/bh_2/ia_css_bh.host.h | 38 +
+ .../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 | 160 +
+ .../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 +
+ .../isp/kernels/iefd2_6/ia_css_iefd2_6.host.c | 200 +
+ .../isp/kernels/iefd2_6/ia_css_iefd2_6.host.h | 46 +
+ .../kernels/iefd2_6/ia_css_iefd2_6_default.host.c | 144 +
+ .../kernels/iefd2_6/ia_css_iefd2_6_default.host.h | 23 +
+ .../isp/kernels/iefd2_6/ia_css_iefd2_6_param.h | 83 +
+ .../isp/kernels/iefd2_6/ia_css_iefd2_6_state.h | 32 +
+ .../isp/kernels/iefd2_6/ia_css_iefd2_6_types.h | 164 +
+ .../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 | 36 +
+ .../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 | 268 +
+ .../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 | 592 +
+ .../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 | 204 +
+ .../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 | 11487 +++++++++++++++++++
+ .../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 | 356 +
+ .../atomisp/pci/atomisp2/css2400/sh_css_firmware.h | 57 +
+ .../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 | 1113 ++
+ .../atomisp/pci/atomisp2/css2400/sh_css_irq.c | 16 +
+ .../pci/atomisp2/css2400/sh_css_lace_stat.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 | 752 ++
+ .../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 | 5285 +++++++++
+ .../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 | 1898 +++
+ .../media/atomisp/pci/atomisp2/css2400/sh_css_sp.h | 262 +
+ .../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 | 741 ++
+ .../media/atomisp/pci/atomisp2/hmm/hmm_bo.c | 1542 +++
+ .../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 | 265 +
+ .../media/atomisp/platform/intel-mid/Makefile | 5 +
+ .../platform/intel-mid/atomisp_gmin_platform.c | 760 ++
+ .../platform/intel-mid/intel_mid_pcihelpers.c | 297 +
+ drivers/staging/media/cxd2099/cxd2099.c | 101 +-
+ .../staging/media/davinci_vpfe/davinci_vpfe_user.h | 24 +-
+ .../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_sasem.c | 2 +-
+ drivers/staging/media/lirc/lirc_sir.c | 8 +-
+ 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 | 10 +-
+ 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/r8192E_dev.c | 32 +-
+ drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 13 +-
+ drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +-
+ drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +-
+ drivers/staging/rtl8192e/rtllib_wx.c | 2 +-
+ 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 | 8 +-
+ 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_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 | 84 +-
+ drivers/staging/sm750fb/ddk750_mode.h | 4 +-
+ 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/speakup/buffers.c | 36 +-
+ drivers/staging/speakup/i18n.c | 77 +-
+ drivers/staging/speakup/keyhelp.c | 14 +-
+ drivers/staging/speakup/kobjects.c | 96 +-
+ drivers/staging/speakup/main.c | 163 +-
+ drivers/staging/speakup/selection.c | 2 +-
+ drivers/staging/speakup/serialio.c | 37 +-
+ drivers/staging/speakup/speakup.h | 3 +-
+ drivers/staging/speakup/speakup_acntpc.c | 13 +-
+ drivers/staging/speakup/speakup_acntsa.c | 1 +
+ drivers/staging/speakup/speakup_apollo.c | 8 +-
+ drivers/staging/speakup/speakup_audptr.c | 3 +-
+ drivers/staging/speakup/speakup_bns.c | 1 +
+ drivers/staging/speakup/speakup_decext.c | 10 +-
+ drivers/staging/speakup/speakup_decpc.c | 93 +-
+ drivers/staging/speakup/speakup_dectlk.c | 14 +-
+ drivers/staging/speakup/speakup_dtlk.c | 4 +
+ drivers/staging/speakup/speakup_dtlk.h | 10 +-
+ drivers/staging/speakup/speakup_dummy.c | 1 +
+ drivers/staging/speakup/speakup_keypc.c | 3 +
+ drivers/staging/speakup/speakup_ltlk.c | 1 +
+ drivers/staging/speakup/speakup_soft.c | 93 +-
+ drivers/staging/speakup/speakup_spkout.c | 1 +
+ drivers/staging/speakup/speakup_txprt.c | 1 +
+ drivers/staging/speakup/spk_priv.h | 15 +-
+ drivers/staging/speakup/spk_types.h | 9 +-
+ drivers/staging/speakup/synth.c | 63 +-
+ drivers/staging/unisys/include/iochannel.h | 4 +-
+ drivers/staging/unisys/visorbus/vbuschannel.h | 2 +-
+ drivers/staging/unisys/visorbus/visorbus_main.c | 44 +-
+ drivers/staging/unisys/visorbus/visorchannel.c | 21 +-
+ drivers/staging/unisys/visorbus/visorchipset.c | 393 +-
+ drivers/staging/unisys/visorhba/visorhba_main.c | 71 +-
+ drivers/staging/unisys/visornic/visornic_main.c | 70 +-
+ 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 | 25 +-
+ .../bcm2835-audio/bcm2835-pcm.c | 11 +-
+ .../bcm2835-audio/bcm2835-vchiq.c | 143 +-
+ .../{ => vc04_services}/bcm2835-audio/bcm2835.c | 0
+ .../{ => vc04_services}/bcm2835-audio/bcm2835.h | 23 +-
+ .../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 | 256 +-
+ .../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 | 548 +-
+ .../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/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 | 13 +-
+ drivers/staging/wilc1000/wilc_spi.c | 78 +-
+ drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 42 +-
+ 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/sched.h | 4 -
+ 1343 files changed, 216021 insertions(+), 6864 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/iio/accel/adxl345.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/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
+ 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} (64%)
+ 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} (62%)
+ delete mode 100644 drivers/staging/iio/accel/adis16240.h
+ delete mode 100644 drivers/staging/iio/meter/ade7753.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_lace_stat.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_memory_access.h
+ 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/iefd2_6/ia_css_iefd2_6.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iefd2_6/ia_css_iefd2_6.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.c
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iefd2_6/ia_css_iefd2_6_default.host.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iefd2_6/ia_css_iefd2_6_param.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iefd2_6/ia_css_iefd2_6_state.h
+ create mode 100644 drivers/staging/media/atomisp/pci/atomisp2/css2400/isp/kernels/iefd2_6/ia_css_iefd2_6_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_lace_stat.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 (94%)
+ rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-pcm.c (98%)
+ rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835-vchiq.c (91%)
+ rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.c (100%)
+ rename drivers/staging/{ => vc04_services}/bcm2835-audio/bcm2835.h (86%)
+ 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 (9920ed1461bb mux: core: fix error handling in devm_mux_chip_alloc)
+$ git merge mux/for-next
+Auto-merging MAINTAINERS
+Merge made by the 'recursive' strategy.
+ .../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 (7c2a156dd136 Merge branch 'for-linus' into next)
+$ git merge slave-dma/next
+Merge made by the 'recursive' strategy.
+ .../devicetree/bindings/usb/da8xx-usb.txt | 41 +++++++-
+ drivers/dma/Kconfig | 6 +-
+ drivers/dma/bcm2835-dma.c | 5 +-
+ drivers/dma/cppi41.c | 106 ++++++++++++++-------
+ drivers/dma/dmaengine.c | 2 +
+ drivers/dma/imx-sdma.c | 2 +-
+ drivers/dma/mv_xor.c | 5 -
+ drivers/dma/stm32-dma.c | 2 +-
+ 8 files changed, 122 insertions(+), 47 deletions(-)
+Merging cgroup/for-next (b4eba5f81324 Merge branch 'for-4.11-fixes' 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 | 28 +++++++++++++++++++++++++---
+ include/linux/sched.h | 4 ++++
+ kernel/cgroup/cgroup-internal.h | 5 +++--
+ kernel/cgroup/cgroup-v1.c | 4 ++--
+ kernel/cgroup/cgroup.c | 17 +++++++++--------
+ kernel/cgroup/namespace.c | 2 +-
+ kernel/kthread.c | 3 +++
+ 8 files changed, 49 insertions(+), 17 deletions(-)
+Merging scsi/for-next (ca4a213db0b6 Merge remote-tracking branch 'mkp-scsi/4.11/scsi-fixes' into fixes)
+$ git merge scsi/for-next
+Merge made by the 'recursive' strategy.
+ drivers/scsi/Kconfig | 14 --------
+ drivers/scsi/hpsa.c | 53 +++++++++++++++++------------
+ drivers/scsi/hpsa.h | 1 +
+ drivers/scsi/hpsa_cmd.h | 2 ++
+ drivers/scsi/lpfc/lpfc_attr.c | 4 +--
+ drivers/scsi/lpfc/lpfc_init.c | 7 ++++
+ drivers/scsi/lpfc/lpfc_nvme.c | 8 ++---
+ drivers/scsi/lpfc/lpfc_nvmet.c | 8 ++---
+ drivers/scsi/megaraid/megaraid_sas.h | 4 +--
+ drivers/scsi/megaraid/megaraid_sas_base.c | 17 ++++++---
+ drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 +--
+ drivers/scsi/ufs/ufshcd.c | 2 +-
+ 12 files changed, 69 insertions(+), 55 deletions(-)
+Merging scsi-mkp/for-next (33bd712be7d2 scsi: esas2r: Remove redundant NULL check on buffer)
+$ git merge scsi-mkp/for-next
+Auto-merging include/scsi/libiscsi.h
+Auto-merging drivers/scsi/qedi/qedi_iscsi.c
+Auto-merging drivers/scsi/libiscsi.c
+Merge made by the 'recursive' strategy.
+ drivers/scsi/esas2r/esas2r_log.c | 5 -
+ drivers/scsi/libfc/fc_fcp.c | 6 +-
+ drivers/scsi/libiscsi.c | 8 +-
+ drivers/scsi/qedi/qedi_iscsi.c | 2 +-
+ drivers/scsi/sgiwd93.c | 2 +-
+ drivers/scsi/sni_53c710.c | 2 +-
+ drivers/scsi/stex.c | 287 +++++++++++++++++++++++++++++----------
+ drivers/scsi/zalon.c | 2 +-
+ include/scsi/libfc.h | 3 +-
+ include/scsi/libiscsi.h | 3 +-
+ 10 files changed, 233 insertions(+), 87 deletions(-)
+Merging target-updates/for-next (c87ba9c49c1f target: Add counters for ABORT_TASK success + failure)
+$ git merge target-updates/for-next
+Already up-to-date.
+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 (9332bd9ef480 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.
+ drivers/ata/Kconfig | 9 -
+ drivers/ata/Makefile | 1 -
+ drivers/ata/ahci_octeon.c | 5 -
+ drivers/ata/libata-core.c | 8 +-
+ drivers/ata/pata_at91.c | 503 -----------------------------------------
+ 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 +-
+ 10 files changed, 9 insertions(+), 527 deletions(-)
+ 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 (80363894995b virtio_mmio: expose header to userspace)
+$ git merge vhost/linux-next
+Merge made by the 'recursive' strategy.
+Merging rpmsg/for-next (349709ba5bea Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next)
+$ git merge rpmsg/for-next
+Already up-to-date!
+Merge made by the 'recursive' strategy.
+Merging gpio/for-next (acac0e697c5e Merge branch 'devel' into for-next)
+$ git merge gpio/for-next
+Recorded preimage for 'drivers/input/misc/soc_button_array.c'
+Auto-merging include/linux/acpi.h
+Auto-merging drivers/input/misc/soc_button_array.c
+CONFLICT (content): Merge conflict in drivers/input/misc/soc_button_array.c
+Automatic merge failed; fix conflicts and then commit the result.
+$ git commit -v -a
+Recorded resolution for 'drivers/input/misc/soc_button_array.c'.
+[master 5189af084728] Merge remote-tracking branch 'gpio/for-next'
+$ git diff -M --stat --summary HEAD^..
+ .../devicetree/bindings/gpio/gpio-thunderx.txt | 27 +++++++
+ Documentation/gpio/consumer.txt | 6 ++
+ drivers/gpio/Kconfig | 10 +--
+ drivers/gpio/devres.c | 2 +-
+ drivers/gpio/gpio-104-dio-48e.c | 38 ++++-----
+ drivers/gpio/gpio-altera-a10sr.c | 2 +-
+ drivers/gpio/gpio-altera.c | 50 ++++++------
+ 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-ml-ioh.c | 28 ++-----
+ drivers/gpio/gpio-mockup.c | 23 +-----
+ drivers/gpio/gpio-mvebu.c | 75 ++++++++++--------
+ drivers/gpio/gpio-mxc.c | 6 +-
+ drivers/gpio/gpio-mxs.c | 6 +-
+ drivers/gpio/gpio-omap.c | 3 +-
+ drivers/gpio/gpio-pch.c | 14 +---
+ drivers/gpio/gpio-pl061.c | 28 +++----
+ drivers/gpio/gpio-pxa.c | 2 +-
+ 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-xgene.c | 13 +---
+ drivers/gpio/gpio-xlp.c | 9 ++-
+ drivers/gpio/gpio-zx.c | 24 +++---
+ drivers/gpio/gpiolib-acpi.c | 53 ++++++++++---
+ drivers/gpio/gpiolib.c | 6 +-
+ drivers/input/misc/soc_button_array.c | 5 +-
+ drivers/platform/x86/surface3_button.c | 5 +-
+ drivers/tty/serial/st-asc.c | 11 +--
+ include/linux/acpi.h | 11 +++
+ include/linux/gpio/consumer.h | 28 ++-----
+ 36 files changed, 434 insertions(+), 361 deletions(-)
+ create mode 100644 Documentation/devicetree/bindings/gpio/gpio-thunderx.txt
+Merging pinctrl/for-next (fec6696b0769 Merge branch 'devel' into for-next)
+$ git merge pinctrl/for-next
+Merge made by the 'recursive' strategy.
+ .../bindings/pinctrl/allwinner,sunxi-pinctrl.txt | 3 +-
+ .../bindings/pinctrl/rockchip,pinctrl.txt | 4 +-
+ 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/meson/pinctrl-meson-gxbb.c | 4 +-
+ 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 | 223 ++++++++++++++++++++-
+ drivers/pinctrl/qcom/pinctrl-msm.c | 4 -
+ drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 14 +-
+ drivers/pinctrl/samsung/pinctrl-samsung.c | 15 +-
+ 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/ti/Kconfig | 2 +-
+ 22 files changed, 512 insertions(+), 150 deletions(-)
+ create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun50i-a64-r.c
+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 b1a1fd573a2e] 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 (10517429b5ac livepatch: make klp_mutex proper part of API)
+$ git merge livepatching/for-next
+Auto-merging kernel/fork.c
+Auto-merging include/linux/sched.h
+Auto-merging arch/x86/kernel/unwind_frame.c
+Auto-merging arch/x86/Kconfig
+Auto-merging arch/s390/kernel/entry.S
+Auto-merging arch/Kconfig
+Merge made by the 'recursive' strategy.
+ 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 | 31 +-
+ 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 | 437 +++++++----------
+ 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, 1560 insertions(+), 354 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 (6de8ad2f92ea coresight: Fixes coresight DT parse to get correct output port ID.)
+$ 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/of_coresight.c | 2 +-
+ 7 files changed, 52 insertions(+), 42 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 (52084f89b38c device-dax: fix debug output typo)
+$ git merge nvdimm/libnvdimm-for-next
+Merge made by the 'recursive' strategy.
+ drivers/dax/dax.c | 33 ++++++++++++++++++++++++++++++---
+ 1 file changed, 30 insertions(+), 3 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 (20518a1747d5 initramfs: use vfs_stat/lstat directly)
+$ git merge --no-ff akpm-current/current
+Auto-merging mm/rmap.c
+Auto-merging mm/kasan/kasan.c
+Auto-merging lib/vsprintf.c
+Auto-merging lib/Kconfig.debug
+Auto-merging kernel/locking/lockdep.c
+Auto-merging include/linux/sched.h
+Auto-merging fs/jbd2/journal.c
+Auto-merging Documentation/filesystems/proc.txt
+Merge made by the 'recursive' strategy.
+ Documentation/cgroup-v2.txt | 5 +
+ Documentation/filesystems/proc.txt | 6 +
+ arch/arm/include/asm/page.h | 2 +
+ arch/mips/kernel/perf_event_mipsxx.c | 2 +-
+ arch/s390/kernel/perf_cpum_sf.c | 2 +-
+ arch/sparc/lib/NG4memset.S | 26 +-
+ arch/x86/include/asm/atomic.h | 100 +++----
+ arch/x86/include/asm/atomic64_32.h | 86 +++---
+ arch/x86/include/asm/atomic64_64.h | 90 +++----
+ arch/x86/include/asm/cmpxchg.h | 12 +-
+ arch/x86/include/asm/cmpxchg_32.h | 8 +-
+ arch/x86/include/asm/cmpxchg_64.h | 4 +-
+ arch/x86/kernel/machine_kexec_64.c | 1 +
+ block/genhd.c | 2 +-
+ drivers/block/zram/zram_drv.c | 8 +-
+ drivers/virt/fsl_hypervisor.c | 7 +-
+ firmware/Makefile | 3 +-
+ fs/dax.c | 44 +++-
+ fs/dcache.c | 18 +-
+ fs/inode.c | 14 +-
+ fs/jbd2/journal.c | 9 +
+ fs/jbd2/transaction.c | 12 +
+ fs/namespace.c | 10 +-
+ fs/ocfs2/cluster/tcp.c | 5 +-
+ fs/ocfs2/dlm/dlmmaster.c | 66 +++--
+ fs/ocfs2/dlm/dlmrecovery.c | 40 ++-
+ fs/proc/inode.c | 2 +-
+ fs/proc/task_mmu.c | 17 +-
+ 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/asm-generic/atomic-instrumented.h | 246 +++++++++++++++++
+ include/linux/bootmem.h | 2 +
+ include/linux/cpumask.h | 4 +-
+ include/linux/gfp.h | 18 +-
+ include/linux/jbd2.h | 2 +
+ include/linux/kasan-checks.h | 10 +-
+ include/linux/kexec.h | 2 +
+ include/linux/ksm.h | 5 +-
+ include/linux/memcontrol.h | 1 +
+ include/linux/mm.h | 2 +
+ include/linux/mmu_notifier.h | 13 -
+ include/linux/mmzone.h | 10 +-
+ include/linux/page-isolation.h | 5 +-
+ include/linux/rmap.h | 47 ++--
+ include/linux/rodata_test.h | 1 -
+ include/linux/sched.h | 6 +-
+ 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 +-
+ init/main.c | 2 +
+ kernel/hung_task.c | 8 +-
+ kernel/locking/lockdep.c | 11 +-
+ kernel/locking/qspinlock_paravirt.h | 3 +-
+ kernel/pid.c | 7 +-
+ kernel/taskstats.c | 14 +
+ lib/Kconfig.debug | 14 +-
+ lib/Makefile | 1 +
+ 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/compaction.c | 89 +++++--
+ mm/filemap.c | 16 +-
+ mm/huge_memory.c | 99 ++++---
+ mm/internal.h | 36 ++-
+ mm/kasan/kasan.c | 7 +-
+ 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 | 2 +-
+ mm/migrate.c | 17 +-
+ mm/mlock.c | 6 +-
+ mm/page-writeback.c | 5 +-
+ mm/page_alloc.c | 256 +++++++++++-------
+ mm/page_idle.c | 4 +-
+ mm/page_isolation.c | 11 +-
+ mm/page_owner.c | 4 +-
+ mm/rmap.c | 145 +++++------
+ mm/rodata_test.c | 17 +-
+ mm/sparse.c | 5 +-
+ mm/swap.c | 76 +++---
+ mm/swap_state.c | 12 +-
+ mm/swapfile.c | 33 ++-
+ mm/vmscan.c | 420 +++++++++++++++---------------
+ mm/vmstat.c | 91 ++++---
+ scripts/checkpatch.pl | 50 +++-
+ scripts/gdb/linux/constants.py.in | 7 +
+ scripts/gdb/linux/proc.py | 73 ++++++
+ usr/Kconfig | 10 +
+ 102 files changed, 2082 insertions(+), 1285 deletions(-)
+ create mode 100644 include/asm-generic/atomic-instrumented.h
+ 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 f7dee369ca84] Merge branch 'akpm-current/current'
+ Date: Mon Mar 20 15:40:46 2017 +1100
+$ git clone -s -l -n -q . ../rebase-tmp
+$ cd ../rebase-tmp
+$ git checkout -b akpm remotes/origin/akpm/master
+Switched to a new branch 'akpm'
+$ git rebase --onto master remotes/origin/akpm/master-base
+First, rewinding head to replay your work on top of it...
+Applying: mm: introduce kv[mz]alloc helpers
+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
+error: Failed to merge in the changes.
+Using index info to reconstruct a base tree...
+M Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
+M sound/soc/soc-core.c
+Falling back to patching base and 3-way merge...
+Auto-merging sound/soc/soc-core.c
+Auto-merging Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
+CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/net/brcm,unimac-mdio.txt
+Patch failed at 0013 scripts/spelling.txt: Add regsiter -> register spelling mistake
+The copy of the patch that failed is found in: .git/rebase-apply/patch
+
+When you have resolved this problem, run "git rebase --continue".
+If you prefer to skip this patch, run "git rebase --skip" instead.
+To check out the original branch and stop rebasing, run "git rebase --abort".
+
+$ git rebase --continue
+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: x86/atomic: move __arch_atomic_add_unless out of line
+Applying: x86-atomic-move-__atomic_add_unless-out-of-line-fix
+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
+ + bd4c5a00adab...d12bc4bff0a0 akpm -> akpm/master (forced update)
+$ rm -rf ../rebase-tmp
+Merging akpm/master (d12bc4bff0a0 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/x86/include/asm/atomic.h | 24 +-----
+ 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/lib/Makefile | 1 +
+ arch/x86/lib/atomic.c | 27 +++++++
+ 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/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/ext4/mballoc.c | 2 +-
+ fs/ext4/super.c | 4 +-
+ fs/f2fs/f2fs.h | 20 -----
+ fs/f2fs/file.c | 4 +-
+ fs/f2fs/node.c | 4 +-
+ fs/f2fs/segment.c | 14 ++--
+ fs/file.c | 2 +-
+ fs/inode.c | 2 +-
+ 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/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/module.c | 5 +-
+ 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/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 +----
+ 196 files changed, 609 insertions(+), 824 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 arch/x86/lib/atomic.c
+ create mode 100644 include/asm-generic/set_memory.h
+$ git am -3 ../patches/0001-mm-introduce-kv-mz-alloc-helpers-f2fs-fix-up.patch
+Applying: mm: introduce kv[mz]alloc helpers - f2fs fix up
+$ git reset HEAD^
+Unstaged changes after reset:
+M fs/f2fs/node.c
+$ git add -A .
+$ git commit -v -a --amend
+[master 05f78875e280] Merge branch 'akpm/master'
+ Date: Mon Mar 20 16:12:49 2017 +1100
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..9a89053e3169
--- /dev/null
+++ b/localversion-next
@@ -0,0 +1 @@
+-next-20170320