diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-05-10 15:14:23 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-05-10 15:14:23 +1000 |
| commit | a802303934b3bd4df6e2fc8bf2e4ebced1c37556 (patch) | |
| tree | ea89e792c53b696b0c9203bfffe0302b2e06d104 | |
| parent | e3fdf48ac91895c15c123d28cbd4b4623f184de5 (diff) | |
| download | linux-next-a802303934b3bd4df6e2fc8bf2e4ebced1c37556.tar.gz | |
Add linux-next specific files for 20190510next-20190510
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 299 | ||||
| -rw-r--r-- | Next/Trees | 301 | ||||
| -rw-r--r-- | Next/merge.log | 7535 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 8138 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..9a1f3015e57d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,299 @@ +Name SHA1 +---- ---- +origin abde77eb5c66b2f98539c4644b54f34b7e179e6b +fixes d15da9d3fb740429beb0a64023caacfc7fdf2968 +kspp-gustavo ccaa75187a5f1d8131b424160eb90a8a94be287f +kbuild-current a2d635decbfa9c1e4ae15cb05b68b2559f7f827c +arc-current 8b21baee8e48f176fe8916b4bfd94cb22de72c9a +arm-current e17b1af96b2afc38e684aa2f1033387e2ed10029 +arm64-fixes 4e69ecf4da1ee0b2ac735e1f1bb13935acd5a38d +m68k-current fdd20ec8786ab2950439c7e78871618f7e51f18b +powerpc-fixes 12f363511d47f86c49b7766c349989cb33fd61a8 +sparc f4d9a23d3dad0252f375901bf4ff6523a2c97241 +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 36096f2f4fa05f7678bc87397665491700bae757 +bpf 494bc1d281b5a9f02a81249fa566d8c7e390c50c +ipsec 9b3040a6aafd7898ece7fc7efcbca71e42aa8069 +netfilter c6c9c0596c21d30169c7a37b242685dc95fedb07 +ipvs b2e3d68d1251a051a620f9086e18f7ffa6833b5b +wireless-drivers 7a0f8ad5ff6323dd8badfeb01d338db146569976 +mac80211 5f05836831f6142081e216f27e1ae8f4b26d3585 +rdma-fixes 2557fabd6e29f349bfa0ac13f38ac98aa5eafc74 +sound-current ed97c988bdc61ab6fb5d1f5f02a709844557b68f +sound-asoc-fixes 7663ec3c92498ed81940c9efac05d3017042e463 +regmap-fixes 7fdc9fc87492a79b9c7f9dba2311c1fc2b2c6bd4 +regulator-fixes c7b5128f72efc732be776569a862bb4169eb1dbc +spi-fixes c84e8dd1bfcb1fd0996b0b3bc34f0bc6f838706c +pci-current 9c9c5fc89b09a1f915654e97402f0739b9bcdcca +driver-core.current e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +tty.current e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +usb.current e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +usb-gadget-fixes 072684e8c58d17e853f8e8b9f6d9ce2e58d2b036 +usb-serial-fixes 79a3aaa7b82e3106be97842dedfd8429248896e6 +usb-chipidea-fixes d6d768a0ec3c088a88635c64620e1fb34e298aef +phy e6f32efb1b128344a2c7df9875bc1a1abaa1d395 +staging.current e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +char-misc.current 80f232121b69cc69a31ccb2b38c1665d770b0710 +soundwire-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +input-current 3a349763cf11e63534b8f2d302f2d0c790566497 +crypto-current cbc22b062106993980df43a7ffa93351d3218844 +ide 7ad19a99ad431b5cae005c30b09096517058e84e +vfio-fixes 492855939bdb59c6f947b0b5b44af9ad82b7e38c +kselftest-fixes 15ade5d2e7775667cf191cf2f94327a4889f8b9d +modules-fixes be71eda5383faa663efdba9ef54a6b8255e3c7f0 +slave-dma-fixes 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b +backlight-fixes 651022382c7f8da46cb4872a545ee1da6d097d2a +mtd-fixes 9a8f612ca0d6a436e6471c9bed516d34a2cc626f +mfd-fixes a05a2e7998ab1badcf80aed47b5313934fd131fa +v4l-dvb-fixes 7afa8db323e37b9174cf78a1c9ab0ae7a9f5e7dd +reset-fixes 13e8a05b922457761ddef39cfff6231bd4ed9eef +mips-fixes a1e8783db8e0d58891681bc1e6d9ada66eae8e20 +at91-fixes ba5e60c9b75dec92d4c695b928f69300b17d7686 +omap-fixes 1ba12322e2f0934383f111a5e695702aaf46b812 +kvm-fixes e8ab8d24b488632d07ce5ddb261f1d454114415b +kvms390-fixes b10bd9a256aec504c14a7c9b6fccb6301ecf290a +hwmon-fixes b88c5049219a7f322bb1fd65fc30d17472a23563 +nvdimm-fixes c4703ce11c23423d4b46e3d59aef7979814fd608 +btrfs-fixes 0b341c8bfa6d1a7aa51bcb0fae4e4ee30bd5c418 +vfs-fixes 05883eee857eab4693e7d13ebab06716475c5754 +dma-mapping-fixes 8c5165430c0194df92369162d1c7f53f8672baa5 +i3c-fixes 709a53e1948494cc4f6c4636c6f84a4d36a8117e +drivers-x86-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +samsung-krzk-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pinctrl-samsung-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +devicetree-fixes 5fa98c2eda35fcd1a1d91a9785c390f54688240c +scsi-fixes 144ec97493af34efdb77c5aba146e9c7de8d0a06 +drm-fixes e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +amdgpu-fixes f7b1844bacecca96dd8d813675e4d8adec02cd66 +drm-intel-fixes f5c58ba18ab8ea2169670ed880e4d31ed772ad10 +mmc-fixes dc4060a5dc2557e6b5aa813bf5b73677299d62d2 +rtc-fixes 882c5e552ffd06856de42261460f46e18319d259 +gnss-fixes 79a3aaa7b82e3106be97842dedfd8429248896e6 +hyperv-fixes 69c8caafb72dfe5935667756e7d04e8fd2972294 +drm-misc-fixes ab042b824c11502bd39abfdfd4c7f285347d483a +kbuild 34bc9e494242bde2674610d8126ed5c497b8fd24 +compiler-attributes a3b22b9f11d9fbc48b0291ea92259a5a810e9438 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 13bf5ced93775ffccb53527a9d862e023a9daa03 +asm-generic 6edd1dbace0e8529ed167e8a5f9da63c0cc763cc +arc 5908e6b738e3357af42c10e1183753c70a0117a9 +arm 3d3c616177cca070b77ef3f0dbe80d88d86d7bfb +arm64 6127bf372addbade8f5edd9947dda26897ec284b +arm-perf 9bcb929f969e4054732158908b1d70e787ef780f +arm-soc c19ddad911592784e18c6d39a833647876fb74e5 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 64d04a7813d5d31f7527dc3389c27389f288b095 +aspeed e1542521499070f88b18846f676b4cd2a166aee5 +at91 ac650130c22794c21048aeff85fbc60319539a1d +bcm2835 1ee128f4fff29c1938f25160b0dafbe9feb57d1f +imx-mxs d9c3322a2906dd52de87e809de6d6c4a3b6289c5 +keystone 3c3a43c81bdaaec61aef208f94e8273b0309635c +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu 891f0f865c373499b7204e9e0029c94311a6bd34 +omap 481df0abf8cf8c0977dbd0361ec245a03bf266cb +reset d005aa750c9b7ca7f77dafd6dda33a0fcb6e7ae3 +qcom 1d31c0b1a28aa9fdb6000066f5b9c495788f70fd +renesas 982700f80241a849fdd8031763f65263216c5400 +rockchip 9c539071723e13b493d9d8fa9b4409f346acd2be +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 831c757827724519ab6b79c1ff55868632080386 +sunxi 613c4ce8fddb5cc0e4061d4d024b00aef7135b4f +tegra 0c0ffecf65fdd092d61a3340e47e293b04721b00 +clk c1157f60d72e8b20efc670cef28883832f42406c +clk-samsung 3c297d9e65d8cef2431c9865ece92722be028393 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky a691f3334d58b833e41d56de1b9820e687edcd78 +h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k fdd20ec8786ab2950439c7e78871618f7e51f18b +m68knommu 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips 3751cbda8f223549d7ea28803cbec8ac87e43ed2 +nds32 d4d45d2d7790f5d173882f44c6aaf2bba10338cd +nios2 21e6bff5e0ef0033d776e64c40e6873d7c75e74b +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 98429dded340606763bb11fa0cd8860378144c25 +powerpc 8150a153c013aa2dd1ffae43370b89ac1347a7fb +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v e23fc917f04ffac8c156fdb4ee8b56f3867fa50b +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 a698e1372800b7e5dde2e461c1d3948c2e06032a +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml 1987b1b8f9f17a06255877e7917d0bb5b5377774 +xtensa 0542593fff0fa9007a1856b34ea91bb6341a24e7 +fscrypt 2c58d548f5706d085c4b009f6abb945220460632 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 6fc9f4e59957ae7aab02c2a32d4d750cc1d71414 +ceph 00abf69dd24f4444d185982379c5cc3bb7b6d1fc +cifs d1c35afb0892fc8b334ee0ce0902155d2cfb118c +configfs 35399f87e271f7cf3048eab00a421a6519ac8441 +ecryptfs d43388dea04b18f516bd7c837d9222fe7309b12d +ext3 91e9f2c1d861697e0079a9f6742da164a173de59 +ext4 db90f41916cf04c020062f8d8b0385942248283e +f2fs 2777e654371dd4207a3a7f4fb5fa39550053a080 +fuse 9031a69cf9f024a3040c0ed8b8ab01aecd196388 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd +nfs-anna 5940d1cf9f42f67e9cc3f7df9eda39f5888d6e9e +nfsd 1c73b9d24f804935dbb06527b768f8f068c93472 +orangefs 33713cd09ccdc1e01b10d0782ae60200d4989553 +overlayfs acf3062a7e1ccf67c6f7e7c28671a6708fde63b0 +ubifs 04d37e5a8b1fad2d625727af3d738c6fd9491720 +v9fs bb06c388fa20ae24cfe80c52488de718a7e3a53f +xfs 8869a2d297cbad848b3a766726adadcaf42d6b60 +file-locks 945ab8f6de94430c23a82f3cf2e3f6d6f2945ff7 +vfs 6e14c3cf8bc4f173e6100494411a8077c24d10b0 +printk 3ba3fee931aa519741c7de23732ccf1d908965f1 +pci ff3e01b7502096dae5fdee1ae2846f7f4ef6c27c +pstore 0be6a6927254061a87d5c09c09712c7a1df69f61 +hid eb18d12154054d0d7887bd891451e0d9b5a5574c +i2c 8d1d950a607217cb980fec8e983a228c3b5c38ae +i3c 476c7e1d34f2a03b1aa5a924c50703053fe5f77c +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging 39abe9d88b30a51029b0b29a708a4f4459034565 +jc_docs afbd4d42470e91470bc59040094b89cd717530bd +v4l-dvb 1199fa8c0ddd34dae6d72b653b27dfb3554e9b57 +v4l-dvb-next 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fbdev d4a5611743a6f5d126f8cbfdbf29e12fd8d1b73f +pm ff9cb8b1104e6e530f3aa30ffb11858599292ce7 +cpufreq-arm 8db82563451f976597ab7b282ec655e4390a4088 +cpupower 21027e78e7c17fa84437351a845009ff284b33c9 +opp 2f36bde0fc8f1ab79d54bd2caa7c1cf874fd2206 +thermal fc15b6af30c96deaf196aa7905dfda414d69cb37 +thermal-soc 8834f5600cf3c8db365e18a3d5cac2c2780c81e5 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm 54cca4bad0764cbac8e1c77cf5767663def5b0f5 +swiotlb 063b8271ec8f706d833e61dfca40c512504a62c1 +rdma b79656ed44c6865e17bcd93472ec39488bcc4984 +net-next 601e6bcc4ef02bda2831d5ac8133947b5edf597b +bpf-next 80f232121b69cc69a31ccb2b38c1665d770b0710 +ipsec-next bb9cd077e216b886438c5698e1cd75f762ecd3c9 +mlx5-next 91a40a48d52d13fbde3239d5839335cabd9a4eae +netfilter-next 54516da1ea859dd4f56ebba2e483d2df9d7c8a32 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e2f7cc72cbf42e037229d8bd998966569662442f +wireless-drivers-next f9b628d61faef9b6d411f13cf4be41470b7a7adb +bluetooth 62a91990f4c52f0b56cfae3e4093a27ed61c49db +mac80211-next 80f232121b69cc69a31ccb2b38c1665d770b0710 +gfs2 f4686c26ecc34e8e458b8235f0af5198c9b13bfd +mtd 3008ba87093852f3756c5d33f584602e5e2a4aa4 +nand 1c14fe2167ef4294b41949bcc372ea39c0510c00 +spi-nor e43f53c22a937d024f070907d02539e413f20c15 +crypto e59f755ceb6d6f39f90899d2a4e39c3e05837e12 +drm eb85d03e01c3e9f3b0ba7282b2e3515a635decb2 +amdgpu 963040e6ae2d07cb2307a23d5a206bcf25b353b3 +drm-intel 23372cce8fe7ee98a6458fd3d035a55b87f0c6fe +drm-tegra 61b51fb51c01a519a249d28ec55c6513a13be5a3 +drm-misc eb85d03e01c3e9f3b0ba7282b2e3515a635decb2 +drm-msm b02872df58aca66d0e7af3ec5065dbc6f0630dd1 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp 15e9122d9b5c745024f2d9d5653caed1f37c185f +imx-drm 5d5fe9970c76ddf9c98ff6b56278bed6cb6b15b3 +etnaviv 2b76f5be7c2778ee2f6bacddc19248f6a4a467a0 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 615c4d9a50e25645646c3bafa658aedc22ab7ca9 +sound ed97c988bdc61ab6fb5d1f5f02a709844557b68f +sound-asoc 898d2e8d8730ee5d868f3cba8ef6ba4a9ed227e4 +modules dadec066d8fa7da227f623f632ea114690fecaf8 +input 0981949da8f7498b96c6e0ae60680865ca283bf1 +block e35d0b782065fc5d20632d051f35e6eea74e0287 +device-mapper 05d6909ea9d62bb357846177a84842e09fc15914 +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 0a49a619e7e1aeb3f5f5511ca59314423c83dae2 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 160f839373c45ad96ec0486ae1738b2e4a5813ef +backlight 53fa0f87177d1159512573e47bf3b0ec0665f470 +battery 09eb8b7c5adcc5d1d1908d78237dd7ae1d8605b6 +regulator e2a23affe6a6a15111ae56edd7e4f3c9673ef201 +security 5664f5faac1148d5ff9060644357fc0079aa0182 +apparmor 058c4f342582362c75dd5e162dc4ff73a392ffad +integrity a2ffe5774e8e4fa9d4f743ca6a25fa3cef046fbd +selinux 35a196bef449b5824033865b963ed9a43fb8c730 +tpmdd ff89e2f4b34dda492f4a14bad212ef9de570879c +watchdog a9f0bda567e32a2b44165b067adfc4a4f56d1815 +iommu b5531563e8a0b8fcc5344a38d1fad9217e08e09b +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 15c80c1659f27364734a3938b04d1c67479aa11c +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 70c4cf17e445264453bc5323db3e50aa0ac9e81f +devicetree 2a656cb5a4a3473c5fc6bf4fddc3560ceed53220 +mailbox 8fbbfd966efa67ef9aec37cb4ff412f9f26e1e84 +spi e40f7182cbdb08cd696fb777423653093b4e31ee +tip f8d6805068ad8dbef2489f6e02ca73c1d84517d7 +clockevents 8c9374068ef6dc3fdf244484b4711a6e10c84d1a +edac-amd 8de9930a4618811edfaebc4981a9fafff2af9170 +irqchip 16e32c3cde7763ab875b9030b443ecbc8e352d8a +ftrace 03197fc02b356606355d7ede343b18e3e3737771 +rcu 91df49e187c1a111e423fe0c3aec3472980385e4 +kvm 3a1e5e4a2c7a1ec63e6d70a7e921f62bcbb57b85 +kvm-arm 9eecfc22e0bfc7a4c8ca007f083f0ae492d6e891 +kvm-ppc 0caecf5b00199636eb2d32201199ecd6be52558d +kvms390 b2d0371d2e374facd45e115d3668086df13730ff +xen-tip fe846979d30576107aa9910e1820fec3c20e62d7 +percpu 558ac86039fc21774e2d33aa191996fbd0a4ed63 +workqueues 24acfb71822566e4d469b4992a7b3b9f873e0083 +drivers-x86 6456fd731517f473eac033f898d40ae76b160183 +chrome-platform cdb80268a6b553a25d37b688775fc204d487cc10 +hsi 1ff85bfa1614df6cacec780cd5922dc0b1c340c7 +leds 0db37915d912e8dc6588f25da76d3ed36718d92f +ipmi a2d635decbfa9c1e4ae15cb05b68b2559f7f827c +driver-core e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +usb e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +usb-gadget 2e487d280525b91b03976203b15aba365ec5b4e6 +usb-serial 7f6fc50242d11d4fedab9cf6c5e8af368c076ccd +usb-chipidea-next bc65fae4b1f01e269dad0cf62d721107d6bc93e2 +phy-next 708310711e6cdc1f5d8fb1d3fb531fba09ebae2e +tty e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +char-misc 80f232121b69cc69a31ccb2b38c1665d770b0710 +extcon 00053de52231117ddc154042549f2256183ffb86 +soundwire 4abbd783d126cabfc20d1b8d50b1d5026b5cba09 +thunderbolt 37209783c73a47692dbf1e6b2dba0d07f6ce24b3 +staging e7a1414f9dc3498c4c35b9ca266d539e8bccab53 +mux 561eb7335f13dc8457cb5a4b2e4ed7b77ef17cbc +icc 83fdb2dfb0c2925f253449677830ed11461ac5c8 +slave-dma f33e7bb3eb922618612a90f0a828c790e8880773 +cgroup 2781a652edd4138db53cbae4e01404a4ee905b88 +scsi 7004db783df50f28a8e95a98f2ba93de73183365 +scsi-mkp d4023db71108375e4194e92730ba0d32d7f07813 +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 4e76105b74c1fe63409864f12b042478c089e02c +rpmsg 6e9b4f32f9fabad43a0fe2fc3acd5468edd69c86 +gpio 0fbee1df2078fa1f61e2da14f51ceb357c79ae69 +gpio-brgl b0d2569d8276439eb3d6f7d221f47bfc503ae00e +pinctrl e0e31695b53b649dc2784c4dd517bcdd09bce189 +pinctrl-samsung 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pwm f41efceb46e697a750e93c19e4579dc50697effe +userns cf43a757fd49442bc38f76088b70c2299eed2c2f +ktest 37e1677330bdc2e96e70f18701e589876f054c67 +random b7d5dc21072cda7124d13eae2aefb7343ef94197 +kselftest c3c599281f2b9915200fe0390afe1ae7aca69feb +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching 591be2f7f7b5421cd5eaf7c870df3520d0e837fe +coresight 78e6427b4e7b017951785982f7f97cf64e2d624b +rtc dacb6a4035a010e41abaf81c1cfe2beadfb05ec8 +nvdimm 1ffc664f9b8ca7346f2af0fb4f62b923193bf65c +at24 d333bad1f6f3e0df224db181c991fb8d65bbc2be +ntb 6202b3c150bc1067b058d8327894016cfacadbd5 +kspp 7f6563fc1e6bfca7b03d7faf9167409470305971 +init_task e1e871aff3ded26348c631b1370e257d401cd22d +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +gnss 7cc10c5cb14397d61d203d0a319ef796d4f6d943 +fsi d20810530b7109a95abef5130e6dcec09c5180d7 +siox 1e4b044d22517cae7047c99038abb444423243ca +slimbus 80471330ec58a212ce516d239d257600e383ee54 +nvmem 889ba60c36ceddb600ec4dcb2ccf54742d9a2b8b +xarray dd12805ed1db79bdad53ce0fb8d69e48feada10c +hyperv a3fb7bf369efa296c1fc68aead1b6fb3c735573b +auxdisplay cc5d04d840d62d7c75e268c51da7cd0be2ee03c0 +kgdb-dt 51fee3389d71bfd281df02c55546a6103779e145 +pidfd eb364bbe6791d3087a4d3411d9b040e61d9547be +devfreq cf451adfa392bd9ba36f31659dbe6a5010b46ef9 +akpm-current b78fc46079e444c5bdf3c2b843cccc2a195d1f75 +akpm f1de864ef49f672322ff431494d8cde2631953a8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..b02eb7d18429 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,301 @@ +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 +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless-drivers git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git#master +mac80211 git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +usb-chipidea-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/usb.git#ci-for-usb-stable +phy git git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +ide git git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux.git#modules-linus +slave-dma-fixes git git://git.infradead.org/users/vkoul/slave-dma.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#master +drivers-x86-fixes git git://git.infradead.org/linux-platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#pinctrl-fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-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 +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +leaks git https://git.kernel.org/pub/scm/linux/kernel/git/tobin/leaks.git#leaks-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 +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +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/at91/linux-at91.git#at91-next +bcm2835 git git://github.com/anholt/linux.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.infradead.org/linux-mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git#for-next +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 +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 +csky git git://github.com/c-sky/csky-linux.git#linux-next +h8300 git git://git.sourceforge.jp/gitroot/uclinux-h8/linux.git#h8300-next +ia64 git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git#next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nds32 git git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux.git#next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +fsl git git://git.kernel.org/pub/scm/linux/kernel/git/scottwood/linux.git#next +risc-v-pjw git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/riscv.git#for-next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/palmer/riscv-linux.git#for-next +sifive git git://git.kernel.org/pub/scm/linux/kernel/git/pjw/sifive.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/fs/fscrypt/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 +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +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/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/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 +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git#next +thermal-soc git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git#next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +swiotlb git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git#linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#master +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +nfc-next git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +wireless-drivers-next git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +mac80211-next git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git#master +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +amdgpu git git://people.freedesktop.org/~agd5f/linux#drm-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 https://gitlab.freedesktop.org/drm/msm.git#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 +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 +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git#kgdb-next +md git git://git.kernel.org/pub/scm/linux/kernel/git/shli/md.git#for-next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next-testing +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +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-amd git git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#linux-next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvm-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/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.infradead.org/linux-platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.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 +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#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 +icc git git://git.linaro.org/people/georgi.djakov/linux.git#icc-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 +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 +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/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 +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/livepatching/livepatching#for-next +coresight git git://git.linaro.org/kernel/coresight.git#next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +init_task git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#init_task +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/benh/linux-fsi.git#master +siox git https://git.pengutronix.de/git/ukl/linux#siox/next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/linux-dax.git#xarray +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb-dt git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/mzx/devfreq.git#for-next +akpm-current mmotm https://www.ozlabs.org/~akpm/mmotm/ +akpm mmotm https://www.ozlabs.org/~akpm/mmotm/ diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..b1315678f477 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,7535 @@ +$ date -R +Fri, 10 May 2019 07:55:45 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at ef75bd71c5d3 Merge tag 'gfs2-for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 +Merging origin/master (abde77eb5c66 Merge branch 'for-5.2' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup) +$ git merge origin/master +Updating ef75bd71c5d3..abde77eb5c66 +Fast-forward + Documentation/DMA-API-HOWTO.txt | 13 +- + Documentation/admin-guide/cgroup-v2.rst | 27 + + Documentation/admin-guide/kernel-parameters.txt | 5 +- + .../bindings/display/amlogic,meson-dw-hdmi.txt | 4 + + .../bindings/display/amlogic,meson-vpu.txt | 9 +- + .../bindings/display/bridge/ti,tfp410.txt | 32 +- + .../devicetree/bindings/display/msm/gmu.txt | 10 +- + .../devicetree/bindings/display/msm/gpu.txt | 11 + + .../display/panel/feiyang,fy07024di26a30d.txt | 20 + + .../bindings/display/panel/innolux,p079zca.txt | 2 +- + .../bindings/display/panel/innolux,p097pfg.txt | 2 +- + .../display/panel/kingdisplay,kd097d04.txt | 2 +- + .../bindings/display/panel/lg,acx467akm-7.txt | 7 + + .../display/panel/osddisplays,osd070t1718-19ts.txt | 12 + + .../display/panel/rocktech,jh057n00900.txt | 18 + + .../bindings/display/panel/ronbo,rb070d30.yaml | 51 + + .../bindings/display/panel/tpo,td028ttec1.txt | 2 + + .../display/rockchip/rockchip,rk3066-hdmi.txt | 72 + + .../devicetree/bindings/display/ste,mcde.txt | 104 + + .../devicetree/bindings/dma/adi,axi-dmac.txt | 4 +- + .../bindings/dma/nvidia,tegra210-adma.txt | 4 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.txt | 92 + + .../devicetree/bindings/gpu/aspeed-gfx.txt | 41 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 11 +- + .../devicetree/bindings/sound/adi,axi-i2s.txt | 7 +- + .../devicetree/bindings/sound/amlogic,axg-fifo.txt | 4 +- + .../devicetree/bindings/sound/amlogic,axg-pdm.txt | 3 +- + .../bindings/sound/amlogic,axg-spdifin.txt | 3 +- + .../bindings/sound/amlogic,axg-spdifout.txt | 3 +- + .../bindings/sound/amlogic,axg-tdm-formatters.txt | 4 +- + .../devicetree/bindings/sound/cirrus,lochnagar.txt | 39 + + .../devicetree/bindings/sound/cs42l51.txt | 16 + + Documentation/devicetree/bindings/sound/da7219.txt | 8 +- + .../devicetree/bindings/sound/fsl,audmix.txt | 50 + + .../devicetree/bindings/sound/mchp-i2s-mcc.txt | 43 + + .../bindings/sound/mt8183-da7219-max98357.txt | 15 + + .../sound/mt8183-mt6358-ts3a227-max98357.txt | 15 + + .../devicetree/bindings/sound/renesas,rsnd.txt | 8 +- + .../devicetree/bindings/sound/rockchip,pdm.txt | 5 + + Documentation/devicetree/bindings/sound/rt5651.txt | 5 + + .../devicetree/bindings/sound/simple-amplifier.txt | 2 +- + .../devicetree/bindings/sound/simple-card.txt | 2 + + .../devicetree/bindings/sound/sprd-mcdt.txt | 19 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + Documentation/driver-api/component.rst | 2 + + Documentation/driver-model/devres.txt | 3 + + Documentation/gpu/drm-internals.rst | 5 + + Documentation/gpu/drm-kms-helpers.rst | 18 + + Documentation/gpu/kms-properties.csv | 1 - + Documentation/gpu/meson.rst | 6 - + Documentation/gpu/tinydrm.rst | 30 +- + Documentation/gpu/todo.rst | 12 +- + .../sound/kernel-api/writing-an-alsa-driver.rst | 4 +- + MAINTAINERS | 79 +- + arch/arm/kernel/dma-isa.c | 8 +- + arch/arm/mach-rpc/dma.c | 8 +- + arch/arm64/Kconfig | 1 + + arch/csky/Kconfig | 1 + + arch/mips/Kconfig | 64 +- + arch/mips/bcm47xx/Kconfig | 8 +- + arch/mips/bcm63xx/boards/Kconfig | 2 +- + arch/mips/configs/generic_defconfig | 1 + + arch/mips/include/asm/bootinfo.h | 1 + + arch/mips/include/asm/jump_label.h | 15 +- + arch/mips/include/asm/uasm.h | 8 + + arch/mips/include/uapi/asm/inst.h | 6 +- + arch/mips/kernel/entry.S | 5 +- + arch/mips/kernel/jump_label.c | 30 +- + arch/mips/kernel/prom.c | 18 +- + arch/mips/kernel/setup.c | 129 +- + arch/mips/kernel/traps.c | 63 +- + arch/mips/kvm/emulate.c | 4 +- + arch/mips/mm/uasm-mips.c | 14 + + arch/mips/mm/uasm.c | 39 +- + arch/mips/net/Makefile | 1 - + arch/mips/net/bpf_jit.c | 1270 -------- + arch/mips/net/bpf_jit_asm.S | 285 -- + arch/mips/net/ebpf_jit.c | 191 +- + arch/mips/pic32/Kconfig | 8 +- + arch/mips/vdso/Makefile | 4 +- + arch/x86/include/asm/dma-mapping.h | 10 - + arch/x86/kernel/amd_gart_64.c | 6 - + arch/x86/kernel/early-quirks.c | 4 +- + arch/x86/kernel/ima_arch.c | 10 +- + arch/x86/kernel/pci-dma.c | 20 - + drivers/dma-buf/Makefile | 3 +- + drivers/dma-buf/dma-fence-chain.c | 242 ++ + drivers/dma-buf/reservation.c | 8 + + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 3 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/amba-pl08x.c | 22 +- + drivers/dma/at_xdmac.c | 67 +- + drivers/dma/bcm-sba-raid.c | 3 +- + drivers/dma/bcm2835-dma.c | 1 - + drivers/dma/dma-axi-dmac.c | 116 +- + drivers/dma/fsl-edma-common.h | 2 +- + drivers/dma/fsl-edma.c | 6 +- + drivers/dma/idma64.c | 15 +- + drivers/dma/idma64.h | 2 + + drivers/dma/imx-sdma.c | 15 +- + drivers/dma/nbpfaxi.c | 4 +- + drivers/dma/pl330.c | 61 +- + drivers/dma/sh/rcar-dmac.c | 4 +- + drivers/dma/stm32-dma.c | 103 +- + drivers/dma/tegra210-adma.c | 269 +- + drivers/dma/xgene-dma.c | 6 +- + drivers/gpu/drm/Kconfig | 20 +- + drivers/gpu/drm/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 41 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 61 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 61 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 54 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 152 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_csa.c | 9 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 82 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 59 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 521 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 299 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 32 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 1482 +++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 294 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 50 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 941 ++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 127 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 270 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 109 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 172 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 16 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 19 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 205 ++ + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 65 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 652 ++-- + drivers/gpu/drm/amd/amdgpu/kv_dpm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 78 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 3 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 95 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 36 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 238 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 8 +- + drivers/gpu/drm/amd/amdgpu/si_dpm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 30 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 108 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 18 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 3 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 16 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 4 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1892 ++++++++---- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 18 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 53 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 194 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 22 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 21 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 126 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 5 + + drivers/gpu/drm/amd/display/dc/calcs/dcn_calcs.c | 220 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 164 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 24 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 196 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 383 ++- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 195 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 121 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 13 + + drivers/gpu/drm/amd/display/dc/dc.h | 134 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 76 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 9 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 10 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 146 +- + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 30 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 42 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.h | 22 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 8 +- + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 5 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 36 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 78 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 119 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 92 +- + .../drm/amd/display/dc/dce112/dce112_resource.h | 3 +- + .../drm/amd/display/dc/dce120/dce120_resource.c | 25 + + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 45 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 65 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c | 13 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_cm.c | 7 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c | 20 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 54 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 63 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 16 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 213 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.h | 4 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 16 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 52 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.h | 2 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 31 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 2 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 31 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 36 +- + drivers/gpu/drm/amd/display/dc/dm_services_types.h | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.c | 40 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 5 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 5 +- + .../amd/display/dc/dml/display_rq_dlg_helpers.c | 3 + + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 10 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 6 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 7 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/reg_helper.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 14 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 7 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 7 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 6 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 40 +- + .../display/dc/virtual/virtual_stream_encoder.c | 3 +- + drivers/gpu/drm/amd/display/include/fixed31_32.h | 2 + + drivers/gpu/drm/amd/display/include/signal_types.h | 5 + + .../drm/amd/display/modules/color/color_gamma.c | 2 + + .../drm/amd/display/modules/freesync/freesync.c | 174 +- + .../drm/amd/display/modules/power/power_helpers.c | 15 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h | 8 + + .../drm/amd/include/asic_reg/vcn/vcn_1_0_offset.h | 2 + + .../drm/amd/include/asic_reg/vcn/vcn_1_0_sh_mask.h | 5 + + drivers/gpu/drm/amd/include/atomfirmware.h | 98 +- + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 16 - + drivers/gpu/drm/amd/include/linux/chash.h | 366 --- + drivers/gpu/drm/amd/lib/Kconfig | 28 - + drivers/gpu/drm/amd/lib/Makefile | 32 - + drivers/gpu/drm/amd/lib/chash.c | 638 ---- + drivers/gpu/drm/amd/powerplay/Makefile | 2 +- + drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 10 +- + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 1253 ++++++++ + drivers/gpu/drm/amd/powerplay/hwmgr/Makefile | 3 +- + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 2 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 127 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 32 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.c | 66 + + drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.h | 31 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 39 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.h | 5 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 39 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 119 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.h | 29 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 5 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_inc.h | 2 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 12 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.h | 1 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 53 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.h | 2 + + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 770 +++++ + drivers/gpu/drm/amd/powerplay/inc/rv_ppsmc.h | 1 - + drivers/gpu/drm/amd/powerplay/inc/smu10.h | 14 +- + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 89 + + .../gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h | 128 + + .../gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h | 147 + + drivers/gpu/drm/amd/powerplay/inc/vega20_ppsmc.h | 3 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 1977 ++++++++++++ + .../gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c | 4 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c | 20 + + .../gpu/drm/amd/powerplay/smumgr/vega20_smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 2413 +++++++++++++++ + drivers/gpu/drm/amd/powerplay/vega20_ppt.h | 129 + + .../gpu/drm/arm/display/include/malidp_product.h | 12 + + drivers/gpu/drm/arm/display/include/malidp_utils.h | 31 + + drivers/gpu/drm/arm/display/komeda/Makefile | 8 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 685 +++++ + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 431 ++- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h | 50 + + drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h | 530 ++++ + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 407 ++- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 118 + + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 95 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 9 +- + .../drm/arm/display/komeda/komeda_framebuffer.h | 9 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 77 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 26 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 113 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 129 +- + .../drm/arm/display/komeda/komeda_pipeline_state.c | 610 ++++ + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 139 + + .../drm/arm/display/komeda/komeda_private_obj.c | 220 +- + drivers/gpu/drm/arm/malidp_drv.c | 48 +- + drivers/gpu/drm/arm/malidp_drv.h | 6 + + drivers/gpu/drm/arm/malidp_hw.c | 249 +- + drivers/gpu/drm/arm/malidp_hw.h | 31 +- + drivers/gpu/drm/arm/malidp_mw.c | 10 +- + drivers/gpu/drm/arm/malidp_planes.c | 271 +- + drivers/gpu/drm/arm/malidp_regs.h | 20 + + drivers/gpu/drm/armada/armada_fbdev.c | 6 +- + drivers/gpu/drm/aspeed/Kconfig | 14 + + drivers/gpu/drm/aspeed/Makefile | 3 + + drivers/gpu/drm/aspeed/aspeed_gfx.h | 104 + + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 241 ++ + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 269 ++ + drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 42 + + drivers/gpu/drm/ast/ast_drv.h | 4 +- + drivers/gpu/drm/ast/ast_fb.c | 7 +- + drivers/gpu/drm/ast/ast_ttm.c | 10 +- + drivers/gpu/drm/bochs/bochs.h | 9 +- + drivers/gpu/drm/bochs/bochs_kms.c | 194 +- + drivers/gpu/drm/bochs/bochs_mm.c | 10 +- + drivers/gpu/drm/bridge/dumb-vga-dac.c | 6 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 140 +- + drivers/gpu/drm/cirrus/Kconfig | 2 +- + drivers/gpu/drm/cirrus/Makefile | 3 - + drivers/gpu/drm/cirrus/cirrus.c | 657 ++++ + drivers/gpu/drm/cirrus/cirrus_drv.c | 161 - + drivers/gpu/drm/cirrus/cirrus_drv.h | 4 +- + drivers/gpu/drm/cirrus/cirrus_fbdev.c | 315 -- + drivers/gpu/drm/cirrus/cirrus_main.c | 328 -- + drivers/gpu/drm/cirrus/cirrus_mode.c | 621 ---- + drivers/gpu/drm/cirrus/cirrus_ttm.c | 10 +- + drivers/gpu/drm/drm_atomic.c | 45 +- + drivers/gpu/drm/drm_atomic_helper.c | 19 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 4 + + drivers/gpu/drm/drm_atomic_uapi.c | 71 +- + drivers/gpu/drm/drm_auth.c | 21 +- + drivers/gpu/drm/drm_bufs.c | 8 + + drivers/gpu/drm/drm_client.c | 11 +- + drivers/gpu/drm/drm_connector.c | 97 +- + drivers/gpu/drm/drm_crtc.c | 4 + + drivers/gpu/drm/drm_crtc_internal.h | 1 + + drivers/gpu/drm/drm_dp_mst_topology.c | 1 - + drivers/gpu/drm/drm_drv.c | 223 +- + drivers/gpu/drm/drm_dsc.c | 269 +- + drivers/gpu/drm/drm_edid.c | 105 +- + drivers/gpu/drm/drm_fb_helper.c | 302 +- + drivers/gpu/drm/drm_file.c | 26 +- + drivers/gpu/drm/drm_format_helper.c | 324 ++ + drivers/gpu/drm/drm_fourcc.c | 27 + + drivers/gpu/drm/drm_gem.c | 320 +- + drivers/gpu/drm/drm_gem_cma_helper.c | 8 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 625 ++++ + drivers/gpu/drm/drm_internal.h | 10 + + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 86 +- + drivers/gpu/drm/drm_irq.c | 2 + + drivers/gpu/drm/drm_kms_helper_common.c | 2 +- + drivers/gpu/drm/drm_lease.c | 13 +- + drivers/gpu/drm/drm_legacy.h | 87 +- + drivers/gpu/drm/drm_legacy_misc.c | 82 + + drivers/gpu/drm/drm_lock.c | 19 + + drivers/gpu/drm/drm_memory.c | 26 +- + drivers/gpu/drm/drm_mode_config.c | 5 +- + drivers/gpu/drm/drm_mode_object.c | 5 +- + drivers/gpu/drm/drm_modes.c | 12 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 13 + + drivers/gpu/drm/drm_plane.c | 8 + + drivers/gpu/drm/drm_prime.c | 1 + + drivers/gpu/drm/drm_print.c | 28 + + drivers/gpu/drm/drm_syncobj.c | 449 ++- + drivers/gpu/drm/drm_vm.c | 6 +- + drivers/gpu/drm/drm_writeback.c | 73 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 40 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.h | 4 - + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 7 - + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 22 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 6 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 6 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 26 +- + drivers/gpu/drm/exynos/exynos_dp.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 9 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 30 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 97 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 48 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 51 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 35 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 72 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.c | 71 +- + drivers/gpu/drm/exynos/exynos_drm_ipp.h | 9 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 29 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 15 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 6 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 49 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 75 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 43 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 2 +- + drivers/gpu/drm/gma500/framebuffer.c | 7 +- + drivers/gpu/drm/gma500/framebuffer.h | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_fbdev.c | 9 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 7 - + drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c | 12 +- + drivers/gpu/drm/i915/.gitignore | 1 + + drivers/gpu/drm/i915/Makefile | 8 +- + drivers/gpu/drm/i915/Makefile.header-test | 47 + + drivers/gpu/drm/i915/gvt/Makefile | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 74 +- + drivers/gpu/drm/i915/gvt/display.c | 1 - + drivers/gpu/drm/i915/gvt/dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/execlist.c | 28 +- + drivers/gpu/drm/i915/gvt/execlist.h | 2 +- + drivers/gpu/drm/i915/gvt/gtt.c | 7 + + drivers/gpu/drm/i915/gvt/gtt.h | 2 +- + drivers/gpu/drm/i915/gvt/gvt.h | 17 +- + drivers/gpu/drm/i915/gvt/handlers.c | 189 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 2 +- + drivers/gpu/drm/i915/gvt/mmio.c | 8 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 247 +- + drivers/gpu/drm/i915/gvt/reg.h | 34 + + drivers/gpu/drm/i915/gvt/scheduler.c | 39 +- + drivers/gpu/drm/i915/gvt/scheduler.h | 6 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 6 +- + drivers/gpu/drm/i915/i915_active.c | 23 +- + drivers/gpu/drm/i915/i915_active.h | 16 - + drivers/gpu/drm/i915/i915_cmd_parser.c | 12 +- + drivers/gpu/drm/i915/i915_debugfs.c | 173 +- + drivers/gpu/drm/i915/i915_drv.c | 622 ++-- + drivers/gpu/drm/i915/i915_drv.h | 408 +-- + drivers/gpu/drm/i915/i915_gem.c | 780 ++--- + drivers/gpu/drm/i915/i915_gem.h | 9 +- + drivers/gpu/drm/i915/i915_gem_context.c | 1101 +++++-- + drivers/gpu/drm/i915/i915_gem_context.h | 260 +- + drivers/gpu/drm/i915/i915_gem_context_types.h | 175 ++ + drivers/gpu/drm/i915/i915_gem_dmabuf.c | 3 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 18 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 42 +- + drivers/gpu/drm/i915/i915_gem_fence_reg.c | 156 +- + drivers/gpu/drm/i915/i915_gem_gtt.c | 141 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 26 +- + drivers/gpu/drm/i915/i915_gem_internal.c | 2 +- + drivers/gpu/drm/i915/i915_gem_object.c | 42 + + drivers/gpu/drm/i915/i915_gem_object.h | 8 +- + drivers/gpu/drm/i915/i915_gem_render_state.c | 4 +- + drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/i915_gem_tiling.c | 6 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 6 +- + drivers/gpu/drm/i915/i915_globals.c | 125 + + drivers/gpu/drm/i915/i915_globals.h | 35 + + drivers/gpu/drm/i915/i915_gpu_error.c | 183 +- + drivers/gpu/drm/i915/i915_gpu_error.h | 51 +- + drivers/gpu/drm/i915/i915_irq.c | 665 ++-- + drivers/gpu/drm/i915/i915_pci.c | 262 +- + drivers/gpu/drm/i915/i915_perf.c | 114 +- + drivers/gpu/drm/i915/i915_pmu.c | 67 +- + drivers/gpu/drm/i915/i915_priolist_types.h | 42 + + drivers/gpu/drm/i915/i915_pvinfo.h | 2 +- + drivers/gpu/drm/i915/i915_query.c | 39 +- + drivers/gpu/drm/i915/i915_reg.h | 571 ++-- + drivers/gpu/drm/i915/i915_request.c | 498 ++- + drivers/gpu/drm/i915/i915_request.h | 87 +- + drivers/gpu/drm/i915/i915_reset.c | 621 ++-- + drivers/gpu/drm/i915/i915_reset.h | 16 +- + drivers/gpu/drm/i915/i915_scheduler.c | 112 +- + drivers/gpu/drm/i915/i915_scheduler.h | 95 +- + drivers/gpu/drm/i915/i915_scheduler_types.h | 72 + + drivers/gpu/drm/i915/i915_suspend.c | 4 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 43 +- + drivers/gpu/drm/i915/i915_sw_fence.h | 16 +- + drivers/gpu/drm/i915/i915_timeline.c | 301 +- + drivers/gpu/drm/i915/i915_timeline.h | 89 +- + drivers/gpu/drm/i915/i915_timeline_types.h | 70 + + drivers/gpu/drm/i915/i915_trace.h | 106 +- + drivers/gpu/drm/i915/i915_user_extensions.c | 61 + + drivers/gpu/drm/i915/i915_user_extensions.h | 20 + + drivers/gpu/drm/i915/i915_utils.h | 31 + + drivers/gpu/drm/i915/i915_vgpu.c | 11 +- + drivers/gpu/drm/i915/i915_vgpu.h | 2 +- + drivers/gpu/drm/i915/i915_vma.c | 51 +- + drivers/gpu/drm/i915/i915_vma.h | 3 + + drivers/gpu/drm/i915/icl_dsi.c | 51 +- + drivers/gpu/drm/i915/intel_atomic.c | 6 +- + drivers/gpu/drm/i915/intel_atomic_plane.c | 59 +- + drivers/gpu/drm/i915/intel_atomic_plane.h | 40 + + drivers/gpu/drm/i915/intel_audio.c | 95 +- + drivers/gpu/drm/i915/intel_audio.h | 24 + + drivers/gpu/drm/i915/intel_bios.c | 133 +- + drivers/gpu/drm/i915/intel_breadcrumbs.c | 14 +- + drivers/gpu/drm/i915/intel_cdclk.c | 382 ++- + drivers/gpu/drm/i915/intel_cdclk.h | 46 + + drivers/gpu/drm/i915/intel_color.c | 1131 +++++-- + drivers/gpu/drm/i915/intel_color.h | 17 + + drivers/gpu/drm/i915/intel_combo_phy.c | 3 +- + drivers/gpu/drm/i915/intel_connector.c | 19 +- + drivers/gpu/drm/i915/intel_connector.h | 35 + + drivers/gpu/drm/i915/intel_context.c | 269 ++ + drivers/gpu/drm/i915/intel_context.h | 87 + + drivers/gpu/drm/i915/intel_context_types.h | 74 + + drivers/gpu/drm/i915/intel_crt.c | 13 +- + drivers/gpu/drm/i915/intel_crt.h | 21 + + drivers/gpu/drm/i915/intel_csr.c | 5 +- + drivers/gpu/drm/i915/intel_csr.h | 17 + + drivers/gpu/drm/i915/intel_ddi.c | 321 +- + drivers/gpu/drm/i915/intel_ddi.h | 53 + + drivers/gpu/drm/i915/intel_device_info.c | 136 +- + drivers/gpu/drm/i915/intel_device_info.h | 46 +- + drivers/gpu/drm/i915/intel_display.c | 804 +++-- + drivers/gpu/drm/i915/intel_dp.c | 583 +++- + drivers/gpu/drm/i915/intel_dp.h | 122 + + drivers/gpu/drm/i915/intel_dp_link_training.c | 1 + + drivers/gpu/drm/i915/intel_dp_mst.c | 154 +- + drivers/gpu/drm/i915/intel_dpio_phy.c | 6 +- + drivers/gpu/drm/i915/intel_dpll_mgr.c | 770 ++--- + drivers/gpu/drm/i915/intel_dpll_mgr.h | 5 +- + drivers/gpu/drm/i915/intel_drv.h | 666 +--- + drivers/gpu/drm/i915/intel_dsi.h | 1 - + drivers/gpu/drm/i915/intel_dsi_vbt.c | 24 +- + drivers/gpu/drm/i915/intel_dvo.c | 10 +- + drivers/gpu/drm/i915/intel_dvo.h | 13 + + drivers/gpu/drm/i915/intel_engine_cs.c | 491 +-- + drivers/gpu/drm/i915/intel_engine_types.h | 546 ++++ + drivers/gpu/drm/i915/intel_fbc.c | 6 +- + drivers/gpu/drm/i915/intel_fbc.h | 42 + + drivers/gpu/drm/i915/intel_fbdev.c | 243 +- + drivers/gpu/drm/i915/intel_fbdev.h | 53 + + drivers/gpu/drm/i915/intel_fifo_underrun.c | 1 + + drivers/gpu/drm/i915/intel_frontbuffer.c | 5 +- + drivers/gpu/drm/i915/intel_frontbuffer.h | 10 + + drivers/gpu/drm/i915/intel_gpu_commands.h | 9 +- + drivers/gpu/drm/i915/intel_guc.c | 45 +- + drivers/gpu/drm/i915/intel_guc.h | 4 +- + drivers/gpu/drm/i915/intel_guc_ads.c | 3 +- + drivers/gpu/drm/i915/intel_guc_ct.c | 99 +- + drivers/gpu/drm/i915/intel_guc_ct.h | 3 + + drivers/gpu/drm/i915/intel_guc_fw.c | 4 +- + drivers/gpu/drm/i915/intel_guc_log.c | 5 + + drivers/gpu/drm/i915/intel_guc_submission.c | 133 +- + drivers/gpu/drm/i915/intel_guc_submission.h | 1 + + drivers/gpu/drm/i915/intel_hangcheck.c | 26 +- + drivers/gpu/drm/i915/intel_hdcp.c | 1261 +++++++- + drivers/gpu/drm/i915/intel_hdcp.h | 33 + + drivers/gpu/drm/i915/intel_hdmi.c | 800 ++++- + drivers/gpu/drm/i915/intel_hdmi.h | 51 + + drivers/gpu/drm/i915/intel_huc.c | 2 +- + drivers/gpu/drm/i915/intel_huc_fw.c | 27 +- + drivers/gpu/drm/i915/intel_i2c.c | 2 +- + drivers/gpu/drm/i915/intel_lrc.c | 904 +++--- + drivers/gpu/drm/i915/intel_lrc.h | 35 +- + drivers/gpu/drm/i915/intel_lspcon.c | 19 +- + drivers/gpu/drm/i915/intel_lspcon.h | 38 + + drivers/gpu/drm/i915/intel_lvds.c | 101 +- + drivers/gpu/drm/i915/intel_lvds.h | 22 + + drivers/gpu/drm/i915/intel_mocs.c | 14 +- + drivers/gpu/drm/i915/intel_opregion.c | 3 +- + drivers/gpu/drm/i915/intel_overlay.c | 6 +- + drivers/gpu/drm/i915/intel_panel.c | 150 +- + drivers/gpu/drm/i915/intel_panel.h | 65 + + drivers/gpu/drm/i915/intel_pipe_crc.c | 232 +- + drivers/gpu/drm/i915/intel_pipe_crc.h | 35 + + drivers/gpu/drm/i915/intel_pm.c | 555 ++-- + drivers/gpu/drm/i915/intel_pm.h | 71 + + drivers/gpu/drm/i915/intel_psr.c | 318 +- + drivers/gpu/drm/i915/intel_psr.h | 40 + + drivers/gpu/drm/i915/intel_ringbuffer.c | 435 ++- + drivers/gpu/drm/i915/intel_ringbuffer.h | 650 +--- + drivers/gpu/drm/i915/intel_runtime_pm.c | 99 +- + drivers/gpu/drm/i915/intel_sdvo.c | 169 +- + drivers/gpu/drm/i915/intel_sdvo.h | 23 + + drivers/gpu/drm/i915/intel_sideband.c | 12 +- + drivers/gpu/drm/i915/intel_sprite.c | 260 +- + drivers/gpu/drm/i915/intel_sprite.h | 55 + + drivers/gpu/drm/i915/intel_tv.c | 5 +- + drivers/gpu/drm/i915/intel_tv.h | 13 + + drivers/gpu/drm/i915/intel_uc.c | 25 +- + drivers/gpu/drm/i915/intel_uc.h | 1 + + drivers/gpu/drm/i915/intel_uncore.c | 996 +++--- + drivers/gpu/drm/i915/intel_uncore.h | 286 +- + drivers/gpu/drm/i915/intel_vbt_defs.h | 3 + + drivers/gpu/drm/i915/intel_vdsc.c | 133 +- + drivers/gpu/drm/i915/intel_workarounds.c | 187 +- + drivers/gpu/drm/i915/intel_workarounds.h | 19 +- + drivers/gpu/drm/i915/intel_workarounds_types.h | 27 + + drivers/gpu/drm/i915/selftests/huge_gem_object.c | 2 +- + drivers/gpu/drm/i915/selftests/huge_pages.c | 25 +- + drivers/gpu/drm/i915/selftests/i915_active.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 12 +- + .../gpu/drm/i915/selftests/i915_gem_coherency.c | 8 +- + drivers/gpu/drm/i915/selftests/i915_gem_context.c | 457 ++- + drivers/gpu/drm/i915/selftests/i915_gem_dmabuf.c | 1 + + drivers/gpu/drm/i915/selftests/i915_gem_evict.c | 6 +- + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 21 +- + drivers/gpu/drm/i915/selftests/i915_gem_object.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 37 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 4 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 9 +- + drivers/gpu/drm/i915/selftests/i915_timeline.c | 120 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 16 +- + drivers/gpu/drm/i915/selftests/igt_flush_test.c | 4 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 9 +- + drivers/gpu/drm/i915/selftests/intel_guc.c | 4 +- + drivers/gpu/drm/i915/selftests/intel_hangcheck.c | 301 +- + drivers/gpu/drm/i915/selftests/intel_lrc.c | 446 ++- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 166 +- + drivers/gpu/drm/i915/selftests/intel_workarounds.c | 423 ++- + drivers/gpu/drm/i915/selftests/mock_context.c | 34 +- + drivers/gpu/drm/i915/selftests/mock_engine.c | 145 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 54 +- + drivers/gpu/drm/i915/selftests/mock_request.c | 12 +- + drivers/gpu/drm/i915/selftests/mock_request.h | 7 - + drivers/gpu/drm/i915/selftests/mock_timeline.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_uncore.c | 10 +- + drivers/gpu/drm/i915/selftests/mock_uncore.h | 2 +- + drivers/gpu/drm/i915/vlv_dsi.c | 84 +- + drivers/gpu/drm/i915/vlv_dsi_pll.c | 4 +- + drivers/gpu/drm/imx/imx-drm-core.c | 2 +- + drivers/gpu/drm/imx/ipuv3-crtc.c | 2 +- + drivers/gpu/drm/lima/Kconfig | 13 + + drivers/gpu/drm/lima/Makefile | 21 + + drivers/gpu/drm/lima/lima_bcast.c | 47 + + drivers/gpu/drm/lima/lima_bcast.h | 14 + + drivers/gpu/drm/lima/lima_ctx.c | 98 + + drivers/gpu/drm/lima/lima_ctx.h | 30 + + drivers/gpu/drm/lima/lima_device.c | 385 +++ + drivers/gpu/drm/lima/lima_device.h | 131 + + drivers/gpu/drm/lima/lima_dlbu.c | 58 + + drivers/gpu/drm/lima/lima_dlbu.h | 18 + + drivers/gpu/drm/lima/lima_drv.c | 376 +++ + drivers/gpu/drm/lima/lima_drv.h | 45 + + drivers/gpu/drm/lima/lima_gem.c | 349 +++ + drivers/gpu/drm/lima/lima_gem.h | 25 + + drivers/gpu/drm/lima/lima_gem_prime.c | 47 + + drivers/gpu/drm/lima/lima_gem_prime.h | 13 + + drivers/gpu/drm/lima/lima_gp.c | 283 ++ + drivers/gpu/drm/lima/lima_gp.h | 16 + + drivers/gpu/drm/lima/lima_l2_cache.c | 80 + + drivers/gpu/drm/lima/lima_l2_cache.h | 14 + + drivers/gpu/drm/lima/lima_mmu.c | 142 + + drivers/gpu/drm/lima/lima_mmu.h | 16 + + drivers/gpu/drm/lima/lima_object.c | 122 + + drivers/gpu/drm/lima/lima_object.h | 36 + + drivers/gpu/drm/lima/lima_pmu.c | 60 + + drivers/gpu/drm/lima/lima_pmu.h | 12 + + drivers/gpu/drm/lima/lima_pp.c | 427 +++ + drivers/gpu/drm/lima/lima_pp.h | 19 + + drivers/gpu/drm/lima/lima_regs.h | 298 ++ + drivers/gpu/drm/lima/lima_sched.c | 362 +++ + drivers/gpu/drm/lima/lima_sched.h | 102 + + drivers/gpu/drm/lima/lima_vm.c | 282 ++ + drivers/gpu/drm/lima/lima_vm.h | 62 + + drivers/gpu/drm/meson/Makefile | 2 +- + drivers/gpu/drm/meson/meson_canvas.c | 73 - + drivers/gpu/drm/meson/meson_canvas.h | 51 - + drivers/gpu/drm/meson/meson_crtc.c | 353 ++- + drivers/gpu/drm/meson/meson_drv.c | 83 +- + drivers/gpu/drm/meson/meson_drv.h | 5 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 163 +- + drivers/gpu/drm/meson/meson_dw_hdmi.h | 32 +- + drivers/gpu/drm/meson/meson_overlay.c | 18 +- + drivers/gpu/drm/meson/meson_plane.c | 21 +- + drivers/gpu/drm/meson/meson_registers.h | 247 ++ + drivers/gpu/drm/meson/meson_vclk.c | 123 +- + drivers/gpu/drm/meson/meson_venc.c | 11 +- + drivers/gpu/drm/meson/meson_venc_cvbs.c | 25 +- + drivers/gpu/drm/meson/meson_viu.c | 85 +- + drivers/gpu/drm/meson/meson_vpp.c | 51 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 3 +- + drivers/gpu/drm/mgag200/mgag200_fb.c | 8 +- + drivers/gpu/drm/mgag200/mgag200_ttm.c | 10 +- + drivers/gpu/drm/msm/Kconfig | 5 + + drivers/gpu/drm/msm/Makefile | 9 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 109 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 216 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 9 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 63 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 3 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 2 + + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 141 + + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 6 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 69 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 119 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 15 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 5 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 177 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 3 - + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cmd_encoder.c | 4 +- + drivers/gpu/drm/msm/msm_debugfs.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 15 +- + drivers/gpu/drm/msm/msm_drv.h | 8 +- + drivers/gpu/drm/msm/msm_fbdev.c | 6 +- + drivers/gpu/drm/msm/msm_gem.c | 69 +- + drivers/gpu/drm/msm/msm_gem.h | 8 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 7 - + drivers/gpu/drm/msm/msm_gem_submit.c | 52 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.c | 17 +- + drivers/gpu/drm/msm/msm_gpu.h | 3 + + drivers/gpu/drm/msm/msm_iommu.c | 13 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 41 + + drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 6 +- + drivers/gpu/drm/nouveau/Kbuild | 8 +- + drivers/gpu/drm/nouveau/Kconfig | 13 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h | 2 + + drivers/gpu/drm/nouveau/nouveau_display.c | 9 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 19 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 2 - + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 4 - + drivers/gpu/drm/nouveau/nvkm/subdev/bar/gf100.c | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/bar/nv50.c | 14 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramgk104.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.c | 26 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/aux.h | 2 + + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/base.c | 15 + + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.c | 21 +- + drivers/gpu/drm/nouveau/nvkm/subdev/i2c/bus.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmm.c | 2 +- + drivers/gpu/drm/omapdrm/displays/Kconfig | 17 - + drivers/gpu/drm/omapdrm/displays/Makefile | 3 - + .../gpu/drm/omapdrm/displays/connector-analog-tv.c | 45 +- + drivers/gpu/drm/omapdrm/displays/connector-dvi.c | 330 -- + drivers/gpu/drm/omapdrm/displays/connector-hdmi.c | 45 +- + drivers/gpu/drm/omapdrm/displays/encoder-opa362.c | 39 +- + drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c | 170 -- + .../gpu/drm/omapdrm/displays/encoder-tpd12s015.c | 40 - + drivers/gpu/drm/omapdrm/displays/panel-dpi.c | 221 -- + drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 140 +- + .../omapdrm/displays/panel-lgphilips-lb035q02.c | 41 +- + .../drm/omapdrm/displays/panel-nec-nl8048hl11.c | 41 +- + .../drm/omapdrm/displays/panel-sharp-ls037v7dw01.c | 61 +- + .../drm/omapdrm/displays/panel-sony-acx565akm.c | 55 +- + .../drm/omapdrm/displays/panel-tpo-td028ttec1.c | 58 +- + .../drm/omapdrm/displays/panel-tpo-td043mtea1.c | 48 +- + drivers/gpu/drm/omapdrm/dss/base.c | 144 +- + drivers/gpu/drm/omapdrm/dss/display.c | 24 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 64 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 110 +- + drivers/gpu/drm/omapdrm/dss/dss-of.c | 60 +- + drivers/gpu/drm/omapdrm/dss/dss.c | 2 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 54 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 54 +- + drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 18 +- + drivers/gpu/drm/omapdrm/dss/omapdss.h | 76 +- + drivers/gpu/drm/omapdrm/dss/output.c | 36 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 68 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 229 +- + drivers/gpu/drm/omapdrm/omap_connector.c | 181 +- + drivers/gpu/drm/omapdrm/omap_connector.h | 8 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 13 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 236 +- + drivers/gpu/drm/omapdrm/omap_drv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_encoder.c | 211 +- + drivers/gpu/drm/omapdrm/omap_encoder.h | 3 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 6 +- + drivers/gpu/drm/panel/Kconfig | 31 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 6 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 272 ++ + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 6 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 1 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 20 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 3 +- + drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c | 387 +++ + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 258 ++ + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 3 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 2 +- + drivers/gpu/drm/panel/panel-simple.c | 84 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 12 +- + drivers/gpu/drm/panfrost/Kconfig | 14 + + drivers/gpu/drm/panfrost/Makefile | 12 + + drivers/gpu/drm/panfrost/TODO | 27 + + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 219 ++ + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 14 + + drivers/gpu/drm/panfrost/panfrost_device.c | 253 ++ + drivers/gpu/drm/panfrost/panfrost_device.h | 125 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 474 +++ + drivers/gpu/drm/panfrost/panfrost_features.h | 309 ++ + drivers/gpu/drm/panfrost/panfrost_gem.c | 95 + + drivers/gpu/drm/panfrost/panfrost_gem.h | 29 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 367 +++ + drivers/gpu/drm/panfrost/panfrost_gpu.h | 19 + + drivers/gpu/drm/panfrost/panfrost_issues.h | 176 ++ + drivers/gpu/drm/panfrost/panfrost_job.c | 564 ++++ + drivers/gpu/drm/panfrost/panfrost_job.h | 51 + + drivers/gpu/drm/panfrost/panfrost_mmu.c | 386 +++ + drivers/gpu/drm/panfrost/panfrost_mmu.h | 17 + + drivers/gpu/drm/panfrost/panfrost_regs.h | 298 ++ + drivers/gpu/drm/pl111/pl111_display.c | 2 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 4 + + drivers/gpu/drm/qxl/qxl_display.c | 8 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 - + drivers/gpu/drm/qxl/qxl_ttm.c | 11 +- + drivers/gpu/drm/radeon/radeon_device.c | 2 +- + drivers/gpu/drm/radeon/radeon_drv.h | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 11 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 17 +- + drivers/gpu/drm/rcar-du/Kconfig | 4 + + drivers/gpu/drm/rcar-du/Makefile | 3 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 64 +- + drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 13 +- + drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 54 +- + drivers/gpu/drm/rcar-du/rcar_du_kms.c | 37 + + drivers/gpu/drm/rcar-du/rcar_du_kms.h | 1 + + drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 122 +- + drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 17 + + drivers/gpu/drm/rcar-du/rcar_du_writeback.c | 243 ++ + drivers/gpu/drm/rcar-du/rcar_du_writeback.h | 39 + + drivers/gpu/drm/rcar-du/rcar_lvds.c | 19 +- + drivers/gpu/drm/rockchip/Kconfig | 8 + + drivers/gpu/drm/rockchip/Makefile | 1 + + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 876 ++++++ + drivers/gpu/drm/rockchip/rk3066_hdmi.h | 229 ++ + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 11 + + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + + drivers/gpu/drm/rockchip/rockchip_drm_fbdev.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 11 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 14 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 20 +- + drivers/gpu/drm/selftests/test-drm_mm.c | 12 +- + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/stm/drv.c | 35 + + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 28 + + drivers/gpu/drm/stm/ltdc.c | 24 + + drivers/gpu/drm/stm/ltdc.h | 3 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 63 +- + drivers/gpu/drm/sun4i/sun4i_hdmi.h | 1 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 40 +- + drivers/gpu/drm/sun4i/sun4i_lvds.c | 29 +- + drivers/gpu/drm/sun4i/sun4i_rgb.c | 74 +- + drivers/gpu/drm/sun4i/sun4i_tcon.c | 12 +- + drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 - + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.c | 179 +- + drivers/gpu/drm/sun4i/sun6i_mipi_dsi.h | 2 + + drivers/gpu/drm/sun4i/sun8i_mixer.c | 49 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 2 + + drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 54 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 11 + + drivers/gpu/drm/tegra/fb.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + drivers/gpu/drm/tegra/sor.c | 21 +- + drivers/gpu/drm/tinydrm/core/Makefile | 2 +- + drivers/gpu/drm/tinydrm/core/tinydrm-core.c | 183 -- + drivers/gpu/drm/tinydrm/core/tinydrm-helpers.c | 160 +- + drivers/gpu/drm/tinydrm/core/tinydrm-pipe.c | 24 +- + drivers/gpu/drm/tinydrm/hx8357d.c | 59 +- + drivers/gpu/drm/tinydrm/ili9225.c | 87 +- + drivers/gpu/drm/tinydrm/ili9341.c | 59 +- + drivers/gpu/drm/tinydrm/mi0283qt.c | 67 +- + drivers/gpu/drm/tinydrm/mipi-dbi.c | 185 +- + drivers/gpu/drm/tinydrm/repaper.c | 147 +- + drivers/gpu/drm/tinydrm/st7586.c | 148 +- + drivers/gpu/drm/tinydrm/st7735r.c | 59 +- + drivers/gpu/drm/ttm/ttm_bo.c | 6 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 + + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 2 - + drivers/gpu/drm/ttm/ttm_memory.c | 10 +- + drivers/gpu/drm/tve200/tve200_display.c | 3 +- + drivers/gpu/drm/udl/udl_drv.c | 57 +- + drivers/gpu/drm/udl/udl_drv.h | 9 +- + drivers/gpu/drm/udl/udl_fb.c | 20 +- + drivers/gpu/drm/udl/udl_gem.c | 2 +- + drivers/gpu/drm/udl/udl_main.c | 35 +- + drivers/gpu/drm/v3d/Kconfig | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 314 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 8 + + drivers/gpu/drm/v3d/v3d_drv.c | 65 +- + drivers/gpu/drm/v3d/v3d_drv.h | 37 +- + drivers/gpu/drm/v3d/v3d_gem.c | 110 +- + drivers/gpu/drm/v3d/v3d_irq.c | 67 +- + drivers/gpu/drm/v3d/v3d_mmu.c | 11 +- + drivers/gpu/drm/v3d/v3d_regs.h | 2 + + drivers/gpu/drm/v3d/v3d_sched.c | 25 +- + drivers/{staging => gpu/drm}/vboxvideo/Kconfig | 0 + drivers/{staging => gpu/drm}/vboxvideo/Makefile | 0 + .../{staging => gpu/drm}/vboxvideo/hgsmi_base.c | 0 + .../drm}/vboxvideo/hgsmi_ch_setup.h | 0 + .../drm}/vboxvideo/hgsmi_channels.h | 0 + .../{staging => gpu/drm}/vboxvideo/hgsmi_defs.h | 0 + .../{staging => gpu/drm}/vboxvideo/modesetting.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c | 25 - + drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h | 9 - + drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c | 8 +- + .../{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c | 10 +- + drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c | 6 +- + drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c | 21 +- + .../{staging => gpu/drm}/vboxvideo/vbox_prime.c | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c | 12 +- + drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h | 0 + .../drm}/vboxvideo/vboxvideo_guest.h | 0 + .../{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h | 0 + drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c | 0 + drivers/gpu/drm/vc4/vc4_bo.c | 69 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 105 +- + drivers/gpu/drm/vc4/vc4_debugfs.c | 90 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 39 +- + drivers/gpu/drm/vc4/vc4_drv.c | 42 +- + drivers/gpu/drm/vc4/vc4_drv.h | 77 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 175 +- + drivers/gpu/drm/vc4/vc4_gem.c | 49 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 162 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 180 +- + drivers/gpu/drm/vc4/vc4_irq.c | 9 + + drivers/gpu/drm/vc4/vc4_kms.c | 123 +- + drivers/gpu/drm/vc4/vc4_perfmon.c | 18 + + drivers/gpu/drm/vc4/vc4_plane.c | 59 +- + drivers/gpu/drm/vc4/vc4_regs.h | 51 +- + drivers/gpu/drm/vc4/vc4_render_cl.c | 23 +- + drivers/gpu/drm/vc4/vc4_txp.c | 49 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 240 +- + drivers/gpu/drm/vc4/vc4_vec.c | 83 +- + drivers/gpu/drm/virtio/virtgpu_debugfs.c | 27 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 1 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 45 +- + drivers/gpu/drm/virtio/virtgpu_fence.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_gem.c | 35 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 107 +- + drivers/gpu/drm/virtio/virtgpu_object.c | 74 +- + drivers/gpu/drm/virtio/virtgpu_prime.c | 25 +- + drivers/gpu/drm/virtio/virtgpu_ttm.c | 102 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 36 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 98 +- + drivers/gpu/drm/vmwgfx/vmwgfx_binding.h | 2 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 24 +- + drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 59 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 30 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1505 ++++----- + drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 27 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 9 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 25 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 28 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 23 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 44 +- + drivers/gpu/drm/vmwgfx/vmwgfx_simple_resource.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 45 +- + drivers/gpu/drm/vmwgfx/vmwgfx_so.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 47 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 80 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 11 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 61 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 7 + + drivers/gpu/drm/xen/xen_drm_front.c | 1 + + drivers/ide/ide-probe.c | 3 + + drivers/infiniband/Kconfig | 1 + + drivers/infiniband/core/addr.c | 1 + + drivers/infiniband/core/cache.c | 145 +- + drivers/infiniband/core/cm.c | 94 +- + drivers/infiniband/core/cm_msgs.h | 22 +- + drivers/infiniband/core/cma.c | 83 +- + drivers/infiniband/core/core_priv.h | 18 +- + drivers/infiniband/core/cq.c | 21 +- + drivers/infiniband/core/device.c | 632 +++- + drivers/infiniband/core/iwcm.c | 35 +- + drivers/infiniband/core/mad.c | 87 +- + drivers/infiniband/core/mad_priv.h | 4 +- + drivers/infiniband/core/multicast.c | 1 - + drivers/infiniband/core/nldev.c | 112 +- + drivers/infiniband/core/rdma_core.c | 200 +- + drivers/infiniband/core/rdma_core.h | 11 +- + drivers/infiniband/core/sa_query.c | 44 +- + drivers/infiniband/core/sysfs.c | 93 +- + drivers/infiniband/core/ucm.c | 35 +- + drivers/infiniband/core/umem.c | 179 +- + drivers/infiniband/core/umem_odp.c | 20 +- + drivers/infiniband/core/user_mad.c | 22 + + drivers/infiniband/core/uverbs.h | 7 +- + drivers/infiniband/core/uverbs_cmd.c | 99 +- + drivers/infiniband/core/uverbs_ioctl.c | 29 +- + drivers/infiniband/core/uverbs_main.c | 69 +- + drivers/infiniband/core/uverbs_std_types.c | 52 +- + .../infiniband/core/uverbs_std_types_counters.c | 6 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 12 +- + drivers/infiniband/core/uverbs_std_types_dm.c | 10 +- + .../infiniband/core/uverbs_std_types_flow_action.c | 6 +- + drivers/infiniband/core/uverbs_std_types_mr.c | 9 +- + drivers/infiniband/core/verbs.c | 233 +- + drivers/infiniband/hw/Makefile | 1 + + drivers/infiniband/hw/bnxt_re/Kconfig | 12 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 194 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 36 +- + drivers/infiniband/hw/bnxt_re/main.c | 8 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 39 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 13 +- + drivers/infiniband/hw/bnxt_re/qplib_rcfw.c | 4 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 43 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 8 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 16 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 4 +- + drivers/infiniband/hw/cxgb3/cxio_wr.h | 10 +- + drivers/infiniband/hw/cxgb3/iwch.c | 56 +- + drivers/infiniband/hw/cxgb3/iwch.h | 38 +- + drivers/infiniband/hw/cxgb3/iwch_ev.c | 18 +- + drivers/infiniband/hw/cxgb3/iwch_mem.c | 2 +- + drivers/infiniband/hw/cxgb3/iwch_provider.c | 97 +- + drivers/infiniband/hw/cxgb4/cm.c | 69 +- + drivers/infiniband/hw/cxgb4/cq.c | 23 +- + drivers/infiniband/hw/cxgb4/device.c | 210 +- + drivers/infiniband/hw/cxgb4/ev.c | 18 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 96 +- + drivers/infiniband/hw/cxgb4/mem.c | 25 +- + drivers/infiniband/hw/cxgb4/provider.c | 77 +- + drivers/infiniband/hw/cxgb4/qp.c | 77 +- + drivers/infiniband/hw/efa/Kconfig | 15 + + drivers/infiniband/hw/efa/Makefile | 9 + + drivers/infiniband/hw/efa/efa.h | 163 + + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 794 +++++ + drivers/infiniband/hw/efa/efa_admin_defs.h | 136 + + drivers/infiniband/hw/efa/efa_com.c | 1160 +++++++ + drivers/infiniband/hw/efa/efa_com.h | 144 + + drivers/infiniband/hw/efa/efa_com_cmd.c | 692 +++++ + drivers/infiniband/hw/efa/efa_com_cmd.h | 270 ++ + drivers/infiniband/hw/efa/efa_common_defs.h | 18 + + drivers/infiniband/hw/efa/efa_main.c | 533 ++++ + drivers/infiniband/hw/efa/efa_regs_defs.h | 113 + + drivers/infiniband/hw/efa/efa_verbs.c | 1825 +++++++++++ + drivers/infiniband/hw/hfi1/chip.c | 54 +- + drivers/infiniband/hw/hfi1/chip.h | 3 + + drivers/infiniband/hw/hfi1/chip_registers.h | 3 + + drivers/infiniband/hw/hfi1/common.h | 2 +- + drivers/infiniband/hw/hfi1/debugfs.c | 82 +- + drivers/infiniband/hw/hfi1/driver.c | 19 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 3 - + drivers/infiniband/hw/hfi1/hfi.h | 8 +- + drivers/infiniband/hw/hfi1/init.c | 59 +- + drivers/infiniband/hw/hfi1/opfn.h | 6 +- + drivers/infiniband/hw/hfi1/qp.c | 2 + + drivers/infiniband/hw/hfi1/rc.c | 27 +- + drivers/infiniband/hw/hfi1/rc.h | 8 + + drivers/infiniband/hw/hfi1/ruc.c | 2 +- + drivers/infiniband/hw/hfi1/tid_rdma.c | 274 +- + drivers/infiniband/hw/hfi1/tid_rdma.h | 2 - + drivers/infiniband/hw/hfi1/trace_dbg.h | 4 +- + drivers/infiniband/hw/hfi1/trace_tid.h | 12 +- + drivers/infiniband/hw/hfi1/verbs.c | 15 +- + drivers/infiniband/hw/hfi1/verbs.h | 1 + + drivers/infiniband/hw/hfi1/vnic_main.c | 16 +- + drivers/infiniband/hw/hns/Makefile | 4 +- + drivers/infiniband/hw/hns/hns_roce_ah.c | 36 +- + drivers/infiniband/hw/hns/hns_roce_cmd.h | 1 + + drivers/infiniband/hw/hns/hns_roce_common.h | 33 - + drivers/infiniband/hw/hns/hns_roce_cq.c | 68 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 52 +- + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 396 +-- + drivers/infiniband/hw/hns/hns_roce_hw_v1.h | 14 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 320 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 7 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c | 35 + + drivers/infiniband/hw/hns/hns_roce_main.c | 35 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 6 +- + drivers/infiniband/hw/hns/hns_roce_pd.c | 7 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 50 +- + drivers/infiniband/hw/hns/hns_roce_restrack.c | 126 + + drivers/infiniband/hw/hns/hns_roce_srq.c | 52 +- + drivers/infiniband/hw/i40iw/i40iw.h | 2 +- + drivers/infiniband/hw/i40iw/i40iw_cm.c | 21 +- + drivers/infiniband/hw/i40iw/i40iw_main.c | 5 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.c | 123 +- + drivers/infiniband/hw/i40iw/i40iw_verbs.h | 3 +- + drivers/infiniband/hw/mlx4/ah.c | 103 +- + drivers/infiniband/hw/mlx4/cm.c | 36 +- + drivers/infiniband/hw/mlx4/cq.c | 40 +- + drivers/infiniband/hw/mlx4/doorbell.c | 6 +- + drivers/infiniband/hw/mlx4/mad.c | 33 +- + drivers/infiniband/hw/mlx4/main.c | 13 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 41 +- + drivers/infiniband/hw/mlx4/mr.c | 7 +- + drivers/infiniband/hw/mlx4/qp.c | 50 +- + drivers/infiniband/hw/mlx4/srq.c | 59 +- + drivers/infiniband/hw/mlx5/ah.c | 33 +- + drivers/infiniband/hw/mlx5/cmd.c | 155 +- + drivers/infiniband/hw/mlx5/cmd.h | 8 +- + drivers/infiniband/hw/mlx5/cq.c | 47 +- + drivers/infiniband/hw/mlx5/devx.c | 32 +- + drivers/infiniband/hw/mlx5/flow.c | 99 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 109 +- + drivers/infiniband/hw/mlx5/ib_rep.h | 13 +- + drivers/infiniband/hw/mlx5/main.c | 662 ++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 118 +- + drivers/infiniband/hw/mlx5/mr.c | 52 +- + drivers/infiniband/hw/mlx5/odp.c | 132 +- + drivers/infiniband/hw/mlx5/qp.c | 161 +- + drivers/infiniband/hw/mlx5/srq.c | 76 +- + drivers/infiniband/hw/mlx5/srq.h | 7 +- + drivers/infiniband/hw/mlx5/srq_cmd.c | 35 +- + drivers/infiniband/hw/mthca/mthca_cq.c | 2 +- + drivers/infiniband/hw/mthca/mthca_eq.c | 16 +- + drivers/infiniband/hw/mthca/mthca_mr.c | 2 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 179 +- + drivers/infiniband/hw/mthca/mthca_qp.c | 6 +- + drivers/infiniband/hw/nes/nes_cm.c | 3 +- + drivers/infiniband/hw/nes/nes_verbs.c | 168 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 32 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 18 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.h | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_main.c | 25 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 128 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 24 +- + drivers/infiniband/hw/qedr/main.c | 57 +- + drivers/infiniband/hw/qedr/qedr.h | 11 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 10 +- + drivers/infiniband/hw/qedr/qedr_roce_cm.c | 11 +- + drivers/infiniband/hw/qedr/verbs.c | 129 +- + drivers/infiniband/hw/qedr/verbs.h | 27 +- + drivers/infiniband/hw/qib/qib.h | 4 +- + drivers/infiniband/hw/qib/qib_common.h | 2 +- + drivers/infiniband/hw/qib/qib_driver.c | 20 +- + drivers/infiniband/hw/qib/qib_fs.c | 12 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 4 +- + drivers/infiniband/hw/qib/qib_init.c | 56 +- + drivers/infiniband/hw/qib/qib_rc.c | 4 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 5 +- + drivers/infiniband/hw/qib/qib_verbs.h | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 15 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 12 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 3 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 17 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 28 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 15 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 3 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 43 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 56 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 27 +- + drivers/infiniband/sw/rdmavt/ah.c | 38 +- + drivers/infiniband/sw/rdmavt/ah.h | 8 +- + drivers/infiniband/sw/rdmavt/cq.c | 7 +- + drivers/infiniband/sw/rdmavt/cq.h | 3 +- + drivers/infiniband/sw/rdmavt/mmap.c | 16 +- + drivers/infiniband/sw/rdmavt/mmap.h | 6 +- + drivers/infiniband/sw/rdmavt/mr.c | 9 +- + drivers/infiniband/sw/rdmavt/mr.h | 7 +- + drivers/infiniband/sw/rdmavt/pd.c | 7 +- + drivers/infiniband/sw/rdmavt/pd.h | 5 +- + drivers/infiniband/sw/rdmavt/qp.c | 27 +- + drivers/infiniband/sw/rdmavt/qp.h | 4 +- + drivers/infiniband/sw/rdmavt/rc.c | 2 +- + drivers/infiniband/sw/rdmavt/srq.c | 49 +- + drivers/infiniband/sw/rdmavt/srq.h | 7 +- + drivers/infiniband/sw/rdmavt/trace_qp.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_rc.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_tx.h | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 3 + + drivers/infiniband/sw/rxe/rxe_cq.c | 10 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 2 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 16 +- + drivers/infiniband/sw/rxe/rxe_mmap.c | 14 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 13 +- + drivers/infiniband/sw/rxe/rxe_net.c | 46 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 4 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 15 +- + drivers/infiniband/sw/rxe/rxe_queue.c | 22 +- + drivers/infiniband/sw/rxe/rxe_queue.h | 15 +- + drivers/infiniband/sw/rxe/rxe_srq.c | 14 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 90 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 4 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 13 +- + drivers/infiniband/ulp/ipoib/ipoib_verbs.c | 3 +- + drivers/infiniband/ulp/iser/Kconfig | 4 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 7 +- + drivers/infiniband/ulp/iser/iscsi_iser.h | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c | 60 +- + drivers/iommu/io-pgtable-arm.c | 91 +- + drivers/iommu/io-pgtable.c | 1 + + drivers/media/platform/vsp1/vsp1_brx.c | 1 + + drivers/media/platform/vsp1/vsp1_clu.c | 1 + + drivers/media/platform/vsp1/vsp1_dl.c | 84 +- + drivers/media/platform/vsp1/vsp1_dl.h | 6 +- + drivers/media/platform/vsp1/vsp1_drm.c | 94 +- + drivers/media/platform/vsp1/vsp1_drm.h | 2 +- + drivers/media/platform/vsp1/vsp1_entity.c | 3 +- + drivers/media/platform/vsp1/vsp1_entity.h | 7 +- + drivers/media/platform/vsp1/vsp1_hgo.c | 1 + + drivers/media/platform/vsp1/vsp1_hgt.c | 1 + + drivers/media/platform/vsp1/vsp1_hsit.c | 1 + + drivers/media/platform/vsp1/vsp1_lif.c | 1 + + drivers/media/platform/vsp1/vsp1_lut.c | 1 + + drivers/media/platform/vsp1/vsp1_regs.h | 6 +- + drivers/media/platform/vsp1/vsp1_rpf.c | 1 + + drivers/media/platform/vsp1/vsp1_rwpf.h | 1 + + drivers/media/platform/vsp1/vsp1_sru.c | 1 + + drivers/media/platform/vsp1/vsp1_uds.c | 1 + + drivers/media/platform/vsp1/vsp1_uif.c | 1 + + drivers/media/platform/vsp1/vsp1_video.c | 16 +- + drivers/media/platform/vsp1/vsp1_wpf.c | 83 +- + drivers/mfd/intel-lpss.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 30 +- + drivers/parport/parport_ip32.c | 18 +- + drivers/reset/core.c | 180 +- + drivers/spi/spi-pxa2xx.c | 7 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/vboxvideo/TODO | 10 - + drivers/tty/serial/8250/8250_dw.c | 4 +- + drivers/usb/dwc3/dwc3-of-simple.c | 3 +- + drivers/video/fbdev/da8xx-fb.c | 13 +- + drivers/video/fbdev/gbefb.c | 24 +- + drivers/video/fbdev/pxa3xx-gcu.c | 4 +- + fs/orangefs/acl.c | 4 +- + fs/orangefs/file.c | 389 +-- + fs/orangefs/inode.c | 914 +++++- + fs/orangefs/namei.c | 40 +- + fs/orangefs/orangefs-bufmap.c | 13 + + fs/orangefs/orangefs-bufmap.h | 2 + + fs/orangefs/orangefs-debugfs.c | 4 +- + fs/orangefs/orangefs-kernel.h | 56 +- + fs/orangefs/orangefs-mod.c | 1 + + fs/orangefs/orangefs-sysfs.c | 22 + + fs/orangefs/orangefs-utils.c | 179 +- + fs/orangefs/super.c | 42 +- + fs/orangefs/waitqueue.c | 18 +- + fs/orangefs/xattr.c | 106 +- + include/drm/drm_atomic.h | 6 + + include/drm/drm_audio_component.h | 7 +- + include/drm/drm_auth.h | 6 +- + include/drm/drm_bridge.h | 11 +- + include/drm/drm_cache.h | 2 +- + include/drm/drm_client.h | 2 +- + include/drm/drm_connector.h | 136 +- + include/drm/drm_crtc.h | 4 +- + include/drm/drm_device.h | 3 +- + include/drm/drm_drv.h | 16 +- + include/drm/drm_dsc.h | 9 +- + include/drm/drm_edid.h | 6 + + include/drm/drm_fb_helper.h | 48 +- + include/drm/drm_file.h | 2 + + include/drm/drm_format_helper.h | 35 + + include/drm/drm_framebuffer.h | 1 + + include/drm/drm_gem.h | 32 + + include/drm/drm_gem_shmem_helper.h | 159 + + include/drm/drm_hdcp.h | 7 +- + include/drm/drm_legacy.h | 2 - + include/drm/drm_modes.h | 17 + + include/drm/drm_modeset_helper_vtables.h | 7 + + include/drm/drm_print.h | 2 + + include/drm/drm_syncobj.h | 5 + + include/drm/drm_utils.h | 4 + + include/drm/drm_vma_manager.h | 12 + + include/drm/drm_writeback.h | 30 +- + include/drm/i915_pciids.h | 217 +- + include/drm/tinydrm/mipi-dbi.h | 32 +- + include/drm/tinydrm/tinydrm-helpers.h | 21 +- + include/drm/tinydrm/tinydrm.h | 75 - + include/drm/ttm/ttm_bo_driver.h | 2 +- + include/linux/cgroup-defs.h | 33 + + include/linux/cgroup.h | 43 + + include/linux/dma-fence-chain.h | 81 + + include/linux/dma-fence.h | 21 +- + include/linux/dma-mapping.h | 6 +- + include/linux/dma-noncoherent.h | 6 + + include/linux/dma/idma64.h | 14 + + include/linux/dynamic_debug.h | 11 + + include/linux/io-pgtable.h | 7 + + include/linux/mlx5/driver.h | 1 - + include/linux/module.h | 5 + + include/linux/overflow.h | 12 +- + include/linux/reservation.h | 3 +- + include/linux/reset.h | 113 +- + include/linux/scatterlist.h | 10 +- + include/linux/sched.h | 2 + + include/linux/sched/jobctl.h | 2 + + include/media/vsp1.h | 19 +- + include/rdma/ib_cache.h | 4 + + include/rdma/ib_mad.h | 4 +- + include/rdma/ib_smi.h | 2 +- + include/rdma/ib_umem.h | 12 +- + include/rdma/ib_umem_odp.h | 1 + + include/rdma/ib_verbs.h | 430 ++- + include/rdma/iw_cm.h | 25 - + include/rdma/opa_port_info.h | 2 +- + include/rdma/opa_smi.h | 4 +- + include/rdma/rdma_vt.h | 78 +- + include/rdma/rdmavt_qp.h | 89 +- + include/rdma/uverbs_std_types.h | 42 +- + include/rdma/uverbs_types.h | 18 +- + include/sound/core.h | 16 +- + include/sound/da7219.h | 8 +- + include/sound/hdaudio.h | 9 +- + include/sound/memalloc.h | 4 - + include/sound/seq_kernel.h | 3 +- + include/sound/simple_card_utils.h | 238 +- + include/sound/sof.h | 100 + + include/sound/sof/control.h | 158 + + include/sound/sof/dai-intel.h | 178 ++ + include/sound/sof/dai.h | 75 + + include/sound/sof/header.h | 158 + + include/sound/sof/info.h | 118 + + include/sound/sof/pm.h | 48 + + include/sound/sof/stream.h | 148 + + include/sound/sof/topology.h | 256 ++ + include/sound/sof/trace.h | 67 + + include/sound/sof/xtensa.h | 44 + + include/trace/events/cgroup.h | 55 + + include/trace/events/ib_mad.h | 390 +++ + include/trace/events/ib_umad.h | 126 + + include/uapi/drm/amdgpu_drm.h | 43 + + include/uapi/drm/drm.h | 37 + + include/uapi/drm/drm_fourcc.h | 51 +- + include/uapi/drm/drm_mode.h | 4 +- + include/uapi/drm/i915_drm.h | 254 +- + include/uapi/drm/lima_drm.h | 169 ++ + include/uapi/drm/msm_drm.h | 14 + + include/uapi/drm/panfrost_drm.h | 142 + + include/uapi/linux/kfd_ioctl.h | 12 +- + include/uapi/linux/virtio_gpu.h | 12 +- + include/uapi/rdma/efa-abi.h | 101 + + include/uapi/rdma/mlx5-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 7 + + include/uapi/rdma/rdma_netlink.h | 31 +- + include/uapi/rdma/rdma_user_ioctl_cmds.h | 1 + + include/uapi/sound/sof/abi.h | 62 + + include/uapi/sound/sof/eq.h | 172 ++ + include/uapi/sound/sof/fw.h | 78 + + include/uapi/sound/sof/header.h | 27 + + include/uapi/sound/sof/manifest.h | 188 ++ + include/uapi/sound/sof/tokens.h | 107 + + include/uapi/sound/sof/tone.h | 21 + + include/uapi/sound/sof/trace.h | 66 + + kernel/cgroup/Makefile | 4 +- + kernel/cgroup/cgroup-internal.h | 8 +- + kernel/cgroup/cgroup-v1.c | 16 - + kernel/cgroup/cgroup.c | 152 +- + kernel/cgroup/debug.c | 8 +- + kernel/cgroup/freezer.c | 639 ++-- + kernel/cgroup/legacy_freezer.c | 481 +++ + kernel/dma/Kconfig | 4 + + kernel/dma/direct.c | 2 +- + kernel/dma/mapping.c | 9 +- + kernel/fork.c | 2 + + kernel/module.c | 5 + + kernel/signal.c | 66 +- + kernel/workqueue.c | 95 +- + lib/dynamic_debug.c | 37 + + net/smc/smc_ib.c | 16 +- + samples/bpf/Makefile | 3 + + samples/bpf/ibumad_kern.c | 144 + + samples/bpf/ibumad_user.c | 122 + + security/smack/smack.h | 1 + + security/smack/smack_lsm.c | 34 +- + security/smack/smackfs.c | 55 +- + sound/core/init.c | 23 +- + sound/core/memalloc.c | 53 +- + sound/core/oss/mixer_oss.c | 16 +- + sound/core/pcm.c | 14 +- + sound/core/seq/oss/seq_oss_device.h | 10 +- + sound/core/seq/oss/seq_oss_rw.c | 11 +- + sound/core/seq/oss/seq_oss_writeq.c | 2 +- + sound/core/seq/seq_clientmgr.c | 109 +- + sound/core/seq/seq_clientmgr.h | 8 +- + sound/core/seq/seq_fifo.c | 14 +- + sound/core/seq/seq_memory.c | 30 +- + sound/core/seq/seq_ports.c | 30 +- + sound/core/seq/seq_ports.h | 5 +- + sound/core/sound.c | 5 +- + sound/core/timer.c | 181 +- + sound/drivers/aloop.c | 4 +- + sound/firewire/amdtp-stream.c | 44 +- + sound/firewire/motu/amdtp-motu.c | 6 + + sound/firewire/motu/motu-protocol-v2.c | 43 +- + sound/firewire/motu/motu.c | 15 + + sound/firewire/motu/motu.h | 1 + + sound/hda/ext/hdac_ext_bus.c | 2 - + sound/hda/hdac_bus.c | 1 + + sound/hda/hdac_component.c | 18 +- + sound/isa/gus/gus_mem.c | 2 +- + sound/last.c | 10 +- + sound/pci/emu10k1/emu10k1_main.c | 16 +- + sound/pci/hda/hda_codec.c | 8 +- + sound/pci/hda/hda_intel.c | 12 +- + sound/pci/hda/patch_hdmi.c | 11 +- + sound/pci/hda/patch_realtek.c | 84 +- + sound/ppc/snd_ps3.c | 4 - + sound/sh/aica.c | 14 +- + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/adi/axi-i2s.c | 68 +- + sound/soc/amd/acp-da7219-max98357a.c | 68 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- + sound/soc/atmel/Kconfig | 14 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/mchp-i2s-mcc.c | 974 ++++++ + sound/soc/atmel/tse850-pcm5142.c | 16 +- + sound/soc/codecs/Kconfig | 15 +- + sound/soc/codecs/Makefile | 4 +- + sound/soc/codecs/cs42l51-i2c.c | 13 +- + sound/soc/codecs/cs42l51.c | 225 +- + sound/soc/codecs/cs42l51.h | 3 + + sound/soc/codecs/cs43130.c | 2 + + sound/soc/codecs/cs47l24.c | 4 +- + sound/soc/codecs/da7213.c | 5 +- + sound/soc/codecs/da7213.h | 2 + + sound/soc/codecs/da7219.c | 542 +++- + sound/soc/codecs/da7219.h | 6 +- + sound/soc/codecs/es8316.c | 14 + + sound/soc/codecs/hdac_hda.c | 6 + + sound/soc/codecs/hdac_hdmi.c | 24 +- + sound/soc/codecs/hdmi-codec.c | 12 +- + sound/soc/codecs/lochnagar-sc.c | 266 ++ + sound/soc/codecs/max98090.c | 12 +- + sound/soc/codecs/max98357a.c | 3 + + sound/soc/codecs/mt6358.c | 131 +- + sound/soc/codecs/nau8810.c | 25 +- + sound/soc/codecs/pcm3168a.c | 7 +- + sound/soc/codecs/rt5645.c | 17 + + sound/soc/codecs/rt5651.c | 47 +- + sound/soc/codecs/rt5651.h | 1 + + sound/soc/codecs/rt5677-spi.c | 43 +- + sound/soc/codecs/rt5682.c | 2 +- + sound/soc/codecs/simple-amplifier.c | 3 +- + sound/soc/codecs/sirf-audio-codec.c | 3 - + sound/soc/codecs/tlv320aic31xx.c | 61 +- + sound/soc/codecs/tlv320aic31xx.h | 12 + + sound/soc/codecs/tlv320aic32x4-clk.c | 483 +++ + sound/soc/codecs/tlv320aic32x4-i2c.c | 14 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 14 +- + sound/soc/codecs/tlv320aic32x4.c | 441 +-- + sound/soc/codecs/tlv320aic32x4.h | 13 + + sound/soc/codecs/wcd9335.c | 1 + + sound/soc/codecs/wm5102.c | 4 +- + sound/soc/codecs/wm5110.c | 4 +- + sound/soc/codecs/wm_adsp.c | 1032 +++++-- + sound/soc/codecs/wm_adsp.h | 50 +- + sound/soc/codecs/wmfw.h | 30 + + sound/soc/fsl/Kconfig | 25 +- + sound/soc/fsl/Makefile | 5 + + sound/soc/fsl/eukrea-tlv320.c | 30 +- + sound/soc/fsl/fsl_audmix.c | 578 ++++ + sound/soc/fsl/fsl_audmix.h | 102 + + sound/soc/fsl/fsl_dma.c | 26 +- + sound/soc/fsl/fsl_dma.h | 5 +- + sound/soc/fsl/fsl_esai.c | 23 +- + sound/soc/fsl/fsl_micfil.c | 3 - + sound/soc/fsl/fsl_sai.c | 26 +- + sound/soc/fsl/fsl_utils.c | 1 + + sound/soc/fsl/imx-audmix.c | 331 ++ + sound/soc/fsl/imx-audmux.c | 26 +- + sound/soc/fsl/imx-es8328.c | 15 +- + sound/soc/fsl/imx-mc13783.c | 22 +- + sound/soc/fsl/imx-pcm-fiq.c | 21 +- + sound/soc/fsl/imx-pcm.h | 6 +- + sound/soc/fsl/imx-spdif.c | 13 +- + sound/soc/fsl/imx-ssi.c | 57 +- + sound/soc/fsl/imx-ssi.h | 6 +- + sound/soc/fsl/mpc5200_dma.c | 14 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 16 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 14 +- + sound/soc/fsl/mpc8610_hpcd.c | 18 +- + sound/soc/fsl/mx27vis-aic32x4.c | 29 +- + sound/soc/fsl/p1022_ds.c | 18 +- + sound/soc/fsl/p1022_rdk.c | 32 +- + sound/soc/fsl/pcm030-audio-fabric.c | 18 +- + sound/soc/fsl/phycore-ac97.c | 16 +- + sound/soc/fsl/wm1133-ev1.c | 21 +- + sound/soc/generic/audio-graph-card.c | 429 ++- + sound/soc/generic/simple-card-utils.c | 440 +-- + sound/soc/generic/simple-card.c | 383 +-- + sound/soc/intel/Kconfig | 7 +- + sound/soc/intel/boards/Kconfig | 117 +- + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/bdw-rt5677.c | 4 + + sound/soc/intel/boards/broadwell.c | 4 + + sound/soc/intel/boards/bytcht_es8316.c | 42 +- + sound/soc/intel/boards/bytcr_rt5640.c | 6 +- + sound/soc/intel/boards/bytcr_rt5651.c | 28 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 52 +- + sound/soc/intel/boards/skl_hda_dsp_common.c | 22 +- + sound/soc/intel/boards/skl_hda_dsp_common.h | 2 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 19 +- + sound/soc/intel/boards/sof_rt5682.c | 563 ++++ + sound/soc/intel/common/soc-acpi-intel-byt-match.c | 6 + + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 6 + + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 19 + + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 9 + + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 6 + + sound/soc/intel/common/sst-firmware.c | 8 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 8 +- + sound/soc/jz4740/Kconfig | 2 +- + sound/soc/mediatek/Kconfig | 27 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 51 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 4 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 13 - + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 16 - + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 16 - + sound/soc/mediatek/mt8183/Makefile | 2 + + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 18 + + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 471 +++ + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 423 +++ + sound/soc/meson/axg-fifo.c | 34 +- + sound/soc/meson/axg-fifo.h | 2 + + sound/soc/meson/axg-frddr.c | 143 +- + sound/soc/meson/axg-tdm-formatter.c | 6 +- + sound/soc/meson/axg-tdm-formatter.h | 11 +- + sound/soc/meson/axg-tdmin.c | 16 +- + sound/soc/meson/axg-tdmout.c | 29 +- + sound/soc/meson/axg-toddr.c | 53 + + sound/soc/qcom/Kconfig | 2 +- + sound/soc/rockchip/rockchip_pdm.c | 205 +- + sound/soc/rockchip/rockchip_pdm.h | 12 + + sound/soc/samsung/arndale_rt5631.c | 17 +- + sound/soc/samsung/bells.c | 15 +- + sound/soc/samsung/dma.h | 8 +- + sound/soc/samsung/dmaengine.c | 22 +- + sound/soc/samsung/h1940_uda1380.c | 22 +- + sound/soc/samsung/i2s-regs.h | 8 +- + sound/soc/samsung/i2s.c | 27 +- + sound/soc/samsung/i2s.h | 8 +- + sound/soc/samsung/idma.c | 20 +- + sound/soc/samsung/idma.h | 9 +- + sound/soc/samsung/jive_wm8750.c | 19 +- + sound/soc/samsung/littlemill.c | 15 +- + sound/soc/samsung/lowland.c | 15 +- + sound/soc/samsung/neo1973_wm8753.c | 25 +- + sound/soc/samsung/odroid.c | 10 +- + sound/soc/samsung/pcm.c | 19 +- + sound/soc/samsung/pcm.h | 8 +- + sound/soc/samsung/regs-i2s-v2.h | 10 +- + sound/soc/samsung/regs-iis.h | 7 +- + sound/soc/samsung/rx1950_uda1380.c | 30 +- + sound/soc/samsung/s3c-i2s-v2.c | 26 +- + sound/soc/samsung/s3c-i2s-v2.h | 11 +- + sound/soc/samsung/s3c2412-i2s.c | 28 +- + sound/soc/samsung/s3c2412-i2s.h | 11 +- + sound/soc/samsung/s3c24xx-i2s.c | 25 +- + sound/soc/samsung/s3c24xx-i2s.h | 6 +- + sound/soc/samsung/s3c24xx_simtec.c | 11 +- + sound/soc/samsung/s3c24xx_simtec.h | 10 +- + sound/soc/samsung/s3c24xx_simtec_hermes.c | 11 +- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 11 +- + sound/soc/samsung/s3c24xx_uda134x.c | 20 +- + sound/soc/samsung/smartq_wm8987.c | 21 +- + sound/soc/samsung/smdk_spdif.c | 16 +- + sound/soc/samsung/smdk_wm8580.c | 15 +- + sound/soc/samsung/smdk_wm8994.c | 9 +- + sound/soc/samsung/smdk_wm8994pcm.c | 16 +- + sound/soc/samsung/snow.c | 15 +- + sound/soc/samsung/spdif.c | 17 +- + sound/soc/samsung/spdif.h | 8 +- + sound/soc/samsung/speyside.c | 15 +- + sound/soc/samsung/tm2_wm5110.c | 17 +- + sound/soc/samsung/tobermory.c | 15 +- + sound/soc/sh/rcar/core.c | 18 +- + sound/soc/sh/rcar/rsnd.h | 1 + + sound/soc/sh/rcar/ssi.c | 2 + + sound/soc/soc-core.c | 18 +- + sound/soc/soc-dapm.c | 5 +- + sound/soc/soc-pcm.c | 14 +- + sound/soc/soc-topology.c | 330 +- + sound/soc/sof/Kconfig | 156 + + sound/soc/sof/Makefile | 18 + + sound/soc/sof/control.c | 552 ++++ + sound/soc/sof/core.c | 508 ++++ + sound/soc/sof/debug.c | 232 ++ + sound/soc/sof/intel/Kconfig | 230 ++ + sound/soc/sof/intel/Makefile | 19 + + sound/soc/sof/intel/apl.c | 113 + + sound/soc/sof/intel/bdw.c | 713 +++++ + sound/soc/sof/intel/byt.c | 874 ++++++ + sound/soc/sof/intel/cnl.c | 268 ++ + sound/soc/sof/intel/hda-bus.c | 111 + + sound/soc/sof/intel/hda-codec.c | 171 ++ + sound/soc/sof/intel/hda-ctrl.c | 181 ++ + sound/soc/sof/intel/hda-dai.c | 356 +++ + sound/soc/sof/intel/hda-dsp.c | 471 +++ + sound/soc/sof/intel/hda-ipc.c | 455 +++ + sound/soc/sof/intel/hda-loader.c | 382 +++ + sound/soc/sof/intel/hda-pcm.c | 239 ++ + sound/soc/sof/intel/hda-stream.c | 701 +++++ + sound/soc/sof/intel/hda-trace.c | 94 + + sound/soc/sof/intel/hda.c | 689 +++++ + sound/soc/sof/intel/hda.h | 583 ++++ + sound/soc/sof/intel/intel-ipc.c | 92 + + sound/soc/sof/intel/shim.h | 185 ++ + sound/soc/sof/ipc.c | 846 ++++++ + sound/soc/sof/loader.c | 400 +++ + sound/soc/sof/nocodec.c | 109 + + sound/soc/sof/ops.c | 163 + + sound/soc/sof/ops.h | 411 +++ + sound/soc/sof/pcm.c | 767 +++++ + sound/soc/sof/pm.c | 388 +++ + sound/soc/sof/sof-acpi-dev.c | 312 ++ + sound/soc/sof/sof-pci-dev.c | 373 +++ + sound/soc/sof/sof-priv.h | 635 ++++ + sound/soc/sof/topology.c | 3179 ++++++++++++++++++++ + sound/soc/sof/trace.c | 297 ++ + sound/soc/sof/utils.c | 112 + + sound/soc/sof/xtensa/Kconfig | 2 + + sound/soc/sof/xtensa/Makefile | 5 + + sound/soc/sof/xtensa/core.c | 138 + + sound/soc/sprd/Kconfig | 9 + + sound/soc/sprd/Makefile | 6 +- + sound/soc/sprd/sprd-mcdt.c | 1011 +++++++ + sound/soc/sprd/sprd-mcdt.h | 107 + + sound/soc/sprd/sprd-pcm-compress.c | 674 +++++ + sound/soc/sprd/sprd-pcm-dma.c | 9 +- + sound/soc/sprd/sprd-pcm-dma.h | 43 + + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_i2s.c | 33 +- + sound/soc/stm/stm32_sai.c | 80 +- + sound/soc/stm/stm32_sai.h | 2 + + sound/soc/stm/stm32_sai_sub.c | 88 +- + sound/soc/stm/stm32_spdifrx.c | 47 +- + sound/soc/ti/Kconfig | 4 +- + sound/soc/ti/ams-delta.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 2 + + sound/soc/ti/edma-pcm.c | 5 +- + sound/soc/ti/sdma-pcm.c | 9 +- + sound/synth/emux/emux_hwdep.c | 5 + + sound/synth/emux/soundfont.c | 2 + + sound/usb/line6/toneport.c | 16 +- + sound/usb/mixer.c | 6 +- + sound/usb/quirks-table.h | 84 + + sound/usb/usx2y/usX2Yhwdep.c | 3 +- + sound/usb/usx2y/usb_stream.c | 20 +- + sound/usb/usx2y/usbusx2y.c | 7 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 6 +- + tools/arch/csky/include/uapi/asm/perf_regs.h | 51 + + tools/perf/Makefile.config | 6 +- + tools/perf/arch/csky/Build | 1 + + tools/perf/arch/csky/Makefile | 3 + + tools/perf/arch/csky/include/perf_regs.h | 100 + + tools/perf/arch/csky/util/Build | 2 + + tools/perf/arch/csky/util/dwarf-regs.c | 49 + + tools/perf/arch/csky/util/unwind-libdw.c | 77 + + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + tools/testing/selftests/cgroup/cgroup_util.c | 58 +- + tools/testing/selftests/cgroup/cgroup_util.h | 5 + + tools/testing/selftests/cgroup/test_freezer.c | 851 ++++++ + 1694 files changed, 111083 insertions(+), 34870 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/feiyang,fy07024di26a30d.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,acx467akm-7.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/osddisplays,osd070t1718-19ts.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.txt + create mode 100644 Documentation/devicetree/bindings/display/panel/ronbo,rb070d30.yaml + create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip,rk3066-hdmi.txt + create mode 100644 Documentation/devicetree/bindings/display/ste,mcde.txt + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-bifrost.txt + create mode 100644 Documentation/devicetree/bindings/gpu/aspeed-gfx.txt + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.txt + create mode 100644 Documentation/devicetree/bindings/sound/mchp-i2s-mcc.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt8183-da7219-max98357.txt + create mode 100644 Documentation/devicetree/bindings/sound/mt8183-mt6358-ts3a227-max98357.txt + create mode 100644 Documentation/devicetree/bindings/sound/sprd-mcdt.txt + delete mode 100644 arch/mips/net/bpf_jit.c + delete mode 100644 arch/mips/net/bpf_jit_asm.S + create mode 100644 drivers/dma-buf/dma-fence-chain.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ta_ras_if.h + delete mode 100644 drivers/gpu/drm/amd/include/linux/chash.h + delete mode 100644 drivers/gpu/drm/amd/lib/Kconfig + delete mode 100644 drivers/gpu/drm/amd/lib/Makefile + delete mode 100644 drivers/gpu/drm/amd/lib/chash.c + create mode 100644 drivers/gpu/drm/amd/powerplay/amdgpu_smu.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/smu9_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c + create mode 100644 drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/powerplay/inc/smu_v11_0_pptable.h + create mode 100644 drivers/gpu/drm/amd/powerplay/smu_v11_0.c + create mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.c + create mode 100644 drivers/gpu/drm/amd/powerplay/vega20_ppt.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_component.c + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_dev.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/d71/d71_regs.h + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c + create mode 100644 drivers/gpu/drm/aspeed/Kconfig + create mode 100644 drivers/gpu/drm/aspeed/Makefile + create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx.h + create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c + create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx_drv.c + create mode 100644 drivers/gpu/drm/aspeed/aspeed_gfx_out.c + create mode 100644 drivers/gpu/drm/cirrus/cirrus.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_drv.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_fbdev.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_main.c + delete mode 100644 drivers/gpu/drm/cirrus/cirrus_mode.c + create mode 100644 drivers/gpu/drm/drm_format_helper.c + create mode 100644 drivers/gpu/drm/drm_gem_shmem_helper.c + create mode 100644 drivers/gpu/drm/drm_legacy_misc.c + create mode 100644 drivers/gpu/drm/i915/.gitignore + create mode 100644 drivers/gpu/drm/i915/Makefile.header-test + create mode 100644 drivers/gpu/drm/i915/i915_gem_context_types.h + create mode 100644 drivers/gpu/drm/i915/i915_globals.c + create mode 100644 drivers/gpu/drm/i915/i915_globals.h + create mode 100644 drivers/gpu/drm/i915/i915_priolist_types.h + create mode 100644 drivers/gpu/drm/i915/i915_scheduler_types.h + create mode 100644 drivers/gpu/drm/i915/i915_timeline_types.h + create mode 100644 drivers/gpu/drm/i915/i915_user_extensions.c + create mode 100644 drivers/gpu/drm/i915/i915_user_extensions.h + create mode 100644 drivers/gpu/drm/i915/intel_atomic_plane.h + create mode 100644 drivers/gpu/drm/i915/intel_audio.h + create mode 100644 drivers/gpu/drm/i915/intel_cdclk.h + create mode 100644 drivers/gpu/drm/i915/intel_color.h + create mode 100644 drivers/gpu/drm/i915/intel_connector.h + create mode 100644 drivers/gpu/drm/i915/intel_context.c + create mode 100644 drivers/gpu/drm/i915/intel_context.h + create mode 100644 drivers/gpu/drm/i915/intel_context_types.h + create mode 100644 drivers/gpu/drm/i915/intel_crt.h + create mode 100644 drivers/gpu/drm/i915/intel_csr.h + create mode 100644 drivers/gpu/drm/i915/intel_ddi.h + create mode 100644 drivers/gpu/drm/i915/intel_dp.h + create mode 100644 drivers/gpu/drm/i915/intel_dvo.h + create mode 100644 drivers/gpu/drm/i915/intel_engine_types.h + create mode 100644 drivers/gpu/drm/i915/intel_fbc.h + create mode 100644 drivers/gpu/drm/i915/intel_fbdev.h + create mode 100644 drivers/gpu/drm/i915/intel_hdcp.h + create mode 100644 drivers/gpu/drm/i915/intel_hdmi.h + create mode 100644 drivers/gpu/drm/i915/intel_lspcon.h + create mode 100644 drivers/gpu/drm/i915/intel_lvds.h + create mode 100644 drivers/gpu/drm/i915/intel_panel.h + create mode 100644 drivers/gpu/drm/i915/intel_pipe_crc.h + create mode 100644 drivers/gpu/drm/i915/intel_pm.h + create mode 100644 drivers/gpu/drm/i915/intel_psr.h + create mode 100644 drivers/gpu/drm/i915/intel_sdvo.h + create mode 100644 drivers/gpu/drm/i915/intel_sprite.h + create mode 100644 drivers/gpu/drm/i915/intel_tv.h + create mode 100644 drivers/gpu/drm/i915/intel_workarounds_types.h + create mode 100644 drivers/gpu/drm/lima/Kconfig + create mode 100644 drivers/gpu/drm/lima/Makefile + create mode 100644 drivers/gpu/drm/lima/lima_bcast.c + create mode 100644 drivers/gpu/drm/lima/lima_bcast.h + create mode 100644 drivers/gpu/drm/lima/lima_ctx.c + create mode 100644 drivers/gpu/drm/lima/lima_ctx.h + create mode 100644 drivers/gpu/drm/lima/lima_device.c + create mode 100644 drivers/gpu/drm/lima/lima_device.h + create mode 100644 drivers/gpu/drm/lima/lima_dlbu.c + create mode 100644 drivers/gpu/drm/lima/lima_dlbu.h + create mode 100644 drivers/gpu/drm/lima/lima_drv.c + create mode 100644 drivers/gpu/drm/lima/lima_drv.h + create mode 100644 drivers/gpu/drm/lima/lima_gem.c + create mode 100644 drivers/gpu/drm/lima/lima_gem.h + create mode 100644 drivers/gpu/drm/lima/lima_gem_prime.c + create mode 100644 drivers/gpu/drm/lima/lima_gem_prime.h + create mode 100644 drivers/gpu/drm/lima/lima_gp.c + create mode 100644 drivers/gpu/drm/lima/lima_gp.h + create mode 100644 drivers/gpu/drm/lima/lima_l2_cache.c + create mode 100644 drivers/gpu/drm/lima/lima_l2_cache.h + create mode 100644 drivers/gpu/drm/lima/lima_mmu.c + create mode 100644 drivers/gpu/drm/lima/lima_mmu.h + create mode 100644 drivers/gpu/drm/lima/lima_object.c + create mode 100644 drivers/gpu/drm/lima/lima_object.h + create mode 100644 drivers/gpu/drm/lima/lima_pmu.c + create mode 100644 drivers/gpu/drm/lima/lima_pmu.h + create mode 100644 drivers/gpu/drm/lima/lima_pp.c + create mode 100644 drivers/gpu/drm/lima/lima_pp.h + create mode 100644 drivers/gpu/drm/lima/lima_regs.h + create mode 100644 drivers/gpu/drm/lima/lima_sched.c + create mode 100644 drivers/gpu/drm/lima/lima_sched.h + create mode 100644 drivers/gpu/drm/lima/lima_vm.c + create mode 100644 drivers/gpu/drm/lima/lima_vm.h + delete mode 100644 drivers/gpu/drm/meson/meson_canvas.c + delete mode 100644 drivers/gpu/drm/meson/meson_canvas.h + delete mode 100644 drivers/gpu/drm/omapdrm/displays/connector-dvi.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c + delete mode 100644 drivers/gpu/drm/omapdrm/displays/panel-dpi.c + create mode 100644 drivers/gpu/drm/panel/panel-feiyang-fy07024di26a30d.c + create mode 100644 drivers/gpu/drm/panel/panel-rocktech-jh057n00900.c + create mode 100644 drivers/gpu/drm/panel/panel-ronbo-rb070d30.c + create mode 100644 drivers/gpu/drm/panfrost/Kconfig + create mode 100644 drivers/gpu/drm/panfrost/Makefile + create mode 100644 drivers/gpu/drm/panfrost/TODO + create mode 100644 drivers/gpu/drm/panfrost/panfrost_devfreq.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_devfreq.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_device.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_device.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_drv.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_features.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_gem.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_gpu.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_gpu.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_issues.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_job.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_job.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_mmu.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_mmu.h + create mode 100644 drivers/gpu/drm/panfrost/panfrost_regs.h + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_writeback.c + create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_writeback.h + create mode 100644 drivers/gpu/drm/rockchip/rk3066_hdmi.c + create mode 100644 drivers/gpu/drm/rockchip/rk3066_hdmi.h + delete mode 100644 drivers/gpu/drm/tinydrm/core/tinydrm-core.c + rename drivers/{staging => gpu/drm}/vboxvideo/Kconfig (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/Makefile (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_base.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_ch_setup.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_channels.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/hgsmi_defs.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/modesetting.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.c (89%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_drv.h (96%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_fb.c (94%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_hgsmi.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_irq.c (93%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_main.c (98%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_mode.c (97%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_prime.c (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbox_ttm.c (97%) + rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_guest.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vboxvideo_vbe.h (100%) + rename drivers/{staging => gpu/drm}/vboxvideo/vbva_base.c (100%) + create mode 100644 drivers/infiniband/hw/efa/Kconfig + create mode 100644 drivers/infiniband/hw/efa/Makefile + create mode 100644 drivers/infiniband/hw/efa/efa.h + create mode 100644 drivers/infiniband/hw/efa/efa_admin_cmds_defs.h + create mode 100644 drivers/infiniband/hw/efa/efa_admin_defs.h + create mode 100644 drivers/infiniband/hw/efa/efa_com.c + create mode 100644 drivers/infiniband/hw/efa/efa_com.h + create mode 100644 drivers/infiniband/hw/efa/efa_com_cmd.c + create mode 100644 drivers/infiniband/hw/efa/efa_com_cmd.h + create mode 100644 drivers/infiniband/hw/efa/efa_common_defs.h + create mode 100644 drivers/infiniband/hw/efa/efa_main.c + create mode 100644 drivers/infiniband/hw/efa/efa_regs_defs.h + create mode 100644 drivers/infiniband/hw/efa/efa_verbs.c + create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c + create mode 100644 drivers/infiniband/hw/hns/hns_roce_restrack.c + delete mode 100644 drivers/staging/vboxvideo/TODO + create mode 100644 include/drm/drm_format_helper.h + create mode 100644 include/drm/drm_gem_shmem_helper.h + delete mode 100644 include/drm/tinydrm/tinydrm.h + create mode 100644 include/linux/dma-fence-chain.h + create mode 100644 include/linux/dma/idma64.h + create mode 100644 include/sound/sof.h + create mode 100644 include/sound/sof/control.h + create mode 100644 include/sound/sof/dai-intel.h + create mode 100644 include/sound/sof/dai.h + create mode 100644 include/sound/sof/header.h + create mode 100644 include/sound/sof/info.h + create mode 100644 include/sound/sof/pm.h + create mode 100644 include/sound/sof/stream.h + create mode 100644 include/sound/sof/topology.h + create mode 100644 include/sound/sof/trace.h + create mode 100644 include/sound/sof/xtensa.h + create mode 100644 include/trace/events/ib_mad.h + create mode 100644 include/trace/events/ib_umad.h + create mode 100644 include/uapi/drm/lima_drm.h + create mode 100644 include/uapi/drm/panfrost_drm.h + create mode 100644 include/uapi/rdma/efa-abi.h + create mode 100644 include/uapi/sound/sof/abi.h + create mode 100644 include/uapi/sound/sof/eq.h + create mode 100644 include/uapi/sound/sof/fw.h + create mode 100644 include/uapi/sound/sof/header.h + create mode 100644 include/uapi/sound/sof/manifest.h + create mode 100644 include/uapi/sound/sof/tokens.h + create mode 100644 include/uapi/sound/sof/tone.h + create mode 100644 include/uapi/sound/sof/trace.h + create mode 100644 kernel/cgroup/legacy_freezer.c + create mode 100644 samples/bpf/ibumad_kern.c + create mode 100644 samples/bpf/ibumad_user.c + create mode 100644 sound/soc/atmel/mchp-i2s-mcc.c + create mode 100644 sound/soc/codecs/lochnagar-sc.c + create mode 100644 sound/soc/codecs/tlv320aic32x4-clk.c + create mode 100644 sound/soc/fsl/fsl_audmix.c + create mode 100644 sound/soc/fsl/fsl_audmix.h + create mode 100644 sound/soc/fsl/imx-audmix.c + create mode 100644 sound/soc/intel/boards/sof_rt5682.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c + create mode 100644 sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c + create mode 100644 sound/soc/sof/Kconfig + create mode 100644 sound/soc/sof/Makefile + create mode 100644 sound/soc/sof/control.c + create mode 100644 sound/soc/sof/core.c + create mode 100644 sound/soc/sof/debug.c + create mode 100644 sound/soc/sof/intel/Kconfig + create mode 100644 sound/soc/sof/intel/Makefile + create mode 100644 sound/soc/sof/intel/apl.c + create mode 100644 sound/soc/sof/intel/bdw.c + create mode 100644 sound/soc/sof/intel/byt.c + create mode 100644 sound/soc/sof/intel/cnl.c + create mode 100644 sound/soc/sof/intel/hda-bus.c + create mode 100644 sound/soc/sof/intel/hda-codec.c + create mode 100644 sound/soc/sof/intel/hda-ctrl.c + create mode 100644 sound/soc/sof/intel/hda-dai.c + create mode 100644 sound/soc/sof/intel/hda-dsp.c + create mode 100644 sound/soc/sof/intel/hda-ipc.c + create mode 100644 sound/soc/sof/intel/hda-loader.c + create mode 100644 sound/soc/sof/intel/hda-pcm.c + create mode 100644 sound/soc/sof/intel/hda-stream.c + create mode 100644 sound/soc/sof/intel/hda-trace.c + create mode 100644 sound/soc/sof/intel/hda.c + create mode 100644 sound/soc/sof/intel/hda.h + create mode 100644 sound/soc/sof/intel/intel-ipc.c + create mode 100644 sound/soc/sof/intel/shim.h + create mode 100644 sound/soc/sof/ipc.c + create mode 100644 sound/soc/sof/loader.c + create mode 100644 sound/soc/sof/nocodec.c + create mode 100644 sound/soc/sof/ops.c + create mode 100644 sound/soc/sof/ops.h + create mode 100644 sound/soc/sof/pcm.c + create mode 100644 sound/soc/sof/pm.c + create mode 100644 sound/soc/sof/sof-acpi-dev.c + create mode 100644 sound/soc/sof/sof-pci-dev.c + create mode 100644 sound/soc/sof/sof-priv.h + create mode 100644 sound/soc/sof/topology.c + create mode 100644 sound/soc/sof/trace.c + create mode 100644 sound/soc/sof/utils.c + create mode 100644 sound/soc/sof/xtensa/Kconfig + create mode 100644 sound/soc/sof/xtensa/Makefile + create mode 100644 sound/soc/sof/xtensa/core.c + create mode 100644 sound/soc/sprd/sprd-mcdt.c + create mode 100644 sound/soc/sprd/sprd-mcdt.h + create mode 100644 sound/soc/sprd/sprd-pcm-compress.c + create mode 100644 tools/arch/csky/include/uapi/asm/perf_regs.h + create mode 100644 tools/perf/arch/csky/Build + create mode 100644 tools/perf/arch/csky/Makefile + create mode 100644 tools/perf/arch/csky/include/perf_regs.h + create mode 100644 tools/perf/arch/csky/util/Build + create mode 100644 tools/perf/arch/csky/util/dwarf-regs.c + create mode 100644 tools/perf/arch/csky/util/unwind-libdw.c + create mode 100644 tools/testing/selftests/cgroup/test_freezer.c +Merging fixes/master (d15da9d3fb74 kernel/compat.c: mark expected switch fall-throughs) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + kernel/compat.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Already up to date. +Merging kbuild-current/fixes (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (8b21baee8e48 ARC: fix build warnings) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/include/asm/cmpxchg.h | 14 ++++++++++---- + arch/arc/mm/tlb.c | 13 ++++++++----- + 2 files changed, 18 insertions(+), 9 deletions(-) +Merging arm-current/fixes (e17b1af96b2a ARM: 8857/1: efi: enable CP15 DMB instructions before cleaning the cache) +$ git merge arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (4e69ecf4da1e arm64/module: ftrace: deal with place relative nature of PLTs) +$ git merge arm64-fixes/for-next/fixes +Already up to date. +Merging m68k-current/for-linus (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (12f363511d47 powerpc/32s: Fix BATs setting with CONFIG_STRICT_KERNEL_RWX) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (f4d9a23d3dad sparc64: simplify reduce_memory() function) +$ git merge sparc/master +Merge made by the 'recursive' strategy. + Documentation/sparc/{adi.txt => adi.rst} | 188 +++++++++++---------- + Documentation/sparc/{console.txt => console.rst} | 4 +- + Documentation/sparc/index.rst | 13 ++ + .../oradax/{oracle-dax.txt => oracle-dax.rst} | 58 ++++--- + arch/sparc/kernel/cpumap.c | 3 +- + arch/sparc/kernel/uprobes.c | 1 - + arch/sparc/mm/init_64.c | 42 +---- + arch/sparc/mm/iommu.c | 142 +++++++--------- + arch/sparc/vdso/Makefile | 2 +- + drivers/sbus/char/oradax.c | 2 +- + 10 files changed, 213 insertions(+), 242 deletions(-) + rename Documentation/sparc/{adi.txt => adi.rst} (70%) + rename Documentation/sparc/{console.txt => console.rst} (53%) + create mode 100644 Documentation/sparc/index.rst + rename Documentation/sparc/oradax/{oracle-dax.txt => oracle-dax.rst} (95%) +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (36096f2f4fa0 packet: Fix error path in packet_init) +$ git merge net/master +Merge made by the 'recursive' strategy. + drivers/net/dsa/lantiq_gswip.c | 8 +-- + drivers/net/dsa/sja1105/sja1105_main.c | 6 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 11 ++-- + .../net/ethernet/aquantia/atlantic/aq_drvinfo.c | 5 ++ + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 1 + + drivers/net/ethernet/netronome/nfp/nfp_port.c | 16 +++++ + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 2 + + drivers/net/macvlan.c | 2 + + drivers/net/phy/realtek.c | 70 ++++++++++++++++++++-- + drivers/net/tun.c | 14 ++++- + drivers/net/usb/aqc111.c | 31 +++++++--- + drivers/ptp/ptp_qoriq.c | 3 + + include/net/tcp.h | 2 +- + net/8021q/vlan_dev.c | 4 +- + net/batman-adv/main.c | 1 + + net/batman-adv/main.h | 2 +- + net/batman-adv/multicast.c | 11 +--- + net/batman-adv/types.h | 5 ++ + net/core/fib_rules.c | 6 +- + net/ipv4/raw.c | 4 +- + net/ipv4/tcp_input.c | 16 +++-- + net/openvswitch/conntrack.c | 4 +- + net/packet/af_packet.c | 25 ++++++-- + net/sched/cls_matchall.c | 1 + + net/tipc/socket.c | 4 +- + net/tls/tls_device.c | 1 + + security/selinux/hooks.c | 8 +-- + 28 files changed, 206 insertions(+), 59 deletions(-) +Merging bpf/master (494bc1d281b5 net/tcp: use deferred jump label for TCP acked data hook) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (9b3040a6aafd ipv4: Define __ipv4_neigh_lookup_noref when CONFIG_INET is disabled) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (c6c9c0596c21 netfilter: nf_tables: remove NFT_CT_TIMEOUT) +$ git merge netfilter/master +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_flow_table_ip.c +Auto-merging net/netfilter/nf_conntrack_netlink.c +Auto-merging net/bridge/netfilter/ebtables.c +Auto-merging include/uapi/linux/netfilter/nf_tables.h +CONFLICT (content): Merge conflict in include/uapi/linux/netfilter/nf_tables.h +Recorded preimage for 'include/uapi/linux/netfilter/nf_tables.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/uapi/linux/netfilter/nf_tables.h'. +[master a57fbf361dab] Merge remote-tracking branch 'netfilter/master' +$ git diff -M --stat --summary HEAD^.. + include/uapi/linux/netfilter/nf_tables.h | 2 -- + net/bridge/netfilter/ebtables.c | 4 ++- + net/netfilter/nf_conntrack_h323_asn1.c | 2 +- + net/netfilter/nf_conntrack_h323_main.c | 11 ++---- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_flow_table_core.c | 34 +++++++++++++----- + net/netfilter/nf_flow_table_ip.c | 6 ++++ + net/netfilter/nf_tables_api.c | 59 +++++++++++++++++++++++++------- + net/netfilter/nft_flow_offload.c | 4 +-- + 9 files changed, 88 insertions(+), 36 deletions(-) +Merging ipvs/master (b2e3d68d1251 netfilter: nft_compat: destroy function must not have side effects) +$ git merge ipvs/master +Already up to date. +Merging wireless-drivers/master (7a0f8ad5ff63 Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git) +$ git merge wireless-drivers/master +Already up to date. +Merging mac80211/master (5f05836831f6 net/sched: avoid double free on matchall reoffload) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (2557fabd6e29 RDMA/hns: Bugfix for mapping user db) +$ git merge rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (ed97c988bdc6 Merge tag 'asoc-v5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (7663ec3c9249 Merge branch 'asoc-5.1' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging regmap-fixes/for-linus (7fdc9fc87492 Merge branch 'regmap-5.1' into regmap-linus) +$ git merge regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (c7b5128f72ef Merge branch 'regulator-5.1' into regulator-linus) +$ git merge regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (c84e8dd1bfcb Merge branch 'spi-5.1' into spi-linus) +$ git merge spi-fixes/for-linus +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci-current/for-linus (9c9c5fc89b09 PCI/LINK: Add Kconfig option (default off)) +$ git merge pci-current/for-linus +Merge made by the 'recursive' strategy. +Merging driver-core.current/driver-core-linus (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (072684e8c58d USB: gadget: f_hid: fix deadlock in f_hidg_write()) +$ git merge usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (79a3aaa7b82e Linux 5.1-rc3) +$ git merge usb-serial-fixes/usb-linus +Already up to date. +Merging usb-chipidea-fixes/ci-for-usb-stable (d6d768a0ec3c usb: chipidea: fix static checker warning for NULL pointer) +$ git merge usb-chipidea-fixes/ci-for-usb-stable +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy/fixes (e6f32efb1b12 phy: sun4i-usb: Make sure to disable PHY0 passby for peripheral mode) +$ git merge phy/fixes +Already up to date. +Merging staging.current/staging-linus (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (e93c9c99a629 Linux 5.1) +$ git merge thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (3a349763cf11 Input: synaptics-rmi4 - write config register values to the right offset) +$ git merge input-current/for-linus +Already up to date. +Merging crypto-current/master (cbc22b062106 Revert "crypto: caam/jr - Remove extra memory barrier during job ring dequeue") +$ git merge crypto-current/master +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + drivers/crypto/caam/caamalg.c | 9 +++++++-- + drivers/crypto/caam/caamalg_qi.c | 7 +++++-- + drivers/crypto/caam/caamalg_qi2.c | 8 +++++++- + drivers/crypto/caam/error.c | 2 +- + drivers/crypto/caam/jr.c | 2 +- + drivers/crypto/caam/regs.h | 8 -------- + drivers/crypto/chelsio/chcr_algo.c | 17 +++++------------ + drivers/crypto/chelsio/chcr_core.c | 4 ---- + drivers/crypto/chelsio/chcr_ipsec.c | 3 ++- + 10 files changed, 29 insertions(+), 33 deletions(-) +Merging ide/master (7ad19a99ad43 ide: officially deprecated the legacy IDE driver) +$ git merge ide/master +Already up to date. +Merging vfio-fixes/for-linus (492855939bdb vfio/type1: Limit DMA mappings per container) +$ git merge vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (15ade5d2e777 Linux 5.1-rc4) +$ git merge kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (be71eda5383f module: Fix display of wrong module .text address) +$ git merge modules-fixes/modules-linus +Already up to date. +Merging slave-dma-fixes/fixes (37624b58542f Linux 5.1-rc7) +$ git merge slave-dma-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (651022382c7f Linux 4.20-rc1) +$ git merge backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (9a8f612ca0d6 mtd: rawnand: marvell: Clean the controller state before each operation) +$ git merge mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a05a2e7998ab mfd: sun6i-prcm: Allow to compile with COMPILE_TEST) +$ git merge mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (7afa8db323e3 media: vsp1: Add support for missing 16-bit RGB555 formats) +$ git merge v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (13e8a05b9224 reset: meson-audio-arb: Fix missing .owner setting of reset_controller_dev) +$ git merge reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (a1e8783db8e0 MIPS: perf: ath79: Fix perfcount IRQ assignment) +$ git merge mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (ba5e60c9b75d arm/mach-at91/pm : fix possible object reference leak) +$ git merge at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (1ba12322e2f0 Merge branch 'am5-sdio-fixes' into fixes) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am57xx-idk-common.dtsi | 1 + + arch/arm/boot/dts/dra76x-mmc-iodelay.dtsi | 40 ++++++++++++------------- + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + 4 files changed, 23 insertions(+), 22 deletions(-) +Merging kvm-fixes/master (e8ab8d24b488 KVM: nVMX: Fix size checks in vmx_set_nested_state) +$ git merge kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (b10bd9a256ae s390: vsie: Use effective CRYCBD.31 to check CRYCBD validity) +$ git merge kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (b88c5049219a hwmon: (occ) Fix extended status bits) +$ git merge hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (c4703ce11c23 libnvdimm/namespace: Fix label tracking error) +$ git merge nvdimm-fixes/libnvdimm-fixes +Merge made by the 'recursive' strategy. + drivers/dax/pmem/core.c | 6 +++--- + drivers/nvdimm/label.c | 29 ++++++++++++++++------------- + drivers/nvdimm/namespace_devs.c | 15 +++++++++++++++ + drivers/nvdimm/nd.h | 4 ++++ + tools/testing/nvdimm/Kbuild | 3 +++ + tools/testing/nvdimm/dax_pmem_compat_test.c | 8 ++++++++ + tools/testing/nvdimm/dax_pmem_core_test.c | 8 ++++++++ + tools/testing/nvdimm/dax_pmem_test.c | 8 ++++++++ + tools/testing/nvdimm/test/nfit.c | 3 +++ + tools/testing/nvdimm/watermark.h | 3 +++ + 10 files changed, 71 insertions(+), 16 deletions(-) + create mode 100644 tools/testing/nvdimm/dax_pmem_compat_test.c + create mode 100644 tools/testing/nvdimm/dax_pmem_core_test.c + create mode 100644 tools/testing/nvdimm/dax_pmem_test.c +Merging btrfs-fixes/next-fixes (0b341c8bfa6d Merge branch 'misc-next' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Auto-merging fs/btrfs/compression.c +Merge made by the 'recursive' strategy. + fs/btrfs/compression.c | 1 + + fs/btrfs/file.c | 4 +--- + fs/btrfs/props.c | 30 ++++++++++++++++++++++-------- + 3 files changed, 24 insertions(+), 11 deletions(-) +Merging vfs-fixes/fixes (05883eee857e do_move_mount(): fix an unsafe use of is_anon_ns()) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/namespace.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging dma-mapping-fixes/for-linus (8c5165430c01 dma-debug: only skip one stackframe entry) +$ git merge dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/master (709a53e19484 MAINTAINERS: Fix the I3C entry) +$ git merge i3c-fixes/master +Already up to date. +Merging drivers-x86-fixes/fixes (e93c9c99a629 Linux 5.1) +$ git merge drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/pinctrl-fixes (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pinctrl-samsung-fixes/pinctrl-fixes +Already up to date. +Merging devicetree-fixes/dt/linus (5fa98c2eda35 dt-bindings: Fix dt_binding_check target for in tree builds) +$ git merge devicetree-fixes/dt/linus +Already up to date. +Merging scsi-fixes/fixes (144ec97493af scsi: aic7xxx: fix EISA support) +$ git merge scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (e93c9c99a629 Linux 5.1) +$ git merge drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (f7b1844bacec drm/amdgpu: Update gc golden setting for vega family) +$ git merge amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (f5c58ba18ab8 drm/i915: Restore correct bxt_ddi_phy_calc_lane_lat_optim_mask() calculation) +$ git merge drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (dc4060a5dc25 Linux 5.1-rc5) +$ git merge mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (882c5e552ffd rtc: da9063: set uie_unsupported when relevant) +$ git merge rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (79a3aaa7b82e Linux 5.1-rc3) +$ git merge gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (69c8caafb72d hv: tools: fixed Python pep8/flake8 warnings for lsvmbus) +$ git merge hyperv-fixes/hyperv-fixes +Merge made by the 'recursive' strategy. + drivers/hv/channel.c | 2 +- + tools/hv/hv_get_dhcp_info.sh | 2 +- + tools/hv/hv_kvp_daemon.c | 8 +++-- + tools/hv/hv_set_ifconfig.sh | 2 +- + tools/hv/hv_vss_daemon.c | 4 ++- + tools/hv/lsvmbus | 75 +++++++++++++++++++++++++------------------- + 6 files changed, 53 insertions(+), 40 deletions(-) +Merging drm-misc-fixes/for-linux-next-fixes (ab042b824c11 Revert "drm/qxl: drop prime import/export callbacks") +$ git merge drm-misc-fixes/for-linux-next-fixes +Already up to date. +Merging kbuild/for-next (34bc9e494242 Merge branch 'kconfig' into for-next) +$ git merge kbuild/for-next +Removing arch/csky/boot/dts/include/dt-bindings +Merge made by the 'recursive' strategy. + Makefile | 1 - + arch/csky/boot/dts/include/dt-bindings | 1 - + arch/ia64/kernel/Makefile.gate | 2 +- + arch/sh/kernel/vsyscall/Makefile | 3 +-- + samples/Makefile | 24 ++++++++++++++++++++---- + samples/seccomp/Makefile | 2 +- + samples/vfs/Makefile | 2 +- + scripts/kconfig/nconf-cfg.sh | 0 + 8 files changed, 24 insertions(+), 11 deletions(-) + delete mode 120000 arch/csky/boot/dts/include/dt-bindings + mode change 100644 => 100755 scripts/kconfig/nconf-cfg.sh +Merging compiler-attributes/compiler-attributes (a3b22b9f11d9 Linux 5.0-rc7) +$ git merge compiler-attributes/compiler-attributes +Already up to date. +Merging leaks/leaks-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge leaks/leaks-next +Already up to date. +Merging dma-mapping/for-next (13bf5ced9377 dma-mapping: add a Kconfig symbol to indicate arch_dma_prep_coherent presence) +$ git merge dma-mapping/for-next +Already up to date. +Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores) +$ git merge asm-generic/master +Auto-merging lib/Kconfig +Removing include/asm-generic/segment.h +Removing arch/xtensa/include/asm/segment.h +Auto-merging arch/unicore32/include/asm/Kbuild +Removing arch/s390/include/asm/segment.h +Auto-merging arch/parisc/include/asm/Kbuild +Auto-merging arch/openrisc/include/asm/Kbuild +Auto-merging arch/nios2/include/asm/Kbuild +Auto-merging arch/nds32/include/asm/Kbuild +Removing arch/ia64/include/asm/segment.h +Auto-merging arch/hexagon/include/asm/Kbuild +Removing arch/h8300/include/asm/uaccess.h +Auto-merging arch/h8300/include/asm/Kbuild +Auto-merging arch/h8300/Kconfig +Auto-merging arch/c6x/include/asm/Kbuild +Auto-merging arch/arm64/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild +Auto-merging arch/arm/include/asm/Kbuild +Removing arch/alpha/include/asm/segment.h +Resolved 'arch/arm64/include/asm/Kbuild' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master d530b210af40] Merge remote-tracking branch 'asm-generic/master' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/segment.h | 6 ---- + arch/alpha/kernel/smc37c669.c | 1 - + arch/alpha/kernel/smc37c93x.c | 1 - + arch/arc/include/asm/uaccess.h | 1 + + arch/arm/include/asm/Kbuild | 1 - + arch/arm64/include/asm/Kbuild | 1 - + arch/c6x/include/asm/Kbuild | 1 - + arch/h8300/Kconfig | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/h8300/include/asm/uaccess.h | 55 ------------------------------------ + arch/hexagon/include/asm/Kbuild | 1 - + arch/hexagon/include/asm/uaccess.h | 1 - + arch/ia64/include/asm/segment.h | 6 ---- + arch/mips/include/asm/Kbuild | 1 - + arch/nds32/include/asm/Kbuild | 1 - + arch/nios2/include/asm/Kbuild | 1 - + arch/openrisc/include/asm/Kbuild | 1 - + arch/openrisc/kernel/ptrace.c | 1 - + arch/openrisc/kernel/setup.c | 1 - + arch/openrisc/kernel/traps.c | 1 - + arch/openrisc/mm/init.c | 1 - + arch/openrisc/mm/tlb.c | 1 - + arch/parisc/include/asm/Kbuild | 1 - + arch/s390/include/asm/segment.h | 5 ---- + arch/s390/kernel/ptrace.c | 1 - + arch/unicore32/include/asm/Kbuild | 1 - + arch/xtensa/include/asm/segment.h | 16 ----------- + include/asm-generic/segment.h | 9 ------ + include/asm-generic/uaccess.h | 58 +++++++++++++++++++++++++++++++++++++- + lib/Kconfig | 4 +++ + 30 files changed, 64 insertions(+), 117 deletions(-) + delete mode 100644 arch/alpha/include/asm/segment.h + delete mode 100644 arch/h8300/include/asm/uaccess.h + delete mode 100644 arch/ia64/include/asm/segment.h + delete mode 100644 arch/s390/include/asm/segment.h + delete mode 100644 arch/xtensa/include/asm/segment.h + delete mode 100644 include/asm-generic/segment.h +Merging arc/for-next (5908e6b738e3 Linux 5.0-rc8) +$ git merge arc/for-next +Already up to date. +Merging arm/for-next (3d3c616177cc Merge branches 'fixes' and 'misc' into for-next) +$ git merge arm/for-next +Removing arch/arm/include/asm/limits.h +Merge made by the 'recursive' strategy. + arch/arm/Makefile | 8 ++------ + arch/arm/include/asm/domain.h | 6 ++++-- + arch/arm/include/asm/futex.h | 3 ++- + arch/arm/include/asm/limits.h | 12 ------------ + arch/arm/include/asm/processor.h | 4 ++-- + arch/arm/include/asm/uaccess.h | 3 ++- + arch/arm/mm/init.c | 17 +---------------- + arch/arm/vdso/Makefile | 21 ++++++++------------- + 8 files changed, 21 insertions(+), 53 deletions(-) + delete mode 100644 arch/arm/include/asm/limits.h +Merging arm64/for-next/core (6127bf372add Merge branch 'for-next/mmiowb' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into for-next/core) +$ git merge arm64/for-next/core +Already up to date! +Merge made by the 'recursive' strategy. +Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling) +$ git merge arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (c19ddad91159 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/watchdog/ixp4xx_wdt.c +Auto-merging drivers/misc/Makefile +CONFLICT (content): Merge conflict in drivers/misc/Makefile +Auto-merging drivers/misc/Kconfig +CONFLICT (content): Merge conflict in drivers/misc/Kconfig +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/firmware/Makefile +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/crypto/ixp4xx_crypto.c +Auto-merging drivers/clocksource/Kconfig +Removing arch/arm/mach-ixp4xx/include/mach/qmgr.h +Removing arch/arm/mach-ixp4xx/include/mach/irqs.h +Removing arch/arm/mach-ixp4xx/include/mach/entry-macro.S +Auto-merging arch/arm/mach-imx/pm-imx6.c +Auto-merging arch/arm/mach-ep93xx/vision_ep9307.c +Auto-merging arch/arm/mach-ep93xx/ts72xx.c +Auto-merging arch/arm/mach-ep93xx/simone.c +Auto-merging arch/arm/mach-ep93xx/edb93xx.c +Removing arch/arm/firmware/Makefile +Removing arch/arm/firmware/Kconfig +Auto-merging arch/arm/boot/dts/rk3288.dtsi +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Auto-merging Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt +Auto-merging Documentation/devicetree/bindings/hwmon/pwm-fan.txt +Removing Documentation/devicetree/bindings/arm/sunxi.txt +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Resolved 'drivers/misc/Kconfig' using previous resolution. +Resolved 'drivers/misc/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 05ff11de2dc5] Merge remote-tracking branch 'arm-soc/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/amlogic.txt | 1 + + .../devicetree/bindings/arm/freescale/fsl,scu.txt | 29 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 36 + + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 22 + + .../devicetree/bindings/arm/omap/omap.txt | 6 + + .../devicetree/bindings/arm/rockchip.yaml | 25 +- + Documentation/devicetree/bindings/arm/sunxi.txt | 23 - + Documentation/devicetree/bindings/arm/sunxi.yaml | 807 ++++++++++++++ + Documentation/devicetree/bindings/bus/ti-sysc.txt | 6 +- + .../devicetree/bindings/clock/xlnx,zynqmp-clk.txt | 63 ++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + + .../intel,ixp4xx-network-processing-engine.yaml | 44 + + .../firmware/xilinx/xlnx,zynqmp-firmware.txt | 54 +- + .../bindings/fpga/xlnx,zynqmp-pcap-fpga.txt | 25 + + .../devicetree/bindings/gpu/arm,mali-midgard.txt | 14 + + .../devicetree/bindings/hwmon/pwm-fan.txt | 2 - + .../devicetree/bindings/iio/adc/imx7d-adc.txt | 2 + + .../devicetree/bindings/iio/adc/qcom,spmi-vadc.txt | 1 + + .../intel,ixp4xx-interrupt.yaml | 54 + + .../interrupt-controller/mediatek,sysirq.txt | 7 +- + .../bindings/memory-controllers/fsl/mmdc.txt | 35 + + .../bindings/misc/intel,ixp4xx-queue-manager.yaml | 49 + + .../devicetree/bindings/mmc/k3-dw-mshc.txt | 2 + + .../bindings/power/amlogic,meson-gx-pwrc.txt | 4 +- + .../bindings/reset/hisilicon,hi3660-reset.txt | 7 +- + .../devicetree/bindings/serial/mtk-uart.txt | 4 +- + .../devicetree/bindings/soc/mediatek/pwrap.txt | 1 + + .../devicetree/bindings/soc/mediatek/scpsys.txt | 5 +- + .../bindings/timer/intel,ixp4xx-timer.yaml | 42 + + .../bindings/timer/mediatek,mtk-timer.txt | 1 + + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + + .../devicetree/bindings/vendor-prefixes.txt | 7 + + .../devicetree/bindings/watchdog/mtk-wdt.txt | 1 + + Documentation/xilinx/eemi.txt | 4 +- + MAINTAINERS | 21 +- + arch/arm/Kconfig | 7 +- + arch/arm/Kconfig.debug | 2 + + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 201 ++++ + arch/arm/boot/dts/Makefile | 16 +- + arch/arm/boot/dts/am335x-baltos-ir2110.dts | 16 +- + arch/arm/boot/dts/am335x-baltos-ir3220.dts | 38 +- + arch/arm/boot/dts/am335x-baltos-ir5221.dts | 42 +- + arch/arm/boot/dts/am335x-baltos-leds.dtsi | 6 +- + arch/arm/boot/dts/am335x-baltos.dtsi | 140 +-- + arch/arm/boot/dts/am335x-base0033.dts | 48 +- + arch/arm/boot/dts/am335x-bone-common.dtsi | 116 +- + arch/arm/boot/dts/am335x-boneblack-common.dtsi | 54 +- + arch/arm/boot/dts/am335x-boneblack-wireless.dts | 28 +- + arch/arm/boot/dts/am335x-boneblue.dts | 104 +- + arch/arm/boot/dts/am335x-bonegreen-common.dtsi | 4 +- + arch/arm/boot/dts/am335x-bonegreen-wireless.dts | 28 +- + arch/arm/boot/dts/am335x-chiliboard.dts | 66 +- + arch/arm/boot/dts/am335x-chilisom.dtsi | 34 +- + arch/arm/boot/dts/am335x-cm-t335.dts | 190 ++-- + arch/arm/boot/dts/am335x-evm.dts | 234 ++-- + arch/arm/boot/dts/am335x-evmsk.dts | 292 ++--- + arch/arm/boot/dts/am335x-icev2.dts | 116 +- + arch/arm/boot/dts/am335x-igep0033.dtsi | 40 +- + arch/arm/boot/dts/am335x-lxm.dts | 120 +-- + arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 42 +- + arch/arm/boot/dts/am335x-moxa-uc-2101.dts | 24 +- + arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 116 +- + arch/arm/boot/dts/am335x-nano.dts | 140 +-- + arch/arm/boot/dts/am335x-osd3358-sm-red.dts | 168 +-- + arch/arm/boot/dts/am335x-osd335x-common.dtsi | 4 +- + arch/arm/boot/dts/am335x-pcm-953.dtsi | 74 +- + arch/arm/boot/dts/am335x-pdu001.dts | 170 +-- + arch/arm/boot/dts/am335x-pepper.dts | 200 ++-- + arch/arm/boot/dts/am335x-phycore-som.dtsi | 60 +- + arch/arm/boot/dts/am335x-pocketbeagle.dts | 56 +- + arch/arm/boot/dts/am335x-sancloud-bbe.dts | 62 +- + arch/arm/boot/dts/am335x-sbc-t335.dts | 152 +-- + arch/arm/boot/dts/am335x-shc.dts | 226 ++-- + arch/arm/boot/dts/am335x-sl50.dts | 208 ++-- + arch/arm/boot/dts/am335x-wega.dtsi | 68 +- + arch/arm/boot/dts/am43x-epos-evm.dts | 11 + + arch/arm/boot/dts/am5718.dtsi | 32 + + arch/arm/boot/dts/am571x-idk.dts | 2 +- + arch/arm/boot/dts/am5728.dtsi | 33 + + arch/arm/boot/dts/am572x-idk.dts | 5 +- + arch/arm/boot/dts/am5748.dtsi | 33 + + arch/arm/boot/dts/am574x-idk.dts | 4 +- + arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 +- + arch/arm/boot/dts/am57xx-cl-som-am57x.dts | 2 +- + arch/arm/boot/dts/armada-38x.dtsi | 2 + + arch/arm/boot/dts/aspeed-ast2500-evb.dts | 21 +- + arch/arm/boot/dts/aspeed-bmc-facebook-cmm.dts | 6 + + .../arm/boot/dts/aspeed-bmc-facebook-tiogapass.dts | 5 + + arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 +- + arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts | 8 + + arch/arm/boot/dts/aspeed-bmc-opp-witherspoon.dts | 52 +- + arch/arm/boot/dts/aspeed-g4.dtsi | 6 + + arch/arm/boot/dts/aspeed-g5.dtsi | 20 + + arch/arm/boot/dts/at91-sama5d27_som1.dtsi | 39 +- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 39 +- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 93 +- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 39 +- + arch/arm/boot/dts/at91-sama5d4ek.dts | 39 +- + arch/arm/boot/dts/at91-vinco.dts | 39 +- + arch/arm/boot/dts/at91sam9260ek.dts | 39 +- + arch/arm/boot/dts/at91sam9xe.dtsi | 39 +- + arch/arm/boot/dts/axp81x.dtsi | 4 + + arch/arm/boot/dts/dra7-l4.dtsi | 6 +- + arch/arm/boot/dts/dra7.dtsi | 2 + + arch/arm/boot/dts/emev2-kzm9d.dts | 2 +- + arch/arm/boot/dts/exynos3250.dtsi | 72 +- + arch/arm/boot/dts/exynos4.dtsi | 14 +- + arch/arm/boot/dts/exynos4210-origen.dts | 4 +- + arch/arm/boot/dts/exynos4210-smdkv310.dts | 4 +- + arch/arm/boot/dts/exynos4210-trats.dts | 4 +- + arch/arm/boot/dts/exynos4210-universal_c210.dts | 21 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 7 +- + arch/arm/boot/dts/exynos4412-origen.dts | 3 +- + arch/arm/boot/dts/exynos4412-smdk4412.dts | 4 +- + arch/arm/boot/dts/exynos4412-trats2.dts | 3 +- + arch/arm/boot/dts/exynos4412.dtsi | 2 +- + arch/arm/boot/dts/exynos5250-smdk5250.dts | 3 +- + arch/arm/boot/dts/exynos5250.dtsi | 40 +- + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 16 + + arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 +- + arch/arm/boot/dts/exynos5260.dtsi | 82 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 2 - + arch/arm/boot/dts/exynos5410-smdk5410.dts | 2 +- + arch/arm/boot/dts/exynos5420-arndale-octa.dts | 364 ++++++- + arch/arm/boot/dts/exynos5420-smdk5420.dts | 3 +- + arch/arm/boot/dts/exynos5420.dtsi | 2 +- + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 5 +- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 2 - + arch/arm/boot/dts/exynos54xx.dtsi | 38 +- + arch/arm/boot/dts/gemini-dlink-dir-685.dts | 82 +- + arch/arm/boot/dts/imx35.dtsi | 6 + + arch/arm/boot/dts/imx50-kobo-aura.dts | 258 +++++ + arch/arm/boot/dts/imx50.dtsi | 23 +- + arch/arm/boot/dts/imx51-zii-rdu1.dts | 38 +- + arch/arm/boot/dts/imx51.dtsi | 2 +- + arch/arm/boot/dts/imx53-m53.dtsi | 2 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 311 ++++++ + arch/arm/boot/dts/imx53.dtsi | 2 +- + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts | 381 +++++++ + arch/arm/boot/dts/imx6dl-sabreauto.dts | 15 + + arch/arm/boot/dts/imx6q-gw54xx.dts | 105 ++ + arch/arm/boot/dts/imx6q-logicpd.dts | 4 +- + arch/arm/boot/dts/imx6q-zii-rdu2.dts | 38 +- + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 2 - + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 29 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 138 +++ + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-var-dart.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-zii-rdu2.dtsi | 50 +- + arch/arm/boot/dts/imx6qdl.dtsi | 18 +- + arch/arm/boot/dts/imx6qp-zii-rdu2.dts | 38 +- + arch/arm/boot/dts/imx6sl.dtsi | 11 +- + arch/arm/boot/dts/imx6sll.dtsi | 3 +- + arch/arm/boot/dts/imx6sx.dtsi | 4 +- + arch/arm/boot/dts/imx6ul.dtsi | 4 +- + arch/arm/boot/dts/imx7-mba7.dtsi | 550 ++++++++++ + arch/arm/boot/dts/imx7-tqma7.dtsi | 249 +++++ + arch/arm/boot/dts/imx7d-mba7.dts | 119 +++ + arch/arm/boot/dts/imx7d-tqma7.dtsi | 11 + + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 941 ++++++++++++++++ + arch/arm/boot/dts/imx7d.dtsi | 1 + + arch/arm/boot/dts/imx7s-mba7.dts | 18 + + arch/arm/boot/dts/imx7s-tqma7.dtsi | 11 + + arch/arm/boot/dts/imx7s-warp.dts | 61 ++ + arch/arm/boot/dts/imx7s.dtsi | 98 +- + arch/arm/boot/dts/imx7ulp.dtsi | 12 + + arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 109 ++ + arch/arm/boot/dts/intel-ixp42x.dtsi | 25 + + .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 94 ++ + arch/arm/boot/dts/intel-ixp43x.dtsi | 15 + + arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi | 34 + + arch/arm/boot/dts/intel-ixp4xx.dtsi | 69 ++ + arch/arm/boot/dts/lpc3250-ea3250.dts | 1 + + arch/arm/boot/dts/lpc3250-phy3250.dts | 3 +- + arch/arm/boot/dts/lpc32xx.dtsi | 38 +- + arch/arm/boot/dts/ls1021a-moxa-uc-8410a.dts | 1 - + arch/arm/boot/dts/ls1021a-qds.dts | 4 + + arch/arm/boot/dts/ls1021a.dtsi | 1 - + arch/arm/boot/dts/meson.dtsi | 9 + + arch/arm/boot/dts/meson8.dtsi | 10 + + arch/arm/boot/dts/meson8b-ec100.dts | 14 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 66 ++ + arch/arm/boot/dts/meson8b.dtsi | 10 + + arch/arm/boot/dts/omap2420-n810.dts | 2 +- + arch/arm/boot/dts/omap4-duovero.dtsi | 21 +- + arch/arm/boot/dts/omap4-l4-abe.dtsi | 501 +++++++++ + arch/arm/boot/dts/omap4-mcpdm.dtsi | 44 + + arch/arm/boot/dts/omap4-panda-common.dtsi | 21 +- + arch/arm/boot/dts/omap4-sdp.dts | 21 +- + arch/arm/boot/dts/omap4-var-som-om44.dtsi | 21 +- + arch/arm/boot/dts/omap4.dtsi | 192 +--- + arch/arm/boot/dts/omap5-board-common.dtsi | 8 +- + arch/arm/boot/dts/omap5-l4-abe.dtsi | 447 ++++++++ + arch/arm/boot/dts/omap5.dtsi | 115 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 4 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 1 + + arch/arm/boot/dts/qcom-msm8660.dtsi | 1 + + arch/arm/boot/dts/qcom-pma8084.dtsi | 1 + + arch/arm/boot/dts/r7s72100-rskrza1.dts | 46 +- + arch/arm/boot/dts/r8a73a4-ape6evm.dts | 29 +- + arch/arm/boot/dts/r8a77470-iwg23s-sbc.dts | 123 +++ + arch/arm/boot/dts/r8a77470.dtsi | 313 ++++++ + arch/arm/boot/dts/r8a7778-bockw.dts | 2 +- + arch/arm/boot/dts/r8a7779-marzen.dts | 2 +- + arch/arm/boot/dts/r8a7792-blanche.dts | 20 + + arch/arm/boot/dts/r8a7792.dtsi | 18 + + arch/arm/boot/dts/r8a7794-alt.dts | 47 + + arch/arm/boot/dts/rk3036-kylin.dts | 10 +- + arch/arm/boot/dts/rk3036.dtsi | 136 +-- + arch/arm/boot/dts/rk3066a-marsboard.dts | 2 +- + arch/arm/boot/dts/rk3066a-mk808.dts | 37 +- + arch/arm/boot/dts/rk3066a-rayeager.dts | 26 +- + arch/arm/boot/dts/rk3066a.dtsi | 239 +++-- + arch/arm/boot/dts/rk3188-px3-evb.dts | 4 +- + arch/arm/boot/dts/rk3188-radxarock.dts | 14 +- + arch/arm/boot/dts/rk3188.dtsi | 210 ++-- + arch/arm/boot/dts/rk322x.dtsi | 170 +-- + arch/arm/boot/dts/rk3288-evb-act8846.dts | 4 +- + arch/arm/boot/dts/rk3288-evb.dtsi | 26 +- + arch/arm/boot/dts/rk3288-fennec.dts | 10 +- + arch/arm/boot/dts/rk3288-firefly-beta.dts | 4 +- + arch/arm/boot/dts/rk3288-firefly-reload-core.dtsi | 10 +- + arch/arm/boot/dts/rk3288-firefly-reload.dts | 36 +- + arch/arm/boot/dts/rk3288-firefly.dts | 4 +- + arch/arm/boot/dts/rk3288-firefly.dtsi | 38 +- + arch/arm/boot/dts/rk3288-miqi.dts | 28 +- + arch/arm/boot/dts/rk3288-phycore-rdk.dts | 28 +- + arch/arm/boot/dts/rk3288-phycore-som.dtsi | 30 +- + arch/arm/boot/dts/rk3288-r89.dts | 14 +- + arch/arm/boot/dts/rk3288-rock2-som.dtsi | 4 +- + arch/arm/boot/dts/rk3288-rock2-square.dts | 18 +- + arch/arm/boot/dts/rk3288-tinker-s.dts | 5 + + arch/arm/boot/dts/rk3288-tinker.dtsi | 67 +- + arch/arm/boot/dts/rk3288-veyron-analog-audio.dtsi | 8 +- + arch/arm/boot/dts/rk3288-veyron-brain.dts | 8 +- + arch/arm/boot/dts/rk3288-veyron-chromebook.dtsi | 25 +- + arch/arm/boot/dts/rk3288-veyron-jaq.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron-jerry.dts | 23 +- + arch/arm/boot/dts/rk3288-veyron-mickey.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-mighty.dts | 34 + + arch/arm/boot/dts/rk3288-veyron-minnie.dts | 24 +- + arch/arm/boot/dts/rk3288-veyron-pinky.dts | 6 +- + arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 16 +- + arch/arm/boot/dts/rk3288-veyron-speedy.dts | 14 +- + arch/arm/boot/dts/rk3288-veyron.dtsi | 91 +- + arch/arm/boot/dts/rk3288-vyasa.dts | 6 +- + arch/arm/boot/dts/rk3288.dtsi | 317 +++--- + arch/arm/boot/dts/rv1108-elgin-r1.dts | 1 - + arch/arm/boot/dts/rv1108.dtsi | 138 +-- + arch/arm/boot/dts/s5pv210-goni.dts | 2 +- + arch/arm/boot/dts/s5pv210.dtsi | 6 +- + arch/arm/boot/dts/sama5d2.dtsi | 45 +- + arch/arm/boot/dts/sama5d36ek_cmp.dts | 39 +- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 39 +- + arch/arm/boot/dts/sama5d3xmb_cmp.dtsi | 39 +- + arch/arm/boot/dts/sama5d4.dtsi | 39 +- + arch/arm/boot/dts/socfpga_arria10_socdk_sdmmc.dts | 1 + + arch/arm/boot/dts/ste-dbx5x0.dtsi | 74 +- + arch/arm/boot/dts/ste-href-stuib.dtsi | 13 + + arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 13 + + arch/arm/boot/dts/stm32f429.dtsi | 13 + + arch/arm/boot/dts/stm32f769-disco.dts | 4 + + arch/arm/boot/dts/stm32h743-pinctrl.dtsi | 68 ++ + arch/arm/boot/dts/stm32h743.dtsi | 14 + + arch/arm/boot/dts/stm32h743i-disco.dts | 20 + + arch/arm/boot/dts/stm32h743i-eval.dts | 23 +- + arch/arm/boot/dts/stm32mp157-pinctrl.dtsi | 269 +++++ + arch/arm/boot/dts/stm32mp157a-dk1.dts | 250 +++++ + arch/arm/boot/dts/stm32mp157c-dk2.dts | 76 ++ + arch/arm/boot/dts/stm32mp157c-ed1.dts | 175 ++- + arch/arm/boot/dts/stm32mp157c.dtsi | 56 + + arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts | 20 +- + arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 10 +- + arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts | 20 +- + arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts | 20 +- + arch/arm/boot/dts/sun4i-a10-inet1.dts | 20 +- + arch/arm/boot/dts/sun4i-a10-inet97fv2.dts | 20 +- + arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts | 72 +- + arch/arm/boot/dts/sun4i-a10-marsboard.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts | 18 +- + arch/arm/boot/dts/sun4i-a10-pcduino.dts | 12 +- + arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts | 20 +- + arch/arm/boot/dts/sun4i-a10.dtsi | 11 +- + arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts | 10 +- + arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts | 10 +- + .../boot/dts/sun5i-a13-empire-electronix-d709.dts | 20 +- + arch/arm/boot/dts/sun5i-a13-hsg-h702.dts | 12 +- + arch/arm/boot/dts/sun5i-a13-licheepi-one.dts | 5 +- + arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts | 18 +- + arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 20 +- + arch/arm/boot/dts/sun5i-a13-q8-tablet.dts | 11 +- + arch/arm/boot/dts/sun5i-a13-utoo-p66.dts | 16 +- + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 4 +- + arch/arm/boot/dts/sun5i-gr8-evb.dts | 4 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 14 +- + .../boot/dts/sun5i-reference-design-tablet.dtsi | 20 +- + arch/arm/boot/dts/sun5i.dtsi | 66 +- + arch/arm/boot/dts/sun6i-a31-colombus.dts | 14 +- + arch/arm/boot/dts/sun6i-a31-hummingbird.dts | 16 +- + arch/arm/boot/dts/sun6i-a31-i7.dts | 1 - + arch/arm/boot/dts/sun6i-a31.dtsi | 22 +- + arch/arm/boot/dts/sun6i-a31s-primo81.dts | 2 +- + .../boot/dts/sun6i-reference-design-tablet.dtsi | 12 +- + arch/arm/boot/dts/sun7i-a20-bananapi.dts | 10 +- + arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts | 4 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts | 18 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 24 +- + arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 18 +- + arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-orangepi.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-pcduino3.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts | 12 +- + arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts | 12 +- + arch/arm/boot/dts/sun7i-a20.dtsi | 125 ++- + arch/arm/boot/dts/sun8i-a23-a33.dtsi | 74 +- + arch/arm/boot/dts/sun8i-a23-q8-tablet.dts | 6 + + arch/arm/boot/dts/sun8i-a33-q8-tablet.dts | 7 + + arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 11 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 20 +- + arch/arm/boot/dts/sun8i-a83t-bananapi-m3.dts | 12 + + arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts | 12 + + arch/arm/boot/dts/sun8i-a83t-tbs-a711.dts | 73 +- + arch/arm/boot/dts/sun8i-a83t.dtsi | 111 +- + .../boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 20 +- + arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 6 +- + arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts | 7 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 25 +- + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 34 +- + arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts | 27 +- + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 25 +- + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 27 +- + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 9 - + arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts | 3 +- + arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts | 114 ++ + arch/arm/boot/dts/sun8i-h3.dtsi | 4 + + arch/arm/boot/dts/sun8i-q8-common.dtsi | 18 +- + .../boot/dts/sun8i-r16-nintendo-nes-classic.dts | 2 - + arch/arm/boot/dts/sun8i-r16-parrot.dts | 12 +- + arch/arm/boot/dts/sun8i-r40.dtsi | 13 +- + .../boot/dts/sun8i-reference-design-tablet.dtsi | 12 +- + arch/arm/boot/dts/sun8i-v3s-licheepi-zero.dts | 2 +- + arch/arm/boot/dts/sun8i-v3s.dtsi | 13 +- + arch/arm/boot/dts/sun8i-v40-bananapi-m2-berry.dts | 36 +- + arch/arm/boot/dts/sun9i-a80-cubieboard4.dts | 15 +- + arch/arm/boot/dts/sun9i-a80-optimus.dts | 4 +- + arch/arm/boot/dts/sun9i-a80.dtsi | 84 +- + arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi | 7 +- + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 50 +- + arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi | 4 +- + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 39 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 40 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 2 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 9 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 45 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 5 + + arch/arm/boot/dts/tegra124-nyan.dtsi | 5 + + arch/arm/boot/dts/tegra124-venice2.dts | 5 + + arch/arm/boot/dts/tegra30.dtsi | 11 + + arch/arm/boot/dts/vf610-zii-cfu1.dts | 26 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 57 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 49 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 6 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 14 +- + arch/arm/boot/dts/vf610-zii-spb4.dts | 359 +++++++ + arch/arm/boot/dts/vf610-zii-ssmb-dtu.dts | 5 +- + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 17 +- + arch/arm/configs/exynos_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 151 +-- + arch/arm/configs/qcom_defconfig | 13 +- + arch/arm/configs/shmobile_defconfig | 13 +- + arch/arm/configs/tegra_defconfig | 36 +- + arch/arm/firmware/Kconfig | 29 - + arch/arm/firmware/Makefile | 4 - + arch/arm/include/asm/firmware.h | 2 +- + arch/arm/mach-davinci/board-da830-evm.c | 51 +- + arch/arm/mach-davinci/board-da850-evm.c | 1 + + arch/arm/mach-davinci/board-dm355-evm.c | 1 + + arch/arm/mach-davinci/board-dm644x-evm.c | 1 + + arch/arm/mach-davinci/board-omapl138-hawk.c | 50 +- + arch/arm/mach-ep93xx/adssphere.c | 2 +- + arch/arm/mach-ep93xx/clock.c | 3 +- + arch/arm/mach-ep93xx/core.c | 8 +- + arch/arm/mach-ep93xx/dma.c | 2 +- + arch/arm/mach-ep93xx/edb93xx.c | 4 +- + arch/arm/mach-ep93xx/gesbc9312.c | 2 +- + .../mach-ep93xx/{include/mach => }/gpio-ep93xx.h | 0 + arch/arm/mach-ep93xx/{include/mach => }/hardware.h | 2 +- + arch/arm/mach-ep93xx/micro9.c | 2 +- + arch/arm/mach-ep93xx/{include/mach => }/platform.h | 23 +- + arch/arm/mach-ep93xx/simone.c | 4 +- + arch/arm/mach-ep93xx/snappercl15.c | 4 +- + arch/arm/mach-ep93xx/ts72xx.c | 4 +- + arch/arm/mach-ep93xx/vision_ep9307.c | 4 +- + arch/arm/mach-exynos/Kconfig | 12 +- + arch/arm/mach-exynos/Makefile | 2 +- + arch/arm/mach-exynos/common.h | 1 + + arch/arm/mach-exynos/exynos.c | 3 + + arch/arm/mach-exynos/firmware.c | 1 + + arch/arm/mach-exynos/mcpm-exynos.c | 13 +- + arch/arm/mach-exynos/platsmp.c | 9 +- + arch/arm/mach-exynos/smc.h | 7 + + arch/arm/mach-exynos/suspend.c | 49 +- + arch/arm/mach-imx/pm-imx6.c | 6 +- + arch/arm/mach-ixp4xx/Kconfig | 27 +- + arch/arm/mach-ixp4xx/Makefile | 5 +- + arch/arm/mach-ixp4xx/avila-pci.c | 2 + + arch/arm/mach-ixp4xx/avila-setup.c | 2 + + arch/arm/mach-ixp4xx/common.c | 484 ++------- + arch/arm/mach-ixp4xx/coyote-pci.c | 2 + + arch/arm/mach-ixp4xx/coyote-setup.c | 2 + + arch/arm/mach-ixp4xx/dsmg600-pci.c | 2 + + arch/arm/mach-ixp4xx/dsmg600-setup.c | 5 +- + arch/arm/mach-ixp4xx/fsg-pci.c | 2 + + arch/arm/mach-ixp4xx/fsg-setup.c | 2 + + arch/arm/mach-ixp4xx/gateway7001-pci.c | 2 + + arch/arm/mach-ixp4xx/gateway7001-setup.c | 2 + + arch/arm/mach-ixp4xx/gtwx5715-pci.c | 2 + + arch/arm/mach-ixp4xx/gtwx5715-setup.c | 2 + + arch/arm/mach-ixp4xx/include/mach/entry-macro.S | 41 - + arch/arm/mach-ixp4xx/include/mach/irqs.h | 75 -- + arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h | 94 -- + arch/arm/mach-ixp4xx/include/mach/qmgr.h | 204 ---- + arch/arm/mach-ixp4xx/irqs.h | 68 ++ + arch/arm/mach-ixp4xx/ixdp425-pci.c | 2 + + arch/arm/mach-ixp4xx/ixdp425-setup.c | 2 + + arch/arm/mach-ixp4xx/ixdpg425-pci.c | 2 + + arch/arm/mach-ixp4xx/ixp4xx-of.c | 60 ++ + arch/arm/mach-ixp4xx/nas100d-pci.c | 2 + + arch/arm/mach-ixp4xx/nas100d-setup.c | 5 +- + arch/arm/mach-ixp4xx/nslu2-pci.c | 2 + + arch/arm/mach-ixp4xx/nslu2-setup.c | 12 +- + arch/arm/mach-ixp4xx/wg302v2-pci.c | 2 + + arch/arm/mach-ixp4xx/wg302v2-setup.c | 2 + + arch/arm/mach-lpc32xx/phy3250.c | 42 +- + arch/arm/mach-omap2/common.h | 9 + + arch/arm/mach-omap2/i2c.c | 11 +- + arch/arm/mach-omap2/io.c | 7 +- + arch/arm/mach-omap2/mmc.h | 8 + + arch/arm/mach-omap2/omap-wakeupgen.c | 4 +- + arch/arm/mach-omap2/omap_hwmod.c | 210 +++- + arch/arm/mach-omap2/omap_hwmod.h | 8 +- + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_2430_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 1 - + .../mach-omap2/omap_hwmod_33xx_43xx_common_data.h | 29 - + .../omap_hwmod_33xx_43xx_interconnect_data.c | 103 -- + .../mach-omap2/omap_hwmod_33xx_43xx_ipblock_data.c | 255 ----- + arch/arm/mach-omap2/omap_hwmod_33xx_data.c | 64 -- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 - + arch/arm/mach-omap2/omap_hwmod_43xx_data.c | 113 -- + arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 740 ------------- + arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 748 ------------- + arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 848 +-------------- + arch/arm/mach-omap2/omap_hwmod_81xx_data.c | 1 - + arch/arm/mach-omap2/pm33xx-core.c | 84 +- + arch/arm/mach-omap2/sleep43xx.S | 3 + + arch/arm/mach-omap2/sr_device.c | 5 +- + arch/arm/mach-rockchip/platsmp.c | 1 + + arch/arm/mach-rockchip/pm.c | 4 +- + arch/arm/mach-s3c64xx/mach-crag6410-module.c | 14 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 1 + + arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c | 6 +- + arch/arm/mach-stm32/Kconfig | 5 +- + arch/arm/mach-sunxi/mc_smp.c | 5 +- + arch/arm/mach-sunxi/platsmp.c | 4 + + arch/arm/mach-tegra/Kconfig | 4 +- + arch/arm/mach-tegra/cpuidle-tegra114.c | 4 +- + arch/arm/mach-tegra/cpuidle-tegra20.c | 11 +- + arch/arm/mach-tegra/cpuidle-tegra30.c | 9 +- + arch/arm/mach-tegra/iomap.h | 9 - + arch/arm/mach-tegra/pm.c | 50 + + arch/arm/mach-tegra/reset-handler.S | 50 +- + arch/arm/mach-tegra/reset.c | 4 + + arch/arm/mach-tegra/reset.h | 9 +- + arch/arm/mach-tegra/sleep-tegra20.S | 4 + + arch/arm/mach-tegra/sleep-tegra30.S | 21 - + arch/arm/mach-tegra/sleep.S | 14 +- + arch/arm/mach-tegra/tegra.c | 5 +- + arch/arm/mach-u300/regulator.c | 2 + + arch/arm/plat-pxa/ssp.c | 6 - + arch/arm64/Kconfig.platforms | 5 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/allwinner/Makefile | 3 + + .../dts/allwinner/sun50i-a64-amarula-relic.dts | 65 ++ + .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 2 +- + .../allwinner/sun50i-a64-oceanic-5205-5inmfd.dts | 68 ++ + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 4 +- + .../boot/dts/allwinner/sun50i-a64-sopine.dtsi | 2 +- + .../boot/dts/allwinner/sun50i-a64-teres-i.dts | 13 + + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 75 +- + .../sun50i-h5-emlid-neutis-n5-devboard.dts | 3 +- + .../dts/allwinner/sun50i-h5-emlid-neutis-n5.dtsi | 1 - + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 5 +- + .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 2 +- + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 4 +- + .../dts/allwinner/sun50i-h5-orangepi-zero-plus.dts | 2 +- + .../allwinner/sun50i-h5-orangepi-zero-plus2.dts | 3 +- + arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 4 + + .../boot/dts/allwinner/sun50i-h6-beelink-gs1.dts | 260 +++++ + .../boot/dts/allwinner/sun50i-h6-orangepi-3.dts | 215 ++++ + .../boot/dts/allwinner/sun50i-h6-orangepi.dtsi | 2 - + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 4 - + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 41 +- + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 3 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 185 ++++ + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 147 +++ + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 140 +++ + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 465 ++++++++ + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 10 + + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxm.dtsi | 27 + + arch/arm64/boot/dts/bitmain/bm1880-sophon-edge.dts | 143 +++ + arch/arm64/boot/dts/bitmain/bm1880.dtsi | 68 ++ + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 6 + + arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 6 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 83 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 57 +- + arch/arm64/boot/dts/freescale/Makefile | 3 + + .../boot/dts/freescale/fsl-ls1012a-oxalis.dts | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-qds.dts | 62 ++ + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 63 ++ + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 64 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 1 - + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 2 - + arch/arm64/boot/dts/freescale/fsl-lx2160a-qds.dts | 16 + + arch/arm64/boot/dts/freescale/fsl-lx2160a-rdb.dts | 16 + + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 69 ++ + arch/arm64/boot/dts/freescale/imx8mm-evk.dts | 235 ++++ + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 733 +++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 129 +++ + .../boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts | 95 ++ + .../boot/dts/freescale/imx8mq-zii-ultra-zest.dts | 24 + + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 725 +++++++++++++ + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 309 +++++- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 95 ++ + arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 89 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 20 +- + arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts | 75 ++ + arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 62 ++ + .../arm64/boot/dts/hisilicon/hikey970-pinctrl.dtsi | 115 ++ + arch/arm64/boot/dts/intel/Makefile | 1 + + arch/arm64/boot/dts/intel/socfpga_agilex.dtsi | 444 ++++++++ + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 75 ++ + .../dts/marvell/armada-8040-clearfog-gt-8k.dts | 13 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 35 +- + arch/arm64/boot/dts/mediatek/mt8183-pinfunc.h | 1120 ++++++++++++++++++++ + arch/arm64/boot/dts/nvidia/Makefile | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 115 ++ + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 42 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 140 ++- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2 - + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 6 + + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 12 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 5 + + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 6 + + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 650 ++++++++++++ + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 12 + + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 41 +- + arch/arm64/boot/dts/qcom/apq8096-db820c-pins.dtsi | 52 + + .../boot/dts/qcom/apq8096-db820c-pmic-pins.dtsi | 8 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 121 +++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 46 +- + arch/arm64/boot/dts/qcom/msm8996-pins.dtsi | 43 + + arch/arm64/boot/dts/qcom/msm8996.dtsi | 558 +++++++++- + arch/arm64/boot/dts/qcom/msm8998-mtp.dtsi | 60 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 315 +++++- + arch/arm64/boot/dts/qcom/pm8005.dtsi | 1 + + arch/arm64/boot/dts/qcom/pm8998.dtsi | 3 + + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 1 + + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 1 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 11 + + arch/arm64/boot/dts/qcom/qcs404-evb-1000.dts | 3 +- + arch/arm64/boot/dts/qcom/qcs404-evb-4000.dts | 85 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 95 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 8 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 427 +++++++- + arch/arm64/boot/dts/renesas/cat875.dtsi | 22 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 62 ++ + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 44 +- + arch/arm64/boot/dts/renesas/r8a7795.dtsi | 72 +- + arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts | 1 + + .../arm64/boot/dts/renesas/r8a7796-salvator-xs.dts | 1 + + arch/arm64/boot/dts/renesas/r8a7796.dtsi | 13 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 324 +++++- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 16 + + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 53 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 74 +- + arch/arm64/boot/dts/renesas/r8a77995-draak.dts | 32 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 73 +- + arch/arm64/boot/dts/rockchip/Makefile | 2 + + arch/arm64/boot/dts/rockchip/px30-evb.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3328-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 53 + + arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 33 +- + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 7 +- + arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi | 34 +- + arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts | 8 +- + .../arm64/boot/dts/rockchip/rk3368-lion-haikou.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3368-lion.dtsi | 10 +- + .../boot/dts/rockchip/rk3368-orion-r68-meta.dts | 46 +- + arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3368-r88.dts | 36 +- + arch/arm64/boot/dts/rockchip/rk3368.dtsi | 240 ++--- + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-ficus.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts | 2 +- + .../boot/dts/rockchip/rk3399-gru-chromebook.dtsi | 14 +- + arch/arm64/boot/dts/rockchip/rk3399-gru-kevin.dts | 8 +- + .../boot/dts/rockchip/rk3399-gru-scarlet.dtsi | 68 +- + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 56 +- + arch/arm64/boot/dts/rockchip/rk3399-nanopc-t4.dts | 69 +- + .../arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts | 50 + + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 27 +- + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 790 ++++++++++++++ + .../arm64/boot/dts/rockchip/rk3399-puma-haikou.dts | 12 +- + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 21 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts | 5 + + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 77 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 6 +- + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 314 +++--- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revB.dts | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu104-revA.dts | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu106-revA.dts | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-zcu111-revA.dts | 1 + + arch/arm64/configs/defconfig | 100 +- + drivers/ata/pata_ep93xx.c | 2 +- + drivers/bus/tegra-aconnect.c | 66 +- + drivers/bus/ti-sysc.c | 661 ++++++++++-- + drivers/clk/meson/axg-audio.h | 20 + + drivers/clk/meson/g12a-aoclk.h | 2 - + drivers/clk/zynqmp/clkc.c | 4 +- + drivers/clocksource/Kconfig | 7 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/timer-ixp4xx.c | 284 +++++ + drivers/crypto/ixp4xx_crypto.c | 4 +- + drivers/firmware/Kconfig | 16 + + drivers/firmware/Makefile | 1 + + drivers/firmware/arm_scmi/driver.c | 8 +- + drivers/firmware/imx/Makefile | 2 +- + drivers/firmware/imx/imx-scu-irq.c | 168 +++ + drivers/firmware/imx/imx-scu.c | 6 + + drivers/firmware/imx/scu-pd.c | 121 ++- + .../arm => drivers}/firmware/trusted_foundations.c | 79 +- + drivers/firmware/xilinx/zynqmp-debug.c | 18 +- + drivers/firmware/xilinx/zynqmp.c | 56 +- + drivers/fpga/Kconfig | 9 + + drivers/fpga/Makefile | 1 + + drivers/fpga/zynqmp-fpga.c | 159 +++ + drivers/gpio/Kconfig | 13 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-ixp4xx.c | 474 +++++++++ + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/ep93xx_keypad.c | 8 +- + drivers/input/misc/ixp4xx-beeper.c | 20 +- + drivers/irqchip/Kconfig | 6 + + drivers/irqchip/Makefile | 1 + + drivers/irqchip/irq-ixp4xx.c | 403 +++++++ + drivers/memory/emif.h | 4 + + drivers/memory/tegra/mc.c | 34 +- + drivers/memory/tegra/mc.h | 2 +- + drivers/memory/tegra/tegra114.c | 4 +- + drivers/memory/tegra/tegra124.c | 4 +- + drivers/memory/tegra/tegra20.c | 28 +- + drivers/memory/tegra/tegra210.c | 2 +- + drivers/memory/tegra/tegra30.c | 4 +- + drivers/memory/ti-emif-pm.c | 3 + + drivers/memory/ti-emif-sram-pm.S | 41 + + drivers/misc/Kconfig | 16 - + drivers/misc/Makefile | 2 - + drivers/net/ethernet/cirrus/Kconfig | 2 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 2 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 14 +- + drivers/net/wan/ixp4xx_hss.c | 4 +- + drivers/nvmem/zynqmp_nvmem.c | 10 +- + drivers/pwm/pwm-ep93xx.c | 2 +- + drivers/reset/reset-zynqmp.c | 8 +- + drivers/rtc/rtc-omap.c | 51 +- + drivers/soc/Kconfig | 2 + + drivers/soc/Makefile | 2 + + drivers/soc/amlogic/meson-gx-pwrc-vpu.c | 160 ++- + drivers/soc/amlogic/meson-gx-socinfo.c | 43 +- + drivers/soc/aspeed/Kconfig | 20 + + drivers/soc/aspeed/Makefile | 2 + + drivers/{misc => soc/aspeed}/aspeed-lpc-ctrl.c | 0 + drivers/{misc => soc/aspeed}/aspeed-lpc-snoop.c | 0 + drivers/soc/imx/Makefile | 1 + + drivers/soc/imx/gpc.c | 4 +- + drivers/soc/imx/gpcv2.c | 43 +- + drivers/soc/imx/soc-imx8.c | 115 ++ + drivers/soc/ixp4xx/Kconfig | 16 + + drivers/soc/ixp4xx/Makefile | 2 + + .../soc/ixp4xx/ixp4xx-npe.c | 66 +- + .../soc/ixp4xx/ixp4xx-qmgr.c | 186 +++- + drivers/soc/mediatek/mtk-pmic-wrap.c | 111 +- + drivers/soc/qcom/cmd-db.c | 4 +- + drivers/soc/qcom/qmi_interface.c | 7 +- + drivers/soc/qcom/rmtfs_mem.c | 21 + + drivers/soc/qcom/rpmh-rsc.c | 2 +- + drivers/soc/renesas/renesas-soc.c | 3 + + drivers/soc/rockchip/grf.c | 2 + + drivers/soc/tegra/pmc.c | 171 ++- + drivers/soc/ti/Kconfig | 5 +- + drivers/soc/ti/pm33xx.c | 273 ++++- + drivers/soc/xilinx/zynqmp_pm_domains.c | 18 +- + drivers/soc/xilinx/zynqmp_power.c | 10 +- + drivers/spi/spi-zynqmp-gqspi.c | 6 + + drivers/tee/optee/core.c | 80 +- + drivers/usb/host/ohci-da8xx.c | 42 +- + drivers/watchdog/ixp4xx_wdt.c | 9 + + include/dt-bindings/clock/axg-audio-clkc.h | 20 - + include/dt-bindings/clock/g12a-aoclkc.h | 2 + + include/dt-bindings/clock/g12a-clkc.h | 5 + + include/dt-bindings/clock/meson8b-clkc.h | 6 +- + .../clock/{xlnx,zynqmp-clk.h => xlnx-zynqmp-clk.h} | 26 +- + include/dt-bindings/firmware/imx/rsrc.h | 25 +- + include/dt-bindings/pinctrl/am33xx.h | 130 ++- + include/dt-bindings/pinctrl/omap.h | 1 + + include/dt-bindings/power/r8a77965-sysc.h | 1 - + include/linux/firmware/imx/sci.h | 5 + + .../linux/firmware}/trusted_foundations.h | 27 +- + include/linux/firmware/xlnx-zynqmp.h | 14 +- + include/linux/irqchip/irq-ixp4xx.h | 12 + + include/linux/platform_data/eth-ep93xx.h | 10 + + include/linux/platform_data/keypad-ep93xx.h | 4 +- + include/linux/platform_data/pm33xx.h | 5 + + include/linux/platform_data/ti-sysc.h | 9 +- + include/linux/platform_data/timer-ixp4xx.h | 11 + + include/linux/reset.h | 2 + + include/linux/rtc/rtc-omap.h | 7 + + include/linux/soc/cirrus/ep93xx.h | 37 + + .../mach => include/linux/soc/ixp4xx}/npe.h | 2 - + include/linux/soc/ixp4xx/qmgr.h | 91 ++ + include/linux/ti-emif-sram.h | 3 + + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/ep93xx-ac97.c | 1 + + sound/soc/cirrus/ep93xx-i2s.c | 3 +- + sound/soc/cirrus/simone.c | 2 +- + sound/soc/cirrus/snappercl15.c | 2 +- + 760 files changed, 29855 insertions(+), 10981 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/sunxi.txt + create mode 100644 Documentation/devicetree/bindings/arm/sunxi.yaml + create mode 100644 Documentation/devicetree/bindings/clock/xlnx,zynqmp-clk.txt + create mode 100644 Documentation/devicetree/bindings/firmware/intel,ixp4xx-network-processing-engine.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml + create mode 100644 Documentation/devicetree/bindings/memory-controllers/fsl/mmdc.txt + create mode 100644 Documentation/devicetree/bindings/misc/intel,ixp4xx-queue-manager.yaml + create mode 100644 Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/am5718.dtsi + create mode 100644 arch/arm/boot/dts/am5728.dtsi + create mode 100644 arch/arm/boot/dts/am5748.dtsi + create mode 100644 arch/arm/boot/dts/imx50-kobo-aura.dts + create mode 100644 arch/arm/boot/dts/imx53-m53menlo.dts + create mode 100644 arch/arm/boot/dts/imx6dl-eckelmann-ci4x10.dts + create mode 100644 arch/arm/boot/dts/imx7-mba7.dtsi + create mode 100644 arch/arm/boot/dts/imx7-tqma7.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-mba7.dts + create mode 100644 arch/arm/boot/dts/imx7d-tqma7.dtsi + create mode 100644 arch/arm/boot/dts/imx7d-zii-rpu2.dts + create mode 100644 arch/arm/boot/dts/imx7s-mba7.dts + create mode 100644 arch/arm/boot/dts/imx7s-tqma7.dtsi + create mode 100644 arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts + create mode 100644 arch/arm/boot/dts/intel-ixp42x.dtsi + create mode 100644 arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts + create mode 100644 arch/arm/boot/dts/intel-ixp43x.dtsi + create mode 100644 arch/arm/boot/dts/intel-ixp45x-ixp46x.dtsi + create mode 100644 arch/arm/boot/dts/intel-ixp4xx.dtsi + create mode 100644 arch/arm/boot/dts/omap4-l4-abe.dtsi + create mode 100644 arch/arm/boot/dts/omap4-mcpdm.dtsi + create mode 100644 arch/arm/boot/dts/omap5-l4-abe.dtsi + create mode 100644 arch/arm/boot/dts/rk3288-veyron-mighty.dts + create mode 100644 arch/arm/boot/dts/stm32mp157a-dk1.dts + create mode 100644 arch/arm/boot/dts/stm32mp157c-dk2.dts + create mode 100644 arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts + create mode 100644 arch/arm/boot/dts/vf610-zii-spb4.dts + delete mode 100644 arch/arm/firmware/Kconfig + delete mode 100644 arch/arm/firmware/Makefile + rename arch/arm/mach-ep93xx/{include/mach => }/gpio-ep93xx.h (100%) + rename arch/arm/mach-ep93xx/{include/mach => }/hardware.h (96%) + rename arch/arm/mach-ep93xx/{include/mach => }/platform.h (65%) + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/entry-macro.S + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/irqs.h + delete mode 100644 arch/arm/mach-ixp4xx/include/mach/qmgr.h + create mode 100644 arch/arm/mach-ixp4xx/irqs.h + create mode 100644 arch/arm/mach-ixp4xx/ixp4xx-of.c + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a64-oceanic-5205-5inmfd.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-beelink-gs1.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-rmb3.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra-zest.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi + create mode 100644 arch/arm64/boot/dts/intel/Makefile + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex.dtsi + create mode 100644 arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8183-pinfunc.h + create mode 100644 arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-nanopi-neo4.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts + create mode 100644 drivers/clocksource/timer-ixp4xx.c + create mode 100644 drivers/firmware/imx/imx-scu-irq.c + rename {arch/arm => drivers}/firmware/trusted_foundations.c (62%) + create mode 100644 drivers/fpga/zynqmp-fpga.c + create mode 100644 drivers/gpio/gpio-ixp4xx.c + create mode 100644 drivers/irqchip/irq-ixp4xx.c + create mode 100644 drivers/soc/aspeed/Kconfig + create mode 100644 drivers/soc/aspeed/Makefile + rename drivers/{misc => soc/aspeed}/aspeed-lpc-ctrl.c (100%) + rename drivers/{misc => soc/aspeed}/aspeed-lpc-snoop.c (100%) + create mode 100644 drivers/soc/imx/soc-imx8.c + create mode 100644 drivers/soc/ixp4xx/Kconfig + create mode 100644 drivers/soc/ixp4xx/Makefile + rename arch/arm/mach-ixp4xx/ixp4xx_npe.c => drivers/soc/ixp4xx/ixp4xx-npe.c (94%) + rename arch/arm/mach-ixp4xx/ixp4xx_qmgr.c => drivers/soc/ixp4xx/ixp4xx-qmgr.c (66%) + rename include/dt-bindings/clock/{xlnx,zynqmp-clk.h => xlnx-zynqmp-clk.h} (85%) + rename {arch/arm/include/asm => include/linux/firmware}/trusted_foundations.h (77%) + create mode 100644 include/linux/irqchip/irq-ixp4xx.h + create mode 100644 include/linux/platform_data/eth-ep93xx.h + create mode 100644 include/linux/platform_data/timer-ixp4xx.h + create mode 100644 include/linux/rtc/rtc-omap.h + create mode 100644 include/linux/soc/cirrus/ep93xx.h + rename {arch/arm/mach-ixp4xx/include/mach => include/linux/soc/ixp4xx}/npe.h (95%) + create mode 100644 include/linux/soc/ixp4xx/qmgr.h +Merging actions/for-next (fb9c1c1deb5e Merge branch 'v4.20/drivers+s900-sps' into next) +$ git merge actions/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging alpine/alpine/for-next (7928b2cbe55b Linux 4.16-rc1) +$ git merge alpine/alpine/for-next +Already up to date. +Merging amlogic/for-next (64d04a7813d5 Merge branch 'v5.2/fixes' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/meson8.dtsi | 5 ++--- + arch/arm/boot/dts/meson8b.dtsi | 1 - + 2 files changed, 2 insertions(+), 4 deletions(-) +Merging aspeed/for-next (e15425214990 ARM: dts: aspeed: quanta-q71l: enable uart1) +$ git merge aspeed/for-next +Already up to date. +Merging at91/at91-next (ac650130c227 Merge branches 'at91-soc', 'at91-dt' and 'at91-defconfig' into at91-next) +$ git merge at91/at91-next +Auto-merging arch/arm/mach-at91/pm.c +CONFLICT (content): Merge conflict in arch/arm/mach-at91/pm.c +Resolved 'arch/arm/mach-at91/pm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 27e39ea5669d] Merge remote-tracking branch 'at91/at91-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arm/atmel-at91.txt | 1 + + arch/arm/configs/sama5_defconfig | 2 +- + arch/arm/mach-at91/Kconfig | 3 - + arch/arm/mach-at91/at91sam9.c | 18 ++ + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/pm.c | 193 ++++++++++++++------- + arch/arm/mach-at91/pm_suspend.S | 111 ++++++++---- + include/linux/clk/at91_pmc.h | 1 + + 8 files changed, 233 insertions(+), 98 deletions(-) +Merging bcm2835/for-next (1ee128f4fff2 Merge branch 'bcm2835-drivers-next' into for-next) +$ git merge bcm2835/for-next +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'recursive' strategy. +Merging imx-mxs/for-next (d9c3322a2906 Merge branch 'imx/defconfig' into for-next) +$ git merge imx-mxs/for-next +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c8ca255e4c5a] Merge remote-tracking branch 'imx-mxs/for-next' +$ git diff -M --stat --summary HEAD^.. + arch/arm/boot/dts/imx6-logicpd-baseboard.dtsi | 4 +- + arch/arm/boot/dts/imx6dl-riotboard.dts | 2 +- + arch/arm/boot/dts/imx6q-ba16.dtsi | 2 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 2 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6qdl-apf6.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sr-som.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-wandboard.dtsi | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-sdb.dtsi | 2 +- + arch/arm/boot/dts/imx7d-pico.dtsi | 2 +- + arch/arm/boot/dts/ls1021a-twr.dts | 9 +++- + arch/arm/boot/dts/ls1021a.dtsi | 11 ++++- + arch/arm/configs/imx_v6_v7_defconfig | 4 ++ + arch/arm64/configs/defconfig | 12 +++++ + drivers/clk/imx/Makefile | 2 +- + drivers/clk/imx/{clk-imx51-imx53.c => clk-imx5.c} | 59 +++++++++++++++++------ + drivers/clk/imx/clk-imx7ulp.c | 1 - + drivers/clk/imx/clk.h | 5 -- + include/dt-bindings/clock/imx7ulp-clock.h | 1 - + 22 files changed, 95 insertions(+), 37 deletions(-) + rename drivers/clk/imx/{clk-imx51-imx53.c => clk-imx5.c} (94%) +Merging keystone/next (3c3a43c81bda Merge branch 'for_5.1/soc-drivers' into next) +$ git merge keystone/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mediatek/for-next (73ade6a62931 Merge branch 'v5.1-next/soc' into for-next) +$ git merge mediatek/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging mvebu/for-next (891f0f865c37 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge mvebu/for-next +Auto-merging arch/arm/mach-mvebu/kirkwood.c +Merge made by the 'recursive' strategy. + arch/arm/mach-mvebu/board-v7.c | 1 - + arch/arm/mach-mvebu/coherency_ll.S | 2 +- + arch/arm/mach-mvebu/kirkwood.c | 2 -- + arch/arm/mach-mvebu/pm-board.c | 11 ++++++++--- + arch/arm/mach-mvebu/pmsu_ll.S | 3 +-- + 5 files changed, 10 insertions(+), 9 deletions(-) +Merging omap/for-next (481df0abf8cf Merge branch 'omap-for-v5.2/ti-sysc' into for-next) +$ git merge omap/for-next +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/am33xx-l4.dtsi | 14 ++++++-------- + arch/arm/boot/dts/am437x-l4.dtsi | 4 ---- + drivers/bus/ti-sysc.c | 23 +++++++++++------------ + 3 files changed, 17 insertions(+), 24 deletions(-) +Merging reset/reset/next (d005aa750c9b reset: fix linux/reset.h errors) +$ git merge reset/reset/next +Already up to date. +Merging qcom/for-next (1d31c0b1a28a Merge tag 'qcom-arm64-for-5.2-1' into really-done-for-5.2) +$ git merge qcom/for-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'recursive' strategy. + arch/arm64/configs/defconfig | 9 +++++++++ + 1 file changed, 9 insertions(+) +Merging renesas/next (982700f80241 Merge branch 'arm-dt-for-v5.2' into next) +$ git merge renesas/next +Already up to date! +Merge made by the 'recursive' strategy. +Merging rockchip/for-next (9c539071723e Merge branch 'v5.2-clk/next' into for-next) +$ git merge rockchip/for-next +Merge made by the 'recursive' strategy. + drivers/clk/rockchip/clk-rk3288.c | 36 ++++++++++++++++++++++-------------- + drivers/clk/rockchip/clk-rk3328.c | 18 +++++++++--------- + drivers/clk/rockchip/clk.c | 9 ++++++--- + drivers/clk/rockchip/clk.h | 23 +++++++++++++++++++++++ + 4 files changed, 60 insertions(+), 26 deletions(-) +Merging samsung/for-next (bebc6082da0a Linux 4.14) +$ git merge samsung/for-next +Already up to date. +Merging samsung-krzk/for-next (831c75782772 Merge branch 'next/dt64' into for-next) +$ git merge samsung-krzk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging sunxi/sunxi/for-next (613c4ce8fddb Merge branch 'sunxi/dt-for-5.2' into sunxi/for-next) +$ git merge sunxi/sunxi/for-next +Merge made by the 'recursive' strategy. + drivers/clk/Kconfig | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 3 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 19 ++++++++++--- + drivers/clk/sunxi-ng/ccu-sun5i.h | 4 --- + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 5 ++-- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 3 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 2 +- + drivers/clk/sunxi/Kconfig | 43 ++++++++++++++++++++++++++++ + drivers/clk/sunxi/Makefile | 49 ++++++++++++++++++-------------- + include/dt-bindings/clock/sun5i-ccu.h | 2 +- + 10 files changed, 95 insertions(+), 36 deletions(-) + create mode 100644 drivers/clk/sunxi/Kconfig +Merging tegra/for-next (0c0ffecf65fd Merge branch for-5.2/arm64/defconfig into for-next) +$ git merge tegra/for-next +Auto-merging arch/arm64/Kconfig.platforms +Merge made by the 'recursive' strategy. + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 4 ++-- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 7 +++++++ + drivers/amba/tegra-ahb.c | 6 ++---- + 4 files changed, 12 insertions(+), 6 deletions(-) +Merging clk/clk-next (c1157f60d72e Merge branch 'clk-parent-rewrite-1' into clk-next) +$ git merge clk/clk-next +Auto-merging include/linux/device.h +Auto-merging include/linux/clk/at91_pmc.h +Auto-merging drivers/clk/zynqmp/clkc.c +Auto-merging arch/arm/mach-omap2/omap_hwmod.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../bindings/arm/mediatek/mediatek,apmixedsys.txt | 2 + + .../bindings/arm/mediatek/mediatek,audsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,camsys.txt | 22 + + .../bindings/arm/mediatek/mediatek,imgsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.txt | 2 + + .../bindings/arm/mediatek/mediatek,ipu.txt | 43 + + .../bindings/arm/mediatek/mediatek,mcucfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 1 + + .../bindings/arm/mediatek/mediatek,mmsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,topckgen.txt | 2 + + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,vencsys.txt | 1 + + .../bindings/clock/amlogic,axg-audio-clkc.txt | 3 +- + .../devicetree/bindings/clock/at91-clock.txt | 33 +- + .../devicetree/bindings/clock/cirrus,lochnagar.txt | 93 ++ + .../devicetree/bindings/clock/milbeaut-clock.yaml | 73 ++ + .../devicetree/bindings/clock/qcom,turingcc.txt | 19 + + .../devicetree/bindings/clock/qoriq-clock.txt | 5 +- + .../bindings/clock/sifive/fu540-prci.txt | 46 + + .../devicetree/bindings/clock/st,stm32-rcc.txt | 6 + + MAINTAINERS | 6 + + arch/arm/mach-omap2/clock.c | 3 + + arch/arm/mach-omap2/omap_hwmod.c | 4 +- + arch/mips/alchemy/common/clock.c | 2 +- + arch/powerpc/platforms/512x/clock-commonclk.c | 9 +- + drivers/clk/Kconfig | 10 + + drivers/clk/Makefile | 4 + + drivers/clk/actions/owl-common.h | 2 +- + drivers/clk/actions/owl-composite.h | 2 +- + drivers/clk/actions/owl-divider.h | 2 +- + drivers/clk/actions/owl-factor.h | 2 +- + drivers/clk/actions/owl-fixed-factor.h | 2 +- + drivers/clk/actions/owl-gate.h | 2 +- + drivers/clk/actions/owl-mux.h | 2 +- + drivers/clk/actions/owl-pll.h | 2 +- + drivers/clk/actions/owl-reset.h | 2 +- + drivers/clk/analogbits/Kconfig | 2 + + drivers/clk/analogbits/Makefile | 3 + + drivers/clk/analogbits/wrpll-cln28hpc.c | 364 ++++++ + drivers/clk/at91/Makefile | 2 + + drivers/clk/at91/at91sam9260.c | 14 +- + drivers/clk/at91/at91sam9rl.c | 2 +- + drivers/clk/at91/at91sam9x5.c | 11 +- + drivers/clk/at91/clk-generated.c | 48 +- + drivers/clk/at91/clk-master.c | 8 +- + drivers/clk/at91/clk-peripheral.c | 46 +- + drivers/clk/at91/clk-sam9x60-pll.c | 330 +++++ + drivers/clk/at91/clk-usb.c | 33 +- + drivers/clk/at91/dt-compat.c | 12 +- + drivers/clk/at91/pmc.h | 25 +- + drivers/clk/at91/sam9x60.c | 307 +++++ + drivers/clk/at91/sama5d2.c | 12 +- + drivers/clk/at91/sama5d4.c | 10 +- + drivers/clk/at91/sckc.c | 134 +- + drivers/clk/clk-aspeed.c | 42 +- + drivers/clk/clk-composite.c | 2 +- + drivers/clk/clk-divider.c | 26 +- + drivers/clk/clk-fixed-factor.c | 57 +- + drivers/clk/clk-fixed-rate.c | 2 +- + drivers/clk/clk-fractional-divider.c | 24 +- + drivers/clk/clk-gate.c | 24 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-highbank.c | 23 +- + drivers/clk/clk-lochnagar.c | 336 +++++ + drivers/clk/clk-milbeaut.c | 663 ++++++++++ + drivers/clk/clk-multiplier.c | 22 +- + drivers/clk/clk-mux.c | 24 +- + drivers/clk/clk-pwm.c | 2 +- + drivers/clk/clk-qoriq.c | 77 +- + drivers/clk/clk-stm32f4.c | 307 ++++- + drivers/clk/clk-stm32mp1.c | 3 + + drivers/clk/clk-xgene.c | 6 +- + drivers/clk/clk.c | 392 ++++-- + drivers/clk/clk.h | 2 + + drivers/clk/clkdev.c | 25 +- + drivers/clk/davinci/da8xx-cfgchip.c | 4 +- + drivers/clk/davinci/pll.h | 2 +- + drivers/clk/davinci/psc.h | 2 +- + drivers/clk/hisilicon/clk-hi3660.c | 6 +- + drivers/clk/hisilicon/clk-hisi-phase.c | 4 +- + drivers/clk/imx/clk-divider-gate.c | 20 +- + drivers/clk/imx/clk-imx6sll.c | 18 +- + drivers/clk/imx/clk-imx7d.c | 4 +- + drivers/clk/imx/clk-imx8mq.c | 1 + + drivers/clk/imx/clk-pfdv2.c | 10 +- + drivers/clk/imx/clk-pll14xx.c | 6 +- + drivers/clk/imx/clk-pllv3.c | 31 +- + drivers/clk/imx/clk-pllv4.c | 72 +- + drivers/clk/imx/clk-sccg-pll.c | 12 +- + drivers/clk/imx/clk.h | 1 + + drivers/clk/ingenic/jz4725b-cgu.c | 6 + + drivers/clk/mediatek/Kconfig | 83 ++ + drivers/clk/mediatek/Makefile | 16 +- + drivers/clk/mediatek/clk-gate.h | 14 + + drivers/clk/mediatek/clk-mt8183-audio.c | 105 ++ + drivers/clk/mediatek/clk-mt8183-cam.c | 63 + + drivers/clk/mediatek/clk-mt8183-img.c | 63 + + drivers/clk/mediatek/clk-mt8183-ipu0.c | 56 + + drivers/clk/mediatek/clk-mt8183-ipu1.c | 56 + + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 54 + + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 123 ++ + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 54 + + drivers/clk/mediatek/clk-mt8183-mm.c | 111 ++ + drivers/clk/mediatek/clk-mt8183-vdec.c | 67 + + drivers/clk/mediatek/clk-mt8183-venc.c | 59 + + drivers/clk/mediatek/clk-mt8183.c | 1284 ++++++++++++++++++++ + drivers/clk/mediatek/clk-mt8516.c | 815 +++++++++++++ + drivers/clk/mediatek/clk-mtk.h | 3 + + drivers/clk/mediatek/clk-mux.c | 223 ++++ + drivers/clk/mediatek/clk-mux.h | 89 ++ + drivers/clk/mediatek/clk-pll.c | 87 +- + drivers/clk/meson/axg-audio.c | 1219 +++++++++++-------- + drivers/clk/meson/axg-audio.h | 36 +- + drivers/clk/meson/clk-pll.c | 26 + + drivers/clk/meson/clk-pll.h | 1 + + drivers/clk/meson/g12a.c | 631 ++++++++++ + drivers/clk/meson/g12a.h | 31 +- + drivers/clk/meson/meson8b.c | 734 ++++++++++- + drivers/clk/meson/meson8b.h | 27 +- + drivers/clk/mmp/clk-gate.c | 2 +- + drivers/clk/mvebu/common.c | 2 +- + drivers/clk/mvebu/cp110-system-controller.c | 4 +- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 6 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 24 +- + drivers/clk/nxp/clk-lpc32xx.c | 7 +- + drivers/clk/qcom/Kconfig | 6 + + drivers/clk/qcom/Makefile | 1 + + drivers/clk/qcom/clk-branch.c | 6 + + drivers/clk/qcom/clk-branch.h | 1 + + drivers/clk/qcom/clk-regmap-mux-div.h | 2 +- + drivers/clk/qcom/gcc-msm8998.c | 2 +- + drivers/clk/qcom/gcc-qcs404.c | 90 ++ + drivers/clk/qcom/turingcc-qcs404.c | 170 +++ + drivers/clk/renesas/r7s9210-cpg-mssr.c | 3 +- + drivers/clk/renesas/r8a774a1-cpg-mssr.c | 18 +- + drivers/clk/renesas/r8a774c0-cpg-mssr.c | 7 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 41 +- + drivers/clk/renesas/r8a7796-cpg-mssr.c | 35 +- + drivers/clk/renesas/r8a77965-cpg-mssr.c | 33 +- + drivers/clk/renesas/r8a77980-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a77990-cpg-mssr.c | 25 +- + drivers/clk/renesas/r8a77995-cpg-mssr.c | 2 +- + drivers/clk/renesas/r9a06g032-clocks.c | 1 + + drivers/clk/renesas/rcar-gen2-cpg.h | 4 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 71 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 9 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 4 +- + drivers/clk/rockchip/clk-ddr.c | 2 +- + drivers/clk/rockchip/clk-half-divider.c | 6 +- + drivers/clk/samsung/clk-exynos5410.c | 1 + + drivers/clk/sifive/Kconfig | 18 + + drivers/clk/sifive/Makefile | 1 + + drivers/clk/sifive/fu540-prci.c | 626 ++++++++++ + drivers/clk/sprd/common.h | 2 +- + drivers/clk/sprd/composite.h | 2 +- + drivers/clk/sprd/div.h | 2 +- + drivers/clk/sprd/gate.h | 2 +- + drivers/clk/sprd/mux.h | 2 +- + drivers/clk/sprd/pll.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6.h | 2 +- + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.h | 4 +- + drivers/clk/tegra/clk-divider.c | 3 +- + drivers/clk/tegra/clk-emc.c | 57 +- + drivers/clk/tegra/clk-pll.c | 54 +- + drivers/clk/tegra/clk-super.c | 2 +- + drivers/clk/tegra/clk-tegra124.c | 7 +- + drivers/clk/tegra/clk-tegra210.c | 6 +- + drivers/clk/ti/clk-7xx-compat.c | 6 +- + drivers/clk/ti/clk-7xx.c | 6 +- + drivers/clk/ti/clkctrl.c | 17 + + drivers/clk/ti/clock.h | 8 +- + drivers/clk/ux500/clk-sysctrl.c | 3 +- + drivers/clk/zynq/clkc.c | 6 +- + drivers/clk/zynq/pll.c | 18 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 1 - + drivers/clk/zynqmp/clk-zynqmp.h | 6 - + drivers/clk/zynqmp/clkc.c | 180 +-- + drivers/clk/zynqmp/divider.c | 17 +- + drivers/pwm/pwm-meson.c | 2 +- + include/dt-bindings/clock/axg-audio-clkc.h | 10 + + include/dt-bindings/clock/exynos5410.h | 3 +- + include/dt-bindings/clock/jz4725b-cgu.h | 1 + + include/dt-bindings/clock/mt8183-clk.h | 422 +++++++ + include/dt-bindings/clock/mt8516-clk.h | 211 ++++ + include/dt-bindings/clock/qcom,gcc-qcs404.h | 5 + + include/dt-bindings/clock/qcom,turingcc-qcs404.h | 15 + + include/dt-bindings/clock/stm32fx-clock.h | 7 +- + include/linux/clk-provider.h | 112 +- + include/linux/clk/analogbits-wrpll-cln28hpc.h | 79 ++ + include/linux/clk/at91_pmc.h | 12 +- + include/linux/clk/ti.h | 2 + + include/linux/device.h | 2 +- + include/linux/math64.h | 13 + + 193 files changed, 11330 insertions(+), 1378 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt + create mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt + create mode 100644 Documentation/devicetree/bindings/clock/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/clock/milbeaut-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,turingcc.txt + create mode 100644 Documentation/devicetree/bindings/clock/sifive/fu540-prci.txt + create mode 100644 drivers/clk/analogbits/Kconfig + create mode 100644 drivers/clk/analogbits/Makefile + create mode 100644 drivers/clk/analogbits/wrpll-cln28hpc.c + create mode 100644 drivers/clk/at91/clk-sam9x60-pll.c + create mode 100644 drivers/clk/at91/sam9x60.c + create mode 100644 drivers/clk/clk-lochnagar.c + create mode 100644 drivers/clk/clk-milbeaut.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-audio.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-cam.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu0.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu1.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_adl.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-ipu_conn.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-mfgcfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-mm.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-vdec.c + create mode 100644 drivers/clk/mediatek/clk-mt8183-venc.c + create mode 100644 drivers/clk/mediatek/clk-mt8183.c + create mode 100644 drivers/clk/mediatek/clk-mt8516.c + create mode 100644 drivers/clk/mediatek/clk-mux.c + create mode 100644 drivers/clk/mediatek/clk-mux.h + create mode 100644 drivers/clk/qcom/turingcc-qcs404.c + create mode 100644 drivers/clk/sifive/Kconfig + create mode 100644 drivers/clk/sifive/Makefile + create mode 100644 drivers/clk/sifive/fu540-prci.c + create mode 100644 include/dt-bindings/clock/mt8183-clk.h + create mode 100644 include/dt-bindings/clock/mt8516-clk.h + create mode 100644 include/dt-bindings/clock/qcom,turingcc-qcs404.h + create mode 100644 include/linux/clk/analogbits-wrpll-cln28hpc.h +Merging clk-samsung/for-next (3c297d9e65d8 clk: samsung: exynos5410: Add gate clock for ADC) +$ git merge clk-samsung/for-next +Merge made by the 'recursive' strategy. +Merging c6x/for-linux-next (8adcc59974b8 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge c6x/for-linux-next +Already up to date. +Merging csky/linux-next (a691f3334d58 csky/syscall_trace: Fixup return processing flow) +$ git merge csky/linux-next +Already up to date. +Merging h8300/h8300-next (21c7acc439b5 h8300: pci: Remove local declaration of pcibios_penalize_isa_irq) +$ git merge h8300/h8300-next +Already up to date. +Merging ia64/next (c51836246f97 ia64: generate uapi header and system call table files) +$ git merge ia64/next +Already up to date. +Merging m68k/for-next (fdd20ec8786a Documentation/features/time: Mark m68k having modern-timekeeping) +$ git merge m68k/for-next +Already up to date. +Merging m68knommu/for-next (37624b58542f Linux 5.1-rc7) +$ git merge m68knommu/for-next +Already up to date. +Merging microblaze/next (226a893bbb1f microblaze: no need to check return value of debugfs_create functions) +$ git merge microblaze/next +Already up to date. +Merging mips/mips-next (3751cbda8f22 mips: Manually call fdt_init_reserved_mem() method) +$ git merge mips/mips-next +Already up to date. +Merging nds32/next (d4d45d2d7790 MAINTAINERS: update nds32 git repo path) +$ git merge nds32/next +Auto-merging arch/nds32/include/asm/tlbflush.h +Auto-merging arch/nds32/include/asm/tlb.h +Auto-merging arch/nds32/include/asm/syscall.h +Auto-merging arch/nds32/include/asm/io.h +Auto-merging arch/nds32/include/asm/elf.h +Auto-merging arch/nds32/include/asm/Kbuild +Auto-merging arch/nds32/Kconfig +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 2 +- + arch/nds32/Kconfig | 16 ++++++++-------- + arch/nds32/include/asm/Kbuild | 1 - + arch/nds32/include/asm/assembler.h | 2 +- + arch/nds32/include/asm/barrier.h | 2 +- + arch/nds32/include/asm/bitfield.h | 2 +- + arch/nds32/include/asm/cache.h | 2 +- + arch/nds32/include/asm/cache_info.h | 2 +- + arch/nds32/include/asm/cacheflush.h | 2 +- + arch/nds32/include/asm/current.h | 2 +- + arch/nds32/include/asm/delay.h | 2 +- + arch/nds32/include/asm/elf.h | 2 +- + arch/nds32/include/asm/fixmap.h | 2 +- + arch/nds32/include/asm/futex.h | 2 +- + arch/nds32/include/asm/highmem.h | 2 +- + arch/nds32/include/asm/io.h | 2 +- + arch/nds32/include/asm/irqflags.h | 2 +- + arch/nds32/include/asm/l2_cache.h | 2 +- + arch/nds32/include/asm/linkage.h | 2 +- + arch/nds32/include/asm/memory.h | 10 +--------- + arch/nds32/include/asm/mmu.h | 2 +- + arch/nds32/include/asm/mmu_context.h | 2 +- + arch/nds32/include/asm/module.h | 2 +- + arch/nds32/include/asm/nds32.h | 2 +- + arch/nds32/include/asm/page.h | 2 +- + arch/nds32/include/asm/pgalloc.h | 2 +- + arch/nds32/include/asm/pgtable.h | 2 +- + arch/nds32/include/asm/proc-fns.h | 2 +- + arch/nds32/include/asm/processor.h | 2 +- + arch/nds32/include/asm/ptrace.h | 2 +- + arch/nds32/include/asm/shmparam.h | 2 +- + arch/nds32/include/asm/string.h | 2 +- + arch/nds32/include/asm/swab.h | 2 +- + arch/nds32/include/asm/syscall.h | 29 ++++++++++++++++++----------- + arch/nds32/include/asm/syscalls.h | 2 +- + arch/nds32/include/asm/thread_info.h | 4 +--- + arch/nds32/include/asm/tlb.h | 2 +- + arch/nds32/include/asm/tlbflush.h | 2 +- + arch/nds32/include/asm/uaccess.h | 2 +- + arch/nds32/include/asm/unistd.h | 2 +- + arch/nds32/include/asm/vdso.h | 2 +- + arch/nds32/include/asm/vdso_datapage.h | 2 +- + arch/nds32/include/asm/vdso_timer_info.h | 2 +- + arch/nds32/include/uapi/asm/auxvec.h | 2 +- + arch/nds32/include/uapi/asm/byteorder.h | 2 +- + arch/nds32/include/uapi/asm/cachectl.h | 2 +- + arch/nds32/include/uapi/asm/param.h | 2 +- + arch/nds32/include/uapi/asm/ptrace.h | 2 +- + arch/nds32/include/uapi/asm/sigcontext.h | 2 +- + arch/nds32/include/uapi/asm/unistd.h | 2 +- + arch/nds32/kernel/.gitignore | 1 + + arch/nds32/kernel/cacheinfo.c | 2 +- + arch/nds32/kernel/ex-exit.S | 4 ++-- + arch/nds32/kernel/nds32_ksyms.c | 6 ------ + arch/nds32/kernel/vdso/.gitignore | 1 + + arch/nds32/kernel/vdso/Makefile | 14 +++++--------- + arch/nds32/mm/init.c | 2 +- + 57 files changed, 84 insertions(+), 96 deletions(-) + create mode 100644 arch/nds32/kernel/.gitignore + create mode 100644 arch/nds32/kernel/vdso/.gitignore +Merging nios2/for-next (21e6bff5e0ef nios2: Fix update_mmu_cache preload the TLB with the new PTE) +$ git merge nios2/for-next +Already up to date. +Merging openrisc/for-next (57ce8ba0fd3a openrisc: Fix broken paths to arch/or32) +$ git merge openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (98429dded340 parisc: Enable SPARSEMEM_VMEMMAP) +$ git merge parisc-hd/for-next +Merge made by the 'recursive' strategy. + arch/parisc/Kconfig | 1 + + arch/parisc/include/asm/fixmap.h | 6 ++++++ + arch/parisc/kernel/syscall.S | 12 ++++++++---- + arch/parisc/mm/init.c | 25 ++++++++++++++++++++++--- + 4 files changed, 37 insertions(+), 7 deletions(-) +Merging powerpc/next (8150a153c013 powerpc/64s: Use early_mmu_has_feature() in set_kuap()) +$ git merge powerpc/next +Auto-merging include/linux/cpuhotplug.h +Auto-merging arch/powerpc/xmon/xmon.c +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/powerpc/mm/book3s32/mmu.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/kernel/security.c +Auto-merging arch/powerpc/include/asm/paca.h +Removing arch/powerpc/include/asm/nohash/64/slice.h +Removing arch/powerpc/include/asm/nohash/64/mmu.h +Removing arch/powerpc/include/asm/nohash/32/mmu.h +Auto-merging arch/powerpc/configs/skiroot_defconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + Documentation/powerpc/DAWR-POWER9.txt | 40 +- + MAINTAINERS | 13 +- + arch/powerpc/Kconfig | 10 +- + arch/powerpc/Kconfig.debug | 32 + + arch/powerpc/Makefile | 15 +- + arch/powerpc/boot/addnote.c | 6 +- + arch/powerpc/boot/dts/fsl/b4qds.dtsi | 1 + + arch/powerpc/configs/pseries_defconfig | 1 + + arch/powerpc/configs/skiroot_defconfig | 2 + + arch/powerpc/crypto/crc-vpmsum_test.c | 10 +- + arch/powerpc/include/asm/book3s/32/kup.h | 145 +++ + arch/powerpc/include/asm/book3s/32/mmu-hash.h | 9 +- + arch/powerpc/include/asm/book3s/32/pgalloc.h | 41 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 13 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 23 +- + arch/powerpc/include/asm/book3s/64/hash-64k.h | 21 +- + arch/powerpc/include/asm/book3s/64/hash.h | 95 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 72 ++ + arch/powerpc/include/asm/book3s/64/kup-radix.h | 108 ++ + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 70 +- + arch/powerpc/include/asm/book3s/64/mmu.h | 104 +- + arch/powerpc/include/asm/book3s/64/pgalloc.h | 52 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 12 +- + arch/powerpc/include/asm/book3s/64/radix-4k.h | 9 +- + arch/powerpc/include/asm/book3s/64/radix-64k.h | 8 +- + arch/powerpc/include/asm/book3s/64/radix.h | 40 +- + arch/powerpc/include/asm/book3s/64/slice.h | 13 +- + arch/powerpc/include/asm/cpuidle.h | 19 +- + arch/powerpc/include/asm/drmem.h | 21 + + arch/powerpc/include/asm/exception-64s.h | 2 + + arch/powerpc/include/asm/fadump.h | 1 + + arch/powerpc/include/asm/feature-fixups.h | 3 + + arch/powerpc/include/asm/fixmap.h | 5 + + arch/powerpc/include/asm/futex.h | 4 + + arch/powerpc/include/asm/hugetlb.h | 87 +- + arch/powerpc/include/asm/hw_breakpoint.h | 8 + + arch/powerpc/include/asm/imc-pmu.h | 39 + + arch/powerpc/include/asm/kasan.h | 40 + + arch/powerpc/include/asm/kup.h | 73 ++ + arch/powerpc/include/asm/mce.h | 97 +- + arch/powerpc/include/asm/mmu.h | 28 +- + arch/powerpc/include/asm/mmu_context.h | 7 +- + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 44 + + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 58 ++ + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 102 +- + arch/powerpc/include/asm/nohash/32/mmu.h | 25 - + arch/powerpc/include/asm/nohash/32/pgalloc.h | 123 +-- + arch/powerpc/include/asm/nohash/32/pgtable.h | 13 +- + arch/powerpc/include/asm/nohash/32/slice.h | 2 + + arch/powerpc/include/asm/nohash/64/mmu.h | 12 - + arch/powerpc/include/asm/nohash/64/pgalloc.h | 117 +-- + arch/powerpc/include/asm/nohash/64/pgtable.h | 12 +- + arch/powerpc/include/asm/nohash/64/slice.h | 12 - + arch/powerpc/include/asm/nohash/hugetlb-book3e.h | 45 + + arch/powerpc/include/asm/nohash/mmu-book3e.h | 2 + + arch/powerpc/include/asm/nohash/mmu.h | 16 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 56 ++ + arch/powerpc/include/asm/nohash/pte-book3e.h | 5 - + arch/powerpc/include/asm/opal-api.h | 18 +- + arch/powerpc/include/asm/opal.h | 9 + + arch/powerpc/include/asm/paca.h | 40 +- + arch/powerpc/include/asm/page.h | 23 +- + arch/powerpc/include/asm/pgalloc.h | 51 + + arch/powerpc/include/asm/pgtable-be-types.h | 9 +- + arch/powerpc/include/asm/pgtable-types.h | 9 +- + arch/powerpc/include/asm/pgtable.h | 9 +- + arch/powerpc/include/asm/processor.h | 12 +- + arch/powerpc/include/asm/ptrace.h | 11 +- + arch/powerpc/include/asm/reg.h | 8 +- + arch/powerpc/include/asm/reg_booke.h | 2 +- + arch/powerpc/include/asm/slice.h | 9 +- + arch/powerpc/include/asm/sparsemem.h | 4 +- + arch/powerpc/include/asm/string.h | 32 +- + arch/powerpc/include/asm/task_size_64.h | 2 +- + arch/powerpc/include/asm/time.h | 2 + + arch/powerpc/include/asm/trace.h | 16 + + arch/powerpc/include/asm/uaccess.h | 38 +- + arch/powerpc/include/asm/xive.h | 14 + + arch/powerpc/kernel/Makefile | 14 +- + arch/powerpc/kernel/asm-offsets.c | 25 +- + arch/powerpc/kernel/cacheinfo.c | 13 +- + arch/powerpc/kernel/cputable.c | 13 +- + arch/powerpc/kernel/dbell.c | 3 + + arch/powerpc/kernel/early_32.c | 36 + + arch/powerpc/kernel/entry_32.S | 186 ++-- + arch/powerpc/kernel/entry_64.S | 35 +- + arch/powerpc/kernel/exceptions-64s.S | 26 +- + arch/powerpc/kernel/fadump.c | 1 + + arch/powerpc/kernel/fpu.S | 1 + + arch/powerpc/kernel/head_32.S | 258 ++--- + arch/powerpc/kernel/head_32.h | 203 ++++ + arch/powerpc/kernel/head_40x.S | 155 +-- + arch/powerpc/kernel/head_44x.S | 12 +- + arch/powerpc/kernel/head_64.S | 4 +- + arch/powerpc/kernel/head_8xx.S | 136 +-- + arch/powerpc/kernel/head_booke.h | 131 ++- + arch/powerpc/kernel/head_fsl_booke.S | 32 +- + arch/powerpc/kernel/hw_breakpoint.c | 62 +- + arch/powerpc/kernel/idle_book3s.S | 1060 +++----------------- + arch/powerpc/kernel/irq.c | 16 +- + arch/powerpc/kernel/mce.c | 106 +- + arch/powerpc/kernel/mce_power.c | 253 ++--- + arch/powerpc/kernel/paca.c | 12 +- + arch/powerpc/kernel/process.c | 35 +- + arch/powerpc/kernel/prom_init.c | 248 +++-- + arch/powerpc/kernel/prom_init_check.sh | 12 +- + arch/powerpc/kernel/ptrace.c | 3 +- + arch/powerpc/kernel/security.c | 8 + + arch/powerpc/kernel/setup-common.c | 116 +-- + arch/powerpc/kernel/setup_32.c | 28 - + arch/powerpc/kernel/setup_64.c | 10 + + arch/powerpc/kernel/signal_64.c | 27 +- + arch/powerpc/kernel/time.c | 10 +- + arch/powerpc/kernel/traps.c | 8 + + arch/powerpc/kernel/vdso32/Makefile | 5 +- + arch/powerpc/kernel/vdso64/Makefile | 5 +- + arch/powerpc/kernel/vector.S | 1 + + arch/powerpc/kernel/watchdog.c | 81 +- + arch/powerpc/kvm/book3s_hv.c | 3 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 141 +-- + arch/powerpc/lib/Makefile | 19 +- + arch/powerpc/lib/checksum_wrappers.c | 4 + + arch/powerpc/lib/code-patching.c | 5 +- + arch/powerpc/lib/copy_32.S | 12 +- + arch/powerpc/lib/mem_64.S | 9 +- + arch/powerpc/lib/memcpy_64.S | 4 +- + arch/powerpc/mm/Makefile | 47 +- + arch/powerpc/mm/book3s32/Makefile | 9 + + .../mm/{hash_low_32.S => book3s32/hash_low.S} | 6 +- + arch/powerpc/mm/{ppc_mmu_32.c => book3s32/mmu.c} | 76 +- + .../mmu_context.c} | 0 + arch/powerpc/mm/{tlb_hash32.c => book3s32/tlb.c} | 2 +- + arch/powerpc/mm/book3s64/Makefile | 24 + + .../powerpc/mm/{hash64_4k.c => book3s64/hash_4k.c} | 2 +- + .../mm/{hash64_64k.c => book3s64/hash_64k.c} | 2 +- + .../hash_hugepage.c} | 2 +- + .../hash_hugetlbpage.c} | 31 +- + .../{hash_native_64.c => book3s64/hash_native.c} | 0 + .../{pgtable-hash64.c => book3s64/hash_pgtable.c} | 15 +- + .../mm/{tlb_hash64.c => book3s64/hash_tlb.c} | 18 +- + .../mm/{hash_utils_64.c => book3s64/hash_utils.c} | 145 ++- + .../{mmu_context_iommu.c => book3s64/iommu_api.c} | 0 + .../mmu_context.c} | 29 +- + .../mm/{pgtable-book3s64.c => book3s64/pgtable.c} | 2 +- + arch/powerpc/mm/{ => book3s64}/pkeys.c | 1 + + .../radix_hugetlbpage.c} | 0 + .../{pgtable-radix.c => book3s64/radix_pgtable.c} | 117 ++- + .../mm/{tlb-radix.c => book3s64/radix_tlb.c} | 0 + arch/powerpc/mm/{ => book3s64}/slb.c | 31 +- + .../mm/{subpage-prot.c => book3s64/subpage_prot.c} | 39 +- + arch/powerpc/mm/{ => book3s64}/vphn.c | 6 +- + arch/powerpc/mm/{ => book3s64}/vphn.h | 3 +- + arch/powerpc/mm/copro_fault.c | 18 +- + arch/powerpc/mm/dma-noncoherent.c | 2 +- + arch/powerpc/mm/drmem.c | 6 +- + arch/powerpc/mm/fault.c | 49 +- + arch/powerpc/mm/highmem.c | 14 +- + arch/powerpc/mm/hugetlbpage.c | 242 +---- + arch/powerpc/mm/init-common.c | 26 + + arch/powerpc/mm/init_32.c | 8 +- + arch/powerpc/mm/init_64.c | 2 +- + arch/powerpc/mm/kasan/Makefile | 5 + + arch/powerpc/mm/kasan/kasan_init_32.c | 183 ++++ + arch/powerpc/mm/mem.c | 17 +- + arch/powerpc/mm/mmu_context.c | 2 +- + arch/powerpc/mm/mmu_decl.h | 9 +- + arch/powerpc/mm/{40x_mmu.c => nohash/40x.c} | 2 +- + arch/powerpc/mm/{44x_mmu.c => nohash/44x.c} | 2 +- + arch/powerpc/mm/{8xx_mmu.c => nohash/8xx.c} | 26 +- + arch/powerpc/mm/nohash/Makefile | 18 + + .../book3e_hugetlbpage.c} | 52 +- + .../{pgtable-book3e.c => nohash/book3e_pgtable.c} | 9 +- + .../mm/{fsl_booke_mmu.c => nohash/fsl_booke.c} | 2 +- + .../{mmu_context_nohash.c => nohash/mmu_context.c} | 2 +- + arch/powerpc/mm/{tlb_nohash.c => nohash/tlb.c} | 19 +- + .../mm/{tlb_nohash_low.S => nohash/tlb_low.S} | 0 + arch/powerpc/mm/{ => nohash}/tlb_low_64e.S | 31 - + arch/powerpc/mm/numa.c | 35 +- + arch/powerpc/mm/pgtable.c | 114 +++ + arch/powerpc/mm/pgtable_32.c | 47 +- + arch/powerpc/mm/pgtable_64.c | 13 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 86 +- + arch/powerpc/mm/slice.c | 109 +- + arch/powerpc/perf/Makefile | 3 +- + arch/powerpc/perf/core-book3s.c | 28 + + arch/powerpc/perf/generic-compat-pmu.c | 234 +++++ + arch/powerpc/perf/imc-pmu.c | 347 ++++++- + arch/powerpc/perf/internal.h | 12 + + arch/powerpc/perf/power5+-pmu.c | 4 +- + arch/powerpc/perf/power5-pmu.c | 4 +- + arch/powerpc/perf/power6-pmu.c | 4 +- + arch/powerpc/perf/power7-pmu.c | 4 +- + arch/powerpc/perf/power8-pmu.c | 3 +- + arch/powerpc/perf/power9-events-list.h | 2 - + arch/powerpc/perf/power9-pmu.c | 3 +- + arch/powerpc/perf/ppc970-pmu.c | 4 +- + arch/powerpc/platforms/83xx/usb.c | 4 +- + arch/powerpc/platforms/8xx/pic.c | 3 +- + arch/powerpc/platforms/Kconfig.cputype | 45 +- + arch/powerpc/platforms/cell/spu_base.c | 4 +- + arch/powerpc/platforms/embedded6xx/holly.c | 19 +- + arch/powerpc/platforms/powermac/Makefile | 6 + + arch/powerpc/platforms/powernv/idle.c | 902 +++++++++++++---- + arch/powerpc/platforms/powernv/opal-call.c | 6 + + arch/powerpc/platforms/powernv/opal-imc.c | 5 +- + arch/powerpc/platforms/powernv/opal.c | 23 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 35 +- + arch/powerpc/platforms/powernv/pci.h | 2 + + arch/powerpc/platforms/powernv/setup.c | 5 +- + arch/powerpc/platforms/powernv/subcore.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 17 +- + arch/powerpc/platforms/pseries/iommu.c | 13 +- + arch/powerpc/platforms/pseries/lpar.c | 3 +- + arch/powerpc/platforms/pseries/pmem.c | 3 +- + arch/powerpc/platforms/pseries/ras.c | 135 ++- + arch/powerpc/purgatory/Makefile | 3 + + arch/powerpc/sysdev/xive/native.c | 99 ++ + arch/powerpc/xmon/Makefile | 1 + + arch/powerpc/xmon/xmon.c | 66 +- + drivers/misc/cxl/fault.c | 2 +- + drivers/misc/ocxl/Makefile | 3 +- + drivers/misc/ocxl/afu_irq.c | 102 +- + drivers/misc/ocxl/config.c | 13 +- + drivers/misc/ocxl/context.c | 31 +- + drivers/misc/ocxl/core.c | 574 +++++++++++ + drivers/misc/ocxl/file.c | 182 +++- + drivers/misc/ocxl/link.c | 42 +- + drivers/misc/ocxl/mmio.c | 234 +++++ + drivers/misc/ocxl/ocxl_internal.h | 94 +- + drivers/misc/ocxl/pci.c | 565 +---------- + drivers/misc/ocxl/sysfs.c | 54 +- + drivers/misc/ocxl/trace.h | 12 +- + include/linux/cpuhotplug.h | 1 + + include/misc/ocxl.h | 359 ++++++- + .../selftests/powerpc/copyloops/asm/export.h | 1 + + .../selftests/powerpc/copyloops/asm/kasan.h | 0 + .../selftests/powerpc/copyloops/asm/ppc_asm.h | 1 + + tools/testing/selftests/powerpc/harness.c | 6 +- + tools/testing/selftests/powerpc/include/reg.h | 2 + + tools/testing/selftests/powerpc/signal/.gitignore | 1 + + tools/testing/selftests/powerpc/signal/Makefile | 3 +- + tools/testing/selftests/powerpc/signal/sigfuz.c | 325 ++++++ + tools/testing/selftests/powerpc/vphn/vphn.c | 2 +- + tools/testing/selftests/powerpc/vphn/vphn.h | 2 +- + 247 files changed, 7819 insertions(+), 4558 deletions(-) + create mode 100644 arch/powerpc/include/asm/book3s/32/kup.h + create mode 100644 arch/powerpc/include/asm/book3s/64/kup-radix.h + create mode 100644 arch/powerpc/include/asm/kasan.h + create mode 100644 arch/powerpc/include/asm/kup.h + create mode 100644 arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h + create mode 100644 arch/powerpc/include/asm/nohash/32/kup-8xx.h + delete mode 100644 arch/powerpc/include/asm/nohash/32/mmu.h + delete mode 100644 arch/powerpc/include/asm/nohash/64/mmu.h + delete mode 100644 arch/powerpc/include/asm/nohash/64/slice.h + create mode 100644 arch/powerpc/include/asm/nohash/hugetlb-book3e.h + create mode 100644 arch/powerpc/kernel/early_32.c + create mode 100644 arch/powerpc/kernel/head_32.h + create mode 100644 arch/powerpc/mm/book3s32/Makefile + rename arch/powerpc/mm/{hash_low_32.S => book3s32/hash_low.S} (99%) + rename arch/powerpc/mm/{ppc_mmu_32.c => book3s32/mmu.c} (86%) + rename arch/powerpc/mm/{mmu_context_hash32.c => book3s32/mmu_context.c} (100%) + rename arch/powerpc/mm/{tlb_hash32.c => book3s32/tlb.c} (99%) + create mode 100644 arch/powerpc/mm/book3s64/Makefile + rename arch/powerpc/mm/{hash64_4k.c => book3s64/hash_4k.c} (98%) + rename arch/powerpc/mm/{hash64_64k.c => book3s64/hash_64k.c} (99%) + rename arch/powerpc/mm/{hugepage-hash64.c => book3s64/hash_hugepage.c} (98%) + rename arch/powerpc/mm/{hugetlbpage-hash64.c => book3s64/hash_hugetlbpage.c} (84%) + rename arch/powerpc/mm/{hash_native_64.c => book3s64/hash_native.c} (100%) + rename arch/powerpc/mm/{pgtable-hash64.c => book3s64/hash_pgtable.c} (97%) + rename arch/powerpc/mm/{tlb_hash64.c => book3s64/hash_tlb.c} (95%) + rename arch/powerpc/mm/{hash_utils_64.c => book3s64/hash_utils.c} (94%) + rename arch/powerpc/mm/{mmu_context_iommu.c => book3s64/iommu_api.c} (100%) + rename arch/powerpc/mm/{mmu_context_book3s64.c => book3s64/mmu_context.c} (86%) + rename arch/powerpc/mm/{pgtable-book3s64.c => book3s64/pgtable.c} (99%) + rename arch/powerpc/mm/{ => book3s64}/pkeys.c (99%) + rename arch/powerpc/mm/{hugetlbpage-radix.c => book3s64/radix_hugetlbpage.c} (100%) + rename arch/powerpc/mm/{pgtable-radix.c => book3s64/radix_pgtable.c} (93%) + rename arch/powerpc/mm/{tlb-radix.c => book3s64/radix_tlb.c} (100%) + rename arch/powerpc/mm/{ => book3s64}/slb.c (97%) + rename arch/powerpc/mm/{subpage-prot.c => book3s64/subpage_prot.c} (91%) + rename arch/powerpc/mm/{ => book3s64}/vphn.c (94%) + rename arch/powerpc/mm/{ => book3s64}/vphn.h (98%) + create mode 100644 arch/powerpc/mm/kasan/Makefile + create mode 100644 arch/powerpc/mm/kasan/kasan_init_32.c + rename arch/powerpc/mm/{40x_mmu.c => nohash/40x.c} (99%) + rename arch/powerpc/mm/{44x_mmu.c => nohash/44x.c} (99%) + rename arch/powerpc/mm/{8xx_mmu.c => nohash/8xx.c} (92%) + create mode 100644 arch/powerpc/mm/nohash/Makefile + rename arch/powerpc/mm/{hugetlbpage-book3e.c => nohash/book3e_hugetlbpage.c} (93%) + rename arch/powerpc/mm/{pgtable-book3e.c => nohash/book3e_pgtable.c} (93%) + rename arch/powerpc/mm/{fsl_booke_mmu.c => nohash/fsl_booke.c} (99%) + rename arch/powerpc/mm/{mmu_context_nohash.c => nohash/mmu_context.c} (99%) + rename arch/powerpc/mm/{tlb_nohash.c => nohash/tlb.c} (98%) + rename arch/powerpc/mm/{tlb_nohash_low.S => nohash/tlb_low.S} (100%) + rename arch/powerpc/mm/{ => nohash}/tlb_low_64e.S (97%) + create mode 100644 arch/powerpc/perf/generic-compat-pmu.c + create mode 100644 arch/powerpc/perf/internal.h + create mode 100644 drivers/misc/ocxl/core.c + create mode 100644 drivers/misc/ocxl/mmio.c + create mode 100644 tools/testing/selftests/powerpc/copyloops/asm/kasan.h + create mode 100644 tools/testing/selftests/powerpc/signal/sigfuz.c +Merging fsl/next (63d86876f324 Revert "powerpc/fsl_pci: simplify fsl_pci_dma_set_mask") +$ git merge fsl/next +Already up to date. +Merging risc-v-pjw/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge risc-v-pjw/for-next +Already up to date. +Merging risc-v/for-next (e23fc917f04f RISC-V: Avoid using invalid intermediate translations) +$ git merge risc-v/for-next +Auto-merging arch/riscv/kernel/stacktrace.c +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. + arch/riscv/Kconfig | 6 +- + arch/riscv/Makefile | 5 +- + arch/riscv/include/asm/Kbuild | 1 + + arch/riscv/include/asm/bug.h | 35 ++++++---- + arch/riscv/include/asm/cacheflush.h | 2 +- + arch/riscv/include/asm/csr.h | 123 ++++++++++++++++++++++------------- + arch/riscv/include/asm/elf.h | 6 -- + arch/riscv/include/asm/futex.h | 13 ---- + arch/riscv/include/asm/irqflags.h | 10 +-- + arch/riscv/include/asm/mmu_context.h | 59 +---------------- + arch/riscv/include/asm/ptrace.h | 21 ++---- + arch/riscv/include/asm/sbi.h | 19 ++++-- + arch/riscv/include/asm/thread_info.h | 4 +- + arch/riscv/include/asm/uaccess.h | 28 +++----- + arch/riscv/kernel/asm-offsets.c | 3 - + arch/riscv/kernel/cpu.c | 3 +- + arch/riscv/kernel/entry.S | 22 +++---- + arch/riscv/kernel/head.S | 33 ++++++---- + arch/riscv/kernel/irq.c | 19 ++---- + arch/riscv/kernel/perf_event.c | 4 +- + arch/riscv/kernel/reset.c | 15 +++-- + arch/riscv/kernel/setup.c | 6 +- + arch/riscv/kernel/signal.c | 6 ++ + arch/riscv/kernel/smp.c | 61 +++-------------- + arch/riscv/kernel/smpboot. | 0 + arch/riscv/kernel/smpboot.c | 22 ++++++- + arch/riscv/kernel/stacktrace.c | 14 ++-- + arch/riscv/kernel/traps.c | 30 ++++++--- + arch/riscv/kernel/vdso/Makefile | 2 +- + arch/riscv/mm/Makefile | 1 + + arch/riscv/mm/cacheflush.c | 61 +++++++++++++++++ + arch/riscv/mm/context.c | 69 ++++++++++++++++++++ + arch/riscv/mm/fault.c | 6 +- + drivers/tty/hvc/hvc_riscv_sbi.c | 1 - + 34 files changed, 390 insertions(+), 320 deletions(-) + create mode 100644 arch/riscv/kernel/smpboot. + create mode 100644 arch/riscv/mm/context.c +Merging sifive/for-next (467e050e9760 Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ git merge sifive/for-next +Already up to date. +Merging s390/features (a698e1372800 s390/qdio: optimize state inspection of HW-owned SBALs) +$ git merge s390/features +Auto-merging include/linux/random.h +Merge made by the 'recursive' strategy. + arch/s390/boot/Makefile | 1 - + arch/s390/boot/compressed/vmlinux.lds.S | 2 ++ + arch/s390/mm/kasan_init.c | 2 +- + drivers/s390/cio/qdio_main.c | 19 +++++++++++-------- + drivers/s390/cio/trace.c | 1 - + drivers/s390/cio/trace.h | 23 ----------------------- + include/linux/random.h | 2 +- + 7 files changed, 15 insertions(+), 35 deletions(-) +Merging sparc-next/master (b71acb0e3721 Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge sparc-next/master +Already up to date. +Merging sh/for-next (ac21fc2dcb40 sh: switch to NO_BOOTMEM) +$ git merge sh/for-next +Already up to date. +Merging uml/linux-next (1987b1b8f9f1 um: irq: don't set the chip for all irqs) +$ git merge uml/linux-next +Merge made by the 'recursive' strategy. + arch/um/Kconfig | 58 +++---- + arch/um/drivers/Kconfig | 352 +++++++++++++++++++++--------------------- + arch/um/drivers/ubd_kern.c | 4 +- + arch/um/include/asm/pgtable.h | 7 +- + arch/um/kernel/irq.c | 2 +- + arch/um/kernel/skas/uaccess.c | 1 - + arch/um/kernel/time.c | 2 +- + arch/um/os-Linux/signal.c | 28 +--- + arch/um/os-Linux/umid.c | 36 +++-- + fs/hostfs/hostfs.h | 2 +- + 10 files changed, 253 insertions(+), 239 deletions(-) +Merging xtensa/xtensa-for-next (0542593fff0f Merge branch 'xtensa-for-next' into xtensa-5.2-fixes) +$ git merge xtensa/xtensa-for-next +Auto-merging arch/xtensa/Kconfig +Merge made by the 'recursive' strategy. + arch/xtensa/Kconfig | 26 ++++- + arch/xtensa/boot/boot-redboot/bootstrap.S | 2 +- + arch/xtensa/include/asm/asmmacro.h | 2 +- + arch/xtensa/include/asm/atomic.h | 66 ++++++++++- + arch/xtensa/include/asm/barrier.h | 4 + + arch/xtensa/include/asm/bitops.h | 125 ++++++++++++++++++++- + arch/xtensa/include/asm/cache.h | 2 +- + arch/xtensa/include/asm/checksum.h | 2 +- + arch/xtensa/include/asm/cmpxchg.h | 36 +++++- + arch/xtensa/include/asm/coprocessor.h | 2 +- + arch/xtensa/include/asm/core.h | 21 ++++ + arch/xtensa/include/asm/futex.h | 122 +++++++++++++------- + arch/xtensa/include/asm/initialize_mmu.h | 38 ++++++- + arch/xtensa/include/asm/io.h | 3 - + arch/xtensa/include/asm/irq.h | 2 +- + arch/xtensa/include/asm/pci-bridge.h | 3 - + arch/xtensa/include/asm/pci.h | 4 - + arch/xtensa/include/asm/pgalloc.h | 3 - + arch/xtensa/include/asm/processor.h | 2 +- + arch/xtensa/include/asm/ptrace.h | 2 +- + arch/xtensa/include/asm/vectors.h | 2 +- + arch/xtensa/kernel/hw_breakpoint.c | 2 +- + arch/xtensa/kernel/setup.c | 3 + + arch/xtensa/kernel/vmlinux.lds.S | 2 +- + arch/xtensa/lib/checksum.S | 2 +- + arch/xtensa/lib/memcopy.S | 2 +- + arch/xtensa/lib/memset.S | 2 +- + arch/xtensa/lib/strncpy_user.S | 2 +- + arch/xtensa/lib/strnlen_user.S | 2 +- + arch/xtensa/lib/usercopy.S | 2 +- + arch/xtensa/platforms/iss/simdisk.c | 3 +- + .../platforms/xt2000/include/platform/hardware.h | 2 +- + .../platforms/xt2000/include/platform/serial.h | 2 +- + 33 files changed, 397 insertions(+), 98 deletions(-) + create mode 100644 arch/xtensa/include/asm/core.h +Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link) +$ 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 (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (6fc9f4e59957 Merge branch 'for-next-current-v5.1-20190509' into for-next-20190509) +$ git merge btrfs-kdave/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging ceph/master (00abf69dd24f ceph: flush dirty inodes before proceeding with remount) +$ git merge ceph/master +Auto-merging net/ceph/osd_client.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/super.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/ceph/file.c +Merge made by the 'recursive' strategy. + drivers/block/rbd.c | 24 +-- + fs/ceph/caps.c | 93 +++++------ + fs/ceph/debugfs.c | 40 ++++- + fs/ceph/export.c | 356 ++++++++++++++++++++++++++++++++++++++--- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 85 ++++++---- + fs/ceph/locks.c | 13 -- + fs/ceph/mds_client.c | 205 ++++++++++-------------- + fs/ceph/mds_client.h | 33 +++- + fs/ceph/mdsmap.c | 2 +- + fs/ceph/quota.c | 177 ++++++++++++++++++-- + fs/ceph/super.c | 7 + + fs/ceph/super.h | 2 + + include/linux/ceph/ceph_fs.h | 6 + + include/linux/ceph/messenger.h | 3 +- + include/linux/ceph/osdmap.h | 13 +- + net/ceph/cls_lock_client.c | 2 +- + net/ceph/debugfs.c | 4 +- + net/ceph/messenger.c | 121 +++++++------- + net/ceph/mon_client.c | 6 +- + net/ceph/osd_client.c | 2 +- + 21 files changed, 845 insertions(+), 351 deletions(-) +Merging cifs/for-next (d1c35afb0892 smb3: trivial cleanup to smb2ops.c) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 2 ++ + fs/cifs/smb2ops.c | 46 +++++++++++++++++++++++----------------------- + 2 files changed, 25 insertions(+), 23 deletions(-) +Merging configfs/for-next (35399f87e271 configfs: fix possible use-after-free in configfs_register_group) +$ git merge configfs/for-next +Auto-merging fs/configfs/dir.c +Merge made by the 'recursive' strategy. + fs/configfs/dir.c | 17 ++++++++++++----- + 1 file changed, 12 insertions(+), 5 deletions(-) +Merging ecryptfs/next (d43388dea04b eCryptfs: fix permission denied with ecryptfs_xattr mount option when create readonly file) +$ git merge ecryptfs/next +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'recursive' strategy. + fs/ecryptfs/crypto.c | 29 +++++++++++++++++++++++------ + fs/ecryptfs/keystore.c | 5 +++-- + 2 files changed, 26 insertions(+), 8 deletions(-) +Merging ext3/for_next (91e9f2c1d861 Merge quota fix from Chengguang.) +$ git merge ext3/for_next +Auto-merging fs/udf/super.c +Merge made by the 'recursive' strategy. + fs/ext2/inode.c | 4 +++- + fs/quota/dquot.c | 41 ++++++++++++++++++++++------------------- + fs/quota/quota_v1.c | 2 +- + fs/quota/quota_v2.c | 2 +- + fs/reiserfs/journal.c | 2 +- + fs/udf/namei.c | 15 --------------- + fs/udf/super.c | 5 +++++ + 7 files changed, 33 insertions(+), 38 deletions(-) +Merging ext4/dev (db90f41916cf ext4: export /sys/fs/ext4/feature/casefold if Unicode support is present) +$ git merge ext4/dev +Already up to date. +Merging f2fs/dev (2777e654371d f2fs: fix to avoid accessing xattr across the boundary) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/data.c +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 4 +- + fs/f2fs/checkpoint.c | 108 +++++++++++++---- + fs/f2fs/data.c | 285 +++++++++++++++++++++++++------------------- + fs/f2fs/f2fs.h | 127 +++++++++++++++----- + fs/f2fs/file.c | 76 +++++++----- + fs/f2fs/gc.c | 16 ++- + fs/f2fs/inline.c | 17 +++ + fs/f2fs/inode.c | 12 +- + fs/f2fs/namei.c | 2 +- + fs/f2fs/node.c | 43 +++++-- + fs/f2fs/recovery.c | 37 +++++- + fs/f2fs/segment.c | 71 ++++++----- + fs/f2fs/segment.h | 16 +-- + fs/f2fs/super.c | 70 ++++++++--- + fs/f2fs/xattr.c | 36 ++++-- + fs/f2fs/xattr.h | 2 + + include/linux/f2fs_fs.h | 11 +- + include/trace/events/f2fs.h | 57 +++++++++ + 18 files changed, 688 insertions(+), 302 deletions(-) +Merging fuse/for-next (9031a69cf9f0 fuse: clean up fuse_alloc_inode) +$ git merge fuse/for-next +Auto-merging fs/fuse/inode.c +Merge made by the 'recursive' strategy. + fs/fuse/control.c | 20 +++++++++++++++----- + fs/fuse/cuse.c | 13 +++++++------ + fs/fuse/dev.c | 16 +++++++++++++--- + fs/fuse/file.c | 22 ++++++++++++++++++---- + fs/fuse/fuse_i.h | 7 +++++++ + fs/fuse/inode.c | 23 ++++++++++++----------- + include/uapi/linux/fuse.h | 22 ++++++++++++++++++++-- + 7 files changed, 92 insertions(+), 31 deletions(-) +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Already up to date. +Merging nfs/linux-next (e93c9c99a629 Linux 5.1) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (5940d1cf9f42 SUNRPC: Rebalance a kref in auth_gss.c) +$ git merge nfs-anna/linux-next +Auto-merging include/trace/events/sunrpc.h +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/inode.c +Merge made by the 'recursive' strategy. + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 4 +- + fs/lockd/host.c | 10 +- + fs/lockd/mon.c | 1 + + fs/nfs/client.c | 16 +- + fs/nfs/delegation.c | 12 + + fs/nfs/delegation.h | 1 + + fs/nfs/dir.c | 7 +- + fs/nfs/direct.c | 11 +- + fs/nfs/file.c | 31 +-- + fs/nfs/filelayout/filelayout.c | 6 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 14 +- + fs/nfs/inode.c | 13 +- + fs/nfs/internal.h | 8 +- + fs/nfs/mount_clnt.c | 2 + + fs/nfs/nfs2xdr.c | 58 +++-- + fs/nfs/nfs3client.c | 1 + + fs/nfs/nfs3xdr.c | 142 +++++++----- + fs/nfs/nfs4_fs.h | 1 + + fs/nfs/nfs4client.c | 6 + + fs/nfs/nfs4file.c | 4 +- + fs/nfs/nfs4idmap.c | 27 ++- + fs/nfs/nfs4proc.c | 159 ++++++++++---- + fs/nfs/nfs4state.c | 7 +- + fs/nfs/pagelist.c | 123 ++++++----- + fs/nfs/pnfs.c | 4 +- + fs/nfs/pnfs.h | 4 +- + fs/nfs/read.c | 6 +- + fs/nfs/super.c | 32 ++- + fs/nfs/symlink.c | 7 +- + fs/nfs/write.c | 70 +++--- + fs/nfsd/nfs4callback.c | 5 +- + include/linux/lockd/bind.h | 1 + + include/linux/lockd/lockd.h | 4 +- + include/linux/nfs_fs.h | 1 - + include/linux/nfs_fs_sb.h | 13 ++ + include/linux/nfs_page.h | 12 +- + include/linux/sunrpc/clnt.h | 4 + + include/linux/sunrpc/sched.h | 20 +- + include/linux/sunrpc/xprt.h | 6 +- + include/trace/events/rpcrdma.h | 27 +++ + include/trace/events/sunrpc.h | 8 +- + include/uapi/linux/nfs_mount.h | 9 - + net/sunrpc/auth_gss/auth_gss.c | 71 ++++-- + net/sunrpc/auth_unix.c | 9 +- + net/sunrpc/clnt.c | 132 +++++++---- + net/sunrpc/debugfs.c | 2 +- + net/sunrpc/rpcb_clnt.c | 12 +- + net/sunrpc/sched.c | 158 ++++++++++---- + net/sunrpc/socklib.c | 2 +- + net/sunrpc/xprt.c | 154 ++++++++----- + net/sunrpc/xprtrdma/backchannel.c | 120 ++++------ + net/sunrpc/xprtrdma/frwr_ops.c | 63 ++---- + net/sunrpc/xprtrdma/rpc_rdma.c | 115 +++++----- + net/sunrpc/xprtrdma/svc_rdma_backchannel.c | 2 +- + net/sunrpc/xprtrdma/transport.c | 105 ++------- + net/sunrpc/xprtrdma/verbs.c | 338 ++++++++++++++++------------- + net/sunrpc/xprtrdma/xprt_rdma.h | 121 +++++------ + net/sunrpc/xprtsock.c | 9 +- + 59 files changed, 1366 insertions(+), 946 deletions(-) +Merging nfsd/nfsd-next (1c73b9d24f80 nfsd: update callback done processing) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/lockd/bind.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/nfsd/nfs4callback.c +Auto-merging fs/nfs/client.c +Auto-merging fs/locks.c +Auto-merging fs/lockd/clntlock.c +Merge made by the 'recursive' strategy. + fs/lockd/clntlock.c | 4 +- + fs/lockd/svc.c | 33 +-- + fs/locks.c | 12 +- + fs/nfs/callback.c | 9 +- + fs/nfs/callback_xdr.c | 2 +- + fs/nfs/client.c | 1 + + fs/nfsd/export.c | 18 +- + fs/nfsd/netns.h | 11 + + fs/nfsd/nfs3xdr.c | 21 +- + fs/nfsd/nfs4callback.c | 9 +- + fs/nfsd/nfs4idmap.c | 8 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4recover.c | 436 +++++++++++++++++++++++++++++++++++--- + fs/nfsd/nfs4state.c | 68 ++++-- + fs/nfsd/nfs4xdr.c | 9 +- + fs/nfsd/nfsctl.c | 42 ++-- + fs/nfsd/nfsd.h | 17 +- + fs/nfsd/nfssvc.c | 271 ++++++++++++++++++----- + fs/nfsd/nfsxdr.c | 17 +- + fs/nfsd/state.h | 8 +- + fs/nfsd/vfs.c | 8 +- + fs/nfsd/vfs.h | 5 +- + include/linux/lockd/bind.h | 2 +- + include/linux/sunrpc/svc.h | 33 +++ + include/linux/sunrpc/svc_xprt.h | 4 +- + include/linux/sunrpc/svcsock.h | 3 +- + include/uapi/linux/nfsd/cld.h | 1 + + net/sunrpc/auth_gss/svcauth_gss.c | 6 +- + net/sunrpc/cache.c | 4 +- + net/sunrpc/svc.c | 298 +++++++++++++++++--------- + net/sunrpc/svc_xprt.c | 17 +- + net/sunrpc/svcauth_unix.c | 15 +- + net/sunrpc/svcsock.c | 4 +- + 34 files changed, 1085 insertions(+), 316 deletions(-) +Merging orangefs/for-next (33713cd09ccd orangefs: truncate before updating size) +$ git merge orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (acf3062a7e1c ovl: relax WARN_ON() for overlapping layers use case) +$ git merge overlayfs/overlayfs-next +Merge made by the 'recursive' strategy. + fs/overlayfs/copy_up.c | 6 +-- + fs/overlayfs/dir.c | 2 +- + fs/overlayfs/file.c | 133 +++++++++++++++++++++++++++++++++++++---------- + fs/overlayfs/inode.c | 3 +- + fs/overlayfs/overlayfs.h | 2 +- + 5 files changed, 113 insertions(+), 33 deletions(-) +Merging ubifs/linux-next (04d37e5a8b1f ubi: wl: Fix uninitialized variable) +$ git merge ubifs/linux-next +Auto-merging include/linux/fscrypt.h +Auto-merging fs/ubifs/super.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/ubifs/auth.c +CONFLICT (content): Merge conflict in fs/ubifs/auth.c +Resolved 'fs/ubifs/auth.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 57021013e4a7] Merge remote-tracking branch 'ubifs/linux-next' +$ git diff -M --stat --summary HEAD^.. + drivers/mtd/ubi/wl.c | 2 +- + fs/ubifs/auth.c | 33 +++----- + fs/ubifs/debug.c | 1 - + fs/ubifs/dir.c | 29 ++++--- + fs/ubifs/file.c | 16 ++-- + fs/ubifs/find.c | 9 +-- + fs/ubifs/ioctl.c | 11 +-- + fs/ubifs/journal.c | 72 ++++++++++++++--- + fs/ubifs/misc.h | 8 ++ + fs/ubifs/orphan.c | 208 ++++++++++++++++++++++++++++++++---------------- + fs/ubifs/sb.c | 7 +- + fs/ubifs/super.c | 22 ++--- + fs/ubifs/tnc.c | 15 ++-- + fs/ubifs/ubifs.h | 6 +- + fs/ubifs/xattr.c | 71 +++++++++++++++-- + include/linux/fscrypt.h | 11 +++ + 16 files changed, 344 insertions(+), 177 deletions(-) +Merging v9fs/9p-next (bb06c388fa20 9p/net: fix memory leak in p9_client_create) +$ git merge v9fs/9p-next +Already up to date. +Merging xfs/for-next (8869a2d297cb Merge remote-tracking branch 'korg/iomap-5.2-merge' into for-next) +$ git merge xfs/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging file-locks/locks-next (945ab8f6de94 locks: wake any locks blocked on request before deadlock check) +$ git merge file-locks/locks-next +Already up to date. +Merging vfs/for-next (6e14c3cf8bc4 Merge branch 'work.icache' into for-next) +$ git merge vfs/for-next +Auto-merging Documentation/filesystems/porting +CONFLICT (content): Merge conflict in Documentation/filesystems/porting +Resolved 'Documentation/filesystems/porting' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c86e2d003969] Merge remote-tracking branch 'vfs/for-next' +$ git diff -M --stat --summary HEAD^.. +Merging printk/for-next (3ba3fee931aa Merge branch 'for-5.2-vsprintf-hardening' into for-next) +$ git merge printk/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging pci/next (ff3e01b75020 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging include/linux/acpi.h +Auto-merging drivers/pci/switch/switchtec.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/pcie/bw_notification.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/hotplug/pciehp_ctrl.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +Auto-merging drivers/net/ethernet/realtek/r8169.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/designware-pcie.txt | 7 +- + .../devicetree/bindings/pci/pci-keystone.txt | 58 +- + Documentation/devicetree/bindings/pci/pci.txt | 50 ++ + MAINTAINERS | 6 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 - + arch/powerpc/platforms/powernv/npu-dma.c | 14 +- + arch/x86/pci/irq.c | 10 +- + drivers/acpi/pci_mcfg.c | 12 + + drivers/acpi/pci_root.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 3 +- + drivers/iommu/amd_iommu.c | 2 +- + drivers/iommu/dma-iommu.c | 35 +- + drivers/iommu/intel-iommu.c | 2 +- + drivers/iommu/intel_irq_remapping.c | 2 +- + drivers/misc/pci_endpoint_test.c | 18 + + drivers/net/ethernet/realtek/r8169.c | 3 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c | 2 +- + drivers/pci/Makefile | 2 +- + drivers/pci/bus.c | 5 +- + drivers/pci/controller/dwc/Kconfig | 29 +- + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-dra7xx.c | 3 +- + drivers/pci/controller/dwc/pci-imx6.c | 144 ++-- + drivers/pci/controller/dwc/pci-keystone.c | 926 +++++++++++++++------ + drivers/pci/controller/dwc/pci-layerscape-ep.c | 2 +- + drivers/pci/controller/dwc/pci-layerscape.c | 1 + + drivers/pci/controller/dwc/pcie-al.c | 93 +++ + drivers/pci/controller/dwc/pcie-artpec6.c | 2 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 55 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 157 ++-- + drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.c | 64 +- + drivers/pci/controller/dwc/pcie-designware.h | 26 +- + drivers/pci/controller/dwc/pcie-qcom.c | 23 +- + drivers/pci/controller/dwc/pcie-uniphier.c | 11 +- + drivers/pci/controller/pci-aardvark.c | 13 +- + drivers/pci/controller/pci-host-generic.c | 2 +- + drivers/pci/controller/pci-hyperv.c | 23 + + drivers/pci/controller/pci-tegra.c | 37 +- + drivers/pci/controller/pcie-iproc-msi.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 98 ++- + drivers/pci/controller/pcie-mediatek.c | 51 +- + drivers/pci/controller/pcie-rcar.c | 85 +- + drivers/pci/controller/pcie-rockchip-ep.c | 2 +- + drivers/pci/controller/pcie-rockchip-host.c | 1 + + drivers/pci/controller/pcie-xilinx-nwl.c | 9 +- + drivers/pci/controller/pcie-xilinx.c | 12 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 10 +- + drivers/pci/endpoint/pci-epf-core.c | 10 +- + drivers/pci/hotplug/pciehp.h | 31 +- + drivers/pci/hotplug/pciehp_core.c | 18 +- + drivers/pci/hotplug/pciehp_ctrl.c | 2 + + drivers/pci/hotplug/pciehp_hpc.c | 17 +- + drivers/pci/hotplug/pciehp_pci.c | 2 + + drivers/pci/hotplug/rpadlpar_core.c | 4 + + drivers/pci/hotplug/rpaphp_slot.c | 3 +- + drivers/pci/msi.c | 6 +- + drivers/pci/of.c | 58 +- + drivers/pci/p2pdma.c | 38 +- + drivers/pci/pci-acpi.c | 183 ++-- + drivers/pci/pci-stub.c | 10 +- + drivers/pci/pci-sysfs.c | 3 +- + drivers/pci/pci.c | 344 ++++---- + drivers/pci/pci.h | 2 +- + drivers/pci/pcie/aer.c | 32 +- + drivers/pci/pcie/aer_inject.c | 22 +- + drivers/pci/pcie/aspm.c | 47 +- + drivers/pci/pcie/bw_notification.c | 14 + + drivers/pci/pcie/dpc.c | 37 +- + drivers/pci/pcie/pme.c | 10 +- + drivers/pci/probe.c | 230 ++++- + drivers/pci/proc.c | 1 + + drivers/pci/quirks.c | 92 +- + drivers/pci/search.c | 10 +- + drivers/pci/setup-bus.c | 526 ++++++------ + drivers/pci/slot.c | 2 +- + drivers/pci/switch/switchtec.c | 42 +- + drivers/pci/xen-pcifront.c | 9 +- + drivers/platform/chrome/chromeos_laptop.c | 2 +- + include/linux/acpi.h | 3 +- + include/linux/cper.h | 336 ++++---- + include/linux/msi.h | 18 - + include/linux/pci-ecam.h | 1 + + include/linux/pci-epc.h | 2 + + include/linux/pci-epf.h | 3 +- + include/linux/pci.h | 9 +- + include/linux/pci_hotplug.h | 66 +- + include/linux/switchtec.h | 2 +- + include/uapi/linux/pci_regs.h | 138 +-- + include/uapi/linux/switchtec_ioctl.h | 13 +- + tools/pci/Makefile | 8 +- + tools/pci/pcitest.c | 8 +- + 92 files changed, 2913 insertions(+), 1620 deletions(-) + create mode 100644 drivers/pci/controller/dwc/pcie-al.c +Merging pstore/for-next/pstore (0be6a6927254 pstore/ram: Improve backward compatibility with older Chromebooks) +$ git merge pstore/for-next/pstore +Merge made by the 'recursive' strategy. + fs/pstore/ram.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) +Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next) +$ git merge hid/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging i2c/i2c/for-next (8d1d950a6072 Merge branch 'i2c/for-5.2' into i2c/for-next) +$ git merge i2c/i2c/for-next +Removing include/linux/platform_data/pca954x.h +Auto-merging drivers/i2c/i2c-core-base.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-i2c-devices-pca954x | 20 + + Documentation/devicetree/bindings/eeprom/at24.txt | 1 + + .../devicetree/bindings/i2c/brcm,iproc-i2c.txt | 17 +- + .../devicetree/bindings/i2c/i2c-designware.txt | 9 + + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 5 +- + Documentation/devicetree/bindings/i2c/i2c-riic.txt | 5 +- + .../devicetree/bindings/i2c/i2c-stm32.txt | 37 +- + Documentation/i2c/busses/i2c-amd-mp2 | 23 + + Documentation/i2c/busses/i2c-piix4 | 2 + + MAINTAINERS | 13 +- + drivers/i2c/algos/i2c-algo-bit.c | 22 +- + drivers/i2c/busses/Kconfig | 25 + + drivers/i2c/busses/Makefile | 5 + + drivers/i2c/busses/i2c-amd-mp2-pci.c | 483 +++++++++++++ + drivers/i2c/busses/i2c-amd-mp2-plat.c | 367 ++++++++++ + drivers/i2c/busses/i2c-amd-mp2.h | 219 ++++++ + drivers/i2c/busses/i2c-at91-core.c | 376 ++++++++++ + .../i2c/busses/{i2c-at91.c => i2c-at91-master.c} | 480 +------------ + drivers/i2c/busses/i2c-at91-slave.c | 143 ++++ + drivers/i2c/busses/i2c-at91.h | 174 +++++ + drivers/i2c/busses/i2c-axxia.c | 57 +- + drivers/i2c/busses/i2c-bcm-iproc.c | 764 +++++++++++++++++---- + drivers/i2c/busses/i2c-brcmstb.c | 1 - + drivers/i2c/busses/i2c-designware-common.c | 18 +- + drivers/i2c/busses/i2c-designware-core.h | 2 + + drivers/i2c/busses/i2c-designware-platdrv.c | 5 + + drivers/i2c/busses/i2c-gpio.c | 2 + + drivers/i2c/busses/i2c-imx-lpi2c.c | 11 +- + drivers/i2c/busses/i2c-isch.c | 1 - + drivers/i2c/busses/i2c-mt65xx.c | 255 +++++-- + drivers/i2c/busses/i2c-nomadik.c | 3 +- + drivers/i2c/busses/i2c-ocores.c | 16 +- + drivers/i2c/busses/i2c-omap.c | 76 +- + drivers/i2c/busses/i2c-piix4.c | 15 +- + drivers/i2c/busses/i2c-rcar.c | 30 +- + drivers/i2c/busses/i2c-riic.c | 43 +- + drivers/i2c/busses/i2c-stm32f7.c | 4 + + drivers/i2c/busses/i2c-stu300.c | 25 +- + drivers/i2c/busses/i2c-tegra-bpmp.c | 25 +- + drivers/i2c/i2c-core-base.c | 23 +- + drivers/i2c/i2c-core-smbus.c | 29 +- + drivers/i2c/i2c-core.h | 36 + + drivers/i2c/i2c-mux.c | 6 + + drivers/i2c/muxes/i2c-demux-pinctrl.c | 6 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 8 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 106 ++- + include/linux/i2c-algo-bit.h | 1 + + include/linux/i2c.h | 41 +- + include/linux/platform_data/pca954x.h | 48 -- + 49 files changed, 3151 insertions(+), 932 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-i2c-devices-pca954x + create mode 100644 Documentation/i2c/busses/i2c-amd-mp2 + create mode 100644 drivers/i2c/busses/i2c-amd-mp2-pci.c + create mode 100644 drivers/i2c/busses/i2c-amd-mp2-plat.c + create mode 100644 drivers/i2c/busses/i2c-amd-mp2.h + create mode 100644 drivers/i2c/busses/i2c-at91-core.c + rename drivers/i2c/busses/{i2c-at91.c => i2c-at91-master.c} (65%) + create mode 100644 drivers/i2c/busses/i2c-at91-slave.c + create mode 100644 drivers/i2c/busses/i2c-at91.h + delete mode 100644 include/linux/platform_data/pca954x.h +Merging i3c/i3c/next (476c7e1d34f2 i3c: Fix a shift wrap bug in i3c_bus_set_addr_slot_status()) +$ git merge i3c/i3c/next +Already up to date. +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (39abe9d88b30 hwmon: (lm75) Add support for TMP75B) +$ git merge hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (afbd4d42470e Merge branch 'x86' into docs-next) +$ git merge jc_docs/docs-next +Removing Documentation/x86/zero-page.txt +CONFLICT (modify/delete): Documentation/x86/x86_64/mm.txt deleted in jc_docs/docs-next and modified in HEAD. Version HEAD of Documentation/x86/x86_64/mm.txt left in tree. +Removing Documentation/x86/x86_64/boot-options.txt +Auto-merging Documentation/x86/topology.rst +Removing Documentation/x86/pat.txt +Removing Documentation/x86/mtrr.txt +Auto-merging Documentation/x86/kernel-stacks.rst +Auto-merging Documentation/index.rst +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/x86/x86_64/mm.txt +Documentation/x86/x86_64/mm.txt: needs merge +rm 'Documentation/x86/x86_64/mm.txt' +$ git commit -v -a +[master 7cbc035dddf3] Merge remote-tracking branch 'jc_docs/docs-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/index.rst | 1 + + Documentation/trace/histogram.rst | 11 +- + .../translations/it_IT/process/license-rules.rst | 60 +- + ...ry-encryption.txt => amd-memory-encryption.rst} | 13 +- + Documentation/x86/{boot.txt => boot.rst} | 528 +++++++----- + .../x86/{earlyprintk.txt => earlyprintk.rst} | 122 +-- + Documentation/x86/{entry_64.txt => entry_64.rst} | 12 +- + .../{exception-tables.txt => exception-tables.rst} | 247 +++--- + .../x86/i386/{IO-APIC.txt => IO-APIC.rst} | 28 +- + Documentation/x86/i386/index.rst | 10 + + Documentation/x86/index.rst | 30 + + Documentation/x86/{intel_mpx.txt => intel_mpx.rst} | 120 +-- + .../x86/{kernel-stacks => kernel-stacks.rst} | 20 +- + Documentation/x86/{microcode.txt => microcode.rst} | 62 +- + Documentation/x86/mtrr.rst | 354 ++++++++ + Documentation/x86/mtrr.txt | 329 -------- + .../x86/{orc-unwinder.txt => orc-unwinder.rst} | 27 +- + Documentation/x86/pat.rst | 242 ++++++ + Documentation/x86/pat.txt | 230 ------ + .../{protection-keys.txt => protection-keys.rst} | 33 +- + Documentation/x86/{pti.txt => pti.rst} | 17 +- + .../x86/{resctrl_ui.txt => resctrl_ui.rst} | 916 +++++++++++---------- + Documentation/x86/{tlb.txt => tlb.rst} | 30 +- + Documentation/x86/{topology.txt => topology.rst} | 92 ++- + ...b-legacy-support.txt => usb-legacy-support.rst} | 40 +- + .../{5level-paging.txt => 5level-paging.rst} | 16 +- + Documentation/x86/x86_64/boot-options.rst | 335 ++++++++ + Documentation/x86/x86_64/boot-options.txt | 278 ------- + .../{cpu-hotplug-spec => cpu-hotplug-spec.rst} | 5 +- + ...-numa-for-cpusets => fake-numa-for-cpusets.rst} | 25 +- + Documentation/x86/x86_64/index.rst | 16 + + .../x86/x86_64/{machinecheck => machinecheck.rst} | 12 +- + Documentation/x86/x86_64/mm.rst | 161 ++++ + Documentation/x86/x86_64/mm.txt | 153 ---- + Documentation/x86/x86_64/{uefi.txt => uefi.rst} | 30 +- + Documentation/x86/zero-page.rst | 45 + + Documentation/x86/zero-page.txt | 40 - + 37 files changed, 2620 insertions(+), 2070 deletions(-) + rename Documentation/x86/{amd-memory-encryption.txt => amd-memory-encryption.rst} (94%) + rename Documentation/x86/{boot.txt => boot.rst} (73%) + rename Documentation/x86/{earlyprintk.txt => earlyprintk.rst} (51%) + rename Documentation/x86/{entry_64.txt => entry_64.rst} (95%) + rename Documentation/x86/{exception-tables.txt => exception-tables.rst} (64%) + rename Documentation/x86/i386/{IO-APIC.txt => IO-APIC.rst} (93%) + create mode 100644 Documentation/x86/i386/index.rst + create mode 100644 Documentation/x86/index.rst + rename Documentation/x86/{intel_mpx.txt => intel_mpx.rst} (75%) + rename Documentation/x86/{kernel-stacks => kernel-stacks.rst} (93%) + rename Documentation/x86/{microcode.txt => microcode.rst} (81%) + create mode 100644 Documentation/x86/mtrr.rst + delete mode 100644 Documentation/x86/mtrr.txt + rename Documentation/x86/{orc-unwinder.txt => orc-unwinder.rst} (93%) + create mode 100644 Documentation/x86/pat.rst + delete mode 100644 Documentation/x86/pat.txt + rename Documentation/x86/{protection-keys.txt => protection-keys.rst} (83%) + rename Documentation/x86/{pti.txt => pti.rst} (96%) + rename Documentation/x86/{resctrl_ui.txt => resctrl_ui.rst} (68%) + rename Documentation/x86/{tlb.txt => tlb.rst} (81%) + rename Documentation/x86/{topology.txt => topology.rst} (74%) + rename Documentation/x86/{usb-legacy-support.txt => usb-legacy-support.rst} (53%) + rename Documentation/x86/x86_64/{5level-paging.txt => 5level-paging.rst} (91%) + create mode 100644 Documentation/x86/x86_64/boot-options.rst + delete mode 100644 Documentation/x86/x86_64/boot-options.txt + rename Documentation/x86/x86_64/{cpu-hotplug-spec => cpu-hotplug-spec.rst} (88%) + rename Documentation/x86/x86_64/{fake-numa-for-cpusets => fake-numa-for-cpusets.rst} (85%) + create mode 100644 Documentation/x86/x86_64/index.rst + rename Documentation/x86/x86_64/{machinecheck => machinecheck.rst} (92%) + create mode 100644 Documentation/x86/x86_64/mm.rst + delete mode 100644 Documentation/x86/x86_64/mm.txt + rename Documentation/x86/x86_64/{uefi.txt => uefi.rst} (79%) + create mode 100644 Documentation/x86/zero-page.rst + delete mode 100644 Documentation/x86/zero-page.txt +$ git am -3 ../patches/0001-Documentation-x86-update-for-x86-mm-Fix-the-56-bit-a.patch +Applying: Documentation: x86: update for "x86/mm: Fix the 56-bit addresses memory map in Documentation/x86/x86_64/mm.txt" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/x86/x86_64/mm.rst +$ git add -A . +$ git commit -v -a --amend +[master b77c7d8b69db] Merge remote-tracking branch 'jc_docs/docs-next' + Date: Fri May 10 10:27:29 2019 +1000 +Merging v4l-dvb/master (1199fa8c0ddd media: tegra-cec: fix cec_notifier_parse_hdmi_phandle return check) +$ git merge v4l-dvb/master +Auto-merging drivers/staging/media/imx/imx-media.h +Auto-merging drivers/staging/media/imx/imx-media-csi.c +Auto-merging drivers/staging/media/imx/imx-media-capture.c +Auto-merging drivers/staging/media/imx/imx-ic-prpencvf.c +Merge made by the 'recursive' strategy. + Documentation/media/uapi/v4l/field-order.rst | 16 +++---- + drivers/media/platform/atmel/atmel-isc-regs.h | 19 ++++++++ + drivers/media/platform/atmel/atmel-isc.c | 46 ++++++++++++++++-- + drivers/media/platform/coda/coda-common.c | 10 ++++ + drivers/media/platform/davinci/vpbe.c | 2 +- + drivers/media/platform/omap/omap_vout.c | 15 +++--- + drivers/media/platform/rcar-vin/rcar-csi2.c | 68 +++++++++++++++++++++++++-- + drivers/media/platform/tegra-cec/tegra_cec.c | 4 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 2 +- + drivers/staging/media/imx/imx-media-capture.c | 6 +-- + drivers/staging/media/imx/imx-media-csi.c | 2 +- + drivers/staging/media/imx/imx-media.h | 3 +- + drivers/staging/media/imx/imx7-media-csi.c | 2 +- + include/media/davinci/vpbe.h | 2 +- + 14 files changed, 160 insertions(+), 37 deletions(-) +Merging v4l-dvb-next/master (9e98c678c2d6 Linux 5.1-rc1) +$ git merge v4l-dvb-next/master +Already up to date. +Merging fbdev/fbdev-for-next (d4a5611743a6 video: fbdev: Use dev_get_drvdata()) +$ git merge fbdev/fbdev-for-next +Removing drivers/video/fbdev/amba-clcd-versatile.h +Removing drivers/video/fbdev/amba-clcd-versatile.c +Removing drivers/video/fbdev/amba-clcd-nomadik.h +Removing drivers/video/fbdev/amba-clcd-nomadik.c +Merge made by the 'recursive' strategy. + drivers/video/fbdev/Kconfig | 304 ++++++----- + drivers/video/fbdev/Makefile | 2 - + drivers/video/fbdev/amba-clcd-nomadik.c | 251 --------- + drivers/video/fbdev/amba-clcd-nomadik.h | 24 - + drivers/video/fbdev/amba-clcd-versatile.c | 567 --------------------- + drivers/video/fbdev/amba-clcd-versatile.h | 17 - + drivers/video/fbdev/amba-clcd.c | 98 +--- + drivers/video/fbdev/atafb.c | 67 ++- + drivers/video/fbdev/atafb_iplan2p2.c | 23 - + drivers/video/fbdev/atafb_iplan2p4.c | 23 - + drivers/video/fbdev/atafb_iplan2p8.c | 23 - + drivers/video/fbdev/atafb_mfb.c | 23 - + drivers/video/fbdev/atmel_lcdfb.c | 116 +---- + drivers/video/fbdev/core/fbcmap.c | 2 + + drivers/video/fbdev/core/fbcon.c | 2 +- + drivers/video/fbdev/core/fbmem.c | 29 +- + drivers/video/fbdev/core/modedb.c | 3 + + drivers/video/fbdev/hgafb.c | 2 + + drivers/video/fbdev/imsttfb.c | 5 + + drivers/video/fbdev/macfb.c | 29 +- + drivers/video/fbdev/mmp/Kconfig | 6 +- + drivers/video/fbdev/mxsfb.c | 14 +- + drivers/video/fbdev/nuc900fb.c | 2 +- + drivers/video/fbdev/omap/Kconfig | 20 +- + drivers/video/fbdev/omap2/omapfb/Kconfig | 18 +- + drivers/video/fbdev/omap2/omapfb/displays/Kconfig | 40 +- + drivers/video/fbdev/omap2/omapfb/dss/Kconfig | 6 +- + .../fbdev/omap2/omapfb/dss/omapdss-boot-init.c | 6 +- + drivers/video/fbdev/pvr2fb.c | 2 - + drivers/video/fbdev/s3c2410fb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 6 +- + drivers/video/fbdev/sm712.h | 12 +- + drivers/video/fbdev/sm712fb.c | 243 +++++++-- + drivers/video/fbdev/udlfb.c | 114 ++++- + drivers/video/fbdev/uvesafb.c | 16 +- + drivers/video/fbdev/vesafb.c | 4 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + include/linux/amba/clcd.h | 31 -- + include/video/udlfb.h | 7 + + 39 files changed, 608 insertions(+), 1553 deletions(-) + delete mode 100644 drivers/video/fbdev/amba-clcd-nomadik.c + delete mode 100644 drivers/video/fbdev/amba-clcd-nomadik.h + delete mode 100644 drivers/video/fbdev/amba-clcd-versatile.c + delete mode 100644 drivers/video/fbdev/amba-clcd-versatile.h +Merging pm/linux-next (ff9cb8b1104e Merge branch 'pm-cpufreq' into linux-next) +$ git merge pm/linux-next +Merge made by the 'recursive' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (21027e78e7c1 cpupower: correct spelling of interval) +$ git merge cpupower/cpupower +Merge made by the 'recursive' strategy. + tools/power/cpupower/man/cpupower-monitor.1 | 2 +- + tools/power/cpupower/po/cs.po | 2 +- + tools/power/cpupower/po/de.po | 2 +- + tools/power/cpupower/po/fr.po | 2 +- + tools/power/cpupower/po/it.po | 2 +- + tools/power/cpupower/po/pt.po | 2 +- + 6 files changed, 6 insertions(+), 6 deletions(-) +Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt()) +$ git merge opp/opp/linux-next +Already up to date. +Merging thermal/next (fc15b6af30c9 Merge branches 'thermal-core', 'thermal-built-it' and 'thermal-intel' into next) +$ git merge thermal/next +Auto-merging drivers/net/ethernet/mellanox/mlxsw/Kconfig +Auto-merging drivers/hwmon/hwmon.c +Merge made by the 'recursive' strategy. + arch/arm/configs/mini2440_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 2 +- + arch/mips/configs/ip22_defconfig | 2 +- + arch/mips/configs/ip27_defconfig | 2 +- + arch/unicore32/configs/unicore32_defconfig | 2 +- + drivers/hwmon/hwmon.c | 4 +-- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 - + drivers/thermal/Kconfig | 8 +++--- + drivers/thermal/intel/Kconfig | 1 - + .../intel/int340x_thermal/int3403_thermal.c | 16 +++++------ + .../int340x_thermal/processor_thermal_device.c | 13 ++------- + drivers/thermal/qcom/Kconfig | 1 - + drivers/thermal/thermal_core.c | 31 +++++++++------------- + include/linux/thermal.h | 6 ++--- + 14 files changed, 34 insertions(+), 57 deletions(-) +Merging thermal-soc/next (8834f5600cf3 Linux 5.0-rc5) +$ git merge thermal-soc/next +Already up to date. +Merging ieee1394/for-next (812cd88749e0 firewire: mark expected switch fall-throughs) +$ git merge ieee1394/for-next +Merge made by the 'recursive' strategy. + drivers/firewire/core-device.c | 2 +- + drivers/firewire/core-iso.c | 2 +- + drivers/firewire/core-topology.c | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +Merging dlm/next (54cca4bad076 dlm: allow binding to all network interfaces) +$ git merge dlm/next +Merge made by the 'recursive' strategy. + fs/dlm/config.c | 42 ++++++++++++++++++++++++ + fs/dlm/config.h | 3 +- + fs/dlm/lockspace.c | 6 ++-- + fs/dlm/lowcomms.c | 95 +++++++++++++++++++++++++++++++++++++++++++----------- + fs/dlm/lowcomms.h | 1 + + 5 files changed, 125 insertions(+), 22 deletions(-) +Merging swiotlb/linux-next (063b8271ec8f swiotlb-xen: ensure we have a single callsite for xen_dma_map_page) +$ git merge swiotlb/linux-next +Already up to date. +Merging rdma/for-next (b79656ed44c6 RDMA/ipoib: Allow user space differentiate between valid dev_port) +$ git merge rdma/for-next +Already up to date. +Merging net-next/master (601e6bcc4ef0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) +$ git merge net-next/master +Auto-merging drivers/rtc/rtc-omap.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c +Resolved 'drivers/rtc/rtc-omap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3f93e0134f16] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/btf.rst | 2 + + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 6 +- + .../devicetree/bindings/rtc/rtc-aspeed.txt | 22 + + Documentation/devicetree/bindings/rtc/rtc.txt | 1 + + drivers/net/ethernet/netronome/nfp/bpf/jit.c | 13 +- + drivers/net/ethernet/netronome/nfp/ccm.h | 2 + + drivers/rtc/Kconfig | 19 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/class.c | 21 +- + drivers/rtc/dev.c | 20 +- + drivers/rtc/hctosys.c | 10 +- + drivers/rtc/interface.c | 107 +++-- + drivers/rtc/lib.c | 30 +- + drivers/rtc/nvmem.c | 7 +- + drivers/rtc/proc.c | 21 +- + drivers/rtc/rtc-88pm80x.c | 14 +- + drivers/rtc/rtc-88pm860x.c | 2 +- + drivers/rtc/rtc-ab-b5ze-s3.c | 189 +++------ + drivers/rtc/rtc-ab3100.c | 24 +- + drivers/rtc/rtc-abx80x.c | 43 +- + drivers/rtc/rtc-aspeed.c | 136 +++++++ + drivers/rtc/rtc-at91sam9.c | 108 ++--- + drivers/rtc/rtc-brcmstb-waketimer.c | 2 +- + drivers/rtc/rtc-coh901331.c | 37 +- + drivers/rtc/rtc-da9063.c | 27 +- + drivers/rtc/rtc-digicolor.c | 25 +- + drivers/rtc/rtc-dm355evm.c | 24 +- + drivers/rtc/rtc-ds1672.c | 127 ++---- + drivers/rtc/rtc-ds1685.c | 262 +++++------- + drivers/rtc/rtc-ds2404.c | 73 +--- + drivers/rtc/rtc-ds3232.c | 40 +- + drivers/rtc/rtc-ep93xx.c | 70 ++-- + drivers/rtc/rtc-goldfish.c | 50 +-- + drivers/rtc/rtc-hid-sensor-time.c | 3 +- + drivers/rtc/rtc-imxdi.c | 50 +-- + drivers/rtc/rtc-jz4740.c | 95 ++--- + drivers/rtc/rtc-lpc32xx.c | 59 +-- + drivers/rtc/rtc-mc13xxx.c | 25 +- + drivers/rtc/rtc-mt6397.c | 9 +- + drivers/rtc/rtc-mv.c | 33 +- + drivers/rtc/rtc-mxc.c | 86 ++-- + drivers/rtc/rtc-mxc_v2.c | 29 +- + drivers/rtc/rtc-omap.c | 32 +- + drivers/rtc/rtc-opal.c | 2 +- + drivers/rtc/rtc-pcap.c | 28 +- + drivers/rtc/rtc-pcf85063.c | 446 ++++++++++++++++----- + drivers/rtc/rtc-pcf85363.c | 20 +- + drivers/rtc/rtc-ps3.c | 30 +- + drivers/rtc/rtc-pxa.c | 3 +- + drivers/rtc/rtc-rk808.c | 6 +- + drivers/rtc/rtc-rx6110.c | 9 + + drivers/rtc/rtc-rx8025.c | 2 +- + drivers/rtc/rtc-sh.c | 30 +- + drivers/rtc/rtc-sirfsoc.c | 2 +- + drivers/rtc/rtc-snvs.c | 48 +-- + drivers/rtc/rtc-stm32.c | 9 +- + drivers/rtc/rtc-stmp3xxx.c | 34 +- + drivers/rtc/rtc-sun4v.c | 21 +- + drivers/rtc/rtc-tegra.c | 47 +-- + drivers/rtc/rtc-test.c | 11 +- + drivers/rtc/rtc-tx4939.c | 17 +- + drivers/rtc/rtc-wm831x.c | 69 ++-- + drivers/rtc/rtc-wm8350.c | 12 +- + drivers/rtc/rtc-x1205.c | 7 + + drivers/rtc/rtc-xgene.c | 61 ++- + drivers/rtc/rtc-zynqmp.c | 13 +- + drivers/rtc/sysfs.c | 23 +- + drivers/rtc/systohc.c | 13 +- + include/linux/rtc.h | 6 +- + include/linux/rtc/ds1685.h | 2 - + net/tls/tls_device.c | 5 +- + net/tls/tls_sw.c | 30 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +- + .../selftests/bpf/prog_tests/task_fd_query_tp.c | 2 +- + .../selftests/bpf/prog_tests/tp_attach_query.c | 3 + + 75 files changed, 1444 insertions(+), 1525 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-aspeed.txt + create mode 100644 drivers/rtc/rtc-aspeed.c +$ git am -3 ../patches/0001-xfrm4-fix-up-for-moved-_decode_session4.patch +Applying: xfrm4: fix up for moved _decode_session4 +$ git reset HEAD^ +Unstaged changes after reset: +M net/xfrm/xfrm_policy.c +$ git add -A . +$ git commit -v -a --amend +[master 9c75f2096a10] Merge remote-tracking branch 'net-next/master' + Date: Fri May 10 10:42:28 2019 +1000 +Merging bpf-next/master (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge bpf-next/master +Already up to date. +Merging ipsec-next/master (bb9cd077e216 xfrm: remove unneeded export_symbols) +$ git merge ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (91a40a48d52d net/mlx5: Fix broken hca cap offset) +$ git merge mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (54516da1ea85 Merge branch 'r8169-replace-some-magic-with-more-speaking-functions') +$ git merge netfilter-next/master +Already up to date. +Merging nfc-next/master (1f008cfec5d5 NFC: fdp: Fix unused variable warnings) +$ git merge nfc-next/master +Auto-merging net/nfc/netlink.c +Auto-merging drivers/nfc/st95hf/core.c +Auto-merging drivers/nfc/st21nfca/dep.c +Auto-merging drivers/nfc/fdp/i2c.c +Merge made by the 'recursive' strategy. + drivers/nfc/fdp/fdp.c | 35 +++++------------------------------ + drivers/nfc/fdp/i2c.c | 26 +++++++++++++------------- + drivers/nfc/st21nfca/dep.c | 3 ++- + drivers/nfc/st21nfca/se.c | 5 +++-- + drivers/nfc/st95hf/core.c | 7 ++----- + net/nfc/netlink.c | 6 ++++-- + 6 files changed, 29 insertions(+), 53 deletions(-) +Merging ipvs-next/master (e2f7cc72cbf4 netfilter: conntrack: fix bogus port values for other l4 protocols) +$ git merge ipvs-next/master +Already up to date. +Merging wireless-drivers-next/master (f9b628d61fae rtw88: add license for Makefile) +$ git merge wireless-drivers-next/master +Already up to date. +Merging bluetooth/master (62a91990f4c5 Bluetooth: hci_qca: Rename STATE_<flags> to QCA_<flags>) +$ git merge bluetooth/master +Already up to date. +Merging mac80211-next/master (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (f4686c26ecc3 gfs2: read journal in large chunks) +$ git merge gfs2/for-next +Already up to date. +Merging mtd/mtd/next (3008ba870938 mtd: part: fix incorrect format specifier for an unsigned long long) +$ git merge mtd/mtd/next +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Removing drivers/mtd/nand/raw/jz4780_nand.c +Removing drivers/mtd/nand/raw/jz4780_bch.h +Removing drivers/mtd/afs.c +Auto-merging arch/mips/configs/rbtx49xx_defconfig +Auto-merging arch/mips/configs/rb532_defconfig +Auto-merging arch/mips/configs/loongson1c_defconfig +Auto-merging arch/mips/configs/loongson1b_defconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm/configs/u300_defconfig +Auto-merging arch/arm/configs/sama5_defconfig +Auto-merging arch/arm/configs/qcom_defconfig +Auto-merging arch/arm/configs/pxa_defconfig +Auto-merging arch/arm/configs/omap1_defconfig +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/multi_v4t_defconfig +Auto-merging arch/arm/configs/mini2440_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/configs/clps711x_defconfig +Auto-merging arch/arm/configs/at91_dt_defconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/mtd/sunxi-nand.txt +Removing Documentation/devicetree/bindings/mtd/nand.txt +Merge made by the 'recursive' strategy. + .../bindings/memory-controllers/atmel,ebi.txt | 1 + + .../bindings/mtd/allwinner,sun4i-a10-nand.yaml | 97 ++ + .../devicetree/bindings/mtd/atmel-nand.txt | 1 + + .../devicetree/bindings/mtd/denali-nand.txt | 40 +- + .../bindings/mtd/ingenic,jz4780-nand.txt | 32 +- + .../devicetree/bindings/mtd/mtd-physmap.txt | 16 + + .../devicetree/bindings/mtd/nand-controller.yaml | 143 +++ + Documentation/devicetree/bindings/mtd/nand.txt | 75 -- + .../mtd/partitions/arm,arm-firmware-suite.txt | 17 + + .../brcm,bcm963xx-cfe-nor-partitions.txt | 24 + + .../mtd/partitions/brcm,bcm963xx-imagetag.txt | 45 + + .../devicetree/bindings/mtd/sunxi-nand.txt | 48 - + MAINTAINERS | 18 +- + arch/arm/configs/at91_dt_defconfig | 2 +- + arch/arm/configs/clps711x_defconfig | 2 +- + arch/arm/configs/cm_x2xx_defconfig | 2 +- + arch/arm/configs/cm_x300_defconfig | 2 +- + arch/arm/configs/colibri_pxa270_defconfig | 2 +- + arch/arm/configs/corgi_defconfig | 2 +- + arch/arm/configs/davinci_all_defconfig | 2 +- + arch/arm/configs/em_x270_defconfig | 2 +- + arch/arm/configs/ep93xx_defconfig | 2 +- + arch/arm/configs/eseries_pxa_defconfig | 2 +- + arch/arm/configs/imx_v4_v5_defconfig | 2 +- + arch/arm/configs/imx_v6_v7_defconfig | 2 +- + arch/arm/configs/ixp4xx_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lpc32xx_defconfig | 2 +- + arch/arm/configs/mini2440_defconfig | 2 +- + arch/arm/configs/mmp2_defconfig | 2 +- + arch/arm/configs/multi_v4t_defconfig | 2 +- + arch/arm/configs/multi_v5_defconfig | 2 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm/configs/mv78xx0_defconfig | 2 +- + arch/arm/configs/mvebu_v5_defconfig | 2 +- + arch/arm/configs/mvebu_v7_defconfig | 2 +- + arch/arm/configs/mxs_defconfig | 2 +- + arch/arm/configs/nhk8815_defconfig | 4 +- + arch/arm/configs/omap1_defconfig | 2 +- + arch/arm/configs/omap2plus_defconfig | 4 +- + arch/arm/configs/orion5x_defconfig | 2 +- + arch/arm/configs/oxnas_v6_defconfig | 2 +- + arch/arm/configs/pxa3xx_defconfig | 2 +- + arch/arm/configs/pxa_defconfig | 4 +- + arch/arm/configs/qcom_defconfig | 2 +- + arch/arm/configs/s3c2410_defconfig | 2 +- + arch/arm/configs/s3c6400_defconfig | 2 +- + arch/arm/configs/sama5_defconfig | 2 +- + arch/arm/configs/socfpga_defconfig | 2 +- + arch/arm/configs/spear13xx_defconfig | 2 +- + arch/arm/configs/spear3xx_defconfig | 2 +- + arch/arm/configs/spear6xx_defconfig | 2 +- + arch/arm/configs/spitz_defconfig | 2 +- + arch/arm/configs/tango4_defconfig | 2 +- + arch/arm/configs/trizeps4_defconfig | 2 +- + arch/arm/configs/u300_defconfig | 2 +- + arch/arm64/configs/defconfig | 2 +- + arch/mips/configs/bcm47xx_defconfig | 2 +- + arch/mips/configs/ci20_defconfig | 2 +- + arch/mips/configs/db1xxx_defconfig | 4 +- + arch/mips/configs/generic/board-ni169445.config | 6 +- + arch/mips/configs/generic/board-ocelot.config | 2 +- + arch/mips/configs/loongson1b_defconfig | 2 +- + arch/mips/configs/loongson1c_defconfig | 2 +- + arch/mips/configs/qi_lb60_defconfig | 2 +- + arch/mips/configs/rb532_defconfig | 2 +- + arch/mips/configs/rbtx49xx_defconfig | 2 +- + arch/mips/configs/xway_defconfig | 2 +- + arch/powerpc/configs/40x/kilauea_defconfig | 2 +- + arch/powerpc/configs/40x/obs600_defconfig | 2 +- + arch/powerpc/configs/44x/canyonlands_defconfig | 2 +- + arch/powerpc/configs/44x/eiger_defconfig | 2 +- + arch/powerpc/configs/44x/sequoia_defconfig | 2 +- + arch/powerpc/configs/44x/warp_defconfig | 2 +- + arch/powerpc/configs/83xx/mpc8313_rdb_defconfig | 2 +- + arch/powerpc/configs/83xx/mpc8315_rdb_defconfig | 2 +- + arch/powerpc/configs/85xx-hw.config | 2 +- + arch/powerpc/configs/85xx/ge_imp3a_defconfig | 2 +- + arch/powerpc/configs/85xx/socrates_defconfig | 2 +- + arch/powerpc/configs/85xx/tqm8548_defconfig | 4 +- + arch/powerpc/configs/85xx/xes_mpc85xx_defconfig | 2 +- + arch/powerpc/configs/86xx-hw.config | 2 +- + arch/powerpc/configs/mpc512x_defconfig | 2 +- + arch/powerpc/configs/mpc83xx_defconfig | 2 +- + arch/powerpc/configs/pasemi_defconfig | 2 +- + arch/powerpc/configs/ppc44x_defconfig | 2 +- + arch/sh/configs/ap325rxa_defconfig | 2 +- + arch/sh/configs/ecovec24_defconfig | 2 +- + arch/sh/configs/migor_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 2 +- + arch/sh/configs/se7724_defconfig | 2 +- + arch/sh/configs/titan_defconfig | 2 +- + drivers/memory/atmel-ebi.c | 37 +- + drivers/mtd/Kconfig | 20 +- + drivers/mtd/Makefile | 1 - + drivers/mtd/afs.c | 266 ----- + drivers/mtd/bcm63xxpart.c | 163 +-- + drivers/mtd/chips/cfi_cmdset_0002.c | 2 + + drivers/mtd/chips/cfi_util.c | 6 + + drivers/mtd/devices/Kconfig | 2 +- + drivers/mtd/devices/phram.c | 2 + + drivers/mtd/lpddr/lpddr_cmds.c | 1 + + drivers/mtd/maps/Kconfig | 2 +- + drivers/mtd/maps/physmap-core.c | 2 + + drivers/mtd/maps/physmap-gemini.c | 2 +- + drivers/mtd/maps/uclinux.c | 8 +- + drivers/mtd/mtdpart.c | 2 +- + drivers/mtd/nand/Kconfig | 1 - + drivers/mtd/nand/core.c | 34 + + drivers/mtd/nand/onenand/onenand_base.c | 5 +- + drivers/mtd/nand/onenand/onenand_bbt.c | 3 - + drivers/mtd/nand/raw/Kconfig | 393 ++++--- + drivers/mtd/nand/raw/Makefile | 9 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 127 ++- + drivers/mtd/nand/raw/atmel/pmecc.c | 5 +- + drivers/mtd/nand/raw/atmel/pmecc.h | 6 +- + drivers/mtd/nand/raw/bcm47xxnflash/ops_bcm4706.c | 2 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 7 +- + drivers/mtd/nand/raw/denali.c | 1152 ++++++++++---------- + drivers/mtd/nand/raw/denali.h | 117 +- + drivers/mtd/nand/raw/denali_dt.c | 98 +- + drivers/mtd/nand/raw/denali_pci.c | 38 +- + drivers/mtd/nand/raw/diskonchip.c | 7 +- + drivers/mtd/nand/raw/fsl_elbc_nand.c | 201 ++-- + drivers/mtd/nand/raw/fsl_ifc_nand.c | 4 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-lib.c | 6 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 19 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 1 + + drivers/mtd/nand/raw/hisi504_nand.c | 2 +- + drivers/mtd/nand/raw/ingenic/Kconfig | 50 + + drivers/mtd/nand/raw/ingenic/Makefile | 7 + + drivers/mtd/nand/raw/ingenic/ingenic_ecc.c | 166 +++ + drivers/mtd/nand/raw/ingenic/ingenic_ecc.h | 83 ++ + drivers/mtd/nand/raw/ingenic/ingenic_nand.c | 530 +++++++++ + drivers/mtd/nand/raw/ingenic/jz4725b_bch.c | 295 +++++ + drivers/mtd/nand/raw/ingenic/jz4740_ecc.c | 197 ++++ + drivers/mtd/nand/raw/{ => ingenic}/jz4740_nand.c | 7 +- + drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.c | 182 +--- + drivers/mtd/nand/raw/internals.h | 3 +- + drivers/mtd/nand/raw/jz4780_bch.h | 43 - + drivers/mtd/nand/raw/jz4780_nand.c | 415 ------- + drivers/mtd/nand/raw/marvell_nand.c | 51 +- + drivers/mtd/nand/raw/meson_nand.c | 30 +- + drivers/mtd/nand/raw/mtk_nand.c | 4 +- + drivers/mtd/nand/raw/nand_amd.c | 19 +- + drivers/mtd/nand/raw/nand_base.c | 324 +++--- + drivers/mtd/nand/raw/nand_bbt.c | 73 +- + drivers/mtd/nand/raw/nand_esmt.c | 19 +- + drivers/mtd/nand/raw/nand_hynix.c | 94 +- + drivers/mtd/nand/raw/nand_jedec.c | 27 +- + drivers/mtd/nand/raw/nand_macronix.c | 2 +- + drivers/mtd/nand/raw/nand_micron.c | 16 +- + drivers/mtd/nand/raw/nand_onfi.c | 35 +- + drivers/mtd/nand/raw/nand_samsung.c | 46 +- + drivers/mtd/nand/raw/nand_toshiba.c | 21 +- + drivers/mtd/nand/raw/nandsim.c | 144 ++- + drivers/mtd/nand/raw/nuc900_nand.c | 3 +- + drivers/mtd/nand/raw/omap2.c | 4 +- + drivers/mtd/nand/raw/omap_elm.c | 4 + + drivers/mtd/nand/raw/qcom_nandc.c | 8 +- + drivers/mtd/nand/raw/sh_flctl.c | 13 +- + drivers/mtd/nand/raw/sunxi_nand.c | 90 +- + drivers/mtd/nand/raw/tegra_nand.c | 8 +- + drivers/mtd/nand/raw/vf610_nfc.c | 3 + + drivers/mtd/nand/spi/core.c | 169 +-- + drivers/mtd/nand/spi/gigadevice.c | 8 +- + drivers/mtd/nand/spi/macronix.c | 4 +- + drivers/mtd/nand/spi/micron.c | 2 +- + drivers/mtd/nand/spi/toshiba.c | 12 +- + drivers/mtd/nand/spi/winbond.c | 4 +- + drivers/mtd/parsers/Kconfig | 27 + + drivers/mtd/parsers/Makefile | 2 + + drivers/mtd/parsers/afs.c | 410 +++++++ + drivers/mtd/parsers/parser_imagetag.c | 222 ++++ + drivers/mtd/sm_ftl.c | 12 +- + drivers/mtd/spi-nor/intel-spi-pci.c | 1 + + drivers/mtd/spi-nor/intel-spi.c | 8 + + drivers/mtd/spi-nor/spi-nor.c | 10 +- + drivers/mtd/tests/mtd_nandecctest.c | 16 +- + include/linux/mtd/bbm.h | 14 +- + include/linux/mtd/nand.h | 32 +- + include/linux/mtd/nand_bch.h | 6 +- + include/linux/mtd/onenand.h | 3 + + include/linux/mtd/rawnand.h | 122 ++- + include/linux/mtd/spinand.h | 7 + + include/linux/platform_data/elm.h | 2 +- + include/soc/at91/atmel-sfr.h | 34 +- + 187 files changed, 4763 insertions(+), 2862 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/allwinner,sun4i-a10-nand.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/nand-controller.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/nand.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/arm,arm-firmware-suite.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-cfe-nor-partitions.txt + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/brcm,bcm963xx-imagetag.txt + delete mode 100644 Documentation/devicetree/bindings/mtd/sunxi-nand.txt + delete mode 100644 drivers/mtd/afs.c + create mode 100644 drivers/mtd/nand/raw/ingenic/Kconfig + create mode 100644 drivers/mtd/nand/raw/ingenic/Makefile + create mode 100644 drivers/mtd/nand/raw/ingenic/ingenic_ecc.c + create mode 100644 drivers/mtd/nand/raw/ingenic/ingenic_ecc.h + create mode 100644 drivers/mtd/nand/raw/ingenic/ingenic_nand.c + create mode 100644 drivers/mtd/nand/raw/ingenic/jz4725b_bch.c + create mode 100644 drivers/mtd/nand/raw/ingenic/jz4740_ecc.c + rename drivers/mtd/nand/raw/{ => ingenic}/jz4740_nand.c (98%) + rename drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.c (57%) + delete mode 100644 drivers/mtd/nand/raw/jz4780_bch.h + delete mode 100644 drivers/mtd/nand/raw/jz4780_nand.c + create mode 100644 drivers/mtd/parsers/afs.c + create mode 100644 drivers/mtd/parsers/parser_imagetag.c +Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface) +$ git merge nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (e43f53c22a93 spi-nor: intel-spi: Add support for Intel Comet Lake SPI serial flash) +$ git merge spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (e59f755ceb6d crypto: ccree - use a proper le32 type for le32 val) +$ git merge crypto/master +Already up to date. +Merging drm/drm-next (eb85d03e01c3 Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm/drm-next +Already up to date. +Merging amdgpu/drm-next (963040e6ae2d drm/amd/display: Make some functions static) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 57 ++- + .../amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} | 131 +++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h | 46 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 83 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.h | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 222 ++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 47 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 37 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 70 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 44 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 53 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 13 + + drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 431 +++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/df_v3_6.h | 17 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 369 +++++++++++++++--- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 24 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 1 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 15 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 8 + + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 131 +++++-- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/si.c | 13 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 77 +++- + drivers/gpu/drm/amd/amdgpu/soc15.h | 10 + + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 57 ++- + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 128 +++++- + drivers/gpu/drm/amd/amdgpu/vi.c | 13 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 19 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 25 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 29 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 28 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 79 ++-- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 51 +-- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.c | 78 +++- + drivers/gpu/drm/amd/display/dc/dce/dce_clk_mgr.h | 23 ++ + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 3 + + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 8 + + .../drm/amd/display/dc/dce110/dce110_resource.c | 5 + + .../display/dc/dce110/dce110_timing_generator.c | 5 + + .../display/dc/dce110/dce110_timing_generator.h | 5 + + .../display/dc/dce110/dce110_timing_generator_v.c | 5 + + .../drm/amd/display/dc/dce120/dce120_resource.c | 6 +- + .../display/dc/dce120/dce120_timing_generator.c | 7 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 7 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 78 +++- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 428 ++++++++++---------- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 16 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 39 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c | 47 ++- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 17 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 37 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 107 ++++- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 22 ++ + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 8 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 7 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 23 +- + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 5 + + .../drm/amd/display/include/bios_parser_types.h | 3 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 3 +- + .../gpu/drm/amd/display/include/set_mode_types.h | 5 +- + .../drm/amd/include/asic_reg/df/df_3_6_offset.h | 18 + + .../drm/amd/include/asic_reg/gc/gc_9_0_offset.h | 31 ++ + .../drm/amd/include/asic_reg/nbio/nbio_6_1_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_0_smn.h | 3 + + .../drm/amd/include/asic_reg/nbio/nbio_7_4_0_smn.h | 3 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 1 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 11 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 30 ++ + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 5 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 28 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 113 ++++-- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 53 ++- + drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 1 + + drivers/gpu/drm/amd/powerplay/inc/power_state.h | 7 + + drivers/gpu/drm/amd/powerplay/inc/pp_thermal.h | 12 +- + drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 1 + + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 23 +- + drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 2 + + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 2 + + .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 2 + + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 21 + + .../gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c | 2 + + drivers/gpu/drm/radeon/radeon_display.c | 4 +- + include/uapi/linux/kfd_ioctl.h | 8 + + 126 files changed, 3357 insertions(+), 802 deletions(-) + rename drivers/gpu/drm/amd/amdgpu/{amdgpu_prime.c => amdgpu_dma_buf.c} (93%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.h +Merging drm-intel/for-linux-next (23372cce8fe7 Merge tag 'gvt-next-fixes-2019-05-07' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/gvt/debugfs.c | 4 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 19 ++++------ + drivers/gpu/drm/i915/gvt/gtt.c | 15 +++++--- + drivers/gpu/drm/i915/gvt/gtt.h | 16 ++++---- + drivers/gpu/drm/i915/gvt/handlers.c | 4 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 1 + + drivers/gpu/drm/i915/gvt/reg.h | 3 -- + drivers/gpu/drm/i915/gvt/scheduler.c | 2 +- + drivers/gpu/drm/i915/i915_request.c | 59 +++++++++++++++++++++++++++++- + drivers/gpu/drm/i915/intel_context.c | 1 + + drivers/gpu/drm/i915/intel_context_types.h | 3 ++ + 11 files changed, 93 insertions(+), 34 deletions(-) +Merging drm-tegra/drm/tegra/for-next (61b51fb51c01 drm/tegra: gem: Fix CPU-cache maintenance for BO's allocated using get_pages()) +$ git merge drm-tegra/drm/tegra/for-next +Already up to date. +Merging drm-misc/for-linux-next (eb85d03e01c3 Merge tag 'drm-misc-next-fixes-2019-05-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge drm-misc/for-linux-next +Already up to date. +Merging drm-msm/msm-next (b02872df58ac drm/msm/a6xx: Don't enable GPU state code if dependencies are missing) +$ git merge drm-msm/msm-next +Already up to date. +Merging hdlcd/for-upstream/hdlcd (d664b851eb2b drm/arm/hdlcd: Reject atomic commits that disable only the plane) +$ git merge hdlcd/for-upstream/hdlcd +Already up to date. +Merging mali-dp/for-upstream/mali-dp (15e9122d9b5c drm/komeda: Mark the local functions as static) +$ git merge mali-dp/for-upstream/mali-dp +Already up to date. +Merging imx-drm/imx-drm/next (5d5fe9970c76 drm/imx: enable IDMAC watermark feature) +$ git merge imx-drm/imx-drm/next +Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/imx/ipuv3-plane.c | 1 + + 1 file changed, 1 insertion(+) +Merging etnaviv/etnaviv/next (2b76f5be7c27 drm/etnaviv: initialize idle mask before querying the HW db) +$ git merge etnaviv/etnaviv/next +Already up to date. +Merging kconfig/for-next (bebc6082da0a Linux 4.14) +$ git merge kconfig/for-next +Already up to date. +Merging regmap/for-next (615c4d9a50e2 Merge branch 'regmap-5.2' into regmap-next) +$ git merge regmap/for-next +Already up to date. +Merging sound/for-next (ed97c988bdc6 Merge tag 'asoc-v5.2-5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge sound/for-next +Already up to date. +Merging sound-asoc/for-next (898d2e8d8730 Merge branch 'asoc-5.2' into asoc-next) +$ git merge sound-asoc/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging modules/modules-next (dadec066d8fa module: add stubs for within_module functions) +$ git merge modules/modules-next +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +CONFLICT (content): Merge conflict in include/linux/module.h +Auto-merging include/asm-generic/vmlinux.lds.h +Resolved 'include/linux/module.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 3d8e771017ac] Merge remote-tracking branch 'modules/modules-next' +$ git diff -M --stat --summary HEAD^.. + include/asm-generic/vmlinux.lds.h | 1 - + include/linux/module.h | 12 ++++++++++++ + kernel/module-internal.h | 2 +- + kernel/module.c | 21 ++++++++++++++------- + 4 files changed, 27 insertions(+), 9 deletions(-) +Merging input/next (0981949da8f7 Input: libps2 - mark expected switch fall-through) +$ git merge input/next +Auto-merging include/uapi/linux/input-event-codes.h +Auto-merging drivers/input/touchscreen/Kconfig +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/input/keyboard/snvs_pwrkey.c +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/evdev.c +Auto-merging drivers/hid/hid-input.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 895e4ae35be8] Merge remote-tracking branch 'input/next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/gpio-vibrator.yaml | 37 + + .../devicetree/bindings/input/lpc32xx-key.txt | 5 +- + .../devicetree/bindings/input/microchip,qt1050.txt | 78 ++ + .../devicetree/bindings/input/sun4i-lradc-keys.txt | 6 +- + .../bindings/input/touchscreen/goodix.txt | 3 + + .../bindings/input/touchscreen/iqs5xx.txt | 80 ++ + .../devicetree/bindings/vendor-prefixes.txt | 1 + + drivers/hid/hid-input.c | 2 + + drivers/input/evdev.c | 7 +- + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/atkbd.c | 2 + + drivers/input/keyboard/qt1050.c | 598 +++++++++++ + drivers/input/keyboard/snvs_pwrkey.c | 30 +- + drivers/input/keyboard/sun4i-lradc-keys.c | 38 +- + drivers/input/misc/Kconfig | 12 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/gpio-vibra.c | 207 ++++ + drivers/input/mouse/psmouse-base.c | 2 + + drivers/input/rmi4/rmi_f54.c | 21 +- + drivers/input/serio/Kconfig | 1 + + drivers/input/serio/hyperv-keyboard.c | 2 + + drivers/input/serio/i8042.c | 3 - + drivers/input/serio/libps2.c | 1 + + drivers/input/touchscreen/Kconfig | 10 + + drivers/input/touchscreen/Makefile | 1 + + drivers/input/touchscreen/edt-ft5x06.c | 23 +- + drivers/input/touchscreen/goodix.c | 54 + + drivers/input/touchscreen/iqs5xx.c | 1133 ++++++++++++++++++++ + include/uapi/linux/input-event-codes.h | 1 + + 30 files changed, 2297 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/gpio-vibrator.yaml + create mode 100644 Documentation/devicetree/bindings/input/microchip,qt1050.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt + create mode 100644 drivers/input/keyboard/qt1050.c + create mode 100644 drivers/input/misc/gpio-vibra.c + create mode 100644 drivers/input/touchscreen/iqs5xx.c +Merging block/for-next (e35d0b782065 Merge branch 'for-5.2/block-post' into for-next) +$ git merge block/for-next +Merge made by the 'recursive' strategy. + drivers/ata/sata_rcar.c | 1 - + drivers/block/brd.c | 6 + + drivers/lightnvm/core.c | 82 +++++--- + drivers/lightnvm/pblk-cache.c | 8 +- + drivers/lightnvm/pblk-core.c | 65 ++++--- + drivers/lightnvm/pblk-gc.c | 52 +++--- + drivers/lightnvm/pblk-init.c | 65 +++---- + drivers/lightnvm/pblk-map.c | 1 + + drivers/lightnvm/pblk-rb.c | 13 +- + drivers/lightnvm/pblk-read.c | 394 +++++++++++---------------------------- + drivers/lightnvm/pblk-recovery.c | 74 +++++--- + drivers/lightnvm/pblk-write.c | 1 + + drivers/lightnvm/pblk.h | 28 +-- + drivers/nvme/host/lightnvm.c | 1 + + drivers/s390/block/dasd_eckd.c | 2 +- + include/linux/lightnvm.h | 2 + + 16 files changed, 333 insertions(+), 462 deletions(-) +Merging device-mapper/for-next (05d6909ea9d6 dm integrity: whitespace, coding style and dead code cleanup) +$ git merge device-mapper/for-next +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-exception-store.h +Auto-merging drivers/md/dm-crypt.c +Merge made by the 'recursive' strategy. + Documentation/device-mapper/dm-dust.txt | 272 +++++++++ + Documentation/device-mapper/dm-integrity.txt | 32 +- + drivers/md/Kconfig | 9 + + drivers/md/Makefile | 1 + + drivers/md/dm-cache-metadata.c | 9 +- + drivers/md/dm-crypt.c | 8 +- + drivers/md/dm-delay.c | 3 +- + drivers/md/dm-dust.c | 515 ++++++++++++++++ + drivers/md/dm-exception-store.h | 3 +- + drivers/md/dm-init.c | 8 +- + drivers/md/dm-integrity.c | 717 ++++++++++++++++++++--- + drivers/md/dm-mpath.c | 19 +- + drivers/md/dm-rq.c | 8 +- + drivers/md/dm-snap.c | 359 ++++++++---- + drivers/md/dm-target.c | 3 +- + drivers/md/dm-thin-metadata.c | 139 +++-- + drivers/md/dm-writecache.c | 29 +- + drivers/md/dm-zoned-metadata.c | 5 + + drivers/md/dm-zoned-target.c | 3 +- + drivers/md/dm.c | 6 +- + drivers/md/persistent-data/dm-space-map-common.c | 2 + + include/linux/device-mapper.h | 3 +- + include/linux/list.h | 2 +- + include/linux/list_bl.h | 26 + + 24 files changed, 1895 insertions(+), 286 deletions(-) + create mode 100644 Documentation/device-mapper/dm-dust.txt + create mode 100644 drivers/md/dm-dust.c +Merging pcmcia/pcmcia-next (95691e3eddc4 pcmcia: Implement CLKRUN protocol disabling for Ricoh bridges) +$ git merge pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (0a49a619e7e1 mmc: sdhci-pci: Fix BYT OCP setting) +$ git merge mmc/next +Already up to date. +Merging kgdb/kgdb-next (3bd67b37e350 kdb: print real address of pointers instead of hashed addresses) +$ git merge kgdb/kgdb-next +Auto-merging kernel/debug/kdb/kdb_support.c +Auto-merging kernel/debug/kdb/kdb_main.c +Auto-merging kernel/debug/kdb/kdb_bt.c +CONFLICT (content): Merge conflict in kernel/debug/kdb/kdb_bt.c +Resolved 'kernel/debug/kdb/kdb_bt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 0c40d56f70d6] Merge remote-tracking branch 'kgdb/kgdb-next' +$ git diff -M --stat --summary HEAD^.. +Merging md/for-next (e820d55cb99d md: fix raid10 hang issue caused by barrier) +$ git merge md/for-next +Already up to date. +Merging mfd/for-mfd-next (160f839373c4 mfd: Add ST Multi-Function eXpander (STMFX) core driver) +$ git merge mfd/for-mfd-next +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/staging/olpc_dcon/Kconfig +Auto-merging drivers/mfd/intel-lpss.c +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/input/misc/Makefile +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/gpu/drm/nouveau/Kconfig +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/unicore32/Kconfig +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +Auto-merging arch/arm/configs/socfpga_defconfig +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 5d2f6a95a5de] Merge remote-tracking branch 'mfd/for-mfd-next' +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/altera/socfpga-system.txt | 12 + + .../devicetree/bindings/arm/stm32/stm32-syscon.txt | 2 + + .../devicetree/bindings/input/max77650-onkey.txt | 26 + + .../devicetree/bindings/leds/leds-max77650.txt | 57 +++ + .../devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + + .../devicetree/bindings/mfd/cirrus,lochnagar.txt | 17 + + Documentation/devicetree/bindings/mfd/max77620.txt | 9 +- + Documentation/devicetree/bindings/mfd/max77650.txt | 46 ++ + Documentation/devicetree/bindings/mfd/stmfx.txt | 28 ++ + Documentation/devicetree/bindings/mfd/ti-lmu.txt | 4 +- + .../bindings/power/supply/max77650-charger.txt | 28 ++ + MAINTAINERS | 20 + + arch/arm/configs/socfpga_defconfig | 1 + + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 2 +- + arch/arm64/configs/defconfig | 1 + + arch/unicore32/Kconfig | 1 - + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-max77650.c | 190 +++++++ + drivers/gpu/drm/Kconfig | 2 - + drivers/gpu/drm/bridge/Kconfig | 1 - + drivers/gpu/drm/fsl-dcu/Kconfig | 1 - + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/nouveau/Kconfig | 2 - + drivers/gpu/drm/shmobile/Kconfig | 1 - + drivers/gpu/drm/tilcdc/Kconfig | 1 - + drivers/input/misc/Kconfig | 9 + + drivers/input/misc/Makefile | 1 + + drivers/input/misc/max77650-onkey.c | 121 +++++ + drivers/leds/Kconfig | 6 + + drivers/leds/Makefile | 1 + + drivers/leds/leds-max77650.c | 147 ++++++ + drivers/mfd/Kconfig | 99 ++-- + drivers/mfd/Makefile | 4 +- + drivers/mfd/ab8500-debugfs.c | 2 +- + drivers/mfd/altera-sysmgr.c | 211 ++++++++ + drivers/mfd/atmel-hlcdc.c | 1 + + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x.c | 16 + + drivers/mfd/cros_ec.c | 39 +- + drivers/mfd/cros_ec_dev.c | 36 +- + drivers/mfd/cs47l35-tables.c | 2 + + drivers/mfd/cs47l90-tables.c | 2 + + drivers/mfd/da9063-core.c | 28 +- + drivers/mfd/da9063-i2c.c | 10 +- + drivers/mfd/da9063-irq.c | 10 +- + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/intel-lpss.c | 3 + + drivers/mfd/intel_quark_i2c_gpio.c | 10 - + drivers/mfd/intel_soc_pmic_chtwc.c | 1 + + drivers/mfd/max77620.c | 87 +++- + drivers/mfd/max77650.c | 232 +++++++++ + drivers/mfd/mfd-core.c | 13 + + drivers/mfd/rk808.c | 9 - + drivers/mfd/sec-core.c | 59 +-- + drivers/mfd/sec-irq.c | 3 + + drivers/mfd/stmfx.c | 545 +++++++++++++++++++++ + drivers/mfd/sun6i-prcm.c | 3 +- + drivers/mfd/syscon.c | 19 + + drivers/mfd/tps65912-spi.c | 1 + + drivers/mfd/twl6040.c | 13 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 5 +- + drivers/platform/chrome/cros_ec_proto.c | 6 + + drivers/power/supply/Kconfig | 7 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/max77650-charger.c | 368 ++++++++++++++ + drivers/staging/olpc_dcon/Kconfig | 1 - + drivers/usb/misc/Kconfig | 1 - + drivers/video/backlight/Kconfig | 10 +- + drivers/video/fbdev/Kconfig | 5 - + include/linux/mfd/altera-sysmgr.h | 29 ++ + include/linux/mfd/cros_ec.h | 5 + + include/linux/mfd/cros_ec_commands.h | 91 +++- + include/linux/mfd/da9063/core.h | 7 +- + include/linux/mfd/da9063/registers.h | 13 +- + include/linux/mfd/max77620.h | 5 +- + include/linux/mfd/max77650.h | 59 +++ + include/linux/mfd/stmfx.h | 123 +++++ + include/linux/mfd/syscon/atmel-matrix.h | 6 +- + include/linux/mfd/syscon/atmel-mc.h | 6 +- + include/linux/mfd/syscon/atmel-smc.h | 5 +- + include/linux/mfd/syscon/atmel-st.h | 6 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 9 + + 83 files changed, 2779 insertions(+), 209 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/max77650-onkey.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-max77650.txt + create mode 100644 Documentation/devicetree/bindings/mfd/max77650.txt + create mode 100644 Documentation/devicetree/bindings/mfd/stmfx.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/max77650-charger.txt + create mode 100644 drivers/gpio/gpio-max77650.c + create mode 100644 drivers/input/misc/max77650-onkey.c + create mode 100644 drivers/leds/leds-max77650.c + create mode 100644 drivers/mfd/altera-sysmgr.c + create mode 100644 drivers/mfd/max77650.c + create mode 100644 drivers/mfd/stmfx.c + create mode 100644 drivers/power/supply/max77650-charger.c + create mode 100644 include/linux/mfd/altera-sysmgr.h + create mode 100644 include/linux/mfd/max77650.h + create mode 100644 include/linux/mfd/stmfx.h +Merging backlight/for-backlight-next (53fa0f87177d backlight: lm3630a: Add firmware node support) +$ git merge backlight/for-backlight-next +Auto-merging drivers/video/backlight/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/leds/backlight/lm3630a-backlight.yaml | 129 +++++++++++++++++ + drivers/video/backlight/Kconfig | 25 ++-- + drivers/video/backlight/lm3630a_bl.c | 153 ++++++++++++++++++++- + include/linux/platform_data/lm3630a_bl.h | 4 + + 4 files changed, 291 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/lm3630a-backlight.yaml +Merging battery/for-next (09eb8b7c5adc power: supply: ucs1002: Fix wrong return value checking) +$ git merge battery/for-next +Auto-merging drivers/power/supply/power_supply_sysfs.c +Auto-merging drivers/power/supply/Makefile +Auto-merging drivers/power/supply/Kconfig +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-class-power | 51 +- + .../devicetree/bindings/arm/atmel-sysregs.txt | 5 +- + .../bindings/power/reset/syscon-reboot.txt | 11 +- + .../bindings/power/supply/axp20x_usb_power.txt | 1 + + .../bindings/power/supply/gpio-charger.txt | 8 +- + .../bindings/power/supply/ingenic,battery.txt | 31 + + .../{ltc3651-charger.txt => lt3651-charger.txt} | 10 +- + .../bindings/power/supply/microchip,ucs1002.txt | 27 + + .../bindings/power/supply/olpc_battery.txt | 2 +- + arch/x86/platform/olpc/olpc_dt.c | 101 +++- + drivers/iio/inkern.c | 22 +- + drivers/power/reset/at91-sama5d2_shdwc.c | 25 + + drivers/power/reset/syscon-reboot.c | 19 +- + drivers/power/supply/Kconfig | 28 +- + drivers/power/supply/Makefile | 4 +- + drivers/power/supply/ab8500_bmdata.c | 1 + + drivers/power/supply/axp20x_usb_power.c | 179 +++++- + drivers/power/supply/axp288_charger.c | 4 + + drivers/power/supply/axp288_fuel_gauge.c | 20 + + drivers/power/supply/bq27xxx_battery.c | 3 +- + drivers/power/supply/charger-manager.c | 3 + + drivers/power/supply/cpcap-battery.c | 44 +- + drivers/power/supply/cpcap-charger.c | 5 +- + drivers/power/supply/gpio-charger.c | 57 +- + drivers/power/supply/ingenic-battery.c | 184 ++++++ + .../supply/{ltc3651-charger.c => lt3651-charger.c} | 123 ++-- + drivers/power/supply/max14656_charger_detector.c | 27 +- + drivers/power/supply/olpc_battery.c | 169 ++++-- + drivers/power/supply/power_supply_core.c | 38 +- + drivers/power/supply/power_supply_sysfs.c | 6 +- + drivers/power/supply/ucs1002_power.c | 646 +++++++++++++++++++++ + include/linux/iio/consumer.h | 14 + + include/linux/power_supply.h | 11 +- + 33 files changed, 1609 insertions(+), 270 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/ingenic,battery.txt + rename Documentation/devicetree/bindings/power/supply/{ltc3651-charger.txt => lt3651-charger.txt} (71%) + create mode 100644 Documentation/devicetree/bindings/power/supply/microchip,ucs1002.txt + create mode 100644 drivers/power/supply/ingenic-battery.c + rename drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c} (50%) + create mode 100644 drivers/power/supply/ucs1002_power.c +Merging regulator/for-next (e2a23affe6a6 Merge branch 'regulator-5.2' into regulator-next) +$ git merge regulator/for-next +Already up to date. +Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing) +$ git merge security/next-testing +Auto-merging security/keys/trusted.c +Merge made by the 'recursive' strategy. + security/tomoyo/Kconfig | 10 ++++++++++ + security/tomoyo/common.c | 13 ++++++++++++- + security/tomoyo/network.c | 4 ++++ + security/tomoyo/realpath.c | 3 ++- + 4 files changed, 28 insertions(+), 2 deletions(-) +Merging apparmor/apparmor-next (058c4f342582 apparmor: fix spelling mistake "immutible" -> "immutable") +$ git merge apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Merge made by the 'recursive' strategy. + security/apparmor/Kconfig | 2 + + security/apparmor/apparmorfs.c | 130 ++++++++++++++++++++++++++++-- + security/apparmor/include/apparmor.h | 1 + + security/apparmor/include/policy_unpack.h | 8 +- + security/apparmor/lsm.c | 47 +++++++++++ + security/apparmor/policy.c | 5 +- + security/apparmor/policy_unpack.c | 116 +++++++++++++++++++++++++- + 7 files changed, 296 insertions(+), 13 deletions(-) +Merging integrity/next-integrity (a2ffe5774e8e selftests/kexec: update get_secureboot_mode) +$ git merge integrity/next-integrity +Auto-merging tools/testing/selftests/kexec/Makefile +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'recursive' strategy. +Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials) +$ git merge selinux/next +Already up to date. +Merging tpmdd/next (ff89e2f4b34d tpm: Actually fail on TPM errors during "get random") +$ git merge tpmdd/next +Auto-merging security/keys/trusted.c +Merge made by the 'recursive' strategy. + drivers/char/tpm/tpm1-cmd.c | 7 +++++-- + drivers/char/tpm/tpm2-cmd.c | 7 +++++-- + 2 files changed, 10 insertions(+), 4 deletions(-) +Merging watchdog/master (a9f0bda567e3 watchdog: Enforce that at least one pretimeout governor is enabled) +$ git merge watchdog/master +Auto-merging drivers/watchdog/sbsa_gwdt.c +Auto-merging drivers/watchdog/sb_wdog.c +Auto-merging drivers/watchdog/nuc900_wdt.c +Auto-merging drivers/watchdog/machzwd.c +Auto-merging drivers/watchdog/intel_scu_watchdog.c +Auto-merging drivers/watchdog/f71808e_wdt.c +Auto-merging drivers/watchdog/ath79_wdt.c +Auto-merging drivers/watchdog/alim7101_wdt.c +Merge made by the 'recursive' strategy. + .../bindings/watchdog/fsl-imx-sc-wdt.txt | 24 ++ + drivers/watchdog/Kconfig | 161 +++++++----- + drivers/watchdog/Makefile | 2 + + drivers/watchdog/alim7101_wdt.c | 2 +- + drivers/watchdog/armada_37xx_wdt.c | 43 +-- + drivers/watchdog/asm9260_wdt.c | 77 +++--- + drivers/watchdog/aspeed_wdt.c | 25 +- + drivers/watchdog/at91sam9_wdt.c | 4 +- + drivers/watchdog/ath79_wdt.c | 4 +- + drivers/watchdog/atlas7_wdt.c | 65 ++--- + drivers/watchdog/bcm2835_wdt.c | 1 - + drivers/watchdog/bcm7038_wdt.c | 42 +-- + drivers/watchdog/bcm_kona_wdt.c | 18 +- + drivers/watchdog/bd70528_wdt.c | 290 +++++++++++++++++++++ + drivers/watchdog/cadence_wdt.c | 90 ++----- + drivers/watchdog/coh901327_wdt.c | 28 +- + drivers/watchdog/da9052_wdt.c | 13 +- + drivers/watchdog/da9055_wdt.c | 12 +- + drivers/watchdog/da9062_wdt.c | 20 +- + drivers/watchdog/da9063_wdt.c | 21 +- + drivers/watchdog/davinci_wdt.c | 45 ++-- + drivers/watchdog/digicolor_wdt.c | 4 +- + drivers/watchdog/dw_wdt.c | 4 +- + drivers/watchdog/ebc-c384_wdt.c | 5 +- + drivers/watchdog/ep93xx_wdt.c | 17 +- + drivers/watchdog/f71808e_wdt.c | 18 +- + drivers/watchdog/ftwdt010_wdt.c | 6 +- + drivers/watchdog/gpio_wdt.c | 16 +- + drivers/watchdog/hpwdt.c | 3 +- + drivers/watchdog/i6300esb.c | 9 +- + drivers/watchdog/iTCO_wdt.c | 13 +- + drivers/watchdog/imgpdc_wdt.c | 95 +++---- + drivers/watchdog/imx2_wdt.c | 8 +- + drivers/watchdog/imx_sc_wdt.c | 175 +++++++++++++ + drivers/watchdog/intel-mid_wdt.c | 22 +- + drivers/watchdog/intel_scu_watchdog.c | 20 +- + drivers/watchdog/jz4740_wdt.c | 17 +- + drivers/watchdog/kempld_wdt.c | 28 +- + drivers/watchdog/lantiq_wdt.c | 4 +- + drivers/watchdog/loongson1_wdt.c | 52 ++-- + drivers/watchdog/lpc18xx_wdt.c | 47 ++-- + drivers/watchdog/machzwd.c | 3 +- + drivers/watchdog/max63xx_wdt.c | 24 +- + drivers/watchdog/max77620_wdt.c | 23 +- + drivers/watchdog/mena21_wdt.c | 28 +- + drivers/watchdog/menf21bmc_wdt.c | 33 +-- + drivers/watchdog/meson_gxbb_wdt.c | 49 ++-- + drivers/watchdog/meson_wdt.c | 19 +- + drivers/watchdog/mlx_wdt.c | 14 +- + drivers/watchdog/moxart_wdt.c | 20 +- + drivers/watchdog/mpc8xxx_wdt.c | 20 +- + drivers/watchdog/mt7621_wdt.c | 12 +- + drivers/watchdog/mtk_wdt.c | 37 +-- + drivers/watchdog/ni903x_wdt.c | 4 +- + drivers/watchdog/nic7018_wdt.c | 5 +- + drivers/watchdog/npcm_wdt.c | 10 +- + drivers/watchdog/nuc900_wdt.c | 4 +- + drivers/watchdog/of_xilinx_wdt.c | 62 ++--- + drivers/watchdog/omap_wdt.c | 4 +- + drivers/watchdog/orion_wdt.c | 14 +- + drivers/watchdog/pic32-dmt.c | 50 ++-- + drivers/watchdog/pic32-wdt.c | 62 ++--- + drivers/watchdog/pm8916_wdt.c | 21 +- + drivers/watchdog/pnx4008_wdt.c | 45 ++-- + drivers/watchdog/qcom-wdt.c | 55 ++-- + drivers/watchdog/renesas_wdt.c | 9 +- + drivers/watchdog/rn5t618_wdt.c | 9 +- + drivers/watchdog/rt2880_wdt.c | 32 +-- + drivers/watchdog/rtd119x_wdt.c | 47 ++-- + drivers/watchdog/rza_wdt.c | 25 +- + drivers/watchdog/s3c2410_wdt.c | 4 +- + drivers/watchdog/sama5d4_wdt.c | 39 +-- + drivers/watchdog/sb_wdog.c | 4 +- + drivers/watchdog/sbsa_gwdt.c | 28 +- + drivers/watchdog/shwdt.c | 4 +- + drivers/watchdog/sirfsoc_wdt.c | 28 +- + drivers/watchdog/sp5100_tco.c | 4 +- + drivers/watchdog/sprd_wdt.c | 42 ++- + drivers/watchdog/st_lpc_wdt.c | 53 ++-- + drivers/watchdog/stm32_iwdg.c | 150 +++++------ + drivers/watchdog/stmp3xxx_rtc_wdt.c | 16 +- + drivers/watchdog/stpmic1_wdt.c | 13 +- + drivers/watchdog/sunxi_wdt.c | 19 +- + drivers/watchdog/tangox_wdt.c | 41 ++- + drivers/watchdog/tegra_wdt.c | 30 +-- + drivers/watchdog/tqmx86_wdt.c | 14 +- + drivers/watchdog/ts4800_wdt.c | 33 +-- + drivers/watchdog/ts72xx_wdt.c | 18 +- + drivers/watchdog/twl4030_wdt.c | 22 +- + drivers/watchdog/txx9wdt.c | 4 +- + drivers/watchdog/uniphier_wdt.c | 2 - + drivers/watchdog/ux500_wdt.c | 17 +- + drivers/watchdog/watchdog_core.c | 42 ++- + drivers/watchdog/wdat_wdt.c | 29 ++- + drivers/watchdog/wm831x_wdt.c | 19 +- + drivers/watchdog/xen_wdt.c | 18 +- + drivers/watchdog/ziirave_wdt.c | 6 +- + drivers/watchdog/zx2967_wdt.c | 37 +-- + 98 files changed, 1489 insertions(+), 1537 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/fsl-imx-sc-wdt.txt + create mode 100644 drivers/watchdog/bd70528_wdt.c + create mode 100644 drivers/watchdog/imx_sc_wdt.c +Merging iommu/next (b5531563e8a0 Merge branches 'arm/tegra', 'arm/mediatek', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge iommu/next +Auto-merging include/linux/pci.h +Auto-merging drivers/iommu/intel_irq_remapping.c +Auto-merging drivers/iommu/intel-iommu.c +Auto-merging drivers/iommu/amd_iommu.c +Auto-merging drivers/acpi/arm64/iort.c +Merge made by the 'recursive' strategy. + drivers/acpi/arm64/iort.c | 11 + + drivers/iommu/Kconfig | 25 ++ + drivers/iommu/amd_iommu.c | 52 +--- + drivers/iommu/amd_iommu_init.c | 8 - + drivers/iommu/amd_iommu_types.h | 6 - + drivers/iommu/arm-smmu-regs.h | 2 + + drivers/iommu/arm-smmu-v3.c | 355 +++++++++++++++++----- + drivers/iommu/arm-smmu.c | 11 +- + drivers/iommu/dmar.c | 2 +- + drivers/iommu/intel-iommu.c | 584 ++++++++++++++++++++++++++++-------- + drivers/iommu/intel-pasid.c | 4 +- + drivers/iommu/intel-svm.c | 19 +- + drivers/iommu/intel_irq_remapping.c | 7 +- + drivers/iommu/iommu.c | 211 ++++++++++++- + drivers/iommu/mtk_iommu.c | 8 +- + drivers/iommu/tegra-smmu.c | 41 ++- + drivers/vfio/mdev/mdev_core.c | 18 ++ + drivers/vfio/mdev/mdev_private.h | 1 + + drivers/vfio/vfio_iommu_type1.c | 139 +++++++-- + include/linux/intel-iommu.h | 13 +- + include/linux/iommu.h | 144 +++++++++ + include/linux/iova.h | 16 +- + include/linux/mdev.h | 14 + + include/linux/pci.h | 31 +- + 24 files changed, 1376 insertions(+), 346 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (15c80c1659f2 vfio: Add Cornelia Huck as reviewer) +$ git merge vfio/next +Auto-merging include/linux/pci.h +Auto-merging include/linux/mdev.h +Auto-merging drivers/vfio/mdev/mdev_private.h +Auto-merging drivers/vfio/mdev/mdev_core.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 1 + + drivers/vfio/mdev/mdev_core.c | 18 +++---- + drivers/vfio/mdev/mdev_private.h | 1 - + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/vfio_pci.c | 23 ++++----- + drivers/vfio/pci/vfio_pci_config.c | 29 +++++------ + drivers/vfio/pci/vfio_pci_nvlink2.c | 2 + + .../vfio/platform/reset/vfio_platform_amdxgbe.c | 5 +- + drivers/vfio/platform/vfio_platform_common.c | 12 +++-- + drivers/vfio/vfio.c | 59 +++++++++------------- + include/linux/mdev.h | 21 ++++---- + include/linux/pci.h | 3 ++ + 12 files changed, 81 insertions(+), 95 deletions(-) +Merging trivial/for-next (75a24b822d38 kfifo: fix inaccurate comment) +$ git merge trivial/for-next +Already up to date. +Merging audit/next (70c4cf17e445 audit: fix a memory leak bug) +$ git merge audit/next +Already up to date. +Merging devicetree/for-next (2a656cb5a4a3 of: unittest: Remove error printing on OOM) +$ git merge devicetree/for-next +Already up to date. +Merging mailbox/mailbox-for-next (8fbbfd966efa mailbox: Add support for Armada 37xx rWTM mailbox) +$ git merge mailbox/mailbox-for-next +Merge made by the 'recursive' strategy. + .../mailbox/marvell,armada-3700-rwtm-mailbox.txt | 16 ++ + drivers/mailbox/Kconfig | 10 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/armada-37xx-rwtm-mailbox.c | 225 +++++++++++++++++++++ + drivers/mailbox/imx-mailbox.c | 4 +- + drivers/mailbox/stm32-ipcc.c | 13 +- + include/linux/armada-37xx-rwtm-mailbox.h | 23 +++ + 7 files changed, 285 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/marvell,armada-3700-rwtm-mailbox.txt + create mode 100644 drivers/mailbox/armada-37xx-rwtm-mailbox.c + create mode 100644 include/linux/armada-37xx-rwtm-mailbox.h +Merging spi/for-next (e40f7182cbdb Merge branch 'spi-5.2' into spi-next) +$ git merge spi/for-next +Merge made by the 'recursive' strategy. + drivers/spi/spi.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging tip/auto-latest (f8d6805068ad Merge branch 'WIP.x86/fpu' into auto-latest) +$ git merge tip/auto-latest +Auto-merging include/linux/overflow.h +Auto-merging include/linux/msi.h +Auto-merging drivers/soc/ti/Kconfig +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/irq-gic-v2m.c +Auto-merging drivers/irqchip/Makefile +Auto-merging drivers/irqchip/Kconfig +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/iommu/Kconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/keystone/ti,sci.txt | 3 +- + .../bindings/interrupt-controller/ti,sci-inta.txt | 66 +++ + .../bindings/interrupt-controller/ti,sci-intr.txt | 82 +++ + MAINTAINERS | 6 + + arch/arm64/Kconfig.platforms | 5 + + arch/x86/entry/vdso/vdso2c.c | 3 - + arch/x86/include/asm/vdso.h | 1 - + arch/x86/kernel/kprobes/core.c | 2 +- + drivers/firmware/ti_sci.c | 651 +++++++++++++++++++++ + drivers/firmware/ti_sci.h | 102 ++++ + drivers/gpio/gpio-thunderx.c | 16 +- + drivers/iommu/Kconfig | 1 + + drivers/iommu/dma-iommu.c | 48 +- + drivers/irqchip/Kconfig | 27 +- + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-bcm7038-l1.c | 3 + + drivers/irqchip/irq-bcm7120-l2.c | 3 + + drivers/irqchip/irq-brcmstb-l2.c | 2 + + drivers/irqchip/irq-gic-pm.c | 76 +-- + drivers/irqchip/irq-gic-v2m.c | 8 +- + drivers/irqchip/irq-gic-v3-its.c | 84 +-- + drivers/irqchip/irq-gic-v3-mbi.c | 10 +- + drivers/irqchip/irq-imx-irqsteer.c | 4 +- + drivers/irqchip/irq-ls-scfg-msi.c | 7 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 233 +++++--- + drivers/irqchip/irq-ti-sci-inta.c | 615 +++++++++++++++++++ + drivers/irqchip/irq-ti-sci-intr.c | 275 +++++++++ + drivers/soc/ti/Kconfig | 6 + + drivers/soc/ti/Makefile | 1 + + drivers/soc/ti/ti_sci_inta_msi.c | 146 +++++ + include/linux/dma-iommu.h | 24 +- + include/linux/irq.h | 2 + + include/linux/irqchip/arm-gic-v3.h | 12 +- + include/linux/irqdomain.h | 1 + + include/linux/msi.h | 36 ++ + include/linux/overflow.h | 8 +- + include/linux/soc/ti/ti_sci_inta_msi.h | 23 + + include/linux/soc/ti/ti_sci_protocol.h | 124 ++++ + kernel/irq/Kconfig | 3 + + kernel/irq/chip.c | 27 + + kernel/irq/irqdomain.c | 2 +- + kernel/locking/rwsem-xadd.c | 46 +- + 43 files changed, 2549 insertions(+), 251 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-inta.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/ti,sci-intr.txt + create mode 100644 drivers/irqchip/irq-ti-sci-inta.c + create mode 100644 drivers/irqchip/irq-ti-sci-intr.c + create mode 100644 drivers/soc/ti/ti_sci_inta_msi.c + create mode 100644 include/linux/soc/ti/ti_sci_inta_msi.h +Merging clockevents/clockevents/next (8c9374068ef6 misc: atmel_tclib: Do not probe already used TCBs) +$ git merge clockevents/clockevents/next +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/clocksource/timer-atmel-tcb.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging arch/arm/mach-at91/Kconfig +Merge made by the 'recursive' strategy. + .../bindings/timer/allwinner,sun4i-timer.txt | 4 +- + arch/arm/mach-at91/Kconfig | 23 ++++ + drivers/clocksource/Kconfig | 14 ++- + drivers/clocksource/Makefile | 2 +- + .../{tcb_clksrc.c => timer-atmel-tcb.c} | 126 ++++++++++++++------- + drivers/clocksource/timer-milbeaut.c | 66 +++++++---- + drivers/clocksource/timer-sun4i.c | 5 +- + drivers/clocksource/timer-tegra20.c | 63 ++++------- + drivers/misc/Kconfig | 24 ---- + drivers/misc/atmel_tclib.c | 5 +- + drivers/pwm/pwm-atmel-tcb.c | 2 +- + include/{linux/atmel_tc.h => soc/at91/atmel_tcb.h} | 4 +- + 12 files changed, 202 insertions(+), 136 deletions(-) + rename drivers/clocksource/{tcb_clksrc.c => timer-atmel-tcb.c} (80%) + rename include/{linux/atmel_tc.h => soc/at91/atmel_tcb.h} (99%) +Merging edac-amd/for-next (8de9930a4618 Revert "EDAC/amd64: Support more than two controllers for chip select handling") +$ git merge edac-amd/for-next +Already up to date. +Merging irqchip/irq/irqchip-next (16e32c3cde77 iommu/dma-iommu: Remove iommu_dma_map_msi_msg()) +$ git merge irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (03197fc02b35 tracing: kdb: Allow ftdump to skip all but the last few entries) +$ git merge ftrace/for-next +Removing tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc +Auto-merging kernel/trace/trace_events_hist.c +Auto-merging kernel/trace/trace.h +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/ring_buffer.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/rcu.h +Auto-merging include/trace/events/rcu.h +Auto-merging include/linux/ftrace.h +Auto-merging Documentation/trace/histogram.rst +Auto-merging Documentation/trace/ftrace.rst +Merge made by the 'recursive' strategy. + Documentation/trace/ftrace.rst | 31 ++ + Documentation/trace/histogram.rst | 16 +- + arch/nds32/kernel/ftrace.c | 1 - + arch/parisc/kernel/ftrace.c | 1 - + include/linux/ftrace.h | 2 + + include/linux/tracepoint.h | 15 + + include/trace/define_trace.h | 8 + + include/trace/events/rcu.h | 81 ++--- + include/trace/events/sched.h | 21 +- + kernel/rcu/rcu.h | 9 +- + kernel/rcu/tree.c | 8 +- + kernel/trace/ftrace.c | 7 +- + kernel/trace/ring_buffer.c | 2 +- + kernel/trace/trace.c | 377 ++++++++++++++++++--- + kernel/trace/trace.h | 13 +- + kernel/trace/trace_events.c | 1 + + kernel/trace/trace_events_filter.c | 36 +- + kernel/trace/trace_events_hist.c | 268 +++++++++------ + kernel/trace/trace_events_trigger.c | 3 +- + kernel/trace/trace_kdb.c | 61 ++-- + kernel/trace/trace_kprobe.c | 77 +++-- + kernel/trace/trace_probe.c | 274 ++++++++++----- + kernel/trace/trace_probe.h | 77 ++++- + kernel/trace/trace_selftest.c | 5 +- + kernel/trace/trace_uprobe.c | 44 ++- + .../ftrace/test.d/ftrace/tracing-error-log.tc | 19 ++ + tools/testing/selftests/ftrace/test.d/functions | 12 + + .../ftrace/test.d/kprobe/kprobe_syntax_errors.tc | 85 +++++ + .../ftrace/test.d/kprobe/uprobe_syntax_errors.tc | 23 ++ + .../inter-event/trigger-extended-error-support.tc | 28 -- + 30 files changed, 1168 insertions(+), 437 deletions(-) + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/tracing-error-log.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/uprobe_syntax_errors.tc + delete mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc +Merging rcu/rcu/next (91df49e187c1 Merge LKMM and RCU commits) +$ git merge rcu/rcu/next +Already up to date. +Merging kvm/linux-next (3a1e5e4a2c7a Revert "KVM: doc: Document the life cycle of a VM and its resources") +$ git merge kvm/linux-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/x86/kvm/x86.h +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/nested.c +Auto-merging arch/s390/kvm/interrupt.c +Auto-merging arch/s390/kvm/Kconfig +Auto-merging Documentation/virtual/kvm/api.txt +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 22 +----- + Documentation/virtual/kvm/devices/vm.txt | 3 +- + arch/powerpc/kvm/powerpc.c | 3 - + arch/s390/include/asm/cpacf.h | 1 + + arch/s390/include/asm/kvm_host.h | 2 + + arch/s390/include/uapi/asm/kvm.h | 5 +- + arch/s390/kvm/Kconfig | 1 + + arch/s390/kvm/interrupt.c | 11 ++- + arch/s390/kvm/kvm-s390.c | 120 +++++++++++++++++++++++++++++-- + arch/s390/kvm/vsie.c | 13 ++-- + arch/s390/tools/gen_facilities.c | 3 + + arch/x86/kvm/mtrr.c | 10 +-- + arch/x86/kvm/vmx/nested.c | 111 ++++++++++++++-------------- + arch/x86/kvm/vmx/vmx.c | 15 ++-- + arch/x86/kvm/x86.c | 47 +++++++----- + arch/x86/kvm/x86.h | 10 +++ + include/linux/kvm_host.h | 10 +++ + tools/arch/s390/include/uapi/asm/kvm.h | 3 +- + virt/kvm/Kconfig | 3 + + virt/kvm/arm/arm.c | 3 - + virt/kvm/kvm_main.c | 4 +- + 21 files changed, 278 insertions(+), 122 deletions(-) +Merging kvm-arm/next (9eecfc22e0bf KVM: arm64: Fix ptrauth ID register masking logic) +$ git merge kvm-arm/next +Auto-merging virt/kvm/arm/arm.c +Auto-merging arch/arm64/kvm/reset.c +Auto-merging arch/arm64/kernel/perf_event.c +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/asm-offsets.c +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/include/asm/kvm_hyp.h +Auto-merging arch/arm64/Kconfig +Auto-merging Documentation/virtual/kvm/api.txt +Merge made by the 'recursive' strategy. + Documentation/arm64/perf.txt | 85 +++++ + Documentation/arm64/pointer-authentication.txt | 22 +- + Documentation/virtual/kvm/api.txt | 178 +++++++++++ + arch/arm/include/asm/kvm_emulate.h | 2 + + arch/arm/include/asm/kvm_host.h | 26 +- + arch/arm64/Kconfig | 6 +- + arch/arm64/include/asm/fpsimd.h | 29 +- + arch/arm64/include/asm/kvm_asm.h | 3 +- + arch/arm64/include/asm/kvm_emulate.h | 16 + + arch/arm64/include/asm/kvm_host.h | 101 +++++- + arch/arm64/include/asm/kvm_hyp.h | 1 - + arch/arm64/include/asm/kvm_ptrauth.h | 111 +++++++ + arch/arm64/include/asm/sysreg.h | 3 + + arch/arm64/include/uapi/asm/kvm.h | 43 +++ + arch/arm64/kernel/asm-offsets.c | 7 + + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/kernel/fpsimd.c | 179 +++++++---- + arch/arm64/kernel/perf_event.c | 50 ++- + arch/arm64/kernel/signal.c | 5 - + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/fpsimd.c | 17 +- + arch/arm64/kvm/guest.c | 415 +++++++++++++++++++++++-- + arch/arm64/kvm/handle_exit.c | 36 ++- + arch/arm64/kvm/hyp/entry.S | 15 + + arch/arm64/kvm/hyp/switch.c | 80 ++++- + arch/arm64/kvm/pmu.c | 239 ++++++++++++++ + arch/arm64/kvm/reset.c | 167 +++++++++- + arch/arm64/kvm/sys_regs.c | 183 +++++++++-- + arch/arm64/kvm/sys_regs.h | 25 ++ + include/uapi/linux/kvm.h | 7 + + virt/kvm/arm/arm.c | 40 ++- + 31 files changed, 1914 insertions(+), 181 deletions(-) + create mode 100644 Documentation/arm64/perf.txt + create mode 100644 arch/arm64/include/asm/kvm_ptrauth.h + create mode 100644 arch/arm64/kvm/pmu.c +Merging kvm-ppc/kvm-ppc-next (0caecf5b0019 KVM: PPC: Book3S HV: XIVE: Clear escalation interrupt pointers on device close) +$ git merge kvm-ppc/kvm-ppc-next +Auto-merging virt/kvm/kvm_main.c +Auto-merging include/uapi/linux/kvm.h +CONFLICT (content): Merge conflict in include/uapi/linux/kvm.h +Auto-merging include/linux/kvm_host.h +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kvm/book3s_hv_rmhandlers.S +Auto-merging Documentation/virtual/kvm/api.txt +Resolved 'include/uapi/linux/kvm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a9f64aa1394a] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/virtual/kvm/api.txt | 10 + + Documentation/virtual/kvm/devices/xive.txt | 197 +++++ + arch/powerpc/include/asm/kvm_host.h | 11 +- + arch/powerpc/include/asm/kvm_ppc.h | 41 +- + arch/powerpc/include/asm/xive.h | 3 + + arch/powerpc/include/uapi/asm/kvm.h | 46 + + arch/powerpc/kvm/Makefile | 2 +- + arch/powerpc/kvm/book3s.c | 42 +- + arch/powerpc/kvm/book3s_64_vio.c | 96 ++- + arch/powerpc/kvm/book3s_64_vio_hv.c | 105 ++- + arch/powerpc/kvm/book3s_hv.c | 152 ++-- + arch/powerpc/kvm/book3s_hv_builtin.c | 57 ++ + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 144 ++++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 80 +- + arch/powerpc/kvm/book3s_xive.c | 250 ++++-- + arch/powerpc/kvm/book3s_xive.h | 37 + + arch/powerpc/kvm/book3s_xive_native.c | 1249 ++++++++++++++++++++++++++++ + arch/powerpc/kvm/book3s_xive_template.c | 78 +- + arch/powerpc/kvm/powerpc.c | 37 + + arch/powerpc/sysdev/xive/native.c | 11 + + include/linux/kvm_host.h | 10 + + include/uapi/linux/kvm.h | 3 + + virt/kvm/kvm_main.c | 24 + + 23 files changed, 2420 insertions(+), 265 deletions(-) + create mode 100644 Documentation/virtual/kvm/devices/xive.txt + create mode 100644 arch/powerpc/kvm/book3s_xive_native.c +Merging kvms390/next (b2d0371d2e37 KVM: s390: vsie: Return correct values for Invalid CRYCB format) +$ git merge kvms390/next +Already up to date. +Merging xen-tip/linux-next (fe846979d305 xen/arm: Use p2m entry with lock protection) +$ git merge xen-tip/linux-next +Auto-merging drivers/net/xen-netfront.c +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 +++++++ + arch/arm/xen/p2m.c | 4 +++- + arch/x86/platform/pvh/enlighten.c | 8 ++++---- + arch/x86/xen/efi.c | 12 ++++++------ + arch/x86/xen/enlighten_pv.c | 2 +- + arch/x86/xen/enlighten_pvh.c | 7 ++++++- + arch/x86/xen/time.c | 20 +++++++++++++++++--- + arch/x86/xen/xen-ops.h | 4 ++-- + drivers/xen/xen-pciback/xenbus.c | 2 +- + drivers/xen/xenbus/xenbus_dev_frontend.c | 2 -- + 10 files changed, 47 insertions(+), 21 deletions(-) +Merging percpu/for-next (558ac86039fc Merge branch 'for-5.3' into for-next) +$ git merge percpu/for-next +Auto-merging lib/percpu-refcount.c +Auto-merging fs/io_uring.c +Auto-merging drivers/md/md.c +Merge made by the 'recursive' strategy. + drivers/md/md.c | 3 +- + fs/io_uring.c | 3 +- + include/linux/percpu-refcount.h | 10 +- + include/linux/percpu.h | 12 +- + lib/percpu-refcount.c | 13 +- + mm/percpu-internal.h | 15 +- + mm/percpu-km.c | 2 +- + mm/percpu-stats.c | 5 +- + mm/percpu.c | 549 ++++++++++++++++++++++++++++------------ + 9 files changed, 429 insertions(+), 183 deletions(-) +Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu) +$ git merge workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (6456fd731517 platform/x86: Add support for Basin Cove power button) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/mellanox/Kconfig | 12 +- + drivers/platform/mellanox/Makefile | 1 + + drivers/platform/mellanox/mlxbf-tmfifo-regs.h | 63 ++ + drivers/platform/mellanox/mlxbf-tmfifo.c | 1281 +++++++++++++++++++++++++ + drivers/platform/x86/Kconfig | 11 + + drivers/platform/x86/Makefile | 1 + + drivers/platform/x86/alienware-wmi.c | 19 +- + drivers/platform/x86/asus-wmi.c | 37 + + drivers/platform/x86/dell-laptop.c | 6 +- + drivers/platform/x86/dell-rbtn.c | 2 + + drivers/platform/x86/ideapad-laptop.c | 321 +------ + drivers/platform/x86/intel_mrfld_pwrbtn.c | 107 +++ + drivers/platform/x86/intel_pmc_core.c | 172 +++- + drivers/platform/x86/intel_pmc_core.h | 7 + + drivers/platform/x86/intel_pmc_ipc.c | 46 +- + drivers/platform/x86/intel_punit_ipc.c | 8 +- + drivers/platform/x86/mlx-platform.c | 228 ++++- + drivers/platform/x86/sony-laptop.c | 8 +- + drivers/platform/x86/thinkpad_acpi.c | 146 ++- + drivers/platform/x86/touchscreen_dmi.c | 51 + + include/linux/platform_data/x86/asus-wmi.h | 1 + + 21 files changed, 2147 insertions(+), 381 deletions(-) + create mode 100644 drivers/platform/mellanox/mlxbf-tmfifo-regs.h + create mode 100644 drivers/platform/mellanox/mlxbf-tmfifo.c + create mode 100644 drivers/platform/x86/intel_mrfld_pwrbtn.c +Merging chrome-platform/for-next (cdb80268a6b5 platform/chrome: wilco_ec: Add property helper library) +$ git merge chrome-platform/for-next +Auto-merging drivers/platform/chrome/cros_ec_proto.c +Auto-merging drivers/platform/chrome/cros_ec_debugfs.c +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/debugfs-wilco-ec | 45 +++-- + drivers/platform/chrome/Kconfig | 24 +++ + drivers/platform/chrome/Makefile | 7 +- + drivers/platform/chrome/cros_ec_debugfs.c | 74 ++------ + drivers/platform/chrome/cros_ec_proto.c | 15 ++ + drivers/platform/chrome/cros_ec_rpmsg.c | 258 +++++++++++++++++++++++++ + drivers/platform/chrome/cros_ec_spi.c | 80 +++++++- + drivers/platform/chrome/cros_ec_trace.c | 124 ++++++++++++ + drivers/platform/chrome/cros_ec_trace.h | 51 +++++ + drivers/platform/chrome/cros_usbpd_logger.c | 262 ++++++++++++++++++++++++++ + drivers/platform/chrome/wilco_ec/Makefile | 2 +- + drivers/platform/chrome/wilco_ec/debugfs.c | 89 +++++---- + drivers/platform/chrome/wilco_ec/mailbox.c | 53 +++--- + drivers/platform/chrome/wilco_ec/properties.c | 132 +++++++++++++ + drivers/rtc/rtc-wilco-ec.c | 63 ++++--- + include/linux/platform_data/wilco-ec.h | 93 +++++++-- + 16 files changed, 1188 insertions(+), 184 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_rpmsg.c + create mode 100644 drivers/platform/chrome/cros_ec_trace.c + create mode 100644 drivers/platform/chrome/cros_ec_trace.h + create mode 100644 drivers/platform/chrome/cros_usbpd_logger.c + create mode 100644 drivers/platform/chrome/wilco_ec/properties.c +Merging hsi/for-next (1ff85bfa1614 HSI: omap_ssi_port: fix debugfs_simple_attr.cocci warnings) +$ git merge hsi/for-next +Already up to date. +Merging leds/for-next (0db37915d912 leds: avoid races with workqueue) +$ git merge leds/for-next +Already up to date. +Merging ipmi/for-next (a2d635decbfa Merge tag 'drm-next-2019-05-09' of git://anongit.freedesktop.org/drm/drm) +$ git merge ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge usb/usb-next +Already up to date. +Merging usb-gadget/next (2e487d280525 usb: dwc3: Rename DWC3_DCTL_LPM_ERRATA) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (7f6fc50242d1 USB: serial: f81232: implement break control) +$ git merge usb-serial/usb-next +Already up to date. +Merging usb-chipidea-next/ci-for-usb-next (bc65fae4b1f0 usb: chipidea: imx: set power polarity) +$ git merge usb-chipidea-next/ci-for-usb-next +Auto-merging drivers/usb/chipidea/ci_hdrc_imx.c +Merge made by the 'recursive' strategy. +Merging phy-next/next (708310711e6c dt-bindings: phy-qcom-qmp: Tweak qcom,msm8998-qmp-ufs-phy) +$ git merge phy-next/next +Already up to date. +Merging tty/tty-next (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (80f232121b69 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next) +$ git merge char-misc/char-misc-next +Already up to date. +Merging extcon/extcon-next (00053de52231 extcon: arizona: Disable mic detect if running when driver is removed) +$ git merge extcon/extcon-next +Already up to date. +Merging soundwire/next (4abbd783d126 soundwire: intel: fix implicit header use of module.h/export.h) +$ git merge soundwire/next +Already up to date. +Merging thunderbolt/next (37209783c73a thunderbolt: Make priority unsigned in struct tb_path) +$ git merge thunderbolt/next +Already up to date. +Merging staging/staging-next (e7a1414f9dc3 Merge tag 'media/v5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media) +$ git merge staging/staging-next +Already up to date. +Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Auto-merging drivers/i2c/muxes/i2c-demux-pinctrl.c +Removing Documentation/devicetree/bindings/mux/mmio-mux.txt +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mux/mmio-mux.txt | 60 ---------- + Documentation/devicetree/bindings/mux/reg-mux.txt | 129 +++++++++++++++++++++ + drivers/mux/Kconfig | 12 +- + drivers/mux/mmio.c | 6 +- + 4 files changed, 140 insertions(+), 67 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mux/mmio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt +Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (f33e7bb3eb92 dmaengine: tegra210-adma: restore channel status) +$ git merge slave-dma/next +Already up to date. +Merging cgroup/for-next (2781a652edd4 Merge branch 'for-5.2' into for-next) +$ git merge cgroup/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi/for-next (7004db783df5 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging scsi-mkp/for-next (d4023db71108 scsi: qla2xxx: Avoid that lockdep complains about unsafe locking in tcm_qla2xxx_close_session()) +$ git merge scsi-mkp/for-next +Already up to date. +Merging target-updates/for-next (1c130ae00b76 iscsi-target: make sure to wake up sleeping login worker) +$ git merge target-updates/for-next +Already up to date. +Merging target-bva/for-next (60cc43fc8884 Linux 4.17-rc1) +$ git merge target-bva/for-next +Already up to date. +Merging vhost/linux-next (4e76105b74c1 virtio: use dependent_ptr_mb) +$ git merge vhost/linux-next +Auto-merging include/linux/compiler.h +Auto-merging drivers/pci/of.c +CONFLICT (content): Merge conflict in drivers/pci/of.c +Auto-merging drivers/of/base.c +Auto-merging drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merging drivers/iommu/Kconfig +Auto-merging MAINTAINERS +Auto-merging Documentation/memory-barriers.txt +Resolved 'drivers/net/virtio_net.c' using previous resolution. +Resolved 'drivers/pci/of.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f382e9baa8c6] Merge remote-tracking branch 'vhost/linux-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/virtio/iommu.txt | 66 ++ + Documentation/devicetree/bindings/virtio/mmio.txt | 30 + + Documentation/memory-barriers.txt | 20 + + MAINTAINERS | 7 + + arch/alpha/include/asm/barrier.h | 1 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/Makefile | 1 + + drivers/iommu/virtio-iommu.c | 1158 ++++++++++++++++++++ + drivers/net/virtio_net.c | 27 +- + drivers/of/base.c | 10 +- + drivers/pci/of.c | 6 + + drivers/virtio/virtio_ring.c | 13 +- + include/asm-generic/barrier.h | 18 + + include/linux/compiler.h | 6 +- + include/uapi/linux/virtio_ids.h | 1 + + include/uapi/linux/virtio_iommu.h | 161 +++ + 16 files changed, 1520 insertions(+), 16 deletions(-) + create mode 100644 Documentation/devicetree/bindings/virtio/iommu.txt + create mode 100644 drivers/iommu/virtio-iommu.c + create mode 100644 include/uapi/linux/virtio_iommu.h +Merging rpmsg/for-next (6e9b4f32f9fa Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge rpmsg/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt | 5 +++++ + drivers/rpmsg/rpmsg_core.c | 3 ++- + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging gpio/for-next (0fbee1df2078 gpio: Update documentation) +$ git merge gpio/for-next +Auto-merging include/linux/gpio/driver.h +Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c +Auto-merging drivers/gpio/gpiolib.h +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/Kconfig +Auto-merging arch/arm/configs/aspeed_g5_defconfig +Auto-merging arch/arm/configs/aspeed_g4_defconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/gpio/gpio-pca953x.txt | 2 + + Documentation/driver-api/gpio/driver.rst | 361 +++++++----- + Documentation/gpio/index.rst | 17 + + Documentation/gpio/{sysfs.txt => sysfs.rst} | 39 +- + arch/arm/configs/aspeed_g4_defconfig | 1 - + arch/arm/configs/aspeed_g5_defconfig | 1 - + drivers/gpio/Kconfig | 83 +-- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-74x164.c | 22 +- + drivers/gpio/gpio-74xx-mmio.c | 4 +- + drivers/gpio/gpio-amdpt.c | 8 +- + drivers/gpio/gpio-aspeed.c | 4 +- + drivers/gpio/gpio-bcm-kona.c | 4 +- + drivers/gpio/gpio-cadence.c | 4 +- + drivers/gpio/gpio-clps711x.c | 7 +- + drivers/gpio/gpio-dwapb.c | 4 +- + drivers/gpio/gpio-ftgpio010.c | 4 +- + drivers/gpio/gpio-hlwd.c | 4 +- + drivers/gpio/gpio-iop.c | 4 +- + drivers/gpio/gpio-janz-ttl.c | 4 +- + drivers/gpio/gpio-loongson1.c | 4 +- + drivers/gpio/gpio-lpc18xx.c | 5 +- + drivers/gpio/gpio-mb86s7x.c | 4 +- + drivers/gpio/gpio-mlxbf.c | 152 +++++ + drivers/gpio/gpio-mmio.c | 99 ++-- + drivers/gpio/gpio-mt7621.c | 3 +- + drivers/gpio/gpio-mvebu.c | 7 +- + drivers/gpio/gpio-mxc.c | 4 +- + drivers/gpio/gpio-octeon.c | 4 +- + drivers/gpio/gpio-omap.c | 644 +++++++++------------ + drivers/gpio/gpio-pca953x.c | 25 +- + drivers/gpio/gpio-pxa.c | 12 +- + drivers/gpio/gpio-rcar.c | 5 +- + drivers/gpio/gpio-sch.c | 5 - + drivers/gpio/gpio-spear-spics.c | 4 +- + drivers/gpio/gpio-sprd.c | 4 +- + drivers/gpio/gpio-sta2x11.c | 5 +- + drivers/gpio/gpio-stp-xway.c | 4 +- + drivers/gpio/gpio-tb10x.c | 4 +- + drivers/gpio/gpio-tegra.c | 4 +- + drivers/gpio/gpio-timberdale.c | 4 +- + drivers/gpio/gpio-ts4800.c | 4 +- + drivers/gpio/gpio-uniphier.c | 4 +- + drivers/gpio/gpio-vf610.c | 92 ++- + drivers/gpio/gpio-xgene-sb.c | 4 +- + drivers/gpio/gpio-xlp.c | 7 +- + drivers/gpio/gpio-zx.c | 4 +- + drivers/gpio/gpio-zynq.c | 4 +- + drivers/gpio/gpiolib-acpi.c | 115 ++-- + drivers/gpio/gpiolib-of.c | 24 +- + drivers/gpio/gpiolib.c | 43 +- + drivers/gpio/gpiolib.h | 19 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 110 ---- + include/linux/gpio/driver.h | 15 +- + include/linux/gpio/machine.h | 26 +- + include/linux/platform_data/gpio-omap.h | 2 - + include/trace/events/gpio.h | 4 - + kernel/trace/Kconfig | 7 - + 58 files changed, 1052 insertions(+), 1012 deletions(-) + create mode 100644 Documentation/gpio/index.rst + rename Documentation/gpio/{sysfs.txt => sysfs.rst} (86%) + create mode 100644 drivers/gpio/gpio-mlxbf.c +Merging gpio-brgl/gpio/for-next (b0d2569d8276 gpio: mlxbf: remove unused including <linux/version.h>) +$ git merge gpio-brgl/gpio/for-next +Already up to date. +Merging pinctrl/for-next (e0e31695b53b pinctrl: mcp23s08: Do not complain about unsupported params) +$ git merge pinctrl/for-next +Already up to date. +Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (f41efceb46e6 pwm: meson: Add clock source configuration for Meson G12A) +$ git merge pwm/for-next +Auto-merging drivers/pwm/pwm-meson.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pwm/imx-tpm-pwm.txt | 22 + + .../devicetree/bindings/pwm/pwm-meson.txt | 3 + + .../devicetree/bindings/pwm/pwm-tiehrpwm.txt | 1 + + drivers/pwm/Kconfig | 16 +- + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 11 +- + drivers/pwm/pwm-berlin.c | 1 - + drivers/pwm/pwm-img.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 449 +++++++++++++++++++++ + drivers/pwm/pwm-imx27.c | 4 +- + drivers/pwm/pwm-meson.c | 64 ++- + drivers/pwm/pwm-pca9685.c | 1 - + drivers/pwm/pwm-samsung.c | 5 +- + drivers/pwm/pwm-tiehrpwm.c | 2 + + drivers/pwm/sysfs.c | 16 +- + include/linux/pwm.h | 5 - + 16 files changed, 552 insertions(+), 51 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/imx-tpm-pwm.txt + create mode 100644 drivers/pwm/pwm-imx-tpm.c +Merging userns/for-next (cf43a757fd49 signal: Restore the stop PTRACE_EVENT_EXIT) +$ git merge userns/for-next +Already up to date. +Merging ktest/for-next (37e1677330bd ktest: introduce REBOOT_RETURN_CODE to confirm the result of REBOOT) +$ git merge ktest/for-next +Already up to date. +Merging random/dev (b7d5dc21072c random: add a spinlock_t to struct batched_entropy) +$ git merge random/dev +Already up to date. +Merging kselftest/next (c3c599281f2b selftests: fix install target to use default install path) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/rseq/rseq-s390.h +CONFLICT (content): Merge conflict in tools/testing/selftests/rseq/rseq-s390.h +Resolved 'tools/testing/selftests/rseq/rseq-s390.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7f43b2d952a2] Merge remote-tracking branch 'kselftest/next' +$ git diff -M --stat --summary HEAD^.. + tools/testing/selftests/.gitignore | 1 - + tools/testing/selftests/Makefile | 34 ++- + .../selftests/breakpoints/breakpoint_test.c | 15 +- + .../selftests/breakpoints/breakpoint_test_arm64.c | 3 +- + .../breakpoints/step_after_suspend_test.c | 8 + + tools/testing/selftests/capabilities/test_execve.c | 6 +- + .../selftests/futex/functional/futex_requeue_pi.c | 1 + + .../functional/futex_requeue_pi_mismatched_ops.c | 1 + + .../functional/futex_requeue_pi_signal_restart.c | 1 + + .../functional/futex_wait_private_mapped_file.c | 1 + + .../futex/functional/futex_wait_timeout.c | 1 + + .../functional/futex_wait_uninitialized_heap.c | 1 + + .../futex/functional/futex_wait_wouldblock.c | 1 + + tools/testing/selftests/kselftest.h | 17 +- + tools/testing/selftests/kselftest/prefix.pl | 23 ++ + tools/testing/selftests/kselftest/runner.sh | 86 +++++++ + tools/testing/selftests/lib.mk | 64 +---- + .../testing/selftests/membarrier/membarrier_test.c | 1 + + tools/testing/selftests/pidfd/pidfd_test.c | 1 + + tools/testing/selftests/rseq/Makefile | 8 +- + tools/testing/selftests/rseq/rseq-arm.h | 132 +++++++++-- + tools/testing/selftests/rseq/rseq-arm64.h | 74 +++++- + tools/testing/selftests/rseq/rseq-mips.h | 115 ++++++++- + tools/testing/selftests/rseq/rseq-ppc.h | 90 ++++++- + tools/testing/selftests/rseq/rseq-s390.h | 69 +++++- + tools/testing/selftests/rseq/rseq-x86.h | 264 ++++++++++++++------- + tools/testing/selftests/rseq/rseq.c | 55 ++++- + tools/testing/selftests/rseq/rseq.h | 1 + + tools/testing/selftests/sigaltstack/sas.c | 1 + + tools/testing/selftests/sync/sync_test.c | 1 + + 30 files changed, 866 insertions(+), 210 deletions(-) + create mode 100755 tools/testing/selftests/kselftest/prefix.pl + create mode 100644 tools/testing/selftests/kselftest/runner.sh +Merging y2038/y2038 (a2318b6a16a8 riscv: Use latest system call ABI) +$ git merge y2038/y2038 +Auto-merging arch/riscv/kernel/vdso/Makefile +Auto-merging arch/riscv/Kconfig +Merge made by the 'recursive' strategy. +Merging livepatching/for-next (591be2f7f7b5 Merge branch 'for-5.2/core' into for-next) +$ git merge livepatching/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging coresight/next (78e6427b4e7b coresight: funnel: Support static funnel) +$ git merge coresight/next +Already up to date. +Merging rtc/rtc-next (dacb6a4035a0 rtc: snvs: Use __maybe_unused instead of #if CONFIG_PM_SLEEP) +$ git merge rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (1ffc664f9b8c Merge branch 'for-5.1/dax' into libnvdimm-for-next) +$ git merge nvdimm/libnvdimm-for-next +Auto-merging fs/dax.c +CONFLICT (content): Merge conflict in fs/dax.c +Resolved 'fs/dax.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 7a18140f6a8b] Merge remote-tracking branch 'nvdimm/libnvdimm-for-next' +$ git diff -M --stat --summary HEAD^.. +Merging at24/at24/for-next (d333bad1f6f3 dt-bindings: at24: add Renesas R1EX24016) +$ git merge at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (6202b3c150bc NTB: ntb_test: Fix bug when counting remote files) +$ git merge ntb/ntb-next +Auto-merging drivers/ntb/test/ntb_perf.c +Auto-merging drivers/ntb/hw/idt/ntb_hw_idt.c +Merge made by the 'recursive' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 12 +++------ + drivers/ntb/hw/idt/ntb_hw_idt.c | 6 ----- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 4 --- + drivers/ntb/hw/intel/ntb_hw_gen3.c | 6 ++--- + drivers/ntb/ntb.c | 9 ++----- + drivers/ntb/ntb_transport.c | 1 + + drivers/ntb/test/ntb_perf.c | 43 +++++++++++++++++++++++++-------- + drivers/ntb/test/ntb_pingpong.c | 14 +++++------ + drivers/ntb/test/ntb_tool.c | 9 +++---- + tools/testing/selftests/ntb/ntb_test.sh | 2 +- + 10 files changed, 54 insertions(+), 52 deletions(-) +Merging kspp/for-next/kspp (7f6563fc1e6b Merge branch 'for-linus/seccomp' into for-next/kspp) +$ git merge kspp/for-next/kspp +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging kernel/seccomp.c +Merge made by the 'recursive' strategy. +Merging init_task/init_task (e1e871aff3de Expand INIT_STRUCT_PID and remove) +$ git merge init_task/init_task +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge cisco/for-next +Already up to date. +Merging gnss/gnss-next (7cc10c5cb143 gnss: ubx: add u-blox,neo-6m compatible) +$ git merge gnss/gnss-next +Already up to date. +Merging fsi/master (d20810530b71 fsi: fsi-scom.c: Remove duplicate header) +$ git merge fsi/master +Already up to date. +Merging siox/siox/next (1e4b044d2251 Linux 4.18-rc4) +$ git merge siox/siox/next +Already up to date. +Merging slimbus/for-next (80471330ec58 slimbus: fix a NULL pointer dereference in of_qcom_slim_ngd_register) +$ git merge slimbus/for-next +Merge made by the 'recursive' strategy. +Merging nvmem/for-next (889ba60c36ce nvmem: core: add NVMEM_SYSFS Kconfig) +$ git merge nvmem/for-next +Merge made by the 'recursive' strategy. +Merging xarray/xarray (dd12805ed1db XArray: Remove radix tree compatibility) +$ git merge xarray/xarray +Merge made by the 'recursive' strategy. + include/linux/radix-tree.h | 13 +++++++++++-- + include/linux/xarray.h | 29 ++++++++++++++--------------- + lib/radix-tree.c | 2 +- + lib/test_xarray.c | 38 ++++++++++++++++++++++++++++++++++++++ + 4 files changed, 64 insertions(+), 18 deletions(-) +Merging hyperv/hyperv-next (a3fb7bf369ef drivers: input: serio: Add a module desription to the hyperv_keyboard driver) +$ git merge hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'recursive' strategy. + drivers/hid/hid-hyperv.c | 2 ++ + drivers/hv/vmbus_drv.c | 1 + + 2 files changed, 3 insertions(+) +Merging auxdisplay/auxdisplay (cc5d04d840d6 auxdisplay: charlcd: make backlight initial state configurable) +$ git merge auxdisplay/auxdisplay +Already up to date. +Merging kgdb-dt/kgdb/for-next (51fee3389d71 kdb: Get rid of broken attempt to print CCVERSION in kdb summary) +$ git merge kgdb-dt/kgdb/for-next +Merge made by the 'recursive' strategy. + kernel/debug/gdbstub.c | 9 +++++---- + kernel/debug/kdb/Makefile | 1 - + kernel/debug/kdb/kdb_main.c | 1 - + kernel/debug/kdb/kdb_support.c | 2 +- + 4 files changed, 6 insertions(+), 7 deletions(-) +Merging pidfd/for-next (eb364bbe6791 samples: show race-free pidfd metadata access) +$ git merge pidfd/for-next +Auto-merging samples/Makefile +CONFLICT (content): Merge conflict in samples/Makefile +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Recorded preimage for 'samples/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'samples/Makefile'. +[master af36e8ad5990] Merge remote-tracking branch 'pidfd/for-next' +$ git diff -M --stat --summary HEAD^.. + kernel/fork.c | 1 + + 1 file changed, 1 insertion(+) +Merging devfreq/for-next (cf451adfa392 PM / devfreq: add tracing for scheduling work) +$ git merge devfreq/for-next +Already up to date. +Merging akpm-current/current (b78fc46079e4 ipc-do-cyclic-id-allocation-for-the-ipc-object-fix) +$ git merge --no-ff akpm-current/current +Auto-merging virt/kvm/kvm_main.c +Auto-merging scripts/checkpatch.pl +Auto-merging net/netfilter/core.c +Auto-merging mm/vmscan.c +Auto-merging mm/vmalloc.c +CONFLICT (content): Merge conflict in mm/vmalloc.c +Auto-merging mm/slub.c +Auto-merging mm/slab.c +Auto-merging mm/shmem.c +Auto-merging mm/page_alloc.c +Auto-merging mm/memory.c +Auto-merging mm/memblock.c +Auto-merging mm/madvise.c +Auto-merging mm/hugetlb.c +Auto-merging mm/huge_memory.c +Auto-merging lib/test_bitmap.c +Removing lib/rational.c +Auto-merging lib/dynamic_debug.c +CONFLICT (content): Merge conflict in lib/dynamic_debug.c +Auto-merging lib/Makefile +CONFLICT (content): Merge conflict in lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.c +Auto-merging kernel/panic.c +Auto-merging kernel/latencytop.c +Auto-merging kernel/kexec_file.c +Auto-merging kernel/futex.c +Auto-merging kernel/fork.c +CONFLICT (content): Merge conflict in kernel/fork.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/cgroup/cgroup.c +Auto-merging ipc/util.c +Auto-merging ipc/mqueue.c +Auto-merging init/main.c +Auto-merging init/Kconfig +Auto-merging include/trace/events/vmscan.h +Auto-merging include/linux/vmalloc.h +Auto-merging include/linux/uaccess.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/printk.h +Auto-merging include/linux/pid.h +Auto-merging include/linux/net.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/list.h +Auto-merging include/linux/kernel.h +Auto-merging include/linux/dynamic_debug.h +CONFLICT (content): Merge conflict in include/linux/dynamic_debug.h +Auto-merging include/linux/device.h +Auto-merging fs/sync.c +CONFLICT (content): Merge conflict in fs/sync.c +Auto-merging fs/proc/base.c +Auto-merging fs/orangefs/orangefs-bufmap.c +Auto-merging fs/io_uring.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/buffer.c +Auto-merging drivers/video/fbdev/pvr2fb.c +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging drivers/tty/sysrq.c +Auto-merging drivers/staging/gasket/gasket_page_table.c +Auto-merging drivers/sbus/char/oradax.c +Auto-merging drivers/mtd/nand/raw/vf610_nfc.c +Auto-merging drivers/media/common/videobuf2/videobuf2-core.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/infiniband/hw/usnic/usnic_uiom.c +Auto-merging drivers/infiniband/hw/qib/qib_user_sdma.c +Auto-merging drivers/infiniband/core/umem_odp.c +Auto-merging drivers/infiniband/core/umem.c +CONFLICT (content): Merge conflict in drivers/infiniband/core/umem.c +Auto-merging drivers/gpu/drm/i915/i915_gem_userptr.c +Auto-merging drivers/firewire/core-iso.c +Auto-merging arch/x86/include/asm/Kbuild +Auto-merging arch/x86/Kconfig +Auto-merging arch/unicore32/Kconfig +Auto-merging arch/sparc/mm/init_64.c +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sh/Kconfig +Auto-merging arch/s390/mm/init.c +CONFLICT (modify/delete): arch/s390/mm/gup.c deleted in HEAD and modified in akpm-current/current. Version akpm-current/current of arch/s390/mm/gup.c left in tree. +Auto-merging arch/s390/kvm/interrupt.c +Auto-merging arch/s390/include/asm/cpacf.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/powerpc/platforms/Kconfig.cputype +CONFLICT (content): Merge conflict in arch/powerpc/platforms/Kconfig.cputype +Auto-merging arch/powerpc/perf/core-book3s.c +Auto-merging arch/powerpc/mm/mem.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/mm/fault.c +Auto-merging arch/powerpc/mm/book3s64/iommu_api.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/book3s64/iommu_api.c +Auto-merging arch/powerpc/kvm/book3s_64_vio.c +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kernel/prom_init.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/include/asm/book3s/64/hugetlb.h +Auto-merging arch/powerpc/include/asm/Kbuild +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/mm/init.c +CONFLICT (content): Merge conflict in arch/parisc/mm/init.c +Auto-merging arch/openrisc/mm/init.c +Auto-merging arch/nios2/Kconfig +CONFLICT (content): Merge conflict in arch/nios2/Kconfig +Auto-merging arch/nds32/mm/init.c +Auto-merging arch/mips/kernel/setup.c +CONFLICT (content): Merge conflict in arch/mips/kernel/setup.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +CONFLICT (content): Merge conflict in arch/m68k/Kconfig +Auto-merging arch/ia64/Kconfig +Auto-merging arch/hexagon/Kconfig +Auto-merging arch/arm64/mm/mmu.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/include/asm/cpufeature.h +Auto-merging arch/arm64/include/asm/Kbuild +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/mm/init.c +Auto-merging arch/arm/Kconfig +Auto-merging arch/Kconfig +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Resolved 'arch/m68k/Kconfig' using previous resolution. +Resolved 'arch/mips/kernel/setup.c' using previous resolution. +Resolved 'arch/nios2/Kconfig' using previous resolution. +Resolved 'arch/parisc/mm/init.c' using previous resolution. +Resolved 'arch/powerpc/mm/book3s64/iommu_api.c' using previous resolution. +Resolved 'arch/powerpc/mm/mem.c' using previous resolution. +Resolved 'arch/powerpc/platforms/Kconfig.cputype' using previous resolution. +Resolved 'drivers/infiniband/core/umem.c' using previous resolution. +Resolved 'fs/sync.c' using previous resolution. +Resolved 'include/linux/dynamic_debug.h' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Resolved 'lib/Makefile' using previous resolution. +Resolved 'lib/dynamic_debug.c' using previous resolution. +Resolved 'mm/vmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/s390/mm/gup.c +arch/s390/mm/gup.c: needs merge +rm 'arch/s390/mm/gup.c' +$ git commit -v -a +[master 81a4e2418909] Merge branch 'akpm-current/current' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-slab | 9 + + Documentation/accounting/psi.txt | 107 ++ + Documentation/admin-guide/cgroup-v2.rst | 20 +- + Documentation/admin-guide/kernel-parameters.txt | 18 +- + Documentation/core-api/genalloc.rst | 2 +- + Documentation/core-api/kernel-api.rst | 4 +- + Documentation/dev-tools/gcov.rst | 18 +- + Documentation/devicetree/bindings/pps/pps-gpio.txt | 7 + + Documentation/filesystems/autofs-mount-control.txt | 6 +- + Documentation/filesystems/autofs.txt | 66 +- + Documentation/sysctl/vm.txt | 12 + + .../trace/postprocess/trace-vmscan-postprocess.pl | 7 +- + Documentation/vm/hmm.rst | 94 +- + arch/Kconfig | 7 + + arch/alpha/mm/init.c | 14 - + arch/arc/mm/init.c | 15 - + arch/arm/Kconfig | 3 +- + arch/arm/include/asm/hardirq.h | 1 + + arch/arm/kernel/atags.h | 2 +- + arch/arm/kernel/smp.c | 6 +- + arch/arm/mm/dma-mapping.c | 24 +- + arch/arm/mm/init.c | 25 +- + arch/arm64/Kconfig | 5 +- + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/cpufeature.h | 4 +- + arch/arm64/include/asm/hugetlb.h | 4 - + arch/arm64/mm/init.c | 17 +- + arch/arm64/mm/mmu.c | 6 +- + arch/c6x/mm/init.c | 12 - + arch/h8300/mm/init.c | 14 - + arch/hexagon/Kconfig | 1 - + arch/hexagon/mm/init.c | 10 - + arch/ia64/Kconfig | 1 - + arch/ia64/mm/init.c | 17 +- + arch/m68k/Kconfig | 3 +- + arch/m68k/mm/init.c | 7 - + arch/microblaze/mm/init.c | 12 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/bitops.h | 4 +- + arch/mips/kernel/cpu-bugs64.c | 4 +- + arch/mips/mm/gup.c | 11 +- + arch/mips/mm/init.c | 8 - + arch/nds32/mm/init.c | 12 - + arch/nios2/Kconfig | 3 +- + arch/nios2/mm/init.c | 12 - + arch/openrisc/mm/init.c | 12 - + arch/parisc/mm/init.c | 7 - + arch/powerpc/Kconfig | 2 + + arch/powerpc/include/asm/Kbuild | 1 + + arch/powerpc/include/asm/book3s/64/hugetlb.h | 5 +- + arch/powerpc/kernel/process.c | 12 +- + arch/powerpc/kernel/prom_init.c | 6 +- + arch/powerpc/kernel/sysfs.c | 8 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 4 +- + arch/powerpc/kvm/book3s_64_vio.c | 34 +- + arch/powerpc/kvm/e500_mmu.c | 2 +- + arch/powerpc/mm/book3s64/iommu_api.c | 33 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 12 +- + arch/powerpc/mm/fault.c | 6 +- + arch/powerpc/mm/mem.c | 24 +- + arch/powerpc/perf/callchain.c | 20 +- + arch/powerpc/perf/core-book3s.c | 8 +- + arch/powerpc/platforms/Kconfig.cputype | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 10 +- + arch/riscv/mm/init.c | 5 - + arch/s390/Kconfig | 3 +- + arch/s390/include/asm/cpacf.h | 2 +- + arch/s390/include/asm/hugetlb.h | 8 +- + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/mm/init.c | 19 +- + arch/sh/Kconfig | 2 +- + arch/sh/boards/mach-dreamcast/irq.c | 1 - + arch/sh/mm/gup.c | 11 +- + arch/sh/mm/init.c | 29 +- + arch/sparc/Kconfig | 1 + + arch/sparc/include/asm/pgtable_64.h | 30 - + arch/sparc/mm/gup.c | 9 +- + arch/sparc/mm/init_32.c | 13 - + arch/sparc/mm/init_64.c | 8 - + arch/um/kernel/mem.c | 7 - + arch/unicore32/Kconfig | 1 + + arch/unicore32/mm/init.c | 24 - + arch/x86/Kconfig | 7 +- + arch/x86/Kconfig.debug | 14 - + arch/x86/entry/vdso/vdso32/vclock_gettime.c | 1 + + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/hugetlb.h | 4 - + arch/x86/include/asm/hyperv-tlfs.h | 2 +- + arch/x86/kvm/paging_tmpl.h | 2 +- + arch/x86/kvm/svm.c | 2 +- + arch/x86/mm/hugetlbpage.c | 2 +- + arch/x86/mm/init_32.c | 11 +- + arch/x86/mm/init_64.c | 20 +- + arch/x86/mm/numa.c | 27 +- + arch/xtensa/include/asm/irqflags.h | 2 +- + arch/xtensa/kernel/smp.c | 2 +- + arch/xtensa/mm/init.c | 5 - + drivers/base/memory.c | 24 +- + drivers/firewire/core-iso.c | 15 +- + drivers/fpga/dfl-afu-dma-region.c | 42 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mn.c | 8 +- + drivers/gpu/drm/i915/i915_gem_userptr.c | 2 +- + drivers/gpu/drm/radeon/radeon_mn.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 17 +- + drivers/gpu/drm/via/via_dmablit.c | 3 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 18 +- + drivers/infiniband/core/umem.c | 5 +- + drivers/infiniband/core/umem_odp.c | 5 +- + drivers/infiniband/hw/hfi1/user_pages.c | 3 +- + drivers/infiniband/hw/mthca/mthca_memfree.c | 3 +- + drivers/infiniband/hw/qib/qib_user_pages.c | 8 +- + drivers/infiniband/hw/qib/qib_user_sdma.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 9 +- + drivers/iommu/dma-iommu.c | 12 +- + drivers/media/common/videobuf2/videobuf2-core.c | 7 + + .../media/common/videobuf2/videobuf2-dma-contig.c | 6 - + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 22 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 6 +- + drivers/misc/genwqe/card_utils.c | 2 +- + drivers/misc/sram-exec.c | 2 +- + drivers/misc/vmw_vmci/vmci_host.c | 2 +- + drivers/misc/vmw_vmci/vmci_queue_pair.c | 6 +- + drivers/mtd/nand/raw/vf610_nfc.c | 2 +- + drivers/platform/goldfish/goldfish_pipe.c | 3 +- + drivers/pps/clients/pps-gpio.c | 153 ++- + drivers/rapidio/devices/rio_mport_cdev.c | 4 +- + drivers/rapidio/rio_cm.c | 8 + + drivers/sbus/char/oradax.c | 2 +- + drivers/scsi/st.c | 3 +- + drivers/spi/spi-rockchip.c | 1 + + drivers/staging/gasket/gasket_page_table.c | 4 +- + drivers/tee/tee_shm.c | 2 +- + drivers/tty/sysrq.c | 6 + + drivers/vfio/vfio_iommu_spapr_tce.c | 40 +- + drivers/vfio/vfio_iommu_type1.c | 34 +- + drivers/vhost/vhost.c | 2 +- + drivers/video/backlight/pwm_bl.c | 15 - + drivers/video/fbdev/pvr2fb.c | 2 +- + drivers/virt/fsl_hypervisor.c | 2 +- + drivers/xen/gntdev.c | 19 +- + drivers/xen/privcmd-buf.c | 8 +- + fs/binfmt_elf.c | 180 +-- + fs/buffer.c | 56 +- + fs/dax.c | 2 +- + fs/eventfd.c | 8 + + fs/exec.c | 4 +- + fs/fat/file.c | 11 +- + fs/hugetlbfs/inode.c | 18 +- + fs/io_uring.c | 5 +- + fs/ocfs2/alloc.c | 15 + + fs/ocfs2/aops.c | 22 +- + fs/ocfs2/dir.c | 20 +- + fs/ocfs2/dlm/dlmunlock.c | 23 +- + fs/ocfs2/dlmglue.c | 21 +- + fs/ocfs2/export.c | 30 +- + fs/ocfs2/ocfs2.h | 1 + + fs/ocfs2/ocfs2_fs.h | 28 +- + fs/orangefs/orangefs-bufmap.c | 2 +- + fs/proc/base.c | 2 +- + fs/proc/meminfo.c | 2 +- + fs/proc/task_mmu.c | 5 +- + fs/ramfs/inode.c | 12 + + fs/reiserfs/xattr.c | 9 + + fs/sync.c | 21 +- + fs/userfaultfd.c | 5 + + include/asm-generic/dynamic_debug.h | 116 ++ + include/asm-generic/hugetlb.h | 7 + + include/asm-generic/shmparam.h | 2 +- + include/linux/balloon_compaction.h | 15 - + include/linux/binfmts.h | 3 +- + include/linux/bitops.h | 16 +- + include/linux/compiler_types.h | 3 +- + include/linux/console.h | 7 +- + include/linux/cpumask.h | 3 +- + include/linux/device.h | 4 +- + include/linux/dynamic_debug.h | 27 +- + include/linux/genalloc.h | 2 +- + include/linux/gfp.h | 4 +- + include/linux/hmm.h | 310 ++++- + include/linux/hugetlb.h | 4 +- + include/linux/ipc_namespace.h | 1 + + include/linux/jump_label.h | 2 + + include/linux/kernel.h | 1 + + include/linux/kthread.h | 3 +- + include/linux/latencytop.h | 4 +- + include/linux/list.h | 35 + + include/linux/list_sort.h | 1 + + include/linux/memblock.h | 44 +- + include/linux/memcontrol.h | 54 +- + include/linux/memory.h | 2 +- + include/linux/memory_hotplug.h | 42 +- + include/linux/mm.h | 117 +- + include/linux/mm_inline.h | 2 +- + include/linux/mm_types.h | 7 +- + include/linux/mmu_notifier.h | 63 +- + include/linux/mmzone.h | 64 +- + include/linux/net.h | 4 +- + include/linux/pagemap.h | 13 + + include/linux/pid.h | 5 +- + include/linux/plist.h | 4 +- + include/linux/poll.h | 4 + + include/linux/pps-gpio.h | 5 +- + include/linux/printk.h | 6 +- + include/linux/psi.h | 8 + + include/linux/psi_types.h | 105 +- + include/linux/qcom-geni-se.h | 2 +- + include/linux/reboot.h | 2 + + include/linux/sched.h | 11 +- + include/linux/uaccess.h | 34 + + include/linux/userfaultfd_k.h | 2 + + include/linux/vmalloc.h | 8 +- + include/linux/vmstat.h | 2 +- + include/trace/events/compaction.h | 10 +- + include/trace/events/vmscan.h | 98 +- + include/uapi/linux/byteorder/big_endian.h | 4 + + include/uapi/linux/byteorder/little_endian.h | 4 + + include/uapi/linux/fs.h | 3 + + init/Kconfig | 24 + + init/initramfs.c | 147 ++- + init/main.c | 5 + + ipc/ipc_sysctl.c | 14 +- + ipc/mqueue.c | 72 +- + ipc/msgutil.c | 6 + + ipc/util.c | 48 +- + ipc/util.h | 47 +- + kernel/cgroup/cgroup.c | 71 +- + kernel/dma/remap.c | 2 +- + kernel/events/uprobes.c | 3 +- + kernel/exit.c | 6 +- + kernel/fork.c | 39 +- + kernel/futex.c | 2 +- + kernel/gcov/Kconfig | 3 +- + kernel/gcov/Makefile | 5 +- + kernel/gcov/base.c | 86 +- + kernel/gcov/clang.c | 581 ++++++++++ + kernel/gcov/gcc_3_4.c | 12 + + kernel/gcov/gcc_4_7.c | 12 + + kernel/gcov/gcc_base.c | 86 ++ + kernel/gcov/gcov.h | 5 + + kernel/kexec_file.c | 16 +- + kernel/kthread.c | 1 + + kernel/latencytop.c | 8 +- + kernel/memremap.c | 12 +- + kernel/notifier.c | 1 + + kernel/panic.c | 11 +- + kernel/pid.c | 10 +- + kernel/printk/printk.c | 18 +- + kernel/reboot.c | 20 +- + kernel/sched/psi.c | 615 +++++++++- + kernel/signal.c | 1 + + kernel/sys.c | 2 +- + kernel/sysctl.c | 53 +- + kernel/user.c | 7 +- + lib/Kconfig | 14 +- + lib/Kconfig.debug | 34 +- + lib/Makefile | 15 +- + lib/bitmap.c | 280 ++--- + lib/debugobjects.c | 66 +- + lib/dynamic_debug.c | 111 +- + lib/genalloc.c | 5 +- + lib/iov_iter.c | 7 +- + lib/list_sort.c | 242 ++-- + lib/math/Kconfig | 11 + + lib/math/Makefile | 5 + + lib/{ => math}/cordic.c | 0 + lib/{ => math}/div64.c | 2 +- + lib/{ => math}/gcd.c | 0 + lib/math/int_pow.c | 32 + + lib/{ => math}/int_sqrt.c | 0 + lib/{ => math}/lcm.c | 0 + lib/{ => math}/prime_numbers.c | 0 + lib/math/rational.c | 102 ++ + lib/{ => math}/reciprocal_div.c | 0 + lib/plist.c | 4 +- + lib/rational.c | 65 -- + lib/sort.c | 254 ++++- + lib/test_bitmap.c | 67 +- + lib/test_sysctl.c | 18 +- + lib/test_vmalloc.c | 8 +- + mm/Kconfig | 82 +- + mm/Kconfig.debug | 1 - + mm/Makefile | 7 +- + mm/cma.c | 23 +- + mm/cma_debug.c | 2 +- + mm/compaction.c | 8 +- + mm/debug.c | 5 +- + mm/filemap.c | 163 ++- + mm/gup.c | 393 +++++-- + mm/gup_benchmark.c | 5 +- + mm/hmm.c | 1086 ++++++++++++------ + mm/huge_memory.c | 17 +- + mm/hugetlb.c | 177 ++- + mm/khugepaged.c | 7 +- + mm/ksm.c | 6 +- + mm/madvise.c | 3 +- + mm/memblock.c | 70 +- + mm/memcontrol.c | 112 +- + mm/memfd.c | 2 + + mm/memory.c | 108 +- + mm/memory_hotplug.c | 132 +-- + mm/migrate.c | 7 +- + mm/mincore.c | 23 +- + mm/mlock.c | 4 +- + mm/mmap.c | 18 +- + mm/mmu_notifier.c | 12 +- + mm/mprotect.c | 4 +- + mm/mremap.c | 9 +- + mm/nommu.c | 14 + + mm/oom_kill.c | 3 +- + mm/page_alloc.c | 372 +++--- + mm/page_isolation.c | 2 - + mm/rmap.c | 10 +- + mm/shmem.c | 2 +- + mm/shuffle.c | 207 ++++ + mm/shuffle.h | 64 ++ + mm/slab.c | 61 +- + mm/slob.c | 59 +- + mm/slub.c | 83 +- + mm/sparse.c | 16 +- + mm/swap.c | 2 +- + mm/swap_state.c | 4 +- + mm/swapfile.c | 4 +- + mm/userfaultfd.c | 3 +- + mm/util.c | 59 +- + mm/vmalloc.c | 1187 +++++++++++++++----- + mm/vmscan.c | 290 ++--- + mm/workingset.c | 5 +- + mm/z3fold.c | 638 ++++++++--- + net/ceph/pagevec.c | 2 +- + net/netfilter/core.c | 2 +- + net/rds/info.c | 2 +- + net/rds/rdma.c | 3 +- + net/xdp/xdp_umem.c | 4 +- + scripts/checkpatch.pl | 24 +- + scripts/gdb/linux/clk.py | 69 ++ + scripts/gdb/linux/config.py | 44 + + scripts/gdb/linux/constants.py.in | 13 + + scripts/gdb/linux/cpus.py | 1 + + scripts/gdb/linux/lists.py | 24 + + scripts/gdb/linux/proc.py | 10 +- + scripts/gdb/linux/rbtree.py | 177 +++ + scripts/gdb/linux/symbols.py | 6 +- + scripts/gdb/linux/tasks.py | 2 + + scripts/gdb/linux/timerlist.py | 219 ++++ + scripts/gdb/linux/utils.py | 7 +- + scripts/gdb/vmlinux-gdb.py | 4 + + scripts/spelling.txt | 579 ++++++++-- + tools/testing/selftests/exec/.gitignore | 3 +- + tools/testing/selftests/exec/Makefile | 4 + + tools/testing/selftests/exec/recursion-depth.c | 67 ++ + tools/testing/selftests/sysctl/sysctl.sh | 161 ++- + tools/vm/slabinfo.c | 7 +- + virt/kvm/kvm_main.c | 3 +- + 354 files changed, 10010 insertions(+), 3858 deletions(-) + create mode 100644 include/asm-generic/dynamic_debug.h + create mode 100644 kernel/gcov/clang.c + create mode 100644 kernel/gcov/gcc_base.c + create mode 100644 lib/math/Kconfig + create mode 100644 lib/math/Makefile + rename lib/{ => math}/cordic.c (100%) + rename lib/{ => math}/div64.c (99%) + rename lib/{ => math}/gcd.c (100%) + create mode 100644 lib/math/int_pow.c + rename lib/{ => math}/int_sqrt.c (100%) + rename lib/{ => math}/lcm.c (100%) + rename lib/{ => math}/prime_numbers.c (100%) + create mode 100644 lib/math/rational.c + rename lib/{ => math}/reciprocal_div.c (100%) + delete mode 100644 lib/rational.c + create mode 100644 mm/shuffle.c + create mode 100644 mm/shuffle.h + create mode 100644 scripts/gdb/linux/clk.py + create mode 100644 scripts/gdb/linux/config.py + create mode 100644 scripts/gdb/linux/rbtree.py + create mode 100644 scripts/gdb/linux/timerlist.py + create mode 100644 tools/testing/selftests/exec/recursion-depth.c +$ 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: pinctrl: fix pxa2xx.c build warnings +Applying: fs/coda/psdev.c: remove duplicate header +Applying: include/linux/sched/signal.h: replace `tsk' with `task' +Applying: fs/cachefiles/namei.c: remove duplicate header +Applying: fs/block_dev.c: Remove duplicate header +Applying: treewide: replace #include <asm/sizes.h> with #include <linux/sizes.h> +Applying: arch: remove <asm/sizes.h> and <asm-generic/sizes.h> +Applying: mm, memcg: rename ambiguously named memory.stat counters and functions +Applying: mm-rename-ambiguously-named-memorystat-counters-and-functions-fix +Applying: mm, memcg: consider subtrees in memory.events +Applying: drivers/virt/fsl_hypervisor.c: dereferencing error pointers in ioctl +Applying: drivers/virt/fsl_hypervisor.c: prevent integer overflow in ioctl +Applying: mm: memcontrol: make cgroup stats and events query API explicitly local +Applying: mm-memcontrol-make-cgroup-stats-and-events-query-api-explicitly-local-fix +Applying: mm: memcontrol: move stat/event counting functions out-of-line +Applying: mm: memcontrol: fix recursive statistics correctness & scalabilty +Applying: mm: memcontrol: fix NUMA round-robin reclaim at intermediate level +Applying: drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow +$ cd ../next +$ git fetch -f ../rebase-tmp akpm:akpm/master +From ../rebase-tmp + + 2ad7824c0d55...f1de864ef49f akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (f1de864ef49f drivers/media/platform/sti/delta/delta-ipc.c: fix read buffer overflow) +$ git merge --no-ff akpm/master +Removing include/asm-generic/sizes.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 9 + + arch/arm/common/sa1111.c | 2 +- + arch/arm/include/asm/Kbuild | 1 - + arch/arm/mach-imx/devices/platform-fec.c | 2 +- + arch/arm/mach-imx/devices/platform-gpio_keys.c | 2 +- + arch/arm/mach-imx/devices/platform-imx2-wdt.c | 2 +- + arch/arm/mach-imx/devices/platform-mxc_nand.c | 2 +- + arch/arm/mach-imx/hardware.h | 2 +- + arch/arm/mach-integrator/impd1.c | 2 +- + arch/arm/mach-iop13xx/pci.c | 2 +- + arch/arm/mach-iop13xx/tpmi.c | 2 +- + arch/arm/mach-ixp4xx/common-pci.c | 2 +- + arch/arm/mach-ks8695/include/mach/hardware.h | 2 +- + arch/arm/mach-omap1/include/mach/hardware.h | 2 +- + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 2 +- + arch/arm/mach-prima2/common.c | 2 +- + arch/arm/mach-pxa/balloon3.c | 2 +- + arch/arm/mach-pxa/colibri-pxa270.c | 2 +- + arch/arm/mach-pxa/colibri-pxa300.c | 2 +- + arch/arm/mach-pxa/colibri-pxa320.c | 2 +- + arch/arm/mach-pxa/colibri-pxa3xx.c | 2 +- + arch/arm/mach-pxa/gumstix.c | 2 +- + arch/arm/mach-pxa/lpd270.c | 2 +- + arch/arm/mach-pxa/lubbock.c | 2 +- + arch/arm/mach-pxa/mainstone.c | 2 +- + arch/arm/mach-pxa/trizeps4.c | 2 +- + arch/arm/mach-pxa/viper.c | 2 +- + arch/arm/mach-s3c24xx/include/mach/hardware.h | 2 +- + arch/arm/mach-sa1100/include/mach/memory.h | 2 +- + arch/arm/mach-sa1100/neponset.c | 2 +- + arch/arm/mach-tegra/iomap.h | 2 +- + arch/arm/mach-tegra/irammap.h | 2 +- + arch/arm/mach-w90x900/include/mach/hardware.h | 2 +- + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/boot.h | 2 +- + arch/arm64/include/asm/memory.h | 2 +- + arch/arm64/mm/init.c | 2 +- + arch/arm64/mm/mmu.c | 2 +- + arch/h8300/include/asm/Kbuild | 1 - + arch/hexagon/include/asm/Kbuild | 1 - + arch/nds32/include/asm/Kbuild | 1 - + arch/nds32/include/asm/pgtable.h | 2 +- + arch/nds32/kernel/head.S | 2 +- + arch/sh/boards/board-apsh4a3a.c | 2 +- + arch/sh/boards/board-apsh4ad0a.c | 2 +- + arch/sh/boards/board-edosk7705.c | 2 +- + arch/sh/boards/board-edosk7760.c | 2 +- + arch/sh/boards/board-espt.c | 2 +- + arch/sh/boards/board-urquell.c | 2 +- + arch/sh/boards/mach-microdev/setup.c | 2 +- + arch/sh/boards/mach-sdk7786/fpga.c | 2 +- + arch/sh/boards/mach-sdk7786/setup.c | 2 +- + arch/sh/boards/mach-sdk7786/sram.c | 2 +- + arch/sh/boards/mach-se/7343/irq.c | 2 +- + arch/sh/boards/mach-se/7722/irq.c | 2 +- + arch/sh/drivers/pci/pci-sh7751.c | 2 +- + arch/sh/drivers/pci/pci-sh7780.c | 2 +- + arch/sh/drivers/pci/pcie-sh7786.c | 2 +- + arch/sh/include/asm/Kbuild | 1 - + arch/sh/mm/init.c | 2 +- + arch/sh/mm/pmb.c | 2 +- + arch/sh/mm/uncached.c | 2 +- + arch/unicore32/include/asm/Kbuild | 1 - + arch/unicore32/include/asm/memory.h | 2 +- + arch/unicore32/mm/init.c | 2 +- + arch/unicore32/mm/ioremap.c | 2 +- + arch/unicore32/mm/mmu.c | 2 +- + arch/x86/events/intel/bts.c | 2 +- + drivers/gpu/drm/msm/msm_drv.h | 2 +- + drivers/iommu/msm_iommu.c | 2 +- + drivers/media/platform/sti/delta/delta-ipc.c | 4 +- + drivers/mmc/host/mvsdio.c | 2 +- + drivers/mmc/host/pxamci.c | 2 +- + drivers/mtd/maps/sa1100-flash.c | 2 +- + drivers/pcmcia/omap_cf.c | 2 +- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 1 + + drivers/sh/intc/userimask.c | 2 +- + drivers/video/fbdev/fb-puv3.c | 2 +- + drivers/virt/fsl_hypervisor.c | 29 +- + fs/block_dev.c | 1 - + fs/cachefiles/namei.c | 1 - + fs/coda/psdev.c | 1 - + include/asm-generic/sizes.h | 2 - + include/linux/cgroup-defs.h | 5 + + include/linux/memcontrol.h | 118 ++++---- + include/linux/sched/signal.h | 51 ++-- + kernel/cgroup/cgroup.c | 16 +- + mm/memcontrol.c | 312 +++++++++++++-------- + mm/vmscan.c | 6 +- + mm/workingset.c | 7 +- + 90 files changed, 403 insertions(+), 303 deletions(-) + delete mode 100644 include/asm-generic/sizes.h diff --git a/Next/quilt-import.log b/Next/quilt-import.log new file mode 100644 index 000000000000..ebc034a1a1b4 --- /dev/null +++ b/Next/quilt-import.log @@ -0,0 +1,2 @@ +Importing dmi based on 4.19-rc2 +Unchanged quilt series dmi diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..10e84555b24c --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190510 |