diff options
| -rw-r--r-- | Next/SHA1s | 258 | ||||
| -rw-r--r-- | Next/Trees | 260 | ||||
| -rw-r--r-- | Next/merge.log | 7197 | ||||
| -rw-r--r-- | Next/quilt-import.log | 17 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 7733 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e827a24ea2fa --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,258 @@ +Name SHA1 +---- ---- +origin 35277995e17919ab838beae765f440674e8576eb +fixes 820bf5c419e4b85298e5c3001bd1b5be46d60765 +kbuild-current 36c1681678b507346e7397a235a7303dad665fc3 +arc-current a46f24acf8bce70b5fdd6774793d121e54b99e97 +arm-current 091f02483df7b56615b524491f404e574c5e0668 +m68k-current 2334b1ac1235934fc196f2d25bae7f348d3bf42e +metag-fixes b884a190afcecdbef34ca508ea5ee88bb7c77861 +powerpc-fixes 1b689a95ce7427075f9ac9fb4aea1af530742b7f +sparc aebb48f5e465772576359c1705c4a84abea92027 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net a6b88814ab541d386d793f6df260a3e4d5cccb11 +bpf 09c0656dfabd0b15e410eca67dc45cb14ec9c13a +ipsec 545d8ae7affff7fb4f8bfd327c7c7790056535c4 +netfilter 743ffffefac1c670c6618742c923f6275d819604 +ipvs f7fb77fc12352d15180dc3c08ffba10573d5167d +wireless-drivers a9e6d44ddeccd3522670e641f1ed9b068e746ff7 +mac80211 c4de37ee2b55deac7d6aeac33e02e3d6be243898 +rdma-fixes ae59c3f0b6cfd472fed96e50548a799b8971d876 +sound-current 1c9609e3a8cf5997bd35205cfda1ff2218ee793b +pci-current 838cda3697073982acd276ac43387b2a0aed04b4 +driver-core.current 4bf772b14675411a69b3c807f73006de0fe4b649 +tty.current 4bf772b14675411a69b3c807f73006de0fe4b649 +usb.current 4bf772b14675411a69b3c807f73006de0fe4b649 +usb-gadget-fixes b2cd1df66037e7c4697c7e40496bf7e4a5e16a2d +usb-serial-fixes d14ac576d10f865970bb1324d337e5e24d79aaf4 +usb-chipidea-fixes 964728f9f407eca0b417fdf8e784b7a76979490c +phy 2b88212c4cc67ff33dec5bb4d690044b97a5f979 +staging.current 4bf772b14675411a69b3c807f73006de0fe4b649 +char-misc.current 4bf772b14675411a69b3c807f73006de0fe4b649 +input-current 0004520af32fca8b40abe78c11654be4e9e20fdf +crypto-current 2d55807b7f7bf62bb05a8b91247c5eb7cd19ac04 +ide 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +vfio-fixes 563b5cbe334e9503ab2b234e279d500fc4f76018 +kselftest-fixes ae64f9bd1d3621b5e60d7363bc20afb46aede215 +backlight-fixes 8ff5cbc6e3c5c2855245c014f3ba572ddfc5ab0f +nand-fixes ee02f73e04c0e690600f621a3a1d2245834af7fe +spi-nor-fixes 10a6a6975691775bbcc677a04c6fd3120b5c1160 +mfd-fixes 107b7d9fa94c4692d9104243f0e793e2a4e1366e +v4l-dvb-fixes 781b045baefdabf7e0bc9f33672ca830d3db9f27 +reset-fixes f450f28e70a2378d9d6ded0932fe480055888cfa +mips-fixes f35764e74f0e45e1d89ca9ed9c8299f5e746a4d1 +kvm-fixes d8a5b80568a9cb66810e75b182018e9edb68e8ff +kvms390-fixes 1de1ea7efeb9e8543212210e34518b4049ccd285 +drm-intel-fixes d8a5b80568a9cb66810e75b182018e9edb68e8ff +drm-misc-fixes 54f809cfbd6b4a43959039f5d33596ed3297ce16 +kbuild 53a7bc8937df7593b2a330c2cb5b3d57f8da2955 +uuid c0020756315eebec58310aca42cf9fb73e1322eb +dma-mapping 04f56534786c885f578c24461bcd782fe9a787cf +asm-generic a351e9b9fc24e982ec2f0e76379a49826036da12 +arc 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +arm 3a175cdf439275c3da347b6b42c4e9b652a12904 +arm-perf 7520fa99246dade7ab6dde1573a146beed632abd +arm-soc 2aa127e4d579def8ff77fbaadf53a4034e43158f +actions 61862a89e6acb61e1193c3ad6d4eeab966c470ed +alpine a1144b2b1ec47f50951a83eb2bd847c74415b567 +amlogic ea879b13a92ba2c5cd1ac56353198bfe21066bf3 +aspeed 8203ca9789bc48f14cf18d261dc62ecd6839b684 +at91 fa4cf68ab4b1972161d38bce2859850da4236994 +bcm2835 a6189bcc00123f47a256d5a6a46d93c9a2cab52e +imx-mxs 824162aa14541985f85a3ed1f2b80dfe73014c84 +keystone a29b8b93e1582aaff0b13b84679b3dda935186d9 +mvebu 91cbd0893d7dc783b86b1b9130a6b04ea2e69a63 +omap e38c387289510c00e7d7be44aad4d8d4ec1ca6ec +reset 70d2f16a6289a9ef13c56e408acd3aad6a6415c2 +qcom f5788d2f292935cb841cb57a61868360fd726de6 +realtek 2b6286eb7ab8b9a22f7238bdaad403badd4a93e9 +renesas b214f9f550fd0a23144381e9199fbcdff5e36b1e +rockchip 5432915256e7b01c0b5134c15effd2b85941bf70 +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 3b6327365aba56a5b11ff0d77da79ac544c42080 +sunxi d7ec2c507677136c4ad09adf59746694a01f014f +tegra 983371acdeda5fd76cab580f66438c02d633d512 +arm64 ec89ab50a03a33a4a648869e868b1964354fb2d1 +clk c43a52cfd27b20292d19d924eddfa5ff8dce87e5 +clk-samsung 7685570f2ae2abfff8a46f8a89dcf0d26f2130bf +c6x 9d440f7a282433338207c4ffb13cafaccaa27818 +cris fd989db807a00d552ebf29d8ffb20c2ef04742da +m68k 2334b1ac1235934fc196f2d25bae7f348d3bf42e +m68knommu 0d665e7b109d512b7cae3ccef6e8654714887844 +metag e3cd7f013bac3105d44b8bd5a90359989d45b5a5 +microblaze 7b6ce52be3f86520524711a6f33f3866f9339694 +mips ea4d340cbea470247b19ee696e31f102bc64466a +mips-james 6045f241b48f07b2fb80905bf49671f457a8c037 +nios2 65d1e3ddeae117f6a224535e10a09145f0f96508 +openrisc 0fedb7653af7a8cac606c3eff213ac92693035b9 +parisc-hd bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +powerpc 015eb1b89e959c9349f0a01803fb8ed1ced36f09 +fsl c095ff93f901c1620b28dce4d813dd548bc5236b +risc-v 4889dec6c87d90619cc1e8436327b91f4bb0e467 +s390 279d2cea3aad4303cd100b9d2a47bea0100c7ede +sparc-next 8e44e6600caa7b96a5b71ae36c8829db753c2d70 +sh 6e2fbfdd585f46128ce8879738bca09719a65138 +uml 02eb0b11eab56b47bcc36aa04dd522786c8faab9 +xtensa 73b37067623c682edd4153640d09728a7c581a33 +fscrypt 0b1dfa4cc6c60052b2c30ead316fa84c46d3c43c +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 7c9a09f56a91c4ee5636703d3a95c72710917718 +btrfs-kdave d69a3372bba20c49d631c13708ec672a6f746c88 +ceph 16515a6d54183349b858b9c05e483afc55fa7948 +cifs 89f51d817f87f6aa68675334f590394ef03633b3 +configfs 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 +ecryptfs 4670269faba728683f7250319a65390946c028e3 +ext3 f463589a7cd2d156e3b6b64ee26588c0cdcce08a +ext4 5dc397113d195a004899ee672c5a8a19809495ba +f2fs 1c1d35df71104c76a4a2e25862926f22c334c9d6 +fuse c6cdd51404b7ac12dd95173ddfc548c59ecf037f +jfs 86313903430d08739e391ad51b4865dc3a2bf522 +nfs e231c6879cfd44e4fffd384bb6dd7d313249a523 +nfs-anna c54c14ba000d769b7f5e4a33f915f0171b378437 +nfsd 3ac71a649c3d88c9587497455b6ee2d0a7e0c45e +orangefs db0267e7afc72e04d92b845a00928e39be211d6a +overlayfs 8383f1748829e1a6a07988863ed13a47fb653387 +ubifs 7f29ae9f977bcdc3654e68bc36d170223c52fd48 +xfs 76883f7988e6d06a97232e979bc7aaa7846a134b +file-locks 1deab8ce2c91e3b16563b7a7ea150f82334262ec +vfs 27f005e635c62d7e4f6b170aabeea8e6e00ff1aa +vfs-miklos 0eb8af4916a540c362a2950e5ab54eca32eb7d58 +iversion bec5a1426bb8c395255dc8f933eca76a515b573f +printk bb4f552a598d40624343bc0815e594efd4d6ec3d +pci ab8c609356fbe8dbcd44df11e884ce8cddf3739e +pstore a99f41a1b4412a0f27cc0b287ea34b168da750f1 +hid 494622678bc9c4f4f45495a635780383c9c0606d +i2c a2cdd4be7a2c9e5f6b1633ae49ca4e6db38574d1 +dmi 36a840c73dc6e70a440d05da3b6ee72f7187a5d3 +hwmon-staging 6fbc4232a5ac944531bda397f3644d1cf66bdd13 +jc_docs 54e36a2dc554685463af54b4ac97a5ec022bd09c +v4l-dvb 273caa260035c03d89ad63d72d8cd3d9e5c5e3f1 +v4l-dvb-next a1dfb4c48cc1e64eeb7800a27c66a6f7e88d075a +fbdev 5865889fe4319415e439095391dda52f23030d60 +pm 1c7385dbf8c55d0866172fdf70320c8f11b1ac15 +cpupower 0e96a0c83f0842d5cfd83b0a896bc82ff61f9849 +idle 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f +opp e856f078bcf120e1627c750014d2612974ed81a2 +thermal 134f4010799a30acd969e603985c27b9f3e6f58d +thermal-soc d0ecbbbe518e1b256fcda1770ec06a5a1a058567 +ieee1394 188775181bc05f29372b305ef96485840e351fde +dlm 9250e523592a8ced3ecd14abe29fbb1e036bd7eb +swiotlb 69369f52d28a34c84acb6f2a8a585e743441566a +net-next 617aebe6a97efa539cc4b8a52adccd89596e6be0 +bpf-next 617aebe6a97efa539cc4b8a52adccd89596e6be0 +ipsec-next 255442c93843f52b6891b21d0b485bf2c97f93c3 +netfilter-next c746fc0e8b2d144e2ee9122e4efd72326ff3cd1b +nfc-next 4d63adfe12dd9cb61ed8badb4d798955399048c2 +ipvs-next a910d20aa007b94cf1799df59341f5e27ca60e6f +wireless-drivers-next cbbde7e8d98542dc1777ac42ec2a08875aea26ee +bluetooth 617aebe6a97efa539cc4b8a52adccd89596e6be0 +mac80211-next ff84e7bfe1763982e1ada390386dbe4739cee1e2 +rdma e9d1e389273aac7fc50c53f0d4492dc190185882 +gfs2 7ac07fdaf840f9b141c6d5c286805107227c0e68 +mtd fee4380f368e84ed216b62ccd2fbc4126f2bf40b +l2-mtd 571cb17b23eccc22f18c4fc0a0fc34cf0abca7ef +nand f4c6cd1a7f2275d5bc0e494b21fff26f8dde80f0 +spi-nor 23bae78e8a57f0249ed9e3f9c3f40fc1499ce0d4 +crypto 2d55807b7f7bf62bb05a8b91247c5eb7cd19ac04 +drm 24b8ef699e8221d2b7f813adaab13eec053e1507 +drm-panel e4bac408b08437d190785ab1250cc676304ed171 +drm-intel 751b01cb07ebf0dbbe4a4fbfeaa509388e4a2b0a +drm-tegra 8f62142e490d761ceb92b55a7c05bb79294d6c6c +drm-misc 761e05a702f5d537ffcca1ba933f9f0a968aa022 +drm-msm 51f55992d13b0c6d60baa832453403d736091166 +hdlcd f73e8b82531573a198a4d0e5bff0d3256cbbd1d8 +mali-dp 54243016ae35a0912a680f884835237fd6176820 +sunxi-drm 7dafb83edd3271917458de0ae70586ac63098e2f +imx-drm 4cfea3c1f2718d945ca44c1aaac47d8d513c4478 +etnaviv a181196c86e1166fdacf2435f4fe7345558613f0 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap a75de77211842a7e120ce95ad156e4b3704dcde7 +sound 1c9609e3a8cf5997bd35205cfda1ff2218ee793b +sound-asoc 56821b5652e2228ba875b72c73f4d8450b63e032 +modules 0cad61d7a3d51e0237a7e421c75b04ebbb5062d0 +input 10a558374f3751cf4eb55143008975641dfc2cf4 +block 0ccfb3c0032b20a7f137976e9e783c896d55301e +lightnvm 1c6286f26301ad154a1c10fb6e68925493dd28ba +device-mapper de6ff5c58656d69f5a58c1e7353532bcf1ebe0d6 +mmc 56174d9a21496fce64fcc6ba2f475734c20c12e4 +kgdb 40b90efeae9be8702d387dbcbb3aadc57033d4db +md 1532d9e87e8b2377f12929f9e40724d5fbe6ecc5 +mfd 0f89ffefa4e122e7e9bc1c2d716c6052b4601b76 +backlight 2023b0524a6310e9ea80daf085f51c71bff9289f +battery 8be4c3667cf117b8f8a2b0b73a34258d45992867 +regulator c8f64f281824d238a36ef948236649c56c9e6926 +security 400f428062af7e9200ff15dce2ef3c01ff007d96 +integrity d56f30ac85c067d0d3a6c4f293f655dc298cb5ce +keys 1e684d3820d8f72d877c0adb521ae17c6fc9bc88 +selinux 4b14752ec4e0d87126e636384cf37c8dd9df157c +tpmdd 68021bf4734d15c9a9ed1c1072b9ebcfda3e39cc +watchdog 592a547adf686dbec7687e816ecdf9101fe227f5 +iommu fedbd940d1c2e37e6b11cf84f67b30dfcbf6fba5 +dwmw2-iommu 910170442944e1f8674fd5ddbeeb8ccd1877ea98 +vfio 46ed90f157f42d956ffed17c003f089a59b76e3e +trivial 1972d6c0c86dd8620ff9f2811ce875135ffb5405 +audit d8a5b80568a9cb66810e75b182018e9edb68e8ff +devicetree 3a6fbcb2e2e4b263df1cc8647ce1858c57ddc805 +mailbox 0ae7d327a64b262443b7d3ebee5831e4dde47b89 +spi d0cb047a0edb3871a41c5261c6b0083c9a436b97 +tip 0b4368acd659c70c3d98f6f8d4405b1a11b4c7b8 +clockevents 322fd24f5e67c396f04bef01ed33ac6bfca46bcd +edac 345fb0a9a6340ba0b3b714d62f877fde88c8a755 +edac-amd 68fa24f9121c04ef146b5158f538c8b32f285be5 +irqchip c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201 +ftrace 841a915d20c7b22fc4f36f12368daf94d9f8cb10 +rcu 1dfa55e01987288d847220b8c027204871440ed1 +kvm 8dbfb2bf1bb3848a8069164e205635b2675c24fe +kvm-arm cd15d2050c044ca9525ba165e9073ac8e036b8d0 +kvm-mips dc44abd6aad22411f7f9890e39fd4753dabf0d03 +kvm-ppc 9b9b13a6d1537ddc4caccd6f1c41b78edbc08437 +kvms390 4b9f952577fb40875a2a163d80515a8daa0d6bef +xen-tip cf2acf66ad43abb39735568f55e1f85f9844e990 +percpu 85dcbba3b8b15c17d3237695440d09d12825184d +workqueues a10eb37ccf1d47f9d97269ede326aa949816be87 +drivers-x86 00f49ee79777876c37f50aa137e96c52aee24205 +chrome-platform d48b8c58c57f6edbe2965f0a5f62c5cf9593ca96 +hsi b6dc80dbe6cdf4effd5a07bcd37f34cbf25eb07a +leds 6a836631e303cec7fd9469ae53a4d97d0360eb38 +ipmi e45af3d372f1d4339663dcbef28665f5b15d448c +driver-core 4bf772b14675411a69b3c807f73006de0fe4b649 +usb 4bf772b14675411a69b3c807f73006de0fe4b649 +usb-gadget 8ada211d0383b72878582bd312b984a9eae62b30 +usb-serial d1c48227d7c45fbb35c81f846a62ec92a74f4701 +usb-chipidea-next ce4c1b820c5269437ce2e7831f638159b3b83269 +phy-next e4b227c1ca70ae779c39e5284742555b9e1cdf9f +tty 4bf772b14675411a69b3c807f73006de0fe4b649 +char-misc 4bf772b14675411a69b3c807f73006de0fe4b649 +extcon ca90a64dc671f4a18958078a4bf2e31e2ef57db9 +staging 4bf772b14675411a69b3c807f73006de0fe4b649 +mux 6cd361c99ef2bbe23edd554079c4187321a21219 +slave-dma 6c773ba2c8438e2c5325497da9fadff33ec49503 +cgroup 5ecf66c9dc2b707aea22f73c0e1882ffbd238bb9 +scsi f468cd2908f8959e0fdf08f0a9fa3bf17f613a67 +scsi-mkp a2390348c19d0819d525d375414a7cfdacb51a68 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +libata 83ab14e6cacc7ed2c340dd5408295b32cf06c620 +vhost d25cc43c6775bff6b8e3dad97c747954b805e421 +rpmsg 163c558b84fe180bf91e4129c28fe2791e278b01 +gpio d58f2bf261fdf3a3fc916c9999a686f959dcf6b6 +pinctrl 02e389e63e3523828fc3832f27e0341885f60f6f +pinctrl-samsung 4fbd8d194f06c8a3fd2af1ce560ddb31f7ec8323 +pwm bccaa3f917c90917a758020dfbdd9027290a7c4e +userns 9eba1cd4b565f66456e0705475f66bf32cd75ee1 +ktest f7c6401ff84ab8ffffc281a29aa0a787f7eb346e +random 9e66317d3c92ddaab330c125dfe9d06eee268aff +aio 2a8a98673c13cb2a61a6476153acf8344adfa992 +kselftest 0e9e327d1622c332e5b1db272d5c97af82164f68 +y2038 69973b830859bc6529a7a0468ba0d80ee5117826 +livepatching d13f5d84ca2774e76f8461a383c222cbc75adad5 +coresight d8a5b80568a9cb66810e75b182018e9edb68e8ff +rtc 4402be2b4ca7f53b6213a9e6b3abe9cdcc683e9b +nvdimm ee95f4059a833839bf52972191b2d4c3d3cec552 +idr f0f3f2d0a3e0f7c48163fd8b45f5909d46e7f371 +at24 0f30aca72c3b68f4b6a443193b574f14106cd61e +ntb 3b28c987fb9547ca9aac73241d0e281cf646387c +kspp e47e311843dece8073146f3606871280ee9beb87 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +akpm-current 902897dc0c88751a69e682779acc0bde7b9e1d6f +akpm e6f00959cebde9d13aeba831ce6a0b25a1ef95c1 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..89cd025c56b4 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,260 @@ +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 +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +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 +nand-fixes git git://git.infradead.org/linux-mtd.git#nand/fixes +spi-nor-fixes git git://git.infradead.org/linux-mtd.git#spi-nor/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +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 +uuid git git://git.infradead.org/users/hch/uuid.git#for-next +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-actions.git#for-next +alpine git git://git.kernel.org/pub/scm/linux/kernel/git/atenart/linux.git#alpine/for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git#for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +realtek git git://git.kernel.org/pub/scm/linux/kernel/git/afaerber/linux-realtek.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git#next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung git git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +c6x git git://linux-c6x.org/git/projects/linux-c6x-upstreaming.git#for-linux-next +cris git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git#for-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#mips-next +mips-james git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips.git#mips-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 +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#features +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +sh git git://git.libc.org/linux-sh#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml.git#linux-next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fscrypt git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt.git#master +befs git git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs.git#for-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git#next +btrfs-kdave git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.linux-nfs.org/~bfields/linux.git#nfsd-next +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.infradead.org/ubifs-2.6.git#linux-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6.git#for-next +vfs-miklos git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +dmi quilt http://jdelvare.nerim.net/devel/linux/jdelvare-dmi/ +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +fbdev git git://github.com/bzolnier/linux.git#fbdev-for-next +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +idle git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.infradead.org/mtd-2.6.git#master +l2-mtd git git://git.infradead.org/linux-mtd.git#mtd/next +nand git git://git.infradead.org/linux-mtd.git#nand/next +spi-nor git git://git.infradead.org/linux-mtd.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://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-msm git git://people.freedesktop.org/~robclark/linux#msm-next +hdlcd git git://linux-arm.org/linux-ld#for-upstream/hdlcd +mali-dp git git://linux-arm.org/linux-ld#for-upstream/mali-dp +sunxi-drm git git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux.git#sunxi-drm/for-next +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +kconfig git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +lightnvm git git://github.com/OpenChannelSSD/linux.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +tpmdd git git://git.infradead.org/users/jjs/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +dwmw2-iommu git git://git.infradead.org/iommu-2.6.git#master +vfio git git://github.com/awilliam/linux-vfio.git#next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#auto-latest +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#clockevents/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac.git#linux_next +edac-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.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 https://github.com/dvhart/linux-pdx86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/bleung/chrome-platform.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +usb-chipidea-next git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-next +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +slave-dma git git://git.infradead.org/users/vkoul/slave-dma.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +target-updates git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git#for-next +target-bva git git://git.kernel.org/pub/scm/linux/kernel/git/bvanassche/linux.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://github.com/andersson/remoteproc.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random.git#dev +aio git git://git.kvack.org/~bcrl/aio-next.git#master +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +y2038 git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git#y2038 +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +idr git git://git.infradead.org/users/willy/linux-dax.git#idr-4.11 +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +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..44494c8b98d7 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7197 @@ +$ date -R +Mon, 05 Feb 2018 09:15:43 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 8e44e6600caa Merge branch 'KASAN-read_word_at_a_time' +Merging origin/master (35277995e179 Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge origin/master +Updating 8e44e6600caa..35277995e179 +Fast-forward + Documentation/ABI/testing/rtc-cdev | 42 + + Documentation/ABI/testing/sysfs-class-ocxl | 35 + + Documentation/ABI/testing/sysfs-class-rtc | 91 + + Documentation/accelerators/ocxl.rst | 160 + + Documentation/admin-guide/kernel-parameters.txt | 16 +- + Documentation/core-api/printk-formats.rst | 34 +- + Documentation/devicetree/bindings/arm/actions.txt | 16 + + .../devicetree/bindings/arm/atmel-at91.txt | 32 - + Documentation/devicetree/bindings/arm/axentia.txt | 9 + + .../devicetree/bindings/arm/bcm/brcm,brcmstb.txt | 22 +- + Documentation/devicetree/bindings/arm/cpus.txt | 1 + + .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 + + Documentation/devicetree/bindings/arm/shmobile.txt | 4 + + .../devicetree/bindings/arm/technologic.txt | 11 + + Documentation/devicetree/bindings/bus/ti-sysc.txt | 37 + + .../bindings/clock/amlogic,gxbb-clkc.txt | 7 +- + .../devicetree/bindings/clock/hi3660-clock.txt | 6 + + .../devicetree/bindings/clock/qcom,a53pll.txt | 22 + + .../devicetree/bindings/clock/qcom,spmi-clkdiv.txt | 59 + + .../devicetree/bindings/clock/qoriq-clock.txt | 1 + + .../devicetree/bindings/clock/silabs,si5351.txt | 1 + + Documentation/devicetree/bindings/clock/sprd.txt | 63 + + .../devicetree/bindings/clock/sun8i-de2.txt | 5 +- + .../bindings/display/amlogic,meson-dw-hdmi.txt | 4 + + .../bindings/display/amlogic,meson-vpu.txt | 4 + + .../devicetree/bindings/display/ilitek,ili9225.txt | 25 + + .../bindings/display/panel/ilitek,ili9322.txt | 49 + + .../display/panel/mitsubishi,aa070mc01.txt | 7 + + .../bindings/display/panel/panel-common.txt | 10 + + .../bindings/display/panel/panel-lvds.txt | 1 + + .../bindings/display/panel/sgd,gktw70sdae4se.txt | 41 + + .../bindings/display/panel/simple-panel.txt | 2 +- + .../bindings/display/panel/tianma,tm070rvhg71.txt | 29 + + .../{toppoly,td028ttec1.txt => tpo,td028ttec1.txt} | 4 +- + .../devicetree/bindings/display/renesas,du.txt | 30 +- + .../bindings/display/rockchip/rockchip-vop.txt | 1 + + .../bindings/display/simple-framebuffer-sunxi.txt | 4 + + .../bindings/display/sitronix,st7735r.txt | 35 + + .../devicetree/bindings/display/st,stm32-ltdc.txt | 6 +- + .../bindings/display/sunxi/sun4i-drm.txt | 11 + + .../display/tegra/nvidia,tegra20-host1x.txt | 14 +- + .../devicetree/bindings/display/ti/ti,dra7-dss.txt | 5 + + .../bindings/display/ti/ti,omap2-dss.txt | 4 + + .../bindings/display/ti/ti,omap3-dss.txt | 4 + + .../bindings/display/ti/ti,omap4-dss.txt | 4 + + .../bindings/display/ti/ti,omap5-dss.txt | 4 + + Documentation/devicetree/bindings/dma/snps-dma.txt | 2 +- + Documentation/devicetree/bindings/eeprom/at24.txt | 78 + + .../devicetree/bindings/eeprom/eeprom.txt | 47 - + .../devicetree/bindings/gpu/arm,mali-utgard.txt | 1 + + .../devicetree/bindings/i2c/i2c-meson.txt | 6 +- + Documentation/devicetree/bindings/i2c/i2c-mtk.txt | 1 + + .../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 13 +- + .../devicetree/bindings/i2c/i2c-mv64xxx.txt | 20 + + .../bindings/mailbox/qcom,apcs-kpss-global.txt | 18 + + .../memory-controllers/nvidia,tegra30-mc.txt | 2 + + .../bindings/memory-controllers/ti/emif.txt | 17 +- + .../devicetree/bindings/mfd/atmel-tcb.txt | 56 + + .../bindings/misc/nvidia,tegra186-misc.txt | 12 + + .../bindings/pinctrl/cortina,gemini-pinctrl.txt | 3 + + .../bindings/pinctrl/fsl,imx6ul-pinctrl.txt | 3 +- + .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 + + .../bindings/pinctrl/mscc,ocelot-pinctrl.txt | 39 + + .../devicetree/bindings/pinctrl/pinctrl-mt7622.txt | 351 + + .../bindings/pinctrl/qcom,msm8998-pinctrl.txt | 193 + + .../bindings/pinctrl/renesas,pfc-pinctrl.txt | 1 + + .../pinctrl/socionext,uniphier-pinctrl.txt | 27 + + .../bindings/pinctrl/st,stm32-pinctrl.txt | 2 + + .../devicetree/bindings/power/actions,owl-sps.txt | 2 + + .../devicetree/bindings/power/fsl,imx-gpc.txt | 3 + + .../devicetree/bindings/power/fsl,imx-gpcv2.txt | 4 +- + .../devicetree/bindings/power/ti-smartreflex.txt | 2 +- + .../bindings/reset/amlogic,meson-reset.txt | 3 +- + .../devicetree/bindings/rtc/rtc-mxc_v2.txt | 17 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 3 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.txt | 8 +- + .../devicetree/bindings/soc/xilinx/xlnx,vcu.txt | 31 + + .../devicetree/bindings/vendor-prefixes.txt | 5 + + Documentation/devicetree/booting-without-of.txt | 2 +- + Documentation/filesystems/dax.txt | 1 - + Documentation/filesystems/ext4.txt | 2 +- + Documentation/filesystems/fscrypt.rst | 10 +- + Documentation/filesystems/sysfs.txt | 4 +- + Documentation/gpu/drm-kms-helpers.rst | 39 +- + Documentation/gpu/drm-kms.rst | 14 +- + Documentation/gpu/i915.rst | 4 +- + Documentation/gpu/todo.rst | 41 +- + Documentation/i2c/DMA-considerations | 67 + + Documentation/i2c/gpio-fault-injection | 54 + + Documentation/ioctl/ioctl-number.txt | 1 + + Documentation/rtc.txt | 81 +- + Documentation/speculation.txt | 90 + + .../translations/zh_CN/filesystems/sysfs.txt | 4 +- + MAINTAINERS | 141 +- + arch/Kconfig | 11 + + arch/alpha/include/asm/Kbuild | 1 - + arch/alpha/include/asm/futex.h | 8 +- + arch/alpha/include/asm/processor.h | 5 +- + arch/alpha/include/uapi/asm/termbits.h | 6 +- + arch/alpha/kernel/pci.c | 2 +- + arch/alpha/kernel/pci_impl.h | 3 +- + arch/alpha/kernel/process.c | 5 +- + arch/alpha/kernel/sys_nautilus.c | 2 +- + arch/alpha/kernel/traps.c | 13 +- + arch/arc/include/asm/Kbuild | 1 - + arch/arm/Kconfig | 14 +- + arch/arm/Kconfig.debug | 33 +- + arch/arm/Makefile | 6 +- + arch/arm/boot/compressed/string.c | 5 - + arch/arm/boot/compressed/vmlinux.lds.S | 8 + + arch/arm/boot/dts/Makefile | 47 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 2 +- + arch/arm/boot/dts/am335x-boneblue.dts | 81 +- + arch/arm/boot/dts/am335x-evm.dts | 2 +- + arch/arm/boot/dts/am335x-evmsk.dts | 2 +- + arch/arm/boot/dts/am335x-pepper.dts | 2 +- + arch/arm/boot/dts/am33xx-clocks.dtsi | 205 +- + arch/arm/boot/dts/am33xx.dtsi | 18 +- + arch/arm/boot/dts/am3517.dtsi | 8 +- + arch/arm/boot/dts/am4372.dtsi | 20 +- + arch/arm/boot/dts/am437x-gp-evm.dts | 4 +- + arch/arm/boot/dts/am437x-idk-evm.dts | 14 + + arch/arm/boot/dts/am437x-sk-evm.dts | 4 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 10 +- + arch/arm/boot/dts/am43xx-clocks.dtsi | 230 +- + arch/arm/boot/dts/am571x-idk.dts | 4 + + arch/arm/boot/dts/am572x-idk-common.dtsi | 100 + + arch/arm/boot/dts/am572x-idk.dts | 93 +- + arch/arm/boot/dts/am574x-idk.dts | 22 + + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 4 +- + arch/arm/boot/dts/animeo_ip.dts | 12 + + arch/arm/boot/dts/arm-realview-eb-mp.dtsi | 5 - + arch/arm/boot/dts/armada-38x.dtsi | 5 + + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 5 +- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 135 +- + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 548 + + arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts | 426 + + arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 458 + + arch/arm/boot/dts/aspeed-g4.dtsi | 163 +- + arch/arm/boot/dts/aspeed-g5.dtsi | 156 +- + arch/arm/boot/dts/at91-ariag25.dts | 12 + + arch/arm/boot/dts/at91-ariettag25.dts | 12 + + arch/arm/boot/dts/at91-cosino.dtsi | 12 + + arch/arm/boot/dts/at91-foxg20.dts | 12 + + arch/arm/boot/dts/at91-kizbox.dts | 12 + + arch/arm/boot/dts/at91-kizbox2.dts | 12 + + arch/arm/boot/dts/at91-kizboxmini.dts | 12 + + arch/arm/boot/dts/at91-linea.dtsi | 12 + + arch/arm/boot/dts/at91-natte.dtsi | 244 + + arch/arm/boot/dts/at91-nattis-2-natte-2.dts | 258 + + arch/arm/boot/dts/at91-qil_a9260.dts | 12 + + arch/arm/boot/dts/at91-sam9_l9260.dts | 12 + + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 12 + + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 413 + + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 12 + + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 12 + + arch/arm/boot/dts/at91-sama5d4_ma5d4.dtsi | 12 + + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 12 + + arch/arm/boot/dts/at91-sama5d4ek.dts | 12 + + arch/arm/boot/dts/at91-vinco.dts | 12 + + arch/arm/boot/dts/at91rm9200.dtsi | 8 +- + arch/arm/boot/dts/at91rm9200ek.dts | 12 + + arch/arm/boot/dts/at91sam9260.dtsi | 8 +- + arch/arm/boot/dts/at91sam9260ek.dts | 12 + + arch/arm/boot/dts/at91sam9261.dtsi | 6 +- + arch/arm/boot/dts/at91sam9261ek.dts | 22 +- + arch/arm/boot/dts/at91sam9263.dtsi | 6 +- + arch/arm/boot/dts/at91sam9263ek.dts | 14 +- + arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 12 + + arch/arm/boot/dts/at91sam9g25ek.dts | 2 +- + arch/arm/boot/dts/at91sam9g45.dtsi | 10 +- + arch/arm/boot/dts/at91sam9m10g45ek.dts | 14 +- + arch/arm/boot/dts/at91sam9n12.dtsi | 8 +- + arch/arm/boot/dts/at91sam9n12ek.dts | 12 + + arch/arm/boot/dts/at91sam9rl.dtsi | 4 +- + arch/arm/boot/dts/at91sam9rlek.dts | 12 + + arch/arm/boot/dts/at91sam9x5.dtsi | 8 +- + arch/arm/boot/dts/at91sam9x5cm.dtsi | 12 + + arch/arm/boot/dts/axp81x.dtsi | 20 + + arch/arm/boot/dts/bcm2835-rpi-a-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-a.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-b-plus.dts | 4 +- + arch/arm/boot/dts/bcm2835-rpi-b-rev2.dts | 2 +- + arch/arm/boot/dts/bcm2835-rpi-b.dts | 2 +- + arch/arm/boot/dts/bcm2836-rpi-2-b.dts | 4 +- + arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 2 +- + arch/arm/boot/dts/dm814x-clocks.dtsi | 30 + + arch/arm/boot/dts/dm814x.dtsi | 4 + + arch/arm/boot/dts/dm816x-clocks.dtsi | 30 + + arch/arm/boot/dts/dm816x.dtsi | 9 +- + arch/arm/boot/dts/dra62x-j5eco-evm.dts | 8 +- + arch/arm/boot/dts/dra7-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra7-evm.dts | 2 +- + arch/arm/boot/dts/dra7.dtsi | 169 +- + arch/arm/boot/dts/dra72-evm-common.dtsi | 4 +- + arch/arm/boot/dts/dra72-evm-tps65917.dtsi | 4 + + arch/arm/boot/dts/dra72x.dtsi | 16 +- + arch/arm/boot/dts/dra74x.dtsi | 18 +- + arch/arm/boot/dts/dra76-evm.dts | 17 + + arch/arm/boot/dts/dra7xx-clocks.dtsi | 909 +- + arch/arm/boot/dts/efm32gg-dk3750.dts | 2 +- + arch/arm/boot/dts/ethernut5.dts | 12 + + arch/arm/boot/dts/exynos3250-artik5-eval.dts | 5 +- + arch/arm/boot/dts/exynos3250-artik5.dtsi | 5 +- + arch/arm/boot/dts/exynos3250-monk.dts | 5 +- + arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 7 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 5 +- + arch/arm/boot/dts/exynos3250.dtsi | 39 +- + arch/arm/boot/dts/exynos4-cpu-thermal.dtsi | 6 +- + arch/arm/boot/dts/exynos4.dtsi | 62 +- + arch/arm/boot/dts/exynos4210-origen.dts | 7 +- + arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 7 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 7 +- + arch/arm/boot/dts/exynos4210-trats.dts | 7 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 7 +- + arch/arm/boot/dts/exynos4210.dtsi | 15 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 5 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 5 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 5 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 7 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 7 +- + arch/arm/boot/dts/exynos4412-odroidx2.dts | 7 +- + arch/arm/boot/dts/exynos4412-origen.dts | 7 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 9 +- + arch/arm/boot/dts/exynos4412-ppmu-common.dtsi | 5 +- + arch/arm/boot/dts/exynos4412-prime.dtsi | 5 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 7 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 29 +- + arch/arm/boot/dts/exynos4412.dtsi | 100 +- + arch/arm/boot/dts/exynos5.dtsi | 50 +- + arch/arm/boot/dts/exynos5250-arndale.dts | 5 +- + arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 7 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 5 +- + arch/arm/boot/dts/exynos5250-snow-common.dtsi | 5 +- + arch/arm/boot/dts/exynos5250-snow-rev5.dts | 5 +- + arch/arm/boot/dts/exynos5250-snow.dts | 5 +- + arch/arm/boot/dts/exynos5250-spring.dts | 5 +- + arch/arm/boot/dts/exynos5250.dtsi | 133 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 7 +- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 7 +- + arch/arm/boot/dts/exynos5260.dtsi | 33 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 5 +- + arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 5 +- + arch/arm/boot/dts/exynos5410-smdk5410.dts | 7 +- + arch/arm/boot/dts/exynos5410.dtsi | 21 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 7 +- + arch/arm/boot/dts/exynos5420-cpus.dtsi | 15 +- + arch/arm/boot/dts/exynos5420-peach-pit.dts | 5 +- + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 7 +- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 7 +- + arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi | 6 +- + arch/arm/boot/dts/exynos5420-trip-points.dtsi | 6 +- + arch/arm/boot/dts/exynos5420.dtsi | 76 +- + arch/arm/boot/dts/exynos5422-cpus.dtsi | 15 +- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 13 +- + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 7 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 67 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 7 +- + arch/arm/boot/dts/exynos5422-odroidxu3-lite.dts | 7 +- + arch/arm/boot/dts/exynos5422-odroidxu3.dts | 7 +- + arch/arm/boot/dts/exynos5422-odroidxu4.dts | 59 +- + arch/arm/boot/dts/exynos5440-sd5v1.dts | 7 +- + arch/arm/boot/dts/exynos5440-ssdk5440.dts | 7 +- + arch/arm/boot/dts/exynos5440-tmu-sensor-conf.dtsi | 6 +- + arch/arm/boot/dts/exynos5440-trip-points.dtsi | 6 +- + arch/arm/boot/dts/exynos5440.dtsi | 21 +- + arch/arm/boot/dts/exynos54xx-odroidxu-leds.dtsi | 7 +- + arch/arm/boot/dts/exynos54xx.dtsi | 31 +- + arch/arm/boot/dts/ge863-pro3.dtsi | 12 + + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 67 +- + arch/arm/boot/dts/gemini-dlink-dns-313.dts | 303 + + arch/arm/boot/dts/gemini-nas4220b.dts | 69 + + arch/arm/boot/dts/gemini-rut1xx.dts | 25 + + arch/arm/boot/dts/gemini-wbd111.dts | 47 + + arch/arm/boot/dts/gemini-wbd222.dts | 60 + + arch/arm/boot/dts/gemini.dtsi | 44 +- + arch/arm/boot/dts/imx25.dtsi | 2 + + arch/arm/boot/dts/imx27-pdk.dts | 1 + + arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts | 1 + + arch/arm/boot/dts/imx27-phytec-phycore-som.dtsi | 1 + + arch/arm/boot/dts/imx28-ts4600.dts | 79 + + arch/arm/boot/dts/imx35.dtsi | 2 + + arch/arm/boot/dts/imx51-babbage.dts | 77 +- + .../boot/dts/imx51-eukrea-mbimxsd51-baseboard.dts | 1 + + arch/arm/boot/dts/imx51-ts4800.dts | 6 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 12 +- + arch/arm/boot/dts/imx51.dtsi | 1 + + arch/arm/boot/dts/imx53-cx9020.dts | 2 +- + arch/arm/boot/dts/imx53-m53.dtsi | 1 - + arch/arm/boot/dts/imx53-tx53-x03x.dts | 232 +- + arch/arm/boot/dts/imx53-tx53.dtsi | 14 +- + arch/arm/boot/dts/imx53.dtsi | 48 +- + arch/arm/boot/dts/imx6dl-aristainetos_4.dts | 50 +- + arch/arm/boot/dts/imx6dl-aristainetos_7.dts | 48 +- + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts | 52 + + arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts | 51 + + arch/arm/boot/dts/imx6dl-cubox-i.dts | 2 + + .../boot/dts/imx6dl-hummingboard-emmc-som-v15.dts | 53 + + arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts | 52 + + arch/arm/boot/dts/imx6dl-hummingboard.dts | 2 + + .../boot/dts/imx6dl-hummingboard2-emmc-som-v15.dts | 55 + + arch/arm/boot/dts/imx6dl-hummingboard2-som-v15.dts | 54 + + arch/arm/boot/dts/imx6dl-hummingboard2.dts | 53 + + arch/arm/boot/dts/imx6dl-pinfunc.h | 1 + + arch/arm/boot/dts/imx6dl-ts7970.dts | 50 + + arch/arm/boot/dts/imx6dl.dtsi | 12 +- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 2 +- + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 +- + arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts | 60 + + arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts | 59 + + arch/arm/boot/dts/imx6q-cubox-i.dts | 2 + + arch/arm/boot/dts/imx6q-display5.dtsi | 2 +- + arch/arm/boot/dts/imx6q-h100.dts | 33 +- + .../boot/dts/imx6q-hummingboard-emmc-som-v15.dts | 61 + + arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts | 60 + + arch/arm/boot/dts/imx6q-hummingboard.dts | 2 + + .../boot/dts/imx6q-hummingboard2-emmc-som-v15.dts | 63 + + arch/arm/boot/dts/imx6q-hummingboard2-som-v15.dts | 62 + + arch/arm/boot/dts/imx6q-hummingboard2.dts | 61 + + arch/arm/boot/dts/imx6q-pinfunc.h | 1 + + arch/arm/boot/dts/imx6q-ts7970.dts | 54 + + arch/arm/boot/dts/imx6q-var-dt6customboard.dts | 235 + + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-apf6dev.dtsi | 44 +- + arch/arm/boot/dts/imx6qdl-aristainetos.dtsi | 73 +- + arch/arm/boot/dts/imx6qdl-aristainetos2.dtsi | 76 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-cubox-i.dtsi | 72 +- + arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 103 +- + arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi | 72 + + arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi | 540 + + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi | 17 + + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 9 + + ...6qdl-microsom.dtsi => imx6qdl-sr-som-brcm.dtsi} | 41 +- + arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi | 70 + + arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi | 170 + + ...dl-microsom-ar8035.dtsi => imx6qdl-sr-som.dtsi} | 36 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 594 + + arch/arm/boot/dts/imx6qdl-udoo.dtsi | 25 +- + arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 503 + + arch/arm/boot/dts/imx6qdl-wandboard-revd1.dtsi | 5 + + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 14 +- + arch/arm/boot/dts/imx6qdl.dtsi | 161 +- + arch/arm/boot/dts/imx6sl-evk.dts | 133 +- + arch/arm/boot/dts/imx6sl.dtsi | 48 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 220 +- + arch/arm/boot/dts/imx6sx.dtsi | 93 +- + arch/arm/boot/dts/imx6ul-14x14-evk.dts | 19 +- + arch/arm/boot/dts/imx6ul.dtsi | 49 +- + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 39 +- + arch/arm/boot/dts/imx7-colibri.dtsi | 116 +- + arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 19 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 21 + + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 13 +- + arch/arm/boot/dts/imx7d-colibri.dtsi | 4 + + arch/arm/boot/dts/imx7d-pico-pi.dts | 181 + + .../boot/dts/{imx7d-pico.dts => imx7d-pico.dtsi} | 133 - + arch/arm/boot/dts/imx7d.dtsi | 22 +- + arch/arm/boot/dts/imx7s.dtsi | 133 +- + arch/arm/boot/dts/iwg20d-q7-common.dtsi | 122 + + arch/arm/boot/dts/iwg20d-q7-dbcm-ca.dtsi | 87 + + arch/arm/boot/dts/keystone-clocks.dtsi | 59 +- + arch/arm/boot/dts/keystone-k2e-clocks.dtsi | 15 +- + arch/arm/boot/dts/keystone-k2e-evm.dts | 13 +- + arch/arm/boot/dts/keystone-k2e-netcp.dtsi | 7 +- + arch/arm/boot/dts/keystone-k2e.dtsi | 11 +- + arch/arm/boot/dts/keystone-k2g-evm.dts | 115 +- + arch/arm/boot/dts/keystone-k2g-ice.dts | 339 +- + arch/arm/boot/dts/keystone-k2g.dtsi | 58 +- + arch/arm/boot/dts/keystone-k2hk-clocks.dtsi | 81 +- + arch/arm/boot/dts/keystone-k2hk-evm.dts | 59 +- + arch/arm/boot/dts/keystone-k2hk-netcp.dtsi | 7 +- + arch/arm/boot/dts/keystone-k2hk.dtsi | 11 +- + arch/arm/boot/dts/keystone-k2l-clocks.dtsi | 51 +- + arch/arm/boot/dts/keystone-k2l-evm.dts | 13 +- + arch/arm/boot/dts/keystone-k2l-netcp.dtsi | 7 +- + arch/arm/boot/dts/keystone-k2l.dtsi | 55 +- + arch/arm/boot/dts/keystone.dtsi | 18 +- + arch/arm/boot/dts/kirkwood-linksys-viper.dts | 10 +- + arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts | 17 + + arch/arm/boot/dts/logicpd-som-lv-37xx-devkit.dts | 249 +- + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 256 + + arch/arm/boot/dts/logicpd-som-lv.dtsi | 27 - + arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts | 17 + + arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 411 +- + arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi | 395 + + arch/arm/boot/dts/logicpd-torpedo-som.dtsi | 84 - + arch/arm/boot/dts/lpc3250-ea3250.dts | 4 +- + arch/arm/boot/dts/lpc3250-phy3250.dts | 4 +- + arch/arm/boot/dts/lpc4337-ciaa.dts | 6 +- + arch/arm/boot/dts/lpc4350-hitex-eval.dts | 2 +- + arch/arm/boot/dts/lpc4357-ea4357-devkit.dts | 2 +- + arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts | 241 + + arch/arm/boot/dts/ls1021a-qds.dts | 5 + + arch/arm/boot/dts/ls1021a-twr.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 30 +- + arch/arm/boot/dts/meson8.dtsi | 29 +- + arch/arm/boot/dts/meson8b.dtsi | 24 +- + arch/arm/boot/dts/mpa1600.dts | 12 + + arch/arm/boot/dts/mt2701.dtsi | 2 + + arch/arm/boot/dts/mt7623.dtsi | 5 +- + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 2 +- + arch/arm/boot/dts/mt7623n-rfb-nand.dts | 2 +- + arch/arm/boot/dts/omap3-cm-t3x.dtsi | 8 +- + arch/arm/boot/dts/omap3-evm-37xx.dts | 8 +- + arch/arm/boot/dts/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 8 +- + arch/arm/boot/dts/omap3-n9.dts | 7 + + arch/arm/boot/dts/omap3-n900.dts | 8 +- + arch/arm/boot/dts/omap3-n950.dts | 88 + + arch/arm/boot/dts/omap3-pandora-common.dtsi | 2 +- + arch/arm/boot/dts/omap3.dtsi | 14 - + arch/arm/boot/dts/omap34xx.dtsi | 39 + + arch/arm/boot/dts/omap36xx.dtsi | 46 + + arch/arm/boot/dts/omap4-droid4-xt894.dts | 6 +- + arch/arm/boot/dts/omap4.dtsi | 161 +- + arch/arm/boot/dts/omap44xx-clocks.dtsi | 895 +- + arch/arm/boot/dts/omap5.dtsi | 46 +- + arch/arm/boot/dts/omap54xx-clocks.dtsi | 623 +- + arch/arm/boot/dts/openbmc-flash-layout.dtsi | 32 + + arch/arm/boot/dts/owl-s500-sparky.dts | 43 + + .../boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} | 0 + ...ts => ox820-cloudengines-pogoplug-series-3.dts} | 0 + arch/arm/boot/dts/pm9g45.dts | 12 + + arch/arm/boot/dts/qcom-msm8974-fairphone-fp2.dts | 34 + + arch/arm/boot/dts/r7s72100-genmai.dts | 2 +- + arch/arm/boot/dts/r8a73a4.dtsi | 5 +- + arch/arm/boot/dts/r8a7740-armadillo800eva.dts | 5 +- + arch/arm/boot/dts/r8a7740.dtsi | 5 +- + arch/arm/boot/dts/r8a7743.dtsi | 607 +- + .../arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts | 158 + + arch/arm/boot/dts/r8a7745-iwg22d-sodimm.dts | 183 +- + arch/arm/boot/dts/r8a7745.dtsi | 585 +- + arch/arm/boot/dts/r8a7778.dtsi | 12 +- + arch/arm/boot/dts/r8a7779.dtsi | 12 +- + arch/arm/boot/dts/r8a7790-lager.dts | 5 +- + arch/arm/boot/dts/r8a7790.dtsi | 25 +- + arch/arm/boot/dts/r8a7791-koelsch.dts | 19 +- + arch/arm/boot/dts/r8a7791.dtsi | 22 +- + arch/arm/boot/dts/r8a7792.dtsi | 67 +- + arch/arm/boot/dts/r8a7793.dtsi | 22 +- + arch/arm/boot/dts/r8a7794-alt.dts | 5 +- + arch/arm/boot/dts/r8a7794.dtsi | 27 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 1 + + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 5 +- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 5 +- + arch/arm/boot/dts/s3c2416.dtsi | 5 +- + arch/arm/boot/dts/s3c24xx.dtsi | 5 +- + arch/arm/boot/dts/s3c6400.dtsi | 7 +- + arch/arm/boot/dts/s3c6410-mini6410.dts | 7 +- + arch/arm/boot/dts/s3c6410-smdk6410.dts | 7 +- + arch/arm/boot/dts/s3c6410.dtsi | 7 +- + arch/arm/boot/dts/s3c64xx-pinctrl.dtsi | 5 +- + arch/arm/boot/dts/s3c64xx.dtsi | 5 +- + arch/arm/boot/dts/s5pv210-aquila.dts | 5 +- + arch/arm/boot/dts/s5pv210-goni.dts | 5 +- + arch/arm/boot/dts/s5pv210-pinctrl.dtsi | 5 +- + arch/arm/boot/dts/s5pv210-smdkc110.dts | 5 +- + arch/arm/boot/dts/s5pv210-smdkv210.dts | 5 +- + arch/arm/boot/dts/s5pv210-torbreck.dts | 5 +- + arch/arm/boot/dts/s5pv210.dtsi | 8 +- + arch/arm/boot/dts/sama5d2.dtsi | 10 +- + arch/arm/boot/dts/sama5d3.dtsi | 4 +- + arch/arm/boot/dts/sama5d3_tcb1.dtsi | 4 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 12 + + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 12 + + arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 2 +- + arch/arm/boot/dts/sama5d4.dtsi | 18 +- + arch/arm/boot/dts/sh73a0.dtsi | 3 - + arch/arm/boot/dts/socfpga.dtsi | 4 + + arch/arm/boot/dts/socfpga_arria10_socdk.dtsi | 1 + + arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts | 2 +- + arch/arm/boot/dts/spear1310-evb.dts | 2 +- + arch/arm/boot/dts/spear1340.dtsi | 4 +- + arch/arm/boot/dts/spear13xx.dtsi | 6 +- + arch/arm/boot/dts/spear600.dtsi | 1 + + arch/arm/boot/dts/ste-nomadik-stn8815.dtsi | 1 + + arch/arm/boot/dts/stih407.dtsi | 3 +- + arch/arm/boot/dts/stih410.dtsi | 3 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 4 + + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 25 + + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 19 + + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 17 + + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 61 + + arch/arm/boot/dts/sun8i-a83t.dtsi | 234 + + arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts | 91 + + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 1 - + arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts | 196 + + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 11 + + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 17 + + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 1 - + arch/arm/boot/dts/sun8i-h3.dtsi | 4 + + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 38 + + arch/arm/boot/dts/tegra20.dtsi | 35 + + arch/arm/boot/dts/tny_a9260_common.dtsi | 12 + + arch/arm/boot/dts/tny_a9263.dts | 12 + + arch/arm/boot/dts/uniphier-ld4-ref.dts | 2 +- + arch/arm/boot/dts/uniphier-ld4.dtsi | 23 + + arch/arm/boot/dts/uniphier-ld6b-ref.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4-ref.dts | 2 +- + arch/arm/boot/dts/uniphier-pro4.dtsi | 27 + + arch/arm/boot/dts/uniphier-pro5.dtsi | 33 + + arch/arm/boot/dts/uniphier-pxs2.dtsi | 19 + + arch/arm/boot/dts/uniphier-sld8-ref.dts | 2 +- + arch/arm/boot/dts/uniphier-sld8.dtsi | 23 + + arch/arm/boot/dts/usb_a9260_common.dtsi | 12 + + arch/arm/boot/dts/usb_a9263.dts | 12 + + arch/arm/boot/dts/vf-colibri-eval-v3.dtsi | 2 +- + arch/arm/boot/dts/vf500.dtsi | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 20 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 4 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 4 + + arch/arm/boot/dts/vfxxx.dtsi | 10 +- + arch/arm/common/bL_switcher_dummy_if.c | 4 + + arch/arm/common/sa1111.c | 328 +- + arch/arm/configs/davinci_all_defconfig | 1 + + arch/arm/configs/exynos_defconfig | 7 + + arch/arm/configs/imx_v6_v7_defconfig | 8 + + arch/arm/configs/keystone_defconfig | 7 + + arch/arm/configs/multi_v7_defconfig | 12 + + arch/arm/configs/omap2plus_defconfig | 19 + + arch/arm/configs/qcom_defconfig | 3 + + arch/arm/configs/shmobile_defconfig | 2 + + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/exception.h | 3 +- + arch/arm/include/asm/glue-cache.h | 4 + + arch/arm/include/asm/hardware/cache-b15-rac.h | 10 + + arch/arm/include/asm/hardware/sa1111.h | 32 +- + arch/arm/include/asm/memory.h | 1 + + arch/arm/include/asm/processor.h | 10 + + arch/arm/include/asm/ptdump.h | 43 + + arch/arm/include/asm/sections.h | 21 + + arch/arm/include/asm/string.h | 14 - + arch/arm/include/asm/traps.h | 12 - + arch/arm/include/asm/unified.h | 77 +- + arch/arm/kernel/armksyms.c | 1 - + arch/arm/kernel/entry-armv.S | 6 +- + arch/arm/kernel/entry-common.S | 1 + + arch/arm/kernel/head-common.S | 5 +- + arch/arm/kernel/hw_breakpoint.c | 10 +- + arch/arm/kernel/process.c | 5 +- + arch/arm/kernel/smp.c | 3 + + arch/arm/kernel/stacktrace.c | 14 +- + arch/arm/kernel/traps.c | 4 +- + arch/arm/kernel/vmlinux-xip.lds.S | 6 +- + arch/arm/kernel/vmlinux.lds.S | 6 +- + arch/arm/lib/Makefile | 2 +- + arch/arm/lib/memzero.S | 137 - + arch/arm/mach-bcm/brcmstb.c | 2 - + arch/arm/mach-davinci/board-da850-evm.c | 4 +- + arch/arm/mach-davinci/board-dm355-evm.c | 15 +- + arch/arm/mach-davinci/board-dm644x-evm.c | 15 +- + arch/arm/mach-davinci/board-neuros-osd2.c | 2 +- + arch/arm/mach-davinci/common.c | 2 +- + arch/arm/mach-davinci/da830.c | 2 +- + arch/arm/mach-davinci/da850.c | 2 +- + arch/arm/mach-davinci/devices-da8xx.c | 4 +- + arch/arm/mach-davinci/dm355.c | 2 +- + arch/arm/mach-davinci/dm365.c | 2 +- + arch/arm/mach-davinci/dm644x.c | 2 +- + arch/arm/mach-davinci/dm646x.c | 4 +- + arch/arm/mach-davinci/include/mach/common.h | 2 +- + arch/arm/mach-ep93xx/Kconfig | 7 + + arch/arm/mach-ep93xx/ts72xx.c | 165 +- + arch/arm/mach-ep93xx/ts72xx.h | 9 + + arch/arm/mach-exynos/Kconfig | 4 +- + arch/arm/mach-exynos/Makefile | 4 +- + arch/arm/mach-exynos/common.h | 5 +- + arch/arm/mach-exynos/exynos-smc.S | 5 +- + arch/arm/mach-exynos/exynos.c | 16 +- + arch/arm/mach-exynos/firmware.c | 14 +- + arch/arm/mach-exynos/headsmp.S | 6 +- + arch/arm/mach-exynos/include/mach/map.h | 7 +- + arch/arm/mach-exynos/mcpm-exynos.c | 17 +- + arch/arm/mach-exynos/platsmp.c | 21 +- + arch/arm/mach-exynos/pm.c | 24 +- + arch/arm/mach-exynos/sleep.S | 11 +- + arch/arm/mach-exynos/smc.h | 5 +- + arch/arm/mach-exynos/suspend.c | 24 +- + arch/arm/mach-imx/common.h | 9 - + arch/arm/mach-imx/mmdc.c | 11 - + arch/arm/mach-mediatek/Kconfig | 2 +- + arch/arm/mach-meson/Kconfig | 1 + + arch/arm/mach-mmp/mmp2.h | 2 +- + arch/arm/mach-mmp/pxa168.h | 2 +- + arch/arm/mach-mmp/pxa910.h | 2 +- + arch/arm/mach-omap2/clockdomain.c | 8 - + arch/arm/mach-omap2/clockdomain.h | 2 - + arch/arm/mach-omap2/cm-regbits-24xx.h | 81 - + arch/arm/mach-omap2/cm-regbits-34xx.h | 162 - + arch/arm/mach-omap2/cm.h | 7 +- + arch/arm/mach-omap2/cm2xxx.c | 2 +- + arch/arm/mach-omap2/cm33xx.c | 8 +- + arch/arm/mach-omap2/cm3xxx.c | 2 +- + arch/arm/mach-omap2/cm_common.c | 16 +- + arch/arm/mach-omap2/cminst44xx.c | 12 +- + arch/arm/mach-omap2/id.c | 17 +- + arch/arm/mach-omap2/omap_hwmod.c | 79 +- + arch/arm/mach-omap2/omap_hwmod.h | 40 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 14 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 28 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 64 - + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 152 - + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 17 +- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 34 +- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 2 +- + arch/arm/mach-omap2/omap_hwmod_common_data.c | 40 +- + arch/arm/mach-omap2/soc.h | 16 + + arch/arm/mach-pxa/Kconfig | 1 + + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/cm-x300.c | 2 +- + arch/arm/mach-pxa/colibri-evalboard.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270-income.c | 2 +- + arch/arm/mach-pxa/corgi.c | 33 +- + arch/arm/mach-pxa/csb726.c | 2 +- + arch/arm/mach-pxa/devices.c | 2 +- + arch/arm/mach-pxa/devices.h | 9 + + arch/arm/mach-pxa/em-x270.c | 2 +- + arch/arm/mach-pxa/ezx.c | 2 +- + arch/arm/mach-pxa/hx4700.c | 2 +- + arch/arm/mach-pxa/littleton.c | 3 +- + arch/arm/mach-pxa/lubbock.c | 24 +- + arch/arm/mach-pxa/magician.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/mioa701.c | 2 +- + arch/arm/mach-pxa/mxm8x10.c | 2 +- + arch/arm/mach-pxa/palm27x.c | 2 +- + arch/arm/mach-pxa/pcm990-baseboard.c | 2 +- + arch/arm/mach-pxa/poodle.c | 30 +- + arch/arm/mach-pxa/pxa27x.c | 2 +- + arch/arm/mach-pxa/pxa3xx.c | 2 +- + arch/arm/mach-pxa/raumfeld.c | 2 +- + arch/arm/mach-pxa/saar.c | 2 +- + arch/arm/mach-pxa/spitz.c | 36 +- + arch/arm/mach-pxa/stargate2.c | 2 +- + arch/arm/mach-pxa/tosa-bt.c | 4 + + arch/arm/mach-pxa/tosa.c | 30 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-pxa/vpac270.c | 2 +- + arch/arm/mach-pxa/xcep.c | 3 +- + arch/arm/mach-pxa/z2.c | 2 +- + arch/arm/mach-pxa/zeus.c | 3 +- + arch/arm/mach-pxa/zylonite_pxa300.c | 3 +- + arch/arm/mach-s3c24xx/Kconfig | 4 +- + arch/arm/mach-s3c24xx/Makefile | 4 +- + arch/arm/mach-s3c24xx/Makefile.boot | 2 + + arch/arm/mach-s3c24xx/anubis.h | 7 +- + arch/arm/mach-s3c24xx/bast-ide.c | 17 +- + arch/arm/mach-s3c24xx/bast-irq.c | 28 +- + arch/arm/mach-s3c24xx/bast.h | 7 +- + arch/arm/mach-s3c24xx/common-smdk.c | 21 +- + arch/arm/mach-s3c24xx/common-smdk.h | 7 +- + arch/arm/mach-s3c24xx/common.c | 29 +- + arch/arm/mach-s3c24xx/common.h | 5 +- + arch/arm/mach-s3c24xx/cpufreq-utils.c | 18 +- + arch/arm/mach-s3c24xx/fb-core.h | 5 +- + arch/arm/mach-s3c24xx/gta02.h | 7 +- + arch/arm/mach-s3c24xx/h1940-bluetooth.c | 16 +- + arch/arm/mach-s3c24xx/h1940.h | 7 +- + arch/arm/mach-s3c24xx/include/mach/dma.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/fb.h | 1 + + arch/arm/mach-s3c24xx/include/mach/gpio-samsung.h | 7 +- + arch/arm/mach-s3c24xx/include/mach/hardware.h | 7 +- + arch/arm/mach-s3c24xx/include/mach/irqs.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/map.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/pm-core.h | 9 +- + arch/arm/mach-s3c24xx/include/mach/regs-clock.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/regs-gpio.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/regs-irq.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/regs-lcd.h | 11 +- + .../mach-s3c24xx/include/mach/regs-s3c2443-clock.h | 10 +- + arch/arm/mach-s3c24xx/include/mach/rtc-core.h | 7 +- + arch/arm/mach-s3c24xx/include/mach/s3c2412.h | 5 +- + arch/arm/mach-s3c24xx/iotiming-s3c2410.c | 18 +- + arch/arm/mach-s3c24xx/iotiming-s3c2412.c | 18 +- + arch/arm/mach-s3c24xx/irq-pm.c | 19 +- + arch/arm/mach-s3c24xx/mach-amlm5900.c | 35 +- + arch/arm/mach-s3c24xx/mach-anubis.c | 15 +- + arch/arm/mach-s3c24xx/mach-at2440evb.c | 21 +- + arch/arm/mach-s3c24xx/mach-bast.c | 17 +- + arch/arm/mach-s3c24xx/mach-gta02.c | 33 +- + arch/arm/mach-s3c24xx/mach-h1940.c | 17 +- + arch/arm/mach-s3c24xx/mach-jive.c | 17 +- + arch/arm/mach-s3c24xx/mach-mini2440.c | 23 +- + arch/arm/mach-s3c24xx/mach-n30.c | 27 +- + arch/arm/mach-s3c24xx/mach-nexcoder.c | 22 +- + arch/arm/mach-s3c24xx/mach-osiris-dvs.c | 19 +- + arch/arm/mach-s3c24xx/mach-osiris.c | 14 +- + arch/arm/mach-s3c24xx/mach-otom.c | 13 +- + arch/arm/mach-s3c24xx/mach-qt2410.c | 27 +- + arch/arm/mach-s3c24xx/mach-rx1950.c | 17 +- + arch/arm/mach-s3c24xx/mach-rx3715.c | 18 +- + arch/arm/mach-s3c24xx/mach-s3c2416-dt.c | 28 +- + arch/arm/mach-s3c24xx/mach-smdk2410.c | 39 +- + arch/arm/mach-s3c24xx/mach-smdk2413.c | 19 +- + arch/arm/mach-s3c24xx/mach-smdk2416.c | 18 +- + arch/arm/mach-s3c24xx/mach-smdk2440.c | 23 +- + arch/arm/mach-s3c24xx/mach-smdk2443.c | 22 +- + arch/arm/mach-s3c24xx/mach-tct_hammer.c | 33 +- + arch/arm/mach-s3c24xx/mach-vr1000.c | 19 +- + arch/arm/mach-s3c24xx/mach-vstms.c | 15 +- + arch/arm/mach-s3c24xx/nand-core.h | 7 +- + arch/arm/mach-s3c24xx/osiris.h | 7 +- + arch/arm/mach-s3c24xx/otom.h | 7 +- + arch/arm/mach-s3c24xx/pll-s3c2410.c | 30 +- + arch/arm/mach-s3c24xx/pll-s3c2440-12000000.c | 20 +- + arch/arm/mach-s3c24xx/pll-s3c2440-16934400.c | 20 +- + arch/arm/mach-s3c24xx/pm-h1940.S | 19 +- + arch/arm/mach-s3c24xx/pm-s3c2410.c | 27 +- + arch/arm/mach-s3c24xx/pm-s3c2412.c | 17 +- + arch/arm/mach-s3c24xx/pm-s3c2416.c | 17 +- + arch/arm/mach-s3c24xx/pm.c | 39 +- + arch/arm/mach-s3c24xx/regs-dsc.h | 7 +- + arch/arm/mach-s3c24xx/regs-mem.h | 5 +- + arch/arm/mach-s3c24xx/s3c2410.c | 17 +- + arch/arm/mach-s3c24xx/s3c2412-power.h | 5 +- + arch/arm/mach-s3c24xx/s3c2412.c | 16 +- + arch/arm/mach-s3c24xx/s3c2416.c | 31 +- + arch/arm/mach-s3c24xx/s3c2440.c | 17 +- + arch/arm/mach-s3c24xx/s3c2442.c | 29 +- + arch/arm/mach-s3c24xx/s3c2443.c | 17 +- + arch/arm/mach-s3c24xx/s3c244x.c | 17 +- + arch/arm/mach-s3c24xx/setup-camif.c | 14 +- + arch/arm/mach-s3c24xx/setup-i2c.c | 17 +- + arch/arm/mach-s3c24xx/setup-sdhci-gpio.c | 21 +- + arch/arm/mach-s3c24xx/setup-spi.c | 16 +- + arch/arm/mach-s3c24xx/setup-ts.c | 17 +- + arch/arm/mach-s3c24xx/simtec-audio.c | 19 +- + arch/arm/mach-s3c24xx/simtec-nor.c | 19 +- + arch/arm/mach-s3c24xx/simtec-pm.c | 21 +- + arch/arm/mach-s3c24xx/simtec-usb.c | 21 +- + arch/arm/mach-s3c24xx/simtec.h | 10 +- + arch/arm/mach-s3c24xx/sleep-s3c2410.S | 20 +- + arch/arm/mach-s3c24xx/sleep-s3c2412.S | 20 +- + arch/arm/mach-s3c24xx/sleep.S | 20 +- + arch/arm/mach-s3c24xx/spi-core.h | 5 +- + arch/arm/mach-s3c24xx/vr1000.h | 11 +- + arch/arm/mach-s3c64xx/Kconfig | 5 +- + arch/arm/mach-s3c64xx/Makefile | 4 +- + arch/arm/mach-s3c64xx/ata-core.h | 7 +- + arch/arm/mach-s3c64xx/backlight.h | 5 +- + arch/arm/mach-s3c64xx/common.c | 26 +- + arch/arm/mach-s3c64xx/common.h | 5 +- + arch/arm/mach-s3c64xx/cpuidle.c | 15 +- + arch/arm/mach-s3c64xx/crag6410.h | 5 +- + arch/arm/mach-s3c64xx/dev-audio.c | 13 +- + arch/arm/mach-s3c64xx/dev-backlight.c | 16 +- + arch/arm/mach-s3c64xx/dev-uart.c | 22 +- + arch/arm/mach-s3c64xx/include/mach/gpio-samsung.h | 7 +- + arch/arm/mach-s3c64xx/include/mach/hardware.h | 1 + + arch/arm/mach-s3c64xx/include/mach/map.h | 10 +- + arch/arm/mach-s3c64xx/include/mach/pm-core.h | 8 +- + arch/arm/mach-s3c64xx/include/mach/regs-clock.h | 10 +- + arch/arm/mach-s3c64xx/include/mach/regs-irq.h | 10 +- + arch/arm/mach-s3c64xx/irq-pm.c | 21 +- + arch/arm/mach-s3c64xx/irq-uart.h | 7 +- + arch/arm/mach-s3c64xx/mach-anw6410.c | 22 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 15 +- + arch/arm/mach-s3c64xx/mach-crag6410.c | 19 +- + arch/arm/mach-s3c64xx/mach-hmt.c | 14 +- + arch/arm/mach-s3c64xx/mach-mini6410.c | 20 +- + arch/arm/mach-s3c64xx/mach-ncp.c | 13 +- + arch/arm/mach-s3c64xx/mach-real6410.c | 20 +- + arch/arm/mach-s3c64xx/mach-s3c64xx-dt.c | 14 +- + arch/arm/mach-s3c64xx/mach-smartq.c | 13 +- + arch/arm/mach-s3c64xx/mach-smartq.h | 6 +- + arch/arm/mach-s3c64xx/mach-smartq5.c | 13 +- + arch/arm/mach-s3c64xx/mach-smartq7.c | 13 +- + arch/arm/mach-s3c64xx/mach-smdk6400.c | 15 +- + arch/arm/mach-s3c64xx/mach-smdk6410.c | 18 +- + arch/arm/mach-s3c64xx/onenand-core.h | 7 +- + arch/arm/mach-s3c64xx/pl080.c | 14 +- + arch/arm/mach-s3c64xx/pm.c | 21 +- + arch/arm/mach-s3c64xx/regs-modem.h | 7 +- + arch/arm/mach-s3c64xx/regs-srom.h | 7 +- + arch/arm/mach-s3c64xx/s3c6400.c | 15 +- + arch/arm/mach-s3c64xx/s3c6410.c | 17 +- + arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 21 +- + arch/arm/mach-s3c64xx/setup-i2c0.c | 21 +- + arch/arm/mach-s3c64xx/setup-i2c1.c | 21 +- + arch/arm/mach-s3c64xx/setup-ide.c | 17 +- + arch/arm/mach-s3c64xx/setup-keypad.c | 17 +- + arch/arm/mach-s3c64xx/setup-sdhci-gpio.c | 19 +- + arch/arm/mach-s3c64xx/setup-spi.c | 13 +- + arch/arm/mach-s3c64xx/setup-usb-phy.c | 14 +- + arch/arm/mach-s3c64xx/sleep.S | 7 +- + arch/arm/mach-s3c64xx/watchdog-reset.h | 7 +- + arch/arm/mach-s5pv210/Kconfig | 4 +- + arch/arm/mach-s5pv210/Makefile | 4 +- + arch/arm/mach-s5pv210/common.h | 5 +- + arch/arm/mach-s5pv210/pm.c | 25 +- + arch/arm/mach-s5pv210/regs-clock.h | 7 +- + arch/arm/mach-s5pv210/s5pv210.c | 18 +- + arch/arm/mach-s5pv210/sleep.S | 6 +- + arch/arm/mach-sa1100/Kconfig | 1 + + arch/arm/mach-sa1100/assabet.c | 71 +- + arch/arm/mach-sa1100/neponset.c | 159 +- + arch/arm/mm/Kconfig | 8 + + arch/arm/mm/Makefile | 4 +- + arch/arm/mm/cache-b15-rac.c | 356 + + arch/arm/mm/cache-v7.S | 21 + + arch/arm/mm/dump.c | 151 +- + arch/arm/mm/fault.c | 5 +- + arch/arm/mm/idmap.c | 4 +- + arch/arm/mm/init.c | 2 + + arch/arm/mm/nommu.c | 4 +- + arch/arm/mm/pmsa-v7.c | 4 +- + arch/arm/mm/proc-v7.S | 6 +- + arch/arm/mm/ptdump_debugfs.c | 34 + + arch/arm/plat-samsung/Kconfig | 4 +- + arch/arm/plat-samsung/Makefile | 4 +- + arch/arm/plat-samsung/adc.c | 19 +- + arch/arm/plat-samsung/cpu.c | 17 +- + arch/arm/plat-samsung/dev-uart.c | 21 +- + arch/arm/plat-samsung/devs.c | 17 +- + arch/arm/plat-samsung/gpio-samsung.c | 26 +- + arch/arm/plat-samsung/include/plat/adc-core.h | 10 +- + arch/arm/plat-samsung/include/plat/adc.h | 10 +- + arch/arm/plat-samsung/include/plat/cpu-freq-core.h | 10 +- + arch/arm/plat-samsung/include/plat/cpu-freq.h | 10 +- + arch/arm/plat-samsung/include/plat/cpu.h | 10 +- + arch/arm/plat-samsung/include/plat/devs.h | 10 +- + arch/arm/plat-samsung/include/plat/fb-s3c2410.h | 8 +- + arch/arm/plat-samsung/include/plat/fb.h | 10 +- + .../plat-samsung/include/plat/gpio-cfg-helpers.h | 10 +- + arch/arm/plat-samsung/include/plat/gpio-cfg.h | 10 +- + arch/arm/plat-samsung/include/plat/gpio-core.h | 10 +- + arch/arm/plat-samsung/include/plat/iic-core.h | 10 +- + arch/arm/plat-samsung/include/plat/keypad.h | 6 +- + arch/arm/plat-samsung/include/plat/map-base.h | 10 +- + arch/arm/plat-samsung/include/plat/map-s3c.h | 10 +- + arch/arm/plat-samsung/include/plat/map-s5p.h | 10 +- + arch/arm/plat-samsung/include/plat/pm-common.h | 7 +- + arch/arm/plat-samsung/include/plat/pm.h | 10 +- + arch/arm/plat-samsung/include/plat/pwm-core.h | 5 +- + arch/arm/plat-samsung/include/plat/regs-adc.h | 10 +- + arch/arm/plat-samsung/include/plat/regs-irqtype.h | 8 +- + arch/arm/plat-samsung/include/plat/regs-spi.h | 10 +- + arch/arm/plat-samsung/include/plat/regs-udc.h | 11 +- + arch/arm/plat-samsung/include/plat/samsung-time.h | 10 +- + arch/arm/plat-samsung/include/plat/sdhci.h | 10 +- + arch/arm/plat-samsung/include/plat/usb-phy.h | 6 +- + arch/arm/plat-samsung/include/plat/wakeup-mask.h | 11 +- + arch/arm/plat-samsung/init.c | 19 +- + arch/arm/plat-samsung/platformdata.c | 15 +- + arch/arm/plat-samsung/pm-check.c | 22 +- + arch/arm/plat-samsung/pm-common.c | 24 +- + arch/arm/plat-samsung/pm-debug.c | 24 +- + arch/arm/plat-samsung/pm-gpio.c | 22 +- + arch/arm/plat-samsung/pm.c | 21 +- + arch/arm/plat-samsung/wakeup-mask.c | 15 +- + arch/arm/plat-samsung/watchdog-reset.c | 21 +- + arch/arm/probes/kprobes/core.c | 14 +- + arch/arm/tools/mach-types | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/actions/Makefile | 2 + + arch/arm64/boot/dts/actions/s700-cubieboard7.dts | 46 + + arch/arm64/boot/dts/actions/s700.dtsi | 169 + + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 36 + + .../boot/dts/allwinner/sun50i-a64-olinuxino.dts | 23 + + .../boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 125 +- + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 19 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 2 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 2 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 34 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 16 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 13 + + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 343 +- + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 12 + + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 19 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 1 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 32 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 1 + + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 46 +- + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 12 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 12 + + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 46 +- + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 15 + + arch/arm64/boot/dts/amlogic/meson-gxm-q200.dts | 3 +- + arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi | 5 +- + arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 5 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 19 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 5 +- + arch/arm64/boot/dts/exynos/exynos5433-tm2e.dts | 5 +- + .../dts/exynos/exynos5433-tmu-g3d-sensor-conf.dtsi | 5 +- + .../dts/exynos/exynos5433-tmu-sensor-conf.dtsi | 5 +- + arch/arm64/boot/dts/exynos/exynos5433-tmu.dtsi | 5 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 147 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 7 +- + arch/arm64/boot/dts/exynos/exynos7-pinctrl.dtsi | 7 +- + .../boot/dts/exynos/exynos7-tmu-sensor-conf.dtsi | 6 +- + .../arm64/boot/dts/exynos/exynos7-trip-points.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 8 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 97 + + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 12 + + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 1 + + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 30 +- + .../boot/dts/hisilicon/hi3798cv200-poplar.dts | 6 + + arch/arm64/boot/dts/hisilicon/hi3798cv200.dtsi | 12 + + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 1 + + arch/arm64/boot/dts/marvell/armada-372x.dtsi | 1 + + arch/arm64/boot/dts/marvell/armada-37xx.dtsi | 21 + + arch/arm64/boot/dts/marvell/armada-7040-db.dts | 52 +- + arch/arm64/boot/dts/marvell/armada-70x0.dtsi | 37 +- + arch/arm64/boot/dts/marvell/armada-8020.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-8040-db.dts | 111 +- + arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 82 +- + arch/arm64/boot/dts/marvell/armada-8040.dtsi | 2 +- + arch/arm64/boot/dts/marvell/armada-80x0.dtsi | 93 +- + arch/arm64/boot/dts/marvell/armada-ap806.dtsi | 10 +- + arch/arm64/boot/dts/marvell/armada-common.dtsi | 10 + + .../boot/dts/marvell/armada-cp110-master.dtsi | 446 - + .../arm64/boot/dts/marvell/armada-cp110-slave.dtsi | 444 - + arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 424 + + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 27 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 188 + + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 18 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 92 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 51 + + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 10 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 351 + + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 23 + + arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 23 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 4 +- + arch/arm64/boot/dts/qcom/apq8016-sbc.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8916-pins.dtsi | 88 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 29 +- + arch/arm64/boot/dts/qcom/pm8916.dtsi | 82 +- + arch/arm64/boot/dts/renesas/Makefile | 3 +- + .../boot/dts/renesas/r8a7795-es1-salvator-x.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 85 + + arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts | 2 +- + .../arm64/boot/dts/renesas/r8a7795-salvator-xs.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 379 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 2 +- + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 58 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 373 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 23 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 55 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 115 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 234 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 50 + + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 29 + + arch/arm64/boot/dts/renesas/ulcb.dtsi | 1 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 47 + + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 29 + + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 42 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 85 +- + .../arm64/boot/dts/socionext/uniphier-ld11-ref.dts | 2 +- + arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi | 6 +- + .../arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 2 +- + arch/arm64/boot/dts/socionext/uniphier-ld20.dtsi | 3 +- + .../arm64/boot/dts/socionext/uniphier-pxs3-ref.dts | 16 + + arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi | 3 +- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 114 + + arch/arm64/boot/dts/sprd/whale2.dtsi | 62 +- + arch/arm64/configs/defconfig | 13 +- + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/processor.h | 10 + + arch/arm64/kernel/process.c | 5 +- + arch/blackfin/include/asm/clkdev.h | 17 - + arch/c6x/include/asm/Kbuild | 1 - + arch/c6x/kernel/traps.c | 4 +- + arch/cris/include/asm/Kbuild | 1 - + arch/frv/include/asm/Kbuild | 1 - + arch/h8300/include/asm/Kbuild | 1 - + arch/hexagon/include/asm/Kbuild | 1 - + arch/ia64/include/asm/Kbuild | 1 - + arch/ia64/include/asm/sections.h | 10 +- + arch/ia64/kernel/module.c | 12 + + arch/ia64/kernel/process.c | 10 +- + arch/ia64/kernel/vmlinux.lds.S | 2 + + arch/m32r/include/asm/Kbuild | 1 - + arch/m68k/include/asm/Kbuild | 1 - + arch/metag/include/asm/Kbuild | 1 - + arch/microblaze/Kconfig.platform | 1 + + arch/microblaze/Makefile | 17 +- + arch/microblaze/include/asm/Kbuild | 1 - + arch/microblaze/include/asm/io.h | 2 +- + arch/microblaze/mm/pgtable.c | 2 +- + arch/mips/include/asm/Kbuild | 1 - + arch/mn10300/include/asm/Kbuild | 1 - + arch/mn10300/kernel/traps.c | 4 +- + arch/nios2/include/asm/Kbuild | 1 - + arch/openrisc/include/asm/Kbuild | 1 - + arch/openrisc/kernel/traps.c | 3 +- + arch/parisc/boot/compressed/vmlinux.lds.S | 2 + + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/include/asm/sections.h | 6 + + arch/parisc/kernel/module.c | 16 + + arch/parisc/kernel/process.c | 9 + + arch/parisc/kernel/vmlinux.lds.S | 2 + + arch/powerpc/Kconfig | 19 +- + arch/powerpc/Kconfig.debug | 6 +- + arch/powerpc/Makefile | 1 + + arch/powerpc/boot/Makefile | 8 +- + arch/powerpc/boot/dts/a3m071.dts | 10 +- + arch/powerpc/boot/dts/akebono.dts | 4 +- + arch/powerpc/boot/dts/c2k.dts | 6 +- + arch/powerpc/boot/dts/currituck.dts | 2 +- + arch/powerpc/boot/dts/fsl/mpc8568mds.dts | 12 +- + arch/powerpc/boot/dts/fsl/mpc8569mds.dts | 20 +- + arch/powerpc/boot/dts/fsl/p1021mds.dts | 6 +- + arch/powerpc/boot/dts/fsl/p1025rdb.dtsi | 8 +- + arch/powerpc/boot/dts/fsl/p1025rdb_32b.dts | 2 +- + arch/powerpc/boot/dts/fsl/p1025twr.dtsi | 8 +- + arch/powerpc/boot/dts/fsl/t1040rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1042d4rdb.dts | 10 +- + arch/powerpc/boot/dts/fsl/t1042rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 6 +- + arch/powerpc/boot/dts/fsp2.dts | 6 +- + arch/powerpc/boot/dts/gamecube.dts | 14 +- + arch/powerpc/boot/dts/haleakala.dts | 2 +- + arch/powerpc/boot/dts/kilauea.dts | 4 +- + arch/powerpc/boot/dts/kmeter1.dts | 10 +- + arch/powerpc/boot/dts/makalu.dts | 4 +- + arch/powerpc/boot/dts/mpc832x_mds.dts | 10 +- + arch/powerpc/boot/dts/mpc832x_rdb.dts | 8 +- + arch/powerpc/boot/dts/mpc836x_mds.dts | 8 +- + arch/powerpc/boot/dts/sbc8548-altflash.dts | 8 +- + arch/powerpc/boot/dts/sbc8548.dts | 8 +- + arch/powerpc/boot/dts/wii.dts | 32 +- + arch/powerpc/boot/serial.c | 6 + + arch/powerpc/configs/mpc866_ads_defconfig | 1 - + arch/powerpc/configs/powernv_defconfig | 2 + + arch/powerpc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 23 + + arch/powerpc/include/asm/book3s/64/hash-4k.h | 20 + + arch/powerpc/include/asm/book3s/64/hash-64k.h | 71 +- + arch/powerpc/include/asm/book3s/64/hash.h | 8 +- + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 5 + + arch/powerpc/include/asm/book3s/64/mmu.h | 10 + + arch/powerpc/include/asm/book3s/64/pgtable.h | 79 +- + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 1 + + .../powerpc/include/asm/book3s/64/tlbflush-radix.h | 7 + + arch/powerpc/include/asm/book3s/64/tlbflush.h | 38 + + arch/powerpc/include/asm/bug.h | 4 +- + arch/powerpc/include/asm/code-patching.h | 2 + + arch/powerpc/include/asm/cpm.h | 2 +- + arch/powerpc/include/asm/cpm1.h | 2 + + arch/powerpc/include/asm/cputable.h | 21 +- + arch/powerpc/include/asm/drmem.h | 102 + + arch/powerpc/include/asm/eeh.h | 2 + + arch/powerpc/include/asm/exception-64s.h | 103 +- + arch/powerpc/include/asm/firmware.h | 5 +- + arch/powerpc/include/asm/hardirq.h | 1 + + arch/powerpc/include/asm/head-64.h | 47 +- + arch/powerpc/include/asm/hmi.h | 4 + + arch/powerpc/include/asm/hugetlb.h | 3 +- + arch/powerpc/include/asm/hw_irq.h | 161 +- + arch/powerpc/include/asm/imc-pmu.h | 9 +- + arch/powerpc/include/asm/irqflags.h | 14 +- + arch/powerpc/include/asm/kexec.h | 2 + + arch/powerpc/include/asm/kvm_ppc.h | 2 +- + arch/powerpc/include/asm/local.h | 200 +- + arch/powerpc/include/asm/machdep.h | 8 + + arch/powerpc/include/asm/mman.h | 13 +- + arch/powerpc/include/asm/mmu-8xx.h | 60 +- + arch/powerpc/include/asm/mmu.h | 9 + + arch/powerpc/include/asm/mmu_context.h | 22 + + arch/powerpc/include/asm/module.h | 3 + + arch/powerpc/include/asm/mpic_timer.h | 8 +- + arch/powerpc/include/asm/nmi.h | 4 - + arch/powerpc/include/asm/nohash/32/pgalloc.h | 3 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 25 +- + arch/powerpc/include/asm/nohash/pgtable.h | 27 +- + arch/powerpc/include/asm/nohash/pte-book3e.h | 1 + + arch/powerpc/include/asm/opal-api.h | 5 +- + arch/powerpc/include/asm/opal.h | 6 + + arch/powerpc/include/asm/paca.h | 5 +- + arch/powerpc/include/asm/pci-bridge.h | 9 +- + arch/powerpc/include/asm/pci.h | 2 + + arch/powerpc/include/asm/pkeys.h | 218 + + arch/powerpc/include/asm/pnv-ocxl.h | 36 + + arch/powerpc/include/asm/ppc-opcode.h | 2 + + arch/powerpc/include/asm/processor.h | 5 + + arch/powerpc/include/asm/prom.h | 27 +- + arch/powerpc/include/asm/pte-common.h | 37 +- + arch/powerpc/include/asm/reg.h | 6 +- + arch/powerpc/include/asm/reg_8xx.h | 82 - + arch/powerpc/include/asm/sections.h | 12 + + arch/powerpc/include/asm/systbl.h | 3 + + arch/powerpc/include/asm/unistd.h | 6 +- + arch/powerpc/include/asm/xive-regs.h | 35 + + arch/powerpc/include/asm/xive.h | 40 +- + arch/powerpc/include/uapi/asm/elf.h | 1 + + arch/powerpc/include/uapi/asm/mman.h | 6 + + arch/powerpc/include/uapi/asm/unistd.h | 3 + + arch/powerpc/kernel/asm-offsets.c | 7 +- + arch/powerpc/kernel/cpu_setup_power.S | 50 - + arch/powerpc/kernel/cputable.c | 15 - + arch/powerpc/kernel/crash.c | 16 +- + arch/powerpc/kernel/dt_cpu_ftrs.c | 30 - + arch/powerpc/kernel/eeh.c | 59 + + arch/powerpc/kernel/eeh_driver.c | 10 +- + arch/powerpc/kernel/eeh_sysfs.c | 64 +- + arch/powerpc/kernel/entry_32.S | 10 +- + arch/powerpc/kernel/entry_64.S | 67 +- + arch/powerpc/kernel/exceptions-64e.S | 20 +- + arch/powerpc/kernel/exceptions-64s.S | 118 +- + arch/powerpc/kernel/head_64.S | 11 +- + arch/powerpc/kernel/head_8xx.S | 275 +- + arch/powerpc/kernel/idle_book3e.S | 5 +- + arch/powerpc/kernel/idle_power4.S | 5 +- + arch/powerpc/kernel/irq.c | 29 +- + arch/powerpc/kernel/mce.c | 142 +- + arch/powerpc/kernel/mce_power.c | 115 +- + arch/powerpc/kernel/module.lds | 8 + + arch/powerpc/kernel/module_64.c | 49 +- + arch/powerpc/kernel/optprobes_head.S | 2 +- + arch/powerpc/kernel/paca.c | 13 +- + arch/powerpc/kernel/pci-common.c | 27 +- + arch/powerpc/kernel/pci_dn.c | 6 - + arch/powerpc/kernel/pci_of_scan.c | 2 +- + arch/powerpc/kernel/proc_powerpc.c | 2 +- + arch/powerpc/kernel/process.c | 28 +- + arch/powerpc/kernel/prom.c | 115 +- + arch/powerpc/kernel/prom_init.c | 2 + + arch/powerpc/kernel/ptrace.c | 78 + + arch/powerpc/kernel/rtas-proc.c | 14 +- + arch/powerpc/kernel/rtas_flash.c | 2 +- + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/setup-common.c | 21 +- + arch/powerpc/kernel/setup.h | 4 + + arch/powerpc/kernel/setup_64.c | 48 +- + arch/powerpc/kernel/signal_32.c | 8 + + arch/powerpc/kernel/signal_64.c | 11 +- + arch/powerpc/kernel/smp.c | 18 + + arch/powerpc/kernel/sysfs.c | 8 + + arch/powerpc/kernel/time.c | 6 +- + arch/powerpc/kernel/traps.c | 51 +- + arch/powerpc/kernel/vdso64/gettimeofday.S | 67 +- + arch/powerpc/kernel/vmlinux.lds.S | 3 + + arch/powerpc/kernel/watchdog.c | 100 +- + arch/powerpc/kvm/book3s_hv.c | 10 +- + arch/powerpc/kvm/book3s_hv_ras.c | 14 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 9 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 11 +- + arch/powerpc/kvm/book3s_xics.c | 2 +- + arch/powerpc/lib/code-patching.c | 37 +- + arch/powerpc/lib/feature-fixups.c | 8 +- + arch/powerpc/mm/8xx_mmu.c | 4 +- + arch/powerpc/mm/Makefile | 3 +- + arch/powerpc/mm/drmem.c | 439 + + arch/powerpc/mm/dump_linuxpagetables.c | 32 +- + arch/powerpc/mm/fault.c | 53 +- + arch/powerpc/mm/hash64_4k.c | 14 +- + arch/powerpc/mm/hash64_64k.c | 123 +- + arch/powerpc/mm/hash_native_64.c | 97 + + arch/powerpc/mm/hash_utils_64.c | 97 +- + arch/powerpc/mm/hugetlbpage-hash64.c | 16 +- + arch/powerpc/mm/hugetlbpage.c | 8 +- + arch/powerpc/mm/init_64.c | 5 +- + arch/powerpc/mm/mem.c | 3 +- + arch/powerpc/mm/mmu_context_book3s64.c | 2 + + arch/powerpc/mm/numa.c | 333 +- + arch/powerpc/mm/pgtable-radix.c | 23 +- + arch/powerpc/mm/pgtable.c | 3 +- + arch/powerpc/mm/pgtable_32.c | 9 +- + arch/powerpc/mm/pgtable_64.c | 14 +- + arch/powerpc/mm/pkeys.c | 468 + + arch/powerpc/mm/subpage-prot.c | 3 + + arch/powerpc/mm/tlb-radix.c | 68 +- + arch/powerpc/mm/tlb_nohash.c | 5 +- + arch/powerpc/perf/8xx-pmu.c | 52 +- + arch/powerpc/perf/Makefile | 2 +- + arch/powerpc/perf/core-book3s.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 102 +- + arch/powerpc/platforms/44x/fsp2.c | 259 +- + arch/powerpc/platforms/44x/fsp2.h | 272 + + arch/powerpc/platforms/512x/mpc512x_shared.c | 4 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 52 +- + arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 +- + arch/powerpc/platforms/85xx/socrates_fpga_pic.c | 7 +- + arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 2 +- + arch/powerpc/platforms/8xx/Kconfig | 12 - + arch/powerpc/platforms/Kconfig | 11 - + arch/powerpc/platforms/Kconfig.cputype | 8 - + arch/powerpc/platforms/cell/interrupt.c | 3 +- + arch/powerpc/platforms/cell/setup.c | 3 +- + arch/powerpc/platforms/cell/spider-pic.c | 3 +- + arch/powerpc/platforms/cell/spu_manage.c | 4 +- + arch/powerpc/platforms/cell/spufs/file.c | 6 +- + arch/powerpc/platforms/cell/spufs/inode.c | 4 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 2 +- + arch/powerpc/platforms/pasemi/dma_lib.c | 4 +- + arch/powerpc/platforms/powermac/backlight.c | 6 +- + arch/powerpc/platforms/powermac/feature.c | 3 +- + arch/powerpc/platforms/powermac/pic.c | 8 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + arch/powerpc/platforms/powernv/Makefile | 1 + + arch/powerpc/platforms/powernv/eeh-powernv.c | 101 +- + arch/powerpc/platforms/powernv/npu-dma.c | 7 +- + arch/powerpc/platforms/powernv/ocxl.c | 515 + + arch/powerpc/platforms/powernv/opal-dump.c | 4 +- + arch/powerpc/platforms/powernv/opal-elog.c | 4 +- + arch/powerpc/platforms/powernv/opal-imc.c | 77 + + arch/powerpc/platforms/powernv/opal-sysparam.c | 6 +- + arch/powerpc/platforms/powernv/opal-wrappers.S | 3 + + arch/powerpc/platforms/powernv/opal.c | 28 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 88 +- + arch/powerpc/platforms/powernv/pci.c | 4 + + arch/powerpc/platforms/powernv/pci.h | 8 +- + arch/powerpc/platforms/powernv/smp.c | 28 + + arch/powerpc/platforms/ps3/device-init.c | 12 +- + arch/powerpc/platforms/ps3/mm.c | 4 +- + arch/powerpc/platforms/ps3/os-area.c | 2 +- + arch/powerpc/platforms/ps3/setup.c | 1 + + arch/powerpc/platforms/pseries/cmm.c | 16 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 162 +- + arch/powerpc/platforms/pseries/firmware.c | 2 + + arch/powerpc/platforms/pseries/hotplug-cpu.c | 3 + + arch/powerpc/platforms/pseries/hotplug-memory.c | 522 +- + arch/powerpc/platforms/pseries/hvCall_inst.c | 2 +- + arch/powerpc/platforms/pseries/ibmebus.c | 4 +- + arch/powerpc/platforms/pseries/iommu.c | 8 +- + arch/powerpc/platforms/pseries/lparcfg.c | 8 +- + arch/powerpc/platforms/pseries/mobility.c | 2 +- + arch/powerpc/platforms/pseries/of_helpers.c | 60 + + arch/powerpc/platforms/pseries/pci.c | 177 +- + arch/powerpc/platforms/pseries/pseries_energy.c | 126 +- + arch/powerpc/platforms/pseries/reconfig.c | 2 +- + arch/powerpc/platforms/pseries/scanlog.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 176 +- + arch/powerpc/platforms/pseries/suspend.c | 3 +- + arch/powerpc/sysdev/Makefile | 4 +- + arch/powerpc/sysdev/axonram.c | 383 - + arch/powerpc/sysdev/cpm1.c | 33 +- + arch/powerpc/sysdev/cpm2.c | 11 - + arch/powerpc/sysdev/cpm_common.c | 5 +- + arch/powerpc/sysdev/cpm_gpio.c | 80 + + arch/powerpc/sysdev/fsl_mpic_timer_wakeup.c | 16 +- + arch/powerpc/sysdev/fsl_pci.c | 14 +- + arch/powerpc/sysdev/mpic.c | 10 +- + arch/powerpc/sysdev/mpic_timer.c | 55 +- + arch/powerpc/sysdev/mv64x60_pci.c | 2 +- + arch/powerpc/sysdev/xics/icp-native.c | 10 +- + arch/powerpc/sysdev/xics/ics-opal.c | 4 +- + arch/powerpc/sysdev/xics/ics-rtas.c | 4 +- + arch/powerpc/sysdev/xics/xics-common.c | 8 +- + arch/powerpc/sysdev/xive/common.c | 8 +- + arch/powerpc/xmon/ppc-dis.c | 4 - + arch/powerpc/xmon/xmon.c | 6 +- + arch/riscv/include/asm/Kbuild | 1 - + arch/s390/include/asm/Kbuild | 1 - + arch/score/include/asm/Kbuild | 1 - + arch/sh/include/asm/Kbuild | 1 - + arch/sh/kernel/process_32.c | 5 +- + arch/sparc/include/asm/Kbuild | 1 - + arch/tile/include/asm/Kbuild | 1 - + arch/um/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/kernel/process.c | 5 +- + arch/x86/Kconfig | 1 + + arch/x86/entry/common.c | 9 +- + arch/x86/entry/entry_64.S | 127 +- + arch/x86/entry/syscall_64.c | 7 +- + arch/x86/include/asm/Kbuild | 1 - + arch/x86/include/asm/barrier.h | 28 + + arch/x86/include/asm/fixmap.h | 6 +- + arch/x86/include/asm/iosf_mbi.h | 25 + + arch/x86/include/asm/msr.h | 3 +- + arch/x86/include/asm/nospec-branch.h | 2 +- + arch/x86/include/asm/pgtable_32_types.h | 5 +- + arch/x86/include/asm/processor.h | 10 +- + arch/x86/include/asm/syscall.h | 6 +- + arch/x86/include/asm/thread_info.h | 3 +- + arch/x86/include/asm/tlbflush.h | 2 + + arch/x86/include/asm/uaccess.h | 15 +- + arch/x86/include/asm/uaccess_32.h | 6 +- + arch/x86/include/asm/uaccess_64.h | 12 +- + arch/x86/kernel/alternative.c | 14 - + arch/x86/kernel/cpu/bugs.c | 96 +- + arch/x86/kernel/cpu/common.c | 25 +- + arch/x86/kernel/cpu/intel.c | 27 +- + arch/x86/kernel/cpu/mcheck/mce.c | 3 +- + arch/x86/kernel/dumpstack.c | 2 +- + arch/x86/kernel/early-quirks.c | 87 +- + arch/x86/kernel/process_64.c | 4 +- + arch/x86/kernel/ptrace.c | 2 +- + arch/x86/kernel/relocate_kernel_64.S | 8 + + arch/x86/kernel/signal.c | 2 +- + arch/x86/kvm/cpuid.c | 22 +- + arch/x86/kvm/cpuid.h | 1 + + arch/x86/kvm/svm.c | 116 + + arch/x86/kvm/vmx.c | 656 +- + arch/x86/kvm/x86.c | 8 +- + arch/x86/lib/getuser.S | 10 + + arch/x86/lib/usercopy_32.c | 8 +- + arch/x86/mm/mmio-mod.c | 5 +- + arch/x86/mm/tlb.c | 33 +- + arch/x86/platform/intel/iosf_mbi.c | 19 +- + arch/x86/power/hibernate_32.c | 2 +- + arch/x86/power/hibernate_64.c | 2 +- + arch/xtensa/include/asm/Kbuild | 1 - + block/blk-core.c | 3 + + block/blk-merge.c | 29 +- + block/blk-mq-sched.c | 2 + + block/blk-mq.c | 20 +- + drivers/base/Kconfig | 1 + + drivers/base/core.c | 5 +- + drivers/block/null_blk.c | 2 +- + drivers/block/skd_main.c | 7 +- + drivers/block/virtio_blk.c | 2 +- + drivers/block/xen-blkfront.c | 2 +- + drivers/bus/omap_l3_noc.c | 5 + + drivers/bus/omap_l3_smx.c | 6 + + drivers/bus/ti-sysc.c | 485 +- + drivers/char/agp/intel-gtt.c | 16 +- + drivers/clk/Kconfig | 13 + + drivers/clk/Makefile | 4 +- + drivers/clk/at91/clk-programmable.c | 2 + + drivers/clk/at91/pmc.c | 63 +- + drivers/clk/at91/pmc.h | 2 + + drivers/clk/bcm/clk-cygnus.c | 25 +- + drivers/clk/bcm/clk-iproc-pll.c | 260 +- + drivers/clk/bcm/clk-iproc.h | 5 + + drivers/clk/clk-aspeed.c | 667 + + drivers/clk/clk-axi-clkgen.c | 39 +- + drivers/clk/clk-divider.c | 7 +- + drivers/clk/clk-qoriq.c | 9 +- + drivers/clk/clk-si5351.c | 68 +- + drivers/clk/clk-stm32f4.c | 2 +- + drivers/clk/clk-stm32h7.c | 19 +- + drivers/clk/clk.c | 620 +- + drivers/clk/clk.h | 4 + + drivers/clk/clkdev.c | 2 +- + drivers/clk/h8300/clk-div.c | 4 +- + drivers/clk/h8300/clk-h8s2678.c | 6 +- + drivers/clk/hisilicon/Kconfig | 6 + + drivers/clk/hisilicon/Makefile | 1 + + drivers/clk/hisilicon/clk-hi3660-stub.c | 185 + + drivers/clk/hisilicon/clkdivider-hi6220.c | 2 +- + drivers/clk/imx/clk-imx51-imx53.c | 12 +- + drivers/clk/mediatek/Kconfig | 97 +- + drivers/clk/mediatek/Makefile | 3 +- + drivers/clk/mediatek/clk-mtk.h | 8 +- + drivers/clk/meson/Kconfig | 8 + + drivers/clk/meson/Makefile | 1 + + drivers/clk/meson/axg.c | 938 + + drivers/clk/meson/axg.h | 126 + + drivers/clk/meson/clk-mpll.c | 2 +- + drivers/clk/meson/clkc.h | 2 +- + drivers/clk/meson/gxbb.c | 132 +- + drivers/clk/meson/meson8b.c | 24 +- + drivers/clk/mvebu/armada-37xx-periph.c | 317 +- + drivers/clk/nxp/clk-lpc32xx.c | 6 +- + drivers/clk/pxa/clk-pxa3xx.c | 6 +- + drivers/clk/qcom/Kconfig | 30 + + drivers/clk/qcom/Makefile | 4 + + drivers/clk/qcom/a53-pll.c | 107 + + drivers/clk/qcom/apcs-msm8916.c | 138 + + drivers/clk/qcom/clk-alpha-pll.c | 516 +- + drivers/clk/qcom/clk-alpha-pll.h | 35 +- + drivers/clk/qcom/clk-rcg.h | 10 - + drivers/clk/qcom/clk-regmap-divider.c | 31 +- + drivers/clk/qcom/clk-regmap-divider.h | 1 + + drivers/clk/qcom/clk-regmap-mux-div.c | 231 + + drivers/clk/qcom/clk-regmap-mux-div.h | 44 + + drivers/clk/qcom/clk-regmap-mux.c | 6 + + drivers/clk/qcom/clk-regmap-mux.h | 2 + + drivers/clk/qcom/clk-spmi-pmic-div.c | 302 + + drivers/clk/qcom/common.h | 11 +- + drivers/clk/qcom/gcc-ipq8074.c | 4182 ++- + drivers/clk/qcom/gcc-msm8916.c | 13 +- + drivers/clk/qcom/gcc-msm8994.c | 4 + + drivers/clk/qcom/gcc-msm8996.c | 4 + + drivers/clk/qcom/mmcc-msm8996.c | 16 + + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 1 + + drivers/clk/renesas/r8a77970-cpg-mssr.c | 1 + + drivers/clk/renesas/renesas-cpg-mssr.c | 2 +- + drivers/clk/spear/clk-frac-synth.c | 2 +- + drivers/clk/spear/clk-gpt-synth.c | 2 +- + drivers/clk/sprd/Kconfig | 14 + + drivers/clk/sprd/Makefile | 11 + + drivers/clk/sprd/common.c | 96 + + drivers/clk/sprd/common.h | 38 + + drivers/clk/sprd/composite.c | 60 + + drivers/clk/sprd/composite.h | 51 + + drivers/clk/sprd/div.c | 91 + + drivers/clk/sprd/div.h | 75 + + drivers/clk/sprd/gate.c | 111 + + drivers/clk/sprd/gate.h | 59 + + drivers/clk/sprd/mux.c | 76 + + drivers/clk/sprd/mux.h | 74 + + drivers/clk/sprd/pll.c | 266 + + drivers/clk/sprd/pll.h | 108 + + drivers/clk/sprd/sc9860-clk.c | 1974 ++ + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 57 +- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 22 +- + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 53 +- + drivers/clk/sunxi-ng/ccu_common.h | 29 - + drivers/clk/sunxi-ng/ccu_div.c | 2 +- + drivers/clk/sunxi-ng/ccu_mp.c | 20 +- + drivers/clk/sunxi-ng/ccu_mp.h | 24 + + drivers/clk/sunxi-ng/ccu_nm.c | 50 +- + drivers/clk/sunxi-ng/ccu_nm.h | 2 + + drivers/clk/sunxi/clk-factors.c | 26 +- + drivers/clk/sunxi/clk-factors.h | 4 + + drivers/clk/sunxi/clk-mod0.c | 9 +- + drivers/clk/sunxi/clk-sun8i-apb0.c | 5 +- + drivers/clk/sunxi/clk-sun8i-mbus.c | 7 +- + drivers/clk/sunxi/clk-sun9i-core.c | 9 +- + drivers/clk/sunxi/clk-sunxi.c | 36 +- + drivers/clk/ti/Makefile | 4 - + drivers/clk/ti/apll.c | 3 +- + drivers/clk/ti/clk-33xx.c | 279 +- + drivers/clk/ti/clk-3xxx-legacy.c | 4656 --- + drivers/clk/ti/clk-3xxx.c | 263 +- + drivers/clk/ti/clk-43xx.c | 295 +- + drivers/clk/ti/clk-44xx.c | 200 +- + drivers/clk/ti/clk-54xx.c | 697 +- + drivers/clk/ti/clk-7xx.c | 1076 +- + drivers/clk/ti/clk-814x.c | 50 +- + drivers/clk/ti/clk-816x.c | 62 +- + drivers/clk/ti/clk.c | 205 +- + drivers/clk/ti/clkctrl.c | 91 +- + drivers/clk/ti/clock.h | 81 +- + drivers/clk/ti/composite.c | 48 +- + drivers/clk/ti/dpll.c | 93 +- + drivers/clk/ti/gate.c | 48 - + drivers/clk/ti/interface.c | 32 - + drivers/clk/zte/clk.h | 18 - + drivers/cpuidle/cpuidle-powernv.c | 2 + + drivers/cpuidle/cpuidle-pseries.c | 16 +- + drivers/dma-buf/dma-buf.c | 9 +- + drivers/dma-buf/dma-fence-array.c | 14 +- + drivers/dma-buf/reservation.c | 66 +- + drivers/dma/imx-dma.c | 2 +- + drivers/firewire/net.c | 7 +- + drivers/firewire/ohci.c | 8 +- + drivers/firmware/Kconfig | 2 +- + drivers/firmware/dmi-sysfs.c | 2 +- + drivers/firmware/dmi_scan.c | 64 +- + drivers/firmware/qcom_scm.c | 24 - + drivers/firmware/raspberrypi.c | 2 +- + drivers/firmware/ti_sci.c | 4 +- + drivers/gpio/gpio-uniphier.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 75 +- + drivers/gpu/drm/Kconfig | 10 + + drivers/gpu/drm/Makefile | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 227 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 102 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 115 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 188 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 266 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atpx_handler.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 79 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 82 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 792 + + .../grph_object_id.c => amdgpu/amdgpu_debugfs.h} | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 1916 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 27 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 75 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 459 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 91 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 7 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 107 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_queue_mgr.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 287 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 134 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1024 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 96 +- + drivers/gpu/drm/amd/amdgpu/atombios_i2c.c | 11 +- + drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 24 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 212 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 28 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 2 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx9.h | 8 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 42 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 54 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 221 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 329 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 51 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 91 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 369 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 63 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 28 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 64 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 125 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.h | 26 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 159 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.h | 22 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 20 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 42 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 117 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 304 +- + drivers/gpu/drm/amd/amdgpu/si.c | 156 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 30 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 15 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 278 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 20 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 62 +- + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 61 +- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 112 +- + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 88 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 67 +- + drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c | 56 + + drivers/gpu/drm/amd/amdgpu/vi.c | 186 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 2 + + drivers/gpu/drm/amd/amdkfd/Makefile | 4 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 1384 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 46 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1267 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 42 +- + drivers/gpu/drm/amd/amdkfd/kfd_dbgdev.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c | 75 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 31 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 124 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_module.c | 17 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 48 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 167 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 59 +- + drivers/gpu/drm/amd/amdkfd/kfd_pasid.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 83 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 267 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 78 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 1061 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 33 +- + drivers/gpu/drm/amd/display/TODO | 3 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 303 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 12 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 9 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 7 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 33 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/basics/conversion.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 28 + + .../gpu/drm/amd/display/dc/basics/log_helpers.c | 10 +- + drivers/gpu/drm/amd/display/dc/basics/logger.c | 22 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 60 +- + .../gpu/drm/amd/display/dc/bios/command_table.c | 21 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 13 + + drivers/gpu/drm/amd/display/dc/calcs/dce_calcs.c | 9 + + .../gpu/drm/amd/display/dc/calcs/dcn_calc_auto.c | 17 +- + .../gpu/drm/amd/display/dc/calcs/dcn_calc_math.c | 27 +- + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 148 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 625 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 4 + + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 145 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 183 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 19 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 20 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 151 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 19 +- + drivers/gpu/drm/amd/display/dc/dc.h | 594 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 28 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 207 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 293 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 50 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 8 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 228 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 15 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_ipp.c | 33 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 21 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.h | 5 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 34 +- + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 278 +- + .../amd/display/dc/dce100/dce100_hw_sequencer.c | 2 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 373 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 8 +- + .../drm/amd/display/dc/dce110/dce110_mem_input_v.c | 28 +- + .../amd/display/dc/dce110/dce110_opp_regamma_v.c | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 1 + + .../display/dc/dce110/dce110_timing_generator.c | 265 +- + .../display/dc/dce110/dce110_timing_generator.h | 6 + + .../amd/display/dc/dce120/dce120_hw_sequencer.c | 6 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 8 +- + .../display/dc/dce120/dce120_timing_generator.c | 6 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 5 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 294 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.h | 10 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 114 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.h | 530 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 221 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 8 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 516 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 214 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 116 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 569 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2068 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c | 529 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.h | 90 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 118 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 125 +- + .../{dcn10_timing_generator.c => dcn10_optc.c} | 439 +- + .../{dcn10_timing_generator.h => dcn10_optc.h} | 150 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 133 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 7 + + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 29 - + .../drm/amd/display/dc/dml/display_mode_structs.h | 6 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 131 +- + .../drm/amd/display/dc/dml/display_rq_dlg_calc.c | 9 + + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 9 + + .../gpu/drm/amd/display/dc/dml/soc_bounding_box.c | 10 + + .../amd/display/dc/gpio/dce120/hw_factory_dce120.c | 6 +- + .../display/dc/gpio/dce120/hw_translate_dce120.c | 6 +- + .../amd/display/dc/gpio/dcn10/hw_factory_dcn10.c | 6 +- + .../amd/display/dc/gpio/dcn10/hw_translate_dcn10.c | 6 +- + .../amd/display/dc/i2caux/dce120/i2caux_dce120.c | 6 +- + .../drm/amd/display/dc/i2caux/dcn10/i2caux_dcn10.c | 6 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 14 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 21 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 46 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 19 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 55 +- + drivers/gpu/drm/amd/display/dc/inc/hw/ipp.h | 6 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 157 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 29 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 71 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 30 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 6 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 6 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 14 +- + .../amd/display/dc/virtual/virtual_link_encoder.c | 3 +- + .../drm/amd/display/include/ddc_service_types.h | 33 - + drivers/gpu/drm/amd/display/include/fixed31_32.h | 7 + + .../gpu/drm/amd/display/include/grph_object_id.h | 16 +- + .../gpu/drm/amd/display/include/logger_interface.h | 5 + + .../drm/amd/display/modules/freesync/freesync.c | 84 +- + drivers/gpu/drm/amd/include/amd_shared.h | 172 - + .../amd/include/asic_reg/athub/athub_1_0_offset.h | 453 + + .../amd/include/asic_reg/athub/athub_1_0_sh_mask.h | 2045 ++ + .../asic_reg/{vega10/DC => dce}/dce_12_0_offset.h | 0 + .../asic_reg/{vega10/DC => dce}/dce_12_0_sh_mask.h | 0 + .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h | 0 + .../asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h | 0 + .../asic_reg/{vega10/GC => gc}/gc_9_0_default.h | 7 - + .../asic_reg/{vega10/GC => gc}/gc_9_0_offset.h | 14 - + .../asic_reg/{vega10/GC => gc}/gc_9_0_sh_mask.h | 45 - + .../asic_reg/{raven1/GC => gc}/gc_9_1_offset.h | 14 - + .../drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h | 209 + + .../drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h | 601 + + .../{vega10/MMHUB => mmhub}/mmhub_1_0_default.h | 0 + .../{vega10/MMHUB => mmhub}/mmhub_1_0_offset.h | 0 + .../{vega10/MMHUB => mmhub}/mmhub_1_0_sh_mask.h | 0 + .../{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h | 0 + .../{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h | 0 + .../asic_reg/{raven1/MP => mp}/mp_10_0_default.h | 0 + .../asic_reg/{raven1/MP => mp}/mp_10_0_offset.h | 0 + .../asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h | 0 + .../drm/amd/include/asic_reg/mp/mp_9_0_offset.h | 375 + + .../drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h | 1463 + + .../{vega10/NBIF => nbif}/nbif_6_1_offset.h | 0 + .../{vega10/NBIF => nbif}/nbif_6_1_sh_mask.h | 0 + .../{vega10/NBIO => nbio}/nbio_6_1_default.h | 0 + .../{vega10/NBIO => nbio}/nbio_6_1_offset.h | 0 + .../{vega10/NBIO => nbio}/nbio_6_1_sh_mask.h | 0 + .../{raven1/NBIO => nbio}/nbio_7_0_default.h | 0 + .../{raven1/NBIO => nbio}/nbio_7_0_offset.h | 0 + .../{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h | 0 + .../{vega10/OSSSYS => oss}/osssys_4_0_offset.h | 0 + .../{vega10/OSSSYS => oss}/osssys_4_0_sh_mask.h | 0 + .../include/asic_reg/raven1/DCN/dcn_1_0_default.h | 7988 ----- + .../include/asic_reg/raven1/GC/gc_9_1_default.h | 4005 --- + .../include/asic_reg/raven1/GC/gc_9_1_sh_mask.h | 31191 ------------------- + .../asic_reg/raven1/MMHUB/mmhub_9_1_default.h | 1028 - + .../asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h | 1658 - + .../include/asic_reg/raven1/VCN/vcn_1_0_default.h | 202 - + .../amd/include/asic_reg/sdma0/sdma0_4_0_default.h | 286 + + .../amd/include/asic_reg/sdma0/sdma0_4_0_offset.h | 547 + + .../amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h | 1852 ++ + .../{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h | 0 + .../{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h | 0 + .../amd/include/asic_reg/sdma1/sdma1_4_0_default.h | 282 + + .../amd/include/asic_reg/sdma1/sdma1_4_0_offset.h | 539 + + .../amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h | 1810 ++ + .../{vega10/SMUIO => smuio}/smuio_9_0_offset.h | 0 + .../{vega10/SMUIO => smuio}/smuio_9_0_sh_mask.h | 0 + .../{raven1/THM => thm}/thm_10_0_default.h | 0 + .../asic_reg/{raven1/THM => thm}/thm_10_0_offset.h | 0 + .../{raven1/THM => thm}/thm_10_0_sh_mask.h | 0 + .../asic_reg/{vega10/THM => thm}/thm_9_0_default.h | 0 + .../asic_reg/{vega10/THM => thm}/thm_9_0_offset.h | 0 + .../asic_reg/{vega10/THM => thm}/thm_9_0_sh_mask.h | 0 + .../drm/amd/include/asic_reg/umc/umc_6_0_default.h | 31 + + .../drm/amd/include/asic_reg/umc/umc_6_0_offset.h | 52 + + .../drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h | 36 + + .../asic_reg/{vega10/UVD => uvd}/uvd_7_0_offset.h | 0 + .../asic_reg/{vega10/UVD => uvd}/uvd_7_0_sh_mask.h | 0 + .../asic_reg/{vega10/VCE => vce}/vce_4_0_default.h | 0 + .../asic_reg/{vega10/VCE => vce}/vce_4_0_offset.h | 0 + .../asic_reg/{vega10/VCE => vce}/vce_4_0_sh_mask.h | 0 + .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h | 0 + .../asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h | 0 + .../asic_reg/vega10/ATHUB/athub_1_0_default.h | 241 - + .../asic_reg/vega10/ATHUB/athub_1_0_offset.h | 453 - + .../asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h | 2045 -- + .../include/asic_reg/vega10/DC/dce_12_0_default.h | 9868 ------ + .../include/asic_reg/vega10/HDP/hdp_4_0_default.h | 117 - + .../include/asic_reg/vega10/HDP/hdp_4_0_offset.h | 209 - + .../include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h | 601 - + .../include/asic_reg/vega10/MP/mp_9_0_default.h | 342 - + .../amd/include/asic_reg/vega10/MP/mp_9_0_offset.h | 375 - + .../include/asic_reg/vega10/MP/mp_9_0_sh_mask.h | 1463 - + .../asic_reg/vega10/NBIF/nbif_6_1_default.h | 1271 - + .../asic_reg/vega10/OSSSYS/osssys_4_0_default.h | 176 - + .../asic_reg/vega10/SDMA0/sdma0_4_0_default.h | 286 - + .../asic_reg/vega10/SDMA0/sdma0_4_0_offset.h | 547 - + .../asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h | 1852 -- + .../asic_reg/vega10/SDMA1/sdma1_4_0_default.h | 282 - + .../asic_reg/vega10/SDMA1/sdma1_4_0_offset.h | 539 - + .../asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h | 1810 -- + .../asic_reg/vega10/SMUIO/smuio_9_0_default.h | 100 - + .../include/asic_reg/vega10/UVD/uvd_7_0_default.h | 127 - + drivers/gpu/drm/amd/include/dm_pp_interface.h | 144 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 52 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 294 + + .../amd/include/{asic_reg/vega10 => }/soc15ip.h | 0 + .../include/{asic_reg/vega10 => }/vega10_enum.h | 0 + drivers/gpu/drm/amd/include/vi_structs.h | 2 + + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 170 +- + drivers/gpu/drm/amd/powerplay/hwmgr/cz_hwmgr.c | 29 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 33 +- + drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + + .../gpu/drm/amd/powerplay/hwmgr/pp_overdriver.h | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/pp_psm.c | 4 + + drivers/gpu/drm/amd/powerplay/hwmgr/ppatomfwctrl.c | 2 +- + .../amd/powerplay/hwmgr/process_pptables_v1_0.c | 6 +- + .../gpu/drm/amd/powerplay/hwmgr/processpptables.c | 6 +- + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.c | 182 +- + drivers/gpu/drm/amd/powerplay/hwmgr/rv_hwmgr.h | 15 + + drivers/gpu/drm/amd/powerplay/hwmgr/rv_inc.h | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 61 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 81 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.h | 1 - + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_inc.h | 23 +- + drivers/gpu/drm/amd/powerplay/inc/amd_powerplay.h | 275 +- + .../gpu/drm/amd/powerplay/inc/hardwaremanager.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 35 +- + drivers/gpu/drm/amd/powerplay/inc/pp_soc15.h | 2 +- + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 7 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 24 +- + drivers/gpu/drm/amd/powerplay/smumgr/cz_smumgr.c | 13 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 5 +- + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 28 +- + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 5 +- + drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.c | 8 + + drivers/gpu/drm/amd/powerplay/smumgr/rv_smumgr.h | 2 +- + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 8 +- + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 15 +- + .../gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c | 6 +- + drivers/gpu/drm/amd/scheduler/gpu_scheduler.h | 185 - + drivers/gpu/drm/arc/arcpgu_drv.c | 2 +- + drivers/gpu/drm/arm/hdlcd_crtc.c | 8 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- + drivers/gpu/drm/arm/malidp_drv.c | 63 +- + drivers/gpu/drm/arm/malidp_drv.h | 2 - + drivers/gpu/drm/arm/malidp_planes.c | 3 +- + drivers/gpu/drm/armada/armada_crtc.c | 395 +- + drivers/gpu/drm/armada/armada_crtc.h | 24 +- + drivers/gpu/drm/armada/armada_drm.h | 1 - + drivers/gpu/drm/armada/armada_drv.c | 8 +- + drivers/gpu/drm/armada/armada_fb.c | 11 +- + drivers/gpu/drm/armada/armada_fbdev.c | 8 - + drivers/gpu/drm/armada/armada_overlay.c | 282 +- + drivers/gpu/drm/armada/armada_trace.h | 24 +- + drivers/gpu/drm/ast/ast_mode.c | 1 + + drivers/gpu/drm/ast/ast_ttm.c | 15 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 26 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 2 +- + drivers/gpu/drm/bochs/bochs_mm.c | 7 +- + drivers/gpu/drm/bridge/analogix-anx78xx.c | 2 - + drivers/gpu/drm/bridge/sil-sii8620.c | 53 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 6 +- + drivers/gpu/drm/bridge/tc358767.c | 2 + + drivers/gpu/drm/cirrus/cirrus_main.c | 9 + + drivers/gpu/drm/cirrus/cirrus_ttm.c | 12 +- + drivers/gpu/drm/drm_atomic.c | 70 +- + drivers/gpu/drm/drm_atomic_helper.c | 112 +- + drivers/gpu/drm/drm_auth.c | 6 + + drivers/gpu/drm/drm_blend.c | 8 +- + drivers/gpu/drm/drm_connector.c | 73 + + drivers/gpu/drm/drm_debugfs.c | 8 + + drivers/gpu/drm/drm_dp_helper.c | 1 - + drivers/gpu/drm/drm_drv.c | 47 - + drivers/gpu/drm/drm_edid.c | 110 +- + drivers/gpu/drm/drm_fb_cma_helper.c | 156 +- + drivers/gpu/drm/drm_fb_helper.c | 352 +- + drivers/gpu/drm/drm_framebuffer.c | 89 +- + drivers/gpu/drm/drm_gem.c | 21 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 53 +- + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 6 +- + drivers/gpu/drm/drm_internal.h | 7 + + drivers/gpu/drm/drm_mm.c | 2 +- + drivers/gpu/drm/drm_mode_config.c | 3 + + drivers/gpu/drm/drm_modeset_helper.c | 76 + + .../drm/drm_panel_orientation_quirks.c} | 104 +- + drivers/gpu/drm/drm_plane_helper.c | 111 +- + drivers/gpu/drm/drm_prime.c | 8 +- + drivers/gpu/drm/drm_print.c | 54 +- + drivers/gpu/drm/drm_probe_helper.c | 3 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 9 +- + drivers/gpu/drm/drm_syncobj.c | 56 +- + drivers/gpu/drm/drm_vblank.c | 12 +- + drivers/gpu/drm/drm_vma_manager.c | 15 +- + drivers/gpu/drm/etnaviv/Kconfig | 9 + + drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 40 +- + drivers/gpu/drm/etnaviv/etnaviv_cmd_parser.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.c | 29 +- + drivers/gpu/drm/etnaviv/etnaviv_cmdbuf.h | 18 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 22 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 23 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 197 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 22 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 199 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 215 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 11 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 14 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.h | 2 +- + drivers/gpu/drm/exynos/Kconfig | 11 +- + drivers/gpu/drm/exynos/Makefile | 1 - + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 8 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.c | 20 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_fb.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 18 - + drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 2 - + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 1806 -- + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 252 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +- + .../gpu/drm/exynos/regs-decon5433.h | 6 +- + .../gpu/drm/exynos/regs-decon7.h | 8 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 25 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.h | 1 - + drivers/gpu/drm/gma500/framebuffer.c | 9 +- + drivers/gpu/drm/gma500/mmu.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.c | 17 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 11 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 29 + + drivers/gpu/drm/i915/Makefile | 32 +- + drivers/gpu/drm/i915/gvt/Makefile | 3 +- + drivers/gpu/drm/i915/gvt/cfg_space.c | 3 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 264 +- + drivers/gpu/drm/i915/gvt/debug.h | 24 +- + drivers/gpu/drm/i915/gvt/debugfs.c | 212 + + drivers/gpu/drm/i915/gvt/display.c | 80 +- + drivers/gpu/drm/i915/gvt/display.h | 2 + + drivers/gpu/drm/i915/gvt/dmabuf.c | 537 + + drivers/gpu/drm/i915/gvt/dmabuf.h | 67 + + drivers/gpu/drm/i915/gvt/edid.c | 22 +- + drivers/gpu/drm/i915/gvt/execlist.c | 498 +- + drivers/gpu/drm/i915/gvt/execlist.h | 8 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 514 + + drivers/gpu/drm/i915/gvt/fb_decoder.h | 169 + + drivers/gpu/drm/i915/gvt/firmware.c | 26 +- + drivers/gpu/drm/i915/gvt/gtt.c | 298 +- + drivers/gpu/drm/i915/gvt/gtt.h | 45 +- + drivers/gpu/drm/i915/gvt/gvt.c | 153 +- + drivers/gpu/drm/i915/gvt/gvt.h | 127 +- + drivers/gpu/drm/i915/gvt/handlers.c | 842 +- + drivers/gpu/drm/i915/gvt/hypercall.h | 3 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 316 +- + drivers/gpu/drm/i915/gvt/mmio.c | 89 +- + drivers/gpu/drm/i915/gvt/mmio.h | 9 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 412 + + .../gpu/drm/i915/gvt/{render.h => mmio_context.h} | 9 + + drivers/gpu/drm/i915/gvt/mpt.h | 79 +- + drivers/gpu/drm/i915/gvt/opregion.c | 360 +- + drivers/gpu/drm/i915/gvt/reg.h | 6 +- + drivers/gpu/drm/i915/gvt/render.c | 405 - + drivers/gpu/drm/i915/gvt/sched_policy.c | 5 + + drivers/gpu/drm/i915/gvt/sched_policy.h | 2 + + drivers/gpu/drm/i915/gvt/scheduler.c | 670 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 35 +- + drivers/gpu/drm/i915/gvt/trace.h | 15 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 73 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 20 +- + drivers/gpu/drm/i915/i915_debugfs.c | 438 +- + drivers/gpu/drm/i915/i915_drv.c | 182 +- + drivers/gpu/drm/i915/i915_drv.h | 643 +- + drivers/gpu/drm/i915/i915_gem.c | 538 +- + drivers/gpu/drm/i915/i915_gem.h | 12 +- + drivers/gpu/drm/i915/i915_gem_clflush.c | 2 +- + drivers/gpu/drm/i915/i915_gem_context.c | 368 +- + drivers/gpu/drm/i915/i915_gem_context.h | 4 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 4 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 85 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 192 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 19 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 4 +- + drivers/gpu/drm/i915/i915_gem_object.h | 13 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 139 +- + drivers/gpu/drm/i915/i915_gem_render_state.h | 4 +- + drivers/gpu/drm/i915/i915_gem_request.c | 68 +- + drivers/gpu/drm/i915/i915_gem_request.h | 2 + + drivers/gpu/drm/i915/i915_gem_shrinker.c | 138 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 323 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 19 +- + drivers/gpu/drm/i915/i915_gem_timeline.c | 11 +- + drivers/gpu/drm/i915/i915_gem_timeline.h | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 195 +- + drivers/gpu/drm/i915/i915_irq.c | 14 +- + drivers/gpu/drm/i915/i915_memcpy.c | 7 +- + drivers/gpu/drm/i915/i915_oa_bdw.c | 4 +- + drivers/gpu/drm/i915/i915_oa_bxt.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cflgt2.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cflgt3.c | 109 + + drivers/gpu/drm/i915/i915_oa_cflgt3.h | 34 + + drivers/gpu/drm/i915/i915_oa_chv.c | 4 +- + drivers/gpu/drm/i915/i915_oa_cnl.c | 121 + + drivers/gpu/drm/i915/i915_oa_cnl.h | 34 + + drivers/gpu/drm/i915/i915_oa_glk.c | 4 +- + drivers/gpu/drm/i915/i915_oa_hsw.c | 4 +- + drivers/gpu/drm/i915/i915_oa_kblgt2.c | 4 +- + drivers/gpu/drm/i915/i915_oa_kblgt3.c | 4 +- + drivers/gpu/drm/i915/i915_oa_sklgt2.c | 4 +- + drivers/gpu/drm/i915/i915_oa_sklgt3.c | 4 +- + drivers/gpu/drm/i915/i915_oa_sklgt4.c | 4 +- + drivers/gpu/drm/i915/i915_params.c | 59 +- + drivers/gpu/drm/i915/i915_params.h | 14 +- + drivers/gpu/drm/i915/i915_pci.c | 4 + + drivers/gpu/drm/i915/i915_perf.c | 153 +- + drivers/gpu/drm/i915/i915_pmu.c | 865 + + drivers/gpu/drm/i915/i915_pmu.h | 111 + + drivers/gpu/drm/i915/i915_reg.h | 93 +- + drivers/gpu/drm/i915/i915_selftest.h | 2 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 3 + + drivers/gpu/drm/i915/i915_sysfs.c | 33 +- + drivers/gpu/drm/i915/i915_trace.h | 40 +- + drivers/gpu/drm/i915/i915_utils.h | 22 +- + drivers/gpu/drm/i915/i915_vma.c | 40 +- + drivers/gpu/drm/i915/i915_vma.h | 35 +- + drivers/gpu/drm/i915/intel_audio.c | 202 +- + drivers/gpu/drm/i915/intel_bios.c | 24 + + drivers/gpu/drm/i915/intel_breadcrumbs.c | 105 +- + drivers/gpu/drm/i915/intel_cdclk.c | 393 +- + drivers/gpu/drm/i915/intel_color.c | 4 +- + drivers/gpu/drm/i915/intel_crt.c | 46 +- + drivers/gpu/drm/i915/intel_csr.c | 13 +- + drivers/gpu/drm/i915/intel_ddi.c | 347 +- + drivers/gpu/drm/i915/intel_device_info.c | 200 +- + drivers/gpu/drm/i915/intel_device_info.h | 183 + + drivers/gpu/drm/i915/intel_display.c | 1001 +- + drivers/gpu/drm/i915/intel_display.h | 321 + + drivers/gpu/drm/i915/intel_dp.c | 594 +- + drivers/gpu/drm/i915/intel_dp_mst.c | 79 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 122 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 107 +- + drivers/gpu/drm/i915/intel_drv.h | 80 +- + drivers/gpu/drm/i915/intel_dsi.c | 47 +- + drivers/gpu/drm/i915/intel_dvo.c | 2 + + drivers/gpu/drm/i915/intel_engine_cs.c | 475 +- + drivers/gpu/drm/i915/intel_fbc.c | 48 +- + drivers/gpu/drm/i915/intel_fbdev.c | 3 +- + drivers/gpu/drm/i915/intel_guc.c | 152 +- + drivers/gpu/drm/i915/intel_guc.h | 21 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 1 + + drivers/gpu/drm/i915/intel_guc_fw.c | 245 +- + drivers/gpu/drm/i915/intel_guc_fw.h | 2 +- + drivers/gpu/drm/i915/intel_guc_fwif.h | 40 + + drivers/gpu/drm/i915/intel_guc_log.c | 29 +- + .../drm/i915/{i915_guc_reg.h => intel_guc_reg.h} | 14 +- + ...915_guc_submission.c => intel_guc_submission.c} | 751 +- + ...915_guc_submission.h => intel_guc_submission.h} | 17 +- + drivers/gpu/drm/i915/intel_gvt.c | 7 +- + drivers/gpu/drm/i915/intel_hangcheck.c | 61 +- + drivers/gpu/drm/i915/intel_hdmi.c | 114 +- + drivers/gpu/drm/i915/intel_huc.c | 83 +- + drivers/gpu/drm/i915/intel_huc.h | 6 +- + drivers/gpu/drm/i915/intel_i2c.c | 61 +- + drivers/gpu/drm/i915/intel_lrc.c | 283 +- + drivers/gpu/drm/i915/intel_lrc.h | 5 - + drivers/gpu/drm/i915/intel_lvds.c | 2 + + drivers/gpu/drm/i915/intel_modes.c | 1 - + drivers/gpu/drm/i915/intel_opregion.c | 6 +- + drivers/gpu/drm/i915/intel_opregion.h | 106 + + drivers/gpu/drm/i915/intel_overlay.c | 4 +- + drivers/gpu/drm/i915/intel_panel.c | 88 +- + drivers/gpu/drm/i915/intel_pipe_crc.c | 6 +- + drivers/gpu/drm/i915/intel_pm.c | 437 +- + drivers/gpu/drm/i915/intel_psr.c | 4 +- + drivers/gpu/drm/i915/intel_ringbuffer.c | 747 +- + drivers/gpu/drm/i915/intel_ringbuffer.h | 263 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 10 +- + drivers/gpu/drm/i915/intel_sdvo.c | 6 +- + drivers/gpu/drm/i915/intel_sprite.c | 13 +- + drivers/gpu/drm/i915/intel_tv.c | 6 +- + drivers/gpu/drm/i915/intel_uc.c | 267 +- + drivers/gpu/drm/i915/intel_uc.h | 23 + + drivers/gpu/drm/i915/intel_uc_fw.c | 6 +- + drivers/gpu/drm/i915/intel_uc_fw.h | 7 +- + drivers/gpu/drm/i915/intel_uncore.c | 172 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 8 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 181 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 16 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 33 +- + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 52 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_request.c | 22 +- + drivers/gpu/drm/i915/selftests/i915_gem_timeline.c | 2 +- + .../gpu/drm/i915/selftests/i915_live_selftests.h | 1 + + drivers/gpu/drm/i915/selftests/i915_random.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_syncmap.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 2 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 353 + + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 331 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 11 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 41 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 14 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 4 +- + drivers/gpu/drm/imx/imx-drm-core.c | 34 +- + drivers/gpu/drm/imx/imx-drm.h | 1 - + drivers/gpu/drm/imx/ipuv3-plane.c | 110 +- + drivers/gpu/drm/mediatek/mtk_drm_plane.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 4 +- + drivers/gpu/drm/meson/meson_drv.c | 9 + + drivers/gpu/drm/meson/meson_dw_hdmi.c | 13 + + drivers/gpu/drm/meson/meson_plane.c | 8 +- + drivers/gpu/drm/meson/meson_registers.h | 4 + + drivers/gpu/drm/mgag200/mgag200_ttm.c | 15 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 38 + + drivers/gpu/drm/msm/adreno/a5xx_power.c | 8 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 140 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 85 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 4 - + drivers/gpu/drm/msm/dsi/pll/dsi_pll_14nm.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.h | 7 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_plane.c | 19 +- + drivers/gpu/drm/msm/msm_drv.c | 18 +- + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/gpu/drm/msm/msm_gem.c | 14 +- + drivers/gpu/drm/msm/msm_gpu.c | 112 +- + drivers/gpu/drm/msm/msm_gpu.h | 14 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 51 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 8 - + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 - + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_vga.c | 3 +- + drivers/gpu/drm/nouveau/nv50_display.c | 28 +- + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 2 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 2 +- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 2 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 2 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 5 +- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 2 +- + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 2 +- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 291 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 2 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 2 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 2 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 13 +- + drivers/gpu/drm/omapdrm/dss/base.c | 15 + + drivers/gpu/drm/omapdrm/dss/core.c | 55 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 27 +- + drivers/gpu/drm/omapdrm/dss/dispc.h | 5 +- + drivers/gpu/drm/omapdrm/dss/dispc_coefs.c | 4 +- + drivers/gpu/drm/omapdrm/dss/display.c | 16 - + drivers/gpu/drm/omapdrm/dss/dpi.c | 8 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 14 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 25 +- + drivers/gpu/drm/omapdrm/dss/dss.h | 38 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 13 +- + drivers/gpu/drm/omapdrm/dss/hdmi4_core.c | 3 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 14 +- + drivers/gpu/drm/omapdrm/dss/hdmi5_core.c | 3 +- + drivers/gpu/drm/omapdrm/dss/hdmi_phy.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_pll.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi_wp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 2 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 12 +- + drivers/gpu/drm/omapdrm/dss/output.c | 2 +- + drivers/gpu/drm/omapdrm/dss/pll.c | 2 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 2 - + drivers/gpu/drm/omapdrm/dss/venc.c | 18 +- + drivers/gpu/drm/omapdrm/dss/video-pll.c | 20 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 10 +- + drivers/gpu/drm/omapdrm/omap_connector.h | 37 + + drivers/gpu/drm/omapdrm/omap_crtc.c | 41 +- + drivers/gpu/drm/omapdrm/omap_crtc.h | 43 + + drivers/gpu/drm/omapdrm/omap_debugfs.c | 4 +- + drivers/gpu/drm/omapdrm/omap_dmm_priv.h | 14 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 25 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.h | 1 - + drivers/gpu/drm/omapdrm/omap_drv.c | 45 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 140 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 4 +- + drivers/gpu/drm/omapdrm/omap_encoder.h | 33 + + drivers/gpu/drm/omapdrm/omap_fb.c | 4 +- + drivers/gpu/drm/omapdrm/omap_fb.h | 46 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 7 +- + drivers/gpu/drm/omapdrm/omap_fbdev.h | 39 + + drivers/gpu/drm/omapdrm/omap_gem.c | 11 +- + drivers/gpu/drm/omapdrm/omap_gem.h | 99 + + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 4 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 4 +- + drivers/gpu/drm/omapdrm/omap_irq.h | 39 + + drivers/gpu/drm/omapdrm/omap_plane.c | 4 +- + drivers/gpu/drm/omapdrm/omap_plane.h | 37 + + drivers/gpu/drm/omapdrm/tcm-sita.c | 4 +- + drivers/gpu/drm/omapdrm/tcm-sita.h | 4 +- + drivers/gpu/drm/omapdrm/tcm.h | 2 - + drivers/gpu/drm/panel/Kconfig | 8 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 962 + + drivers/gpu/drm/panel/panel-lvds.c | 30 + + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 62 + + drivers/gpu/drm/pl111/pl111_drm.h | 1 - + drivers/gpu/drm/pl111/pl111_drv.c | 16 +- + drivers/gpu/drm/qxl/qxl_display.c | 63 +- + drivers/gpu/drm/qxl/qxl_drv.h | 2 + + drivers/gpu/drm/qxl/qxl_ioctl.c | 4 +- + drivers/gpu/drm/qxl/qxl_object.c | 6 +- + drivers/gpu/drm/qxl/qxl_release.c | 6 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 21 +- + drivers/gpu/drm/radeon/cik.c | 114 +- + drivers/gpu/drm/radeon/cik_reg.h | 2 - + drivers/gpu/drm/radeon/evergreen.c | 1 + + drivers/gpu/drm/radeon/ni.c | 1 + + drivers/gpu/drm/radeon/radeon.h | 6 - + drivers/gpu/drm/radeon/radeon_connectors.c | 1 - + drivers/gpu/drm/radeon/radeon_device.c | 32 - + drivers/gpu/drm/radeon/radeon_display.c | 9 +- + drivers/gpu/drm/radeon/radeon_dp_mst.c | 3 +- + drivers/gpu/drm/radeon/radeon_fb.c | 22 - + drivers/gpu/drm/radeon/radeon_gem.c | 3 +- + drivers/gpu/drm/radeon/radeon_kms.c | 5 +- + drivers/gpu/drm/radeon/radeon_mn.c | 3 +- + drivers/gpu/drm/radeon/radeon_mode.h | 3 - + drivers/gpu/drm/radeon/radeon_object.c | 14 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 46 +- + drivers/gpu/drm/radeon/radeon_vm.c | 3 +- + drivers/gpu/drm/radeon/si_dpm.c | 5 + + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 38 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 62 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 4 - + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 75 +- + drivers/gpu/drm/rcar-du/rcar_du_plane.h | 4 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 64 +- + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 28 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 4 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 9 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 30 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.h | 6 + + drivers/gpu/drm/scheduler/Makefile | 26 + + .../gpu/drm/{amd => }/scheduler/gpu_scheduler.c | 396 +- + drivers/gpu/drm/{amd => }/scheduler/sched_fence.c | 122 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 5 + + drivers/gpu/drm/sti/Kconfig | 1 + + drivers/gpu/drm/sti/sti_awg_utils.c | 2 +- + drivers/gpu/drm/sti/sti_awg_utils.h | 2 +- + drivers/gpu/drm/sti/sti_compositor.c | 2 +- + drivers/gpu/drm/sti/sti_compositor.h | 2 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_crtc.h | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.h | 2 +- + drivers/gpu/drm/sti/sti_drv.c | 29 +- + drivers/gpu/drm/sti/sti_drv.h | 3 +- + drivers/gpu/drm/sti/sti_dvo.c | 2 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_gdp.h | 2 +- + drivers/gpu/drm/sti/sti_hda.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi.c | 12 +- + drivers/gpu/drm/sti/sti_hdmi.h | 2 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.c | 2 +- + drivers/gpu/drm/sti/sti_hdmi_tx3g4c28phy.h | 2 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/drm/sti/sti_hqvdp_lut.h | 2 +- + drivers/gpu/drm/sti/sti_mixer.c | 2 +- + drivers/gpu/drm/sti/sti_mixer.h | 2 +- + drivers/gpu/drm/sti/sti_plane.c | 2 +- + drivers/gpu/drm/sti/sti_plane.h | 2 +- + drivers/gpu/drm/sti/sti_tvout.c | 2 +- + drivers/gpu/drm/sti/sti_vid.c | 2 +- + drivers/gpu/drm/sti/sti_vid.h | 2 +- + drivers/gpu/drm/sti/sti_vtg.c | 40 +- + drivers/gpu/drm/sti/sti_vtg.h | 2 +- + drivers/gpu/drm/stm/drv.c | 41 +- + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 14 +- + drivers/gpu/drm/stm/ltdc.c | 75 +- + drivers/gpu/drm/stm/ltdc.h | 4 +- + drivers/gpu/drm/sun4i/Makefile | 5 +- + drivers/gpu/drm/sun4i/sun4i_dotclock.c | 10 +- + drivers/gpu/drm/sun4i/sun4i_drv.c | 23 +- + drivers/gpu/drm/sun4i/sun4i_drv.h | 2 - + drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 18 +- + drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 2 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 177 + + drivers/gpu/drm/sun4i/sun4i_lvds.h | 12 + + drivers/gpu/drm/sun4i/sun4i_tcon.c | 248 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 33 + + drivers/gpu/drm/sun4i/sun8i_csc.c | 93 + + drivers/gpu/drm/sun4i/sun8i_csc.h | 36 + + drivers/gpu/drm/sun4i/sun8i_layer.c | 134 - + drivers/gpu/drm/sun4i/sun8i_layer.h | 36 - + drivers/gpu/drm/sun4i/sun8i_mixer.c | 517 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 126 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 349 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 63 + + drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 172 + + drivers/gpu/drm/sun4i/sun8i_ui_scaler.h | 49 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 390 + + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 51 + + drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 971 + + drivers/gpu/drm/sun4i/sun8i_vi_scaler.h | 58 + + drivers/gpu/drm/tegra/Makefile | 2 + + drivers/gpu/drm/tegra/dc.c | 1930 +- + drivers/gpu/drm/tegra/dc.h | 289 +- + drivers/gpu/drm/tegra/dpaux.c | 120 +- + drivers/gpu/drm/tegra/drm.c | 177 +- + drivers/gpu/drm/tegra/drm.h | 30 +- + drivers/gpu/drm/tegra/dsi.c | 228 +- + drivers/gpu/drm/tegra/fb.c | 50 +- + drivers/gpu/drm/tegra/gem.c | 15 +- + drivers/gpu/drm/tegra/hdmi.c | 504 +- + drivers/gpu/drm/tegra/hub.c | 806 + + drivers/gpu/drm/tegra/hub.h | 81 + + drivers/gpu/drm/tegra/output.c | 25 +- + drivers/gpu/drm/tegra/plane.c | 383 + + drivers/gpu/drm/tegra/plane.h | 70 + + drivers/gpu/drm/tegra/sor.c | 1117 +- + drivers/gpu/drm/tegra/sor.h | 16 + + drivers/gpu/drm/tegra/vic.c | 20 +- + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 51 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 28 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.h | 2 - + drivers/gpu/drm/tilcdc/tilcdc_regs.h | 2 +- + drivers/gpu/drm/tinydrm/Kconfig | 20 + + drivers/gpu/drm/tinydrm/Makefile | 2 + + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 104 +- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 4 +- + drivers/gpu/drm/tinydrm/ili9225.c | 469 + + drivers/gpu/drm/tinydrm/mi0283qt.c | 10 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 32 +- + drivers/gpu/drm/tinydrm/st7586.c | 3 +- + drivers/gpu/drm/tinydrm/st7735r.c | 215 + + drivers/gpu/drm/ttm/ttm_agp_backend.c | 4 +- + drivers/gpu/drm/ttm/ttm_bo.c | 341 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 23 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 29 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 8 +- + drivers/gpu/drm/ttm/ttm_memory.c | 37 +- + drivers/gpu/drm/ttm/ttm_object.c | 13 +- + drivers/gpu/drm/ttm/ttm_page_alloc.c | 36 +- + drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 99 +- + drivers/gpu/drm/ttm/ttm_tt.c | 5 +- + drivers/gpu/drm/tve200/tve200_drm.h | 1 - + drivers/gpu/drm/tve200/tve200_drv.c | 16 +- + drivers/gpu/drm/vc4/vc4_drv.c | 13 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 16 +- + drivers/gpu/drm/vc4/vc4_kms.c | 18 +- + drivers/gpu/drm/vc4/vc4_plane.c | 38 +- + drivers/gpu/drm/via/via_drv.h | 4 +- + drivers/gpu/drm/via/via_irq.c | 27 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 12 + + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 13 +- + drivers/gpu/drm/virtio/virtgpu_kms.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_buffer.c | 17 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_dmabuf.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 40 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 13 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 12 +- + drivers/gpu/drm/zte/zx_drm_drv.c | 48 +- + drivers/gpu/drm/zte/zx_hdmi.c | 1 + + drivers/gpu/drm/zte/zx_plane.c | 15 +- + drivers/gpu/host1x/bus.c | 11 +- + drivers/gpu/host1x/dev.c | 36 +- + drivers/gpu/host1x/dev.h | 1 + + drivers/gpu/ipu-v3/Kconfig | 4 +- + drivers/gpu/ipu-v3/ipu-cpmem.c | 1 + + drivers/gpu/ipu-v3/ipu-ic.c | 1 + + drivers/gpu/ipu-v3/ipu-pre.c | 29 +- + drivers/gpu/ipu-v3/ipu-prg.c | 84 +- + drivers/gpu/ipu-v3/ipu-prv.h | 4 +- + drivers/i2c/algos/i2c-algo-bit.c | 5 + + drivers/i2c/busses/Kconfig | 8 + + drivers/i2c/busses/i2c-acorn.c | 8 +- + drivers/i2c/busses/i2c-davinci.c | 37 +- + drivers/i2c/busses/i2c-designware-common.c | 20 +- + drivers/i2c/busses/i2c-designware-core.h | 2 + + drivers/i2c/busses/i2c-designware-master.c | 57 + + drivers/i2c/busses/i2c-designware-platdrv.c | 29 +- + drivers/i2c/busses/i2c-designware-slave.c | 64 - + drivers/i2c/busses/i2c-exynos5.c | 2 +- + drivers/i2c/busses/i2c-gpio.c | 122 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 68 +- + drivers/i2c/busses/i2c-imx.c | 20 +- + drivers/i2c/busses/i2c-ismt.c | 42 +- + drivers/i2c/busses/i2c-meson.c | 34 +- + drivers/i2c/busses/i2c-mpc.c | 57 +- + drivers/i2c/busses/i2c-mt65xx.c | 40 +- + drivers/i2c/busses/i2c-mv64xxx.c | 20 +- + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-pxa-pci.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 62 +- + drivers/i2c/busses/i2c-rk3x.c | 17 +- + drivers/i2c/busses/i2c-sh_mobile.c | 191 +- + drivers/i2c/i2c-core-base.c | 212 +- + drivers/i2c/i2c-core-smbus.c | 45 +- + drivers/i2c/i2c-dev.c | 2 + + drivers/i2c/muxes/Kconfig | 6 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 38 +- + drivers/i2c/muxes/i2c-mux-reg.c | 3 + + drivers/iommu/tegra-smmu.c | 124 +- + drivers/irqchip/irq-stm32-exti.c | 3 +- + drivers/macintosh/adb.c | 24 +- + drivers/macintosh/adbhid.c | 55 +- + drivers/macintosh/ams/ams-input.c | 4 +- + drivers/macintosh/therm_adt746x.c | 4 +- + drivers/macintosh/via-pmu-backlight.c | 2 +- + drivers/macintosh/windfarm_pm112.c | 8 +- + drivers/macintosh/windfarm_pm121.c | 5 +- + drivers/macintosh/windfarm_pm72.c | 2 +- + drivers/macintosh/windfarm_pm81.c | 5 +- + drivers/macintosh/windfarm_pm91.c | 5 +- + drivers/macintosh/windfarm_rm31.c | 2 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 35 +- + drivers/mailbox/ti-msgmgr.c | 14 +- + drivers/md/dm-rq.c | 5 +- + drivers/media/platform/vsp1/vsp1_drm.c | 37 +- + drivers/memory/Kconfig | 10 + + drivers/memory/Makefile | 8 + + drivers/memory/Makefile.asm-offsets | 5 + + drivers/memory/emif-asm-offsets.c | 92 + + drivers/memory/emif.h | 17 + + drivers/memory/tegra/Makefile | 1 + + drivers/memory/tegra/tegra114.c | 15 + + drivers/memory/tegra/tegra124.c | 17 + + drivers/memory/tegra/tegra186.c | 600 + + drivers/memory/tegra/tegra210.c | 15 + + drivers/memory/tegra/tegra30.c | 15 + + drivers/memory/ti-emif-pm.c | 324 + + drivers/memory/ti-emif-sram-pm.S | 334 + + drivers/misc/Kconfig | 1 + + drivers/misc/Makefile | 3 +- + drivers/misc/cxl/context.c | 2 + + drivers/misc/cxl/cxl.h | 3 + + drivers/misc/cxl/cxllib.c | 3 +- + drivers/misc/cxl/file.c | 15 +- + drivers/misc/cxl/native.c | 13 +- + drivers/misc/cxl/pci.c | 2 - + drivers/misc/eeprom/Kconfig | 1 + + drivers/misc/eeprom/at24.c | 731 +- + drivers/misc/lkdtm.h | 4 +- + drivers/misc/lkdtm_core.c | 4 +- + drivers/misc/lkdtm_usercopy.c | 101 +- + drivers/misc/ocxl/Kconfig | 31 + + drivers/misc/ocxl/Makefile | 11 + + drivers/misc/ocxl/afu_irq.c | 202 + + drivers/misc/ocxl/config.c | 723 + + drivers/misc/ocxl/context.c | 279 + + drivers/misc/ocxl/file.c | 432 + + drivers/misc/ocxl/link.c | 647 + + drivers/misc/ocxl/main.c | 33 + + drivers/misc/ocxl/ocxl_internal.h | 131 + + drivers/misc/ocxl/pasid.c | 107 + + drivers/misc/ocxl/pci.c | 585 + + drivers/misc/ocxl/sysfs.c | 142 + + drivers/misc/ocxl/trace.c | 6 + + drivers/misc/ocxl/trace.h | 182 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 18 + + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 3 +- + drivers/net/ethernet/ibm/ibmvnic.c | 6 +- + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 12 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 6 +- + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 3 +- + drivers/net/ethernet/rocker/rocker_main.c | 18 +- + drivers/net/usb/lan78xx.c | 2 +- + drivers/net/usb/r8152.c | 13 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 6 +- + drivers/ntb/hw/amd/ntb_hw_amd.c | 4 + + drivers/ntb/hw/idt/ntb_hw_idt.c | 37 +- + drivers/ntb/hw/intel/ntb_hw_intel.c | 313 +- + drivers/ntb/hw/intel/ntb_hw_intel.h | 58 - + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 603 +- + drivers/ntb/ntb.c | 4 +- + drivers/ntb/ntb_transport.c | 3 + + drivers/ntb/test/ntb_perf.c | 1824 +- + drivers/ntb/test/ntb_pingpong.c | 450 +- + drivers/ntb/test/ntb_tool.c | 1827 +- + drivers/nvme/host/fc.c | 12 +- + drivers/of/platform.c | 6 + + drivers/pci/hotplug/rpadlpar_core.c | 13 +- + drivers/pci/hotplug/rpadlpar_sysfs.c | 3 +- + drivers/pci/hotplug/rpaphp.h | 8 +- + drivers/pci/hotplug/rpaphp_core.c | 107 +- + drivers/pci/iov.c | 11 + + drivers/pci/pcie/aer/aerdrv_core.c | 3 + + drivers/pcmcia/at91_cf.c | 4 +- + drivers/pinctrl/Kconfig | 15 + + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/core.c | 24 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 81 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 13 +- + drivers/pinctrl/freescale/pinctrl-imx25.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx35.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx50.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx51.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx53.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx6dl.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx6q.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx6sl.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx6sx.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx6ul.c | 52 +- + drivers/pinctrl/freescale/pinctrl-imx7d.c | 10 +- + drivers/pinctrl/freescale/pinctrl-imx7ulp.c | 7 +- + drivers/pinctrl/freescale/pinctrl-vf610.c | 5 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 6 + + drivers/pinctrl/intel/pinctrl-cannonlake.c | 65 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 59 +- + drivers/pinctrl/intel/pinctrl-intel.c | 179 +- + drivers/pinctrl/intel/pinctrl-intel.h | 3 + + drivers/pinctrl/intel/pinctrl-merrifield.c | 7 + + drivers/pinctrl/mediatek/Kconfig | 15 +- + drivers/pinctrl/mediatek/Makefile | 3 +- + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 1597 + + drivers/pinctrl/meson/Kconfig | 9 + + drivers/pinctrl/meson/Makefile | 2 + + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 118 + + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 62 + + drivers/pinctrl/meson/pinctrl-meson-axg.c | 975 + + drivers/pinctrl/meson/pinctrl-meson.h | 1 + + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 4 +- + drivers/pinctrl/mvebu/pinctrl-mvebu.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 10 +- + drivers/pinctrl/pinctrl-adi2.c | 13 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 4 +- + drivers/pinctrl/pinctrl-at91.c | 4 +- + drivers/pinctrl/pinctrl-axp209.c | 4 +- + drivers/pinctrl/pinctrl-gemini.c | 84 +- + drivers/pinctrl/pinctrl-ingenic.c | 4 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 54 +- + drivers/pinctrl/pinctrl-ocelot.c | 511 + + drivers/pinctrl/pinctrl-palmas.c | 4 +- + drivers/pinctrl/pinctrl-rockchip.c | 31 +- + drivers/pinctrl/pinctrl-single.c | 10 +- + drivers/pinctrl/pinctrl-sx150x.c | 40 +- + drivers/pinctrl/pinctrl-tz1090-pdc.c | 9 +- + drivers/pinctrl/pinctrl-tz1090.c | 9 +- + drivers/pinctrl/pinctrl-utils.c | 4 +- + drivers/pinctrl/pinctrl-xway.c | 10 +- + drivers/pinctrl/pinmux.c | 4 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 4 + + drivers/pinctrl/qcom/Kconfig | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-msm.c | 5 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 1590 + + drivers/pinctrl/samsung/Kconfig | 1 + + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 33 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 33 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 33 +- + drivers/pinctrl/samsung/pinctrl-exynos.h | 6 +- + drivers/pinctrl/samsung/pinctrl-exynos5440.c | 21 +- + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 23 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 27 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 37 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 6 +- + drivers/pinctrl/sh-pfc/Kconfig | 5 + + drivers/pinctrl/sh-pfc/Makefile | 1 + + drivers/pinctrl/sh-pfc/core.c | 6 + + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 62 +- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 473 + + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 2 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 193 +- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 66 +- + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 2329 ++ + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 88 + + drivers/pinctrl/sh-pfc/sh_pfc.h | 17 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 8 +- + drivers/pinctrl/spear/pinctrl-spear.c | 4 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 2 +- + drivers/pinctrl/stm32/Kconfig | 12 + + drivers/pinctrl/stm32/Makefile | 2 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32.h | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32f429.c | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32f469.c | 6 +- + drivers/pinctrl/stm32/pinctrl-stm32f746.c | 3 +- + drivers/pinctrl/stm32/pinctrl-stm32f769.c | 1827 ++ + drivers/pinctrl/stm32/pinctrl-stm32h743.c | 6 +- + drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 2188 ++ + drivers/pinctrl/sunxi/pinctrl-sun4i-a10.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 9 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 176 +- + drivers/pinctrl/vt8500/pinctrl-vt8500.c | 4 +- + drivers/pinctrl/vt8500/pinctrl-wm8505.c | 4 +- + drivers/pinctrl/vt8500/pinctrl-wm8650.c | 4 +- + drivers/pinctrl/vt8500/pinctrl-wm8750.c | 4 +- + drivers/pinctrl/vt8500/pinctrl-wm8850.c | 4 +- + drivers/ps3/ps3av.c | 11 +- + drivers/reset/core.c | 9 +- + drivers/reset/reset-meson.c | 2 + + drivers/rtc/Kconfig | 27 +- + drivers/rtc/Makefile | 3 +- + drivers/rtc/rtc-ac100.c | 25 +- + drivers/rtc/rtc-at32ap700x.c | 287 - + drivers/rtc/rtc-brcmstb-waketimer.c | 15 +- + drivers/rtc/rtc-cros-ec.c | 413 + + drivers/rtc/rtc-mxc_v2.c | 419 + + drivers/rtc/rtc-omap.c | 5 +- + drivers/rtc/rtc-opal.c | 12 +- + drivers/rtc/rtc-r7301.c | 4 +- + drivers/rtc/rtc-r9701.c | 6 - + drivers/rtc/rtc-stm32.c | 4 +- + drivers/rtc/rtc-sun6i.c | 4 +- + drivers/scsi/scsi_debugfs.c | 40 +- + drivers/scsi/scsi_lib.c | 15 +- + drivers/scsi/sd.c | 41 +- + drivers/scsi/sd.h | 11 - + drivers/scsi/sd_zbc.c | 235 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 2 + + drivers/soc/actions/owl-sps.c | 42 + + drivers/soc/bcm/brcmstb/biuctrl.c | 192 +- + drivers/soc/bcm/brcmstb/common.c | 43 +- + drivers/soc/fsl/guts.c | 8 + + drivers/soc/gemini/Makefile | 2 + + drivers/soc/gemini/soc-gemini.c | 71 + + drivers/soc/imx/gpc.c | 16 +- + drivers/soc/mediatek/mtk-infracfg.c | 26 +- + drivers/soc/mediatek/mtk-scpsys.c | 140 +- + drivers/soc/qcom/Kconfig | 10 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/qmi_encdec.c | 816 + + drivers/soc/qcom/qmi_interface.c | 848 + + drivers/soc/qcom/rmtfs_mem.c | 4 + + drivers/soc/qcom/smp2p.c | 55 +- + drivers/soc/qcom/smsm.c | 6 +- + drivers/soc/renesas/rcar-sysc.c | 2 +- + drivers/soc/renesas/renesas-soc.c | 3 + + drivers/soc/samsung/Kconfig | 1 + + drivers/soc/samsung/Makefile | 1 + + drivers/soc/samsung/exynos-pmu.c | 16 +- + drivers/soc/samsung/exynos-pmu.h | 5 +- + drivers/soc/samsung/exynos3250-pmu.c | 16 +- + drivers/soc/samsung/exynos4-pmu.c | 16 +- + drivers/soc/samsung/exynos5250-pmu.c | 16 +- + drivers/soc/samsung/exynos5420-pmu.c | 16 +- + drivers/soc/samsung/pm_domains.c | 24 +- + drivers/soc/tegra/Kconfig | 5 +- + drivers/soc/tegra/Makefile | 1 - + drivers/soc/tegra/fuse/fuse-tegra.c | 4 + + drivers/soc/tegra/fuse/fuse-tegra20.c | 13 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 24 +- + drivers/soc/tegra/fuse/fuse.h | 4 + + drivers/soc/tegra/fuse/tegra-apbmisc.c | 11 +- + drivers/soc/tegra/pmc-tegra186.c | 169 - + drivers/soc/tegra/pmc.c | 304 +- + drivers/soc/ti/knav_qmss_queue.c | 4 +- + drivers/soc/xilinx/Kconfig | 20 + + drivers/soc/xilinx/Makefile | 2 + + drivers/soc/xilinx/xlnx_vcu.c | 630 + + drivers/staging/vboxvideo/vbox_ttm.c | 23 +- + drivers/tee/optee/Makefile | 1 + + drivers/tee/optee/call.c | 220 +- + drivers/tee/optee/core.c | 163 +- + drivers/tee/optee/optee_msg.h | 38 +- + drivers/tee/optee/optee_private.h | 72 +- + drivers/tee/optee/optee_smc.h | 7 + + drivers/tee/optee/rpc.c | 81 +- + drivers/tee/optee/shm_pool.c | 75 + + drivers/tee/optee/shm_pool.h | 23 + + drivers/tee/optee/supp.c | 375 +- + drivers/tee/tee_core.c | 113 +- + drivers/tee/tee_private.h | 60 +- + drivers/tee/tee_shm.c | 230 +- + drivers/tee/tee_shm_pool.c | 165 +- + drivers/vfio/mdev/vfio_mdev.c | 6 +- + drivers/vfio/pci/vfio_pci.c | 75 +- + drivers/vfio/vfio.c | 52 +- + drivers/video/fbdev/Kconfig | 1 + + drivers/video/fbdev/core/Makefile | 3 - + drivers/video/fbdev/core/fbcon.c | 22 +- + drivers/video/fbdev/core/fbcon.h | 6 - + drivers/video/fbdev/core/fbsysfs.c | 1 + + drivers/video/fbdev/efifb.c | 21 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 12 +- + drivers/video/hdmi.c | 51 +- + fs/befs/linuxvfs.c | 14 +- + fs/cifs/cifsfs.c | 10 +- + fs/crypto/crypto.c | 1 + + fs/crypto/fname.c | 140 +- + fs/crypto/fscrypt_private.h | 31 + + fs/crypto/hooks.c | 158 + + fs/crypto/keyinfo.c | 17 +- + fs/dax.c | 9 +- + fs/dcache.c | 9 +- + fs/exofs/super.c | 7 +- + fs/ext2/file.c | 2 +- + fs/ext2/super.c | 12 +- + fs/ext4/acl.h | 2 +- + fs/ext4/balloc.c | 4 +- + fs/ext4/block_validity.c | 6 +- + fs/ext4/ext4.h | 22 +- + fs/ext4/ext4_extents.h | 14 +- + fs/ext4/ext4_jbd2.h | 5 +- + fs/ext4/extents.c | 14 +- + fs/ext4/extents_status.h | 2 +- + fs/ext4/file.c | 10 +- + fs/ext4/fsmap.c | 15 +- + fs/ext4/fsmap.h | 15 +- + fs/ext4/hash.c | 6 +- + fs/ext4/ialloc.c | 4 +- + fs/ext4/inline.c | 10 +- + fs/ext4/inode.c | 16 +- + fs/ext4/mballoc.c | 28 +- + fs/ext4/mballoc.h | 2 +- + fs/ext4/migrate.c | 9 +- + fs/ext4/move_extent.c | 10 +- + fs/ext4/namei.c | 64 +- + fs/ext4/resize.c | 2 +- + fs/ext4/super.c | 25 +- + fs/ext4/symlink.c | 43 +- + fs/ext4/sysfs.c | 65 +- + fs/ext4/truncate.h | 2 +- + fs/ext4/xattr.h | 2 +- + fs/f2fs/inode.c | 2 +- + fs/f2fs/namei.c | 132 +- + fs/fhandle.c | 3 +- + fs/freevxfs/vxfs_super.c | 8 +- + fs/gfs2/Kconfig | 3 +- + fs/gfs2/glock.c | 65 +- + fs/jbd2/checkpoint.c | 5 +- + fs/jbd2/commit.c | 5 +- + fs/jbd2/journal.c | 5 +- + fs/jbd2/recovery.c | 5 +- + fs/jbd2/revoke.c | 5 +- + fs/jbd2/transaction.c | 10 +- + fs/jfs/super.c | 8 +- + fs/mbcache.c | 8 +- + fs/orangefs/super.c | 15 +- + fs/pstore/platform.c | 1 - + fs/sysfs/file.c | 5 +- + fs/ubifs/dir.c | 63 +- + fs/ubifs/file.c | 36 +- + fs/ubifs/super.c | 4 +- + fs/ufs/super.c | 13 +- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/clkdev.h | 30 - + include/asm-generic/sections.h | 8 +- + include/drm/drmP.h | 197 +- + include/drm/drm_atomic.h | 32 + + include/drm/drm_atomic_helper.h | 7 + + include/drm/drm_connector.h | 54 +- + include/drm/drm_device.h | 9 + + include/drm/drm_dp_helper.h | 1 + + include/drm/drm_drv.h | 22 +- + include/drm/drm_edid.h | 2 +- + include/drm/drm_encoder.h | 6 +- + include/drm/drm_fb_cma_helper.h | 13 +- + include/drm/drm_fb_helper.h | 57 + + include/drm/drm_framebuffer.h | 8 +- + include/drm/drm_gem_cma_helper.h | 16 +- + include/drm/drm_mm.h | 2 +- + include/drm/drm_mode_config.h | 27 +- + include/drm/drm_modeset_helper.h | 3 + + include/drm/drm_modeset_helper_vtables.h | 3 - + include/drm/drm_plane.h | 14 +- + include/drm/drm_plane_helper.h | 5 - + include/drm/drm_print.h | 219 + + include/drm/drm_syncobj.h | 36 +- + include/drm/drm_utils.h | 15 + + include/drm/drm_vma_manager.h | 2 +- + include/drm/gpu_scheduler.h | 173 + + .../drm/gpu_scheduler_trace.h | 21 +- + include/drm/i915_drm.h | 3 + + include/drm/i915_pciids.h | 32 +- + include/drm/intel-gtt.h | 3 +- + include/drm/spsc_queue.h | 122 + + include/drm/tinydrm/mipi-dbi.h | 4 +- + include/drm/tinydrm/tinydrm.h | 8 +- + include/drm/ttm/ttm_bo_api.h | 169 +- + include/drm/ttm/ttm_bo_driver.h | 157 +- + include/drm/ttm/ttm_memory.h | 75 +- + include/drm/ttm/ttm_page_alloc.h | 11 +- + include/dt-bindings/bus/ti-sysc.h | 22 + + include/dt-bindings/clock/am3.h | 108 + + include/dt-bindings/clock/am4.h | 113 + + include/dt-bindings/clock/aspeed-clock.h | 52 + + include/dt-bindings/clock/axg-clkc.h | 71 + + include/dt-bindings/clock/dm814.h | 45 + + include/dt-bindings/clock/dm816.h | 53 + + include/dt-bindings/clock/dra7.h | 172 + + include/dt-bindings/clock/hi3660-clock.h | 7 + + include/dt-bindings/clock/omap5.h | 118 + + include/dt-bindings/clock/qcom,gcc-ipq8074.h | 222 + + include/dt-bindings/clock/sprd,sc9860-clk.h | 404 + + include/dt-bindings/gpio/aspeed-gpio.h | 49 + + include/dt-bindings/gpio/meson-axg-gpio.h | 116 + + include/dt-bindings/memory/tegra186-mc.h | 111 + + include/dt-bindings/pinctrl/am43xx.h | 3 +- + include/dt-bindings/pinctrl/stm32-pinfunc.h | 6 + + include/dt-bindings/power/mt2712-power.h | 26 + + include/dt-bindings/power/owl-s700-powergate.h | 19 + + .../dt-bindings/reset/amlogic,meson-axg-reset.h | 124 + + include/linux/blk_types.h | 18 + + include/linux/buffer_head.h | 5 +- + include/linux/clk-provider.h | 43 +- + include/linux/clk.h | 62 + + include/linux/clkdev.h | 7 +- + include/linux/cpuhotplug.h | 2 + + include/linux/dax.h | 2 +- + include/linux/device.h | 2 +- + include/linux/dma-fence-array.h | 3 + + include/linux/dma-fence.h | 2 +- + include/linux/fb.h | 5 + + include/linux/fdtable.h | 5 +- + include/linux/fscrypt.h | 174 +- + include/linux/fscrypt_notsupp.h | 59 +- + include/linux/fscrypt_supp.h | 68 +- + include/linux/i2c.h | 112 +- + include/linux/init.h | 9 +- + include/linux/jbd2.h | 431 +- + include/linux/kallsyms.h | 72 +- + include/linux/mfd/cros_ec_commands.h | 8 + + include/linux/module.h | 10 + + include/linux/nospec.h | 72 + + include/linux/ntb.h | 51 +- + include/linux/pci.h | 38 + + include/linux/pinctrl/devinfo.h | 2 + + include/linux/pinctrl/pinctrl.h | 1 + + include/linux/platform_data/at24.h | 2 + + include/linux/platform_data/i2c-davinci.h | 5 +- + .../{i2c/pxa-i2c.h => platform_data/i2c-pxa.h} | 11 - + include/linux/platform_data/si5351.h | 2 + + include/linux/platform_data/ti-sysc.h | 86 + + include/linux/qcom_scm.h | 3 + + include/linux/reservation.h | 23 + + include/linux/reset.h | 50 +- + include/linux/rtc.h | 1 - + include/linux/sched/task.h | 14 + + include/linux/skbuff.h | 16 + + include/linux/slab.h | 41 +- + include/linux/slab_def.h | 3 + + include/linux/slub_def.h | 3 + + include/linux/soc/brcmstb/brcmstb.h | 6 - + include/linux/soc/mediatek/infracfg.h | 7 +- + include/linux/soc/qcom/qmi.h | 271 + + include/linux/stddef.h | 10 +- + include/linux/suspend.h | 2 + + include/linux/switchtec.h | 23 +- + include/linux/tee_drv.h | 196 +- + include/linux/ti-emif-sram.h | 69 + + include/linux/uaccess.h | 8 + + include/linux/vfio.h | 3 +- + include/misc/ocxl-config.h | 45 + + include/misc/ocxl.h | 214 + + include/net/sctp/structs.h | 9 +- + include/net/sock.h | 2 + + include/scsi/scsi_cmnd.h | 3 +- + include/soc/tegra/mc.h | 9 + + include/soc/tegra/pmc.h | 12 + + include/uapi/drm/amdgpu_drm.h | 12 + + include/uapi/drm/drm_fourcc.h | 38 +- + include/uapi/drm/exynos_drm.h | 192 +- + include/uapi/drm/i915_drm.h | 77 + + include/uapi/linux/elf.h | 1 + + include/uapi/linux/i2c.h | 3 + + include/uapi/linux/kfd_ioctl.h | 15 +- + include/uapi/linux/tee.h | 37 + + include/uapi/linux/vfio.h | 72 + + include/uapi/misc/cxl.h | 10 +- + include/uapi/misc/ocxl.h | 49 + + include/video/imx-ipu-v3.h | 2 +- + kernel/fork.c | 31 +- + kernel/irq/autoprobe.c | 2 +- + kernel/irq/chip.c | 6 +- + kernel/irq/debug.h | 14 +- + kernel/irq/internals.h | 2 +- + kernel/kallsyms.c | 46 - + kernel/module.c | 6 + + kernel/power/power.h | 3 - + kernel/printk/printk.c | 215 +- + kernel/sched/autogroup.c | 5 +- + kernel/trace/ftrace.c | 2 - + kernel/trace/trace.c | 14 +- + kernel/trace/trace_events.c | 2 - + kernel/trace/trace_selftest_dynamic.c | 5 +- + kernel/trace/trace_uprobe.c | 2 +- + lib/smp_processor_id.c | 3 +- + lib/vsprintf.c | 87 +- + mm/memcontrol.c | 14 + + mm/slab.c | 36 +- + mm/slab.h | 8 +- + mm/slab_common.c | 62 +- + mm/slub.c | 49 +- + mm/usercopy.c | 133 +- + net/bridge/br_fdb.c | 2 +- + net/caif/caif_socket.c | 2 + + net/core/rtnetlink.c | 3 - + net/core/skbuff.c | 63 +- + net/core/sock.c | 9 +- + net/core/sock_reuseport.c | 35 +- + net/ipv4/igmp.c | 4 + + net/ipv4/inet_connection_sock.c | 1 - + net/ipv4/inet_hashtables.c | 6 +- + net/ipv4/ip_sockglue.c | 14 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 16 +- + net/ipv4/netfilter/nf_conntrack_l3proto_ipv4.c | 6 +- + net/ipv4/raw.c | 2 + + net/ipv4/tcp_bbr.c | 6 +- + net/ipv6/ipv6_sockglue.c | 17 +- + net/ipv6/netfilter/nf_conntrack_l3proto_ipv6.c | 18 +- + net/ipv6/raw.c | 2 + + net/netfilter/ipset/ip_set_hash_ipportnet.c | 26 +- + net/netfilter/ipset/ip_set_hash_net.c | 9 +- + net/netfilter/ipset/ip_set_hash_netiface.c | 9 +- + net/netfilter/ipset/ip_set_hash_netnet.c | 28 +- + net/netfilter/ipset/ip_set_hash_netport.c | 19 +- + net/netfilter/ipset/ip_set_hash_netportnet.c | 35 +- + net/netfilter/x_tables.c | 9 +- + net/netfilter/xt_IDLETIMER.c | 1 + + net/netfilter/xt_LED.c | 1 + + net/netfilter/xt_limit.c | 3 +- + net/netfilter/xt_nfacct.c | 1 + + net/netfilter/xt_statistic.c | 1 + + net/openvswitch/conntrack.c | 34 + + net/sched/cls_u32.c | 12 +- + net/sched/sch_tbf.c | 10 - + net/sctp/socket.c | 10 +- + net/wireless/nl80211.c | 9 +- + scripts/checkpatch.pl | 11 +- + security/Kconfig | 14 + + security/integrity/iint.c | 1 + + tools/objtool/check.c | 90 +- + tools/objtool/orc_gen.c | 5 + + tools/testing/selftests/Makefile | 9 +- + .../ftrace/test.d/kprobe/multiple_kprobes.tc | 21 +- + tools/testing/selftests/gen_kselftest_tar.sh | 4 +- + tools/testing/selftests/kselftest.h | 2 +- + tools/testing/selftests/kselftest_install.sh | 4 +- + tools/testing/selftests/lib.mk | 2 +- + tools/testing/selftests/media_tests/Makefile | 7 +- + .../selftests/media_tests/media_device_open.c | 3 +- + .../selftests/media_tests/media_device_test.c | 3 +- + .../selftests/media_tests/video_device_test.c | 3 +- + tools/testing/selftests/nsfs/pidns.c | 2 +- + tools/testing/selftests/ntb/ntb_test.sh | 307 +- + tools/testing/selftests/powerpc/alignment/Makefile | 3 +- + .../powerpc/alignment/alignment_handler.c | 491 + + .../selftests/powerpc/benchmarks/mmap_bench.c | 53 +- + tools/testing/selftests/powerpc/mm/.gitignore | 3 +- + tools/testing/selftests/powerpc/mm/Makefile | 2 +- + tools/testing/selftests/powerpc/mm/segv_errors.c | 78 + + .../selftests/powerpc/ptrace/ptrace-tm-spd-vsx.c | 4 +- + .../selftests/powerpc/ptrace/ptrace-tm-spr.c | 3 +- + .../selftests/powerpc/ptrace/ptrace-tm-vsx.c | 2 +- + tools/testing/selftests/powerpc/tm/.gitignore | 1 + + tools/testing/selftests/powerpc/tm/Makefile | 3 +- + tools/testing/selftests/powerpc/tm/tm-trap.c | 329 + + .../testing/selftests/powerpc/tm/tm-unavailable.c | 43 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 4 +- + tools/testing/selftests/vm/.gitignore | 1 + + tools/testing/selftests/vm/compaction_test.c | 2 + + tools/testing/selftests/x86/Makefile | 12 + + virt/kvm/kvm_main.c | 8 +- + 2973 files changed, 138413 insertions(+), 124991 deletions(-) + create mode 100644 Documentation/ABI/testing/rtc-cdev + create mode 100644 Documentation/ABI/testing/sysfs-class-ocxl + create mode 100644 Documentation/ABI/testing/sysfs-class-rtc + create mode 100644 Documentation/accelerators/ocxl.rst + create mode 100644 Documentation/devicetree/bindings/clock/qcom,a53pll.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt + create mode 100644 Documentation/devicetree/bindings/clock/sprd.txt + create mode 100644 Documentation/devicetree/bindings/display/ilitek,ili9225.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9322.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/mitsubishi,aa070mc01.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/tianma,tm070rvhg71.txt + rename Documentation/devicetree/bindings/display/panel/{toppoly,td028ttec1.txt => tpo,td028ttec1.txt} (84%) + create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7735r.txt + create mode 100644 Documentation/devicetree/bindings/eeprom/at24.txt + delete mode 100644 Documentation/devicetree/bindings/eeprom/eeprom.txt + create mode 100644 Documentation/devicetree/bindings/mfd/atmel-tcb.txt + create mode 100644 Documentation/devicetree/bindings/misc/nvidia,tegra186-misc.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/mscc,ocelot-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt7622.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8998-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-mxc_v2.txt + create mode 100644 Documentation/devicetree/bindings/soc/xilinx/xlnx,vcu.txt + create mode 100644 Documentation/i2c/DMA-considerations + create mode 100644 Documentation/i2c/gpio-fault-injection + create mode 100644 Documentation/speculation.txt + create mode 100644 arch/arm/boot/dts/am572x-idk-common.dtsi + create mode 100644 arch/arm/boot/dts/am574x-idk.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts + create mode 100644 arch/arm/boot/dts/at91-natte.dtsi + create mode 100644 arch/arm/boot/dts/at91-nattis-2-natte-2.dts + create mode 100644 arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts + create mode 100644 arch/arm/boot/dts/gemini-dlink-dns-313.dts + create mode 100644 arch/arm/boot/dts/imx28-ts4600.dts + create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-cubox-i-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6dl-hummingboard2.dts + create mode 100644 arch/arm/boot/dts/imx6dl-ts7970.dts + create mode 100644 arch/arm/boot/dts/imx6q-cubox-i-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-cubox-i-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2-emmc-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2-som-v15.dts + create mode 100644 arch/arm/boot/dts/imx6q-hummingboard2.dts + create mode 100644 arch/arm/boot/dts/imx6q-ts7970.dts + create mode 100644 arch/arm/boot/dts/imx6q-var-dt6customboard.dts + create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard2-emmc.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-hummingboard2.dtsi + rename arch/arm/boot/dts/{imx6qdl-microsom.dtsi => imx6qdl-sr-som-brcm.dtsi} (85%) + create mode 100644 arch/arm/boot/dts/imx6qdl-sr-som-emmc.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-sr-som-ti.dtsi + rename arch/arm/boot/dts/{imx6qdl-microsom-ar8035.dtsi => imx6qdl-sr-som.dtsi} (84%) + create mode 100644 arch/arm/boot/dts/imx6qdl-ts7970.dtsi + create mode 100644 arch/arm/boot/dts/imx6qdl-var-dart.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts + create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-pico-pi.dts + rename arch/arm/boot/dts/{imx7d-pico.dts => imx7d-pico.dtsi} (71%) + create mode 100644 arch/arm/boot/dts/logicpd-som-lv-35xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-35xx-devkit.dts + create mode 100644 arch/arm/boot/dts/logicpd-torpedo-baseboard.dtsi + create mode 100644 arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts + create mode 100644 arch/arm/boot/dts/openbmc-flash-layout.dtsi + create mode 100644 arch/arm/boot/dts/owl-s500-sparky.dts + rename arch/arm/boot/dts/{wd-mbwe.dts => ox810se-wd-mbwe.dts} (100%) + rename arch/arm/boot/dts/{cloudengines-pogoplug-series-3.dts => ox820-cloudengines-pogoplug-series-3.dts} (100%) + create mode 100644 arch/arm/boot/dts/r8a7745-iwg22d-sodimm-dbhd-ca.dts + create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-orangepi-r1.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-libretech-all-h3-cc.dts + create mode 100644 arch/arm/include/asm/hardware/cache-b15-rac.h + create mode 100644 arch/arm/include/asm/ptdump.h + delete mode 100644 arch/arm/lib/memzero.S + create mode 100644 arch/arm/mm/cache-b15-rac.c + create mode 100644 arch/arm/mm/ptdump_debugfs.c + create mode 100644 arch/arm64/boot/dts/actions/s700-cubieboard7.dts + create mode 100644 arch/arm64/boot/dts/actions/s700.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-common.dtsi + delete mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-master.dtsi + delete mode 100644 arch/arm64/boot/dts/marvell/armada-cp110-slave.dtsi + create mode 100644 arch/arm64/boot/dts/marvell/armada-cp110.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts + delete mode 100644 arch/blackfin/include/asm/clkdev.h + create mode 100644 arch/powerpc/include/asm/drmem.h + create mode 100644 arch/powerpc/include/asm/pkeys.h + create mode 100644 arch/powerpc/include/asm/pnv-ocxl.h + create mode 100644 arch/powerpc/kernel/module.lds + create mode 100644 arch/powerpc/mm/drmem.c + create mode 100644 arch/powerpc/mm/pkeys.c + create mode 100644 arch/powerpc/platforms/44x/fsp2.h + create mode 100644 arch/powerpc/platforms/powernv/ocxl.c + delete mode 100644 arch/powerpc/sysdev/axonram.c + create mode 100644 arch/powerpc/sysdev/cpm_gpio.c + create mode 100644 drivers/clk/clk-aspeed.c + create mode 100644 drivers/clk/hisilicon/clk-hi3660-stub.c + create mode 100644 drivers/clk/meson/axg.c + create mode 100644 drivers/clk/meson/axg.h + create mode 100644 drivers/clk/qcom/a53-pll.c + create mode 100644 drivers/clk/qcom/apcs-msm8916.c + create mode 100644 drivers/clk/qcom/clk-regmap-mux-div.c + create mode 100644 drivers/clk/qcom/clk-regmap-mux-div.h + create mode 100644 drivers/clk/qcom/clk-spmi-pmic-div.c + create mode 100644 drivers/clk/sprd/Kconfig + create mode 100644 drivers/clk/sprd/Makefile + create mode 100644 drivers/clk/sprd/common.c + create mode 100644 drivers/clk/sprd/common.h + create mode 100644 drivers/clk/sprd/composite.c + create mode 100644 drivers/clk/sprd/composite.h + create mode 100644 drivers/clk/sprd/div.c + create mode 100644 drivers/clk/sprd/div.h + create mode 100644 drivers/clk/sprd/gate.c + create mode 100644 drivers/clk/sprd/gate.h + create mode 100644 drivers/clk/sprd/mux.c + create mode 100644 drivers/clk/sprd/mux.h + create mode 100644 drivers/clk/sprd/pll.c + create mode 100644 drivers/clk/sprd/pll.h + create mode 100644 drivers/clk/sprd/sc9860-clk.c + delete mode 100644 drivers/clk/ti/clk-3xxx-legacy.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c + rename drivers/gpu/drm/amd/{display/dc/basics/grph_object_id.c => amdgpu/amdgpu_debugfs.h} (50%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h + mode change 100644 => 100755 drivers/gpu/drm/amd/amdgpu/vce_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vega10_reg_init.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_crat.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_debugfs.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_link.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_stream.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h + rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_timing_generator.c => dcn10_optc.c} (72%) + rename drivers/gpu/drm/amd/display/dc/dcn10/{dcn10_timing_generator.h => dcn10_optc.h} (76%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/athub/athub_1_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/DC => dce}/dce_12_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/DC => dce}/dce_12_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/DCN => dcn}/dcn_1_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/GC => gc}/gc_9_0_default.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/GC => gc}/gc_9_0_offset.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/GC => gc}/gc_9_0_sh_mask.h (99%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/GC => gc}/gc_9_1_offset.h (99%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_4_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MMHUB => mmhub}/mmhub_1_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MMHUB => mmhub}/mmhub_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/MMHUB => mmhub}/mmhub_1_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MMHUB => mmhub}/mmhub_9_1_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/MP => mp}/mp_10_0_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_9_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIF => nbif}/nbif_6_1_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIF => nbif}/nbif_6_1_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIO => nbio}/nbio_6_1_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIO => nbio}/nbio_6_1_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/NBIO => nbio}/nbio_6_1_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/NBIO => nbio}/nbio_7_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/OSSSYS => oss}/osssys_4_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/OSSSYS => oss}/osssys_4_0_sh_mask.h (100%) + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/DCN/dcn_1_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/GC/gc_9_1_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/MMHUB/mmhub_9_1_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/SDMA0/sdma0_4_1_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/raven1/VCN/vcn_1_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma0/sdma0_4_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/SDMA0 => sdma0}/sdma0_4_1_offset.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/sdma1/sdma1_4_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SMUIO => smuio}/smuio_9_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/SMUIO => smuio}/smuio_9_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/THM => thm}/thm_10_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/THM => thm}/thm_9_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/THM => thm}/thm_9_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/THM => thm}/thm_9_0_sh_mask.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_6_0_sh_mask.h + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/UVD => uvd}/uvd_7_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/UVD => uvd}/uvd_7_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/VCE => vce}/vce_4_0_default.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/VCE => vce}/vce_4_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{vega10/VCE => vce}/vce_4_0_sh_mask.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_offset.h (100%) + rename drivers/gpu/drm/amd/include/asic_reg/{raven1/VCN => vcn}/vcn_1_0_sh_mask.h (100%) + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/ATHUB/athub_1_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/DC/dce_12_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/HDP/hdp_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/MP/mp_9_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/NBIF/nbif_6_1_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/OSSSYS/osssys_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA0/sdma0_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_offset.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SDMA1/sdma1_4_0_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/SMUIO/smuio_9_0_default.h + delete mode 100644 drivers/gpu/drm/amd/include/asic_reg/vega10/UVD/uvd_7_0_default.h + create mode 100644 drivers/gpu/drm/amd/include/kgd_pp_interface.h + rename drivers/gpu/drm/amd/include/{asic_reg/vega10 => }/soc15ip.h (100%) + rename drivers/gpu/drm/amd/include/{asic_reg/vega10 => }/vega10_enum.h (100%) + delete mode 100644 drivers/gpu/drm/amd/scheduler/gpu_scheduler.h + rename drivers/{video/fbdev/core/fbcon_dmi_quirks.c => gpu/drm/drm_panel_orientation_quirks.c} (50%) + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_ipp.c + delete mode 100644 drivers/gpu/drm/exynos/exynos_drm_ipp.h + rename include/video/exynos5433_decon.h => drivers/gpu/drm/exynos/regs-decon5433.h (98%) + rename include/video/exynos7_decon.h => drivers/gpu/drm/exynos/regs-decon7.h (99%) + create mode 100644 drivers/gpu/drm/i915/gvt/debugfs.c + create mode 100644 drivers/gpu/drm/i915/gvt/dmabuf.c + create mode 100644 drivers/gpu/drm/i915/gvt/dmabuf.h + create mode 100644 drivers/gpu/drm/i915/gvt/fb_decoder.c + create mode 100644 drivers/gpu/drm/i915/gvt/fb_decoder.h + create mode 100644 drivers/gpu/drm/i915/gvt/mmio_context.c + rename drivers/gpu/drm/i915/gvt/{render.h => mmio_context.h} (91%) + delete mode 100644 drivers/gpu/drm/i915/gvt/render.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt3.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cflgt3.h + create mode 100644 drivers/gpu/drm/i915/i915_oa_cnl.c + create mode 100644 drivers/gpu/drm/i915/i915_oa_cnl.h + create mode 100644 drivers/gpu/drm/i915/i915_pmu.c + create mode 100644 drivers/gpu/drm/i915/i915_pmu.h + create mode 100644 drivers/gpu/drm/i915/intel_device_info.h + create mode 100644 drivers/gpu/drm/i915/intel_display.h + rename drivers/gpu/drm/i915/{i915_guc_reg.h => intel_guc_reg.h} (92%) + rename drivers/gpu/drm/i915/{i915_guc_submission.c => intel_guc_submission.c} (63%) + rename drivers/gpu/drm/i915/{i915_guc_submission.h => intel_guc_submission.h} (85%) + create mode 100644 drivers/gpu/drm/i915/intel_opregion.h + create mode 100644 drivers/gpu/drm/i915/selftests/intel_guc.c + create mode 100644 drivers/gpu/drm/omapdrm/omap_connector.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_crtc.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_encoder.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_fb.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_fbdev.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_gem.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_irq.h + create mode 100644 drivers/gpu/drm/omapdrm/omap_plane.h + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9322.c + create mode 100644 drivers/gpu/drm/scheduler/Makefile + rename drivers/gpu/drm/{amd => }/scheduler/gpu_scheduler.c (55%) + rename drivers/gpu/drm/{amd => }/scheduler/sched_fence.c (58%) + create mode 100644 drivers/gpu/drm/sun4i/sun4i_lvds.c + create mode 100644 drivers/gpu/drm/sun4i/sun4i_lvds.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_csc.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_csc.h + delete mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.c + delete mode 100644 drivers/gpu/drm/sun4i/sun8i_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_layer.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_scaler.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_ui_scaler.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_layer.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_layer.h + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_scaler.c + create mode 100644 drivers/gpu/drm/sun4i/sun8i_vi_scaler.h + create mode 100644 drivers/gpu/drm/tegra/hub.c + create mode 100644 drivers/gpu/drm/tegra/hub.h + create mode 100644 drivers/gpu/drm/tegra/plane.c + create mode 100644 drivers/gpu/drm/tegra/plane.h + create mode 100644 drivers/gpu/drm/tinydrm/ili9225.c + create mode 100644 drivers/gpu/drm/tinydrm/st7735r.c + create mode 100644 drivers/memory/Makefile.asm-offsets + create mode 100644 drivers/memory/emif-asm-offsets.c + create mode 100644 drivers/memory/tegra/tegra186.c + create mode 100644 drivers/memory/ti-emif-pm.c + create mode 100644 drivers/memory/ti-emif-sram-pm.S + create mode 100644 drivers/misc/ocxl/Kconfig + create mode 100644 drivers/misc/ocxl/Makefile + create mode 100644 drivers/misc/ocxl/afu_irq.c + create mode 100644 drivers/misc/ocxl/config.c + create mode 100644 drivers/misc/ocxl/context.c + create mode 100644 drivers/misc/ocxl/file.c + create mode 100644 drivers/misc/ocxl/link.c + create mode 100644 drivers/misc/ocxl/main.c + create mode 100644 drivers/misc/ocxl/ocxl_internal.h + create mode 100644 drivers/misc/ocxl/pasid.c + create mode 100644 drivers/misc/ocxl/pci.c + create mode 100644 drivers/misc/ocxl/sysfs.c + create mode 100644 drivers/misc/ocxl/trace.c + create mode 100644 drivers/misc/ocxl/trace.h + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt7622.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h + create mode 100644 drivers/pinctrl/meson/pinctrl-meson-axg.c + create mode 100644 drivers/pinctrl/pinctrl-ocelot.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8998.c + create mode 100644 drivers/pinctrl/sh-pfc/pfc-r8a77970.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32f769.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32mp157.c + delete mode 100644 drivers/rtc/rtc-at32ap700x.c + create mode 100644 drivers/rtc/rtc-cros-ec.c + create mode 100644 drivers/rtc/rtc-mxc_v2.c + create mode 100644 drivers/soc/gemini/Makefile + create mode 100644 drivers/soc/gemini/soc-gemini.c + create mode 100644 drivers/soc/qcom/qmi_encdec.c + create mode 100644 drivers/soc/qcom/qmi_interface.c + delete mode 100644 drivers/soc/tegra/pmc-tegra186.c + create mode 100644 drivers/soc/xilinx/Kconfig + create mode 100644 drivers/soc/xilinx/Makefile + create mode 100644 drivers/soc/xilinx/xlnx_vcu.c + create mode 100644 drivers/tee/optee/shm_pool.c + create mode 100644 drivers/tee/optee/shm_pool.h + delete mode 100644 include/asm-generic/clkdev.h + create mode 100644 include/drm/drm_utils.h + create mode 100644 include/drm/gpu_scheduler.h + rename drivers/gpu/drm/amd/scheduler/gpu_sched_trace.h => include/drm/gpu_scheduler_trace.h (84%) + create mode 100644 include/drm/spsc_queue.h + create mode 100644 include/dt-bindings/bus/ti-sysc.h + create mode 100644 include/dt-bindings/clock/am3.h + create mode 100644 include/dt-bindings/clock/am4.h + create mode 100644 include/dt-bindings/clock/aspeed-clock.h + create mode 100644 include/dt-bindings/clock/axg-clkc.h + create mode 100644 include/dt-bindings/clock/dm814.h + create mode 100644 include/dt-bindings/clock/dm816.h + create mode 100644 include/dt-bindings/clock/dra7.h + create mode 100644 include/dt-bindings/clock/omap5.h + create mode 100644 include/dt-bindings/clock/sprd,sc9860-clk.h + create mode 100644 include/dt-bindings/gpio/aspeed-gpio.h + create mode 100644 include/dt-bindings/gpio/meson-axg-gpio.h + create mode 100644 include/dt-bindings/memory/tegra186-mc.h + create mode 100644 include/dt-bindings/power/mt2712-power.h + create mode 100644 include/dt-bindings/power/owl-s700-powergate.h + create mode 100644 include/dt-bindings/reset/amlogic,meson-axg-reset.h + create mode 100644 include/linux/nospec.h + rename include/linux/{i2c/pxa-i2c.h => platform_data/i2c-pxa.h} (90%) + create mode 100644 include/linux/platform_data/ti-sysc.h + create mode 100644 include/linux/soc/qcom/qmi.h + create mode 100644 include/linux/ti-emif-sram.h + create mode 100644 include/misc/ocxl-config.h + create mode 100644 include/misc/ocxl.h + create mode 100644 include/uapi/misc/ocxl.h + create mode 100644 tools/testing/selftests/powerpc/alignment/alignment_handler.c + create mode 100644 tools/testing/selftests/powerpc/mm/segv_errors.c + create mode 100644 tools/testing/selftests/powerpc/tm/tm-trap.c +Merging fixes/master (820bf5c419e4 Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi) +$ git merge fixes/master +Already up to date. +$ git am -3 ../patches/0001-pinctrl-files-should-directly-include-apis-they-use.patch +Applying: pinctrl: files should directly include apis they use +Merging kbuild-current/fixes (36c1681678b5 genksyms: drop *.hash.c from .gitignore) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (a46f24acf8bc ARC: boot log: Fix trailing semicolon) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/axs101.dts | 2 +- + arch/arc/boot/dts/haps_hs_idu.dts | 2 +- + arch/arc/boot/dts/nsim_700.dts | 2 +- + arch/arc/boot/dts/nsim_hs.dts | 2 +- + arch/arc/boot/dts/nsim_hs_idu.dts | 2 +- + arch/arc/boot/dts/nsimosci.dts | 2 +- + arch/arc/boot/dts/nsimosci_hs.dts | 2 +- + arch/arc/boot/dts/nsimosci_hs_idu.dts | 2 +- + arch/arc/include/asm/entry-arcv2.h | 2 +- + arch/arc/kernel/setup.c | 2 +- + arch/arc/kernel/unwind.c | 2 +- + arch/arc/mm/cache.c | 5 ++++- + 12 files changed, 15 insertions(+), 12 deletions(-) +Merging arm-current/fixes (091f02483df7 ARM: net: bpf: clarify tail_call index) +$ git merge arm-current/fixes +Already up to date. +Merging m68k-current/for-linus (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) +$ git merge m68k-current/for-linus +Already up to date. +Merging metag-fixes/fixes (b884a190afce metag/usercopy: Add missing fixups) +$ git merge metag-fixes/fixes +Already up to date. +Merging powerpc-fixes/fixes (1b689a95ce74 powerpc/pseries: include linux/types.h in asm/hvcall.h) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (aebb48f5e465 sparc64: fix typo in CONFIG_CRYPTO_DES_SPARC64 => CONFIG_CRYPTO_CAMELLIA_SPARC64) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (a6b88814ab54 Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/bpf/bpf_devel_QA.txt | 31 + + drivers/net/netdevsim/bpf.c | 5 +- + include/linux/netdevice.h | 6 + + kernel/bpf/core.c | 32 +- + net/bpf/test_run.c | 4 + + samples/bpf/Makefile | 2 +- + samples/bpf/bpf_load.c | 102 --- + samples/bpf/bpf_load.h | 2 +- + samples/bpf/xdp1_user.c | 4 +- + samples/bpf/xdp_redirect_cpu_user.c | 6 +- + samples/bpf/xdp_redirect_map_user.c | 8 +- + samples/bpf/xdp_redirect_user.c | 8 +- + samples/bpf/xdp_router_ipv4_user.c | 10 +- + samples/bpf/xdp_rxq_info_user.c | 4 +- + samples/bpf/xdp_tx_iptunnel_user.c | 6 +- + tools/include/uapi/linux/if_link.h | 943 ++++++++++++++++++++++++++++ + tools/include/uapi/linux/netlink.h | 251 ++++++++ + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/Makefile | 6 + + tools/lib/bpf/bpf.c | 135 ++++ + tools/lib/bpf/bpf.h | 2 + + tools/lib/bpf/libbpf.c | 4 + + tools/lib/bpf/libbpf.h | 6 + + tools/lib/bpf/nlattr.c | 187 ++++++ + tools/lib/bpf/nlattr.h | 72 +++ + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 4 +- + tools/testing/selftests/bpf/test_verifier.c | 14 + + 28 files changed, 1716 insertions(+), 141 deletions(-) + create mode 100644 tools/include/uapi/linux/if_link.h + create mode 100644 tools/include/uapi/linux/netlink.h + create mode 100644 tools/lib/bpf/nlattr.c + create mode 100644 tools/lib/bpf/nlattr.h +Merging bpf/master (09c0656dfabd Merge branch 'libbpf-xdp-support') +$ git merge bpf/master +Already up to date. +Merging ipsec/master (545d8ae7afff xfrm: fix boolean assignment in xfrm_get_type_offload) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (743ffffefac1 net: pxa168_eth: add netconsole support) +$ git merge netfilter/master +Already up to date. +Merging ipvs/master (f7fb77fc1235 netfilter: nft_compat: check extension hook mask only if set) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (a9e6d44ddecc ssb: Do not disable PCI host on non-Mips) +$ git merge wireless-drivers/master +Auto-merging drivers/ssb/Kconfig +Merge made by the 'recursive' strategy. + drivers/ssb/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mac80211/master (c4de37ee2b55 mac80211: mesh: fix wrong mesh TTL offset calculation) +$ git merge mac80211/master +Auto-merging net/mac80211/mesh.c +Auto-merging net/mac80211/ieee80211_i.h +Merge made by the 'recursive' strategy. + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 17 ++++++----------- + net/wireless/mesh.c | 25 ++++++++++++++++++++++--- + 3 files changed, 29 insertions(+), 15 deletions(-) +Merging rdma-fixes/for-rc (ae59c3f0b6cf RDMA/mlx5: Fix out-of-bound access while querying AH) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (1c9609e3a8cf ALSA: hda - Reduce the suspend time consumption for ALC256) +$ git merge sound-current/for-linus +Already up to date. +Merging pci-current/for-linus (838cda369707 x86/PCI: Enable AMD 64-bit window on resume) +$ git merge pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (b2cd1df66037 Linux 4.15-rc7) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (d14ac576d10f USB: serial: cp210x: add new device ID ELV ALC 8xxx) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (964728f9f407 USB: chipidea: msm: fix ulpi-node lookup) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Already up to date. +Merging phy/fixes (2b88212c4cc6 phy: rcar-gen3-usb2: select USB_COMMON) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging input-current/for-linus (0004520af32f Input: mms114 - add SPDX identifier) +$ git merge input-current/for-linus +Merge made by the 'recursive' strategy. + drivers/input/touchscreen/mms114.c | 15 ++++++--------- + 1 file changed, 6 insertions(+), 9 deletions(-) +Merging crypto-current/master (2d55807b7f7b crypto: picoxcell - Fix error handling in spacc_probe()) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (563b5cbe334e iommu/arm-smmu-v3: Cope with duplicated Stream IDs) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ff5cbc6e3c5 backlight: as3711_bl: fix device-tree node leaks) +$ git merge backlight-fixes/for-backlight-fixes +Merge made by the 'recursive' strategy. + drivers/video/backlight/as3711_bl.c | 45 ++++++++++++++++++++++------------- + drivers/video/backlight/max8925_bl.c | 4 +++- + drivers/video/backlight/tps65217_bl.c | 4 ++-- + include/linux/mfd/as3711.h | 4 ++-- + 4 files changed, 36 insertions(+), 21 deletions(-) +Merging nand-fixes/nand/fixes (ee02f73e04c0 mtd: nand: atmel: Fix EDO mode check) +$ git merge nand-fixes/nand/fixes +Already up to date. +Merging spi-nor-fixes/spi-nor/fixes (10a6a6975691 Revert "dt-bindings: mtd: add sst25wf040b and en25s64 to sip-nor list") +$ git merge spi-nor-fixes/spi-nor/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (107b7d9fa94c mfd: rtsx: Release IRQ during shutdown) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (781b045baefd media: imx274: Fix error handling, add MAINTAINERS entry) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (f450f28e70a2 reset: socfpga: fix for 64-bit compilation) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (f35764e74f0e MIPS: Fix undefined reference to physical_memsize) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging kvm-fixes/master (d8a5b80568a9 Linux 4.15) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (1de1ea7efeb9 KVM: s390: add proper locking for CMMA migration bitmap) +$ git merge kvms390-fixes/master +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (d8a5b80568a9 Linux 4.15) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (54f809cfbd6b drm/atomic: Fix memleak on ERESTARTSYS during non-blocking commits) +$ git merge drm-misc-fixes/for-linux-next-fixes +Auto-merging include/drm/drm_atomic.h +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/cirrus/cirrus_mode.c | 40 +++++++++++++++++++++--------------- + drivers/gpu/drm/drm_atomic_helper.c | 15 ++++++++++++++ + include/drm/drm_atomic.h | 9 ++++++++ + 3 files changed, 47 insertions(+), 17 deletions(-) +Merging kbuild/for-next (53a7bc8937df Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Auto-merging lib/Kconfig.debug +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/mmc/host/Kconfig +Auto-merging arch/mips/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/mach-vt8500/Kconfig | 1 - + arch/mips/Kconfig | 1 - + arch/mips/bcm63xx/boards/Kconfig | 1 - + arch/nios2/Kconfig | 1 - + drivers/mmc/host/Kconfig | 1 - + drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 - + drivers/staging/rtl8192u/Kconfig | 1 - + drivers/video/fbdev/Kconfig | 1 - + lib/Kconfig.debug | 1 - + scripts/kconfig/zconf.y | 6 ++++++ + 10 files changed, 6 insertions(+), 9 deletions(-) +Merging uuid/for-next (c0020756315e efi: switch to use new generic UUID API) +$ git merge uuid/for-next +Already up to date. +Merging dma-mapping/for-next (04f56534786c MAINTAINERS: add the iommu list for swiotlb and xen-swiotlb) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (a351e9b9fc24 Linux 4.11) +$ git merge asm-generic/master +Already up to date. +Merging arc/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3a175cdf4392 Merge branches 'fixes', 'misc', 'sa1111' and 'sa1100-for-next' into for-next) +$ git merge arm/for-next +Already up to date. +Merging arm-perf/for-next/perf (7520fa99246d perf: ARM DynamIQ Shared Unit PMU support) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (2aa127e4d579 Merge branches 'next/dt' and 'next/drivers' into for-next) +$ git merge arm-soc/for-next +Merge made by the 'recursive' strategy. + arch/arm/arm-soc-for-next-contents.txt | 239 +++++++++++++++++++++++++++++++++ + 1 file changed, 239 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (61862a89e6ac Merge branch 'v4.16/drivers' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (a1144b2b1ec4 ARM: dts: alpine: add valid clock-frequency values) +$ git merge alpine/alpine/for-next +Merge made by the 'recursive' strategy. +Merging amlogic/for-next (ea879b13a92b Merge branch 'v4.16/dt64' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 4 ++-- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 10 +++++----- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 1 + + 3 files changed, 8 insertions(+), 7 deletions(-) +Merging aspeed/for-next (8203ca9789bc Merge branch 'dt-for-v4.16' into for-next) +$ git merge aspeed/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging at91/at91-next (fa4cf68ab4b1 Merge tag 'at91-ab-4.16-dt' into at91-next) +$ git merge at91/at91-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging bcm2835/for-next (a6189bcc0012 Merge branch anholt/bcm2835-drivers-next into for-next) +$ git merge bcm2835/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (824162aa1454 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging keystone/next (a29b8b93e158 Merge branch 'for_4.16/keystone-config' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (91cbd0893d7d Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging omap/for-next (e38c38728951 Merge branch 'omap-for-v4.16/ti-sysc' into for-next) +$ git merge omap/for-next +Resolved 'arch/arm/boot/dts/dra7.dtsi' using previous resolution. +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging arch/arm/boot/dts/dra7.dtsi +CONFLICT (content): Merge conflict in arch/arm/boot/dts/dra7.dtsi +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master b1ef3739b463] Merge remote-tracking branch 'omap/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap2/omap_hwmod.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging reset/reset/next (70d2f16a6289 reset: meson: enable level reset support on Meson8b) +$ git merge reset/reset/next +Merge made by the 'recursive' strategy. + drivers/reset/reset-meson.c | 22 +++++----------------- + 1 file changed, 5 insertions(+), 17 deletions(-) +Merging qcom/for-next (f5788d2f2929 Merge tag 'qcom-arm64-defconfig-for-4.16' into tagged-for-4.16) +$ git merge qcom/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging realtek/for-next (2b6286eb7ab8 Merge branch 'v4.15/dt64' into next) +$ git merge realtek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging renesas/next (b214f9f550fd Merge branches 'fixes-for-v4.15' and 'dt-for-v4.16' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (5432915256e7 Merge branch 'v4.16-armsoc/dts64fixes' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/usb/rockchip,dwc3.txt | 4 +++- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 9 ++++++++ + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 16 +++++++++---- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 27 ++++++++++++++++++++++ + 4 files changed, 51 insertions(+), 5 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (3b6327365aba Merge branch 'next/dt' into for-next) +$ git merge samsung-krzk/for-next +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (d7ec2c507677 Merge branch 'sunxi/fixes-for-4.15' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tegra/for-next (983371acdeda Merge branch for-4.16/arm64/dt into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm64/for-next/core (ec89ab50a03a arm64: Fix TTBR + PAN + 52-bit PA logic in cpu_do_switch_mm) +$ git merge arm64/for-next/core +Already up to date. +Merging clk/clk-next (c43a52cfd27b Merge branches 'clk-aspeed', 'clk-lock-UP', 'clk-mediatek' and 'clk-allwinner' into clk-next) +$ git merge clk/clk-next +Already up to date. +Merging clk-samsung/for-next (7685570f2ae2 clk: samsung: s3c: Remove unneeded enumeration) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. + drivers/clk/samsung/clk-s3c2412.c | 11 ++--------- + drivers/clk/samsung/clk-s3c2443.c | 17 ++++------------- + drivers/clk/samsung/clk-s3c64xx.c | 17 ++++++----------- + 3 files changed, 12 insertions(+), 33 deletions(-) +Merging c6x/for-linux-next (9d440f7a2824 c6x: fix platforms/plldata.c get_coreid build error) +$ git merge c6x/for-linux-next +Auto-merging arch/c6x/kernel/asm-offsets.c +Merge made by the 'recursive' strategy. + arch/c6x/kernel/asm-offsets.c | 1 - + arch/c6x/platforms/plldata.c | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) +Merging cris/for-next (fd989db807a0 cris: Fix conflicting types for _etext, _edata, _end) +$ git merge cris/for-next +Merge made by the 'recursive' strategy. + arch/cris/kernel/setup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging m68k/for-next (2334b1ac1235 MAINTAINERS: Add NuBus subsystem entry) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (0d665e7b109d mm, page_vma_mapped: Drop faulty pointer arithmetics in check_pte()) +$ git merge m68knommu/for-next +Already up to date. +Merging metag/for-next (e3cd7f013bac metag/mm: Drop pointless increment) +$ git merge metag/for-next +Already up to date. +Merging microblaze/next (7b6ce52be3f8 microblaze: Setup proper dependency for optimized lib functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (ea4d340cbea4 Merge branches '4.15-fixes', '4.16-features' and 'octeon-3-net-mips-bits' into mips-next) +$ git merge mips/mips-next +Auto-merging drivers/staging/octeon/ethernet-tx.c +Auto-merging drivers/staging/octeon/ethernet-rx.c +Auto-merging drivers/staging/octeon/ethernet-defines.h +Auto-merging arch/mips/cavium-octeon/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 20 ++ + arch/mips/cavium-octeon/Kconfig | 27 +- + arch/mips/cavium-octeon/Makefile | 1 + + arch/mips/cavium-octeon/resource-mgr.c | 351 +++++++++++++++++++++ + arch/mips/cavium-octeon/setup.c | 22 +- + arch/mips/include/asm/barrier.h | 2 +- + .../asm/mach-cavium-octeon/kernel-entry-init.h | 20 +- + arch/mips/include/asm/mipsregs.h | 2 + + arch/mips/include/asm/octeon/octeon.h | 32 +- + arch/mips/include/asm/processor.h | 2 +- + arch/mips/kernel/octeon_switch.S | 2 - + arch/mips/math-emu/cp1emu.c | 28 +- + arch/mips/math-emu/dp_add.c | 3 +- + arch/mips/math-emu/dp_div.c | 1 + + arch/mips/math-emu/dp_fmax.c | 2 + + arch/mips/math-emu/dp_fmin.c | 2 + + arch/mips/math-emu/dp_maddf.c | 8 +- + arch/mips/math-emu/dp_mul.c | 4 +- + arch/mips/math-emu/dp_sqrt.c | 8 +- + arch/mips/math-emu/dp_sub.c | 2 +- + arch/mips/math-emu/ieee754dp.h | 3 + + arch/mips/math-emu/sp_add.c | 3 +- + arch/mips/math-emu/sp_div.c | 1 + + arch/mips/math-emu/sp_fdp.c | 3 +- + arch/mips/math-emu/sp_fmax.c | 2 + + arch/mips/math-emu/sp_fmin.c | 2 + + arch/mips/math-emu/sp_maddf.c | 3 +- + arch/mips/math-emu/sp_mul.c | 1 + + arch/mips/math-emu/sp_sqrt.c | 3 +- + arch/mips/math-emu/sp_sub.c | 1 + + arch/mips/math-emu/sp_tlong.c | 1 - + arch/mips/mm/tlbex.c | 29 +- + drivers/staging/octeon/ethernet-defines.h | 6 - + drivers/staging/octeon/ethernet-rx.c | 25 +- + drivers/staging/octeon/ethernet-tx.c | 85 ++--- + 35 files changed, 545 insertions(+), 162 deletions(-) + create mode 100644 arch/mips/cavium-octeon/resource-mgr.c +Merging mips-james/mips-next (6045f241b48f MIPS: Loongson fix name confict - MEM_RESERVED) +$ git merge mips-james/mips-next +Auto-merging arch/mips/mm/dma-default.c +Auto-merging arch/mips/loongson64/Kconfig +Auto-merging arch/mips/include/asm/mipsregs.h +Auto-merging arch/mips/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/vendor-prefixes.txt | 1 + + MAINTAINERS | 7 + + arch/mips/Kconfig | 13 +- + arch/mips/Makefile | 8 +- + arch/mips/bcm47xx/Platform | 1 + + arch/mips/boot/compressed/Makefile | 6 +- + arch/mips/boot/dts/ingenic/Makefile | 1 + + arch/mips/boot/dts/ingenic/gcw0.dts | 62 ++ + arch/mips/boot/dts/ingenic/jz4770.dtsi | 212 +++++++ + arch/mips/configs/gcw0_defconfig | 27 + + arch/mips/configs/generic/board-ranchu.config | 30 + + arch/mips/generic/Kconfig | 10 + + arch/mips/generic/Makefile | 1 + + arch/mips/generic/board-ranchu.c | 92 +++ + arch/mips/include/asm/bootinfo.h | 2 + + arch/mips/include/asm/checksum.h | 2 +- + arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +- + arch/mips/include/asm/mipsregs.h | 702 +++++++++++---------- + arch/mips/include/asm/msa.h | 63 +- + arch/mips/jz4740/Kconfig | 10 + + arch/mips/jz4740/prom.c | 25 +- + arch/mips/jz4740/setup.c | 22 +- + arch/mips/jz4740/time.c | 2 +- + arch/mips/kernel/branch.c | 2 +- + arch/mips/kernel/ftrace.c | 2 +- + arch/mips/kernel/setup.c | 39 +- + arch/mips/kernel/watch.c | 31 +- + arch/mips/loongson64/Kconfig | 2 - + arch/mips/loongson64/common/mem.c | 2 +- + arch/mips/loongson64/loongson-3/numa.c | 2 +- + arch/mips/mm/dma-default.c | 6 - + arch/mips/mm/sc-mips.c | 9 + + drivers/clk/ingenic/Makefile | 1 + + drivers/clk/ingenic/cgu.c | 94 ++- + drivers/clk/ingenic/cgu.h | 4 +- + drivers/clk/ingenic/jz4770-cgu.c | 483 ++++++++++++++ + drivers/clk/ingenic/jz4780-cgu.c | 2 +- + include/dt-bindings/clock/jz4770-cgu.h | 58 ++ + 38 files changed, 1547 insertions(+), 491 deletions(-) + create mode 100644 arch/mips/boot/dts/ingenic/gcw0.dts + create mode 100644 arch/mips/boot/dts/ingenic/jz4770.dtsi + create mode 100644 arch/mips/configs/gcw0_defconfig + create mode 100644 arch/mips/configs/generic/board-ranchu.config + create mode 100644 arch/mips/generic/board-ranchu.c + create mode 100644 drivers/clk/ingenic/jz4770-cgu.c + create mode 100644 include/dt-bindings/clock/jz4770-cgu.h +Merging nios2/for-next (65d1e3ddeae1 nios2: time: Read timer in get_cycles only if initialized) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (0fedb7653af7 openrisc: remove unused __ARCH_HAVE_MMU define) +$ git merge openrisc/for-next +Merge made by the 'recursive' strategy. + arch/openrisc/include/uapi/asm/unistd.h | 2 -- + 1 file changed, 2 deletions(-) +Merging parisc-hd/for-next (bebc6082da0a Linux 4.14) +$ git merge parisc-hd/for-next +Already up to date. +Merging powerpc/next (015eb1b89e95 powerpc/mm/radix: Fix build error when RADIX_MMU=n) +$ git merge powerpc/next +Already up to date. +Merging fsl/next (c095ff93f901 powerpc/sysdev: change CPM GPIO to platform_device) +$ git merge fsl/next +Already up to date. +Merging risc-v/for-next (4889dec6c87d riscv: inline set_pgdir into its only caller) +$ git merge risc-v/for-next +Auto-merging arch/riscv/mm/fault.c +Auto-merging arch/riscv/include/asm/Kbuild +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 10 +++ + arch/riscv/include/asm/Kbuild | 1 - + arch/riscv/include/asm/csr.h | 14 ++-- + arch/riscv/include/asm/ftrace.h | 10 +++ + arch/riscv/include/asm/mmu_context.h | 17 ++--- + arch/riscv/include/asm/tlbflush.h | 20 +++--- + arch/riscv/include/asm/unistd.h | 1 - + arch/riscv/kernel/Makefile | 7 ++ + arch/riscv/kernel/entry.S | 9 ++- + arch/riscv/kernel/ftrace.c | 41 +++++++++++ + arch/riscv/kernel/head.S | 6 +- + arch/riscv/kernel/mcount.S | 126 ++++++++++++++++++++++++++++++++++ + arch/riscv/kernel/setup.c | 44 +++--------- + arch/riscv/kernel/vdso.c | 2 +- + arch/riscv/mm/fault.c | 4 ++ + arch/riscv/mm/init.c | 12 ++-- + include/asm-generic/audit_dir_write.h | 2 + + 17 files changed, 250 insertions(+), 76 deletions(-) + create mode 100644 arch/riscv/include/asm/ftrace.h + create mode 100644 arch/riscv/kernel/ftrace.c + create mode 100644 arch/riscv/kernel/mcount.S +Merging s390/features (279d2cea3aad s390/cio: fix kernel-doc usage) +$ git merge s390/features +Merge made by the 'recursive' strategy. + Documentation/driver-api/s390-drivers.rst | 32 +++++++++++-- + arch/s390/include/asm/eadm.h | 2 +- + arch/s390/include/asm/runtime_instr.h | 67 +-------------------------- + arch/s390/include/asm/sysinfo.h | 3 +- + arch/s390/include/uapi/asm/runtime_instr.h | 74 ++++++++++++++++++++++++++++++ + arch/s390/kernel/kprobes.c | 2 +- + arch/s390/kernel/perf_cpum_cf_events.c | 2 +- + arch/s390/kernel/runtime_instr.c | 10 +++- + arch/s390/kernel/sysinfo.c | 2 + + drivers/s390/cio/chp.c | 10 ++-- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/cio/cmf.c | 15 +++--- + drivers/s390/cio/itcw.c | 2 +- + drivers/s390/cio/qdio_main.c | 4 +- + drivers/s390/cio/vfio_ccw_cp.c | 2 +- + 15 files changed, 136 insertions(+), 93 deletions(-) + create mode 100644 arch/s390/include/uapi/asm/runtime_instr.h +Merging sparc-next/master (8e44e6600caa Merge branch 'KASAN-read_word_at_a_time') +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (6e2fbfdd585f sh: fix futex FUTEX_OP_SET op on userspace addresses) +$ git merge sh/for-next +Auto-merging arch/sh/include/asm/futex.h +Merge made by the 'recursive' strategy. + arch/sh/include/asm/futex.h | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging uml/linux-next (02eb0b11eab5 um: Add missing EXPORT for free_irq_by_fd()) +$ git merge uml/linux-next +Auto-merging arch/um/drivers/net_kern.c +Merge made by the 'recursive' strategy. + arch/um/Kconfig.net | 11 + + arch/um/drivers/Makefile | 4 +- + arch/um/drivers/chan_kern.c | 53 +- + arch/um/drivers/line.c | 2 +- + arch/um/drivers/net_kern.c | 4 +- + arch/um/drivers/random.c | 11 +- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1630 ++++++++++++++++++++++++++++++++++ + arch/um/drivers/vector_kern.h | 129 +++ + arch/um/drivers/vector_transports.c | 458 ++++++++++ + arch/um/drivers/vector_user.c | 586 ++++++++++++ + arch/um/drivers/vector_user.h | 99 +++ + arch/um/include/asm/asm-prototypes.h | 1 + + arch/um/include/asm/irq.h | 12 + + arch/um/include/shared/irq_user.h | 12 +- + arch/um/include/shared/net_kern.h | 2 + + arch/um/include/shared/os.h | 17 +- + arch/um/kernel/irq.c | 461 ++++++---- + arch/um/kernel/time.c | 6 +- + arch/um/os-Linux/irq.c | 202 +++-- + arch/um/os-Linux/signal.c | 2 +- + arch/x86/um/stub_segv.c | 2 +- + 22 files changed, 3383 insertions(+), 325 deletions(-) + create mode 100644 arch/um/drivers/vector_kern.c + create mode 100644 arch/um/drivers/vector_kern.h + create mode 100644 arch/um/drivers/vector_transports.c + create mode 100644 arch/um/drivers/vector_user.c + create mode 100644 arch/um/drivers/vector_user.h + create mode 100644 arch/um/include/asm/asm-prototypes.h +Merging xtensa/xtensa-for-next (73b37067623c xtensa: fix futex_atomic_cmpxchg_inatomic) +$ git merge xtensa/xtensa-for-next +Merge made by the 'recursive' strategy. +Merging fscrypt/master (0b1dfa4cc6c6 fscrypt: fix build with pre-4.6 gcc versions) +$ git merge fscrypt/master +Already up to date. +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (7c9a09f56a91 btrfs: don't use async helpers for crcs when under IO limits) +$ git merge btrfs/next +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/backing-dev.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext2/super.c +Auto-merging fs/buffer.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/disk-io.c +Merge made by the 'recursive' strategy. + block/blk-cgroup.c | 1 + + fs/block_dev.c | 3 +-- + fs/btrfs/check-integrity.c | 2 +- + fs/btrfs/disk-io.c | 4 ++++ + fs/btrfs/inode.c | 15 ++++++++++++--- + fs/btrfs/ioctl.c | 8 +++++++- + fs/btrfs/super.c | 1 - + fs/buffer.c | 42 ++++++++++++++++++++++++++++++++++-------- + fs/ext2/inode.c | 3 ++- + fs/ext2/super.c | 1 - + fs/ext4/inode.c | 4 +++- + fs/ext4/super.c | 2 -- + include/linux/backing-dev.h | 2 +- + include/linux/buffer_head.h | 3 +++ + include/linux/fs.h | 3 ++- + kernel/cgroup/cgroup.c | 1 + + 16 files changed, 72 insertions(+), 23 deletions(-) +$ git am -3 ../patches/0001-f2fs-fixup-for-cgroup-writeback-change.patch +Applying: f2fs: fixup for cgroup/writeback change +$ git reset HEAD^ +Unstaged changes after reset: +M fs/f2fs/inode.c +M fs/f2fs/super.c +$ git add -A . +$ git commit -v -a --amend +[master 5bd90a739cf4] Merge remote-tracking branch 'btrfs/next' + Date: Mon Feb 5 10:07:45 2018 +1100 +Merging btrfs-kdave/for-next (d69a3372bba2 Merge branch 'for-next-next-v4.16-20180130' into for-next-20180130) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/delayed-inode.c +Auto-merging fs/btrfs/compression.c +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 21 ++- + fs/btrfs/ctree.h | 15 +- + fs/btrfs/delayed-inode.c | 50 ++++-- + fs/btrfs/disk-io.c | 12 +- + fs/btrfs/extent-tree.c | 49 +++--- + fs/btrfs/extent_map.c | 3 + + fs/btrfs/file.c | 15 +- + fs/btrfs/free-space-cache.c | 2 +- + fs/btrfs/inode-map.c | 4 +- + fs/btrfs/inode.c | 27 ++-- + fs/btrfs/ioctl.c | 30 +++- + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 351 ++++++++++++++++++++++++++++++++----------- + fs/btrfs/qgroup.h | 102 ++++++++++++- + fs/btrfs/relocation.c | 9 +- + fs/btrfs/super.c | 3 +- + fs/btrfs/transaction.c | 8 +- + fs/btrfs/tree-checker.c | 149 +++++++++--------- + fs/btrfs/tree-checker.h | 7 +- + fs/btrfs/zstd.c | 19 ++- + include/trace/events/btrfs.h | 108 ++++++++++++- + 22 files changed, 713 insertions(+), 275 deletions(-) +Merging ceph/master (16515a6d5418 ceph: improving efficiency of syncfs) +$ git merge ceph/master +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 22 ++----- + fs/ceph/addr.c | 28 +++++--- + fs/ceph/caps.c | 170 ++++++++++++++++++++++++++++++++++--------------- + fs/ceph/dir.c | 79 +++++++++++++---------- + fs/ceph/file.c | 12 +++- + fs/ceph/inode.c | 56 ++++++++++++---- + fs/ceph/mds_client.c | 33 +++++++--- + fs/ceph/mds_client.h | 3 + + fs/ceph/snap.c | 8 ++- + fs/ceph/super.h | 53 ++++++++++++++- + net/ceph/ceph_common.c | 4 ++ + 11 files changed, 323 insertions(+), 145 deletions(-) +Merging cifs/for-next (89f51d817f87 [SMB3] address lock imbalance warnings in smbdirect.c) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 9 ++++++++- + fs/cifs/cifssmb.c | 4 +--- + fs/cifs/smbdirect.c | 16 +++++++++------- + 3 files changed, 18 insertions(+), 11 deletions(-) +Merging configfs/for-next (6ace4f6bbcfd RDMA/cma: make config_item_type const) +$ git merge configfs/for-next +Already up to date. +Merging ecryptfs/next (4670269faba7 eCryptfs: constify attribute_group structures.) +$ git merge ecryptfs/next +Already up to date. +Merging ext3/for_next (f463589a7cd2 ext2: drop unneeded newline) +$ git merge ext3/for_next +Auto-merging fs/ext2/super.c +Merge made by the 'recursive' strategy. + fs/ext2/super.c | 2 +- + fs/udf/udftime.c | 5 +++++ + 2 files changed, 6 insertions(+), 1 deletion(-) +Merging ext4/dev (5dc397113d19 ext4: create ext4_kset dynamically) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (1c1d35df7110 f2fs: support inode creation time) +$ git merge f2fs/dev +Already up to date. +Merging fuse/for-next (c6cdd51404b7 fuse: fix READDIRPLUS skipping an entry) +$ git merge fuse/for-next +Already up to date. +Merging jfs/jfs-next (86313903430d MAINTAINERS: fix jfs tree location) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (e231c6879cfd NFS: Fix a race between mmap() and O_DIRECT) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (c54c14ba000d xprtrdma: Spread reply processing over more CPUs) +$ git merge nfs-anna/linux-next +Resolved 'net/sunrpc/xprt.c' using previous resolution. +Resolved 'net/sunrpc/xprtrdma/transport.c' using previous resolution. +Auto-merging net/sunrpc/xprtrdma/transport.c +CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/transport.c +Auto-merging net/sunrpc/xprt.c +CONFLICT (content): Merge conflict in net/sunrpc/xprt.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0fd19c2752e2] Merge remote-tracking branch 'nfs-anna/linux-next' +$ git diff -M --stat --summary HEAD^.. +Merging nfsd/nfsd-next (3ac71a649c3d nfsd: store stat times in fill_pre_wcc() instead of inode times) +$ git merge nfsd/nfsd-next +Resolved 'fs/nfsd/nfsfh.h' using previous resolution. +Auto-merging net/sunrpc/svcsock.c +Auto-merging fs/nfsd/nfsfh.h +CONFLICT (content): Merge conflict in fs/nfsd/nfsfh.h +Auto-merging fs/locks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 1b0763ba8020] Merge remote-tracking branch 'nfsd/nfsd-next' +$ git diff -M --stat --summary HEAD^.. + fs/locks.c | 6 +- + fs/nfsd/nfs3proc.c | 18 ++++- + fs/nfsd/nfs3xdr.c | 98 ++++++++++++-------------- + fs/nfsd/nfs4proc.c | 46 +++++------- + fs/nfsd/nfs4state.c | 6 +- + fs/nfsd/nfs4xdr.c | 24 +++++-- + fs/nfsd/nfsfh.h | 28 ++------ + fs/nfsd/nfsproc.c | 23 +++--- + fs/nfsd/nfsxdr.c | 64 ++++++++--------- + fs/nfsd/xdr.h | 3 +- + fs/nfsd/xdr3.h | 3 +- + fs/nfsd/xdr4.h | 3 +- + include/linux/sunrpc/svc.h | 4 ++ + include/linux/sunrpc/svc_rdma.h | 2 - + net/sunrpc/svc.c | 109 +++++++++++++++++++++++++++++ + net/sunrpc/svcsock.c | 14 ---- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 5 -- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 9 +-- + net/sunrpc/xprtrdma/svc_rdma_sendto.c | 6 -- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 25 ++----- + 20 files changed, 282 insertions(+), 214 deletions(-) +Merging orangefs/for-next (db0267e7afc7 orangefs: call op_release sooner when creating inodes) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (8383f1748829 ovl: wire up NFS export operations) +$ git merge overlayfs/overlayfs-next +Resolved 'fs/dcache.c' using previous resolution. +Auto-merging fs/dcache.c +CONFLICT (content): Merge conflict in fs/dcache.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 47b692829d5f] Merge remote-tracking branch 'overlayfs/overlayfs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/overlayfs.txt | 106 ++++- + fs/dcache.c | 88 ++-- + fs/overlayfs/Kconfig | 31 +- + fs/overlayfs/Makefile | 3 +- + fs/overlayfs/copy_up.c | 188 +++++++-- + fs/overlayfs/dir.c | 175 ++++---- + fs/overlayfs/export.c | 712 ++++++++++++++++++++++++++++++++ + fs/overlayfs/inode.c | 106 +++-- + fs/overlayfs/namei.c | 531 +++++++++++++++++------- + fs/overlayfs/overlayfs.h | 66 ++- + fs/overlayfs/ovl_entry.h | 11 +- + fs/overlayfs/readdir.c | 57 ++- + fs/overlayfs/super.c | 125 ++++-- + fs/overlayfs/util.c | 108 +++-- + include/linux/dcache.h | 2 + + 15 files changed, 1900 insertions(+), 409 deletions(-) + create mode 100644 fs/overlayfs/export.c +Merging ubifs/linux-next (7f29ae9f977b ubi: block: Fix locking for idr_alloc/idr_remove) +$ git merge ubifs/linux-next +Already up to date. +Merging xfs/for-next (76883f7988e6 xfs: remove experimental tag for reverse mapping) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/libxfs/xfs_sb.c | 4 ++-- + fs/xfs/xfs_super.c | 24 +++++++++++++++--------- + fs/xfs/xfs_super.h | 7 +++++++ + 3 files changed, 24 insertions(+), 11 deletions(-) +Merging file-locks/locks-next (1deab8ce2c91 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (27f005e635c6 Merge branch 'misc.netdrv' into for-next) +$ git merge vfs/for-next +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/genet/bcmgenet.c +Auto-merging drivers/net/ethernet/broadcom/bnx2.c +Auto-merging drivers/net/ethernet/broadcom/bcmsysport.c +Merge made by the 'recursive' strategy. + arch/um/drivers/mconsole_kern.c | 3 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 2 +- + drivers/net/ethernet/broadcom/bgmac.h | 6 +- + drivers/net/ethernet/broadcom/bnx2.c | 6 +- + drivers/net/ethernet/broadcom/cnic_if.h | 8 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 26 +++--- + drivers/net/ethernet/brocade/bna/bfa_ioc.h | 4 +- + drivers/net/ethernet/brocade/bna/bfi.h | 94 ++++++++++----------- + drivers/net/ethernet/brocade/bna/bfi_enet.h | 96 +++++++++++----------- + drivers/net/ethernet/brocade/bna/bna.h | 2 +- + drivers/net/ethernet/brocade/bna/bna_enet.c | 6 +- + drivers/net/ethernet/brocade/bna/bna_hw_defs.h | 34 ++++---- + drivers/net/ethernet/brocade/bna/bna_tx_rx.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +-- + drivers/net/ethernet/stmicro/stmmac/dwmac4_descs.c | 9 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/via/via-rhine.c | 2 +- + drivers/net/ethernet/via/via-velocity.c | 15 ++-- + drivers/net/wireless/cisco/airo.c | 4 +- + fs/kernfs/file.c | 2 +- + fs/seq_file.c | 5 +- + 23 files changed, 175 insertions(+), 169 deletions(-) +Merging vfs-miklos/next (0eb8af4916a5 vfs: use helper for calling f_op->fsync()) +$ git merge vfs-miklos/next +Already up to date. +Merging iversion/iversion-next (bec5a1426bb8 Rename make inode_cmp_iversion{+raw} to inode_eq_iversion{+raw}) +$ git merge iversion/iversion-next +Auto-merging fs/ext4/inline.c +Merge made by the 'recursive' strategy. + fs/affs/dir.c | 2 +- + fs/exofs/dir.c | 2 +- + fs/ext2/dir.c | 2 +- + fs/ext4/dir.c | 4 ++-- + fs/ext4/inline.c | 2 +- + fs/fat/namei_vfat.c | 2 +- + fs/nfs/inode.c | 6 +++--- + fs/ocfs2/dir.c | 4 ++-- + fs/ufs/dir.c | 2 +- + include/linux/iversion.h | 22 +++++++++++----------- + security/integrity/ima/ima_main.c | 2 +- + 11 files changed, 25 insertions(+), 25 deletions(-) +Merging printk/for-next (bb4f552a598d Merge branch 'for-4.16-console-waiter-logic' into for-4.16) +$ git merge printk/for-next +Already up to date. +Merging pci/next (ab8c609356fb Merge branch 'pci/spdx' into next) +$ git merge pci/next +Resolved 'arch/powerpc/platforms/powernv/eeh-powernv.c' using previous resolution. +Resolved 'drivers/of/Kconfig' using previous resolution. +Resolved 'include/linux/pci.h' using previous resolution. +Auto-merging include/linux/switchtec.h +Auto-merging include/linux/pci.h +CONFLICT (content): Merge conflict in include/linux/pci.h +Auto-merging drivers/pci/switch/switchtec.c +Auto-merging drivers/pci/pcie/aer/aerdrv_core.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/iov.c +Auto-merging drivers/pci/hotplug/rpaphp_core.c +Auto-merging drivers/pci/hotplug/rpaphp.h +Auto-merging drivers/pci/hotplug/rpadlpar_sysfs.c +Auto-merging drivers/pci/hotplug/rpadlpar_core.c +Auto-merging drivers/pci/host/pci-hyperv.c +Removing drivers/of/of_pci_irq.c +Removing drivers/of/of_pci.c +Auto-merging drivers/of/address.c +Auto-merging drivers/of/Kconfig +CONFLICT (content): Merge conflict in drivers/of/Kconfig +Auto-merging drivers/macintosh/via-pmu.c +Auto-merging drivers/iommu/amd_iommu_v2.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/infiniband/hw/qedr/main.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/gma500/psb_drv.h +Auto-merging drivers/gpu/drm/gma500/psb_drv.c +Auto-merging drivers/block/DAC960.c +Auto-merging drivers/Makefile +Auto-merging arch/powerpc/sysdev/mv64x60_pci.c +Auto-merging arch/powerpc/platforms/powernv/eeh-powernv.c +CONFLICT (content): Merge conflict in arch/powerpc/platforms/powernv/eeh-powernv.c +Auto-merging arch/powerpc/platforms/powermac/feature.c +Auto-merging arch/powerpc/kernel/pci_of_scan.c +Auto-merging arch/powerpc/kernel/pci-common.c +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 96371eb716960fc59eedb5f30ef4e4bf0bd4bc97] Merge remote-tracking branch 'pci/next' +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 6 +- + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 5 +- + .../devicetree/bindings/pci/cdns,cdns-pcie-ep.txt | 22 + + .../bindings/pci/cdns,cdns-pcie-host.txt | 60 +++ + .../bindings/pci/samsung,exynos5440-pcie.txt | 58 +-- + MAINTAINERS | 11 + + arch/alpha/kernel/console.c | 1 + + arch/arm/include/asm/pci.h | 5 +- + arch/arm/kernel/bios32.c | 2 +- + arch/arm/mach-mvebu/Kconfig | 1 - + arch/mips/jazz/setup.c | 8 +- + arch/mips/mti-malta/malta-setup.c | 10 +- + arch/powerpc/kernel/pci-common.c | 10 +- + arch/powerpc/kernel/pci-hotplug.c | 20 +- + arch/powerpc/kernel/pci_32.c | 3 +- + arch/powerpc/kernel/pci_of_scan.c | 7 +- + arch/powerpc/platforms/maple/time.c | 2 +- + arch/powerpc/platforms/powermac/feature.c | 2 +- + arch/powerpc/sysdev/i8259.c | 6 +- + arch/powerpc/sysdev/mv64x60_pci.c | 4 +- + arch/x86/pci/irq.c | 3 +- + arch/x86/pci/xen.c | 4 +- + drivers/Makefile | 5 +- + drivers/ata/pata_ali.c | 3 +- + drivers/block/DAC960.c | 38 +- + drivers/block/DAC960.h | 4 +- + drivers/char/agp/nvidia-agp.c | 12 +- + drivers/char/agp/sworks-agp.c | 3 +- + drivers/firmware/edd.c | 8 +- + drivers/firmware/iscsi_ibft.c | 5 +- + drivers/gpu/drm/gma500/cdv_device.c | 16 +- + drivers/gpu/drm/gma500/gma_device.c | 4 +- + drivers/gpu/drm/gma500/mid_bios.c | 12 +- + drivers/gpu/drm/gma500/psb_drv.c | 10 +- + drivers/gpu/drm/gma500/psb_drv.h | 18 +- + drivers/gpu/drm/nouveau/dispnv04/arb.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv1a.c | 10 +- + drivers/ide/sl82c105.c | 5 +- + drivers/infiniband/hw/qedr/main.c | 59 +-- + drivers/iommu/amd_iommu.c | 3 +- + drivers/iommu/amd_iommu_init.c | 9 +- + drivers/iommu/amd_iommu_v2.c | 3 +- + drivers/irqchip/irq-i8259.c | 4 +- + drivers/macintosh/via-pmu.c | 2 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 18 +- + drivers/media/usb/ttusb-dec/ttusb_dec.c | 18 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h | 1 + + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 10 +- + drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +- + drivers/net/ethernet/intel/e100.c | 12 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 6 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 36 +- + drivers/of/Kconfig | 16 - + drivers/of/Makefile | 2 - + drivers/of/address.c | 9 +- + drivers/of/of_pci.c | 384 -------------- + drivers/of/of_pci_irq.c | 131 ----- + drivers/pci/Kconfig | 3 + + drivers/pci/Makefile | 14 +- + drivers/pci/access.c | 9 +- + drivers/pci/ats.c | 1 + + drivers/pci/bus.c | 5 +- + drivers/pci/cadence/Kconfig | 27 + + drivers/pci/cadence/Makefile | 4 + + drivers/pci/cadence/pcie-cadence-ep.c | 542 +++++++++++++++++++ + drivers/pci/cadence/pcie-cadence-host.c | 336 ++++++++++++ + drivers/pci/cadence/pcie-cadence.c | 126 +++++ + drivers/pci/cadence/pcie-cadence.h | 311 +++++++++++ + drivers/pci/dwc/Kconfig | 70 ++- + drivers/pci/dwc/Makefile | 6 +- + drivers/pci/dwc/pci-dra7xx.c | 47 +- + drivers/pci/dwc/pci-exynos.c | 227 +------- + drivers/pci/dwc/pci-imx6.c | 5 +- + drivers/pci/dwc/pci-keystone-dw.c | 6 +- + drivers/pci/dwc/pci-keystone.c | 10 +- + drivers/pci/dwc/pci-keystone.h | 6 +- + drivers/pci/dwc/pci-layerscape.c | 5 +- + drivers/pci/dwc/pcie-armada8k.c | 5 +- + drivers/pci/dwc/pcie-artpec6.c | 475 ++++++++++++++--- + drivers/pci/dwc/pcie-designware-ep.c | 140 +++-- + drivers/pci/dwc/pcie-designware-host.c | 20 +- + drivers/pci/dwc/pcie-designware-plat.c | 5 +- + drivers/pci/dwc/pcie-designware.c | 7 +- + drivers/pci/dwc/pcie-designware.h | 41 +- + drivers/pci/dwc/pcie-hisi.c | 5 +- + drivers/pci/dwc/pcie-histb.c | 5 +- + drivers/pci/dwc/pcie-kirin.c | 5 +- + drivers/pci/dwc/pcie-qcom.c | 14 +- + drivers/pci/dwc/pcie-spear13xx.c | 5 +- + drivers/pci/ecam.c | 13 +- + drivers/pci/endpoint/Kconfig | 1 + + drivers/pci/endpoint/Makefile | 1 + + drivers/pci/endpoint/functions/Kconfig | 1 + + drivers/pci/endpoint/functions/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-test.c | 54 +- + drivers/pci/endpoint/pci-ep-cfs.c | 78 ++- + drivers/pci/endpoint/pci-epc-core.c | 85 ++- + drivers/pci/endpoint/pci-epc-mem.c | 13 +- + drivers/pci/endpoint/pci-epf-core.c | 17 +- + drivers/pci/host-bridge.c | 1 + + drivers/pci/host/Kconfig | 2 + + drivers/pci/host/Makefile | 2 + + drivers/pci/host/pci-aardvark.c | 5 +- + drivers/pci/host/pci-host-common.c | 87 +--- + drivers/pci/host/pci-host-generic.c | 13 +- + drivers/pci/host/pci-hyperv.c | 12 +- + drivers/pci/host/pci-mvebu.c | 5 +- + drivers/pci/host/pci-rcar-gen2.c | 5 +- + drivers/pci/host/pci-tegra.c | 171 ++---- + drivers/pci/host/pci-thunder-ecam.c | 5 +- + drivers/pci/host/pci-thunder-pem.c | 13 +- + drivers/pci/host/pci-v3-semi.c | 1 + + drivers/pci/host/pci-versatile.c | 12 +- + drivers/pci/host/pci-xgene-msi.c | 11 +- + drivers/pci/host/pci-xgene.c | 13 +- + drivers/pci/host/pcie-altera-msi.c | 13 +- + drivers/pci/host/pcie-altera.c | 13 +- + drivers/pci/host/pcie-iproc-bcma.c | 10 +- + drivers/pci/host/pcie-iproc-msi.c | 10 +- + drivers/pci/host/pcie-iproc-platform.c | 17 +- + drivers/pci/host/pcie-iproc.c | 18 +- + drivers/pci/host/pcie-iproc.h | 12 +- + drivers/pci/host/pcie-mediatek.c | 10 +- + drivers/pci/host/pcie-rcar.c | 12 +- + drivers/pci/host/pcie-rockchip.c | 6 +- + drivers/pci/host/pcie-xilinx-nwl.c | 6 +- + drivers/pci/host/pcie-xilinx.c | 6 +- + drivers/pci/host/vmd.c | 10 +- + drivers/pci/hotplug/Kconfig | 1 + + drivers/pci/hotplug/acpi_pcihp.c | 16 +- + drivers/pci/hotplug/acpiphp.h | 16 +- + drivers/pci/hotplug/acpiphp_core.c | 16 +- + drivers/pci/hotplug/acpiphp_glue.c | 20 +- + drivers/pci/hotplug/acpiphp_ibm.c | 16 +- + drivers/pci/hotplug/cpci_hotplug.h | 16 +- + drivers/pci/hotplug/cpci_hotplug_core.c | 16 +- + drivers/pci/hotplug/cpci_hotplug_pci.c | 16 +- + drivers/pci/hotplug/cpcihp_generic.c | 21 +- + drivers/pci/hotplug/cpcihp_zt5550.c | 21 +- + drivers/pci/hotplug/cpcihp_zt5550.h | 21 +- + drivers/pci/hotplug/cpqphp.h | 16 +- + drivers/pci/hotplug/cpqphp_core.c | 19 +- + drivers/pci/hotplug/cpqphp_ctrl.c | 16 +- + drivers/pci/hotplug/cpqphp_nvram.c | 16 +- + drivers/pci/hotplug/cpqphp_nvram.h | 16 +- + drivers/pci/hotplug/cpqphp_pci.c | 34 +- + drivers/pci/hotplug/cpqphp_sysfs.c | 16 +- + drivers/pci/hotplug/ibmphp.h | 16 +- + drivers/pci/hotplug/ibmphp_core.c | 36 +- + drivers/pci/hotplug/ibmphp_ebda.c | 16 +- + drivers/pci/hotplug/ibmphp_hpc.c | 16 +- + drivers/pci/hotplug/ibmphp_pci.c | 76 +-- + drivers/pci/hotplug/ibmphp_res.c | 54 +- + drivers/pci/hotplug/pci_hotplug_core.c | 16 +- + drivers/pci/hotplug/pciehp.h | 16 +- + drivers/pci/hotplug/pciehp_core.c | 16 +- + drivers/pci/hotplug/pciehp_ctrl.c | 16 +- + drivers/pci/hotplug/pciehp_hpc.c | 28 +- + drivers/pci/hotplug/pciehp_pci.c | 28 +- + drivers/pci/hotplug/pcihp_skeleton.c | 16 +- + drivers/pci/hotplug/pnv_php.c | 45 +- + drivers/pci/hotplug/rpadlpar.h | 6 +- + drivers/pci/hotplug/rpadlpar_core.c | 6 +- + drivers/pci/hotplug/rpadlpar_sysfs.c | 6 +- + drivers/pci/hotplug/rpaphp.h | 16 +- + drivers/pci/hotplug/rpaphp_core.c | 16 +- + drivers/pci/hotplug/rpaphp_pci.c | 16 +- + drivers/pci/hotplug/rpaphp_slot.c | 16 +- + drivers/pci/hotplug/s390_pci_hpc.c | 3 +- + drivers/pci/hotplug/sgi_hotplug.c | 41 +- + drivers/pci/hotplug/shpchp.h | 24 +- + drivers/pci/hotplug/shpchp_core.c | 21 +- + drivers/pci/hotplug/shpchp_ctrl.c | 16 +- + drivers/pci/hotplug/shpchp_hpc.c | 16 +- + drivers/pci/hotplug/shpchp_pci.c | 28 +- + drivers/pci/hotplug/shpchp_sysfs.c | 16 +- + drivers/pci/iov.c | 11 +- + drivers/pci/irq.c | 7 +- + drivers/pci/mmap.c | 5 +- + drivers/pci/msi.c | 8 +- + drivers/pci/of.c | 571 ++++++++++++++++++++- + drivers/pci/pci-acpi.c | 3 +- + drivers/pci/pci-driver.c | 4 +- + drivers/pci/pci-mid.c | 5 +- + drivers/pci/pci-stub.c | 5 +- + drivers/pci/pci-sysfs.c | 30 +- + drivers/pci/pci.c | 158 ++++-- + drivers/pci/pci.h | 74 ++- + drivers/pci/pcie/Kconfig | 3 +- + drivers/pci/pcie/aer/Kconfig | 1 + + drivers/pci/pcie/aer/Kconfig.debug | 1 + + drivers/pci/pcie/aer/aer_inject.c | 22 +- + drivers/pci/pcie/aer/aerdrv.c | 7 +- + drivers/pci/pcie/aer/aerdrv_core.c | 31 +- + drivers/pci/pcie/aer/aerdrv_errprint.c | 27 +- + drivers/pci/pcie/aer/ecrc.c | 16 +- + drivers/pci/pcie/aspm.c | 80 +-- + drivers/pci/pcie/pcie-dpc.c | 256 ++++----- + drivers/pci/pcie/pme.c | 11 +- + drivers/pci/pcie/portdrv_acpi.c | 5 +- + drivers/pci/pcie/portdrv_bus.c | 1 + + drivers/pci/pcie/portdrv_core.c | 4 +- + drivers/pci/pcie/ptm.c | 12 +- + drivers/pci/probe.c | 372 +++++++++----- + drivers/pci/quirks.c | 210 ++++---- + drivers/pci/remove.c | 1 + + drivers/pci/rom.c | 9 +- + drivers/pci/search.c | 1 + + drivers/pci/setup-bus.c | 49 +- + drivers/pci/setup-irq.c | 5 +- + drivers/pci/setup-res.c | 40 +- + drivers/pci/slot.c | 1 + + drivers/pci/switch/Kconfig | 2 + + drivers/pci/switch/Makefile | 1 + + drivers/pci/switch/switchtec.c | 14 +- + drivers/pci/syscall.c | 4 +- + drivers/pci/vc.c | 23 +- + drivers/pci/vpd.c | 1 + + drivers/pci/xen-pcifront.c | 23 +- + drivers/sbus/char/openprom.c | 5 +- + drivers/video/console/vgacon.c | 34 +- + drivers/video/fbdev/intelfb/intelfbhw.c | 4 +- + drivers/video/fbdev/nvidia/nv_hw.c | 11 +- + drivers/video/fbdev/nvidia/nv_setup.c | 3 +- + drivers/video/fbdev/riva/fbdev.c | 2 +- + drivers/video/fbdev/riva/nv_driver.c | 7 +- + drivers/video/fbdev/riva/riva_hw.c | 20 +- + drivers/video/fbdev/riva/riva_hw.h | 3 +- + include/asm-generic/pci_iomap.h | 6 +- + include/linux/of_pci.h | 8 +- + include/linux/pci-aspm.h | 35 +- + include/linux/pci-dma-compat.h | 27 +- + include/linux/pci-ecam.h | 13 +- + include/linux/pci-ep-cfs.h | 5 +- + include/linux/pci-epc.h | 48 +- + include/linux/pci-epf.h | 5 +- + include/linux/pci.h | 441 ++++++++-------- + include/linux/pci_hotplug.h | 16 +- + include/linux/pci_ids.h | 2 + + include/linux/switchtec.h | 3 + + include/uapi/linux/pci_regs.h | 30 +- + include/uapi/linux/switchtec_ioctl.h | 3 +- + kernel/resource.c | 29 +- + lib/pci_iomap.c | 1 + + 247 files changed, 4500 insertions(+), 3753 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-ep.txt + create mode 100644 Documentation/devicetree/bindings/pci/cdns,cdns-pcie-host.txt + delete mode 100644 drivers/of/of_pci.c + delete mode 100644 drivers/of/of_pci_irq.c + create mode 100644 drivers/pci/cadence/Kconfig + create mode 100644 drivers/pci/cadence/Makefile + create mode 100644 drivers/pci/cadence/pcie-cadence-ep.c + create mode 100644 drivers/pci/cadence/pcie-cadence-host.c + create mode 100644 drivers/pci/cadence/pcie-cadence.c + create mode 100644 drivers/pci/cadence/pcie-cadence.h +$ git am -3 ../patches/0001-PCI-fix-up-for-powerpc-eeh-Update-VF-config-space-af.patch +Applying: PCI: fix up for "powerpc/eeh: Update VF config space after EEH" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/powerpc/kernel/eeh.c +$ git add -A . +$ git commit -v -a --amend +[master e116d3b6e167ffb87e1801153d4e90ccc566dc63] Merge remote-tracking branch 'pci/next' + Date: Mon Feb 5 10:40:02 2018 +1100 +Merging pstore/for-next/pstore (a99f41a1b441 fs: pstore: remove unused hardirq.h) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (494622678bc9 Merge branch 'for-4.16/hid-quirks-cleanup/toshiba' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (a2cdd4be7a2c Merge branch 'i2c/for-4.16' into i2c/for-next) +$ git merge i2c/i2c/for-next +Recorded preimage for 'drivers/i2c/i2c-core-smbus.c' +Auto-merging drivers/i2c/i2c-core-smbus.c +CONFLICT (content): Merge conflict in drivers/i2c/i2c-core-smbus.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'drivers/i2c/i2c-core-smbus.c'. +[master f639a905e02e] Merge remote-tracking branch 'i2c/i2c/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging dmi/master (36a840c73dc6 firmware: dmi: handle missing DMI data gracefully) +$ git merge dmi/master +Merge made by the 'recursive' strategy. +Merging hwmon-staging/hwmon-next (6fbc4232a5ac hwmon: (dell-smm) Disable fan support for Dell Vostro 3360) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (54e36a2dc554 Documentation/admin-guide: fixes for thunderbolt.rst) +$ git merge jc_docs/docs-next +Merge made by the 'recursive' strategy. + Documentation/admin-guide/thunderbolt.rst | 66 +- + Documentation/mips/AU1xxx_IDE.README | 7 - + Documentation/process/index.rst | 1 + + Documentation/process/kernel-docs.rst | 2 +- + Documentation/process/maintainer-pgp-guide.rst | 911 +++++++++++++++++++++++++ + 5 files changed, 946 insertions(+), 41 deletions(-) + create mode 100644 Documentation/process/maintainer-pgp-guide.rst +Merging v4l-dvb/master (273caa260035 media: v4l2-compat-ioctl32.c: make ctrl_is_pointer work for subdevs) +$ git merge v4l-dvb/master +Resolved 'drivers/media/dvb-core/dmxdev.c' using previous resolution. +Resolved 'drivers/media/rc/lirc_dev.c' using previous resolution. +Auto-merging include/media/videobuf2-v4l2.h +Auto-merging include/media/videobuf2-core.h +Removing include/media/v4l2-tpg-colors.h +Auto-merging include/media/v4l2-dev.h +Auto-merging include/media/v4l2-ctrls.h +Auto-merging include/media/tpg/v4l2-tpg.h +CONFLICT (modify/delete): include/media/lirc_dev.h deleted in v4l-dvb/master and modified in HEAD. Version HEAD of include/media/lirc_dev.h left in tree. +Removing include/media/lirc.h +Removing include/media/i2c/as3645a.h +Removing include/media/i2c-addr.h +Auto-merging include/media/dvbdev.h +Auto-merging include/media/dvb_net.h +Auto-merging include/media/dvb_frontend.h +Auto-merging include/media/dvb_demux.h +Auto-merging include/media/dvb_ca_en50221.h +Auto-merging include/media/dvb-usb-ids.h +Auto-merging include/media/dmxdev.h +CONFLICT (modify/delete): drivers/staging/media/lirc/lirc_zilog.c deleted in v4l-dvb/master and modified in HEAD. Version HEAD of drivers/staging/media/lirc/lirc_zilog.c left in tree. +Removing drivers/staging/media/lirc/TODO +Removing drivers/staging/media/lirc/Makefile +Removing drivers/staging/media/lirc/Kconfig +Auto-merging drivers/staging/media/imx/imx-media.h +Auto-merging drivers/staging/media/imx/imx-media-csi.c +Auto-merging drivers/media/v4l2-core/v4l2-dev.c +Auto-merging drivers/media/usb/uvc/uvcvideo.h +Auto-merging drivers/media/usb/uvc/uvc_v4l2.c +Auto-merging drivers/media/usb/uvc/uvc_queue.c +Auto-merging drivers/media/usb/ttusb-dec/ttusb_dec.c +Auto-merging drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c +Auto-merging drivers/media/usb/tm6000/tm6000-video.c +Auto-merging drivers/media/usb/stkwebcam/stk-webcam.c +Auto-merging drivers/media/usb/pvrusb2/pvrusb2-v4l2.c +Auto-merging drivers/media/usb/hdpvr/hdpvr-video.c +Auto-merging drivers/media/usb/gspca/gspca.c +Auto-merging drivers/media/usb/cx231xx/cx231xx-video.c +Auto-merging drivers/media/usb/cpia2/cpia2_v4l.c +Auto-merging drivers/media/rc/lirc_dev.c +CONFLICT (content): Merge conflict in drivers/media/rc/lirc_dev.c +Removing drivers/media/rc/ir-lirc-codec.c +Auto-merging drivers/media/radio/si470x/radio-si470x-common.c +Auto-merging drivers/media/radio/radio-si476x.c +Auto-merging drivers/media/radio/radio-cadet.c +Auto-merging drivers/media/platform/vivid/vivid-radio-tx.c +Auto-merging drivers/media/platform/vivid/vivid-radio-rx.c +Auto-merging drivers/media/platform/vivid/vivid-core.c +Auto-merging drivers/media/platform/soc_camera/soc_camera.c +Auto-merging drivers/media/platform/soc_camera/sh_mobile_ceu_camera.c +Auto-merging drivers/media/platform/s5p-mfc/s5p_mfc.c +Auto-merging drivers/media/platform/omap/omap_vout.c +Auto-merging drivers/media/platform/m2m-deinterlace.c +Auto-merging drivers/media/platform/exynos-gsc/gsc-m2m.c +Auto-merging drivers/media/platform/davinci/vpfe_capture.c +Auto-merging drivers/media/pci/zoran/zoran_driver.c +Auto-merging drivers/media/pci/saa7134/saa7134-video.c +Auto-merging drivers/media/pci/meye/meye.c +Auto-merging drivers/media/pci/ddbridge/ddbridge-max.h +Auto-merging drivers/media/pci/ddbridge/ddbridge-max.c +Auto-merging drivers/media/pci/ddbridge/ddbridge-core.c +Auto-merging drivers/media/pci/cx18/cx18-fileops.c +Removing drivers/media/i2c/as3645a.c +Auto-merging drivers/media/firewire/firedtv-ci.c +Auto-merging drivers/media/dvb-core/dvb_frontend.c +Auto-merging drivers/media/dvb-core/dvb_ca_en50221.c +Auto-merging drivers/media/dvb-core/dmxdev.c +CONFLICT (content): Merge conflict in drivers/media/dvb-core/dmxdev.c +Auto-merging drivers/media/common/videobuf2/videobuf2-v4l2.c +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-sg.c +Auto-merging drivers/media/common/videobuf2/videobuf2-dma-contig.c +Auto-merging drivers/media/common/videobuf2/videobuf2-core.c +Auto-merging drivers/media/common/siano/smsdvb-debugfs.c +Auto-merging drivers/media/cec/cec-api.c +Auto-merging arch/arm/boot/dts/omap3-n900.dts +Auto-merging MAINTAINERS +Removing Documentation/media/uapi/rc/lirc-get-length.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f include/media/lirc_dev.h drivers/staging/media/lirc/lirc_zilog.c +drivers/staging/media/lirc/lirc_zilog.c: needs merge +include/media/lirc_dev.h: needs merge +rm 'drivers/staging/media/lirc/lirc_zilog.c' +rm 'include/media/lirc_dev.h' +$ git commit -v -a +[master 9ab9e46dfb75b8f1439a2a7bab8601c84e28a377] Merge remote-tracking branch 'v4l-dvb/master' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/media/cec-gpio.txt | 6 +- + .../devicetree/bindings/media/i2c/mt9m111.txt | 4 + + .../devicetree/bindings/media/i2c/ov5640.txt | 46 +- + .../devicetree/bindings/media/i2c/ov7740.txt | 47 + + .../bindings/media/i2c/toshiba,et8ek8.txt | 7 + + .../devicetree/bindings/media/nvidia,tegra-vde.txt | 55 + + .../bindings/media/xilinx/xlnx,v-tpg.txt | 2 +- + Documentation/media/dmx.h.rst.exceptions | 2 + + Documentation/media/kapi/cec-core.rst | 14 + + Documentation/media/kapi/dtv-ca.rst | 2 +- + Documentation/media/kapi/dtv-common.rst | 11 +- + Documentation/media/kapi/dtv-demux.rst | 8 +- + Documentation/media/kapi/dtv-frontend.rst | 8 +- + Documentation/media/kapi/dtv-net.rst | 2 +- + Documentation/media/kapi/rc-core.rst | 82 +- + Documentation/media/kapi/v4l2-dev.rst | 17 +- + Documentation/media/kapi/v4l2-event.rst | 67 +- + Documentation/media/lirc.h.rst.exceptions | 31 + + Documentation/media/uapi/dvb/dmx-expbuf.rst | 88 + + Documentation/media/uapi/dvb/dmx-mmap.rst | 116 ++ + Documentation/media/uapi/dvb/dmx-munmap.rst | 54 + + Documentation/media/uapi/dvb/dmx-qbuf.rst | 83 + + Documentation/media/uapi/dvb/dmx-querybuf.rst | 63 + + Documentation/media/uapi/dvb/dmx-reqbufs.rst | 74 + + Documentation/media/uapi/dvb/dmx_fcalls.rst | 6 + + .../media/uapi/dvb/fe_property_parameters.rst | 18 + + .../dvb/frontend-property-satellite-systems.rst | 2 + + Documentation/media/uapi/rc/lirc-dev-intro.rst | 75 +- + Documentation/media/uapi/rc/lirc-func.rst | 1 - + Documentation/media/uapi/rc/lirc-get-features.rst | 25 +- + Documentation/media/uapi/rc/lirc-get-length.rst | 44 - + Documentation/media/uapi/rc/lirc-get-rec-mode.rst | 45 +- + Documentation/media/uapi/rc/lirc-get-send-mode.rst | 40 +- + Documentation/media/uapi/rc/lirc-read.rst | 15 +- + Documentation/media/uapi/rc/lirc-write.rst | 19 +- + Documentation/media/uapi/v4l/meta-formats.rst | 1 + + Documentation/media/uapi/v4l/pixfmt-meta-uvc.rst | 51 + + Documentation/media/uapi/v4l/pixfmt-rgb.rst | 1 + + .../media/uapi/v4l/pixfmt-srggb10-ipu3.rst | 335 ++++ + .../media/uapi/v4l/vidioc-g-dv-timings.rst | 2 +- + MAINTAINERS | 56 +- + arch/arm/boot/dts/omap3-n900.dts | 2 + + drivers/media/Kconfig | 20 +- + drivers/media/cec/cec-adap.c | 81 +- + drivers/media/cec/cec-api.c | 32 +- + drivers/media/cec/cec-core.c | 27 +- + drivers/media/cec/cec-priv.h | 2 + + drivers/media/common/Kconfig | 1 + + drivers/media/common/Makefile | 2 +- + drivers/media/common/b2c2/Makefile | 1 - + drivers/media/common/b2c2/flexcop-common.h | 8 +- + drivers/media/common/saa7146/saa7146_video.c | 17 +- + drivers/media/common/siano/Makefile | 4 - + drivers/media/common/siano/smsdvb-debugfs.c | 29 +- + drivers/media/common/siano/smsdvb-main.c | 10 +- + drivers/media/common/siano/smsir.c | 35 +- + drivers/media/common/siano/smsir.h | 37 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-colors.c | 8 +- + drivers/media/common/v4l2-tpg/v4l2-tpg-core.c | 2 +- + drivers/media/common/videobuf2/Kconfig | 31 + + drivers/media/common/videobuf2/Makefile | 7 + + .../videobuf2}/videobuf2-core.c | 53 +- + .../videobuf2}/videobuf2-dma-contig.c | 6 +- + .../videobuf2}/videobuf2-dma-sg.c | 7 +- + .../videobuf2}/videobuf2-dvb.c | 0 + .../videobuf2}/videobuf2-memops.c | 0 + .../videobuf2}/videobuf2-v4l2.c | 2 + + .../videobuf2}/videobuf2-vmalloc.c | 0 + drivers/media/dvb-core/Kconfig | 13 + + drivers/media/dvb-core/Makefile | 7 +- + drivers/media/dvb-core/dmxdev.c | 232 ++- + drivers/media/dvb-core/dvb_ca_en50221.c | 9 +- + drivers/media/dvb-core/dvb_demux.c | 47 +- + drivers/media/dvb-core/dvb_frontend.c | 183 +- + drivers/media/dvb-core/dvb_math.c | 2 +- + drivers/media/dvb-core/dvb_net.c | 74 +- + drivers/media/dvb-core/dvb_ringbuffer.c | 2 +- + drivers/media/dvb-core/dvb_vb2.c | 430 ++++ + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/dvb-frontends/Makefile | 1 - + drivers/media/dvb-frontends/a8293.h | 2 +- + drivers/media/dvb-frontends/af9013_priv.h | 2 +- + drivers/media/dvb-frontends/af9033_priv.h | 4 +- + drivers/media/dvb-frontends/as102_fe.c | 2 +- + drivers/media/dvb-frontends/ascot2e.c | 6 +- + drivers/media/dvb-frontends/atbm8830.c | 2 +- + drivers/media/dvb-frontends/au8522_common.c | 2 +- + drivers/media/dvb-frontends/au8522_dig.c | 2 +- + drivers/media/dvb-frontends/au8522_priv.h | 220 +-- + drivers/media/dvb-frontends/bcm3510.c | 2 +- + drivers/media/dvb-frontends/cx22700.c | 2 +- + drivers/media/dvb-frontends/cx22702.c | 2 +- + drivers/media/dvb-frontends/cx24110.c | 2 +- + drivers/media/dvb-frontends/cx24113.c | 2 +- + drivers/media/dvb-frontends/cx24116.c | 4 +- + drivers/media/dvb-frontends/cx24117.c | 2 +- + drivers/media/dvb-frontends/cx24120.c | 2 +- + drivers/media/dvb-frontends/cx24123.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_priv.h | 4 +- + drivers/media/dvb-frontends/cxd2841er.c | 23 +- + drivers/media/dvb-frontends/dib0070.c | 2 +- + drivers/media/dvb-frontends/dib0090.c | 2 +- + drivers/media/dvb-frontends/dib3000mb.c | 2 +- + drivers/media/dvb-frontends/dib3000mc.c | 2 +- + drivers/media/dvb-frontends/dib7000m.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 4 +- + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/dib9000.c | 4 +- + drivers/media/dvb-frontends/dibx000_common.c | 8 +- + drivers/media/dvb-frontends/drx39xyj/Makefile | 1 - + drivers/media/dvb-frontends/drx39xyj/drx39xxj.h | 2 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 2 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 16 +- + drivers/media/dvb-frontends/drxd_hard.c | 27 +- + drivers/media/dvb-frontends/drxk.h | 6 +- + drivers/media/dvb-frontends/drxk_hard.c | 6 +- + drivers/media/dvb-frontends/ds3000.c | 2 +- + drivers/media/dvb-frontends/dvb-pll.h | 2 +- + drivers/media/dvb-frontends/dvb_dummy_fe.c | 2 +- + drivers/media/dvb-frontends/dvb_dummy_fe.h | 2 +- + drivers/media/dvb-frontends/ec100.c | 2 +- + drivers/media/dvb-frontends/gp8psk-fe.c | 2 +- + drivers/media/dvb-frontends/helene.c | 6 +- + drivers/media/dvb-frontends/horus3a.c | 6 +- + drivers/media/dvb-frontends/isl6405.c | 2 +- + drivers/media/dvb-frontends/isl6421.c | 2 +- + drivers/media/dvb-frontends/isl6423.c | 2 +- + drivers/media/dvb-frontends/itd1000.c | 7 +- + drivers/media/dvb-frontends/ix2505v.h | 2 +- + drivers/media/dvb-frontends/l64781.c | 2 +- + drivers/media/dvb-frontends/lg2160.h | 2 +- + drivers/media/dvb-frontends/lgdt3305.c | 2 +- + drivers/media/dvb-frontends/lgdt3305.h | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.h | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 4 +- + drivers/media/dvb-frontends/lgs8gl5.c | 2 +- + drivers/media/dvb-frontends/lgs8gxx.c | 2 +- + drivers/media/dvb-frontends/lnbh25.c | 2 +- + drivers/media/dvb-frontends/lnbp21.c | 2 +- + drivers/media/dvb-frontends/lnbp22.c | 2 +- + drivers/media/dvb-frontends/m88ds3103_priv.h | 4 +- + drivers/media/dvb-frontends/m88rs2000.c | 13 +- + drivers/media/dvb-frontends/m88rs2000.h | 2 +- + drivers/media/dvb-frontends/mb86a16.c | 15 +- + drivers/media/dvb-frontends/mb86a16.h | 2 +- + drivers/media/dvb-frontends/mb86a20s.c | 4 +- + drivers/media/dvb-frontends/mn88472_priv.h | 4 +- + drivers/media/dvb-frontends/mn88473.c | 2 +- + drivers/media/dvb-frontends/mn88473_priv.h | 4 +- + drivers/media/dvb-frontends/mt312.c | 7 +- + drivers/media/dvb-frontends/mt352.c | 2 +- + drivers/media/dvb-frontends/mxl5xx.c | 11 +- + drivers/media/dvb-frontends/mxl5xx.h | 2 +- + drivers/media/dvb-frontends/nxt200x.c | 2 +- + drivers/media/dvb-frontends/nxt6000.c | 2 +- + drivers/media/dvb-frontends/or51132.c | 4 +- + drivers/media/dvb-frontends/or51211.c | 4 +- + drivers/media/dvb-frontends/rtl2830_priv.h | 4 +- + drivers/media/dvb-frontends/rtl2832_priv.h | 4 +- + drivers/media/dvb-frontends/rtl2832_sdr.h | 2 +- + drivers/media/dvb-frontends/s5h1409.c | 2 +- + drivers/media/dvb-frontends/s5h1411.c | 2 +- + drivers/media/dvb-frontends/s5h1420.c | 2 +- + drivers/media/dvb-frontends/s5h1432.c | 2 +- + drivers/media/dvb-frontends/s921.c | 2 +- + drivers/media/dvb-frontends/si2165.c | 613 +++--- + drivers/media/dvb-frontends/si2165.h | 37 +- + drivers/media/dvb-frontends/si2165_priv.h | 114 +- + drivers/media/dvb-frontends/si2168.c | 3 + + drivers/media/dvb-frontends/si2168_priv.h | 2 +- + drivers/media/dvb-frontends/si21xx.c | 2 +- + drivers/media/dvb-frontends/si21xx.h | 2 +- + drivers/media/dvb-frontends/sp2.h | 2 +- + drivers/media/dvb-frontends/sp2_priv.h | 2 +- + drivers/media/dvb-frontends/sp8870.c | 2 +- + drivers/media/dvb-frontends/sp887x.c | 2 +- + drivers/media/dvb-frontends/stb0899_algo.c | 3 +- + drivers/media/dvb-frontends/stb0899_drv.c | 15 +- + drivers/media/dvb-frontends/stb0899_drv.h | 4 +- + drivers/media/dvb-frontends/stb0899_priv.h | 4 +- + drivers/media/dvb-frontends/stb6000.h | 2 +- + drivers/media/dvb-frontends/stb6100.c | 8 +- + drivers/media/dvb-frontends/stb6100.h | 2 +- + drivers/media/dvb-frontends/stb6100_cfg.h | 2 +- + drivers/media/dvb-frontends/stb6100_proc.h | 2 +- + drivers/media/dvb-frontends/stv0288.c | 2 +- + drivers/media/dvb-frontends/stv0288.h | 2 +- + drivers/media/dvb-frontends/stv0297.c | 2 +- + drivers/media/dvb-frontends/stv0297.h | 2 +- + drivers/media/dvb-frontends/stv0299.c | 2 +- + drivers/media/dvb-frontends/stv0299.h | 2 +- + drivers/media/dvb-frontends/stv0367.c | 8 +- + drivers/media/dvb-frontends/stv0367.h | 2 +- + drivers/media/dvb-frontends/stv0900.h | 2 +- + drivers/media/dvb-frontends/stv0900_core.c | 2 +- + drivers/media/dvb-frontends/stv0900_init.h | 34 +- + drivers/media/dvb-frontends/stv0900_priv.h | 2 +- + drivers/media/dvb-frontends/stv090x.c | 43 +- + drivers/media/dvb-frontends/stv090x_priv.h | 4 +- + drivers/media/dvb-frontends/stv0910.c | 227 ++- + drivers/media/dvb-frontends/stv0910_regs.h | 1854 +++++++++--------- + drivers/media/dvb-frontends/stv6110.h | 2 +- + drivers/media/dvb-frontends/stv6110x.c | 8 +- + drivers/media/dvb-frontends/stv6110x_priv.h | 6 +- + drivers/media/dvb-frontends/stv6111.c | 46 +- + drivers/media/dvb-frontends/tc90522.c | 2 +- + drivers/media/dvb-frontends/tc90522.h | 2 +- + drivers/media/dvb-frontends/tda10021.c | 2 +- + drivers/media/dvb-frontends/tda10023.c | 4 +- + drivers/media/dvb-frontends/tda10048.c | 4 +- + drivers/media/dvb-frontends/tda1004x.c | 2 +- + drivers/media/dvb-frontends/tda10071_priv.h | 2 +- + drivers/media/dvb-frontends/tda10086.c | 2 +- + drivers/media/dvb-frontends/tda18271c2dd.c | 3 +- + drivers/media/dvb-frontends/tda18271c2dd.h | 4 +- + drivers/media/dvb-frontends/tda665x.c | 2 +- + drivers/media/dvb-frontends/tda8083.c | 2 +- + drivers/media/dvb-frontends/tda8261.c | 2 +- + drivers/media/dvb-frontends/tda826x.h | 2 +- + drivers/media/dvb-frontends/ts2020.c | 6 +- + drivers/media/dvb-frontends/tua6100.h | 2 +- + drivers/media/dvb-frontends/ves1820.c | 2 +- + drivers/media/dvb-frontends/ves1x93.c | 2 +- + drivers/media/dvb-frontends/zd1301_demod.h | 2 +- + drivers/media/dvb-frontends/zl10036.h | 2 +- + drivers/media/dvb-frontends/zl10039.c | 6 +- + drivers/media/dvb-frontends/zl10353.c | 2 +- + drivers/media/firewire/Makefile | 2 - + drivers/media/firewire/firedtv-avc.c | 6 +- + drivers/media/firewire/firedtv-ci.c | 2 +- + drivers/media/firewire/firedtv-dvb.c | 8 +- + drivers/media/firewire/firedtv-fe.c | 8 +- + drivers/media/firewire/firedtv-fw.c | 2 +- + drivers/media/firewire/firedtv.h | 12 +- + drivers/media/i2c/Kconfig | 26 +- + drivers/media/i2c/Makefile | 2 +- + drivers/media/i2c/adv7180.c | 12 +- + drivers/media/i2c/adv7343.c | 2 +- + drivers/media/i2c/adv7393.c | 2 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 1 + + drivers/media/i2c/adv748x/adv748x-core.c | 16 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 13 +- + drivers/media/i2c/adv748x/adv748x.h | 1 + + drivers/media/i2c/adv7604.c | 1 + + drivers/media/i2c/as3645a.c | 880 --------- + drivers/media/i2c/cx25840/Makefile | 2 - + drivers/media/i2c/cx25840/cx25840-core.c | 35 +- + drivers/media/i2c/cx25840/cx25840-core.h | 2 +- + drivers/media/i2c/cx25840/cx25840-ir.c | 6 +- + drivers/media/i2c/dw9714.c | 22 +- + drivers/media/i2c/imx274.c | 4 +- + drivers/media/i2c/ir-kbd-i2c.c | 540 +++++- + drivers/media/i2c/ks0127.c | 2 +- + drivers/media/i2c/mt9m111.c | 49 +- + drivers/media/i2c/mt9v011.c | 13 +- + drivers/media/i2c/mt9v032.c | 21 +- + drivers/media/i2c/ov2640.c | 4 - + drivers/media/i2c/ov2659.c | 4 - + drivers/media/i2c/ov5640.c | 326 +++- + drivers/media/i2c/ov7670.c | 90 +- + drivers/media/i2c/ov7740.c | 1214 ++++++++++++ + drivers/media/i2c/ov9650.c | 10 +- + drivers/media/i2c/saa6752hs.c | 8 +- + drivers/media/i2c/saa7115.c | 60 +- + drivers/media/i2c/saa711x_regs.h | 14 +- + drivers/media/i2c/saa7127.c | 162 +- + drivers/media/i2c/saa717x.c | 12 +- + drivers/media/i2c/smiapp/smiapp-core.c | 2 +- + drivers/media/i2c/tda7432.c | 1 - + drivers/media/i2c/ths7303.c | 2 +- + drivers/media/i2c/tvaudio.c | 4 +- + drivers/media/i2c/tvp514x.c | 4 - + drivers/media/i2c/tvp5150.c | 13 +- + drivers/media/i2c/tvp5150_reg.h | 9 +- + drivers/media/i2c/tvp7002_reg.h | 6 +- + drivers/media/i2c/vpx3220.c | 2 +- + drivers/media/mmc/siano/Makefile | 2 - + drivers/media/pci/Kconfig | 2 + + drivers/media/pci/Makefile | 3 +- + drivers/media/pci/b2c2/Makefile | 1 - + drivers/media/pci/bt8xx/Makefile | 2 - + drivers/media/pci/bt8xx/bt878.c | 7 +- + drivers/media/pci/bt8xx/bttv-cards.c | 273 +-- + drivers/media/pci/bt8xx/bttv-input.c | 8 +- + drivers/media/pci/bt8xx/bttv.h | 5 +- + drivers/media/pci/bt8xx/bttvp.h | 6 +- + drivers/media/pci/bt8xx/dst.c | 2 +- + drivers/media/pci/bt8xx/dst_ca.c | 4 +- + drivers/media/pci/bt8xx/dvb-bt8xx.c | 8 +- + drivers/media/pci/bt8xx/dvb-bt8xx.h | 4 +- + drivers/media/pci/cobalt/Kconfig | 1 + + drivers/media/pci/cx18/Makefile | 1 - + drivers/media/pci/cx18/cx18-alsa-pcm.c | 2 +- + drivers/media/pci/cx18/cx18-av-audio.c | 2 +- + drivers/media/pci/cx18/cx18-av-core.c | 18 +- + drivers/media/pci/cx18/cx18-av-core.h | 2 +- + drivers/media/pci/cx18/cx18-cards.c | 8 +- + drivers/media/pci/cx18/cx18-cards.h | 40 +- + drivers/media/pci/cx18/cx18-driver.h | 58 +- + drivers/media/pci/cx18/cx18-fileops.c | 2 +- + drivers/media/pci/cx18/cx18-firmware.c | 96 +- + drivers/media/pci/cx18/cx18-i2c.c | 13 +- + drivers/media/pci/cx18/cx18-mailbox.c | 8 +- + drivers/media/pci/cx18/cx18-streams.c | 4 +- + drivers/media/pci/cx18/cx18-vbi.c | 2 +- + drivers/media/pci/cx18/cx23418.h | 88 +- + drivers/media/pci/cx23885/Makefile | 2 - + drivers/media/pci/cx23885/altera-ci.c | 6 +- + drivers/media/pci/cx23885/cimax2.c | 4 +- + drivers/media/pci/cx23885/cimax2.h | 2 +- + drivers/media/pci/cx23885/cx23885-cards.c | 6 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 6 +- + drivers/media/pci/cx23885/cx23885-input.c | 15 +- + drivers/media/pci/cx23885/cx23885-video.c | 2 +- + drivers/media/pci/cx23885/cx23885.h | 4 +- + drivers/media/pci/cx23885/cx23888-ir.c | 6 +- + drivers/media/pci/cx25821/Makefile | 2 - + drivers/media/pci/cx25821/cx25821-alsa.c | 4 +- + drivers/media/pci/cx88/Makefile | 3 - + drivers/media/pci/cx88/cx88-blackbird.c | 3 +- + drivers/media/pci/cx88/cx88-video.c | 10 +- + drivers/media/pci/cx88/cx88.h | 4 +- + drivers/media/pci/ddbridge/Makefile | 5 +- + drivers/media/pci/ddbridge/ddbridge-ci.c | 359 ++++ + drivers/media/pci/ddbridge/ddbridge-ci.h | 31 + + drivers/media/pci/ddbridge/ddbridge-core.c | 651 ++----- + drivers/media/pci/ddbridge/ddbridge-hw.c | 8 +- + drivers/media/pci/ddbridge/ddbridge-i2c.c | 16 +- + drivers/media/pci/ddbridge/ddbridge-main.c | 23 +- + .../ddbridge/{ddbridge-maxs8.c => ddbridge-max.c} | 54 +- + .../ddbridge/{ddbridge-maxs8.h => ddbridge-max.h} | 12 +- + drivers/media/pci/ddbridge/ddbridge-regs.h | 32 +- + drivers/media/pci/ddbridge/ddbridge.h | 105 +- + drivers/media/pci/dm1105/Makefile | 2 +- + drivers/media/pci/dm1105/dm1105.c | 12 +- + drivers/media/pci/intel/Makefile | 5 + + drivers/media/pci/intel/ipu3/Kconfig | 19 + + drivers/media/pci/intel/ipu3/Makefile | 1 + + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 2048 ++++++++++++++++++++ + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 449 +++++ + drivers/media/pci/ivtv/Makefile | 2 - + drivers/media/pci/ivtv/ivtv-cards.c | 2 +- + drivers/media/pci/ivtv/ivtv-cards.h | 148 +- + drivers/media/pci/ivtv/ivtv-driver.h | 102 +- + drivers/media/pci/ivtv/ivtv-firmware.c | 36 +- + drivers/media/pci/ivtv/ivtv-i2c.c | 46 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 74 +- + drivers/media/pci/ivtv/ivtv-mailbox.c | 182 +- + drivers/media/pci/mantis/Makefile | 2 +- + drivers/media/pci/mantis/hopper_cards.c | 10 +- + drivers/media/pci/mantis/hopper_vp3028.c | 10 +- + drivers/media/pci/mantis/mantis_ca.c | 10 +- + drivers/media/pci/mantis/mantis_cards.c | 10 +- + drivers/media/pci/mantis/mantis_dma.c | 10 +- + drivers/media/pci/mantis/mantis_dvb.c | 10 +- + drivers/media/pci/mantis/mantis_evm.c | 10 +- + drivers/media/pci/mantis/mantis_hif.c | 10 +- + drivers/media/pci/mantis/mantis_i2c.c | 10 +- + drivers/media/pci/mantis/mantis_input.c | 10 +- + drivers/media/pci/mantis/mantis_ioc.c | 10 +- + drivers/media/pci/mantis/mantis_link.h | 2 +- + drivers/media/pci/mantis/mantis_pci.c | 10 +- + drivers/media/pci/mantis/mantis_pcmcia.c | 10 +- + drivers/media/pci/mantis/mantis_reg.h | 6 +- + drivers/media/pci/mantis/mantis_uart.c | 10 +- + drivers/media/pci/mantis/mantis_vp1033.c | 10 +- + drivers/media/pci/mantis/mantis_vp1034.c | 10 +- + drivers/media/pci/mantis/mantis_vp1034.h | 2 +- + drivers/media/pci/mantis/mantis_vp1041.c | 220 +-- + drivers/media/pci/mantis/mantis_vp2033.c | 10 +- + drivers/media/pci/mantis/mantis_vp2040.c | 10 +- + drivers/media/pci/mantis/mantis_vp3028.h | 2 +- + drivers/media/pci/mantis/mantis_vp3030.c | 10 +- + drivers/media/pci/meye/meye.c | 2 +- + drivers/media/pci/netup_unidvb/Makefile | 1 - + drivers/media/pci/netup_unidvb/netup_unidvb.h | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +- + drivers/media/pci/ngene/Makefile | 1 - + drivers/media/pci/ngene/ngene.h | 14 +- + drivers/media/pci/pluto2/Makefile | 2 +- + drivers/media/pci/pluto2/pluto2.c | 14 +- + drivers/media/pci/pt1/Makefile | 2 +- + drivers/media/pci/pt1/pt1.c | 29 +- + drivers/media/pci/pt1/va1j5jf8007s.c | 4 +- + drivers/media/pci/pt1/va1j5jf8007s.h | 2 +- + drivers/media/pci/pt1/va1j5jf8007t.c | 6 +- + drivers/media/pci/pt1/va1j5jf8007t.h | 2 +- + drivers/media/pci/pt3/Makefile | 1 - + drivers/media/pci/pt3/pt3.c | 8 +- + drivers/media/pci/pt3/pt3.h | 6 +- + drivers/media/pci/pt3/pt3_i2c.c | 1 - + drivers/media/pci/saa7134/Makefile | 2 - + drivers/media/pci/saa7134/saa7134-cards.c | 64 +- + drivers/media/pci/saa7134/saa7134-dvb.c | 6 +- + drivers/media/pci/saa7134/saa7134-input.c | 3 +- + drivers/media/pci/saa7134/saa7134-video.c | 6 +- + drivers/media/pci/saa7134/saa7134.h | 8 +- + drivers/media/pci/saa7146/hexium_gemini.c | 25 +- + drivers/media/pci/saa7146/hexium_orion.c | 21 +- + drivers/media/pci/saa7146/mxb.c | 29 +- + drivers/media/pci/saa7164/Makefile | 4 - + drivers/media/pci/saa7164/saa7164.h | 10 +- + drivers/media/pci/smipcie/Makefile | 1 - + drivers/media/pci/smipcie/smipcie.h | 12 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 17 +- + drivers/media/pci/solo6x10/solo6x10-gpio.c | 2 + + drivers/media/pci/ttpci/Makefile | 2 +- + drivers/media/pci/ttpci/av7110.c | 2 +- + drivers/media/pci/ttpci/av7110.h | 16 +- + drivers/media/pci/ttpci/budget-av.c | 8 +- + drivers/media/pci/ttpci/budget-ci.c | 212 +- + drivers/media/pci/ttpci/budget.h | 12 +- + drivers/media/pci/ttpci/dvb_filter.h | 2 +- + drivers/media/pci/tw5864/tw5864-video.c | 2 +- + drivers/media/pci/zoran/videocodec.c | 1 - + drivers/media/pci/zoran/zoran_driver.c | 38 +- + drivers/media/pci/zoran/zr36057.h | 4 +- + drivers/media/platform/Kconfig | 38 +- + drivers/media/platform/Makefile | 16 +- + drivers/media/platform/am437x/am437x-vpfe.c | 6 +- + drivers/media/platform/arv.c | 54 +- + drivers/media/platform/atmel/atmel-isc.c | 6 +- + drivers/media/platform/atmel/atmel-isi.c | 2 +- + drivers/media/platform/blackfin/ppi.c | 2 +- + drivers/media/platform/coda/coda-bit.c | 23 +- + drivers/media/platform/coda/coda-common.c | 13 +- + drivers/media/platform/coda/coda_regs.h | 3 +- + drivers/media/platform/coda/imx-vdoa.c | 8 +- + drivers/media/platform/davinci/dm355_ccdc.c | 4 +- + drivers/media/platform/davinci/dm355_ccdc_regs.h | 6 +- + drivers/media/platform/davinci/dm644x_ccdc.c | 6 +- + drivers/media/platform/davinci/dm644x_ccdc_regs.h | 4 +- + drivers/media/platform/davinci/isif_regs.h | 6 +- + drivers/media/platform/davinci/vpfe_capture.c | 8 +- + drivers/media/platform/davinci/vpif.h | 4 +- + drivers/media/platform/davinci/vpif_capture.c | 10 +- + drivers/media/platform/davinci/vpss.c | 10 +- + drivers/media/platform/exynos-gsc/gsc-m2m.c | 4 +- + drivers/media/platform/exynos4-is/Kconfig | 2 +- + drivers/media/platform/exynos4-is/fimc-core.c | 4 +- + drivers/media/platform/exynos4-is/fimc-core.h | 2 +- + drivers/media/platform/exynos4-is/fimc-isp.c | 14 +- + drivers/media/platform/exynos4-is/fimc-lite.c | 7 +- + drivers/media/platform/exynos4-is/fimc-lite.h | 4 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 10 +- + drivers/media/platform/exynos4-is/media-dev.c | 4 +- + drivers/media/platform/m2m-deinterlace.c | 12 +- + .../media/platform/mtk-vcodec/mtk_vcodec_util.c | 3 + + drivers/media/platform/mtk-vcodec/vdec_vpu_if.h | 2 +- + drivers/media/platform/omap/omap_vout.c | 12 +- + drivers/media/platform/omap3isp/isp.c | 2 +- + drivers/media/platform/pxa_camera.c | 35 +- + drivers/media/platform/qcom/camss-8x16/camss.c | 2 +- + drivers/media/platform/qcom/venus/core.h | 4 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 73 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 4 +- + drivers/media/platform/qcom/venus/venc.c | 48 +- + drivers/media/platform/qcom/venus/venc_ctrls.c | 59 +- + drivers/media/platform/rcar-vin/rcar-core.c | 2 +- + drivers/media/platform/rcar_drif.c | 4 +- + drivers/media/platform/s5p-jpeg/jpeg-core.c | 2 +- + drivers/media/platform/s5p-mfc/s5p_mfc.c | 6 + + drivers/media/platform/s5p-mfc/s5p_mfc_common.h | 3 + + drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c | 10 +- + drivers/media/platform/s5p-mfc/s5p_mfc_enc.c | 2 +- + drivers/media/platform/sh_vou.c | 2 +- + .../platform/soc_camera/sh_mobile_ceu_camera.c | 7 +- + drivers/media/platform/soc_camera/soc_camera.c | 2 +- + drivers/media/platform/soc_camera/soc_scale_crop.c | 4 + + drivers/media/platform/sti/bdisp/bdisp-debug.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp-filter.h | 2 +- + drivers/media/platform/sti/bdisp/bdisp-hw.c | 4 +- + drivers/media/platform/sti/bdisp/bdisp-reg.h | 2 +- + drivers/media/platform/sti/bdisp/bdisp-v4l2.c | 2 +- + drivers/media/platform/sti/bdisp/bdisp.h | 2 +- + drivers/media/platform/sti/c8sectpfe/Kconfig | 2 +- + drivers/media/platform/sti/c8sectpfe/Makefile | 5 +- + .../platform/sti/c8sectpfe/c8sectpfe-common.c | 15 +- + .../platform/sti/c8sectpfe/c8sectpfe-common.h | 13 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.c | 19 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-core.h | 5 +- + .../platform/sti/c8sectpfe/c8sectpfe-debugfs.c | 9 +- + .../platform/sti/c8sectpfe/c8sectpfe-debugfs.h | 9 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.c | 11 +- + .../media/platform/sti/c8sectpfe/c8sectpfe-dvb.h | 5 +- + drivers/media/platform/sti/cec/stih-cec.c | 5 +- + drivers/media/platform/sti/delta/delta-cfg.h | 2 +- + drivers/media/platform/sti/delta/delta-debug.c | 2 +- + drivers/media/platform/sti/delta/delta-debug.h | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.h | 2 +- + drivers/media/platform/sti/delta/delta-mem.c | 2 +- + drivers/media/platform/sti/delta/delta-mem.h | 2 +- + drivers/media/platform/sti/delta/delta-mjpeg-dec.c | 2 +- + drivers/media/platform/sti/delta/delta-mjpeg-fw.h | 2 +- + drivers/media/platform/sti/delta/delta-mjpeg-hdr.c | 2 +- + drivers/media/platform/sti/delta/delta-mjpeg.h | 2 +- + drivers/media/platform/sti/delta/delta-v4l2.c | 2 +- + drivers/media/platform/sti/delta/delta.h | 2 +- + drivers/media/platform/sti/hva/hva-debugfs.c | 2 +- + drivers/media/platform/sti/hva/hva-h264.c | 2 +- + drivers/media/platform/sti/hva/hva-hw.c | 2 +- + drivers/media/platform/sti/hva/hva-hw.h | 2 +- + drivers/media/platform/sti/hva/hva-mem.c | 2 +- + drivers/media/platform/sti/hva/hva-mem.h | 2 +- + drivers/media/platform/sti/hva/hva-v4l2.c | 2 +- + drivers/media/platform/sti/hva/hva.h | 4 +- + drivers/media/platform/stm32/stm32-dcmi.c | 2 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 5 + + drivers/media/platform/ti-vpe/cal.c | 5 +- + drivers/media/platform/via-camera.h | 2 +- + drivers/media/platform/vimc/vimc-common.h | 5 + + drivers/media/platform/vimc/vimc-sensor.c | 65 +- + drivers/media/platform/vivid/vivid-core.c | 2 +- + drivers/media/platform/vivid/vivid-core.h | 5 +- + drivers/media/platform/vivid/vivid-ctrls.c | 35 +- + drivers/media/platform/vivid/vivid-radio-rx.c | 11 +- + drivers/media/platform/vivid/vivid-radio-tx.c | 8 +- + drivers/media/platform/vivid/vivid-rds-gen.c | 2 +- + drivers/media/platform/vivid/vivid-rds-gen.h | 1 + + drivers/media/platform/vivid/vivid-vbi-gen.c | 2 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 9 +- + drivers/media/platform/vsp1/vsp1_drv.c | 16 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 18 +- + drivers/media/radio/radio-aimslab.c | 2 +- + drivers/media/radio/radio-aztech.c | 2 +- + drivers/media/radio/radio-cadet.c | 4 +- + drivers/media/radio/radio-gemtek.c | 8 +- + drivers/media/radio/radio-maxiradio.c | 2 +- + drivers/media/radio/radio-mr800.c | 24 +- + drivers/media/radio/radio-rtrack2.c | 2 +- + drivers/media/radio/radio-sf16fmi.c | 4 +- + drivers/media/radio/radio-sf16fmr2.c | 2 +- + drivers/media/radio/radio-si476x.c | 16 +- + drivers/media/radio/radio-tea5764.c | 2 +- + drivers/media/radio/radio-terratec.c | 6 +- + drivers/media/radio/si470x/radio-si470x-common.c | 24 +- + drivers/media/radio/tea575x.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.h | 10 +- + drivers/media/rc/Kconfig | 35 +- + drivers/media/rc/Makefile | 5 +- + drivers/media/rc/iguanair.c | 19 +- + drivers/media/rc/imon.c | 55 +- + drivers/media/rc/ir-jvc-decoder.c | 1 + + drivers/media/rc/ir-lirc-codec.c | 448 ----- + drivers/media/rc/ir-mce_kbd-decoder.c | 18 +- + drivers/media/rc/ir-nec-decoder.c | 20 +- + drivers/media/rc/ir-rc5-decoder.c | 44 +- + drivers/media/rc/ir-rc6-decoder.c | 32 +- + drivers/media/rc/ir-sanyo-decoder.c | 38 +- + drivers/media/rc/ir-sharp-decoder.c | 1 + + drivers/media/rc/ir-sony-decoder.c | 1 + + drivers/media/rc/ir-spi.c | 15 +- + drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 17 +- + drivers/media/rc/keymaps/rc-apac-viewcomp.c | 17 +- + drivers/media/rc/keymaps/rc-asus-pc39.c | 17 +- + drivers/media/rc/keymaps/rc-asus-ps3-100.c | 17 +- + drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-a16d.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 17 +- + drivers/media/rc/keymaps/rc-avermedia-m135a.c | 15 +- + drivers/media/rc/keymaps/rc-avermedia.c | 17 +- + drivers/media/rc/keymaps/rc-avertv-303.c | 17 +- + drivers/media/rc/keymaps/rc-behold-columbus.c | 23 +- + drivers/media/rc/keymaps/rc-behold.c | 17 +- + drivers/media/rc/keymaps/rc-budget-ci-old.c | 17 +- + drivers/media/rc/keymaps/rc-cinergy-1400.c | 17 +- + drivers/media/rc/keymaps/rc-cinergy.c | 17 +- + drivers/media/rc/keymaps/rc-dib0700-nec.c | 27 +- + drivers/media/rc/keymaps/rc-dib0700-rc5.c | 27 +- + drivers/media/rc/keymaps/rc-dm1105-nec.c | 17 +- + drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 17 +- + drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 17 +- + drivers/media/rc/keymaps/rc-em-terratec.c | 17 +- + drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 17 +- + drivers/media/rc/keymaps/rc-encore-enltv.c | 17 +- + drivers/media/rc/keymaps/rc-encore-enltv2.c | 17 +- + drivers/media/rc/keymaps/rc-evga-indtube.c | 17 +- + drivers/media/rc/keymaps/rc-eztv.c | 17 +- + drivers/media/rc/keymaps/rc-flydvb.c | 17 +- + drivers/media/rc/keymaps/rc-flyvideo.c | 17 +- + drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 17 +- + drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 17 +- + drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 17 +- + drivers/media/rc/keymaps/rc-gotview7135.c | 17 +- + drivers/media/rc/keymaps/rc-hauppauge.c | 29 +- + drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 17 +- + drivers/media/rc/keymaps/rc-kaiomy.c | 17 +- + drivers/media/rc/keymaps/rc-kworld-315u.c | 17 +- + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 17 +- + drivers/media/rc/keymaps/rc-manli.c | 17 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 17 +- + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 17 +- + drivers/media/rc/keymaps/rc-nebula.c | 17 +- + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 17 +- + drivers/media/rc/keymaps/rc-norwood.c | 17 +- + drivers/media/rc/keymaps/rc-npgtech.c | 17 +- + drivers/media/rc/keymaps/rc-pctv-sedna.c | 17 +- + drivers/media/rc/keymaps/rc-pinnacle-color.c | 17 +- + drivers/media/rc/keymaps/rc-pinnacle-grey.c | 17 +- + drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview-002t.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview-mk12.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview-new.c | 17 +- + drivers/media/rc/keymaps/rc-pixelview.c | 17 +- + .../media/rc/keymaps/rc-powercolor-real-angel.c | 17 +- + drivers/media/rc/keymaps/rc-proteus-2309.c | 17 +- + drivers/media/rc/keymaps/rc-purpletv.c | 17 +- + drivers/media/rc/keymaps/rc-pv951.c | 17 +- + .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 17 +- + drivers/media/rc/keymaps/rc-tbs-nec.c | 17 +- + drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 17 +- + drivers/media/rc/keymaps/rc-tevii-nec.c | 17 +- + drivers/media/rc/keymaps/rc-tt-1500.c | 17 +- + drivers/media/rc/keymaps/rc-videomate-s350.c | 17 +- + drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 17 +- + drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 19 +- + drivers/media/rc/keymaps/rc-winfast.c | 17 +- + drivers/media/rc/lirc_dev.c | 982 ++++++---- + drivers/media/rc/rc-core-priv.h | 72 +- + drivers/media/rc/rc-ir-raw.c | 86 +- + drivers/media/rc/rc-main.c | 248 ++- + drivers/media/rc/winbond-cir.c | 2 +- + drivers/media/tuners/Kconfig | 7 + + drivers/media/tuners/Makefile | 2 +- + drivers/media/tuners/e4000.h | 2 +- + drivers/media/tuners/fc0011.h | 2 +- + drivers/media/tuners/fc0012.h | 2 +- + drivers/media/tuners/fc0013.h | 2 +- + drivers/media/tuners/fc2580.h | 2 +- + drivers/media/tuners/it913x.h | 2 +- + drivers/media/tuners/m88rs6000t.h | 2 +- + drivers/media/tuners/max2165.c | 2 +- + drivers/media/tuners/mc44s803.c | 2 +- + drivers/media/tuners/mt2060.c | 2 +- + drivers/media/tuners/mt2063.c | 4 +- + drivers/media/tuners/mt2063.h | 2 +- + drivers/media/tuners/mt20xx.h | 2 +- + drivers/media/tuners/mt2131.c | 2 +- + drivers/media/tuners/mt2266.c | 2 +- + drivers/media/tuners/mxl301rf.h | 2 +- + drivers/media/tuners/mxl5005s.c | 25 +- + drivers/media/tuners/mxl5005s.h | 2 +- + drivers/media/tuners/mxl5007t.h | 2 +- + drivers/media/tuners/qm1d1c0042.h | 2 +- + drivers/media/tuners/qt1010.c | 4 +- + drivers/media/tuners/qt1010.h | 2 +- + drivers/media/tuners/r820t.c | 69 +- + drivers/media/tuners/r820t.h | 2 +- + drivers/media/tuners/si2157.c | 2 +- + drivers/media/tuners/si2157.h | 2 +- + drivers/media/tuners/tda18212.h | 2 +- + drivers/media/tuners/tda18218.h | 2 +- + drivers/media/tuners/tda18250.c | 902 +++++++++ + drivers/media/tuners/tda18250.h | 51 + + drivers/media/tuners/tda18250_priv.h | 145 ++ + drivers/media/tuners/tda18271.h | 2 +- + drivers/media/tuners/tda827x.h | 4 +- + drivers/media/tuners/tda8290.c | 78 +- + drivers/media/tuners/tda8290.h | 2 +- + drivers/media/tuners/tda9887.c | 4 +- + drivers/media/tuners/tda9887.h | 2 +- + drivers/media/tuners/tea5761.c | 15 +- + drivers/media/tuners/tea5761.h | 2 +- + drivers/media/tuners/tea5767.c | 21 +- + drivers/media/tuners/tea5767.h | 2 +- + drivers/media/tuners/tua9001.h | 2 +- + drivers/media/tuners/tuner-i2c.h | 2 +- + drivers/media/tuners/tuner-simple.c | 2 +- + drivers/media/tuners/tuner-simple.h | 2 +- + drivers/media/tuners/tuner-xc2028-types.h | 5 +- + drivers/media/tuners/tuner-xc2028.c | 26 +- + drivers/media/tuners/tuner-xc2028.h | 9 +- + drivers/media/tuners/xc4000.c | 7 +- + drivers/media/tuners/xc5000.c | 24 +- + drivers/media/usb/as102/Makefile | 1 - + drivers/media/usb/as102/as102_drv.c | 2 +- + drivers/media/usb/as102/as102_drv.h | 6 +- + drivers/media/usb/as102/as10x_cmd_cfg.c | 6 +- + drivers/media/usb/au0828/Makefile | 1 - + drivers/media/usb/au0828/au0828-cards.h | 2 +- + drivers/media/usb/au0828/au0828-input.c | 25 +- + drivers/media/usb/au0828/au0828-video.c | 2 +- + drivers/media/usb/au0828/au0828.h | 18 +- + drivers/media/usb/b2c2/Makefile | 1 - + drivers/media/usb/cpia2/cpia2_usb.c | 14 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 4 +- + drivers/media/usb/cx231xx/Makefile | 2 - + drivers/media/usb/cx231xx/cx231xx-audio.c | 6 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 4 +- + drivers/media/usb/cx231xx/cx231xx-cards.c | 30 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-dvb.c | 8 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-input.c | 28 +- + drivers/media/usb/cx231xx/cx231xx-pcb-cfg.h | 2 +- + drivers/media/usb/cx231xx/cx231xx-reg.h | 20 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 4 +- + drivers/media/usb/cx231xx/cx231xx.h | 1 + + drivers/media/usb/dvb-usb-v2/Makefile | 1 - + drivers/media/usb/dvb-usb-v2/anysee.h | 2 +- + drivers/media/usb/dvb-usb-v2/az6007.c | 2 +- + drivers/media/usb/dvb-usb-v2/dvb_usb.h | 10 +- + drivers/media/usb/dvb-usb-v2/dvbsky.c | 92 +- + drivers/media/usb/dvb-usb-v2/lmedm04.c | 39 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.c | 9 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-demod.h | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-tuner.h | 2 +- + drivers/media/usb/dvb-usb/Kconfig | 2 + + drivers/media/usb/dvb-usb/Makefile | 1 - + drivers/media/usb/dvb-usb/az6027.c | 218 +-- + drivers/media/usb/dvb-usb/cxusb.c | 10 +- + drivers/media/usb/dvb-usb/dib0700.h | 2 + + drivers/media/usb/dvb-usb/dib0700_core.c | 26 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 110 +- + drivers/media/usb/dvb-usb/dvb-usb.h | 10 +- + drivers/media/usb/dvb-usb/dw2102.c | 2 +- + drivers/media/usb/dvb-usb/friio-fe.c | 5 +- + drivers/media/usb/dvb-usb/pctv452e.c | 10 +- + drivers/media/usb/dvb-usb/ttusb2.c | 2 +- + drivers/media/usb/em28xx/Kconfig | 14 +- + drivers/media/usb/em28xx/Makefile | 2 - + drivers/media/usb/em28xx/em28xx-cards.c | 1 - + drivers/media/usb/em28xx/em28xx-dvb.c | 9 +- + drivers/media/usb/gspca/autogain_functions.c | 28 +- + drivers/media/usb/gspca/benq.c | 8 +- + drivers/media/usb/gspca/conex.c | 13 +- + drivers/media/usb/gspca/cpia1.c | 76 +- + drivers/media/usb/gspca/dtcs033.c | 28 +- + drivers/media/usb/gspca/etoms.c | 38 +- + drivers/media/usb/gspca/finepix.c | 4 +- + drivers/media/usb/gspca/gl860/gl860.c | 37 +- + drivers/media/usb/gspca/gspca.c | 153 +- + drivers/media/usb/gspca/gspca.h | 9 +- + drivers/media/usb/gspca/jeilinj.c | 19 +- + drivers/media/usb/gspca/jl2005bcd.c | 45 +- + drivers/media/usb/gspca/kinect.c | 11 +- + drivers/media/usb/gspca/konica.c | 28 +- + drivers/media/usb/gspca/m5602/m5602_core.c | 34 +- + drivers/media/usb/gspca/m5602/m5602_mt9m111.c | 21 +- + drivers/media/usb/gspca/m5602/m5602_ov7660.c | 11 +- + drivers/media/usb/gspca/m5602/m5602_ov9650.c | 26 +- + drivers/media/usb/gspca/m5602/m5602_po1030.c | 27 +- + drivers/media/usb/gspca/m5602/m5602_s5k4aa.c | 16 +- + drivers/media/usb/gspca/m5602/m5602_s5k83a.c | 2 +- + drivers/media/usb/gspca/mars.c | 4 +- + drivers/media/usb/gspca/mr97310a.c | 29 +- + drivers/media/usb/gspca/nw80x.c | 24 +- + drivers/media/usb/gspca/ov519.c | 155 +- + drivers/media/usb/gspca/ov534.c | 25 +- + drivers/media/usb/gspca/ov534_9.c | 23 +- + drivers/media/usb/gspca/pac207.c | 16 +- + drivers/media/usb/gspca/pac7302.c | 2 +- + drivers/media/usb/gspca/pac7311.c | 2 +- + drivers/media/usb/gspca/pac_common.h | 7 +- + drivers/media/usb/gspca/sn9c2028.c | 34 +- + drivers/media/usb/gspca/sn9c2028.h | 7 +- + drivers/media/usb/gspca/sn9c20x.c | 2 +- + drivers/media/usb/gspca/sonixj.c | 58 +- + drivers/media/usb/gspca/spca1528.c | 17 +- + drivers/media/usb/gspca/spca500.c | 66 +- + drivers/media/usb/gspca/spca501.c | 10 +- + drivers/media/usb/gspca/spca505.c | 6 +- + drivers/media/usb/gspca/spca506.c | 16 +- + drivers/media/usb/gspca/spca508.c | 20 +- + drivers/media/usb/gspca/spca561.c | 20 +- + drivers/media/usb/gspca/sq905.c | 16 +- + drivers/media/usb/gspca/sq905c.c | 37 +- + drivers/media/usb/gspca/sq930x.c | 29 +- + drivers/media/usb/gspca/stk014.c | 6 +- + drivers/media/usb/gspca/stk1135.c | 15 +- + drivers/media/usb/gspca/stv0680.c | 36 +- + drivers/media/usb/gspca/stv06xx/stv06xx.c | 76 +- + drivers/media/usb/gspca/stv06xx/stv06xx.h | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx_hdcs.c | 10 +- + drivers/media/usb/gspca/stv06xx/stv06xx_pb0100.c | 23 +- + drivers/media/usb/gspca/stv06xx/stv06xx_st6422.c | 2 +- + drivers/media/usb/gspca/stv06xx/stv06xx_vv6410.c | 16 +- + drivers/media/usb/gspca/sunplus.c | 36 +- + drivers/media/usb/gspca/t613.c | 24 +- + drivers/media/usb/gspca/topro.c | 6 +- + drivers/media/usb/gspca/touptek.c | 89 +- + drivers/media/usb/gspca/vc032x.c | 51 +- + drivers/media/usb/gspca/w996Xcf.c | 9 +- + drivers/media/usb/gspca/xirlink_cit.c | 32 +- + drivers/media/usb/gspca/zc3xx.c | 83 +- + drivers/media/usb/hdpvr/Makefile | 4 - + drivers/media/usb/hdpvr/hdpvr-core.c | 37 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 23 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 26 +- + drivers/media/usb/hdpvr/hdpvr.h | 19 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 4 +- + drivers/media/usb/pvrusb2/Makefile | 2 - + drivers/media/usb/pvrusb2/pvrusb2-devattr.c | 12 +- + drivers/media/usb/pvrusb2/pvrusb2-dvb.c | 2 +- + drivers/media/usb/pvrusb2/pvrusb2-dvb.h | 8 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 15 +- + drivers/media/usb/pvrusb2/pvrusb2-i2c-core.c | 13 +- + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 34 +- + drivers/media/usb/pwc/pwc.h | 6 +- + drivers/media/usb/s2255/s2255drv.c | 13 +- + drivers/media/usb/siano/Makefile | 1 - + drivers/media/usb/siano/smsusb.c | 2 +- + drivers/media/usb/stk1160/Makefile | 4 +- + drivers/media/usb/stkwebcam/stk-sensor.c | 44 +- + drivers/media/usb/stkwebcam/stk-webcam.c | 2 +- + drivers/media/usb/tm6000/Makefile | 2 - + drivers/media/usb/tm6000/tm6000-alsa.c | 18 +- + drivers/media/usb/tm6000/tm6000-cards.c | 21 +- + drivers/media/usb/tm6000/tm6000-core.c | 24 +- + drivers/media/usb/tm6000/tm6000-i2c.c | 24 +- + drivers/media/usb/tm6000/tm6000-regs.h | 14 +- + drivers/media/usb/tm6000/tm6000-stds.c | 18 +- + drivers/media/usb/tm6000/tm6000-usb-isoc.h | 14 +- + drivers/media/usb/tm6000/tm6000-video.c | 26 +- + drivers/media/usb/tm6000/tm6000.h | 24 +- + drivers/media/usb/ttusb-budget/Makefile | 2 +- + drivers/media/usb/ttusb-budget/dvb-ttusb-budget.c | 8 +- + drivers/media/usb/ttusb-dec/Makefile | 2 - + drivers/media/usb/ttusb-dec/ttusb_dec.c | 8 +- + drivers/media/usb/ttusb-dec/ttusbdecfe.c | 2 +- + drivers/media/usb/usbtv/Kconfig | 16 +- + drivers/media/usb/usbvision/Makefile | 1 - + drivers/media/usb/usbvision/usbvision-video.c | 3 +- + drivers/media/usb/uvc/Makefile | 2 +- + drivers/media/usb/uvc/uvc_driver.c | 243 ++- + drivers/media/usb/uvc/uvc_isight.c | 12 +- + drivers/media/usb/uvc/uvc_metadata.c | 179 ++ + drivers/media/usb/uvc/uvc_queue.c | 44 +- + drivers/media/usb/uvc/uvc_status.c | 5 +- + drivers/media/usb/uvc/uvc_v4l2.c | 4 - + drivers/media/usb/uvc/uvc_video.c | 187 +- + drivers/media/usb/uvc/uvcvideo.h | 35 +- + drivers/media/v4l2-core/Kconfig | 36 +- + drivers/media/v4l2-core/Makefile | 8 - + drivers/media/v4l2-core/v4l2-async.c | 16 +- + drivers/media/v4l2-core/v4l2-common.c | 27 +- + drivers/media/v4l2-core/v4l2-compat-ioctl32.c | 1040 ++++++---- + drivers/media/v4l2-core/v4l2-dev.c | 10 +- + drivers/media/v4l2-core/v4l2-dv-timings.c | 2 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 10 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 212 +- + drivers/media/v4l2-core/v4l2-mc.c | 2 - + drivers/staging/media/Kconfig | 17 +- + drivers/staging/media/Makefile | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 10 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 8 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 38 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 8 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 10 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 17 +- + drivers/staging/media/atomisp/i2c/ov2680.h | 1 - + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 94 +- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 2 +- + drivers/staging/media/atomisp/i2c/ov8858.c | 43 +- + .../staging/media/atomisp/include/linux/atomisp.h | 2 + + .../atomisp/include/linux/atomisp_gmin_platform.h | 1 - + .../media/atomisp/pci/atomisp2/atomisp_drvfs.c | 17 +- + .../media/atomisp/pci/atomisp2/atomisp_drvfs.h | 5 +- + .../media/atomisp/pci/atomisp2/atomisp_internal.h | 1 - + .../media/atomisp/pci/atomisp2/atomisp_ioctl.c | 5 +- + .../media/atomisp/pci/atomisp2/atomisp_subdev.c | 2 + + .../media/atomisp/pci/atomisp2/atomisp_v4l2.c | 12 +- + .../isp/kernels/eed1_8/ia_css_eed1_8.host.c | 24 +- + .../css2400/runtime/debug/src/ia_css_debug.c | 1 + + .../isp_param/interface/ia_css_isp_param_types.h | 2 +- + .../staging/media/atomisp/pci/atomisp2/hmm/hmm.c | 8 +- + .../platform/intel-mid/atomisp_gmin_platform.c | 129 +- + drivers/staging/media/cxd2099/Makefile | 1 - + drivers/staging/media/cxd2099/cxd2099.c | 30 +- + drivers/staging/media/cxd2099/cxd2099.h | 16 +- + drivers/staging/media/davinci_vpfe/TODO | 10 +- + drivers/staging/media/imx/TODO | 63 +- + drivers/staging/media/imx/imx-ic-prp.c | 4 +- + drivers/staging/media/imx/imx-media-capture.c | 8 +- + drivers/staging/media/imx/imx-media-csi.c | 189 +- + drivers/staging/media/imx/imx-media-dev.c | 400 ++-- + drivers/staging/media/imx/imx-media-internal-sd.c | 253 +-- + drivers/staging/media/imx/imx-media-of.c | 278 ++- + drivers/staging/media/imx/imx-media-utils.c | 122 +- + drivers/staging/media/imx/imx-media.h | 189 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 4 +- + drivers/staging/media/lirc/Kconfig | 21 - + drivers/staging/media/lirc/Makefile | 6 - + drivers/staging/media/lirc/TODO | 36 - + drivers/staging/media/lirc/lirc_zilog.c | 1653 ---------------- + drivers/staging/media/omap4iss/iss.c | 2 +- + drivers/staging/media/tegra-vde/Kconfig | 8 + + drivers/staging/media/tegra-vde/Makefile | 1 + + drivers/staging/media/tegra-vde/TODO | 4 + + drivers/staging/media/tegra-vde/tegra-vde.c | 1213 ++++++++++++ + drivers/staging/media/tegra-vde/uapi.h | 78 + + fs/compat_ioctl.c | 22 +- + include/linux/kfifo.h | 3 +- + include/linux/led-class-flash.h | 4 + + include/media/cec.h | 18 +- + {drivers/media/dvb-core => include/media}/demux.h | 0 + {drivers/media/dvb-core => include/media}/dmxdev.h | 43 +- + include/media/drv-intf/cx2341x.h | 144 +- + include/media/drv-intf/exynos-fimc.h | 3 +- + include/media/drv-intf/msp3400.h | 62 +- + include/media/drv-intf/saa7146.h | 2 +- + .../media/dvb-core => include/media}/dvb-usb-ids.h | 3 + + .../dvb-core => include/media}/dvb_ca_en50221.h | 2 +- + .../media/dvb-core => include/media}/dvb_demux.h | 25 +- + .../dvb-core => include/media}/dvb_frontend.h | 19 +- + .../media/dvb-core => include/media}/dvb_math.h | 0 + .../media/dvb-core => include/media}/dvb_net.h | 2 +- + .../dvb-core => include/media}/dvb_ringbuffer.h | 0 + include/media/dvb_vb2.h | 266 +++ + {drivers/media/dvb-core => include/media}/dvbdev.h | 4 +- + include/media/i2c-addr.h | 43 - + include/media/i2c/as3645a.h | 66 - + include/media/i2c/bt819.h | 4 +- + include/media/i2c/ir-kbd-i2c.h | 6 +- + include/media/i2c/m52790.h | 52 +- + include/media/i2c/saa7115.h | 12 +- + include/media/i2c/tvaudio.h | 17 +- + include/media/i2c/upd64031a.h | 6 +- + include/media/lirc.h | 1 - + include/media/lirc_dev.h | 192 -- + include/media/media-entity.h | 11 +- + include/media/rc-core.h | 69 +- + include/media/rc-map.h | 54 +- + include/media/{ => tpg}/v4l2-tpg.h | 45 +- + include/media/tuner-types.h | 15 + + include/media/v4l2-async.h | 39 +- + include/media/v4l2-common.h | 145 +- + include/media/v4l2-ctrls.h | 11 +- + include/media/v4l2-dev.h | 140 +- + include/media/v4l2-device.h | 246 ++- + include/media/v4l2-dv-timings.h | 16 +- + include/media/v4l2-event.h | 36 +- + include/media/v4l2-flash-led-class.h | 12 + + include/media/v4l2-fwnode.h | 12 +- + include/media/v4l2-mediabus.h | 80 +- + include/media/v4l2-subdev.h | 150 +- + include/media/v4l2-tpg-colors.h | 68 - + include/media/videobuf-dvb.h | 10 +- + include/media/videobuf2-core.h | 519 +++-- + include/media/videobuf2-dvb.h | 11 +- + include/media/videobuf2-memops.h | 8 +- + include/media/videobuf2-v4l2.h | 112 +- + include/uapi/linux/dvb/dmx.h | 63 +- + include/uapi/linux/dvb/frontend.h | 40 +- + include/uapi/linux/dvb/version.h | 2 +- + include/uapi/linux/dvb/video.h | 20 +- + include/uapi/linux/lirc.h | 82 + + include/uapi/linux/uvcvideo.h | 26 + + include/uapi/linux/v4l2-controls.h | 96 +- + include/uapi/linux/videodev2.h | 63 +- + 953 files changed, 21724 insertions(+), 14035 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ov7740.txt + create mode 100644 Documentation/devicetree/bindings/media/nvidia,tegra-vde.txt + create mode 100644 Documentation/media/uapi/dvb/dmx-expbuf.rst + create mode 100644 Documentation/media/uapi/dvb/dmx-mmap.rst + create mode 100644 Documentation/media/uapi/dvb/dmx-munmap.rst + create mode 100644 Documentation/media/uapi/dvb/dmx-qbuf.rst + create mode 100644 Documentation/media/uapi/dvb/dmx-querybuf.rst + create mode 100644 Documentation/media/uapi/dvb/dmx-reqbufs.rst + delete mode 100644 Documentation/media/uapi/rc/lirc-get-length.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-meta-uvc.rst + create mode 100644 Documentation/media/uapi/v4l/pixfmt-srggb10-ipu3.rst + create mode 100644 drivers/media/common/videobuf2/Kconfig + create mode 100644 drivers/media/common/videobuf2/Makefile + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-core.c (97%) + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-dma-contig.c (99%) + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-dma-sg.c (99%) + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-dvb.c (100%) + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-memops.c (100%) + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-v4l2.c (99%) + rename drivers/media/{v4l2-core => common/videobuf2}/videobuf2-vmalloc.c (100%) + create mode 100644 drivers/media/dvb-core/dvb_vb2.c + delete mode 100644 drivers/media/i2c/as3645a.c + create mode 100644 drivers/media/i2c/ov7740.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-ci.c + create mode 100644 drivers/media/pci/ddbridge/ddbridge-ci.h + rename drivers/media/pci/ddbridge/{ddbridge-maxs8.c => ddbridge-max.c} (92%) + rename drivers/media/pci/ddbridge/{ddbridge-maxs8.h => ddbridge-max.h} (73%) + create mode 100644 drivers/media/pci/intel/Makefile + create mode 100644 drivers/media/pci/intel/ipu3/Kconfig + create mode 100644 drivers/media/pci/intel/ipu3/Makefile + create mode 100644 drivers/media/pci/intel/ipu3/ipu3-cio2.c + create mode 100644 drivers/media/pci/intel/ipu3/ipu3-cio2.h + delete mode 100644 drivers/media/rc/ir-lirc-codec.c + create mode 100644 drivers/media/tuners/tda18250.c + create mode 100644 drivers/media/tuners/tda18250.h + create mode 100644 drivers/media/tuners/tda18250_priv.h + create mode 100644 drivers/media/usb/uvc/uvc_metadata.c + delete mode 100644 drivers/staging/media/lirc/Kconfig + delete mode 100644 drivers/staging/media/lirc/Makefile + delete mode 100644 drivers/staging/media/lirc/TODO + delete mode 100644 drivers/staging/media/lirc/lirc_zilog.c + create mode 100644 drivers/staging/media/tegra-vde/Kconfig + create mode 100644 drivers/staging/media/tegra-vde/Makefile + create mode 100644 drivers/staging/media/tegra-vde/TODO + create mode 100644 drivers/staging/media/tegra-vde/tegra-vde.c + create mode 100644 drivers/staging/media/tegra-vde/uapi.h + rename {drivers/media/dvb-core => include/media}/demux.h (100%) + rename {drivers/media/dvb-core => include/media}/dmxdev.h (82%) + rename {drivers/media/dvb-core => include/media}/dvb-usb-ids.h (99%) + rename {drivers/media/dvb-core => include/media}/dvb_ca_en50221.h (99%) + rename {drivers/media/dvb-core => include/media}/dvb_demux.h (94%) + rename {drivers/media/dvb-core => include/media}/dvb_frontend.h (98%) + rename {drivers/media/dvb-core => include/media}/dvb_math.h (100%) + rename {drivers/media/dvb-core => include/media}/dvb_net.h (98%) + rename {drivers/media/dvb-core => include/media}/dvb_ringbuffer.h (100%) + create mode 100644 include/media/dvb_vb2.h + rename {drivers/media/dvb-core => include/media}/dvbdev.h (99%) + delete mode 100644 include/media/i2c-addr.h + delete mode 100644 include/media/i2c/as3645a.h + delete mode 100644 include/media/lirc.h + delete mode 100644 include/media/lirc_dev.h + rename include/media/{ => tpg}/v4l2-tpg.h (93%) + delete mode 100644 include/media/v4l2-tpg-colors.h +$ git am -3 ../patches/0001-media-videobuf2-fix-up-for-media-annotate-poll-insta.patch +Applying: media: videobuf2: fix up for "media: annotate ->poll() instances" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/dvb-core/dvb_vb2.c +M include/media/dvb_vb2.h +$ git add -A . +$ git commit -v -a --amend +[master 698cbaed877f9a4a5892d3734945c60ac467dee9] Merge remote-tracking branch 'v4l-dvb/master' + Date: Mon Feb 5 10:54:55 2018 +1100 +Merging v4l-dvb-next/master (a1dfb4c48cc1 media: v4l2-compat-ioctl32.c: refactor compat ioctl32 logic) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (5865889fe431 video: udlfb: Switch from the pr_*() to the dev_*() logging functions) +$ git merge fbdev/fbdev-for-next +Auto-merging include/linux/fb.h +Auto-merging drivers/video/fbdev/auo_k190x.c +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'recursive' strategy. + drivers/video/console/dummycon.c | 1 - + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 8 +- + drivers/video/fbdev/aty/radeon_base.c | 18 +- + drivers/video/fbdev/au1200fb.h | 286 ----------- + drivers/video/fbdev/auo_k190x.c | 3 +- + drivers/video/fbdev/mmp/core.c | 5 + + drivers/video/fbdev/mxsfb.c | 45 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 39 +- + drivers/video/fbdev/omap2/omapfb/dss/dss.c | 45 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 5 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi_phy.c | 31 +- + drivers/video/fbdev/pxa3xx-gcu.c | 16 +- + drivers/video/fbdev/smscufx.c | 5 +- + drivers/video/fbdev/udlfb.c | 655 ++++++++++++------------ + drivers/video/fbdev/vfb.c | 17 + + drivers/video/fbdev/vga16fb.c | 1 - + drivers/video/fbdev/vt8500lcdfb.c | 4 +- + drivers/video/fbdev/wm8505fb.c | 4 +- + include/linux/fb.h | 5 +- + include/video/udlfb.h | 3 +- + 21 files changed, 421 insertions(+), 777 deletions(-) +Merging pm/linux-next (1c7385dbf8c5 Merge tag 'pnp-4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm) +$ git merge pm/linux-next +Already up to date. +Merging cpupower/cpupower (0e96a0c83f08 cpupower: Remove FSF address) +$ git merge cpupower/cpupower +Already up to date. +Merging idle/next (8a5776a5f498 Linux 4.14-rc4) +$ git merge idle/next +Already up to date. +Merging opp/opp/linux-next (e856f078bcf1 OPP: Introduce "required-opp" property) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (134f4010799a Merge branches 'thermal-core', 'thermal-intel' and 'thermal-soc' into next) +$ git merge thermal/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/thermal/armada-thermal.txt | 37 ++- + .../devicetree/bindings/thermal/rcar-thermal.txt | 1 + + drivers/thermal/Kconfig | 4 +- + drivers/thermal/armada_thermal.c | 253 +++++++++++++++------ + drivers/thermal/hisi_thermal.c | 2 +- + drivers/thermal/imx_thermal.c | 74 +++--- + drivers/thermal/int340x_thermal/int3400_thermal.c | 12 +- + drivers/thermal/mtk_thermal.c | 9 +- + drivers/thermal/of-thermal.c | 1 - + drivers/thermal/power_allocator.c | 2 + + drivers/thermal/tegra/soctherm.c | 103 ++++----- + drivers/thermal/thermal_hwmon.c | 20 +- + drivers/thermal/x86_pkg_temp_thermal.c | 4 +- + 13 files changed, 312 insertions(+), 210 deletions(-) +Merging thermal-soc/next (d0ecbbbe518e thermal/drivers/hisi: Remove bogus const from function return type) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (188775181bc0 firewire-ohci: work around oversized DMA reads on JMicron controllers) +$ git merge ieee1394/for-next +Already up to date. +Merging dlm/next (9250e523592a dlm: remove dlm_send_rcom_lookup_dump) +$ git merge dlm/next +Already up to date. +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 (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge net-next/master +Already up to date. +Merging bpf-next/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (255442c93843 Merge tag 'docs-4.16' of git://git.lwn.net/linux) +$ git merge ipsec-next/master +Already up to date. +Merging netfilter-next/master (c746fc0e8b2d cxgb4: add geneve offload support for T6) +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (4d63adfe12dd NFC: Add NFC_CMD_DEACTIVATE_TARGET support) +$ git merge nfc-next/master +Already up to date. +Merging ipvs-next/master (a910d20aa007 netfilter: ipvs: Fix space before '[' error.) +$ git merge ipvs-next/master +Auto-merging net/netfilter/ipvs/ip_vs_proto_tcp.c +Merge made by the 'recursive' strategy. + net/netfilter/ipvs/ip_vs_proto_tcp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging wireless-drivers-next/master (cbbde7e8d985 mt76: do not set status->aggr for NULL data frames) +$ git merge wireless-drivers-next/master +Merge made by the 'recursive' strategy. + drivers/net/wireless/mediatek/mt76/agg-rx.c | 40 +++++++++++++++++- + drivers/net/wireless/mediatek/mt76/mac80211.c | 52 +++++++++++++++++++++++- + drivers/net/wireless/mediatek/mt76/mt76.h | 10 +++++ + drivers/net/wireless/mediatek/mt76/mt76x2.h | 2 + + drivers/net/wireless/mediatek/mt76/mt76x2_init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76x2_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x2_main.c | 28 ++++++------- + 7 files changed, 117 insertions(+), 18 deletions(-) +Merging bluetooth/master (617aebe6a97e Merge tag 'usercopy-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (ff84e7bfe176 mac80211: Add support to notify ht/vht opmode modification.) +$ git merge mac80211-next/master +Auto-merging net/wireless/nl80211.c +Merge made by the 'recursive' strategy. + drivers/net/wireless/mac80211_hwsim.c | 81 +++++++++++++---- + drivers/net/wireless/mac80211_hwsim.h | 9 +- + include/net/cfg80211.h | 97 +++++++++++++++++++- + include/uapi/linux/nl80211.h | 87 +++++++++++++++++- + net/mac80211/debugfs_sta.c | 10 +- + net/mac80211/rx.c | 14 +++ + net/mac80211/vht.c | 9 ++ + net/wireless/nl80211.c | 167 +++++++++++++++++++++++++++++++++- + net/wireless/rdev-ops.h | 15 +++ + net/wireless/trace.h | 23 +++++ + 10 files changed, 482 insertions(+), 30 deletions(-) +Merging rdma/for-next (e9d1e389273a IB/uverbs: Use the standard kConfig format for experimental) +$ git merge rdma/for-next +Auto-merging drivers/infiniband/hw/qib/qib_ud.c +Auto-merging drivers/infiniband/hw/qib/qib_uc.c +Auto-merging drivers/infiniband/hw/qib/qib_rc.c +Auto-merging drivers/infiniband/hw/hfi1/ud.c +Auto-merging drivers/infiniband/hw/hfi1/uc.c +Auto-merging drivers/infiniband/hw/hfi1/sdma.c +Auto-merging drivers/infiniband/hw/hfi1/ruc.c +Auto-merging drivers/infiniband/hw/hfi1/rc.c +Auto-merging drivers/infiniband/hw/hfi1/file_ops.c +Auto-merging drivers/infiniband/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/infiniband/user_verbs.txt | 2 +- + MAINTAINERS | 2 +- + drivers/infiniband/Kconfig | 7 +- + drivers/infiniband/core/nldev.c | 4 +- + drivers/infiniband/core/uverbs_std_types.c | 2 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 7 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 18 ++-- + drivers/infiniband/hw/hfi1/chip.c | 82 +++++++++++++++--- + drivers/infiniband/hw/hfi1/chip.h | 4 +- + drivers/infiniband/hw/hfi1/debugfs.c | 9 +- + drivers/infiniband/hw/hfi1/driver.c | 51 ++++++----- + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/hfi1/hfi.h | 26 +++--- + drivers/infiniband/hw/hfi1/init.c | 31 +++++-- + drivers/infiniband/hw/hfi1/iowait.h | 9 ++ + drivers/infiniband/hw/hfi1/mad.c | 127 +++++++++++++++++++++++++--- + drivers/infiniband/hw/hfi1/mad.h | 47 +++++++++- + drivers/infiniband/hw/hfi1/pcie.c | 23 ++--- + drivers/infiniband/hw/hfi1/pio.c | 15 ++-- + drivers/infiniband/hw/hfi1/qp.c | 4 +- + drivers/infiniband/hw/hfi1/qp.h | 13 +++ + drivers/infiniband/hw/hfi1/rc.c | 51 ++++++----- + drivers/infiniband/hw/hfi1/ruc.c | 47 ++++------ + drivers/infiniband/hw/hfi1/sdma.c | 16 ++-- + drivers/infiniband/hw/hfi1/sdma.h | 1 + + drivers/infiniband/hw/hfi1/trace.c | 8 +- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 16 ++-- + drivers/infiniband/hw/hfi1/trace_rx.h | 30 +++---- + drivers/infiniband/hw/hfi1/uc.c | 9 +- + drivers/infiniband/hw/hfi1/ud.c | 39 ++++----- + drivers/infiniband/hw/hfi1/verbs.c | 10 +-- + drivers/infiniband/hw/hfi1/verbs.h | 24 +++--- + drivers/infiniband/hw/hfi1/verbs_txreq.h | 7 ++ + drivers/infiniband/hw/hns/hns_roce_device.h | 8 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 1 - + drivers/infiniband/hw/qib/qib_rc.c | 3 +- + drivers/infiniband/hw/qib/qib_uc.c | 3 +- + drivers/infiniband/hw/qib/qib_ud.c | 3 +- + drivers/infiniband/sw/rxe/rxe_av.c | 14 +-- + drivers/infiniband/sw/rxe/rxe_loc.h | 10 +-- + drivers/infiniband/sw/rxe/rxe_qp.c | 15 ++-- + drivers/infiniband/sw/rxe/rxe_verbs.c | 10 +-- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 + + include/rdma/ib_hdrs.h | 19 +++-- + include/rdma/ib_verbs.h | 20 +++-- + include/uapi/rdma/rdma_netlink.h | 14 ++- + 48 files changed, 554 insertions(+), 322 deletions(-) +Merging gfs2/for-next (7ac07fdaf840 gfs2: Glock dump performance regression fix) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/master (fee4380f368e mtd: nand: pxa3xx: Fix READOOB implementation) +$ git merge mtd/master +Already up to date. +Merging l2-mtd/mtd/next (571cb17b23ec Merge tag 'nand/for-4.16' of git://git.infradead.org/linux-mtd into mtd/next) +$ git merge l2-mtd/mtd/next +Already up to date. +Merging nand/nand/next (f4c6cd1a7f22 mtd: nand: sunxi: Fix ECC strength choice) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (23bae78e8a57 mtd: mtk-nor: modify functions' name more generally) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (2d55807b7f7b crypto: picoxcell - Fix error handling in spacc_probe()) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (24b8ef699e82 drm/ast: Load lut in crtc_commit) +$ git merge drm/drm-next +Already up to date. +Merging drm-panel/drm/panel/for-next (e4bac408b084 drm/panel: simple: Add support for Winstar WF35LTIACD) +$ git merge drm-panel/drm/panel/for-next +Already up to date. +Merging drm-intel/for-linux-next (751b01cb07eb drm/i915/ppgtt: Pin page directories before allocation) +$ git merge drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/gvt/kvmgt.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/dmabuf.c | 1 - + drivers/gpu/drm/i915/gvt/gtt.c | 24 +++++-- + drivers/gpu/drm/i915/gvt/handlers.c | 3 + + drivers/gpu/drm/i915/gvt/hypercall.h | 1 + + drivers/gpu/drm/i915/gvt/kvmgt.c | 16 +++++ + drivers/gpu/drm/i915/gvt/mmio_context.c | 10 +-- + drivers/gpu/drm/i915/gvt/mpt.h | 17 +++++ + drivers/gpu/drm/i915/gvt/sched_policy.c | 7 ++ + drivers/gpu/drm/i915/gvt/vgpu.c | 2 + + drivers/gpu/drm/i915/i915_drv.c | 2 + + drivers/gpu/drm/i915/i915_gem.c | 9 +-- + drivers/gpu/drm/i915/i915_gem_gtt.c | 61 +++++++++++++---- + drivers/gpu/drm/i915/i915_gem_request.c | 2 + + drivers/gpu/drm/i915/i915_gem_shrinker.c | 4 +- + drivers/gpu/drm/i915/i915_pci.c | 94 +++++++++++++-------------- + drivers/gpu/drm/i915/i915_reg.h | 2 + + drivers/gpu/drm/i915/intel_audio.c | 2 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 11 ---- + drivers/gpu/drm/i915/intel_display.c | 6 +- + drivers/gpu/drm/i915/intel_dp_link_training.c | 26 +++++--- + drivers/gpu/drm/i915/intel_engine_cs.c | 16 ++++- + drivers/gpu/drm/i915/intel_guc_fw.c | 9 --- + drivers/gpu/drm/i915/intel_hangcheck.c | 7 +- + drivers/gpu/drm/i915/intel_hdmi.c | 14 +++- + drivers/gpu/drm/i915/intel_huc.c | 11 ---- + drivers/gpu/drm/i915/intel_uc.c | 2 - + 26 files changed, 226 insertions(+), 133 deletions(-) +Merging drm-tegra/drm/tegra/for-next (8f62142e490d drm/tegra: dc: Properly cleanup overlay planes) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (761e05a702f5 drm: Check for lessee in DROP_MASTER ioctl) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (51f55992d13b drm/msm/adreno: Use generic function to load firmware to a buffer object) +$ git merge drm-msm/msm-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/display/msm/dsi.txt | 26 +- + drivers/gpu/drm/msm/Kconfig | 20 + + drivers/gpu/drm/msm/Makefile | 4 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 8 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 185 +++++ + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 99 ++- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 4 + + drivers/gpu/drm/msm/adreno/a5xx_power.c | 26 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 50 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 52 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 14 +- + drivers/gpu/drm/msm/dsi/dsi.c | 22 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/dsi/dsi.xml.h | 187 ++++- + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 19 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 38 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 10 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 251 +++++++ + drivers/gpu/drm/msm/dsi/pll/dsi_pll.c | 5 +- + drivers/gpu/drm/msm/dsi/pll/dsi_pll.h | 9 + + drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c | 822 +++++++++++++++++++++ + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c | 6 +- + drivers/gpu/drm/msm/mdp/mdp4/mdp4_kms.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c | 2 +- + drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c | 2 +- + drivers/gpu/drm/msm/msm_debugfs.c | 5 +- + drivers/gpu/drm/msm/msm_drv.c | 8 +- + drivers/gpu/drm/msm/msm_fb.c | 6 +- + drivers/gpu/drm/msm/msm_gem.c | 12 +- + drivers/gpu/drm/msm/msm_gem.h | 1 + + drivers/gpu/drm/msm/msm_gem_submit.c | 9 + + drivers/gpu/drm/msm/msm_gem_vma.c | 4 +- + drivers/gpu/drm/msm/msm_gpu.c | 12 +- + drivers/gpu/drm/msm/msm_gpu.h | 2 + + drivers/gpu/drm/msm/msm_ringbuffer.c | 2 +- + include/uapi/drm/msm_drm.h | 2 + + 41 files changed, 1791 insertions(+), 154 deletions(-) + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_debugfs.c + create mode 100644 drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c + create mode 100644 drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c +Merging hdlcd/for-upstream/hdlcd (f73e8b825315 drm/arm: Replace instances of drm_dev_unref with drm_dev_put.) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (54243016ae35 drm: mali-dp: Disable planes when their CRTC gets disabled.) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging sunxi-drm/sunxi-drm/for-next (7dafb83edd32 Merge branches 'sunxi/drm-fixes-for-4.13' and 'sunxi/drm-for-4.14' into sunxi-drm/for-next) +$ git merge sunxi-drm/sunxi-drm/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging imx-drm/imx-drm/next (4cfea3c1f271 gpu: ipu-v3: allow to build with COMPILE_TEST) +$ git merge imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (a181196c86e1 drm/etnaviv: remove the need for a gpu-subsystem DT node) +$ git merge etnaviv/etnaviv/next +Merge made by the 'recursive' strategy. + .../bindings/display/etnaviv/etnaviv-drm.txt | 24 +- + drivers/gpu/drm/etnaviv/Kconfig | 1 + + drivers/gpu/drm/etnaviv/Makefile | 3 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 52 ++-- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 7 +- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 21 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 5 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 68 ++--- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 275 ++++++--------------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 29 +-- + drivers/gpu/drm/etnaviv/etnaviv_iommu.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_iommu_v2.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 169 +++++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_sched.h | 35 +++ + 15 files changed, 397 insertions(+), 300 deletions(-) + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sched.c + create mode 100644 drivers/gpu/drm/etnaviv/etnaviv_sched.h +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (a75de7721184 Merge remote-tracking branches 'regmap/topic/soundwire' and 'regmap/topic/zero' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (1c9609e3a8cf ALSA: hda - Reduce the suspend time consumption for ALC256) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (56821b5652e2 Merge remote-tracking branch 'asoc/fix/mtk' into asoc-linus) +$ git merge sound-asoc/for-next +Auto-merging sound/soc/soc-core.c +Merge made by the 'recursive' strategy. + include/sound/soc.h | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 17 +- + sound/soc/atmel/sam9x5_wm8731.c | 12 +- + sound/soc/codecs/ak4613.c | 78 +++++ + sound/soc/codecs/dmic.c | 2 +- + sound/soc/codecs/max98373.c | 4 +- + sound/soc/codecs/max98373.h | 5 +- + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/twl4030.c | 2 + + sound/soc/codecs/twl6040.c | 2 + + sound/soc/intel/Kconfig | 3 + + sound/soc/intel/boards/Kconfig | 1 + + sound/soc/intel/boards/kbl_rt5663_max98927.c | 95 +++++- + sound/soc/intel/skylake/Makefile | 5 + + sound/soc/intel/skylake/skl-i2s.h | 31 ++ + sound/soc/intel/skylake/skl-messages.c | 1 + + sound/soc/intel/skylake/skl-nhlt.c | 41 ++- + sound/soc/intel/skylake/skl-ssp-clk.c | 429 +++++++++++++++++++++++++++ + sound/soc/intel/skylake/skl-ssp-clk.h | 38 +++ + sound/soc/intel/skylake/skl.h | 6 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 32 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 11 +- + sound/soc/rockchip/rk3399_gru_sound.c | 19 +- + sound/soc/soc-compress.c | 79 ++--- + sound/soc/soc-core.c | 12 +- + sound/soc/soc-pcm.c | 7 +- + sound/soc/sunxi/sun8i-codec.c | 82 ++++- + 27 files changed, 915 insertions(+), 103 deletions(-) + create mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c +Merging modules/modules-next (0cad61d7a3d5 modpost: Remove trailing semicolon) +$ git merge modules/modules-next +Auto-merging scripts/mod/modpost.c +Auto-merging kernel/module.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 -- + kernel/module.c | 7 +------ + scripts/mod/modpost.c | 2 +- + 3 files changed, 2 insertions(+), 9 deletions(-) +Merging input/next (10a558374f37 Merge tag 'v4.15' into next) +$ git merge input/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging block/for-next (0ccfb3c0032b Merge branch 'for-4.16/block' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. +Merging lightnvm/for-next (1c6286f26301 lightnvm: fix some error code in pblk-init.c) +$ git merge lightnvm/for-next +Already up to date. +Merging device-mapper/for-next (de6ff5c58656 Merge branch 'dm-4.16' into block-4.16_dm-4.16) +$ git merge device-mapper/for-next +Recorded preimage for 'block/blk-core.c' +Recorded preimage for 'block/blk-mq.c' +Recorded preimage for 'include/linux/blk_types.h' +Auto-merging include/linux/blk_types.h +CONFLICT (content): Merge conflict in include/linux/blk_types.h +Auto-merging block/blk-mq.c +CONFLICT (content): Merge conflict in block/blk-mq.c +Auto-merging block/blk-core.c +CONFLICT (content): Merge conflict in block/blk-core.c +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'block/blk-core.c'. +Recorded resolution for 'block/blk-mq.c'. +Recorded resolution for 'include/linux/blk_types.h'. +[master 6946684f5885] Merge remote-tracking branch 'device-mapper/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging mmc/next (56174d9a2149 mmc: MMC_SDHI_{SYS,INTERNAL}_DMAC should depend on HAS_DMA) +$ git merge mmc/next +Auto-merging drivers/mmc/host/Kconfig +Merge made by the 'recursive' strategy. + drivers/mmc/host/Kconfig | 4 +- + drivers/mmc/host/sdhci.c | 164 ++++++++++++++++++++++++++++++++++++++++++++--- + drivers/mmc/host/sdhci.h | 3 + + 3 files changed, 161 insertions(+), 10 deletions(-) +Merging kgdb/kgdb-next (40b90efeae9b kdb: use ktime_get_mono_fast_ns() instead of ktime_get_ts()) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_main.c +Merge made by the 'recursive' strategy. + drivers/misc/kgdbts.c | 8 +++- + include/linux/timekeeping.h | 1 + + kernel/debug/kdb/kdb_bp.c | 4 +- + kernel/debug/kdb/kdb_main.c | 89 +++++++++++++++++--------------------- + kernel/time/timekeeping_internal.h | 2 - + 5 files changed, 49 insertions(+), 55 deletions(-) +Merging md/for-next (1532d9e87e8b raid5-ppl: PPL support for disks with write-back cache enabled) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (0f89ffefa4e1 mfd: lpc_ich: Do not touch SPI-NOR write protection bit on Apollo Lake) +$ git merge mfd/for-mfd-next +Already up to date. +Merging backlight/for-backlight-next (2023b0524a63 backlight: tdo24m: Fix the SPI CS between transfers) +$ git merge backlight/for-backlight-next +Already up to date. +Merging battery/for-next (8be4c3667cf1 MAINTAINERS: Add AXP288 PMIC entry) +$ git merge battery/for-next +Already up to date. +Merging regulator/for-next (c8f64f281824 Merge remote-tracking branch 'regulator/fix/suspend' into regulator-linus) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging security/next-testing (400f428062af Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into next-testing) +$ git merge security/next-testing +Already up to date! +Merge made by the 'recursive' strategy. +Merging integrity/next-integrity (d56f30ac85c0 ima: force re-appraisal on filesystems with FS_IMA_NO_CACHE) +$ git merge integrity/next-integrity +Resolved 'security/integrity/ima/ima_main.c' using previous resolution. +Auto-merging security/integrity/ima/ima_main.c +CONFLICT (content): Merge conflict in security/integrity/ima/ima_main.c +Auto-merging include/linux/fs.h +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a6b83cfcfd32] Merge remote-tracking branch 'integrity/next-integrity' +$ git diff -M --stat --summary HEAD^.. + fs/fuse/inode.c | 2 +- + include/linux/fs.h | 1 + + security/integrity/ima/ima_main.c | 15 +++++++++++++-- + 3 files changed, 15 insertions(+), 3 deletions(-) +Merging keys/keys-next (1e684d3820d8 pkcs7: Set the module licence to prevent tainting) +$ git merge keys/keys-next +Already up to date. +Merging selinux/next (4b14752ec4e0 selinux: skip bounded transition processing if the policy isn't loaded) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (68021bf4734d tpm: remove unused variables) +$ git merge tpmdd/next +Already up to date. +Merging watchdog/master (592a547adf68 documentation: watchdog: remove documentation of w83697hf_wdt/w83697ug_wdt) +$ git merge watchdog/master +Removing drivers/watchdog/gemini_wdt.c +Removing drivers/watchdog/at32ap700x_wdt.c +Auto-merging drivers/watchdog/Makefile +Auto-merging drivers/watchdog/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/watchdog/faraday,ftwdt010.txt +Removing Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt +Merge made by the 'recursive' strategy. + .../bindings/watchdog/cortina,gemini-watchdog.txt | 17 - + ...ina,gemin-watchdog.txt => faraday,ftwdt010.txt} | 11 +- + .../bindings/watchdog/ingenic,jz4740-wdt.txt | 4 +- + .../bindings/watchdog/realtek,rtd119x.txt | 17 + + .../devicetree/bindings/watchdog/renesas-wdt.txt | 3 +- + .../devicetree/bindings/watchdog/sprd-wdt.txt | 19 + + Documentation/watchdog/watchdog-parameters.txt | 23 - + MAINTAINERS | 4 +- + drivers/watchdog/Kconfig | 41 +- + drivers/watchdog/Makefile | 7 +- + drivers/watchdog/advantechwdt.c | 2 +- + drivers/watchdog/alim1535_wdt.c | 2 +- + drivers/watchdog/aspeed_wdt.c | 21 +- + drivers/watchdog/at32ap700x_wdt.c | 433 ------------- + drivers/watchdog/da9062_wdt.c | 48 +- + drivers/watchdog/davinci_wdt.c | 38 ++ + drivers/watchdog/dw_wdt.c | 18 +- + drivers/watchdog/eurotechwdt.c | 2 +- + drivers/watchdog/f71808e_wdt.c | 4 +- + drivers/watchdog/ftwdt010_wdt.c | 236 +++++++ + drivers/watchdog/gemini_wdt.c | 229 ------- + drivers/watchdog/gpio_wdt.c | 58 +- + drivers/watchdog/hpwdt.c | 12 +- + drivers/watchdog/i6300esb.c | 377 ++++------- + drivers/watchdog/ib700wdt.c | 2 +- + drivers/watchdog/imx2_wdt.c | 20 +- + drivers/watchdog/jz4740_wdt.c | 1 + + drivers/watchdog/mei_wdt.c | 7 +- + drivers/watchdog/mpc8xxx_wdt.c | 83 ++- + drivers/watchdog/mt7621_wdt.c | 34 +- + drivers/watchdog/orion_wdt.c | 2 +- + drivers/watchdog/pcwd_pci.c | 2 +- + drivers/watchdog/pcwd_usb.c | 5 +- + drivers/watchdog/rtd119x_wdt.c | 168 +++++ + drivers/watchdog/sp5100_tco.c | 710 +++++++++------------ + drivers/watchdog/sp5100_tco.h | 57 +- + drivers/watchdog/sprd_wdt.c | 399 ++++++++++++ + drivers/watchdog/stm32_iwdg.c | 6 +- + drivers/watchdog/sunxi_wdt.c | 7 +- + drivers/watchdog/watchdog_core.c | 1 + + drivers/watchdog/watchdog_dev.c | 125 ++-- + drivers/watchdog/wdt_pci.c | 2 +- + drivers/watchdog/xen_wdt.c | 255 ++------ + 43 files changed, 1711 insertions(+), 1801 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/watchdog/cortina,gemini-watchdog.txt + rename Documentation/devicetree/bindings/watchdog/{cortina,gemin-watchdog.txt => faraday,ftwdt010.txt} (55%) + create mode 100644 Documentation/devicetree/bindings/watchdog/realtek,rtd119x.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/sprd-wdt.txt + delete mode 100644 drivers/watchdog/at32ap700x_wdt.c + create mode 100644 drivers/watchdog/ftwdt010_wdt.c + delete mode 100644 drivers/watchdog/gemini_wdt.c + create mode 100644 drivers/watchdog/rtd119x_wdt.c + create mode 100644 drivers/watchdog/sprd_wdt.c +Merging iommu/next (fedbd940d1c2 Merge branches 'arm/renesas', 'arm/omap', 'arm/exynos', 'x86/amd', 'x86/vt-d' and 'core' into next) +$ git merge iommu/next +Auto-merging drivers/iommu/intel-svm.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Merge made by the 'recursive' strategy. + .../bindings/iommu/renesas,ipmmu-vmsa.txt | 3 ++ + drivers/iommu/amd_iommu.c | 24 ++++++++++++---- + drivers/iommu/amd_iommu_types.h | 2 ++ + drivers/iommu/arm-smmu-v3.c | 2 +- + drivers/iommu/arm-smmu.c | 12 ++++---- + drivers/iommu/exynos-iommu.c | 9 +++++- + drivers/iommu/intel-iommu.c | 5 ++-- + drivers/iommu/intel-svm.c | 32 ++++++++++++++++++---- + drivers/iommu/iommu.c | 5 ++++ + drivers/iommu/ipmmu-vmsa.c | 14 ++-------- + drivers/iommu/msm_iommu.c | 16 ++--------- + drivers/iommu/of_iommu.c | 16 ----------- + drivers/iommu/omap-iommu-debug.c | 4 +-- + drivers/iommu/qcom_iommu.c | 2 +- + include/linux/intel-iommu.h | 2 ++ + include/linux/of_iommu.h | 5 +--- + 16 files changed, 83 insertions(+), 70 deletions(-) +Merging dwmw2-iommu/master (910170442944 iommu/vt-d: Fix PASID table allocation) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (46ed90f157f4 vfio: mdev: make a couple of functions and structure vfio_mdev_driver static) +$ git merge vfio/next +Already up to date. +Merging trivial/for-next (1972d6c0c86d MAINTAINERS: relinquish kconfig) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (d8a5b80568a9 Linux 4.15) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (3a6fbcb2e2e4 xtensa: remove arch specific early DT functions) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (0ae7d327a64b dt-bindings: mailbox: qcom: Document the APCS clock binding) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (d0cb047a0edb Merge tag 'spi-v4.16' into spi-next) +$ git merge spi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging tip/auto-latest (0b4368acd659 Merge branch 'x86/pti') +$ git merge tip/auto-latest +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/include/asm/mshyperv.h +Auto-merging arch/x86/hyperv/hv_init.c +Merge made by the 'recursive' strategy. + arch/x86/entry/entry_32.S | 3 + + arch/x86/entry/entry_64.S | 3 + + arch/x86/hyperv/hv_init.c | 123 +- + arch/x86/include/asm/hardirq.h | 3 + + arch/x86/include/asm/irq_vectors.h | 7 +- + arch/x86/include/asm/mshyperv.h | 32 +- + arch/x86/include/uapi/asm/hyperv.h | 27 + + arch/x86/kernel/cpu/mshyperv.c | 6 + + arch/x86/kernel/irq.c | 9 + + arch/x86/kvm/x86.c | 138 +- + tools/memory-model/Documentation/cheatsheet.txt | 30 + + tools/memory-model/Documentation/explanation.txt | 1840 ++++++++++++++++++++ + tools/memory-model/Documentation/recipes.txt | 570 ++++++ + tools/memory-model/Documentation/references.txt | 107 ++ + tools/memory-model/MAINTAINERS | 15 + + tools/memory-model/README | 220 +++ + tools/memory-model/linux-kernel.bell | 53 + + tools/memory-model/linux-kernel.cat | 124 ++ + tools/memory-model/linux-kernel.cfg | 21 + + tools/memory-model/linux-kernel.def | 108 ++ + .../litmus-tests/CoRR+poonceonce+Once.litmus | 19 + + .../litmus-tests/CoRW+poonceonce+Once.litmus | 18 + + .../litmus-tests/CoWR+poonceonce+Once.litmus | 18 + + .../litmus-tests/CoWW+poonceonce.litmus | 11 + + .../litmus-tests/IRIW+mbonceonces+OnceOnce.litmus | 35 + + .../litmus-tests/IRIW+poonceonces+OnceOnce.litmus | 33 + + .../litmus-tests/ISA2+poonceonces.litmus | 28 + + ...cerelease+poacquirerelease+poacquireonce.litmus | 28 + + .../litmus-tests/LB+ctrlonceonce+mbonceonce.litmus | 23 + + .../LB+poacquireonce+pooncerelease.litmus | 21 + + .../litmus-tests/LB+poonceonces.litmus | 21 + + .../litmus-tests/MP+onceassign+derefonce.litmus | 25 + + tools/memory-model/litmus-tests/MP+polocks.litmus | 24 + + .../litmus-tests/MP+poonceonces.litmus | 20 + + .../MP+pooncerelease+poacquireonce.litmus | 20 + + .../memory-model/litmus-tests/MP+porevlocks.litmus | 24 + + .../litmus-tests/MP+wmbonceonce+rmbonceonce.litmus | 22 + + .../memory-model/litmus-tests/R+mbonceonces.litmus | 21 + + .../memory-model/litmus-tests/R+poonceonces.litmus | 19 + + tools/memory-model/litmus-tests/README | 125 ++ + .../memory-model/litmus-tests/S+poonceonces.litmus | 19 + + .../S+wmbonceonce+poacquireonce.litmus | 20 + + .../litmus-tests/SB+mbonceonces.litmus | 23 + + .../litmus-tests/SB+poonceonces.litmus | 21 + + .../litmus-tests/WRC+poonceonces+Once.litmus | 27 + + .../WRC+pooncerelease+rmbonceonce+Once.litmus | 28 + + .../Z6.0+pooncelock+poonceLock+pombonce.litmus | 33 + + .../Z6.0+pooncelock+pooncelock+pombonce.litmus | 32 + + ...ooncerelease+poacquirerelease+mbonceonce.litmus | 28 + + tools/memory-model/lock.cat | 99 ++ + 50 files changed, 4292 insertions(+), 32 deletions(-) + create mode 100644 tools/memory-model/Documentation/cheatsheet.txt + create mode 100644 tools/memory-model/Documentation/explanation.txt + create mode 100644 tools/memory-model/Documentation/recipes.txt + create mode 100644 tools/memory-model/Documentation/references.txt + create mode 100644 tools/memory-model/MAINTAINERS + create mode 100644 tools/memory-model/README + create mode 100644 tools/memory-model/linux-kernel.bell + create mode 100644 tools/memory-model/linux-kernel.cat + create mode 100644 tools/memory-model/linux-kernel.cfg + create mode 100644 tools/memory-model/linux-kernel.def + create mode 100644 tools/memory-model/litmus-tests/CoRR+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoRW+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoWR+poonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/CoWW+poonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/IRIW+mbonceonces+OnceOnce.litmus + create mode 100644 tools/memory-model/litmus-tests/IRIW+poonceonces+OnceOnce.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/ISA2+pooncerelease+poacquirerelease+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+ctrlonceonce+mbonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+poacquireonce+pooncerelease.litmus + create mode 100644 tools/memory-model/litmus-tests/LB+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+onceassign+derefonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+polocks.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+pooncerelease+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+porevlocks.litmus + create mode 100644 tools/memory-model/litmus-tests/MP+wmbonceonce+rmbonceonce.litmus + create mode 100644 tools/memory-model/litmus-tests/R+mbonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/R+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/README + create mode 100644 tools/memory-model/litmus-tests/S+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/S+wmbonceonce+poacquireonce.litmus + create mode 100644 tools/memory-model/litmus-tests/SB+mbonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/SB+poonceonces.litmus + create mode 100644 tools/memory-model/litmus-tests/WRC+poonceonces+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/WRC+pooncerelease+rmbonceonce+Once.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncelock+poonceLock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncelock+pooncelock+pombonce.litmus + create mode 100644 tools/memory-model/litmus-tests/Z6.0+pooncerelease+poacquirerelease+mbonceonce.litmus + create mode 100644 tools/memory-model/lock.cat +Merging clockevents/clockevents/next (322fd24f5e67 clocksource/drivers/stm32: Start the timer's counter sooner) +$ git merge clockevents/clockevents/next +Resolved 'drivers/clocksource/Kconfig' using previous resolution. +Resolved 'drivers/clocksource/timer-of.c' using previous resolution. +Resolved 'drivers/clocksource/timer-stm32.c' using previous resolution. +Auto-merging drivers/clocksource/timer-stm32.c +CONFLICT (content): Merge conflict in drivers/clocksource/timer-stm32.c +Auto-merging drivers/clocksource/timer-of.c +CONFLICT (content): Merge conflict in drivers/clocksource/timer-of.c +Auto-merging drivers/clocksource/Kconfig +CONFLICT (content): Merge conflict in drivers/clocksource/Kconfig +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 9735a00de5ea] Merge remote-tracking branch 'clockevents/clockevents/next' +$ git diff -M --stat --summary HEAD^.. +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 (68fa24f9121c EDAC, mv64x60: Fix an error handling path) +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irqchip/for-next (c1ae3cfa0e89 Linux 4.11-rc1) +$ git merge irqchip/irqchip/for-next +Already up to date. +Merging ftrace/for-next (841a915d20c7 vsprintf: Do not have bprintf dereference pointers) +$ git merge ftrace/for-next +Already up to date. +Merging rcu/rcu/next (1dfa55e01987 Merge branches 'cond_resched.2017.12.04a', 'dyntick.2017.11.28a', 'fixes.2017.12.11a', 'srbd.2017.12.05a' and 'torture.2017.12.11a' into HEAD) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (8dbfb2bf1bb3 KVM: x86: don't forget vcpu_put() in kvm_arch_vcpu_ioctl_set_sregs()) +$ git merge kvm/linux-next +Recorded preimage for 'arch/x86/kvm/svm.c' +Recorded preimage for 'arch/x86/kvm/vmx.c' +Auto-merging virt/kvm/kvm_main.c +Auto-merging virt/kvm/arm/mmu.c +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx.c +CONFLICT (content): Merge conflict in arch/x86/kvm/vmx.c +Auto-merging arch/x86/kvm/svm.c +CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/powerpc/kvm/book3s_xive.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/asm-offsets.c +Auto-merging arch/powerpc/include/asm/xive.h +Auto-merging arch/powerpc/include/asm/opal-api.h +Auto-merging arch/arm64/mm/cache.S +Auto-merging arch/arm64/kvm/hyp/switch.c +Auto-merging arch/arm64/include/asm/pgtable-prot.h +Auto-merging arch/arm64/include/asm/pgtable-hwdef.h +Auto-merging arch/arm64/include/asm/kvm_mmu.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/assembler.h +Auto-merging arch/arm/include/asm/kvm_mmu.h +Auto-merging arch/arm/include/asm/kvm_host.h +Auto-merging MAINTAINERS +Removing Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'arch/x86/kvm/svm.c'. +Recorded resolution for 'arch/x86/kvm/vmx.c'. +[master 07707f3926f9d16f5c0b8cca007aacdc7d1a48bf] Merge remote-tracking branch 'kvm/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/00-INDEX | 3 + + .../virtual/kvm/amd-memory-encryption.rst | 247 ++++ + Documentation/virtual/kvm/api.txt | 54 +- + Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt | 187 --- + Documentation/virtual/kvm/cpuid.txt | 4 + + MAINTAINERS | 5 +- + arch/arm/include/asm/kvm_emulate.h | 2 +- + arch/arm/include/asm/kvm_host.h | 2 + + arch/arm/include/asm/kvm_hyp.h | 3 +- + arch/arm/include/asm/kvm_mmu.h | 99 +- + arch/arm/include/asm/pgtable.h | 4 +- + arch/arm/kvm/hyp/switch.c | 1 + + arch/arm/kvm/hyp/tlb.c | 1 + + arch/arm64/include/asm/assembler.h | 21 + + arch/arm64/include/asm/cacheflush.h | 7 + + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/kvm_hyp.h | 1 - + arch/arm64/include/asm/kvm_mmu.h | 36 +- + arch/arm64/include/asm/pgtable-hwdef.h | 2 + + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/kvm/guest.c | 15 +- + arch/arm64/kvm/hyp/debug-sr.c | 1 + + arch/arm64/kvm/hyp/switch.c | 1 + + arch/arm64/kvm/hyp/tlb.c | 1 + + arch/arm64/mm/cache.S | 32 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/mips.c | 67 +- + arch/powerpc/include/asm/kvm_book3s_64.h | 14 +- + arch/powerpc/include/asm/kvm_host.h | 6 +- + arch/powerpc/include/asm/opal-api.h | 1 + + arch/powerpc/include/asm/xive.h | 3 +- + arch/powerpc/include/uapi/asm/kvm.h | 2 + + arch/powerpc/kernel/asm-offsets.c | 4 + + arch/powerpc/kvm/Kconfig | 1 + + arch/powerpc/kvm/book3s.c | 24 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 54 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 228 ++-- + arch/powerpc/kvm/book3s_xive.c | 109 +- + arch/powerpc/kvm/book3s_xive.h | 15 +- + arch/powerpc/kvm/booke.c | 51 +- + arch/powerpc/kvm/powerpc.c | 47 +- + arch/powerpc/kvm/timing.c | 3 +- + arch/powerpc/sysdev/xive/native.c | 18 +- + arch/s390/include/asm/bitops.h | 5 + + arch/s390/include/asm/css_chars.h | 4 +- + arch/s390/include/asm/kvm_host.h | 126 +- + arch/s390/include/asm/sclp.h | 1 + + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/diag.c | 1 + + arch/s390/kvm/interrupt.c | 288 ++++- + arch/s390/kvm/kvm-s390.c | 209 +++- + arch/s390/kvm/kvm-s390.h | 22 +- + arch/s390/kvm/priv.c | 38 +- + arch/s390/kvm/sigp.c | 18 +- + arch/s390/kvm/vsie.c | 91 +- + arch/s390/mm/gmap.c | 44 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm_host.h | 22 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/include/asm/pat.h | 2 + + arch/x86/include/asm/svm.h | 3 + + arch/x86/include/uapi/asm/kvm_para.h | 4 + + arch/x86/kernel/cpu/amd.c | 66 +- + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kernel/kvm.c | 49 +- + arch/x86/kvm/Kconfig | 8 + + arch/x86/kvm/cpuid.c | 22 +- + arch/x86/kvm/emulate.c | 62 +- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/lapic.c | 25 +- + arch/x86/kvm/lapic.h | 4 +- + arch/x86/kvm/mmu.c | 26 +- + arch/x86/kvm/mmu_audit.c | 2 +- + arch/x86/kvm/svm.c | 1199 +++++++++++++++++++- + arch/x86/kvm/vmx.c | 767 +++++++------ + arch/x86/kvm/vmx_shadow_fields.h | 77 ++ + arch/x86/kvm/x86.c | 200 +++- + arch/x86/kvm/x86.h | 33 +- + arch/x86/mm/pat.c | 19 + + drivers/crypto/ccp/Kconfig | 12 + + drivers/crypto/ccp/Makefile | 1 + + drivers/crypto/ccp/psp-dev.c | 805 +++++++++++++ + drivers/crypto/ccp/psp-dev.h | 83 ++ + drivers/crypto/ccp/sp-dev.c | 35 + + drivers/crypto/ccp/sp-dev.h | 28 +- + drivers/crypto/ccp/sp-pci.c | 52 + + drivers/s390/char/sclp_early.c | 3 +- + include/kvm/arm_arch_timer.h | 2 + + include/kvm/arm_vgic.h | 13 +- + include/linux/kvm_host.h | 14 +- + include/linux/psp-sev.h | 606 ++++++++++ + include/uapi/linux/kvm.h | 90 ++ + include/uapi/linux/psp-sev.h | 142 +++ + kernel/configs/kvm_guest.config | 1 + + virt/kvm/Kconfig | 3 + + virt/kvm/arm/arch_timer.c | 138 ++- + virt/kvm/arm/arm.c | 153 ++- + virt/kvm/arm/hyp/vgic-v2-sr.c | 1 + + virt/kvm/arm/mmu.c | 64 +- + virt/kvm/arm/vgic/vgic-its.c | 4 +- + virt/kvm/arm/vgic/vgic-mmio.c | 115 +- + virt/kvm/arm/vgic/vgic-v2.c | 29 + + virt/kvm/arm/vgic/vgic-v3.c | 29 + + virt/kvm/arm/vgic/vgic.c | 41 +- + virt/kvm/arm/vgic/vgic.h | 8 + + virt/kvm/kvm_main.c | 62 +- + 107 files changed, 6019 insertions(+), 1344 deletions(-) + create mode 100644 Documentation/virtual/kvm/amd-memory-encryption.rst + delete mode 100644 Documentation/virtual/kvm/arm/vgic-mapped-irqs.txt + create mode 100644 arch/x86/kvm/vmx_shadow_fields.h + create mode 100644 drivers/crypto/ccp/psp-dev.c + create mode 100644 drivers/crypto/ccp/psp-dev.h + create mode 100644 include/linux/psp-sev.h + create mode 100644 include/uapi/linux/psp-sev.h +Merging kvm-arm/next (cd15d2050c04 KVM: arm/arm64: Fixup userspace irqchip static key optimization) +$ git merge kvm-arm/next +Already up to date. +Merging kvm-mips/next (dc44abd6aad2 KVM: MIPS/Emulate: Properly implement TLBR for T&E) +$ git merge kvm-mips/next +Already up to date. +Merging kvm-ppc/kvm-ppc-next (9b9b13a6d153 KVM: PPC: Book3S HV: Keep XIVE escalation interrupt masked unless ceded) +$ git merge kvm-ppc/kvm-ppc-next +Already up to date. +Merging kvms390/next (4b9f952577fb KVM: s390: introduce the format-1 GISA) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (cf2acf66ad43 xen/gntdev: Fix partial gntdev_mmap() cleanup) +$ git merge xen-tip/linux-next +Already up to date. +Merging percpu/for-next (85dcbba3b8b1 percpu: percpu_counter_initialized can be boolean) +$ git merge percpu/for-next +Already up to date. +Merging workqueues/for-next (a10eb37ccf1d Merge branch 'for-4.15-fixes' into for-next) +$ git merge workqueues/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging drivers-x86/for-next (00f49ee79777 platform/x86: intel-vbtn: Replace License by SDPX identifier) +$ git merge drivers-x86/for-next +Resolved 'drivers/platform/x86/dell-laptop.c' using previous resolution. +Removing include/linux/platform_data/mlxcpld-hotplug.h +Removing drivers/platform/x86/mlxcpld-hotplug.c +Auto-merging drivers/platform/x86/dell-wmi.c +Auto-merging drivers/platform/x86/dell-laptop.c +CONFLICT (content): Merge conflict in drivers/platform/x86/dell-laptop.c +Removing arch/x86/include/asm/pmc_core.h +Auto-merging MAINTAINERS +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a1543686f2d4] Merge remote-tracking branch 'drivers-x86/for-next' +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-samsung-laptop | 2 +- + MAINTAINERS | 15 +- + arch/x86/include/asm/intel_pmc_ipc.h | 6 + + arch/x86/include/asm/pmc_core.h | 27 - + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/mellanox/Kconfig | 26 + + drivers/platform/mellanox/Makefile | 6 + + drivers/platform/mellanox/mlxreg-hotplug.c | 638 +++++++++++++++++++++ + drivers/platform/x86/Kconfig | 56 +- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/acer-wireless.c | 71 +++ + drivers/platform/x86/alienware-wmi.c | 17 + + drivers/platform/x86/apple-gmux.c | 48 +- + drivers/platform/x86/asus-nb-wmi.c | 13 +- + drivers/platform/x86/dell-laptop.c | 263 ++++++--- + drivers/platform/x86/dell-smbios.c | 8 +- + drivers/platform/x86/dell-wmi.c | 3 + + drivers/platform/x86/gpd-pocket-fan.c | 216 +++++++ + drivers/platform/x86/ideapad-laptop.c | 28 +- + drivers/platform/x86/intel-hid.c | 41 +- + drivers/platform/x86/intel-vbtn.c | 65 ++- + drivers/platform/x86/intel_chtdc_ti_pwrbtn.c | 93 +++ + drivers/platform/x86/intel_int0002_vgpio.c | 2 +- + drivers/platform/x86/intel_pmc_core.c | 180 ++---- + drivers/platform/x86/intel_pmc_core.h | 18 +- + drivers/platform/x86/intel_pmc_ipc.c | 33 +- + drivers/platform/x86/intel_telemetry_debugfs.c | 83 ++- + drivers/platform/x86/mlx-platform.c | 324 +++++++++-- + drivers/platform/x86/mlxcpld-hotplug.c | 515 ----------------- + drivers/platform/x86/pmc_atom.c | 56 +- + drivers/platform/x86/silead_dmi.c | 175 ++++++ + drivers/platform/x86/thinkpad_acpi.c | 18 +- + include/linux/platform_data/mlxcpld-hotplug.h | 99 ---- + include/linux/platform_data/mlxreg.h | 144 +++++ + include/uapi/linux/input-event-codes.h | 1 + + 36 files changed, 2182 insertions(+), 1115 deletions(-) + delete mode 100644 arch/x86/include/asm/pmc_core.h + create mode 100644 drivers/platform/mellanox/Kconfig + create mode 100644 drivers/platform/mellanox/Makefile + create mode 100644 drivers/platform/mellanox/mlxreg-hotplug.c + create mode 100644 drivers/platform/x86/acer-wireless.c + create mode 100644 drivers/platform/x86/gpd-pocket-fan.c + create mode 100644 drivers/platform/x86/intel_chtdc_ti_pwrbtn.c + delete mode 100644 drivers/platform/x86/mlxcpld-hotplug.c + delete mode 100644 include/linux/platform_data/mlxcpld-hotplug.h + create mode 100644 include/linux/platform_data/mlxreg.h +Merging chrome-platform/for-next (d48b8c58c57f platform/chrome: Use proper protocol transfer function) +$ git merge chrome-platform/for-next +Merge made by the 'recursive' strategy. + drivers/platform/chrome/chromeos_laptop.c | 22 ++++++++-------- + drivers/platform/chrome/cros_ec_lpc.c | 44 ++++++++++++++++++++++++++++--- + drivers/platform/chrome/cros_ec_proto.c | 8 +++--- + drivers/platform/chrome/cros_ec_sysfs.c | 2 +- + 4 files changed, 57 insertions(+), 19 deletions(-) +Merging hsi/for-next (b6dc80dbe6cd HSI: cmt_speech: use timespec64 instead of timespec) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (6a836631e303 leds: ledtrig-transient: Add SPDX license identifiers) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (e45af3d372f1 ipmi_ssif: Remove duplicate NULL check) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (8ada211d0383 usb: renesas_usbhs: add extcon notifier to set mode for non-otg channel) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (d1c48227d7c4 USB: serial: f81534: fix tx error on some baud rate) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (ce4c1b820c52 usb: chipidea: imx: Fix ULPI on imx53) +$ git merge usb-chipidea-next/ci-for-usb-next +Merge made by the 'recursive' strategy. + drivers/usb/chipidea/ci_hdrc_imx.c | 15 +++++++++++++-- + drivers/usb/chipidea/usbmisc_imx.c | 26 ++++++++++++++++---------- + 2 files changed, 29 insertions(+), 12 deletions(-) +Merging phy-next/next (e4b227c1ca70 phy: phy-mtk-tphy: use of_device_get_match_data()) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (ca90a64dc671 extcon: axp288: Handle reserved charger-type values better) +$ git merge extcon/extcon-next +Already up to date. +Merging staging/staging-next (4bf772b14675 Merge tag 'drm-for-v4.16' of git://people.freedesktop.org/~airlied/linux) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (6cd361c99ef2 mux: add SPDX identifiers to all mux source files) +$ git merge mux/for-next +Merge made by the 'recursive' strategy. +Merging slave-dma/next (6c773ba2c843 Merge branch 'for-linus' into next) +$ git merge slave-dma/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging cgroup/for-next (5ecf66c9dc2b Merge branch 'for-4.16' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (f468cd2908f8 Merge branch 'postmerge' into for-next) +$ git merge scsi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (a2390348c19d scsi: qla2xxx: Fix logo flag for qlt_free_session_done()) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Auto-merging drivers/target/target_core_transport.c +Merge made by the 'recursive' strategy. + drivers/target/iscsi/cxgbit/cxgbit_cm.c | 3 + + drivers/target/iscsi/iscsi_target_auth.c | 3 +- + drivers/target/iscsi/iscsi_target_nego.c | 3 + + drivers/target/loopback/tcm_loop.c | 145 ++--- + drivers/target/sbp/sbp_target.c | 13 +- + drivers/target/target_core_configfs.c | 6 + + drivers/target/target_core_device.c | 4 +- + drivers/target/target_core_fabric_lib.c | 6 +- + drivers/target/target_core_internal.h | 3 +- + drivers/target/target_core_pr.c | 4 +- + drivers/target/target_core_sbc.c | 8 +- + drivers/target/target_core_transport.c | 3 + + drivers/target/target_core_user.c | 983 ++++++++++++++++++++++--------- + include/target/target_core_backend.h | 1 + + include/target/target_core_base.h | 2 + + 15 files changed, 798 insertions(+), 389 deletions(-) +Merging target-bva/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging libata/for-next (83ab14e6cacc Merge branch 'for-4.16' into for-next) +$ git merge libata/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging vhost/linux-next (d25cc43c6775 vhost: don't hold onto file pointer for VHOST_SET_LOG_FD) +$ git merge vhost/linux-next +Auto-merging drivers/vhost/vhost.h +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/net.c +Auto-merging drivers/block/virtio_blk.c +Merge made by the 'recursive' strategy. + drivers/block/virtio_blk.c | 32 ++++++++-------- + drivers/firmware/qemu_fw_cfg.c | 4 +- + drivers/misc/mic/vop/vop_main.c | 20 ++++++---- + drivers/vhost/net.c | 2 +- + drivers/vhost/scsi.c | 11 +++--- + drivers/vhost/test.c | 2 +- + drivers/vhost/vhost.c | 68 ++++++++------------------------- + drivers/vhost/vhost.h | 9 +---- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/Kconfig | 8 +++- + drivers/virtio/virtio.c | 18 +++++++-- + drivers/virtio/virtio_balloon.c | 4 ++ + drivers/virtio/virtio_mmio.c | 6 +-- + drivers/virtio/virtio_pci_common.c | 8 +++- + include/uapi/linux/virtio_balloon.h | 3 +- + tools/virtio/ringtest/ring.c | 30 ++++++++------- + tools/virtio/ringtest/virtio_ring_0_9.c | 24 +++++++----- + 17 files changed, 120 insertions(+), 131 deletions(-) +Merging rpmsg/for-next (163c558b84fe Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Auto-merging drivers/rpmsg/qcom_smd.c +Merge made by the 'recursive' strategy. + drivers/remoteproc/qcom_adsp_pil.c | 8 +-- + drivers/remoteproc/qcom_common.c | 21 +------- + drivers/remoteproc/qcom_common.h | 4 -- + drivers/remoteproc/qcom_q6v5_pil.c | 18 +------ + drivers/remoteproc/qcom_wcnss.c | 8 +-- + drivers/remoteproc/remoteproc_core.c | 83 ++++++++++++------------------ + drivers/remoteproc/remoteproc_elf_loader.c | 59 ++++++++++----------- + drivers/remoteproc/remoteproc_internal.h | 57 +++++++------------- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 32 ++---------- + drivers/rpmsg/qcom_glink_native.c | 1 + + drivers/rpmsg/qcom_glink_smem.c | 5 +- + drivers/rpmsg/qcom_smd.c | 66 ++++++++++++++++++------ + include/linux/remoteproc.h | 21 ++++++-- + 14 files changed, 162 insertions(+), 223 deletions(-) +Merging gpio/for-next (d58f2bf261fd gpio: Timestamp events in hardirq handler) +$ git merge gpio/for-next +Already up to date. +Merging pinctrl/for-next (02e389e63e35 pinctrl: mcp23s08: fix irq setup order) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (4fbd8d194f06 Linux 4.15-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (bccaa3f917c9 pwm: meson: Add clock source configuration for Meson-AXG) +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/pwm-meson.txt | 2 ++ + drivers/pwm/pwm-meson.c | 26 ++++++++++++++++++++++ + drivers/pwm/pwm-stmpe.c | 2 +- + drivers/pwm/sysfs.c | 1 + + 4 files changed, 30 insertions(+), 1 deletion(-) +Merging userns/for-next (9eba1cd4b565 24 Jan 2018 Merge of my siginfo and userns trees for testing in linux-next) +$ git merge userns/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 (9e66317d3c92 Linux 4.14-rc3) +$ git merge random/dev +Already up to date. +Merging aio/master (2a8a98673c13 fs: aio: fix the increment of aio-nr and counting against aio-max-nr) +$ git merge aio/master +Already up to date. +Merging kselftest/next (0e9e327d1622 selftests: vm: update .gitignore with missing generated file) +$ git merge kselftest/next +Already up to date. +Merging y2038/y2038 (69973b830859 Linux 4.9) +$ git merge y2038/y2038 +Already up to date. +Merging livepatching/for-next (d13f5d84ca27 Merge branch 'for-4.16/signal-sysfs-force-v2' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (d8a5b80568a9 Linux 4.15) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (4402be2b4ca7 rtc: remove rtc-at32ap700x) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (ee95f4059a83 Merge branch 'for-4.16/nfit' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Resolved 'arch/powerpc/platforms/Kconfig' using previous resolution. +Auto-merging mm/sparse.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/hmm.c +Auto-merging mm/gup.c +Auto-merging include/linux/mm.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext2/super.c +Auto-merging fs/Kconfig +CONFLICT (modify/delete): arch/powerpc/sysdev/axonram.c deleted in HEAD and modified in nvdimm/libnvdimm-for-next. Version nvdimm/libnvdimm-for-next of arch/powerpc/sysdev/axonram.c left in tree. +Auto-merging arch/powerpc/platforms/Kconfig +CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/init_64.c +Auto-merging arch/ia64/mm/discontig.c +Auto-merging arch/arm64/mm/mmu.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/powerpc/sysdev/axonram.c +arch/powerpc/sysdev/axonram.c: needs merge +rm 'arch/powerpc/sysdev/axonram.c' +$ git commit -v -a +[master 22caa7a9ed419ec6814f003545751644a44fa5ad] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm64/mm/mmu.c | 9 +- + arch/ia64/mm/discontig.c | 6 +- + arch/ia64/mm/init.c | 18 +- + arch/powerpc/mm/init_64.c | 17 +- + arch/powerpc/mm/mem.c | 11 +- + arch/s390/mm/init.c | 7 +- + arch/s390/mm/vmem.c | 6 +- + arch/sh/mm/init.c | 10 +- + arch/sparc/mm/init_64.c | 5 +- + arch/x86/mm/init_32.c | 9 +- + arch/x86/mm/init_64.c | 94 ++++--- + drivers/acpi/nfit/core.c | 26 ++ + drivers/acpi/nfit/nfit.h | 1 + + drivers/dax/device.c | 2 +- + drivers/dax/pmem.c | 20 +- + drivers/dax/super.c | 10 + + drivers/nvdimm/btt.c | 2 +- + drivers/nvdimm/bus.c | 3 - + drivers/nvdimm/namespace_devs.c | 2 +- + drivers/nvdimm/nd.h | 9 +- + drivers/nvdimm/pfn_devs.c | 27 +- + drivers/nvdimm/pmem.c | 41 +-- + drivers/nvdimm/pmem.h | 1 + + drivers/nvdimm/region_devs.c | 13 + + drivers/s390/block/Kconfig | 1 + + drivers/s390/block/dcssblk.c | 3 +- + fs/Kconfig | 7 + + fs/ext2/super.c | 7 +- + fs/ext4/super.c | 9 +- + include/linux/libnvdimm.h | 11 + + include/linux/memory_hotplug.h | 29 +- + include/linux/memremap.h | 77 ++--- + include/linux/mm.h | 22 +- + include/linux/pfn_t.h | 13 + + include/uapi/linux/ndctl.h | 56 +--- + kernel/memremap.c | 174 +++++------- + mm/gup.c | 7 +- + mm/hmm.c | 13 +- + mm/memory.c | 16 +- + mm/memory_hotplug.c | 39 ++- + mm/page_alloc.c | 6 +- + mm/sparse-vmemmap.c | 67 ++--- + mm/sparse.c | 43 +-- + tools/testing/nvdimm/Kbuild | 4 + + tools/testing/nvdimm/acpi_nfit_test.c | 8 + + tools/testing/nvdimm/device_dax_test.c | 8 + + tools/testing/nvdimm/libnvdimm_test.c | 8 + + tools/testing/nvdimm/pmem_test.c | 8 + + tools/testing/nvdimm/test/iomap.c | 7 +- + tools/testing/nvdimm/test/nfit.c | 498 +++++++++++++++++++++++++++++---- + tools/testing/nvdimm/test/nfit_test.h | 134 +++++++++ + tools/testing/nvdimm/watermark.h | 21 ++ + 52 files changed, 1120 insertions(+), 525 deletions(-) + create mode 100644 tools/testing/nvdimm/acpi_nfit_test.c + create mode 100644 tools/testing/nvdimm/device_dax_test.c + create mode 100644 tools/testing/nvdimm/libnvdimm_test.c + create mode 100644 tools/testing/nvdimm/pmem_test.c + create mode 100644 tools/testing/nvdimm/watermark.h +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 at24/at24/for-next (0f30aca72c3b eeprom: at24: extend the list of chips supported in DT) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (3b28c987fb95 NTB: ntb_perf: fix cast to restricted __le32) +$ git merge ntb/ntb-next +Already up to date. +Merging kspp/for-next/kspp (e47e311843de lkdtm: Update usercopy tests for whitelisting) +$ git merge kspp/for-next/kspp +Already up to date. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging akpm-current/current (902897dc0c88 ipc/mqueue.c: have RT tasks queue in by priority in wq_add()) +$ git merge --no-ff akpm-current/current +Auto-merging tools/scripts/Makefile.include +Auto-merging tools/hv/Makefile +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/Makefile.lib +Auto-merging net/ipv6/mcast.c +Auto-merging net/core/ethtool.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/memory.c +Auto-merging mm/memcontrol.c +Auto-merging lib/find_bit_benchmark.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging kernel/ptrace.c +Auto-merging kernel/fork.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/memory_hotplug.h +Auto-merging include/linux/kallsyms.h +Auto-merging include/linux/compiler.h +Auto-merging fs/seq_file.c +Auto-merging fs/dcache.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/Kconfig +Auto-merging Makefile +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-bdi | 8 + + Documentation/cgroup-v2.txt | 74 ++++++ + Documentation/sysctl/vm.txt | 5 +- + MAINTAINERS | 8 +- + Makefile | 54 +++- + arch/Kconfig | 16 +- + arch/alpha/include/uapi/asm/mman.h | 1 + + arch/arc/include/asm/bug.h | 3 +- + arch/arm/include/asm/bitops.h | 1 + + arch/arm/include/asm/page.h | 2 + + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm64/include/asm/kasan.h | 17 +- + arch/arm64/include/asm/memory.h | 3 +- + arch/arm64/kernel/perf_event.c | 5 +- + arch/arm64/mm/kasan_init.c | 3 +- + arch/cris/include/arch-v10/arch/bug.h | 11 +- + arch/ia64/include/asm/bug.h | 6 +- + arch/ia64/kernel/perfmon.c | 13 +- + arch/m68k/include/asm/bitops.h | 3 +- + arch/m68k/include/asm/bug.h | 3 + + arch/metag/kernel/process.c | 6 +- + arch/mips/include/uapi/asm/mman.h | 1 + + arch/parisc/include/uapi/asm/mman.h | 1 + + arch/powerpc/mm/mmu_context_iommu.c | 3 +- + arch/sparc/include/asm/bug.h | 6 +- + arch/unicore32/include/asm/bitops.h | 2 + + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/kasan.h | 12 +- + arch/x86/kernel/machine_kexec_64.c | 1 + + arch/xtensa/include/uapi/asm/mman.h | 1 + + block/genhd.c | 2 +- + drivers/pps/generators/pps_gen_parport.c | 40 +-- + drivers/rapidio/devices/tsi721_dma.c | 17 +- + drivers/rapidio/rio.c | 110 ++++---- + fs/binfmt_elf.c | 15 +- + fs/dcache.c | 3 +- + fs/exec.c | 1 + + fs/hfsplus/dir.c | 4 +- + fs/hfsplus/hfsplus_fs.h | 3 +- + fs/hfsplus/inode.c | 7 +- + fs/hfsplus/super.c | 2 +- + fs/nilfs2/segbuf.c | 2 +- + fs/nilfs2/segbuf.h | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/nilfs2/segment.h | 2 +- + fs/nilfs2/sufile.c | 2 +- + fs/nilfs2/sufile.h | 2 +- + fs/nilfs2/super.c | 4 +- + fs/nilfs2/sysfs.c | 21 +- + fs/nilfs2/the_nilfs.h | 8 +- + fs/ocfs2/dlmglue.c | 2 +- + fs/ocfs2/filecheck.c | 357 ++++++++++---------------- + fs/ocfs2/filecheck.h | 29 ++- + fs/ocfs2/ocfs2.h | 8 + + fs/ocfs2/stackglue.c | 6 - + fs/ocfs2/stackglue.h | 3 - + fs/ocfs2/super.c | 27 +- + fs/proc/array.c | 8 +- + fs/proc/base.c | 70 +++-- + fs/proc/consoles.c | 3 +- + fs/proc/fd.c | 2 +- + fs/proc/generic.c | 18 +- + fs/proc/inode.c | 11 +- + fs/proc/internal.h | 29 ++- + fs/proc/kcore.c | 18 +- + fs/proc/proc_net.c | 4 +- + fs/proc/self.c | 9 +- + fs/proc/task_mmu.c | 21 +- + fs/proc/thread_self.c | 8 +- + fs/proc/vmcore.c | 6 +- + fs/seq_file.c | 65 ++++- + include/asm-generic/bitops/find.h | 20 ++ + include/asm-generic/bug.h | 1 + + include/linux/bitmap.h | 63 +++-- + include/linux/build_bug.h | 2 - + include/linux/cgroup-defs.h | 5 + + include/linux/compiler-clang.h | 8 + + include/linux/compiler-gcc.h | 15 +- + include/linux/compiler.h | 5 + + include/linux/cpumask.h | 2 +- + include/linux/crash_core.h | 2 + + include/linux/genl_magic_func.h | 12 +- + include/linux/kallsyms.h | 2 +- + include/linux/kasan.h | 15 +- + include/linux/list_lru.h | 3 +- + include/linux/memcontrol.h | 34 +++ + include/linux/memory_hotplug.h | 3 - + include/linux/migrate.h | 7 +- + include/linux/mm.h | 2 + + include/linux/mmzone.h | 2 +- + include/linux/oom.h | 12 +- + include/linux/page-isolation.h | 3 +- + include/linux/sched.h | 5 + + include/linux/sched/signal.h | 3 + + include/linux/seq_file.h | 3 + + include/linux/shrinker.h | 2 +- + include/linux/swap.h | 2 - + include/linux/uuid.h | 1 + + include/uapi/asm-generic/mman-common.h | 3 + + include/uapi/linux/prctl.h | 4 + + include/uapi/linux/sysctl.h | 4 + + include/uapi/linux/uuid.h | 1 - + ipc/mqueue.c | 2 +- + ipc/msg.c | 20 +- + ipc/sem.c | 10 + + ipc/shm.c | 20 +- + ipc/util.c | 5 +- + kernel/async.c | 20 +- + kernel/cgroup/cgroup.c | 13 +- + kernel/compat.c | 2 +- + kernel/configs/tiny.config | 4 + + kernel/cred.c | 1 + + kernel/exit.c | 4 + + kernel/fork.c | 57 ++-- + kernel/futex.c | 20 +- + kernel/kcov.c | 4 +- + kernel/pid.c | 13 + + kernel/ptrace.c | 27 +- + kernel/relay.c | 1 - + kernel/sched/core.c | 2 +- + kernel/sys.c | 11 + + kernel/taskstats.c | 6 +- + lib/Kconfig.debug | 9 +- + lib/Makefile | 2 +- + lib/bitmap.c | 137 ++++------ + lib/cpumask.c | 9 +- + lib/find_bit.c | 59 +++-- + lib/{test_find_bit.c => find_bit_benchmark.c} | 70 +++-- + lib/idr.c | 2 - + lib/radix-tree.c | 2 +- + lib/stackdepot.c | 19 +- + lib/test_bitmap.c | 295 +++++++-------------- + lib/test_kasan.c | 105 ++++++++ + lib/test_sort.c | 6 + + lib/ubsan.c | 64 ++--- + lib/ubsan.h | 17 +- + mm/backing-dev.c | 35 +++ + mm/cma.c | 83 +++++- + mm/compaction.c | 7 +- + mm/huge_memory.c | 6 + + mm/internal.h | 5 +- + mm/kasan/kasan.c | 108 ++++++-- + mm/kasan/kasan.h | 55 +++- + mm/kasan/report.c | 11 +- + mm/list_lru.c | 74 ++++-- + mm/memcontrol.c | 264 ++++++++++++++++++- + mm/memory-failure.c | 18 +- + mm/memory.c | 2 +- + mm/memory_hotplug.c | 9 +- + mm/mempolicy.c | 40 +-- + mm/mempool.c | 6 +- + mm/migrate.c | 357 ++++++++++++-------------- + mm/mlock.c | 6 + + mm/mmap.c | 11 + + mm/oom_kill.c | 210 ++++++++++----- + mm/page_alloc.c | 108 +++++--- + mm/page_isolation.c | 3 +- + mm/page_owner.c | 4 +- + mm/process_vm_access.c | 6 +- + mm/slab.c | 6 +- + mm/slub.c | 10 +- + mm/swap.c | 82 +++--- + mm/swapfile.c | 4 +- + mm/vmscan.c | 59 +---- + net/core/ethtool.c | 53 ++-- + net/ipv6/mcast.c | 8 +- + scripts/Makefile.kasan | 33 ++- + scripts/Makefile.lib | 2 +- + scripts/Makefile.ubsan | 1 - + scripts/checkpatch.pl | 136 ++++++++-- + security/apparmor/lsm.c | 1 + + security/selinux/hooks.c | 1 + + security/yama/yama_lsm.c | 11 +- + tools/cgroup/Makefile | 1 - + tools/gpio/Makefile | 2 - + tools/hv/Makefile | 1 - + tools/iio/Makefile | 2 - + tools/include/asm-generic/bitops/find.h | 16 ++ + tools/laptop/freefall/Makefile | 1 - + tools/leds/Makefile | 1 - + tools/lib/find_bit.c | 40 ++- + tools/lib/subcmd/pager.c | 5 +- + tools/perf/Makefile.perf | 6 - + tools/power/acpi/Makefile.config | 3 - + tools/scripts/Makefile.include | 18 ++ + tools/spi/Makefile | 2 - + tools/usb/Makefile | 1 - + tools/vm/Makefile | 1 - + tools/wmi/Makefile | 1 - + 189 files changed, 2751 insertions(+), 1711 deletions(-) + rename lib/{test_find_bit.c => find_bit_benchmark.c} (69%) +$ 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: ipc/mqueue: add missing error code in init_mqueue_fs() +Applying: net/netfilter/x_tables.c: make allocation less aggressive +Applying: net/netfilter/x_tables.c: remove size check +Applying: arch/score/kernel/setup.c: combine two seq_printf() calls into one call in show_cpuinfo() +Applying: vfs: remove might_sleep() from clear_inode() +Applying: mm/userfaultfd.c: remove duplicate include +Applying: mm: remove unneeded kallsyms include +Applying: hrtimer: remove unneeded kallsyms include +Applying: genirq: remove unneeded kallsyms include +Applying: mm/memblock: memblock_is_map/region_memory can be boolean +Applying: lib/lockref: __lockref_is_dead can be boolean +Applying: kernel/cpuset: current_cpuset_is_being_rebound can be boolean +Applying: kernel/resource: iomem_is_exclusive can be boolean +Applying: kernel/module: module_is_live can be boolean +Applying: kernel/mutex: mutex_is_locked can be boolean +Applying: crash_dump: is_kdump_kernel can be boolean +Applying: certs/blacklist_nohashes.c: fix const confusion in certs blacklist +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +Applying: kasan: rework Kconfig settings +Applying: sparc64: NG4 memset 32 bits overflow +Applying: pipe, sysctl: drop 'min' parameter from pipe-max-size converter +Applying: pipe, sysctl: remove pipe_proc_fn() +Applying: pipe: actually allow root to exceed the pipe buffer limits +Applying: pipe: fix off-by-one error when checking buffer limits +Applying: pipe: reject F_SETPIPE_SZ with size over UINT_MAX +Applying: pipe: simplify round_pipe_size() +Applying: pipe: read buffer limits atomically +Applying: mm: docs: fixup punctuation +Applying: mm: docs: fix parameter names mismatch +Applying: mm: docs: add blank lines to silence sphinx "Unexpected indentation" errors +Applying: MAINTAINERS: remove ANDROID ION pattern +Applying: MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern +Applying: MAINTAINERS: update Cortina/Gemini patterns +Applying: MAINTAINERS: update "ARM/OXNAS platform support" patterns +Applying: maintainers-update-arm-oxnas-platform-support-patterns-fix +Applying: MAINTAINERS: update various PALM patterns +Applying: MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 9258cdd44e58...e6f00959cebd akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (e6f00959cebd MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns) +$ git merge --no-ff akpm/master +Merge made by the 'recursive' strategy. + MAINTAINERS | 21 +++------- + arch/score/kernel/setup.c | 4 +- + arch/sparc/lib/NG4memset.S | 26 ++++++------- + certs/blacklist_nohashes.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + fs/inode.c | 1 - + fs/pipe.c | 57 ++++++++++++---------------- + include/linux/cpuset.h | 6 +-- + include/linux/crash_dump.h | 12 +++--- + include/linux/ioport.h | 2 +- + include/linux/lockref.h | 2 +- + include/linux/memblock.h | 4 +- + include/linux/module.h | 2 +- + include/linux/mutex.h | 4 +- + include/linux/pipe_fs_i.h | 5 +-- + include/linux/sysctl.h | 3 -- + ipc/mqueue.c | 4 +- + kernel/cgroup/cpuset.c | 4 +- + kernel/irq/spurious.c | 1 - + kernel/resource.c | 10 ++--- + kernel/sysctl.c | 33 +++------------- + kernel/time/hrtimer.c | 1 - + lib/Kconfig.debug | 2 +- + lib/Kconfig.kasan | 11 ++++++ + mm/bootmem.c | 2 +- + mm/ksm.c | 2 +- + mm/maccess.c | 2 +- + mm/memblock.c | 6 +-- + mm/memcontrol.c | 6 +-- + mm/memory.c | 4 -- + mm/mlock.c | 2 +- + mm/nommu.c | 2 +- + mm/pagewalk.c | 1 + + mm/process_vm_access.c | 4 +- + mm/swap.c | 4 +- + mm/userfaultfd.c | 1 - + mm/vmscan.c | 1 + + mm/z3fold.c | 4 +- + mm/zbud.c | 4 +- + mm/zpool.c | 46 +++++++++++----------- + net/netfilter/x_tables.c | 11 +++--- + scripts/Makefile.kasan | 2 + + 42 files changed, 146 insertions(+), 179 deletions(-) diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..b5e773c7ca9f --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,17 @@ +Importing dmi based on 4.15 +$ git clone -s -l -n -q . ../quilt-tmp +$ cd ../quilt-tmp +$ git reset --hard d8a5b80568a9cb66810e75b182018e9edb68e8ff +HEAD is now at d8a5b80568a9 Linux 4.15 +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi-optimize-dmi_matches.patch +Applying: firmware: dmi: Optimize dmi_matches +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi-remove-dmi_initialized.patch +Applying: firmware: dmi_scan: Drop dmi_initialized +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi-fix-dmi_empty_string-handling.patch +Applying: firmware: dmi_scan: Fix handling of empty DMI strings +$ git am -s --patch-format=mbox ../quilt/dmi/firmware-dmi-handle-missing-dmi-data-gracefully.patch +Applying: firmware: dmi: handle missing DMI data gracefully +$ cd /home/sfr/kernels/next/next +$ git fetch -f ../quilt-tmp master:dmi/master +From ../quilt-tmp + + 0bcea5c474d1...36a840c73dc6 master -> dmi/master (forced update) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..dbdc1edda55d --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20180205 |