diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-05-01 21:49:21 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2019-05-01 21:49:21 +1000 |
| commit | bf2c8035bd8b364a912a2fe67083c1c2ea836d19 (patch) | |
| tree | 242cb5c26c2141ca19d64247dba6098841627387 | |
| parent | af92ee665f6cc4c982dc4c18f083bfabed24c608 (diff) | |
| download | linux-bf2c8035bd8b364a912a2fe67083c1c2ea836d19.tar.gz linux-bf2c8035bd8b364a912a2fe67083c1c2ea836d19.tar.xz | |
Add linux-next specific files for 20190501next-20190501
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 | 14020 | ||||
| -rw-r--r-- | Next/quilt-import.log | 2 | ||||
| -rw-r--r-- | localversion-next | 1 |
5 files changed, 14623 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..1283d2eaa5f8 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,299 @@ +Name SHA1 +---- ---- +origin bf3bd966dfd7d9582f50e9bd08b15922197cd277 +fixes 1995fa480636ec1d23af154751b8680881531f3f +kspp-gustavo ccaa75187a5f1d8131b424160eb90a8a94be287f +kbuild-current 79a3aaa7b82e3106be97842dedfd8429248896e6 +arc-current 55c0c4c793b538fb438bcc72481b9dc2f79fe5a9 +arm-current e17b1af96b2afc38e684aa2f1033387e2ed10029 +arm64-fixes 4e69ecf4da1ee0b2ac735e1f1bb13935acd5a38d +m68k-current 28713169d879b67be2ef2f84dcf54905de238294 +powerpc-fixes 7a3a4d763837d3aa654cd1059030950410c04d77 +sparc 7d762d69145a54d169f58e56d6dac57a5508debc +fscrypt-current ae64f9bd1d3621b5e60d7363bc20afb46aede215 +net 34259977f23cde5cac323055845ae5dd6343df0f +bpf 21f1b8a6636c4dbde4aa1ec0343f42eaf653ffcc +ipsec 837f74116585dcd235fae1696e1e1471b6bb9e01 +netfilter 33cc3c0cfa64c86b6c4bbee86997aea638534931 +ipvs b2e3d68d1251a051a620f9086e18f7ffa6833b5b +wireless-drivers 7a0f8ad5ff6323dd8badfeb01d338db146569976 +mac80211 517879147493a5e1df6b89a50f708f1133fcaddb +rdma-fixes d2360df0e4e6bca732957a3affaec6d698046708 +sound-current 3887c26c0e24d50a4d0ce20cf4726737cee1a2fd +sound-asoc-fixes 952f0986cc5176f373c8c8bcb63ca62445055f20 +regmap-fixes 7fdc9fc87492a79b9c7f9dba2311c1fc2b2c6bd4 +regulator-fixes 222d7eef42eb0ec8ebcdb5414f7d0162305ba556 +spi-fixes 9f2487a2ae45035a156092cbdd7eb27ac459a919 +pci-current cf68c9e8128a0ef2fc2532a78d4f91d40a39cf56 +driver-core.current 79a3aaa7b82e3106be97842dedfd8429248896e6 +tty.current 085b7755808aa11f78ab9377257e1dad2e6fa4bb +usb.current c114944d7d67f24e71562fcfc18d550ab787e4d4 +usb-gadget-fixes 072684e8c58d17e853f8e8b9f6d9ce2e58d2b036 +usb-serial-fixes 79a3aaa7b82e3106be97842dedfd8429248896e6 +usb-chipidea-fixes d6d768a0ec3c088a88635c64620e1fb34e298aef +phy e6f32efb1b128344a2c7df9875bc1a1abaa1d395 +staging.current 085b7755808aa11f78ab9377257e1dad2e6fa4bb +char-misc.current 24f1bc280bcedbde1c05bec2d9f7fbef4a7579ff +soundwire-fixes bfeffd155283772bbe78c6a05dec7c0128ee500c +thunderbolt-fixes 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b +input-current 3a349763cf11e63534b8f2d302f2d0c790566497 +crypto-current b257b48cd5830c5b1d0c347eb281f9c28056f881 +ide dc5c37736d16ec90559888fb4c974977fc8ed1ca +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 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +reset-fixes 13e8a05b922457761ddef39cfff6231bd4ed9eef +mips-fixes a1e8783db8e0d58891681bc1e6d9ada66eae8e20 +at91-fixes ba5e60c9b75dec92d4c695b928f69300b17d7686 +omap-fixes 6a38df676a0a06bfc7ff8607ac62ccd6d95969ad +kvm-fixes 6245242d9145815c3f4be71f7d8af858f7c66319 +kvms390-fixes b10bd9a256aec504c14a7c9b6fccb6301ecf290a +hwmon-fixes b88c5049219a7f322bb1fd65fc30d17472a23563 +nvdimm-fixes a7de824d947a1e684302c7ba8787ac96ceb011ab +btrfs-fixes 38464fdaacb53d7dfe265589476d4ccc6c466720 +vfs-fixes f69e749a49353d96af1a293f56b5b56de59c668a +dma-mapping-fixes 8c5165430c0194df92369162d1c7f53f8672baa5 +i3c-fixes 709a53e1948494cc4f6c4636c6f84a4d36a8117e +drivers-x86-fixes 57f634b76a95f6c007b66b0a52d4f71eb58163f1 +samsung-krzk-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pinctrl-samsung-fixes 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +devicetree-fixes 5fa98c2eda35fcd1a1d91a9785c390f54688240c +scsi-fixes 144ec97493af34efdb77c5aba146e9c7de8d0a06 +drm-fixes 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b +amdgpu-fixes f7b1844bacecca96dd8d813675e4d8adec02cd66 +drm-intel-fixes f5c58ba18ab8ea2169670ed880e4d31ed772ad10 +mmc-fixes dc4060a5dc2557e6b5aa813bf5b73677299d62d2 +rtc-fixes 882c5e552ffd06856de42261460f46e18319d259 +gnss-fixes 79a3aaa7b82e3106be97842dedfd8429248896e6 +hyperv-fixes a0033bd1eae4650b69be07c17cb87393da584563 +drm-misc-fixes ab042b824c11502bd39abfdfd4c7f285347d483a +kbuild 97011fda759d8422ef3d4c158bcc1cea5684df7f +compiler-attributes a3b22b9f11d9fbc48b0291ea92259a5a810e9438 +leaks 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +dma-mapping 148a97d5a02a62f81b5d6176f871c94a65e1f3af +asm-generic 6edd1dbace0e8529ed167e8a5f9da63c0cc763cc +arc 5908e6b738e3357af42c10e1183753c70a0117a9 +arm 3d3c616177cca070b77ef3f0dbe80d88d86d7bfb +arm64 9f0c4b6bef45d62df50fb961a9ee03e5630f44f8 +arm-perf 9bcb929f969e4054732158908b1d70e787ef780f +arm-soc c19ddad911592784e18c6d39a833647876fb74e5 +actions fb9c1c1deb5ece57810afdbd743358d02e632d2c +alpine 7928b2cbe55b2a410a0f5c1f154610059c57b1b2 +amlogic 14248aa919f9d4e8c434d67cf10e75597578c071 +aspeed e1542521499070f88b18846f676b4cd2a166aee5 +at91 ac650130c22794c21048aeff85fbc60319539a1d +bcm2835 1ee128f4fff29c1938f25160b0dafbe9feb57d1f +imx-mxs 7119403f9617a22bd8458ec14424f02132d7a034 +keystone 3c3a43c81bdaaec61aef208f94e8273b0309635c +mediatek 73ade6a629317bce9c17b83e266cfc0ba3e601a9 +mvebu 891f0f865c373499b7204e9e0029c94311a6bd34 +omap ef2989fe20d876efc9d611cf4582b81d63c5f2a8 +reset d005aa750c9b7ca7f77dafd6dda33a0fcb6e7ae3 +qcom 1d31c0b1a28aa9fdb6000066f5b9c495788f70fd +renesas 982700f80241a849fdd8031763f65263216c5400 +rockchip 9c539071723e13b493d9d8fa9b4409f346acd2be +samsung bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +samsung-krzk 831c757827724519ab6b79c1ff55868632080386 +sunxi 613c4ce8fddb5cc0e4061d4d024b00aef7135b4f +tegra b31c477a98920dd7ef962412f0d5f41ce48c997b +clk 5b3c66ad8a80fbe09897a1f3409c9b272aa58867 +clk-samsung 3c297d9e65d8cef2431c9865ece92722be028393 +c6x 8adcc59974b8a65b7eac7d503364837c297139bc +csky a691f3334d58b833e41d56de1b9820e687edcd78 +h8300 21c7acc439b55d0569d7c2fc2eea5194b3910406 +ia64 c51836246f9772dfab8ca7bb945f4a566fe502d5 +m68k 733df11cfc3614254e2b9a5c81ac205e98a90b82 +m68knommu 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b +microblaze 226a893bbb1f4495d7139fd57143475ada0de61d +mips cf0c4876684d287b6fe72699598517ca9b827216 +nds32 83f7b748f73932a82a53fe3b85f38613c91ffb05 +nios2 21e6bff5e0ef0033d776e64c40e6873d7c75e74b +openrisc 57ce8ba0fd3a95bf29ed741df1c52bd591bf43ff +parisc-hd 61726d43208f57b85cdf13831d047c3ef220be99 +powerpc 26ad26718dfaa7cf49d106d212ebf2370076c253 +fsl 63d86876f32440a45b6f9d42ab2fb7f68b3a8bf7 +risc-v-pjw 467e050e9760fc31dcf854ec88401e18419f5f78 +risc-v fd7f744caed82dcfd3a23bce8843836d6e94d584 +sifive 467e050e9760fc31dcf854ec88401e18419f5f78 +s390 7a5da02de8d6eafba99556f8c98e5313edebb449 +sparc-next b71acb0e372160167bf6d5500b88b30b52ccef6e +sh ac21fc2dcb405cf250ad3f1228f64f64930d9211 +uml aea05eb56e47046de1e5b508d40931dca969f1e5 +xtensa a26a70426e9b0ce8f512184447926de7fd5ee6ea +fscrypt 2c58d548f5706d085c4b009f6abb945220460632 +befs 55d945e2e4aa148ef38bdfabb9569af78183a539 +btrfs 29dcea88779c856c7dc92040a0c01233263101d4 +btrfs-kdave 6033347bcdd8e2acdf818faf7a86def6a353c73d +ceph 37659182bff1eeaaeadcfc8f853c6d2b6dbc3f47 +cifs eb54b6b100dac59ddcdd2033e1c8fa1329167bd5 +configfs cc57c07343bd071cdf1915a91a24ab7d40c9b590 +ecryptfs d43388dea04b18f516bd7c837d9222fe7309b12d +ext3 91e9f2c1d861697e0079a9f6742da164a173de59 +ext4 a046f4dfac7f3ebc8d23c24447383050962a53b0 +f2fs fd3ebe90089a7aa9865ff27b913dbc4e14845f7c +fuse 6407f44aaf2a39b5ccbb1cc1d342b906dcfa8a87 +jfs a5fdd713d256887b5f012608701149fa939e5645 +nfs 37624b58542fb9f2d9a70e6ea006ef8a5f66c30b +nfs-anna b422df915cef80333d7a1732e6ed81f41db12b79 +nfsd 5926459e7c897ee348c134f44da520c8bf234b05 +orangefs 7dccb4027ef92c4449235a31c00f059b49758dea +overlayfs 993a0b2aec52754f0897b1dab4c453be8217cae5 +ubifs 5578e48e5c0bf4684e68ae08caa2293bfb3f5307 +v9fs bb06c388fa20ae24cfe80c52488de718a7e3a53f +xfs 75efa57d0bf5fcf650a183f0ce0dc011ba8c4bc8 +file-locks 945ab8f6de94430c23a82f3cf2e3f6d6f2945ff7 +vfs af467ef6c590e322b31ec2b2c03d1ca545751894 +printk 3ba3fee931aa519741c7de23732ccf1d908965f1 +pci e564375c44604a437bfb8336b369c5361d73e6c7 +pstore 93ee4b7d9f0632690713aee604c49e298e634094 +hid eb18d12154054d0d7887bd891451e0d9b5a5574c +i2c 5dc8e322f1a8931880ec5a82e9034ab4a4073902 +i3c 124dbd750da4a9bf494ae9d8cbed364058140731 +dmi 57361846b52bc686112da6ca5368d11210796804 +hwmon-staging a60170000338c59b4de43e7c6e38413b8a748f0d +jc_docs 41f0a9542a253d79506584ab6353bcd6c4916150 +v4l-dvb 7afa8db323e37b9174cf78a1c9ab0ae7a9f5e7dd +v4l-dvb-next 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fbdev 261ac4ddfa9f128b41665abaf8e0e10a8f9e6b33 +pm f9d6fbd8a37e298d0d256d0ce77c6032477b74a0 +cpufreq-arm 8db82563451f976597ab7b282ec655e4390a4088 +cpupower 8c2ffd9174779014c3fe1f96d9dc3641d9175f00 +opp 2f36bde0fc8f1ab79d54bd2caa7c1cf874fd2206 +thermal c5e7be3b089dc3c88b331f12bf2f51a1cee27936 +thermal-soc 8834f5600cf3c8db365e18a3d5cac2c2780c81e5 +ieee1394 812cd88749e098ad976b6a1c149984dfd6c0f195 +dlm 54cca4bad0764cbac8e1c77cf5767663def5b0f5 +swiotlb 8395c154abb707a89859f66a322f5e1f624f4b0c +rdma 1d045aa76fe8105cbb9fc0dfa1d15ae332551f25 +net-next a658a3f2ecbabba60dafa9ba94f12fc25c18474f +bpf-next 9076c49bdca2aa68c805f2677b2bccc4bde2bac1 +ipsec-next bb9cd077e216b886438c5698e1cd75f762ecd3c9 +mlx5-next b169e64a24442e02cafee1586f17fcb713fe65a6 +netfilter-next 1de6f3342191e4e4da10919818126d4629f6ee66 +nfc-next 1f008cfec5d529b30ca8da1a1f5fbbd457c10382 +ipvs-next e2f7cc72cbf42e037229d8bd998966569662442f +wireless-drivers-next e3037485c68ec1a299ff41160d8fedbd4abc29b9 +bluetooth 632c596243025e4a95fd05073970c70f49e27848 +mac80211-next 88d6272acaaa4bfb03da0a87a8754ec431471680 +gfs2 79dc625c5d061ef28dd81a35c090c165c389ead2 +mtd 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +nand 1c14fe2167ef4294b41949bcc372ea39c0510c00 +spi-nor dcb4b22eeaf44f9122721ffc2b14d84363871454 +crypto 1036633e10f86b793e60dd8698c65df6712cad2a +drm 7c13e5cc2391950541f41fc9ab0336aae77c7f63 +amdgpu 9cf211b86430c4892dcd7b28fb7fc21aa2fb2127 +drm-intel 9628e15ca9d5f7595ba886173e98a139d0a56cd1 +drm-tegra 61b51fb51c01a519a249d28ec55c6513a13be5a3 +drm-misc 761e473f6b23f206862d904a1a5fcbc012656b47 +drm-msm b02872df58aca66d0e7af3ec5065dbc6f0630dd1 +hdlcd d664b851eb2bcdf84a3c063cf59457bb15bc6120 +mali-dp ed94cfab195fa46bfb13741439fbacb9534c0e16 +imx-drm 5d5fe9970c76ddf9c98ff6b56278bed6cb6b15b3 +etnaviv fd2450a77d3360ac3d54c84e0aa0672f4d8ad4b2 +kconfig bebc6082da0a9f5d47a1ea2edc099bf671058bd4 +regmap 615c4d9a50e25645646c3bafa658aedc22ab7ca9 +sound f495222e28275222ab6fd93813bd3d462e16d340 +sound-asoc 7e0f9ae5e356ae88b75b69940912b94ec2e5fd78 +modules 7e470ea99bcd471038f00fe458fc4714886b96d6 +input 7b5bb55d0dad859ee5bb41b1664e2ac577378c38 +block e62243e75d2256805fe538e62db1e318ca87b26a +device-mapper 940bc471780b004a5277c1931f52af363c2fc9da +pcmcia 95691e3eddc41da2d1cd3cca51fecdfb46bd85bc +mmc 7a8b9daf7ea6bfacf48d1082ea66c1b244ddffd4 +kgdb 3bd67b37e35069b43cc5de8d138727360c503e8f +md e820d55cb99dd93ac2dc949cf486bb187e5cd70d +mfd 7f042743306c3a9dc071952065514e2ae1814c1a +backlight a6d6a589cb09bda5f3828715510360ebfd6b536b +battery 231a13d93d5169600f161601de8a25c7bd31af44 +regulator 68b13529a118c28b463757beeceaf134cf544634 +security 5664f5faac1148d5ff9060644357fc0079aa0182 +apparmor 058c4f342582362c75dd5e162dc4ff73a392ffad +integrity a2ffe5774e8e4fa9d4f743ca6a25fa3cef046fbd +selinux 35a196bef449b5824033865b963ed9a43fb8c730 +tpmdd ff89e2f4b34dda492f4a14bad212ef9de570879c +watchdog 458c8961c194f2d2cb6ffed3dd9b6692d74ad65e +iommu 398ece5bde7e4927f61e667b3f1bf03bb20e02bd +dwmw2-iommu d8a5b80568a9cb66810e75b182018e9edb68e8ff +vfio 41be3e2618174fdf3361e49e64f2bf530f40c6b0 +trivial 75a24b822d383489badd343cab4cb171d09f93ef +audit 70c4cf17e445264453bc5323db3e50aa0ac9e81f +devicetree 57ddd16b111ba865cab2fa6188f72adb54332b1e +mailbox 17b860bbfc844a3d8e38135ef430d4af8e436b9e +spi b99fc29b35150b2afe5a45f5699e2623aeebefec +tip dbe37a300947c593e901b3718277c09053ae3e56 +clockevents dbfc6db7ba46e73b97dc32b9013f01d9b91d630e +edac-amd 74676a8e247a2163a25fb0ef98f17b74fbad9d21 +irqchip 89626d4bad8199367e2085fd2408b4d63df79f43 +ftrace 070ea1a24f403b68e76d9763cedd061917f6e1c1 +rcu 91df49e187c1a111e423fe0c3aec3472980385e4 +kvm 3a1e5e4a2c7a1ec63e6d70a7e921f62bcbb57b85 +kvm-arm 21137301de5a5bd8be7b0de7896c3f139b7eb859 +kvm-ppc 0caecf5b00199636eb2d32201199ecd6be52558d +kvms390 b2d0371d2e374facd45e115d3668086df13730ff +xen-tip 72813bfbf0276a97c82af038efb5f02dcdd9e310 +percpu cb453ce4846b4d421cd7ef595348bab28e9e2d69 +workqueues 24acfb71822566e4d469b4992a7b3b9f873e0083 +drivers-x86 98e2630284ab741804bd0713e932e725466f2f84 +chrome-platform cdb80268a6b553a25d37b688775fc204d487cc10 +hsi 1ff85bfa1614df6cacec780cd5922dc0b1c340c7 +leds c37f5a41b0f92300fb997ad5f557076b6e4833fc +ipmi ed6c3a6d8996659e3bbf4214ba26b5e5a7440b26 +driver-core 391c0325cc5f9e2daf9117825714d777b3595a42 +usb e823d948b7e53dc982c867ac4ce7877fc0418897 +usb-gadget 5895d311d28f2605e2f71c1a3e043ed38f3ac9d2 +usb-serial 80ed53707bb3ec92c331ca33f45c113338ee434d +usb-chipidea-next bc65fae4b1f01e269dad0cf62d721107d6bc93e2 +phy-next 708310711e6cdc1f5d8fb1d3fb531fba09ebae2e +tty 45c054d0815b1530d7c7ff8441389a0421dd05e7 +char-misc e21107aa6bf32a90f856c96d77806bf42eb8f238 +extcon 00053de52231117ddc154042549f2256183ffb86 +soundwire 4abbd783d126cabfc20d1b8d50b1d5026b5cba09 +thunderbolt 37209783c73a47692dbf1e6b2dba0d07f6ce24b3 +staging 39e8046240e2b1a4c2e431e08a3356abce93cf35 +mux 561eb7335f13dc8457cb5a4b2e4ed7b77ef17cbc +icc 83fdb2dfb0c2925f253449677830ed11461ac5c8 +slave-dma c6504be53972cd57326196eb2a18b2b182c26c5c +cgroup cd4f686eb6dfa465f9f61a7229640f909e9bf504 +scsi aec67294b839a072da85a0c1c226ff16719cf3ca +scsi-mkp 9bee24d08c08a08464b97e1da5c37acbc57a67df +target-updates 1c130ae00b769a2e2df41bad3d6051ee8234b636 +target-bva 60cc43fc888428bb2f18f08997432d426a243338 +vhost 4e76105b74c1fe63409864f12b042478c089e02c +rpmsg 6e9b4f32f9fabad43a0fe2fc3acd5468edd69c86 +gpio 93c6d8ca2807019819ef392cf16e4af030d00850 +gpio-brgl b0d2569d8276439eb3d6f7d221f47bfc503ae00e +pinctrl b7cd97cd140ff25e9d7cc1a671afb9606f4f8185 +pinctrl-samsung 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +pwm 9ff06679e109a216fc4a0cf5b4069a5305df141c +userns cf43a757fd49442bc38f76088b70c2299eed2c2f +ktest 6cd110a91f52197e3392809cd43466bfe2c524d0 +random b7d5dc21072cda7124d13eae2aefb7343ef94197 +kselftest d917fb876f6eaeeea8a2b620d2a266ce26372f4d +y2038 a2318b6a16a8a62fcacd454514cbe1227f2c0afc +livepatching 7df6a9f68d5df53177a19b294b7d4dd196f681ea +coresight b627167ed8e61990ed4e999a5249c7727d7d76b3 +rtc 87ccec4fd05d1cc89281e07a27659b1de3130718 +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 97498c96a1869f6e8563a042e490f187a39f68e7 +pidfd eb364bbe6791d3087a4d3411d9b040e61d9547be +devfreq cf451adfa392bd9ba36f31659dbe6a5010b46ef9 +akpm-current b78fc46079e444c5bdf3c2b843cccc2a195d1f75 +akpm 0095787e119c675a4ad32a9a0a8acb458a799701 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..c073a24fe382 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14020 @@ +$ date -R +Wed, 01 May 2019 08:15:10 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 80871482fd5c x86: make ZERO_PAGE() at least parse its argument +Merging origin/master (bf3bd966dfd7 Merge tag 'usb-5.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ git merge origin/master +Updating 80871482fd5c..bf3bd966dfd7 +Fast-forward + Documentation/driver-api/usb/power-management.rst | 14 ++++++---- + drivers/usb/core/driver.c | 13 --------- + drivers/usb/core/message.c | 4 ++- + drivers/usb/gadget/udc/dummy_hcd.c | 19 ++++++++++--- + drivers/usb/misc/yurex.c | 1 + + drivers/usb/storage/realtek_cr.c | 13 ++++----- + drivers/usb/usbip/stub_rx.c | 12 ++------ + drivers/usb/usbip/usbip_common.h | 7 +++++ + drivers/w1/masters/ds2490.c | 6 ++-- + include/linux/usb.h | 2 -- + kernel/seccomp.c | 17 ++++++++++-- + scripts/selinux/genheaders/genheaders.c | 1 - + scripts/selinux/mdp/mdp.c | 1 - + security/selinux/include/classmap.h | 1 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 34 +++++++++++++++++------ + 15 files changed, 87 insertions(+), 58 deletions(-) +Merging fixes/master (1995fa480636 kernel/compat.c: mark expected switch fall-throughs) +$ git merge fixes/master +Merge made by the 'recursive' strategy. + kernel/compat.c | 3 +++ + lib/siphash.c | 36 ++++++++++++++++++------------------ + 2 files changed, 21 insertions(+), 18 deletions(-) +Merging kspp-gustavo/for-next/kspp (ccaa75187a5f memstick: mark expected switch fall-throughs) +$ git merge kspp-gustavo/for-next/kspp +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/locks.c +Auto-merging fs/afs/yfsclient.c +Auto-merging fs/afs/rxrpc.c +Auto-merging fs/afs/fsclient.c +Auto-merging fs/afs/cmservice.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Merge made by the 'recursive' strategy. + drivers/block/drbd/drbd_int.h | 2 +- + drivers/block/drbd/drbd_receiver.c | 4 +-- + drivers/block/drbd/drbd_req.c | 2 +- + drivers/block/rsxx/core.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmi.c | 17 +++++++++++ + drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv04.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv04.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/engine/fifo/nv40.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/perf.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/bios/pll.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/clk/mcp77.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramnv40.c | 2 ++ + drivers/gpu/drm/nouveau/nvkm/subdev/mxm/nv50.c | 1 + + drivers/memstick/host/jmb38x_ms.c | 2 ++ + drivers/memstick/host/tifm_ms.c | 2 ++ + drivers/nfc/pn533/pn533.c | 2 ++ + drivers/nfc/st21nfca/dep.c | 2 ++ + drivers/scsi/aic7xxx/aic7xxx_core.c | 12 ++++++-- + drivers/scsi/be2iscsi/be_iscsi.c | 1 + + drivers/scsi/be2iscsi/be_main.c | 1 + + drivers/scsi/bfa/bfa_fcpim.c | 6 ++-- + drivers/scsi/csiostor/csio_wr.c | 1 + + drivers/scsi/imm.c | 33 +++++++++++----------- + drivers/scsi/lpfc/lpfc_ct.c | 2 ++ + drivers/scsi/lpfc/lpfc_els.c | 1 + + drivers/scsi/lpfc/lpfc_hbadisc.c | 4 ++- + drivers/scsi/lpfc/lpfc_nportdisc.c | 1 + + drivers/scsi/lpfc/lpfc_nvme.c | 1 + + drivers/scsi/lpfc/lpfc_scsi.c | 8 +++--- + drivers/scsi/osst.c | 6 ++++ + drivers/scsi/ppa.c | 1 + + drivers/scsi/sym53c8xx_2/sym_hipd.c | 2 ++ + drivers/scsi/sym53c8xx_2/sym_nvram.c | 1 + + fs/adfs/dir_f.c | 6 ++++ + fs/affs/super.c | 3 +- + fs/afs/cmservice.c | 8 ++++++ + fs/afs/file.c | 2 ++ + fs/afs/flock.c | 1 + + fs/afs/fsclient.c | 31 ++++++++++++-------- + fs/afs/misc.c | 9 ++++++ + fs/afs/rxrpc.c | 1 + + fs/afs/vlclient.c | 18 +++++++----- + fs/afs/yfsclient.c | 30 +++++++++++++------- + fs/btrfs/ref-verify.c | 1 + + fs/btrfs/volumes.h | 1 + + fs/ceph/file.c | 1 + + fs/configfs/dir.c | 2 ++ + fs/f2fs/node.c | 2 ++ + fs/fcntl.c | 2 +- + fs/gfs2/bmap.c | 4 +-- + fs/jffs2/fs.c | 1 + + fs/libfs.c | 2 ++ + fs/locks.c | 2 +- + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/nfs4state.c | 1 + + fs/ocfs2/cluster/quorum.c | 1 + + fs/seq_file.c | 1 + + fs/signalfd.c | 1 + + fs/ufs/util.h | 4 +-- + lib/asn1_decoder.c | 4 +++ + lib/cmdline.c | 5 ++++ + lib/zstd/bitstream.h | 5 ++++ + lib/zstd/compress.c | 1 + + lib/zstd/decompress.c | 5 +++- + lib/zstd/huf_compress.c | 2 ++ + 66 files changed, 216 insertions(+), 68 deletions(-) +Merging kbuild-current/fixes (79a3aaa7b82e Linux 5.1-rc3) +$ git merge kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (55c0c4c793b5 ARC: memset: fix build with L1_CACHE_SHIFT != 6) +$ git merge arc-current/for-curr +Merge made by the 'recursive' strategy. + arch/arc/boot/dts/hsdk.dts | 13 +++++++------ + arch/arc/lib/memset-archs.S | 4 ++-- + arch/arc/mm/cache.c | 31 ++++++++++++++++--------------- + 3 files changed, 25 insertions(+), 23 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 (28713169d879 m68k: Add -ffreestanding to CFLAGS) +$ git merge m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (7a3a4d763837 powerpc/mm_iommu: Allow pinning large regions) +$ git merge powerpc-fixes/fixes +Already up to date. +Merging sparc/master (7d762d69145a afs: Fix manually set volume location server list) +$ git merge sparc/master +Already up to date. +Merging fscrypt-current/for-stable (ae64f9bd1d36 Linux 4.15-rc2) +$ git merge fscrypt-current/for-stable +Already up to date. +Merging net/master (34259977f23c Merge tag 'wireless-drivers-for-davem-2019-04-30' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers) +$ git merge net/master +Merge made by the 'recursive' strategy. + Documentation/networking/ip-sysctl.txt | 2 + + arch/mips/net/ebpf_jit.c | 5 +- + drivers/net/dsa/bcm_sf2_cfp.c | 6 ++ + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 53 +++++++++------ + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 3 + + drivers/net/ieee802154/mcr20a.c | 6 ++ + drivers/net/phy/marvell.c | 6 +- + drivers/net/usb/qmi_wwan.c | 10 +++ + drivers/net/wireless/ath/ath10k/ce.c | 2 +- + drivers/net/wireless/ath/ath10k/core.c | 1 + + drivers/net/wireless/ath/ath10k/core.h | 3 + + drivers/net/wireless/ath/ath10k/coredump.c | 6 +- + drivers/net/wireless/ath/ath10k/mac.c | 4 +- + drivers/net/wireless/ath/ath10k/pci.c | 24 +++++-- + drivers/net/wireless/ath/ath10k/pci.h | 2 + + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/5000.c | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 15 +++-- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 3 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 28 ++++++-- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 19 ++++-- + drivers/net/wireless/marvell/mwifiex/sdio.c | 2 +- + include/linux/bpf.h | 2 +- + include/net/xfrm.h | 20 +++++- + kernel/bpf/verifier.c | 76 +++++++++++++--------- + net/appletalk/ddp.c | 1 + + net/ipv4/esp4.c | 20 ++++-- + net/ipv4/esp4_offload.c | 8 ++- + net/ipv4/ip_vti.c | 9 ++- + net/ipv4/tcp_ipv4.c | 13 +++- + net/ipv4/udp_offload.c | 9 +-- + net/ipv4/xfrm4_policy.c | 24 +++---- + net/ipv6/esp6_offload.c | 8 ++- + net/ipv6/ip6_flowlabel.c | 22 ++++--- + net/ipv6/route.c | 23 +++++-- + net/ipv6/xfrm6_tunnel.c | 6 +- + net/key/af_key.c | 4 +- + net/l2tp/l2tp_core.c | 10 +-- + net/mac80211/debugfs_netdev.c | 2 +- + net/mac80211/ht.c | 5 +- + net/mac80211/iface.c | 3 + + net/netlink/genetlink.c | 4 +- + net/rxrpc/call_object.c | 32 ++++----- + net/tls/tls_device.c | 39 +++++++---- + net/wireless/reg.c | 5 +- + net/xfrm/xfrm_interface.c | 17 ++++- + net/xfrm/xfrm_policy.c | 2 +- + net/xfrm/xfrm_state.c | 2 +- + net/xfrm/xfrm_user.c | 16 +---- + tools/bpf/bpftool/map.c | 3 + + tools/lib/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/verifier/calls.c | 25 +++++++ + .../selftests/bpf/verifier/direct_packet_access.c | 22 +++++++ + 56 files changed, 448 insertions(+), 199 deletions(-) +Merging bpf/master (21f1b8a6636c udp: fix GRO reception in case of length mismatch) +$ git merge bpf/master +Already up to date. +Merging ipsec/master (837f74116585 xfrm: update doc about xfrm[46]_gc_thresh) +$ git merge ipsec/master +Already up to date. +Merging netfilter/master (33cc3c0cfa64 netfilter: nf_flow_table: check ttl value in flow offload data path) +$ git merge netfilter/master +Merge made by the 'recursive' strategy. + net/netfilter/nf_flow_table_ip.c | 6 +++++ + net/netfilter/nf_tables_api.c | 50 +++++++++++++++++++++++++++++++--------- + net/netfilter/nft_flow_offload.c | 4 ++-- + 3 files changed, 47 insertions(+), 13 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 (517879147493 mac80211: don't attempt to rename ERR_PTR() debugfs dirs) +$ git merge mac80211/master +Already up to date. +Merging rdma-fixes/for-rc (d2360df0e4e6 Revert "RDMA/uverbs: Fix compilation error on s390 and mips platforms") +$ git merge rdma-fixes/for-rc +Already up to date! +Merge made by the 'recursive' strategy. +Merging sound-current/for-linus (3887c26c0e24 ALSA: hda/realtek - Apply the fixup for ASUS Q325UAR) +$ git merge sound-current/for-linus +Merge made by the 'recursive' strategy. + sound/pci/hda/patch_realtek.c | 13 ++++++++++ + sound/usb/line6/driver.c | 60 +++++++++++++++++++++++++------------------ + sound/usb/line6/podhd.c | 21 ++++++++------- + sound/usb/line6/toneport.c | 24 ++++++++++++----- + 4 files changed, 78 insertions(+), 40 deletions(-) +Merging sound-asoc-fixes/for-linus (952f0986cc51 Merge branch 'asoc-5.1' into asoc-linus) +$ git merge sound-asoc-fixes/for-linus +Merge made by the 'recursive' strategy. + sound/soc/codecs/hdac_hdmi.c | 11 +++++++++++ + sound/soc/codecs/rt5682.c | 2 +- + sound/soc/mediatek/common/mtk-btcvsd.c | 4 ++-- + sound/soc/sh/rcar/core.c | 18 +++++++++++++----- + sound/soc/sh/rcar/rsnd.h | 1 + + sound/soc/sh/rcar/ssi.c | 2 ++ + sound/soc/stm/stm32_i2s.c | 5 +++-- + 7 files changed, 33 insertions(+), 10 deletions(-) +Merging regmap-fixes/for-linus (7fdc9fc87492 Merge branch 'regmap-5.1' into regmap-linus) +$ git merge regmap-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/base/regmap/regmap-irq.c | 3 --- + 1 file changed, 3 deletions(-) +Merging regulator-fixes/for-linus (222d7eef42eb Merge branch 'regulator-5.1' into regulator-linus) +$ git merge regulator-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/regulator/core.c | 15 +++++++-------- + drivers/regulator/max77620-regulator.c | 2 +- + drivers/regulator/tps65217-regulator.c | 2 +- + 3 files changed, 9 insertions(+), 10 deletions(-) +Merging spi-fixes/for-linus (9f2487a2ae45 Merge branch 'spi-5.1' into spi-linus) +$ git merge spi-fixes/for-linus +Merge made by the 'recursive' strategy. + drivers/spi/atmel-quadspi.c | 6 +- + drivers/spi/spi-fsl-lpspi.c | 4 +- + drivers/spi/spi-gpio.c | 1 - + drivers/spi/spi-imx.c | 2 +- + drivers/spi/spi-pic32.c | 2 +- + drivers/spi/spi-rspi.c | 119 ++++++++++------------- + drivers/spi/spi-stm32-qspi.c | 4 +- + drivers/spi/spi-stm32.c | 5 +- + drivers/spi/spi-tegra114.c | 208 ++++++++++++++++++++++++++++------------ + drivers/spi/spi-tegra20-slink.c | 12 ++- + drivers/spi/spi-topcliff-pch.c | 15 ++- + drivers/spi/spi.c | 4 + + 12 files changed, 234 insertions(+), 148 deletions(-) +Merging pci-current/for-linus (cf68c9e8128a Revert "PCI/LINK: Report degraded links via link bandwidth notification") +$ git merge pci-current/for-linus +Removing drivers/pci/pcie/bw_notification.c +Merge made by the 'recursive' strategy. + drivers/pci/pci.c | 19 +++++- + drivers/pci/pci.h | 1 - + drivers/pci/pcie/Makefile | 1 - + drivers/pci/pcie/bw_notification.c | 121 ------------------------------------- + drivers/pci/pcie/portdrv.h | 6 +- + drivers/pci/pcie/portdrv_core.c | 17 ++---- + drivers/pci/pcie/portdrv_pci.c | 1 - + drivers/pci/probe.c | 2 +- + 8 files changed, 24 insertions(+), 144 deletions(-) + delete mode 100644 drivers/pci/pcie/bw_notification.c +Merging driver-core.current/driver-core-linus (79a3aaa7b82e Linux 5.1-rc3) +$ git merge driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (085b7755808a Linux 5.1-rc6) +$ git merge tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (c114944d7d67 USB: w1 ds2490: Fix bug caused by improper use of altsetting array) +$ 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 +Auto-merging drivers/phy/allwinner/phy-sun4i-usb.c +Merge made by the 'recursive' strategy. + drivers/phy/allwinner/Kconfig | 9 +++++--- + drivers/phy/allwinner/phy-sun4i-usb.c | 4 ++++ + drivers/phy/marvell/phy-mvebu-a3700-utmi.c | 1 - + drivers/phy/motorola/Kconfig | 2 +- + drivers/phy/qualcomm/phy-qcom-ufs.c | 2 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 4 ++-- + drivers/phy/ti/Kconfig | 2 +- + drivers/phy/ti/phy-twl4030-usb.c | 35 +++++++++++------------------- + 8 files changed, 28 insertions(+), 31 deletions(-) +Merging staging.current/staging-linus (085b7755808a Linux 5.1-rc6) +$ git merge staging.current/staging-linus +Already up to date. +Merging char-misc.current/char-misc-linus (24f1bc280bce misc: rtsx: Fixed rts5260 power saving parameter and sd glitch) +$ git merge char-misc.current/char-misc-linus +Merge made by the 'recursive' strategy. + Documentation/ABI/stable/sysfs-bus-vmbus | 12 ++- + drivers/android/binder_alloc.c | 8 +- + drivers/hv/channel_mgmt.c | 3 + + drivers/hv/hv.c | 1 - + drivers/hv/hyperv_vmbus.h | 3 + + drivers/hv/ring_buffer.c | 22 +++- + drivers/hv/vmbus_drv.c | 166 +++++++++++++++++++++++++------ + drivers/hwtracing/intel_th/pci.c | 5 + + drivers/hwtracing/stm/core.c | 9 +- + drivers/misc/cardreader/rts5260.c | 7 +- + include/linux/hyperv.h | 7 +- + 11 files changed, 192 insertions(+), 51 deletions(-) +Merging soundwire-fixes/fixes (bfeffd155283 Linux 5.0-rc1) +$ git merge soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (37624b58542f Linux 5.1-rc7) +$ 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 (b257b48cd583 crypto: lrw - Fix atomic sleep when walking skcipher) +$ git merge crypto-current/master +Already up to date. +Merging ide/master (dc5c37736d16 drivers: ide: Kconfig: pedantic formatting) +$ 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 +Merge made by the 'recursive' strategy. + drivers/mtd/nand/raw/marvell_nand.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +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 (9e98c678c2d6 Linux 5.1-rc1) +$ 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 (6a38df676a0a ARM: dts: logicpd-som-lv: Fix MMC1 card detect) +$ git merge omap-fixes/fixes +Merge made by the 'recursive' strategy. + arch/arm/boot/dts/logicpd-som-lv-baseboard.dtsi | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging kvm-fixes/master (6245242d9145 Merge tag 'kvmarm-fixes-for-5.1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into kvm-master) +$ git merge kvm-fixes/master +Merge made by the 'recursive' strategy. + Documentation/virtual/kvm/api.txt | 11 ++-- + arch/powerpc/kvm/book3s_64_vio.c | 6 +- + arch/powerpc/kvm/book3s_hv.c | 4 +- + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/kvm/hyperv.c | 11 +++- + arch/x86/kvm/lapic.c | 73 ++++++++++++++++------- + arch/x86/kvm/lapic.h | 4 +- + arch/x86/kvm/mmu.c | 1 + + arch/x86/kvm/vmx/vmenter.S | 12 ++++ + arch/x86/kvm/vmx/vmx.c | 7 +-- + arch/x86/kvm/x86.c | 36 ++++++++--- + arch/x86/kvm/x86.h | 2 - + tools/testing/selftests/kvm/dirty_log_test.c | 9 ++- + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 9 ++- + virt/kvm/arm/arch_timer.c | 17 +++--- + virt/kvm/arm/arm.c | 11 +++- + virt/kvm/arm/mmu.c | 6 +- + virt/kvm/arm/vgic/vgic-mmio-v3.c | 3 + + virt/kvm/arm/vgic/vgic.c | 21 +++++++ + virt/kvm/arm/vgic/vgic.h | 1 + + virt/kvm/kvm_main.c | 7 ++- + 22 files changed, 190 insertions(+), 63 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/hwmon/occ/sysfs.c | 8 ++++---- + drivers/hwmon/pwm-fan.c | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (a7de824d947a Merge branch 'for-5.1/dax' into libnvdimm-for-next) +$ git merge nvdimm-fixes/libnvdimm-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging btrfs-fixes/next-fixes (38464fdaacb5 Merge branch 'misc-5.1' into next-fixes) +$ git merge btrfs-fixes/next-fixes +Already up to date! +Merge made by the 'recursive' strategy. +Merging vfs-fixes/fixes (f69e749a4935 Abort file_remove_privs() for non-reg. files) +$ git merge vfs-fixes/fixes +Merge made by the 'recursive' strategy. + fs/inode.c | 9 +++++++-- + fs/super.c | 5 ----- + security/apparmor/apparmorfs.c | 13 +++++++++---- + security/inode.c | 13 +++++++++---- + 4 files changed, 25 insertions(+), 15 deletions(-) +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 (57f634b76a95 platform/x86: dell-laptop: fix rfkill functionality) +$ git merge drivers-x86-fixes/fixes +Merge made by the 'recursive' strategy. + drivers/platform/x86/dell-laptop.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 (37624b58542f Linux 5.1-rc7) +$ 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 (a0033bd1eae4 Drivers: hv: vmbus: Remove the undesired put_cpu_ptr() in hv_synic_cleanup()) +$ git merge hyperv-fixes/hyperv-fixes +Already up to date. +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 +Merge made by the 'recursive' strategy. + drivers/gpu/drm/qxl/qxl_drv.c | 4 ++++ + drivers/gpu/drm/qxl/qxl_prime.c | 12 ++++++++++++ + 2 files changed, 16 insertions(+) +Merging kbuild/for-next (97011fda759d Merge branch 'kbuild' into for-next) +$ git merge kbuild/for-next +Removing drivers/memory/Makefile.asm-offsets +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 122 ++++++++++++++++++++---------------- + drivers/memory/Makefile | 7 ++- + drivers/memory/Makefile.asm-offsets | 4 -- + scripts/Makefile.build | 2 +- + scripts/Makefile.host | 2 +- + scripts/Makefile.lib | 2 +- + scripts/Makefile.modbuiltin | 2 +- + scripts/Makefile.modpost | 2 +- + scripts/gdb/linux/Makefile | 2 +- + scripts/kconfig/nconf-cfg.sh | 0 + scripts/mkmakefile | 26 +------- + scripts/tags.sh | 2 +- + 12 files changed, 82 insertions(+), 91 deletions(-) + delete mode 100644 drivers/memory/Makefile.asm-offsets + 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 (148a97d5a02a dma-mapping: remove an unnecessary NULL check) +$ git merge dma-mapping/for-next +Merge made by the 'recursive' strategy. + Documentation/DMA-API-HOWTO.txt | 13 ++++++------- + arch/arm/kernel/dma-isa.c | 8 +++++++- + arch/arm/mach-rpc/dma.c | 8 +++++++- + arch/x86/include/asm/dma-mapping.h | 10 ---------- + arch/x86/kernel/amd_gart_64.c | 6 ------ + arch/x86/kernel/pci-dma.c | 20 -------------------- + drivers/parport/parport_ip32.c | 18 ++++++++++-------- + drivers/video/fbdev/da8xx-fb.c | 13 +++++++------ + drivers/video/fbdev/gbefb.c | 24 ++++++++---------------- + drivers/video/fbdev/pxa3xx-gcu.c | 4 +++- + include/linux/dma-mapping.h | 6 +++--- + kernel/dma/Kconfig | 1 + + kernel/dma/direct.c | 2 +- + kernel/dma/mapping.c | 9 +-------- + 14 files changed, 54 insertions(+), 88 deletions(-) +Merging asm-generic/master (6edd1dbace0e asm-generic: optimize generic uaccess for 8-byte loads and stores) +$ git merge asm-generic/master +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 +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/c6x/include/asm/Kbuild +Removing arch/alpha/include/asm/segment.h +Merge made by the 'recursive' strategy. + 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 (9f0c4b6bef45 Merge branches 'for-next/futex' and '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 +Auto-merging virt/kvm/arm/mmu.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_int.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_main.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c +Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c +Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c +Auto-merging drivers/mmc/host/alcor.c +Auto-merging drivers/memstick/host/jmb38x_ms.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/hfi1/chip.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Auto-merging arch/unicore32/include/asm/Kbuild +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 +Auto-merging arch/hexagon/include/asm/Kbuild +Auto-merging arch/h8300/include/asm/Kbuild +Auto-merging arch/c6x/include/asm/Kbuild +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/include/asm/futex.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/futex.h +Auto-merging arch/arm64/include/asm/Kbuild +Auto-merging arch/arm/include/asm/Kbuild +Resolved 'arch/arm64/include/asm/futex.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6233b09572ba] Merge remote-tracking branch 'arm64/for-next/core' +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/cpu-feature-registers.txt | 16 ++ + Documentation/arm64/elf_hwcaps.txt | 41 +++- + Documentation/arm64/sve.txt | 17 ++ + Documentation/driver-api/device-io.rst | 45 ---- + Documentation/driver-api/pci/p2pdma.rst | 4 - + Documentation/memory-barriers.txt | 249 +++++++++------------ + Documentation/robust-futexes.txt | 3 +- + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/io.h | 2 - + arch/arc/include/asm/Kbuild | 1 + + arch/arm/include/asm/Kbuild | 1 + + arch/arm/include/asm/io.h | 2 - + arch/arm/include/asm/stage2_pgtable.h | 4 +- + arch/arm64/Kconfig | 92 +++++--- + arch/arm64/boot/dts/mediatek/mt2712-pinfunc.h | 2 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 2 +- + arch/arm64/crypto/aes-neonbs-glue.c | 2 +- + arch/arm64/crypto/chacha-neon-glue.c | 2 +- + arch/arm64/crypto/crct10dif-ce-glue.c | 4 +- + arch/arm64/crypto/ghash-ce-glue.c | 8 +- + arch/arm64/crypto/nhpoly1305-neon-glue.c | 2 +- + arch/arm64/crypto/sha256-glue.c | 4 +- + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/assembler.h | 8 +- + arch/arm64/include/asm/barrier.h | 24 +- + arch/arm64/include/asm/brk-imm.h | 5 + + arch/arm64/include/asm/cpucaps.h | 3 +- + arch/arm64/include/asm/cpufeature.h | 21 +- + arch/arm64/include/asm/debug-monitors.h | 25 ++- + arch/arm64/include/asm/elf.h | 6 +- + arch/arm64/include/asm/esr.h | 7 +- + arch/arm64/include/asm/futex.h | 61 +++-- + arch/arm64/include/asm/hwcap.h | 60 ++++- + arch/arm64/include/asm/io.h | 2 - + arch/arm64/include/asm/irqflags.h | 8 +- + arch/arm64/include/asm/kprobes.h | 2 - + arch/arm64/include/asm/kvm_hyp.h | 4 +- + arch/arm64/include/asm/memory.h | 2 +- + arch/arm64/include/asm/pgalloc.h | 12 +- + arch/arm64/include/asm/pointer_auth.h | 2 +- + arch/arm64/include/asm/processor.h | 8 + + arch/arm64/include/asm/ptrace.h | 22 ++ + arch/arm64/include/asm/sdei.h | 2 +- + arch/arm64/include/asm/signal32.h | 2 - + arch/arm64/include/asm/stage2_pgtable.h | 4 +- + arch/arm64/include/asm/sysreg.h | 59 +++-- + arch/arm64/include/asm/system_misc.h | 1 - + arch/arm64/include/asm/tlb.h | 5 +- + arch/arm64/include/asm/vdso_datapage.h | 1 + + arch/arm64/include/asm/vmap_stack.h | 2 +- + arch/arm64/include/uapi/asm/hwcap.h | 13 +- + arch/arm64/kernel/Makefile | 11 +- + arch/arm64/kernel/asm-offsets.c | 2 +- + arch/arm64/kernel/cpu_ops.c | 1 + + arch/arm64/kernel/cpufeature.c | 127 ++++++++--- + arch/arm64/kernel/cpuinfo.c | 9 +- + arch/arm64/kernel/debug-monitors.c | 115 ++++++---- + arch/arm64/kernel/fpsimd.c | 4 +- + arch/arm64/kernel/head.S | 10 +- + arch/arm64/kernel/kgdb.c | 30 +-- + arch/arm64/kernel/kuser32.S | 66 +----- + arch/arm64/kernel/probes/kprobes.c | 22 +- + arch/arm64/kernel/probes/uprobes.c | 19 +- + arch/arm64/kernel/signal32.c | 3 +- + arch/arm64/kernel/sigreturn32.S | 46 ++++ + arch/arm64/kernel/traps.c | 29 +-- + arch/arm64/kernel/vdso.c | 139 +++++++++--- + arch/arm64/kernel/vdso/Makefile | 19 +- + arch/arm64/kernel/vdso/gettimeofday.S | 7 +- + arch/arm64/lib/Makefile | 2 +- + arch/arm64/mm/fault.c | 16 +- + arch/arm64/mm/init.c | 5 +- + arch/arm64/mm/mmu.c | 47 ++-- + arch/arm64/mm/numa.c | 25 +-- + arch/arm64/mm/proc.S | 34 +-- + arch/c6x/include/asm/Kbuild | 1 + + arch/csky/include/asm/Kbuild | 1 + + arch/h8300/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/Kbuild | 1 + + arch/hexagon/include/asm/io.h | 2 - + arch/ia64/include/asm/io.h | 17 -- + arch/ia64/include/asm/mmiowb.h | 25 +++ + arch/ia64/include/asm/spinlock.h | 2 + + arch/m68k/include/asm/Kbuild | 1 + + arch/m68k/include/asm/io_mm.h | 2 - + arch/microblaze/include/asm/Kbuild | 1 + + arch/mips/include/asm/io.h | 3 - + arch/mips/include/asm/mmiowb.h | 11 + + arch/mips/include/asm/spinlock.h | 15 ++ + arch/nds32/include/asm/Kbuild | 1 + + arch/nds32/include/asm/io.h | 2 - + arch/nios2/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/Kbuild | 1 + + arch/parisc/include/asm/io.h | 2 - + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/io.h | 33 +-- + arch/powerpc/include/asm/mmiowb.h | 18 ++ + arch/powerpc/include/asm/paca.h | 6 +- + arch/powerpc/include/asm/spinlock.h | 17 -- + arch/powerpc/xmon/xmon.c | 5 +- + arch/riscv/Kconfig | 1 + + arch/riscv/include/asm/io.h | 15 +- + arch/riscv/include/asm/mmiowb.h | 14 ++ + arch/s390/include/asm/Kbuild | 1 + + arch/sh/include/asm/io.h | 3 - + arch/sh/include/asm/mmiowb.h | 12 + + arch/sh/include/asm/spinlock-llsc.h | 2 + + arch/sparc/include/asm/Kbuild | 1 + + arch/sparc/include/asm/io_64.h | 2 - + arch/um/include/asm/Kbuild | 1 + + arch/unicore32/include/asm/Kbuild | 1 + + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/io.h | 2 - + arch/xtensa/include/asm/Kbuild | 1 + + drivers/acpi/arm64/iort.c | 19 +- + drivers/clocksource/arm_arch_timer.c | 8 + + drivers/crypto/cavium/nitrox/nitrox_reqmgr.c | 4 - + drivers/dma/txx9dmac.c | 3 - + drivers/firewire/ohci.c | 1 - + drivers/firmware/efi/libstub/Makefile | 6 +- + drivers/gpu/drm/i915/intel_hdmi.c | 10 - + drivers/ide/tx4939ide.c | 2 - + drivers/infiniband/hw/hfi1/chip.c | 3 - + drivers/infiniband/hw/hfi1/pio.c | 1 - + drivers/infiniband/hw/hns/hns_roce_hw_v1.c | 2 - + drivers/infiniband/hw/i40iw/i40iw_osdep.h | 2 +- + drivers/infiniband/hw/mlx4/qp.c | 6 - + drivers/infiniband/hw/mlx5/qp.c | 1 - + drivers/infiniband/hw/mthca/mthca_cmd.c | 6 - + drivers/infiniband/hw/mthca/mthca_cq.c | 5 - + drivers/infiniband/hw/mthca/mthca_qp.c | 17 -- + drivers/infiniband/hw/mthca/mthca_srq.c | 6 - + drivers/infiniband/hw/qedr/verbs.c | 12 - + drivers/infiniband/hw/qib/qib_iba6120.c | 4 - + drivers/infiniband/hw/qib/qib_iba7220.c | 3 - + drivers/infiniband/hw/qib/qib_iba7322.c | 3 - + drivers/infiniband/hw/qib/qib_sd7220.c | 4 - + drivers/media/pci/dt3155/dt3155.c | 8 - + drivers/memstick/host/jmb38x_ms.c | 4 - + drivers/misc/ioc4.c | 2 - + drivers/misc/mei/hw-me.c | 3 - + drivers/misc/tifm_7xx1.c | 1 - + drivers/mmc/host/alcor.c | 1 - + drivers/mmc/host/sdhci.c | 13 -- + drivers/mmc/host/tifm_sd.c | 3 - + drivers/mmc/host/via-sdmmc.c | 10 - + drivers/mtd/nand/raw/r852.c | 2 - + drivers/mtd/nand/raw/txx9ndfmc.c | 1 - + drivers/net/ethernet/aeroflex/greth.c | 1 - + drivers/net/ethernet/alacritech/slicoss.c | 4 - + drivers/net/ethernet/amazon/ena/ena_com.c | 1 - + drivers/net/ethernet/atheros/atlx/atl1.c | 1 - + drivers/net/ethernet/atheros/atlx/atl2.c | 1 - + drivers/net/ethernet/broadcom/bnx2.c | 4 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 4 - + .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 29 --- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c | 1 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 - + drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c | 4 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 3 - + drivers/net/ethernet/broadcom/tg3.c | 6 - + .../net/ethernet/cavium/liquidio/cn66xx_device.c | 10 - + .../net/ethernet/cavium/liquidio/octeon_device.c | 1 - + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 4 - + .../net/ethernet/cavium/liquidio/request_manager.c | 1 - + drivers/net/ethernet/intel/e1000/e1000_main.c | 5 - + drivers/net/ethernet/intel/e1000e/netdev.c | 7 - + drivers/net/ethernet/intel/fm10k/fm10k_iov.c | 2 - + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 5 - + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 - + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 5 - + drivers/net/ethernet/intel/ice/ice_txrx.c | 5 - + drivers/net/ethernet/intel/igb/igb_main.c | 5 - + drivers/net/ethernet/intel/igbvf/netdev.c | 4 - + drivers/net/ethernet/intel/igc/igc_main.c | 5 - + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 - + drivers/net/ethernet/marvell/sky2.c | 4 - + drivers/net/ethernet/mellanox/mlx4/catas.c | 4 - + drivers/net/ethernet/mellanox/mlx4/cmd.c | 13 -- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 1 - + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 2 - + drivers/net/ethernet/neterion/s2io.c | 2 - + drivers/net/ethernet/neterion/vxge/vxge-main.c | 5 - + drivers/net/ethernet/neterion/vxge/vxge-traffic.c | 4 - + drivers/net/ethernet/qlogic/qed/qed_int.c | 13 -- + drivers/net/ethernet/qlogic/qed/qed_spq.c | 3 - + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 8 - + drivers/net/ethernet/qlogic/qede/qede_fp.c | 8 - + drivers/net/ethernet/qlogic/qla3xxx.c | 1 - + drivers/net/ethernet/qlogic/qlge/qlge.h | 1 - + drivers/net/ethernet/qlogic/qlge/qlge_main.c | 1 - + drivers/net/ethernet/renesas/ravb_main.c | 9 - + drivers/net/ethernet/renesas/ravb_ptp.c | 3 - + drivers/net/ethernet/renesas/sh_eth.c | 1 - + drivers/net/ethernet/sfc/falcon/io.h | 2 - + drivers/net/ethernet/sfc/io.h | 2 - + drivers/net/ethernet/silan/sc92031.c | 15 -- + drivers/net/ethernet/via/via-rhine.c | 3 - + drivers/net/ethernet/wiznet/w5100.c | 6 - + drivers/net/ethernet/wiznet/w5300.c | 15 -- + drivers/net/wireless/ath/ath5k/base.c | 4 - + drivers/net/wireless/ath/ath5k/mac80211-ops.c | 2 - + drivers/net/wireless/broadcom/b43/main.c | 7 - + drivers/net/wireless/broadcom/b43/sysfs.c | 1 - + drivers/net/wireless/broadcom/b43legacy/ilt.c | 2 - + drivers/net/wireless/broadcom/b43legacy/main.c | 20 -- + drivers/net/wireless/broadcom/b43legacy/phy.c | 1 - + drivers/net/wireless/broadcom/b43legacy/pio.h | 1 - + drivers/net/wireless/broadcom/b43legacy/radio.c | 4 - + drivers/net/wireless/broadcom/b43legacy/sysfs.c | 1 - + drivers/net/wireless/intel/iwlegacy/common.h | 7 - + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 1 - + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 - + drivers/ntb/test/ntb_perf.c | 3 - + drivers/scsi/bfa/bfa.h | 3 +- + drivers/scsi/bfa/bfa_hw_cb.c | 2 - + drivers/scsi/bfa/bfa_hw_ct.c | 2 - + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 2 - + drivers/scsi/bnx2i/bnx2i_hwi.c | 3 - + drivers/scsi/megaraid/megaraid_sas_base.c | 1 - + drivers/scsi/megaraid/megaraid_sas_fusion.c | 1 - + drivers/scsi/mpt3sas/mpt3sas_base.c | 1 - + drivers/scsi/qedf/qedf_io.c | 1 - + drivers/scsi/qedi/qedi_fw.c | 1 - + drivers/scsi/qla1280.c | 15 -- + drivers/ssb/pci.c | 1 - + drivers/ssb/pcmcia.c | 4 - + drivers/staging/comedi/drivers/mite.c | 3 - + drivers/staging/comedi/drivers/ni_660x.c | 2 - + drivers/staging/comedi/drivers/ni_mio_common.c | 1 - + drivers/staging/comedi/drivers/ni_pcidio.c | 2 - + drivers/staging/comedi/drivers/ni_tio.c | 1 - + drivers/staging/comedi/drivers/s626.c | 2 - + drivers/tty/serial/men_z135_uart.c | 1 - + drivers/tty/serial/serial_txx9.c | 1 - + drivers/usb/early/xhci-dbc.c | 4 - + drivers/usb/host/xhci-dbgcap.c | 2 - + include/asm-generic/futex.h | 8 +- + include/asm-generic/io.h | 7 +- + include/asm-generic/mmiowb.h | 63 ++++++ + include/asm-generic/mmiowb_types.h | 12 + + include/linux/qed/qed_if.h | 2 - + include/linux/spinlock.h | 11 +- + kernel/Kconfig.locks | 7 + + kernel/futex.c | 188 ++++++++++------ + kernel/locking/spinlock.c | 7 + + kernel/locking/spinlock_debug.c | 6 +- + mm/kasan/Makefile | 6 +- + sound/soc/txx9/txx9aclc-ac97.c | 1 - + virt/kvm/arm/mmu.c | 2 +- + 253 files changed, 1377 insertions(+), 1387 deletions(-) + create mode 100644 arch/arm64/kernel/sigreturn32.S + create mode 100644 arch/ia64/include/asm/mmiowb.h + create mode 100644 arch/mips/include/asm/mmiowb.h + create mode 100644 arch/powerpc/include/asm/mmiowb.h + create mode 100644 arch/riscv/include/asm/mmiowb.h + create mode 100644 arch/sh/include/asm/mmiowb.h + create mode 100644 include/asm-generic/mmiowb.h + create mode 100644 include/asm-generic/mmiowb_types.h +Merging arm-perf/for-next/perf (9bcb929f969e perf/arm-ccn: Clean up CPU hotplug handling) +$ git merge arm-perf/for-next/perf +Auto-merging drivers/acpi/arm64/iort.c +Merge made by the 'recursive' strategy. + Documentation/arm64/silicon-errata.txt | 1 + + arch/arm64/kernel/perf_event.c | 4 +- + drivers/acpi/arm64/iort.c | 131 ++++- + drivers/perf/Kconfig | 9 + + drivers/perf/Makefile | 1 + + drivers/perf/arm-cci.c | 21 +- + drivers/perf/arm-ccn.c | 25 +- + drivers/perf/arm_smmuv3_pmu.c | 865 +++++++++++++++++++++++++++++++++ + include/linux/acpi_iort.h | 8 + + 9 files changed, 1018 insertions(+), 47 deletions(-) + create mode 100644 drivers/perf/arm_smmuv3_pmu.c +Merging arm-soc/for-next (c19ddad91159 ARM: Document merges) +$ git merge arm-soc/for-next +Auto-merging drivers/input/keyboard/Kconfig +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 +Removing arch/arm/firmware/Makefile +Removing arch/arm/firmware/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm/Kconfig.debug +Auto-merging arch/arm/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/arm/sunxi.txt +Merge made by the 'recursive' strategy. + 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/core.c | 180 +++- + 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/dwc3/dwc3-of-simple.c | 3 +- + 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 | 115 +- + 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 +- + 762 files changed, 30110 insertions(+), 11022 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 (14248aa919f9 Merge branch 'v5.2/drivers' into tmp/aml-rebuild) +$ git merge amlogic/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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 c76c1c174514] 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 (7119403f9617 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 +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master a85f3cbbdf09] 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 +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 (ef2989fe20d8 Merge branch 'fixes' into for-next) +$ git merge omap/for-next +Already up to date! +Merge made by the 'recursive' strategy. +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-ng/ccu_nkmp.c | 24 ++++++++++++---- + drivers/clk/sunxi/Kconfig | 43 ++++++++++++++++++++++++++++ + drivers/clk/sunxi/Makefile | 49 ++++++++++++++++++-------------- + include/dt-bindings/clock/sun5i-ccu.h | 2 +- + 11 files changed, 114 insertions(+), 41 deletions(-) + create mode 100644 drivers/clk/sunxi/Kconfig +Merging tegra/for-next (b31c477a9892 Merge branch for-5.2/arm64/defconfig into for-next) +$ git merge tegra/for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging clk/clk-next (5b3c66ad8a80 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 +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 +- + .../devicetree/bindings/clock/st,stm32-rcc.txt | 6 + + arch/powerpc/platforms/512x/clock-commonclk.c | 9 +- + drivers/clk/Kconfig | 7 + + drivers/clk/Makefile | 2 + + 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-divider.c | 24 +- + drivers/clk/clk-fixed-factor.c | 55 +- + drivers/clk/clk-fractional-divider.c | 22 +- + drivers/clk/clk-gate.c | 22 +- + 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 | 22 +- + 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 | 368 ++++-- + drivers/clk/clk.h | 2 + + drivers/clk/clkdev.c | 30 +- + drivers/clk/davinci/da8xx-cfgchip.c | 4 +- + 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-pll14xx.c | 6 +- + drivers/clk/imx/clk-pllv3.c | 29 +- + 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/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/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-gen3-cpg.c | 71 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 5 +- + drivers/clk/rockchip/clk-ddr.c | 2 +- + drivers/clk/rockchip/clk-half-divider.c | 6 +- + drivers/clk/samsung/clk-exynos5410.c | 1 + + 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/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 +- + 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.h | 16 + + include/linux/clk/at91_pmc.h | 12 +- + include/linux/device.h | 2 +- + include/linux/math64.h | 13 + + 146 files changed, 10034 insertions(+), 1312 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 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 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 +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 +Auto-merging arch/csky/include/asm/Kbuild +Merge made by the 'recursive' strategy. + arch/csky/Kconfig | 7 +- + arch/csky/Makefile | 2 +- + arch/csky/abiv1/inc/abi/ckmmu.h | 24 ++- + arch/csky/abiv1/inc/abi/entry.h | 41 ++-- + arch/csky/abiv1/inc/abi/regdef.h | 5 +- + arch/csky/abiv2/cacheflush.c | 13 +- + arch/csky/abiv2/inc/abi/ckmmu.h | 34 +++- + arch/csky/abiv2/inc/abi/entry.h | 87 +++++++-- + arch/csky/abiv2/inc/abi/regdef.h | 5 +- + arch/csky/abiv2/mcount.S | 39 +++- + arch/csky/abiv2/memmove.S | 6 +- + arch/csky/include/asm/Kbuild | 1 - + arch/csky/include/asm/ftrace.h | 18 +- + arch/csky/include/asm/mmu_context.h | 17 +- + arch/csky/include/asm/page.h | 39 ++-- + arch/csky/include/asm/perf_event.h | 8 + + arch/csky/include/asm/ptrace.h | 41 ++++ + arch/csky/include/asm/syscall.h | 9 + + arch/csky/include/asm/thread_info.h | 27 ++- + arch/csky/include/asm/unistd.h | 2 + + arch/csky/include/uapi/asm/perf_regs.h | 51 +++++ + arch/csky/include/uapi/asm/ptrace.h | 15 -- + arch/csky/kernel/Makefile | 2 + + arch/csky/kernel/atomic.S | 26 +-- + arch/csky/kernel/entry.S | 77 +++----- + arch/csky/kernel/ftrace.c | 148 +++++++++++++- + arch/csky/kernel/head.S | 60 +----- + arch/csky/kernel/perf_callchain.c | 119 +++++++++++ + arch/csky/kernel/perf_regs.c | 40 ++++ + arch/csky/kernel/ptrace.c | 51 +++-- + arch/csky/kernel/setup.c | 12 +- + arch/csky/kernel/signal.c | 348 +++++++++++++-------------------- + arch/csky/mm/fault.c | 15 +- + scripts/recordmcount.pl | 3 + + 34 files changed, 890 insertions(+), 502 deletions(-) + create mode 100644 arch/csky/include/asm/ptrace.h + create mode 100644 arch/csky/include/uapi/asm/perf_regs.h + create mode 100644 arch/csky/kernel/perf_callchain.c + create mode 100644 arch/csky/kernel/perf_regs.c +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 (733df11cfc36 m68k: defconfig: Update defconfigs for v5.1-rc1) +$ git merge m68k/for-next +Merge made by the 'recursive' strategy. + arch/m68k/Kconfig | 1 - + arch/m68k/amiga/cia.c | 9 +++ + arch/m68k/amiga/config.c | 49 +++++++++--- + arch/m68k/apollo/config.c | 7 -- + arch/m68k/atari/ataints.c | 4 +- + arch/m68k/atari/config.c | 2 - + arch/m68k/atari/time.c | 70 ++++++++++++----- + arch/m68k/bvme6000/config.c | 77 +++++++++++------- + arch/m68k/configs/amiga_defconfig | 14 ++-- + arch/m68k/configs/apollo_defconfig | 14 ++-- + arch/m68k/configs/atari_defconfig | 14 ++-- + arch/m68k/configs/bvme6000_defconfig | 14 ++-- + arch/m68k/configs/hp300_defconfig | 14 ++-- + arch/m68k/configs/mac_defconfig | 14 ++-- + arch/m68k/configs/multi_defconfig | 14 ++-- + arch/m68k/configs/mvme147_defconfig | 14 ++-- + arch/m68k/configs/mvme16x_defconfig | 14 ++-- + arch/m68k/configs/q40_defconfig | 14 ++-- + arch/m68k/configs/sun3_defconfig | 14 ++-- + arch/m68k/configs/sun3x_defconfig | 14 ++-- + arch/m68k/hp300/config.c | 1 - + arch/m68k/hp300/time.c | 73 +++++++++++++----- + arch/m68k/hp300/time.h | 1 - + arch/m68k/include/asm/mvme147hw.h | 2 +- + arch/m68k/mac/config.c | 3 - + arch/m68k/mac/via.c | 146 +++++++++++++++++++++++------------ + arch/m68k/mvme147/config.c | 73 ++++++++++++------ + arch/m68k/mvme16x/config.c | 97 ++++++++++++++++------- + arch/m68k/q40/config.c | 9 --- + arch/m68k/q40/q40ints.c | 19 +++-- + arch/m68k/sun3/config.c | 2 - + arch/m68k/sun3/intersil.c | 7 -- + arch/m68k/sun3/sun3ints.c | 3 + + arch/m68k/sun3x/config.c | 1 - + arch/m68k/sun3x/time.c | 21 +++-- + arch/m68k/sun3x/time.h | 1 - + 36 files changed, 517 insertions(+), 329 deletions(-) +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 (cf0c4876684d mips: Combine memblock init and memory reservation loops) +$ git merge mips/mips-next +Auto-merging arch/mips/net/ebpf_jit.c +Removing arch/mips/net/bpf_jit_asm.S +Removing arch/mips/net/bpf_jit.c +Merge made by the 'recursive' strategy. + 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/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/setup.c | 76 +-- + 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 +- + 19 files changed, 282 insertions(+), 1749 deletions(-) + delete mode 100644 arch/mips/net/bpf_jit.c + delete mode 100644 arch/mips/net/bpf_jit_asm.S +Merging nds32/next (83f7b748f739 nds32: fix asm/syscall.h) +$ git merge nds32/next +Auto-merging arch/nds32/include/asm/io.h +Auto-merging arch/nds32/include/asm/Kbuild +Merge made by the 'recursive' strategy. + 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/vdso/.gitignore | 1 + + arch/nds32/kernel/vdso/Makefile | 14 +++++--------- + arch/nds32/mm/init.c | 2 +- + 55 files changed, 83 insertions(+), 89 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 (61726d43208f parisc: Add memory barrier to asm pdc and sync instructions) +$ git merge parisc-hd/for-next +Auto-merging arch/parisc/include/asm/Kbuild +Merge made by the 'recursive' strategy. + Documentation/features/debug/kgdb/arch-support.txt | 2 +- + .../features/debug/kprobes/arch-support.txt | 2 +- + .../features/debug/kretprobes/arch-support.txt | 2 +- + Documentation/kprobes.txt | 1 + + arch/parisc/Kconfig | 15 +- + arch/parisc/boot/compressed/misc.c | 31 ++- + arch/parisc/include/asm/Kbuild | 1 - + arch/parisc/include/asm/cache.h | 10 +- + arch/parisc/include/asm/fixmap.h | 19 +- + arch/parisc/include/asm/kgdb.h | 68 +++++ + arch/parisc/include/asm/kprobes.h | 55 ++++ + arch/parisc/include/asm/mmzone.h | 58 +--- + arch/parisc/include/asm/page.h | 4 +- + arch/parisc/include/asm/patch.h | 11 + + arch/parisc/include/asm/ptrace.h | 13 + + arch/parisc/include/asm/sparsemem.h | 14 + + arch/parisc/include/asm/spinlock.h | 4 + + arch/parisc/kernel/Makefile | 5 +- + arch/parisc/kernel/entry.S | 43 +-- + arch/parisc/kernel/head.S | 13 + + arch/parisc/kernel/kgdb.c | 209 +++++++++++++++ + arch/parisc/kernel/kprobes.c | 291 +++++++++++++++++++++ + arch/parisc/kernel/pacache.S | 43 --- + arch/parisc/kernel/parisc_ksyms.c | 6 - + arch/parisc/kernel/patch.c | 77 ++++++ + arch/parisc/kernel/process.c | 1 + + arch/parisc/kernel/processor.c | 3 +- + arch/parisc/kernel/ptrace.c | 35 +++ + arch/parisc/kernel/sys_parisc.c | 3 +- + arch/parisc/kernel/syscall.S | 16 +- + arch/parisc/kernel/traps.c | 31 +++ + arch/parisc/mm/Makefile | 2 +- + arch/parisc/mm/fixmap.c | 41 +++ + arch/parisc/mm/init.c | 115 ++++---- + drivers/net/ethernet/i825xx/lasi_82596.c | 5 +- + drivers/parisc/led.c | 3 + + 36 files changed, 1025 insertions(+), 227 deletions(-) + create mode 100644 arch/parisc/include/asm/kgdb.h + create mode 100644 arch/parisc/include/asm/kprobes.h + create mode 100644 arch/parisc/include/asm/patch.h + create mode 100644 arch/parisc/include/asm/sparsemem.h + create mode 100644 arch/parisc/kernel/kgdb.c + create mode 100644 arch/parisc/kernel/kprobes.c + create mode 100644 arch/parisc/kernel/patch.c + create mode 100644 arch/parisc/mm/fixmap.c +Merging powerpc/next (26ad26718dfa powerpc/mm: Fix section mismatch warning) +$ git merge powerpc/next +Auto-merging arch/powerpc/platforms/Kconfig.cputype +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + MAINTAINERS | 9 +- + arch/powerpc/Makefile | 15 ++- + arch/powerpc/configs/pseries_defconfig | 1 + + 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 | 5 + + 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/kup-radix.h | 108 ++++++++++++++++++ + arch/powerpc/include/asm/book3s/64/mmu-hash.h | 70 ++++++++---- + arch/powerpc/include/asm/book3s/64/mmu.h | 107 ++++++++++++----- + 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/exception-64s.h | 2 + + arch/powerpc/include/asm/feature-fixups.h | 3 + + arch/powerpc/include/asm/futex.h | 4 + + arch/powerpc/include/asm/kup.h | 73 ++++++++++++ + arch/powerpc/include/asm/mce.h | 1 + + arch/powerpc/include/asm/mmu.h | 25 ++-- + arch/powerpc/include/asm/nohash/32/kup-8xx.h | 58 ++++++++++ + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 76 ++++++++++++- + arch/powerpc/include/asm/nohash/64/mmu.h | 2 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 3 +- + arch/powerpc/include/asm/page.h | 11 -- + arch/powerpc/include/asm/processor.h | 3 + + arch/powerpc/include/asm/ptrace.h | 11 +- + arch/powerpc/include/asm/sparsemem.h | 4 +- + arch/powerpc/include/asm/uaccess.h | 38 +++++-- + arch/powerpc/kernel/asm-offsets.c | 7 ++ + arch/powerpc/kernel/entry_32.S | 28 +++-- + arch/powerpc/kernel/entry_64.S | 27 ++++- + arch/powerpc/kernel/exceptions-64s.S | 3 + + arch/powerpc/kernel/head_32.S | 46 ++++++-- + arch/powerpc/kernel/head_64.S | 4 +- + arch/powerpc/kernel/idle_book3s.S | 39 +++++++ + arch/powerpc/kernel/mce_power.c | 2 +- + arch/powerpc/kernel/paca.c | 12 +- + arch/powerpc/kernel/process.c | 3 +- + arch/powerpc/kernel/setup-common.c | 10 +- + arch/powerpc/kernel/setup_64.c | 10 ++ + arch/powerpc/kernel/time.c | 1 - + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/powerpc/lib/checksum_wrappers.c | 4 + + arch/powerpc/lib/code-patching.c | 5 +- + arch/powerpc/mm/8xx_mmu.c | 24 ++++ + arch/powerpc/mm/copro_fault.c | 18 +-- + arch/powerpc/mm/fault.c | 49 ++++++-- + arch/powerpc/mm/hash_low_32.S | 6 +- + arch/powerpc/mm/hash_utils_64.c | 81 ++++++++----- + arch/powerpc/mm/highmem.c | 14 +-- + arch/powerpc/mm/init-common.c | 26 +++++ + arch/powerpc/mm/init_32.c | 3 + + arch/powerpc/mm/mem.c | 11 +- + arch/powerpc/mm/mmu_context_book3s64.c | 29 ++++- + arch/powerpc/mm/numa.c | 33 ++++-- + arch/powerpc/mm/pgtable-hash64.c | 13 ++- + arch/powerpc/mm/pgtable-radix.c | 55 ++++++++- + arch/powerpc/mm/pgtable_64.c | 9 +- + arch/powerpc/mm/pkeys.c | 1 + + arch/powerpc/mm/ppc_mmu_32.c | 23 ++++ + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 3 +- + arch/powerpc/mm/slb.c | 28 +++-- + arch/powerpc/mm/slice.c | 49 ++++---- + arch/powerpc/mm/subpage-prot.c | 34 ++++-- + arch/powerpc/mm/tlb_nohash.c | 6 + + arch/powerpc/platforms/83xx/usb.c | 4 +- + arch/powerpc/platforms/8xx/pic.c | 3 +- + arch/powerpc/platforms/Kconfig.cputype | 37 ++++++ + arch/powerpc/platforms/cell/spu_base.c | 4 +- + arch/powerpc/platforms/embedded6xx/holly.c | 19 +--- + arch/powerpc/platforms/powernv/opal-call.c | 2 + + 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 +++++++++++++++++----- + drivers/misc/cxl/fault.c | 2 +- + drivers/misc/ocxl/link.c | 2 +- + 83 files changed, 1514 insertions(+), 442 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/kup.h + create mode 100644 arch/powerpc/include/asm/nohash/32/kup-8xx.h +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 (fd7f744caed8 riscv: vdso: drop unnecessary cc-ldoption) +$ git merge risc-v/for-next +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/elf.h | 6 ------ + arch/riscv/include/asm/futex.h | 13 ------------- + arch/riscv/include/asm/ptrace.h | 21 ++++++--------------- + 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/head.S | 11 ++++------- + arch/riscv/kernel/irq.c | 3 ++- + arch/riscv/kernel/reset.c | 15 +++++++++------ + arch/riscv/kernel/setup.c | 6 ++++-- + arch/riscv/kernel/signal.c | 6 ++++++ + arch/riscv/kernel/stacktrace.c | 14 +++++--------- + arch/riscv/kernel/traps.c | 2 +- + arch/riscv/kernel/vdso/Makefile | 2 +- + 17 files changed, 54 insertions(+), 92 deletions(-) +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 (7a5da02de8d6 locking/lockdep: check for freed initmem in static_obj()) +$ git merge s390/features +Auto-merging kernel/locking/lockdep.c +Removing arch/s390/mm/gup.c +Auto-merging arch/s390/include/asm/syscall.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 2 + + arch/s390/Kconfig | 49 +++ + arch/s390/Makefile | 6 +- + arch/s390/boot/Makefile | 13 +- + arch/s390/boot/boot.h | 5 + + arch/s390/boot/compressed/decompressor.h | 5 + + arch/s390/boot/compressed/vmlinux.lds.S | 22 + + arch/s390/boot/head.S | 48 ++- + arch/s390/boot/ipl_parm.c | 52 ++- + arch/s390/boot/ipl_report.c | 165 ++++++++ + arch/s390/boot/kaslr.c | 144 +++++++ + arch/s390/boot/machine_kexec_reloc.c | 2 + + arch/s390/boot/startup.c | 119 +++++- + arch/s390/boot/text_dma.S | 167 ++++++++ + arch/s390/boot/uv.c | 24 ++ + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/performance_defconfig | 1 + + arch/s390/crypto/prng.c | 135 ++++-- + arch/s390/defconfig | 1 + + arch/s390/hypfs/hypfs_diag0c.c | 18 +- + arch/s390/include/asm/airq.h | 12 +- + arch/s390/include/asm/boot_data.h | 11 +- + arch/s390/include/asm/diag.h | 13 + + arch/s390/include/asm/elf.h | 4 + + arch/s390/include/asm/extable.h | 5 + + arch/s390/include/asm/ftrace.h | 5 + + arch/s390/include/asm/io.h | 17 +- + arch/s390/include/asm/ipl.h | 132 +++--- + arch/s390/include/asm/irq.h | 9 +- + arch/s390/include/asm/kexec.h | 26 +- + arch/s390/include/asm/linkage.h | 7 + + arch/s390/include/asm/pci.h | 12 + + arch/s390/include/asm/pci_clp.h | 20 +- + arch/s390/include/asm/pci_insn.h | 97 ++++- + arch/s390/include/asm/pci_io.h | 49 +-- + arch/s390/include/asm/pgtable.h | 112 +++-- + arch/s390/include/asm/processor.h | 24 +- + arch/s390/include/asm/sclp.h | 3 + + arch/s390/include/asm/sections.h | 22 + + arch/s390/include/asm/setup.h | 21 +- + arch/s390/include/asm/syscall.h | 9 +- + arch/s390/include/asm/syscall_wrapper.h | 4 +- + arch/s390/include/asm/uaccess.h | 2 + + arch/s390/include/asm/uv.h | 132 ++++++ + arch/s390/include/asm/vmlinux.lds.h | 13 + + arch/s390/include/uapi/asm/ipl.h | 154 +++++++ + arch/s390/kernel/Makefile | 6 +- + arch/s390/kernel/base.S | 68 --- + arch/s390/kernel/diag.c | 67 +-- + arch/s390/kernel/early.c | 5 +- + arch/s390/kernel/entry.S | 18 +- + arch/s390/kernel/head64.S | 26 -- + arch/s390/kernel/ima_arch.c | 14 + + arch/s390/kernel/ipl.c | 366 +++++++++++----- + arch/s390/kernel/ipl_vmparm.c | 8 +- + arch/s390/kernel/irq.c | 48 ++- + arch/s390/kernel/kexec_elf.c | 63 ++- + arch/s390/kernel/kexec_image.c | 49 +-- + arch/s390/kernel/kprobes.c | 37 +- + arch/s390/kernel/machine_kexec.c | 3 + + arch/s390/kernel/machine_kexec_file.c | 268 ++++++++---- + arch/s390/kernel/machine_kexec_reloc.c | 53 +++ + arch/s390/kernel/nospec-branch.c | 6 +- + arch/s390/kernel/nospec-sysfs.c | 2 +- + arch/s390/kernel/perf_cpum_cf.c | 15 +- + arch/s390/kernel/perf_cpum_cf_diag.c | 9 +- + arch/s390/kernel/perf_cpum_cf_events.c | 107 +++-- + arch/s390/kernel/pgm_check.S | 2 +- + arch/s390/kernel/processor.c | 3 +- + arch/s390/kernel/relocate_kernel.S | 3 + + arch/s390/kernel/setup.c | 70 +++- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/swsusp.S | 15 +- + arch/s390/kernel/traps.c | 3 +- + arch/s390/kernel/vdso.c | 10 +- + arch/s390/kernel/vmlinux.lds.S | 19 + + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/mm/Makefile | 2 +- + arch/s390/mm/fault.c | 14 +- + arch/s390/mm/gup.c | 300 ------------- + arch/s390/mm/init.c | 3 + + arch/s390/mm/pgtable.c | 2 + + arch/s390/mm/vmem.c | 2 + + arch/s390/net/bpf_jit_comp.c | 6 +- + arch/s390/pci/Makefile | 2 +- + arch/s390/pci/pci.c | 366 ++++++---------- + arch/s390/pci/pci_clp.c | 25 +- + arch/s390/pci/pci_insn.c | 169 +++++++- + arch/s390/pci/pci_irq.c | 486 ++++++++++++++++++++++ + arch/s390/purgatory/Makefile | 19 +- + arch/s390/purgatory/kexec-purgatory.S | 14 + + arch/s390/purgatory/purgatory.lds.S | 54 +++ + arch/s390/scripts/Makefile.chkbss | 3 +- + drivers/s390/char/sclp.c | 14 +- + drivers/s390/char/sclp.h | 6 +- + drivers/s390/char/sclp_early.c | 5 +- + drivers/s390/char/sclp_early_core.c | 20 +- + drivers/s390/char/sclp_sdias.c | 74 ++-- + drivers/s390/char/zcore.c | 22 +- + drivers/s390/cio/Makefile | 3 +- + drivers/s390/cio/airq.c | 41 +- + drivers/s390/cio/cio.c | 2 +- + drivers/s390/cio/cio.h | 4 +- + drivers/s390/cio/ioasm.c | 1 + + drivers/s390/cio/qdio.h | 6 +- + drivers/s390/cio/qdio_debug.c | 9 +- + drivers/s390/cio/qdio_main.c | 211 +++++----- + drivers/s390/cio/qdio_setup.c | 2 +- + drivers/s390/cio/qdio_thinint.c | 4 +- + drivers/s390/cio/vfio_ccw_async.c | 88 ++++ + drivers/s390/cio/vfio_ccw_cp.c | 21 +- + drivers/s390/cio/vfio_ccw_cp.h | 2 + + drivers/s390/cio/vfio_ccw_drv.c | 81 ++-- + drivers/s390/cio/vfio_ccw_fsm.c | 143 ++++++- + drivers/s390/cio/vfio_ccw_ops.c | 227 ++++++++-- + drivers/s390/cio/vfio_ccw_private.h | 48 ++- + drivers/s390/crypto/ap_bus.c | 4 +- + drivers/s390/crypto/zcrypt_api.c | 4 + + drivers/s390/net/ism.h | 29 +- + drivers/s390/net/ism_drv.c | 20 +- + drivers/s390/virtio/virtio_ccw.c | 2 +- + include/asm-generic/sections.h | 14 + + include/linux/ima.h | 2 +- + include/uapi/linux/vfio.h | 4 + + include/uapi/linux/vfio_ccw.h | 12 + + kernel/locking/lockdep.c | 3 + + security/integrity/Kconfig | 11 +- + security/integrity/Makefile | 8 +- + security/integrity/platform_certs/load_ipl_s390.c | 36 ++ + tools/testing/selftests/rseq/rseq-s390.h | 9 +- + 130 files changed, 4250 insertions(+), 1670 deletions(-) + create mode 100644 arch/s390/boot/ipl_report.c + create mode 100644 arch/s390/boot/kaslr.c + create mode 100644 arch/s390/boot/machine_kexec_reloc.c + create mode 100644 arch/s390/boot/text_dma.S + create mode 100644 arch/s390/boot/uv.c + create mode 100644 arch/s390/include/asm/uv.h + create mode 100644 arch/s390/include/uapi/asm/ipl.h + create mode 100644 arch/s390/kernel/ima_arch.c + create mode 100644 arch/s390/kernel/machine_kexec_reloc.c + delete mode 100644 arch/s390/mm/gup.c + create mode 100644 arch/s390/pci/pci_irq.c + create mode 100644 arch/s390/purgatory/kexec-purgatory.S + create mode 100644 arch/s390/purgatory/purgatory.lds.S + create mode 100644 drivers/s390/cio/vfio_ccw_async.c + create mode 100644 security/integrity/platform_certs/load_ipl_s390.c +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 (aea05eb56e47 um: Fix for a possible OOPS in ubd initialization) +$ git merge uml/linux-next +Already up to date. +Merging xtensa/xtensa-for-next (a26a70426e9b Merge branch 'xtensa-5.1-fixes' into xtensa-for-next) +$ git merge xtensa/xtensa-for-next +Already up to date! +Merge made by the 'recursive' strategy. +Merging fscrypt/master (2c58d548f570 fscrypt: cache decrypted symlink target in ->i_link) +$ git merge fscrypt/master +Merge made by the 'recursive' strategy. + fs/crypto/bio.c | 8 ++---- + fs/crypto/crypto.c | 74 +++++++++++++++++++++++------------------------ + fs/crypto/fname.c | 5 ++-- + fs/crypto/hooks.c | 68 ++++++++++++++++++++++++++++++++----------- + fs/crypto/keyinfo.c | 25 ++++++++++++++-- + fs/crypto/policy.c | 6 ++-- + fs/dcache.c | 2 ++ + fs/ext4/ext4.h | 62 ++++++++++++++++++++++++++++++---------- + fs/ext4/namei.c | 76 +++++++++++++++++++++++++++++++++---------------- + fs/ext4/readpage.c | 2 +- + fs/ext4/super.c | 3 ++ + fs/f2fs/namei.c | 17 ++++++----- + fs/f2fs/super.c | 3 ++ + fs/namei.c | 4 +-- + fs/ubifs/dir.c | 8 ++---- + fs/ubifs/super.c | 3 ++ + include/linux/dcache.h | 2 +- + include/linux/fscrypt.h | 74 +++++++++++++++++++++++++++++++++-------------- + 18 files changed, 298 insertions(+), 144 deletions(-) +Merging befs/for-next (55d945e2e4aa fs: befs: btree: Fixed some coding standard issues) +$ git merge befs/for-next +Merge made by the 'recursive' strategy. + fs/befs/btree.c | 97 ++++++++++++++++++++++++++++++--------------------------- + 1 file changed, 51 insertions(+), 46 deletions(-) +Merging btrfs/next (29dcea88779c Linux 4.17) +$ git merge btrfs/next +Already up to date. +Merging btrfs-kdave/for-next (6033347bcdd8 Merge branch 'for-next-stale-20190425' into for-next-20190425) +$ git merge btrfs-kdave/for-next +Auto-merging fs/btrfs/volumes.h +Auto-merging fs/btrfs/ref-verify.c +Merge made by the 'recursive' strategy. + fs/btrfs/acl.c | 6 +- + fs/btrfs/backref.c | 38 +- + fs/btrfs/btrfs_inode.h | 8 - + fs/btrfs/compression.c | 2 +- + fs/btrfs/ctree.c | 254 +++++++------ + fs/btrfs/ctree.h | 78 ++-- + fs/btrfs/delayed-inode.c | 5 +- + fs/btrfs/delayed-ref.c | 46 ++- + fs/btrfs/delayed-ref.h | 122 +++++- + fs/btrfs/dev-replace.c | 8 +- + fs/btrfs/dev-replace.h | 3 +- + fs/btrfs/dir-item.c | 5 +- + fs/btrfs/disk-io.c | 225 ++++++------ + fs/btrfs/disk-io.h | 7 +- + fs/btrfs/extent-tree.c | 654 +++++++++++++-------------------- + fs/btrfs/extent_io.c | 356 ++++++++++++------ + fs/btrfs/extent_io.h | 89 +++-- + fs/btrfs/extent_map.c | 38 ++ + fs/btrfs/file-item.c | 32 +- + fs/btrfs/file.c | 49 ++- + fs/btrfs/free-space-cache.c | 45 +-- + fs/btrfs/free-space-cache.h | 18 +- + fs/btrfs/free-space-tree.c | 24 +- + fs/btrfs/free-space-tree.h | 1 - + fs/btrfs/inode-item.c | 8 +- + fs/btrfs/inode.c | 396 ++++++++++++-------- + fs/btrfs/ioctl.c | 208 ++++++----- + fs/btrfs/locking.c | 157 ++++++-- + fs/btrfs/ordered-data.c | 14 +- + fs/btrfs/ordered-data.h | 3 +- + fs/btrfs/print-tree.c | 2 +- + fs/btrfs/props.c | 242 ++++++------ + fs/btrfs/props.h | 7 +- + fs/btrfs/qgroup.c | 5 +- + fs/btrfs/ref-verify.c | 53 +-- + fs/btrfs/ref-verify.h | 10 +- + fs/btrfs/relocation.c | 123 ++++--- + fs/btrfs/root-tree.c | 13 +- + fs/btrfs/scrub.c | 6 +- + fs/btrfs/send.c | 114 +++++- + fs/btrfs/super.c | 4 +- + fs/btrfs/tests/btrfs-tests.c | 17 +- + fs/btrfs/tests/btrfs-tests.h | 17 +- + fs/btrfs/tests/extent-buffer-tests.c | 8 +- + fs/btrfs/tests/extent-io-tests.c | 35 +- + fs/btrfs/tests/extent-map-tests.c | 213 +++++++---- + fs/btrfs/tests/free-space-tests.c | 11 +- + fs/btrfs/tests/free-space-tree-tests.c | 14 +- + fs/btrfs/tests/inode-tests.c | 34 +- + fs/btrfs/tests/qgroup-tests.c | 20 +- + fs/btrfs/transaction.c | 64 +--- + fs/btrfs/transaction.h | 4 +- + fs/btrfs/tree-checker.c | 513 +++++++++++++++++++++----- + fs/btrfs/tree-checker.h | 11 +- + fs/btrfs/tree-log.c | 289 +++++++++++---- + fs/btrfs/tree-log.h | 10 +- + fs/btrfs/uuid-tree.c | 6 +- + fs/btrfs/volumes.c | 475 ++++++++---------------- + fs/btrfs/volumes.h | 39 +- + fs/btrfs/xattr.c | 65 ++-- + fs/btrfs/xattr.h | 7 +- + fs/btrfs/zstd.c | 11 +- + include/trace/events/btrfs.h | 243 +++++++++++- + include/uapi/linux/btrfs_tree.h | 2 + + 64 files changed, 3370 insertions(+), 2216 deletions(-) +Merging ceph/master (37659182bff1 ceph: fix ci->i_head_snapc leak) +$ git merge ceph/master +Already up to date. +Merging cifs/for-next (eb54b6b100da cifs: zero-range does not require the file is sparse) +$ git merge cifs/for-next +Merge made by the 'recursive' strategy. + fs/cifs/cifs_debug.c | 33 +- + fs/cifs/cifsfs.c | 3 + + fs/cifs/cifsfs.h | 2 + + fs/cifs/cifsglob.h | 19 +- + fs/cifs/cifsproto.h | 9 + + fs/cifs/connect.c | 63 +- + fs/cifs/dfs_cache.c | 140 +- + fs/cifs/dfs_cache.h | 5 +- + fs/cifs/file.c | 5 - + fs/cifs/inode.c | 37 + + fs/cifs/smb2ops.c | 131 +- + fs/cifs/smb2pdu.c | 63 +- + fs/cifs/smb2pdu.h | 35 + + fs/cifs/smb2status.h | 3480 +++++++++++++++++++++++++------------------------- + fs/cifs/smbdirect.c | 292 ++--- + fs/cifs/smbdirect.h | 19 +- + fs/cifs/smbfsctl.h | 29 +- + fs/cifs/transport.c | 29 +- + 18 files changed, 2393 insertions(+), 2001 deletions(-) +Merging configfs/for-next (cc57c07343bd configfs: fix registered group removal) +$ git merge configfs/for-next +Already up to date. +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/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 +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 (a046f4dfac7f unicode: refactor the rule for regenerating utf8data.h) +$ git merge ext4/dev +Auto-merging include/linux/fs.h +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/ext4.h +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/admin-guide/ext4.rst | 38 + + Documentation/dontdiff | 1 + + MAINTAINERS | 6 + + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/ext4/block_validity.c | 49 + + fs/ext4/dir.c | 48 + + fs/ext4/ext4.h | 45 +- + fs/ext4/extents_status.c | 4 +- + fs/ext4/hash.c | 34 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inline.c | 2 +- + fs/ext4/inode.c | 12 +- + fs/ext4/ioctl.c | 20 +- + fs/ext4/mballoc.c | 4 +- + fs/ext4/namei.c | 107 +- + fs/ext4/readpage.c | 3 +- + fs/ext4/resize.c | 1 + + fs/ext4/super.c | 149 +- + fs/ext4/xattr.c | 2 +- + fs/jbd2/checkpoint.c | 1 - + fs/jbd2/journal.c | 4 + + fs/unicode/.gitignore | 1 + + fs/unicode/Kconfig | 13 + + fs/unicode/Makefile | 34 + + fs/unicode/README.utf8data | 72 + + fs/unicode/mkutf8data.c | 3419 ++++++++++++++++++++++++++++++ + fs/unicode/utf8-core.c | 187 ++ + fs/unicode/utf8-norm.c | 799 +++++++ + fs/unicode/utf8-selftest.c | 320 +++ + fs/unicode/utf8data.h | 4109 ++++++++++++++++++++++++++++++++++++ + fs/unicode/utf8n.h | 117 + + include/linux/fs.h | 2 + + include/linux/unicode.h | 30 + + 34 files changed, 9579 insertions(+), 58 deletions(-) + create mode 100644 fs/unicode/.gitignore + create mode 100644 fs/unicode/Kconfig + create mode 100644 fs/unicode/Makefile + create mode 100644 fs/unicode/README.utf8data + create mode 100644 fs/unicode/mkutf8data.c + create mode 100644 fs/unicode/utf8-core.c + create mode 100644 fs/unicode/utf8-norm.c + create mode 100644 fs/unicode/utf8-selftest.c + create mode 100644 fs/unicode/utf8data.h + create mode 100644 fs/unicode/utf8n.h + create mode 100644 include/linux/unicode.h +Merging f2fs/dev (fd3ebe90089a f2fs: fix to be aware of readonly device in write_checkpoint()) +$ git merge f2fs/dev +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/namei.c +Merge made by the 'recursive' strategy. + fs/f2fs/acl.c | 4 +- + fs/f2fs/checkpoint.c | 93 ++++++++++++--- + fs/f2fs/data.c | 270 +++++++++++++++++++++++++------------------- + fs/f2fs/f2fs.h | 121 ++++++++++++++------ + fs/f2fs/file.c | 58 +++++++--- + fs/f2fs/gc.c | 15 ++- + 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 | 66 +++++------ + fs/f2fs/segment.h | 16 +-- + fs/f2fs/super.c | 59 +++++++--- + fs/f2fs/xattr.c | 32 +++++- + include/linux/f2fs_fs.h | 11 +- + include/trace/events/f2fs.h | 57 ++++++++++ + 17 files changed, 634 insertions(+), 279 deletions(-) +Merging fuse/for-next (6407f44aaf2a fuse: Add ioctl flag for x32 compat ioctl) +$ git merge fuse/for-next +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 | 13 ++++++++----- + include/uapi/linux/fuse.h | 22 ++++++++++++++++++++-- + 7 files changed, 88 insertions(+), 25 deletions(-) +Merging jfs/jfs-next (a5fdd713d256 jfs: fix bogus variable self-initialization) +$ git merge jfs/jfs-next +Merge made by the 'recursive' strategy. + fs/jfs/acl.c | 3 ++- + fs/jfs/jfs_incore.h | 6 ++++-- + fs/jfs/jfs_logmgr.c | 18 +++++++++--------- + fs/jfs/jfs_logmgr.h | 10 +++++----- + fs/jfs/jfs_mount.c | 4 ++-- + fs/jfs/jfs_superblock.h | 8 ++++---- + fs/jfs/jfs_txnmgr.c | 3 +-- + fs/jfs/namei.c | 2 +- + fs/jfs/super.c | 8 +++++--- + 9 files changed, 33 insertions(+), 29 deletions(-) +Merging nfs/linux-next (37624b58542f Linux 5.1-rc7) +$ git merge nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (b422df915cef lockd: Store the lockd client credential in struct nlm_host) +$ git merge nfs-anna/linux-next +Auto-merging fs/nfsd/nfs4callback.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 | 9 + + fs/nfs/direct.c | 11 +- + fs/nfs/file.c | 31 +-- + fs/nfs/filelayout/filelayout.c | 4 +- + 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/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/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 | 68 ++++-- + net/sunrpc/auth_unix.c | 9 +- + net/sunrpc/clnt.c | 123 +++++++---- + 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 +- + 54 files changed, 1322 insertions(+), 935 deletions(-) +Merging nfsd/nfsd-next (5926459e7c89 locks: move checks from locks_free_lock() to locks_release_private()) +$ git merge nfsd/nfsd-next +Auto-merging include/linux/lockd/bind.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfs4proc.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/nfs4idmap.c | 8 +- + fs/nfsd/nfs4proc.c | 3 +- + fs/nfsd/nfs4recover.c | 436 +++++++++++++++++++++++++++++++++++--- + fs/nfsd/nfs4state.c | 63 ++++-- + 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 +- + 32 files changed, 1075 insertions(+), 310 deletions(-) +Merging orangefs/for-next (7dccb4027ef9 orangefs: copy Orangefs-sized blocks into the pagecache if possible.) +$ git merge orangefs/for-next +Merge made by the 'recursive' strategy. + fs/orangefs/acl.c | 4 +- + fs/orangefs/file.c | 389 ++++++++---------- + fs/orangefs/inode.c | 908 ++++++++++++++++++++++++++++++++++++----- + 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 | 39 +- + fs/orangefs/waitqueue.c | 18 +- + fs/orangefs/xattr.c | 106 ++++- + 14 files changed, 1293 insertions(+), 488 deletions(-) +Merging overlayfs/overlayfs-next (993a0b2aec52 ovl: Do not lose security.capability xattr over metadata file copy-up) +$ git merge overlayfs/overlayfs-next +Already up to date. +Merging ubifs/linux-next (5578e48e5c0b ubi: wl: Silence uninitialized variable warning) +$ git merge ubifs/linux-next +Already up to date. +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 (75efa57d0bf5 xfs: add online scrub for superblock counters) +$ git merge xfs/for-next +Merge made by the 'recursive' strategy. + fs/xfs/Makefile | 3 + + fs/xfs/libxfs/xfs_ag.c | 54 ++++++ + fs/xfs/libxfs/xfs_ag.h | 2 + + fs/xfs/libxfs/xfs_alloc.c | 13 +- + fs/xfs/libxfs/xfs_attr.c | 35 ++-- + fs/xfs/libxfs/xfs_attr.h | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 17 +- + fs/xfs/libxfs/xfs_defer.c | 14 +- + fs/xfs/libxfs/xfs_fs.h | 139 +++++++++++---- + fs/xfs/libxfs/xfs_health.h | 190 ++++++++++++++++++++ + fs/xfs/libxfs/xfs_sb.c | 10 +- + fs/xfs/libxfs/xfs_trans_resv.c | 6 +- + fs/xfs/libxfs/xfs_types.c | 2 +- + fs/xfs/libxfs/xfs_types.h | 2 + + fs/xfs/scrub/agheader.c | 20 +++ + fs/xfs/scrub/common.c | 47 ++++- + fs/xfs/scrub/common.h | 4 + + fs/xfs/scrub/fscounters.c | 366 ++++++++++++++++++++++++++++++++++++++ + fs/xfs/scrub/health.c | 237 +++++++++++++++++++++++++ + fs/xfs/scrub/health.h | 14 ++ + fs/xfs/scrub/ialloc.c | 4 +- + fs/xfs/scrub/parent.c | 2 +- + fs/xfs/scrub/quota.c | 2 +- + fs/xfs/scrub/repair.c | 34 ++-- + fs/xfs/scrub/repair.h | 5 +- + fs/xfs/scrub/scrub.c | 49 ++++-- + fs/xfs/scrub/scrub.h | 27 ++- + fs/xfs/scrub/trace.h | 63 ++++++- + fs/xfs/xfs_aops.c | 135 ++++++++++++-- + fs/xfs/xfs_aops.h | 1 - + fs/xfs/xfs_bmap_util.c | 2 + + fs/xfs/xfs_buf_item.c | 4 +- + fs/xfs/xfs_discard.c | 3 +- + fs/xfs/xfs_dquot.c | 17 +- + fs/xfs/xfs_file.c | 6 +- + fs/xfs/xfs_health.c | 392 +++++++++++++++++++++++++++++++++++++++++ + fs/xfs/xfs_icache.c | 11 +- + fs/xfs/xfs_icache.h | 4 +- + fs/xfs/xfs_inode.c | 4 +- + fs/xfs/xfs_inode.h | 17 +- + fs/xfs/xfs_ioctl.c | 55 +++--- + fs/xfs/xfs_ioctl32.c | 4 +- + fs/xfs/xfs_itable.c | 2 + + fs/xfs/xfs_log.c | 3 +- + fs/xfs/xfs_log_cil.c | 21 ++- + fs/xfs/xfs_mount.c | 35 +++- + fs/xfs/xfs_mount.h | 32 +++- + fs/xfs/xfs_qm.c | 3 +- + fs/xfs/xfs_qm.h | 8 +- + fs/xfs/xfs_quota.h | 37 ++-- + fs/xfs/xfs_super.c | 33 ++-- + fs/xfs/xfs_trace.h | 76 ++++++++ + fs/xfs/xfs_trans_dquot.c | 52 +++--- + 53 files changed, 2062 insertions(+), 258 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_health.h + create mode 100644 fs/xfs/scrub/fscounters.c + create mode 100644 fs/xfs/scrub/health.c + create mode 100644 fs/xfs/scrub/health.h + create mode 100644 fs/xfs/xfs_health.c +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 (af467ef6c590 Merge branches 'work.misc' and 'work.dcache' into for-next) +$ git merge vfs/for-next +Auto-merging include/linux/dcache.h +Auto-merging fs/dcache.c +Auto-merging fs/block_dev.c +Merge made by the 'recursive' strategy. + Documentation/filesystems/porting | 10 ++++++++++ + fs/autofs/autofs_i.h | 1 + + fs/autofs/inode.c | 2 +- + fs/block_dev.c | 1 - + fs/dcache.c | 28 ++++++++++++++++------------ + fs/internal.h | 3 +-- + fs/nsfs.c | 26 +++++++++++--------------- + fs/sysv/namei.c | 15 --------------- + fs/sysv/super.c | 3 --- + fs/sysv/sysv.h | 3 --- + include/linux/dcache.h | 3 +-- + include/linux/mount.h | 2 ++ + kernel/acct.c | 4 ++-- + 13 files changed, 45 insertions(+), 56 deletions(-) +Merging printk/for-next (3ba3fee931aa Merge branch 'for-5.2-vsprintf-hardening' into for-next) +$ git merge printk/for-next +Auto-merging mm/vmscan.c +Auto-merging mm/memory.c +Auto-merging mm/memblock.c +CONFLICT (content): Merge conflict in mm/memblock.c +Auto-merging kernel/workqueue.c +Auto-merging kernel/time/sched_clock.c +Auto-merging kernel/irq/manage.c +Auto-merging kernel/events/uprobes.c +Auto-merging init/main.c +Auto-merging include/trace/events/sunrpc.h +CONFLICT (content): Merge conflict in include/trace/events/sunrpc.h +Auto-merging include/trace/events/btrfs.h +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/btrfs/tests/free-space-tree-tests.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/nvdimm/dimm_devs.c +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging drivers/base/power/main.c +CONFLICT (content): Merge conflict in drivers/base/power/main.c +Auto-merging arch/arm/mach-imx/pm-imx6.c +Auto-merging arch/alpha/kernel/pci_iommu.c +Resolved 'drivers/base/power/main.c' using previous resolution. +Resolved 'include/trace/events/sunrpc.h' using previous resolution. +Resolved 'mm/memblock.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 72177a3af3f5] Merge remote-tracking branch 'printk/for-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/clearing-warn-once.txt | 2 +- + Documentation/core-api/printk-formats.rst | 8 + + arch/alpha/kernel/pci_iommu.c | 20 +- + arch/arm/mach-imx/pm-imx6.c | 2 +- + arch/arm/mm/alignment.c | 2 +- + arch/arm/nwfpe/fpmodule.c | 2 +- + arch/microblaze/mm/pgtable.c | 2 +- + arch/sparc/kernel/ds.c | 2 +- + arch/um/kernel/sysrq.c | 2 +- + arch/x86/include/asm/trace/exceptions.h | 2 +- + arch/x86/kernel/irq_64.c | 2 +- + arch/x86/mm/extable.c | 4 +- + arch/x86/xen/multicalls.c | 2 +- + drivers/acpi/device_pm.c | 2 +- + drivers/base/power/main.c | 6 +- + drivers/base/syscore.c | 12 +- + drivers/block/drbd/drbd_receiver.c | 2 +- + drivers/block/floppy.c | 10 +- + drivers/cpufreq/cpufreq.c | 2 +- + drivers/mmc/core/quirks.h | 2 +- + drivers/nvdimm/bus.c | 2 +- + drivers/nvdimm/dimm_devs.c | 2 +- + drivers/pci/pci-driver.c | 14 +- + drivers/pci/quirks.c | 4 +- + drivers/pnp/quirks.c | 2 +- + drivers/scsi/esp_scsi.c | 2 +- + fs/btrfs/tests/free-space-tree-tests.c | 4 +- + fs/f2fs/f2fs.h | 2 +- + fs/pstore/inode.c | 2 +- + include/linux/printk.h | 4 +- + include/trace/events/btrfs.h | 2 +- + include/trace/events/cpuhp.h | 4 +- + include/trace/events/preemptirq.h | 2 +- + include/trace/events/rcu.h | 4 +- + include/trace/events/sunrpc.h | 2 +- + include/trace/events/vmscan.h | 4 +- + include/trace/events/workqueue.h | 4 +- + include/trace/events/xen.h | 2 +- + init/main.c | 6 +- + kernel/async.c | 4 +- + kernel/events/uprobes.c | 2 +- + kernel/fail_function.c | 2 +- + kernel/irq/debugfs.c | 2 +- + kernel/irq/handle.c | 2 +- + kernel/irq/manage.c | 2 +- + kernel/irq/spurious.c | 4 +- + kernel/rcu/tree.c | 2 +- + kernel/stop_machine.c | 2 +- + kernel/time/sched_clock.c | 2 +- + kernel/time/timer.c | 2 +- + kernel/workqueue.c | 12 +- + lib/error-inject.c | 2 +- + lib/percpu-refcount.c | 4 +- + lib/test_printf.c | 29 +- + lib/vsprintf.c | 431 +++++++++++++++++++----------- + mm/memblock.c | 12 +- + mm/memory.c | 2 +- + mm/vmscan.c | 2 +- + net/ceph/osd_client.c | 2 +- + net/core/net-procfs.c | 2 +- + net/core/netpoll.c | 4 +- + 61 files changed, 411 insertions(+), 273 deletions(-) +Merging pci/next (e564375c4460 Merge branch 'pci/trivial') +$ git merge pci/next +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/pci/pci.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/pci/designware-pcie.txt | 7 +- + .../devicetree/bindings/pci/pci-keystone.txt | 14 +- + Documentation/devicetree/bindings/pci/pci.txt | 50 ++ + MAINTAINERS | 6 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 2 - + arch/x86/pci/irq.c | 10 +- + drivers/acpi/pci_mcfg.c | 12 + + drivers/acpi/pci_root.c | 2 + + drivers/misc/pci_endpoint_test.c | 18 + + drivers/pci/Makefile | 2 +- + 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 | 1 + + 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 | 52 ++ + drivers/pci/controller/dwc/pcie-designware.h | 23 +- + 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 | 52 +- + 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/rpadlpar_core.c | 4 + + drivers/pci/hotplug/rpaphp_slot.c | 3 +- + drivers/pci/of.c | 58 +- + drivers/pci/pci-acpi.c | 172 ++-- + drivers/pci/pci.c | 327 ++++---- + drivers/pci/pci.h | 2 +- + drivers/pci/pcie/aspm.c | 47 +- + drivers/pci/probe.c | 207 ++++- + drivers/pci/proc.c | 1 + + drivers/pci/quirks.c | 77 ++ + drivers/pci/switch/switchtec.c | 42 +- + drivers/pci/xen-pcifront.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 | 3 +- + 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 +- + 65 files changed, 2271 insertions(+), 1085 deletions(-) + create mode 100644 drivers/pci/controller/dwc/pcie-al.c +Merging pstore/for-next/pstore (93ee4b7d9f06 pstore/ram: Avoid needless alloc during header write) +$ git merge pstore/for-next/pstore +Already up to date. +Merging hid/for-next (eb18d1215405 Merge branch 'for-5.2/logitech' into for-next) +$ git merge hid/for-next +Auto-merging drivers/hid/hid-input.c +Merge made by the 'recursive' strategy. + drivers/hid/Kconfig | 27 + + drivers/hid/Makefile | 3 + + drivers/hid/hid-core.c | 53 +- + drivers/hid/hid-ids.h | 7 +- + drivers/hid/hid-input.c | 81 +- + drivers/hid/hid-lg.c | 2 - + drivers/hid/hid-logitech-dj.c | 1142 +++++++++++++++++++++----- + drivers/hid/hid-logitech-hidpp.c | 736 ++++++++++++----- + drivers/hid/hid-macally.c | 45 + + drivers/hid/hid-picolcd_core.c | 18 +- + drivers/hid/hid-quirks.c | 6 - + drivers/hid/hid-sensor-custom.c | 12 +- + drivers/hid/hid-u2fzero.c | 374 +++++++++ + drivers/hid/i2c-hid/i2c-hid-core.c | 2 - + drivers/hid/intel-ish-hid/Kconfig | 15 + + drivers/hid/intel-ish-hid/Makefile | 3 + + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 1 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 1 + + drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 1085 ++++++++++++++++++++++++ + drivers/hid/intel-ish-hid/ishtp-hid-client.c | 168 ++-- + drivers/hid/intel-ish-hid/ishtp-hid.c | 49 +- + drivers/hid/intel-ish-hid/ishtp-hid.h | 14 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 96 ++- + drivers/hid/intel-ish-hid/ishtp/bus.h | 37 +- + drivers/hid/intel-ish-hid/ishtp/client.c | 60 +- + drivers/hid/intel-ish-hid/ishtp/client.h | 24 - + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 31 - + include/linux/hid.h | 4 +- + include/linux/intel-ish-client-if.h | 112 +++ + 29 files changed, 3518 insertions(+), 690 deletions(-) + create mode 100644 drivers/hid/hid-macally.c + create mode 100644 drivers/hid/hid-u2fzero.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp-fw-loader.c + create mode 100644 include/linux/intel-ish-client-if.h +Merging i2c/i2c/for-next (5dc8e322f1a8 Merge branch 'i2c/for-current-fixed' into i2c/for-next) +$ git merge i2c/i2c/for-next +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/i2c/brcm,iproc-i2c.txt | 17 +- + .../devicetree/bindings/i2c/i2c-designware.txt | 9 + + .../devicetree/bindings/i2c/i2c-mt65xx.txt | 5 +- + .../devicetree/bindings/i2c/i2c-stm32.txt | 37 +- + Documentation/i2c/busses/i2c-amd-mp2 | 23 + + MAINTAINERS | 11 +- + drivers/i2c/algos/i2c-algo-bit.c | 22 +- + drivers/i2c/busses/Kconfig | 24 + + 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.c | 4 +- + 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-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 | 17 +- + drivers/i2c/i2c-core-smbus.c | 25 +- + drivers/i2c/i2c-core.h | 25 + + drivers/i2c/i2c-mux.c | 6 + + drivers/i2c/muxes/i2c-demux-pinctrl.c | 2 + + include/linux/i2c-algo-bit.h | 1 + + include/linux/i2c.h | 38 +- + 41 files changed, 3007 insertions(+), 833 deletions(-) + 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 +Merging i3c/i3c/next (124dbd750da4 i3c: master: dw: remove dead code from dw_i3c_master_*_xfers()) +$ git merge i3c/i3c/next +Auto-merging drivers/i3c/master/dw-i3c-master.c +Merge made by the 'recursive' strategy. + drivers/i3c/master/dw-i3c-master.c | 10 ---------- + 1 file changed, 10 deletions(-) +Merging dmi/master (57361846b52b Linux 4.19-rc2) +$ git merge dmi/master +Already up to date. +Merging hwmon-staging/hwmon-next (a60170000338 hwmon: (s3c) Use dev_get_drvdata()) +$ git merge hwmon-staging/hwmon-next +Auto-merging MAINTAINERS +Removing Documentation/hwmon/w83795 +Removing Documentation/hwmon/w83793 +Removing Documentation/hwmon/smsc47m192 +Removing Documentation/hwmon/abituguru +Auto-merging Documentation/devicetree/bindings/hwmon/pwm-fan.txt +Merge made by the 'recursive' strategy. + .../devicetree/bindings/hwmon/cirrus,lochnagar.txt | 26 + + Documentation/devicetree/bindings/hwmon/g762.txt | 2 +- + .../devicetree/bindings/hwmon/pwm-fan.txt | 21 +- + Documentation/hwmon/{ab8500 => ab8500.rst} | 10 +- + Documentation/hwmon/abituguru | 92 --- + ...abituguru-datasheet => abituguru-datasheet.rst} | 160 +++-- + Documentation/hwmon/abituguru.rst | 113 ++++ + Documentation/hwmon/{abituguru3 => abituguru3.rst} | 36 +- + Documentation/hwmon/{abx500 => abx500.rst} | 8 +- + .../{acpi_power_meter => acpi_power_meter.rst} | 25 +- + Documentation/hwmon/{ad7314 => ad7314.rst} | 9 + + Documentation/hwmon/{adc128d818 => adc128d818.rst} | 7 +- + Documentation/hwmon/{adm1021 => adm1021.rst} | 44 +- + Documentation/hwmon/{adm1025 => adm1025.rst} | 13 +- + Documentation/hwmon/{adm1026 => adm1026.rst} | 24 +- + Documentation/hwmon/{adm1031 => adm1031.rst} | 16 +- + Documentation/hwmon/{adm1275 => adm1275.rst} | 30 +- + Documentation/hwmon/{adm9240 => adm9240.rst} | 50 +- + Documentation/hwmon/{ads1015 => ads1015.rst} | 74 ++- + Documentation/hwmon/{ads7828 => ads7828.rst} | 29 +- + Documentation/hwmon/{adt7410 => adt7410.rst} | 49 +- + Documentation/hwmon/{adt7411 => adt7411.rst} | 20 +- + Documentation/hwmon/{adt7462 => adt7462.rst} | 11 +- + Documentation/hwmon/{adt7470 => adt7470.rst} | 8 +- + Documentation/hwmon/{adt7475 => adt7475.rst} | 38 +- + Documentation/hwmon/{amc6821 => amc6821.rst} | 18 +- + Documentation/hwmon/{asb100 => asb100.rst} | 55 +- + Documentation/hwmon/{asc7621 => asc7621.rst} | 146 +++-- + .../{aspeed-pwm-tacho => aspeed-pwm-tacho.rst} | 2 + + Documentation/hwmon/{coretemp => coretemp.rst} | 46 +- + Documentation/hwmon/{da9052 => da9052.rst} | 41 +- + Documentation/hwmon/{da9055 => da9055.rst} | 20 +- + Documentation/hwmon/{dme1737 => dme1737.rst} | 88 ++- + Documentation/hwmon/{ds1621 => ds1621.rst} | 156 +++-- + Documentation/hwmon/{ds620 => ds620.rst} | 12 +- + Documentation/hwmon/{emc1403 => emc1403.rst} | 33 +- + Documentation/hwmon/{emc2103 => emc2103.rst} | 6 +- + Documentation/hwmon/{emc6w201 => emc6w201.rst} | 5 + + Documentation/hwmon/{f71805f => f71805f.rst} | 36 +- + Documentation/hwmon/{f71882fg => f71882fg.rst} | 56 +- + .../hwmon/{fam15h_power => fam15h_power.rst} | 85 ++- + .../hwmon/{ftsteutates => ftsteutates.rst} | 14 +- + Documentation/hwmon/{g760a => g760a.rst} | 4 + + Documentation/hwmon/{g762 => g762.rst} | 51 +- + Documentation/hwmon/{gl518sm => gl518sm.rst} | 21 +- + Documentation/hwmon/{hih6130 => hih6130.rst} | 14 +- + .../{hwmon-kernel-api.txt => hwmon-kernel-api.rst} | 337 +++++----- + Documentation/hwmon/{ibm-cffps => ibm-cffps.rst} | 3 + + Documentation/hwmon/{ibmaem => ibmaem.rst} | 10 +- + Documentation/hwmon/{ibmpowernv => ibmpowernv.rst} | 31 +- + Documentation/hwmon/{ina209 => ina209.rst} | 18 +- + Documentation/hwmon/{ina2xx => ina2xx.rst} | 41 +- + Documentation/hwmon/{ina3221 => ina3221.rst} | 35 +- + Documentation/hwmon/index.rst | 182 ++++++ + Documentation/hwmon/{ir35221 => ir35221.rst} | 13 +- + Documentation/hwmon/ir38064.rst | 66 ++ + Documentation/hwmon/isl68137.rst | 80 +++ + Documentation/hwmon/{it87 => it87.rst} | 102 ++- + Documentation/hwmon/{jc42 => jc42.rst} | 55 +- + Documentation/hwmon/{k10temp => k10temp.rst} | 37 +- + Documentation/hwmon/{k8temp => k8temp.rst} | 17 +- + .../hwmon/{lineage-pem => lineage-pem.rst} | 16 +- + Documentation/hwmon/{lm25066 => lm25066.rst} | 32 +- + Documentation/hwmon/{lm63 => lm63.rst} | 24 +- + Documentation/hwmon/{lm70 => lm70.rst} | 13 +- + Documentation/hwmon/{lm73 => lm73.rst} | 16 +- + Documentation/hwmon/{lm75 => lm75.rst} | 96 ++- + Documentation/hwmon/{lm77 => lm77.rst} | 9 +- + Documentation/hwmon/{lm78 => lm78.rst} | 20 +- + Documentation/hwmon/{lm80 => lm80.rst} | 19 +- + Documentation/hwmon/{lm83 => lm83.rst} | 16 +- + Documentation/hwmon/{lm85 => lm85.rst} | 97 ++- + Documentation/hwmon/{lm87 => lm87.rst} | 23 +- + Documentation/hwmon/{lm90 => lm90.rst} | 174 ++++- + Documentation/hwmon/{lm92 => lm92.rst} | 17 +- + Documentation/hwmon/{lm93 => lm93.rst} | 157 ++--- + Documentation/hwmon/{lm95234 => lm95234.rst} | 11 +- + Documentation/hwmon/{lm95245 => lm95245.rst} | 13 +- + Documentation/hwmon/lochnagar.rst | 83 +++ + Documentation/hwmon/{ltc2945 => ltc2945.rst} | 16 +- + Documentation/hwmon/{ltc2978 => ltc2978.rst} | 267 ++++++-- + Documentation/hwmon/{ltc2990 => ltc2990.rst} | 23 +- + Documentation/hwmon/{ltc3815 => ltc3815.rst} | 12 +- + Documentation/hwmon/{ltc4151 => ltc4151.rst} | 16 +- + Documentation/hwmon/{ltc4215 => ltc4215.rst} | 16 +- + Documentation/hwmon/{ltc4245 => ltc4245.rst} | 17 +- + Documentation/hwmon/{ltc4260 => ltc4260.rst} | 16 +- + Documentation/hwmon/{ltc4261 => ltc4261.rst} | 16 +- + Documentation/hwmon/{max16064 => max16064.rst} | 17 +- + Documentation/hwmon/{max16065 => max16065.rst} | 24 +- + Documentation/hwmon/{max1619 => max1619.rst} | 12 +- + Documentation/hwmon/{max1668 => max1668.rst} | 14 +- + Documentation/hwmon/{max197 => max197.rst} | 36 +- + Documentation/hwmon/{max20751 => max20751.rst} | 9 +- + Documentation/hwmon/{max31722 => max31722.rst} | 12 + + Documentation/hwmon/{max31785 => max31785.rst} | 6 + + Documentation/hwmon/{max31790 => max31790.rst} | 6 + + Documentation/hwmon/{max34440 => max34440.rst} | 90 ++- + Documentation/hwmon/{max6639 => max6639.rst} | 16 +- + Documentation/hwmon/{max6642 => max6642.rst} | 10 +- + Documentation/hwmon/{max6650 => max6650.rst} | 17 +- + Documentation/hwmon/{max6697 => max6697.rst} | 33 + + Documentation/hwmon/{max8688 => max8688.rst} | 20 +- + .../hwmon/{mc13783-adc => mc13783-adc.rst} | 27 +- + Documentation/hwmon/{mcp3021 => mcp3021.rst} | 15 +- + Documentation/hwmon/{menf21bmc => menf21bmc.rst} | 5 + + Documentation/hwmon/{mlxreg-fan => mlxreg-fan.rst} | 60 +- + Documentation/hwmon/{nct6683 => nct6683.rst} | 11 +- + Documentation/hwmon/{nct6775 => nct6775.rst} | 114 +++- + Documentation/hwmon/{nct7802 => nct7802.rst} | 11 +- + Documentation/hwmon/{nct7904 => nct7904.rst} | 9 +- + .../hwmon/{npcm750-pwm-fan => npcm750-pwm-fan.rst} | 4 + + Documentation/hwmon/{nsa320 => nsa320.rst} | 15 +- + .../hwmon/{ntc_thermistor => ntc_thermistor.rst} | 123 ++-- + Documentation/hwmon/{occ => occ.rst} | 93 ++- + Documentation/hwmon/{pc87360 => pc87360.rst} | 38 +- + Documentation/hwmon/{pc87427 => pc87427.rst} | 4 + + Documentation/hwmon/{pcf8591 => pcf8591.rst} | 52 +- + Documentation/hwmon/{pmbus-core => pmbus-core.rst} | 173 +++-- + Documentation/hwmon/{pmbus => pmbus.rst} | 90 ++- + Documentation/hwmon/{powr1220 => powr1220.rst} | 12 +- + Documentation/hwmon/{pwm-fan => pwm-fan.rst} | 3 + + .../{raspberrypi-hwmon => raspberrypi-hwmon.rst} | 3 + + Documentation/hwmon/{sch5627 => sch5627.rst} | 4 + + Documentation/hwmon/{sch5636 => sch5636.rst} | 3 + + Documentation/hwmon/{scpi-hwmon => scpi-hwmon.rst} | 7 +- + Documentation/hwmon/{sht15 => sht15.rst} | 28 +- + Documentation/hwmon/{sht21 => sht21.rst} | 24 +- + Documentation/hwmon/{sht3x => sht3x.rst} | 42 +- + Documentation/hwmon/{shtc1 => shtc1.rst} | 19 +- + Documentation/hwmon/{sis5595 => sis5595.rst} | 41 +- + Documentation/hwmon/{smm665 => smm665.rst} | 42 +- + Documentation/hwmon/{smsc47b397 => smsc47b397.rst} | 162 +++-- + Documentation/hwmon/{smsc47m1 => smsc47m1.rst} | 43 +- + Documentation/hwmon/smsc47m192 | 103 --- + Documentation/hwmon/smsc47m192.rst | 116 ++++ + .../{submitting-patches => submitting-patches.rst} | 21 +- + .../hwmon/{sysfs-interface => sysfs-interface.rst} | 721 ++++++++++++++------- + Documentation/hwmon/{tc654 => tc654.rst} | 9 +- + Documentation/hwmon/{tc74 => tc74.rst} | 3 + + Documentation/hwmon/{thmc50 => thmc50.rst} | 37 +- + Documentation/hwmon/{tmp102 => tmp102.rst} | 7 +- + Documentation/hwmon/{tmp103 => tmp103.rst} | 7 +- + Documentation/hwmon/{tmp108 => tmp108.rst} | 7 +- + Documentation/hwmon/{tmp401 => tmp401.rst} | 32 +- + Documentation/hwmon/{tmp421 => tmp421.rst} | 26 +- + Documentation/hwmon/{tps40422 => tps40422.rst} | 25 +- + .../{twl4030-madc-hwmon => twl4030-madc-hwmon.rst} | 8 +- + Documentation/hwmon/{ucd9000 => ucd9000.rst} | 35 +- + Documentation/hwmon/{ucd9200 => ucd9200.rst} | 46 +- + .../hwmon/{userspace-tools => userspace-tools.rst} | 3 + + Documentation/hwmon/{vexpress => vexpress.rst} | 13 +- + Documentation/hwmon/{via686a => via686a.rst} | 30 +- + Documentation/hwmon/{vt1211 => vt1211.rst} | 84 ++- + Documentation/hwmon/{w83627ehf => w83627ehf.rst} | 162 +++-- + Documentation/hwmon/{w83627hf => w83627hf.rst} | 65 +- + Documentation/hwmon/{w83773g => w83773g.rst} | 12 +- + Documentation/hwmon/{w83781d => w83781d.rst} | 330 ++++++---- + Documentation/hwmon/{w83791d => w83791d.rst} | 123 ++-- + Documentation/hwmon/{w83792d => w83792d.rst} | 112 ++-- + Documentation/hwmon/w83793 | 106 --- + Documentation/hwmon/w83793.rst | 113 ++++ + Documentation/hwmon/w83795 | 127 ---- + Documentation/hwmon/w83795.rst | 142 ++++ + Documentation/hwmon/{w83l785ts => w83l785ts.rst} | 9 +- + Documentation/hwmon/{w83l786ng => w83l786ng.rst} | 42 +- + Documentation/hwmon/{wm831x => wm831x.rst} | 9 +- + Documentation/hwmon/{wm8350 => wm8350.rst} | 10 +- + .../hwmon/{xgene-hwmon => xgene-hwmon.rst} | 24 +- + Documentation/hwmon/{zl6100 => zl6100.rst} | 71 +- + Documentation/index.rst | 1 + + Documentation/thermal/sysfs-api.txt | 2 +- + MAINTAINERS | 111 ++-- + drivers/hwmon/Kconfig | 19 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ad7414.c | 2 +- + drivers/hwmon/adc128d818.c | 2 +- + drivers/hwmon/adm1025.c | 98 +-- + drivers/hwmon/adm1026.c | 416 ++++++------ + drivers/hwmon/adm1029.c | 41 +- + drivers/hwmon/adm1031.c | 201 +++--- + drivers/hwmon/adm9240.c | 135 ++-- + drivers/hwmon/ads1015.c | 2 +- + drivers/hwmon/ads7828.c | 4 +- + drivers/hwmon/adt7411.c | 48 +- + drivers/hwmon/adt7475.c | 2 +- + drivers/hwmon/f71805f.c | 15 +- + drivers/hwmon/hih6130.c | 2 +- + drivers/hwmon/hwmon.c | 5 + + drivers/hwmon/iio_hwmon.c | 27 +- + drivers/hwmon/ina209.c | 2 +- + drivers/hwmon/ina2xx.c | 2 +- + drivers/hwmon/ina3221.c | 176 +++-- + drivers/hwmon/jc42.c | 18 +- + drivers/hwmon/jz4740-hwmon.c | 4 +- + drivers/hwmon/lm63.c | 2 +- + drivers/hwmon/lm75.c | 34 +- + drivers/hwmon/lm78.c | 114 ++-- + drivers/hwmon/lm85.c | 342 +++++----- + drivers/hwmon/lm87.c | 165 ++--- + drivers/hwmon/lm90.c | 15 +- + drivers/hwmon/lm95241.c | 34 +- + drivers/hwmon/lm95245.c | 49 +- + drivers/hwmon/lochnagar-hwmon.c | 412 ++++++++++++ + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4245.c | 73 +-- + drivers/hwmon/ltq-cputemp.c | 26 +- + drivers/hwmon/max197.c | 2 +- + drivers/hwmon/max31790.c | 58 +- + drivers/hwmon/max6621.c | 44 +- + drivers/hwmon/max6650.c | 90 ++- + drivers/hwmon/max6697.c | 2 +- + drivers/hwmon/menf21bmc_hwmon.c | 43 +- + drivers/hwmon/mlxreg-fan.c | 121 ++-- + drivers/hwmon/nct7904.c | 128 ++-- + drivers/hwmon/npcm750-pwm-fan.c | 70 +- + drivers/hwmon/ntc_thermistor.c | 24 +- + drivers/hwmon/occ/Kconfig | 17 +- + drivers/hwmon/occ/Makefile | 6 +- + drivers/hwmon/occ/common.c | 11 + + drivers/hwmon/occ/common.h | 3 +- + drivers/hwmon/occ/sysfs.c | 21 +- + drivers/hwmon/pc87427.c | 14 +- + drivers/hwmon/pmbus/Kconfig | 18 + + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/ir38064.c | 65 ++ + drivers/hwmon/pmbus/isl68137.c | 169 +++++ + drivers/hwmon/pmbus/lm25066.c | 17 +- + drivers/hwmon/pmbus/pmbus.h | 18 + + drivers/hwmon/pmbus/pmbus_core.c | 129 +++- + drivers/hwmon/pmbus/tps53679.c | 2 +- + drivers/hwmon/pmbus/ucd9000.c | 2 +- + drivers/hwmon/pmbus/ucd9200.c | 2 +- + drivers/hwmon/pwm-fan.c | 116 +++- + drivers/hwmon/raspberrypi-hwmon.c | 13 +- + drivers/hwmon/s3c-hwmon.c | 4 +- + drivers/hwmon/sht15.c | 2 +- + drivers/hwmon/sis5595.c | 92 ++- + drivers/hwmon/smsc47b397.c | 13 +- + drivers/hwmon/smsc47m1.c | 106 +-- + drivers/hwmon/smsc47m192.c | 146 +++-- + drivers/hwmon/stts751.c | 2 +- + drivers/hwmon/thmc50.c | 83 ++- + drivers/hwmon/tmp102.c | 28 +- + drivers/hwmon/tmp103.c | 2 +- + drivers/hwmon/tmp108.c | 29 +- + drivers/hwmon/tmp421.c | 2 +- + drivers/hwmon/via686a.c | 148 +++-- + drivers/hwmon/vt1211.c | 15 +- + drivers/hwmon/vt8231.c | 166 ++--- + drivers/hwmon/w83627hf.c | 299 ++++----- + drivers/hwmon/w83773g.c | 32 +- + include/linux/hwmon.h | 18 + + include/linux/platform_data/ads7828.h | 2 +- + include/linux/platform_data/ds620.h | 2 +- + include/linux/platform_data/ina2xx.h | 2 +- + include/linux/platform_data/max197.h | 2 +- + include/linux/platform_data/ntc_thermistor.h | 2 +- + 258 files changed, 8894 insertions(+), 4589 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/cirrus,lochnagar.txt + rename Documentation/hwmon/{ab8500 => ab8500.rst} (69%) + delete mode 100644 Documentation/hwmon/abituguru + rename Documentation/hwmon/{abituguru-datasheet => abituguru-datasheet.rst} (69%) + create mode 100644 Documentation/hwmon/abituguru.rst + rename Documentation/hwmon/{abituguru3 => abituguru3.rst} (75%) + rename Documentation/hwmon/{abx500 => abx500.rst} (89%) + rename Documentation/hwmon/{acpi_power_meter => acpi_power_meter.rst} (65%) + rename Documentation/hwmon/{ad7314 => ad7314.rst} (98%) + rename Documentation/hwmon/{adc128d818 => adc128d818.rst} (95%) + rename Documentation/hwmon/{adm1021 => adm1021.rst} (97%) + rename Documentation/hwmon/{adm1025 => adm1025.rst} (96%) + rename Documentation/hwmon/{adm1026 => adm1026.rst} (89%) + rename Documentation/hwmon/{adm1031 => adm1031.rst} (80%) + rename Documentation/hwmon/{adm1275 => adm1275.rst} (93%) + rename Documentation/hwmon/{adm9240 => adm9240.rst} (85%) + rename Documentation/hwmon/{ads1015 => ads1015.rst} (64%) + rename Documentation/hwmon/{ads7828 => ads7828.rst} (68%) + rename Documentation/hwmon/{adt7410 => adt7410.rst} (70%) + rename Documentation/hwmon/{adt7411 => adt7411.rst} (67%) + rename Documentation/hwmon/{adt7462 => adt7462.rst} (94%) + rename Documentation/hwmon/{adt7470 => adt7470.rst} (95%) + rename Documentation/hwmon/{adt7475 => adt7475.rst} (89%) + rename Documentation/hwmon/{amc6821 => amc6821.rst} (90%) + rename Documentation/hwmon/{asb100 => asb100.rst} (69%) + rename Documentation/hwmon/{asc7621 => asc7621.rst} (80%) + rename Documentation/hwmon/{aspeed-pwm-tacho => aspeed-pwm-tacho.rst} (79%) + rename Documentation/hwmon/{coretemp => coretemp.rst} (78%) + rename Documentation/hwmon/{da9052 => da9052.rst} (66%) + rename Documentation/hwmon/{da9055 => da9055.rst} (80%) + rename Documentation/hwmon/{dme1737 => dme1737.rst} (89%) + rename Documentation/hwmon/{ds1621 => ds1621.rst} (68%) + rename Documentation/hwmon/{ds620 => ds620.rst} (88%) + rename Documentation/hwmon/{emc1403 => emc1403.rst} (83%) + rename Documentation/hwmon/{emc2103 => emc2103.rst} (95%) + rename Documentation/hwmon/{emc6w201 => emc6w201.rst} (99%) + rename Documentation/hwmon/{f71805f => f71805f.rst} (88%) + rename Documentation/hwmon/{f71882fg => f71882fg.rst} (97%) + rename Documentation/hwmon/{fam15h_power => fam15h_power.rst} (63%) + rename Documentation/hwmon/{ftsteutates => ftsteutates.rst} (65%) + rename Documentation/hwmon/{g760a => g760a.rst} (99%) + rename Documentation/hwmon/{g762 => g762.rst} (59%) + rename Documentation/hwmon/{gl518sm => gl518sm.rst} (89%) + rename Documentation/hwmon/{hih6130 => hih6130.rst} (85%) + rename Documentation/hwmon/{hwmon-kernel-api.txt => hwmon-kernel-api.rst} (58%) + rename Documentation/hwmon/{ibm-cffps => ibm-cffps.rst} (90%) + rename Documentation/hwmon/{ibmaem => ibmaem.rst} (92%) + rename Documentation/hwmon/{ibmpowernv => ibmpowernv.rst} (86%) + rename Documentation/hwmon/{ina209 => ina209.rst} (90%) + rename Documentation/hwmon/{ina2xx => ina2xx.rst} (81%) + rename Documentation/hwmon/{ina3221 => ina3221.rst} (50%) + create mode 100644 Documentation/hwmon/index.rst + rename Documentation/hwmon/{ir35221 => ir35221.rst} (88%) + create mode 100644 Documentation/hwmon/ir38064.rst + create mode 100644 Documentation/hwmon/isl68137.rst + rename Documentation/hwmon/{it87 => it87.rst} (92%) + rename Documentation/hwmon/{jc42 => jc42.rst} (92%) + rename Documentation/hwmon/{k10temp => k10temp.rst} (98%) + rename Documentation/hwmon/{k8temp => k8temp.rst} (83%) + rename Documentation/hwmon/{lineage-pem => lineage-pem.rst} (88%) + rename Documentation/hwmon/{lm25066 => lm25066.rst} (91%) + rename Documentation/hwmon/{lm63 => lm63.rst} (95%) + rename Documentation/hwmon/{lm70 => lm70.rst} (96%) + rename Documentation/hwmon/{lm73 => lm73.rst} (92%) + rename Documentation/hwmon/{lm75 => lm75.rst} (80%) + rename Documentation/hwmon/{lm77 => lm77.rst} (97%) + rename Documentation/hwmon/{lm78 => lm78.rst} (95%) + rename Documentation/hwmon/{lm80 => lm80.rst} (94%) + rename Documentation/hwmon/{lm83 => lm83.rst} (95%) + rename Documentation/hwmon/{lm85 => lm85.rst} (86%) + rename Documentation/hwmon/{lm87 => lm87.rst} (89%) + rename Documentation/hwmon/{lm90 => lm90.rst} (85%) + rename Documentation/hwmon/{lm92 => lm92.rst} (90%) + rename Documentation/hwmon/{lm93 => lm93.rst} (80%) + rename Documentation/hwmon/{lm95234 => lm95234.rst} (94%) + rename Documentation/hwmon/{lm95245 => lm95245.rst} (91%) + create mode 100644 Documentation/hwmon/lochnagar.rst + rename Documentation/hwmon/{ltc2945 => ltc2945.rst} (89%) + rename Documentation/hwmon/{ltc2978 => ltc2978.rst} (58%) + rename Documentation/hwmon/{ltc2990 => ltc2990.rst} (76%) + rename Documentation/hwmon/{ltc3815 => ltc3815.rst} (83%) + rename Documentation/hwmon/{ltc4151 => ltc4151.rst} (80%) + rename Documentation/hwmon/{ltc4215 => ltc4215.rst} (78%) + rename Documentation/hwmon/{ltc4245 => ltc4245.rst} (89%) + rename Documentation/hwmon/{ltc4260 => ltc4260.rst} (85%) + rename Documentation/hwmon/{ltc4261 => ltc4261.rst} (88%) + rename Documentation/hwmon/{max16064 => max16064.rst} (88%) + rename Documentation/hwmon/{max16065 => max16065.rst} (95%) + rename Documentation/hwmon/{max1619 => max1619.rst} (82%) + rename Documentation/hwmon/{max1668 => max1668.rst} (85%) + rename Documentation/hwmon/{max197 => max197.rst} (59%) + rename Documentation/hwmon/{max20751 => max20751.rst} (89%) + rename Documentation/hwmon/{max31722 => max31722.rst} (83%) + rename Documentation/hwmon/{max31785 => max31785.rst} (92%) + rename Documentation/hwmon/{max31790 => max31790.rst} (88%) + rename Documentation/hwmon/{max34440 => max34440.rst} (77%) + rename Documentation/hwmon/{max6639 => max6639.rst} (83%) + rename Documentation/hwmon/{max6642 => max6642.rst} (82%) + rename Documentation/hwmon/{max6650 => max6650.rst} (86%) + rename Documentation/hwmon/{max6697 => max6697.rst} (91%) + rename Documentation/hwmon/{max8688 => max8688.rst} (85%) + rename Documentation/hwmon/{mc13783-adc => mc13783-adc.rst} (82%) + rename Documentation/hwmon/{mcp3021 => mcp3021.rst} (90%) + rename Documentation/hwmon/{menf21bmc => menf21bmc.rst} (93%) + rename Documentation/hwmon/{mlxreg-fan => mlxreg-fan.rst} (53%) + rename Documentation/hwmon/{nct6683 => nct6683.rst} (89%) + rename Documentation/hwmon/{nct6775 => nct6775.rst} (86%) + rename Documentation/hwmon/{nct7802 => nct7802.rst} (73%) + rename Documentation/hwmon/{nct7904 => nct7904.rst} (88%) + rename Documentation/hwmon/{npcm750-pwm-fan => npcm750-pwm-fan.rst} (79%) + rename Documentation/hwmon/{nsa320 => nsa320.rst} (93%) + rename Documentation/hwmon/{ntc_thermistor => ntc_thermistor.rst} (52%) + rename Documentation/hwmon/{occ => occ.rst} (67%) + rename Documentation/hwmon/{pc87360 => pc87360.rst} (88%) + rename Documentation/hwmon/{pc87427 => pc87427.rst} (99%) + rename Documentation/hwmon/{pcf8591 => pcf8591.rst} (62%) + rename Documentation/hwmon/{pmbus-core => pmbus-core.rst} (68%) + rename Documentation/hwmon/{pmbus => pmbus.rst} (88%) + rename Documentation/hwmon/{powr1220 => powr1220.rst} (90%) + rename Documentation/hwmon/{pwm-fan => pwm-fan.rst} (79%) + rename Documentation/hwmon/{raspberrypi-hwmon => raspberrypi-hwmon.rst} (85%) + rename Documentation/hwmon/{sch5627 => sch5627.rst} (99%) + rename Documentation/hwmon/{sch5636 => sch5636.rst} (99%) + rename Documentation/hwmon/{scpi-hwmon => scpi-hwmon.rst} (96%) + rename Documentation/hwmon/{sht15 => sht15.rst} (74%) + rename Documentation/hwmon/{sht21 => sht21.rst} (92%) + rename Documentation/hwmon/{sht3x => sht3x.rst} (75%) + rename Documentation/hwmon/{shtc1 => shtc1.rst} (94%) + rename Documentation/hwmon/{sis5595 => sis5595.rst} (80%) + rename Documentation/hwmon/{smm665 => smm665.rst} (92%) + rename Documentation/hwmon/{smsc47b397 => smsc47b397.rst} (62%) + rename Documentation/hwmon/{smsc47m1 => smsc47m1.rst} (77%) + delete mode 100644 Documentation/hwmon/smsc47m192 + create mode 100644 Documentation/hwmon/smsc47m192.rst + rename Documentation/hwmon/{submitting-patches => submitting-patches.rst} (93%) + rename Documentation/hwmon/{sysfs-interface => sysfs-interface.rst} (67%) + rename Documentation/hwmon/{tc654 => tc654.rst} (81%) + rename Documentation/hwmon/{tc74 => tc74.rst} (99%) + rename Documentation/hwmon/{thmc50 => thmc50.rst} (84%) + rename Documentation/hwmon/{tmp102 => tmp102.rst} (92%) + rename Documentation/hwmon/{tmp103 => tmp103.rst} (91%) + rename Documentation/hwmon/{tmp108 => tmp108.rst} (95%) + rename Documentation/hwmon/{tmp401 => tmp401.rst} (92%) + rename Documentation/hwmon/{tmp421 => tmp421.rst} (96%) + rename Documentation/hwmon/{tps40422 => tps40422.rst} (75%) + rename Documentation/hwmon/{twl4030-madc-hwmon => twl4030-madc-hwmon.rst} (82%) + rename Documentation/hwmon/{ucd9000 => ucd9000.rst} (87%) + rename Documentation/hwmon/{ucd9200 => ucd9200.rst} (80%) + rename Documentation/hwmon/{userspace-tools => userspace-tools.rst} (97%) + rename Documentation/hwmon/{vexpress => vexpress.rst} (85%) + rename Documentation/hwmon/{via686a => via686a.rst} (79%) + rename Documentation/hwmon/{vt1211 => vt1211.rst} (73%) + rename Documentation/hwmon/{w83627ehf => w83627ehf.rst} (64%) + rename Documentation/hwmon/{w83627hf => w83627hf.rst} (73%) + rename Documentation/hwmon/{w83773g => w83773g.rst} (91%) + rename Documentation/hwmon/{w83781d => w83781d.rst} (66%) + rename Documentation/hwmon/{w83791d => w83791d.rst} (59%) + rename Documentation/hwmon/{w83792d => w83792d.rst} (78%) + delete mode 100644 Documentation/hwmon/w83793 + create mode 100644 Documentation/hwmon/w83793.rst + delete mode 100644 Documentation/hwmon/w83795 + create mode 100644 Documentation/hwmon/w83795.rst + rename Documentation/hwmon/{w83l785ts => w83l785ts.rst} (91%) + rename Documentation/hwmon/{w83l786ng => w83l786ng.rst} (64%) + rename Documentation/hwmon/{wm831x => wm831x.rst} (86%) + rename Documentation/hwmon/{wm8350 => wm8350.rst} (81%) + rename Documentation/hwmon/{xgene-hwmon => xgene-hwmon.rst} (51%) + rename Documentation/hwmon/{zl6100 => zl6100.rst} (83%) + create mode 100644 drivers/hwmon/lochnagar-hwmon.c + create mode 100644 drivers/hwmon/pmbus/ir38064.c + create mode 100644 drivers/hwmon/pmbus/isl68137.c +Merging jc_docs/docs-next (41f0a9542a25 docs/vm: Minor editorial changes in the THP and hugetlbfs) +$ git merge jc_docs/docs-next +Auto-merging scripts/checkpatch.pl +Auto-merging MAINTAINERS +Removing Documentation/translations/zh_CN/magic-number.txt +Removing Documentation/translations/zh_CN/SubmittingPatches +Auto-merging Documentation/dontdiff +Auto-merging Documentation/clearing-warn-once.txt +Auto-merging Documentation/DMA-API-HOWTO.txt +Auto-merging .mailmap +Merge made by the 'recursive' strategy. + .mailmap | 6 + + Documentation/DMA-API-HOWTO.txt | 2 +- + Documentation/Makefile | 9 +- + Documentation/atomic_bitops.txt | 6 +- + Documentation/clearing-warn-once.txt | 2 + + Documentation/core-api/index.rst | 1 - + Documentation/dev-tools/kselftest.rst | 42 +- + Documentation/doc-guide/index.rst | 6 +- + Documentation/dontdiff | 8 +- + Documentation/driver-api/soundwire/stream.rst | 16 +- + Documentation/ntb.txt | 14 +- + Documentation/process/5.Posting.rst | 10 +- + Documentation/process/coding-style.rst | 6 +- + Documentation/process/deprecated.rst | 2 + + Documentation/process/howto.rst | 2 +- + Documentation/process/kernel-docs.rst | 12 - + Documentation/process/maintainer-pgp-guide.rst | 2 +- + Documentation/process/submitting-patches.rst | 46 +- + Documentation/rtc.txt | 2 +- + Documentation/speculation.txt | 8 +- + Documentation/sysctl/kernel.txt | 2 +- + Documentation/trace/ftrace.rst | 1 + + Documentation/trace/histogram.rst | 94 ++- + Documentation/translations/index.rst | 40 + + .../it_IT/core-api/memory-allocation.rst | 13 + + .../translations/it_IT/disclaimer-ita.rst | 13 +- + .../translations/it_IT/doc-guide/index.rst | 6 +- + Documentation/translations/it_IT/index.rst | 65 +- + .../translations/it_IT/networking/netdev-FAQ.rst | 13 + + .../translations/it_IT/process/5.Posting.rst | 10 +- + .../translations/it_IT/process/coding-style.rst | 8 +- + .../translations/it_IT/process/deprecated.rst | 129 +++ + .../it_IT/process/kernel-enforcement-statement.rst | 168 +++- + .../translations/it_IT/process/license-rules.rst | 452 ++++++++++ + .../it_IT/process/maintainer-pgp-guide.rst | 939 ++++++++++++++++++++- + .../it_IT/process/stable-kernel-rules.rst | 194 ++++- + .../it_IT/process/submitting-patches.rst | 47 +- + Documentation/translations/ja_JP/SubmittingPatches | 6 +- + Documentation/translations/zh_CN/SubmittingPatches | 412 --------- + .../translations/zh_CN/disclaimer-zh_CN.rst | 9 + + Documentation/translations/zh_CN/index.rst | 17 +- + Documentation/translations/zh_CN/magic-number.txt | 153 ---- + Documentation/translations/zh_CN/oops-tracing.txt | 2 +- + .../translations/zh_CN/process/1.Intro.rst | 186 ++++ + .../translations/zh_CN/process/2.Process.rst | 360 ++++++++ + .../translations/zh_CN/process/3.Early-stage.rst | 161 ++++ + .../translations/zh_CN/process/4.Coding.rst | 290 +++++++ + .../translations/zh_CN/process/5.Posting.rst | 240 ++++++ + .../translations/zh_CN/process/6.Followthrough.rst | 145 ++++ + .../zh_CN/process/7.AdvancedTopics.rst | 124 +++ + .../translations/zh_CN/process/8.Conclusion.rst | 64 ++ + .../process/code-of-conduct-interpretation.rst | 108 +++ + .../translations/zh_CN/process/code-of-conduct.rst | 72 ++ + .../zh_CN/{ => process}/coding-style.rst | 21 +- + .../zh_CN/process/development-process.rst | 26 + + .../email-clients.rst} | 104 ++- + .../zh_CN/{HOWTO => process/howto.rst} | 265 +++--- + Documentation/translations/zh_CN/process/index.rst | 60 ++ + .../translations/zh_CN/process/license-rules.rst | 370 ++++++++ + .../translations/zh_CN/process/magic-number.rst | 151 ++++ + .../zh_CN/process/management-style.rst | 207 +++++ + .../zh_CN/process/programming-language.rst | 41 + + .../stable-api-nonsense.rst} | 68 +- + .../stable-kernel-rules.rst} | 34 +- + .../zh_CN/process/submit-checklist.rst | 107 +++ + .../submitting-drivers.rst} | 36 +- + .../zh_CN/process/submitting-patches.rst | 682 +++++++++++++++ + .../volatile-considered-harmful.rst} | 35 +- + Documentation/translations/zh_CN/sparse.txt | 6 +- + Documentation/unaligned-memory-access.txt | 2 +- + Documentation/userspace-api/seccomp_filter.rst | 8 +- + Documentation/video-output.txt | 52 +- + Documentation/vm/hugetlbfs_reserv.rst | 17 +- + Documentation/vm/index.rst | 1 + + Documentation/vm/memory-model.rst | 183 ++++ + Documentation/vm/numa.rst | 4 +- + Documentation/vm/transhuge.rst | 81 +- + Documentation/x86/boot.txt | 4 + + MAINTAINERS | 2 +- + include/linux/wait.h | 2 +- + scripts/checkpatch.pl | 18 + + scripts/sphinx-pre-install | 1 + + 82 files changed, 6202 insertions(+), 1131 deletions(-) + create mode 100644 Documentation/translations/it_IT/core-api/memory-allocation.rst + create mode 100644 Documentation/translations/it_IT/networking/netdev-FAQ.rst + create mode 100644 Documentation/translations/it_IT/process/deprecated.rst + create mode 100644 Documentation/translations/it_IT/process/license-rules.rst + delete mode 100644 Documentation/translations/zh_CN/SubmittingPatches + create mode 100644 Documentation/translations/zh_CN/disclaimer-zh_CN.rst + delete mode 100644 Documentation/translations/zh_CN/magic-number.txt + create mode 100644 Documentation/translations/zh_CN/process/1.Intro.rst + create mode 100644 Documentation/translations/zh_CN/process/2.Process.rst + create mode 100644 Documentation/translations/zh_CN/process/3.Early-stage.rst + create mode 100644 Documentation/translations/zh_CN/process/4.Coding.rst + create mode 100644 Documentation/translations/zh_CN/process/5.Posting.rst + create mode 100644 Documentation/translations/zh_CN/process/6.Followthrough.rst + create mode 100644 Documentation/translations/zh_CN/process/7.AdvancedTopics.rst + create mode 100644 Documentation/translations/zh_CN/process/8.Conclusion.rst + create mode 100644 Documentation/translations/zh_CN/process/code-of-conduct-interpretation.rst + create mode 100644 Documentation/translations/zh_CN/process/code-of-conduct.rst + rename Documentation/translations/zh_CN/{ => process}/coding-style.rst (97%) + create mode 100644 Documentation/translations/zh_CN/process/development-process.rst + rename Documentation/translations/zh_CN/{email-clients.txt => process/email-clients.rst} (74%) + rename Documentation/translations/zh_CN/{HOWTO => process/howto.rst} (70%) + create mode 100644 Documentation/translations/zh_CN/process/index.rst + create mode 100644 Documentation/translations/zh_CN/process/license-rules.rst + create mode 100644 Documentation/translations/zh_CN/process/magic-number.rst + create mode 100644 Documentation/translations/zh_CN/process/management-style.rst + create mode 100644 Documentation/translations/zh_CN/process/programming-language.rst + rename Documentation/translations/zh_CN/{stable_api_nonsense.txt => process/stable-api-nonsense.rst} (78%) + rename Documentation/translations/zh_CN/{stable_kernel_rules.txt => process/stable-kernel-rules.rst} (74%) + create mode 100644 Documentation/translations/zh_CN/process/submit-checklist.rst + rename Documentation/translations/zh_CN/{SubmittingDrivers => process/submitting-drivers.rst} (85%) + create mode 100644 Documentation/translations/zh_CN/process/submitting-patches.rst + rename Documentation/translations/zh_CN/{volatile-considered-harmful.txt => process/volatile-considered-harmful.rst} (81%) + create mode 100644 Documentation/vm/memory-model.rst +Merging v4l-dvb/master (7afa8db323e3 media: vsp1: Add support for missing 16-bit RGB555 formats) +$ git merge v4l-dvb/master +Removing drivers/staging/media/zoran/zr36060.h +Removing drivers/staging/media/zoran/zr36060.c +Removing drivers/staging/media/zoran/zr36057.h +Removing drivers/staging/media/zoran/zr36050.h +Removing drivers/staging/media/zoran/zr36050.c +Removing drivers/staging/media/zoran/zr36016.h +Removing drivers/staging/media/zoran/zr36016.c +Removing drivers/staging/media/zoran/zoran_procfs.h +Removing drivers/staging/media/zoran/zoran_procfs.c +Removing drivers/staging/media/zoran/zoran_driver.c +Removing drivers/staging/media/zoran/zoran_device.h +Removing drivers/staging/media/zoran/zoran_device.c +Removing drivers/staging/media/zoran/zoran_card.h +Removing drivers/staging/media/zoran/zoran_card.c +Removing drivers/staging/media/zoran/zoran.h +Removing drivers/staging/media/zoran/videocodec.h +Removing drivers/staging/media/zoran/videocodec.c +Removing drivers/staging/media/zoran/TODO +Removing drivers/staging/media/zoran/Makefile +Removing drivers/staging/media/zoran/Kconfig +Removing drivers/staging/media/mt9t031/TODO +Removing drivers/staging/media/mt9t031/Makefile +Removing drivers/staging/media/mt9t031/Kconfig +Auto-merging MAINTAINERS +Removing Documentation/media/v4l-drivers/zoran.rst +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/media/cedrus.txt | 1 + + .../bindings/media/i2c/st,st-mipid02.txt | 82 + + .../devicetree/bindings/media/meson-ao-cec.txt | 13 +- + .../devicetree/bindings/media/rcar_imr.txt | 31 + + .../devicetree/bindings/media/rcar_vin.txt | 1 + + .../bindings/media/renesas,rcar-csi2.txt | 4 +- + Documentation/media/index.rst | 2 +- + Documentation/media/kapi/mc-core.rst | 41 + + Documentation/media/lirc.h.rst.exceptions | 1 + + Documentation/media/uapi/mediactl/request-api.rst | 2 +- + Documentation/media/uapi/v4l/buffer.rst | 21 +- + Documentation/media/uapi/v4l/colorspaces-defs.rst | 4 +- + Documentation/media/uapi/v4l/colorspaces.rst | 4 +- + Documentation/media/uapi/v4l/dev-raw-vbi.rst | 4 +- + Documentation/media/uapi/v4l/dev-rds.rst | 2 +- + Documentation/media/uapi/v4l/dev-sliced-vbi.rst | 22 +- + Documentation/media/uapi/v4l/dev-subdev.rst | 82 +- + Documentation/media/uapi/v4l/ext-ctrls-camera.rst | 17 +- + Documentation/media/uapi/v4l/ext-ctrls-codec.rst | 235 +- + Documentation/media/uapi/v4l/ext-ctrls-detect.rst | 2 +- + Documentation/media/uapi/v4l/ext-ctrls-dv.rst | 2 +- + Documentation/media/uapi/v4l/ext-ctrls-flash.rst | 4 +- + Documentation/media/uapi/v4l/ext-ctrls-jpeg.rst | 2 +- + Documentation/media/uapi/v4l/field-order.rst | 4 +- + Documentation/media/uapi/v4l/pixfmt-compressed.rst | 6 + + Documentation/media/uapi/v4l/pixfmt-meta-d4xx.rst | 9 +- + .../media/uapi/v4l/pixfmt-meta-vsp1-hgt.rst | 9 + + Documentation/media/uapi/v4l/pixfmt-packed-hsv.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-packed-rgb.rst | 440 ++- + Documentation/media/uapi/v4l/pixfmt-packed-yuv.rst | 23 +- + Documentation/media/uapi/v4l/pixfmt-srggb10p.rst | 2 +- + Documentation/media/uapi/v4l/pixfmt-srggb12p.rst | 3 +- + Documentation/media/uapi/v4l/pixfmt-srggb14p.rst | 24 +- + .../media/uapi/v4l/pixfmt-v4l2-mplane.rst | 17 +- + Documentation/media/uapi/v4l/pixfmt-y10p.rst | 10 + + Documentation/media/uapi/v4l/subdev-formats.rst | 113 +- + Documentation/media/uapi/v4l/vidioc-qbuf.rst | 10 +- + Documentation/media/v4l-drivers/index.rst | 1 - + Documentation/media/v4l-drivers/zoran.rst | 583 ---- + MAINTAINERS | 14 +- + drivers/media/Kconfig | 20 +- + drivers/media/Makefile | 6 + + drivers/media/cec/Kconfig | 4 +- + drivers/media/cec/cec-core.c | 1 + + drivers/media/cec/cec-notifier.c | 30 + + drivers/media/common/cx2341x.c | 151 +- + drivers/media/common/siano/Kconfig | 4 +- + drivers/media/common/videobuf2/videobuf2-core.c | 46 +- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 24 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 10 +- + drivers/media/dvb-core/dvbdev.c | 1 - + drivers/media/dvb-frontends/as102_fe.c | 2 +- + drivers/media/dvb-frontends/dib7000p.c | 3 +- + drivers/media/dvb-frontends/dib8000.c | 4 +- + drivers/media/dvb-frontends/dib9000.c | 6 +- + drivers/media/dvb-frontends/drxd_hard.c | 30 +- + drivers/media/dvb-frontends/dvb-pll.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 11 +- + drivers/media/dvb-frontends/si2165.c | 9 +- + drivers/media/dvb-frontends/ts2020.c | 3 + + drivers/media/i2c/Kconfig | 271 +- + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/cx25840/Kconfig | 2 +- + drivers/media/i2c/et8ek8/Kconfig | 2 +- + drivers/media/i2c/imx214.c | 10 +- + drivers/media/i2c/m5mols/Kconfig | 2 +- + drivers/media/i2c/ov2659.c | 8 +- + drivers/media/i2c/ov6650.c | 43 +- + drivers/media/i2c/ov7670.c | 32 +- + drivers/media/i2c/ov7740.c | 28 +- + drivers/media/i2c/smiapp/Kconfig | 2 +- + drivers/media/i2c/st-mipid02.c | 1033 +++++++ + drivers/media/media-dev-allocator.c | 135 + + drivers/media/media-devnode.c | 4 +- + drivers/media/media-entity.c | 33 +- + drivers/media/media-request.c | 4 +- + drivers/media/mmc/siano/Kconfig | 2 +- + drivers/media/pci/bt8xx/Kconfig | 2 +- + drivers/media/pci/bt8xx/dst.c | 3 +- + drivers/media/pci/bt8xx/dst_common.h | 2 +- + drivers/media/pci/cobalt/Kconfig | 2 +- + drivers/media/pci/cobalt/cobalt-irq.c | 2 +- + drivers/media/pci/cx18/Kconfig | 4 +- + drivers/media/pci/cx18/cx18-fileops.c | 2 +- + drivers/media/pci/cx23885/Kconfig | 4 +- + drivers/media/pci/cx23885/cx23885-dvb.c | 5 +- + drivers/media/pci/cx25821/Kconfig | 4 +- + drivers/media/pci/cx88/Kconfig | 10 +- + drivers/media/pci/ddbridge/Kconfig | 4 +- + drivers/media/pci/dt3155/Kconfig | 2 +- + drivers/media/pci/intel/ipu3/Kconfig | 2 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 1 + + drivers/media/pci/ivtv/Kconfig | 10 +- + drivers/media/pci/ivtv/ivtv-fileops.c | 2 +- + drivers/media/pci/mantis/mantis_i2c.c | 2 +- + drivers/media/pci/meye/Kconfig | 2 +- + drivers/media/pci/netup_unidvb/Kconfig | 2 +- + drivers/media/pci/ngene/Kconfig | 2 +- + drivers/media/pci/saa7134/Kconfig | 10 +- + drivers/media/pci/saa7134/saa7134-go7007.c | 2 +- + drivers/media/pci/saa7146/Kconfig | 6 +- + drivers/media/pci/saa7146/hexium_gemini.c | 5 +- + drivers/media/pci/saa7146/hexium_orion.c | 5 +- + drivers/media/pci/saa7164/Kconfig | 2 +- + drivers/media/pci/solo6x10/Kconfig | 2 +- + drivers/media/pci/tw5864/Kconfig | 2 +- + drivers/media/pci/tw5864/tw5864-video.c | 4 +- + drivers/media/pci/tw68/Kconfig | 2 +- + drivers/media/platform/Kconfig | 90 +- + drivers/media/platform/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/atmel/Kconfig | 2 +- + drivers/media/platform/atmel/atmel-isc-regs.h | 2 + + drivers/media/platform/atmel/atmel-isc.c | 906 ++++--- + drivers/media/platform/coda/coda-bit.c | 3 + + drivers/media/platform/coda/coda-common.c | 120 +- + drivers/media/platform/cros-ec-cec/cros-ec-cec.c | 1 + + drivers/media/platform/davinci/isif.c | 9 - + drivers/media/platform/davinci/vpfe_capture.c | 2 +- + drivers/media/platform/davinci/vpif_capture.c | 3 +- + drivers/media/platform/davinci/vpif_display.c | 4 +- + drivers/media/platform/exynos4-is/fimc-capture.c | 2 +- + drivers/media/platform/exynos4-is/fimc-m2m.c | 2 +- + drivers/media/platform/imx-pxp.c | 4 +- + drivers/media/platform/marvell-ccic/Kconfig | 4 +- + drivers/media/platform/meson/Makefile | 1 + + drivers/media/platform/meson/ao-cec-g12a.c | 779 ++++++ + drivers/media/platform/meson/ao-cec.c | 16 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.c | 75 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_dec.h | 2 - + drivers/media/platform/mtk-vcodec/mtk_vcodec_drv.h | 16 +- + drivers/media/platform/mtk-vcodec/mtk_vcodec_enc.c | 10 +- + .../media/platform/mtk-vcodec/vdec/vdec_h264_if.c | 4 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp8_if.c | 4 +- + .../media/platform/mtk-vcodec/vdec/vdec_vp9_if.c | 27 +- + drivers/media/platform/mtk-vpu/mtk_vpu.c | 2 +- + drivers/media/platform/mx2_emmaprp.c | 4 +- + drivers/media/platform/omap/Kconfig | 2 +- + drivers/media/platform/pxa_camera.c | 2 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 4 +- + drivers/media/platform/rcar-vin/Kconfig | 3 +- + drivers/media/platform/rcar-vin/rcar-core.c | 47 +- + drivers/media/platform/rcar-vin/rcar-csi2.c | 120 +- + drivers/media/platform/rcar-vin/rcar-dma.c | 2 +- + drivers/media/platform/rcar_drif.c | 8 +- + drivers/media/platform/rcar_fdp1.c | 28 +- + drivers/media/platform/s5p-cec/s5p_cec.c | 16 +- + drivers/media/platform/s5p-g2d/g2d.c | 6 +- + drivers/media/platform/seco-cec/seco-cec.c | 1 + + drivers/media/platform/sh_veu.c | 6 - + drivers/media/platform/sti/c8sectpfe/Kconfig | 2 +- + drivers/media/platform/sti/cec/stih-cec.c | 21 +- + drivers/media/platform/sti/delta/delta-ipc.c | 6 +- + drivers/media/platform/stm32/stm32-cec.c | 11 + + drivers/media/platform/stm32/stm32-dcmi.c | 46 +- + .../media/platform/sunxi/sun6i-csi/sun6i_video.c | 4 +- + drivers/media/platform/tegra-cec/tegra_cec.c | 14 +- + drivers/media/platform/ti-vpe/cal.c | 12 +- + drivers/media/platform/ti-vpe/vpe.c | 6 +- + drivers/media/platform/vicodec/codec-fwht.c | 121 +- + drivers/media/platform/vicodec/codec-fwht.h | 12 +- + drivers/media/platform/vicodec/codec-v4l2-fwht.c | 431 +-- + drivers/media/platform/vicodec/codec-v4l2-fwht.h | 7 +- + drivers/media/platform/vicodec/vicodec-core.c | 762 ++++-- + drivers/media/platform/video-mux.c | 5 + + drivers/media/platform/vim2m.c | 69 +- + drivers/media/platform/vimc/Kconfig | 2 +- + drivers/media/platform/vimc/vimc-capture.c | 93 +- + drivers/media/platform/vimc/vimc-common.c | 313 +-- + drivers/media/platform/vimc/vimc-common.h | 60 +- + drivers/media/platform/vimc/vimc-core.c | 2 + + drivers/media/platform/vimc/vimc-debayer.c | 98 +- + drivers/media/platform/vimc/vimc-scaler.c | 78 +- + drivers/media/platform/vimc/vimc-sensor.c | 70 +- + drivers/media/platform/vimc/vimc-streamer.c | 40 +- + drivers/media/platform/vimc/vimc-streamer.h | 22 +- + drivers/media/platform/vivid/Kconfig | 6 +- + drivers/media/platform/vivid/vivid-core.c | 2 +- + drivers/media/platform/vivid/vivid-vid-cap.c | 2 +- + drivers/media/platform/vivid/vivid-vid-out.c | 14 +- + drivers/media/platform/vsp1/vsp1_pipe.c | 62 + + drivers/media/platform/xilinx/Kconfig | 6 +- + drivers/media/radio/Kconfig | 54 +- + drivers/media/radio/si470x/Kconfig | 6 +- + drivers/media/radio/si4713/Kconfig | 6 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/radio/wl128x/fmdrv_common.c | 14 +- + drivers/media/rc/Kconfig | 80 +- + drivers/media/rc/ir-rcmm-decoder.c | 1 - + drivers/media/rc/keymaps/Kconfig | 2 +- + drivers/media/rc/keymaps/rc-xbox-dvd.c | 2 +- + drivers/media/rc/rc-main.c | 2 + + drivers/media/rc/serial_ir.c | 9 +- + drivers/media/rc/xbox_remote.c | 6 +- + drivers/media/spi/Kconfig | 2 +- + drivers/media/usb/airspy/Kconfig | 2 +- + drivers/media/usb/au0828/Kconfig | 8 +- + drivers/media/usb/au0828/au0828-core.c | 196 +- + drivers/media/usb/au0828/au0828-video.c | 20 +- + drivers/media/usb/au0828/au0828.h | 6 +- + drivers/media/usb/cpia2/Kconfig | 2 +- + drivers/media/usb/cpia2/cpia2_v4l.c | 3 +- + drivers/media/usb/cx231xx/Kconfig | 8 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 104 +- + drivers/media/usb/dvb-usb-v2/af9035.h | 12 + + drivers/media/usb/dvb-usb-v2/dvbsky.c | 18 +- + drivers/media/usb/em28xx/Kconfig | 8 +- + drivers/media/usb/em28xx/em28xx-input.c | 2 +- + drivers/media/usb/go7007/Kconfig | 8 +- + drivers/media/usb/go7007/go7007-fw.c | 4 +- + drivers/media/usb/go7007/go7007-usb.c | 16 +- + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/gspca/Kconfig | 2 +- + drivers/media/usb/gspca/gspca.c | 12 +- + drivers/media/usb/hackrf/Kconfig | 2 +- + drivers/media/usb/hdpvr/Kconfig | 2 +- + drivers/media/usb/hdpvr/hdpvr-video.c | 10 +- + drivers/media/usb/pulse8-cec/Kconfig | 2 +- + drivers/media/usb/pulse8-cec/pulse8-cec.c | 4 +- + drivers/media/usb/pvrusb2/Kconfig | 8 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 7 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.h | 1 + + drivers/media/usb/pvrusb2/pvrusb2-v4l2.c | 4 +- + drivers/media/usb/pwc/Kconfig | 4 +- + drivers/media/usb/pwc/pwc-ctrl.c | 17 +- + drivers/media/usb/rainshadow-cec/Kconfig | 2 +- + drivers/media/usb/siano/Kconfig | 2 +- + drivers/media/usb/stk1160/Kconfig | 2 +- + drivers/media/usb/stkwebcam/Kconfig | 2 +- + drivers/media/usb/tm6000/Kconfig | 4 +- + drivers/media/usb/usbtv/Kconfig | 2 +- + drivers/media/usb/usbvision/Kconfig | 2 +- + drivers/media/usb/usbvision/usbvision-core.c | 3 + + drivers/media/usb/uvc/Kconfig | 4 +- + drivers/media/usb/zr364xx/Kconfig | 2 +- + drivers/media/v4l2-core/Kconfig | 8 +- + drivers/media/v4l2-core/v4l2-common.c | 186 ++ + drivers/media/v4l2-core/v4l2-ctrls.c | 38 +- + drivers/media/v4l2-core/v4l2-device.c | 19 +- + drivers/media/v4l2-core/v4l2-fwnode.c | 17 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 3 +- + drivers/media/v4l2-core/v4l2-subdev.c | 22 +- + drivers/staging/media/Kconfig | 4 +- + drivers/staging/media/Makefile | 1 - + drivers/staging/media/bcm2048/Kconfig | 2 +- + drivers/staging/media/bcm2048/radio-bcm2048.c | 4 +- + drivers/staging/media/davinci_vpfe/Kconfig | 2 +- + drivers/staging/media/davinci_vpfe/dm365_isif.c | 20 +- + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 2 +- + drivers/staging/media/imx/Kconfig | 4 +- + drivers/staging/media/imx/imx-ic-common.c | 4 +- + drivers/staging/media/imx/imx-media-csi.c | 18 +- + drivers/staging/media/imx/imx-media-dev-common.c | 4 +- + drivers/staging/media/imx/imx-media-dev.c | 28 +- + drivers/staging/media/imx/imx-media-internal-sd.c | 32 +- + drivers/staging/media/imx/imx-media-of.c | 73 +- + drivers/staging/media/imx/imx-media-vdic.c | 12 +- + drivers/staging/media/imx/imx-media.h | 7 +- + drivers/staging/media/imx/imx7-media-csi.c | 6 +- + drivers/staging/media/imx/imx7-mipi-csis.c | 26 +- + drivers/staging/media/ipu3/Kconfig | 2 +- + drivers/staging/media/ipu3/ipu3-css.c | 40 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 126 +- + drivers/staging/media/ipu3/ipu3.c | 32 +- + drivers/staging/media/mt9t031/Kconfig | 5 - + drivers/staging/media/mt9t031/Makefile | 1 - + drivers/staging/media/mt9t031/TODO | 5 - + drivers/staging/media/omap4iss/Kconfig | 2 +- + .../staging/media/rockchip/vpu/rockchip_vpu_drv.c | 3 +- + .../staging/media/rockchip/vpu/rockchip_vpu_enc.c | 12 +- + drivers/staging/media/soc_camera/TODO | 4 + + drivers/staging/media/sunxi/cedrus/cedrus.c | 33 +- + drivers/staging/media/sunxi/cedrus/cedrus.h | 3 + + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 3 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 1 + + drivers/staging/media/zoran/Kconfig | 75 - + drivers/staging/media/zoran/Makefile | 7 - + drivers/staging/media/zoran/TODO | 4 - + drivers/staging/media/zoran/videocodec.c | 391 --- + drivers/staging/media/zoran/videocodec.h | 349 --- + drivers/staging/media/zoran/zoran.h | 402 --- + drivers/staging/media/zoran/zoran_card.c | 1524 ----------- + drivers/staging/media/zoran/zoran_card.h | 50 - + drivers/staging/media/zoran/zoran_device.c | 1619 ----------- + drivers/staging/media/zoran/zoran_device.h | 91 - + drivers/staging/media/zoran/zoran_driver.c | 2850 -------------------- + drivers/staging/media/zoran/zoran_procfs.c | 221 -- + drivers/staging/media/zoran/zoran_procfs.h | 32 - + drivers/staging/media/zoran/zr36016.c | 516 ---- + drivers/staging/media/zoran/zr36016.h | 107 - + drivers/staging/media/zoran/zr36050.c | 896 ------ + drivers/staging/media/zoran/zr36050.h | 179 -- + drivers/staging/media/zoran/zr36057.h | 164 -- + drivers/staging/media/zoran/zr36060.c | 1006 ------- + drivers/staging/media/zoran/zr36060.h | 216 -- + include/media/cec-notifier.h | 19 +- + include/media/dvb-usb-ids.h | 1 + + include/media/fwht-ctrls.h | 31 + + include/media/media-dev-allocator.h | 63 + + include/media/media-entity.h | 24 - + include/media/media-request.h | 4 +- + include/media/rc-map.h | 4 +- + include/media/v4l2-common.h | 33 + + include/media/v4l2-ctrls.h | 11 +- + include/media/v4l2-subdev.h | 15 +- + include/media/videobuf2-core.h | 25 +- + include/uapi/linux/lirc.h | 2 + + include/uapi/linux/media-bus-format.h | 3 +- + include/uapi/linux/media.h | 25 +- + include/uapi/linux/v4l2-controls.h | 8 + + include/uapi/linux/videodev2.h | 17 + + sound/usb/Kconfig | 4 + + sound/usb/Makefile | 2 + + sound/usb/card.c | 14 + + sound/usb/card.h | 3 + + sound/usb/media.c | 327 +++ + sound/usb/media.h | 74 + + sound/usb/mixer.h | 3 + + sound/usb/pcm.c | 29 +- + sound/usb/quirks-table.h | 1 + + sound/usb/stream.c | 2 + + sound/usb/usbaudio.h | 6 + + .../selftests/media_tests/media_dev_allocator.sh | 85 + + 322 files changed, 7605 insertions(+), 14125 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/st,st-mipid02.txt + create mode 100644 Documentation/devicetree/bindings/media/rcar_imr.txt + delete mode 100644 Documentation/media/v4l-drivers/zoran.rst + create mode 100644 drivers/media/i2c/st-mipid02.c + create mode 100644 drivers/media/media-dev-allocator.c + create mode 100644 drivers/media/platform/meson/ao-cec-g12a.c + delete mode 100644 drivers/staging/media/mt9t031/Kconfig + delete mode 100644 drivers/staging/media/mt9t031/Makefile + delete mode 100644 drivers/staging/media/mt9t031/TODO + create mode 100644 drivers/staging/media/soc_camera/TODO + delete mode 100644 drivers/staging/media/zoran/Kconfig + delete mode 100644 drivers/staging/media/zoran/Makefile + delete mode 100644 drivers/staging/media/zoran/TODO + delete mode 100644 drivers/staging/media/zoran/videocodec.c + delete mode 100644 drivers/staging/media/zoran/videocodec.h + delete mode 100644 drivers/staging/media/zoran/zoran.h + delete mode 100644 drivers/staging/media/zoran/zoran_card.c + delete mode 100644 drivers/staging/media/zoran/zoran_card.h + delete mode 100644 drivers/staging/media/zoran/zoran_device.c + delete mode 100644 drivers/staging/media/zoran/zoran_device.h + delete mode 100644 drivers/staging/media/zoran/zoran_driver.c + delete mode 100644 drivers/staging/media/zoran/zoran_procfs.c + delete mode 100644 drivers/staging/media/zoran/zoran_procfs.h + delete mode 100644 drivers/staging/media/zoran/zr36016.c + delete mode 100644 drivers/staging/media/zoran/zr36016.h + delete mode 100644 drivers/staging/media/zoran/zr36050.c + delete mode 100644 drivers/staging/media/zoran/zr36050.h + delete mode 100644 drivers/staging/media/zoran/zr36057.h + delete mode 100644 drivers/staging/media/zoran/zr36060.c + delete mode 100644 drivers/staging/media/zoran/zr36060.h + create mode 100644 include/media/fwht-ctrls.h + create mode 100644 include/media/media-dev-allocator.h + create mode 100644 sound/usb/media.c + create mode 100644 sound/usb/media.h + create mode 100755 tools/testing/selftests/media_tests/media_dev_allocator.sh +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 (261ac4ddfa9f video: fbdev: atmel_lcdfb: remove set but not used variable 'pdata') +$ 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/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/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/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/vesafb.c | 4 +- + drivers/video/fbdev/xen-fbfront.c | 2 +- + include/linux/amba/clcd.h | 31 -- + include/video/udlfb.h | 7 + + 35 files changed, 597 insertions(+), 1542 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 (f9d6fbd8a37e Merge branch 'acpica-fixes' into linux-next) +$ git merge pm/linux-next +Auto-merging include/linux/acpi.h +Auto-merging drivers/firmware/Makefile +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/base/power/main.c +Auto-merging drivers/acpi/device_pm.c +Auto-merging MAINTAINERS +Auto-merging Documentation/index.rst +Removing Documentation/acpi/ssdt-overlays.txt +Removing Documentation/acpi/method-tracing.txt +Removing Documentation/acpi/method-customizing.txt +Removing Documentation/acpi/initrd_table_override.txt +Removing Documentation/acpi/i2c-muxes.txt +Removing Documentation/acpi/apei/output_format.txt +Removing Documentation/acpi/aml-debugger.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 18 ++ + Documentation/acpi/aml-debugger.txt | 66 ----- + Documentation/acpi/apei/output_format.txt | 147 ----------- + Documentation/acpi/i2c-muxes.txt | 58 ---- + Documentation/acpi/initrd_table_override.txt | 111 -------- + Documentation/acpi/method-customizing.txt | 73 ----- + Documentation/acpi/method-tracing.txt | 192 -------------- + Documentation/acpi/ssdt-overlays.txt | 172 ------------ + .../acpi/cppc_sysfs.rst} | 71 ++--- + .../acpi/dsdt-override.rst} | 8 +- + Documentation/admin-guide/acpi/index.rst | 14 + + .../admin-guide/acpi/initrd_table_override.rst | 115 ++++++++ + Documentation/admin-guide/acpi/ssdt-overlays.rst | 180 +++++++++++++ + Documentation/admin-guide/index.rst | 1 + + Documentation/admin-guide/pm/cpufreq.rst | 18 +- + Documentation/admin-guide/pm/cpuidle.rst | 8 +- + Documentation/admin-guide/pm/index.rst | 2 + + Documentation/admin-guide/pm/intel_epb.rst | 41 +++ + Documentation/admin-guide/pm/intel_pstate.rst | 32 ++- + Documentation/admin-guide/pm/sleep-states.rst | 8 +- + Documentation/admin-guide/pm/strategies.rst | 8 +- + Documentation/admin-guide/pm/system-wide.rst | 2 + + Documentation/admin-guide/pm/working-state.rst | 3 + + Documentation/driver-api/acpi/index.rst | 9 + + .../acpi/linuxized-acpica.rst} | 109 ++++---- + .../acpi/scan_handlers.rst} | 24 +- + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/pm/cpuidle.rst | 7 +- + Documentation/driver-api/pm/devices.rst | 12 +- + Documentation/driver-api/pm/index.rst | 2 + + Documentation/driver-api/pm/notifiers.rst | 8 +- + Documentation/driver-api/pm/types.rst | 2 + + .../acpi/DSD-properties-rules.rst} | 21 +- + .../acpi/acpi-lid.rst} | 40 ++- + Documentation/firmware-guide/acpi/aml-debugger.rst | 75 ++++++ + .../einj.txt => firmware-guide/acpi/apei/einj.rst} | 94 ++++--- + .../firmware-guide/acpi/apei/output_format.rst | 150 +++++++++++ + .../debug.txt => firmware-guide/acpi/debug.rst} | 31 ++- + .../acpi/dsd/data-node-references.rst} | 36 +-- + .../acpi/dsd/graph.rst} | 157 +++++------ + .../acpi/enumeration.rst} | 161 ++++++----- + .../acpi/gpio-properties.rst} | 78 +++--- + Documentation/firmware-guide/acpi/i2c-muxes.rst | 61 +++++ + Documentation/firmware-guide/acpi/index.rst | 26 ++ + .../lpit.txt => firmware-guide/acpi/lpit.rst} | 18 +- + .../firmware-guide/acpi/method-customizing.rst | 89 +++++++ + .../firmware-guide/acpi/method-tracing.rst | 238 +++++++++++++++++ + .../acpi/namespace.rst} | 294 +++++++++++---------- + .../{acpi/osi.txt => firmware-guide/acpi/osi.rst} | 15 +- + .../acpi/video_extension.rst} | 83 +++--- + Documentation/firmware-guide/index.rst | 13 + + Documentation/index.rst | 10 + + MAINTAINERS | 5 +- + arch/x86/boot/compressed/acpi.c | 2 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/common.c | 17 -- + arch/x86/kernel/cpu/cpu.h | 1 - + arch/x86/kernel/cpu/intel.c | 34 --- + arch/x86/kernel/cpu/intel_epb.c | 216 +++++++++++++++ + arch/x86/kernel/tsc.c | 29 +- + drivers/acpi/acpi_configfs.c | 4 +- + drivers/acpi/acpi_dbg.c | 2 +- + drivers/acpi/acpi_lpat.c | 2 +- + drivers/acpi/acpi_lpss.c | 4 +- + drivers/acpi/acpica/aclocal.h | 4 +- + drivers/acpi/acpica/dbexec.c | 2 +- + drivers/acpi/acpica/dbnames.c | 2 +- + drivers/acpi/acpica/dsinit.c | 2 +- + drivers/acpi/acpica/evgpe.c | 6 +- + drivers/acpi/acpica/evgpeinit.c | 4 +- + drivers/acpi/acpica/exnames.c | 6 +- + drivers/acpi/acpica/nsaccess.c | 2 +- + drivers/acpi/acpica/nsalloc.c | 4 + + drivers/acpi/acpica/nsdump.c | 2 +- + drivers/acpi/acpica/nsinit.c | 4 +- + drivers/acpi/acpica/nsnames.c | 8 +- + drivers/acpi/acpica/nsparse.c | 2 +- + drivers/acpi/acpica/nsrepair.c | 2 +- + drivers/acpi/acpica/nsrepair2.c | 4 +- + drivers/acpi/acpica/nsutils.c | 14 +- + drivers/acpi/acpica/nsxfname.c | 4 +- + drivers/acpi/acpica/psargs.c | 8 +- + drivers/acpi/acpica/rsxface.c | 8 +- + drivers/acpi/acpica/tbdata.c | 3 +- + drivers/acpi/acpica/tbfind.c | 20 +- + drivers/acpi/acpica/tbinstal.c | 2 +- + drivers/acpi/acpica/tbprint.c | 10 +- + drivers/acpi/acpica/tbutils.c | 6 +- + drivers/acpi/acpica/tbxface.c | 4 +- + drivers/acpi/acpica/tbxfload.c | 15 +- + drivers/acpi/acpica/utascii.c | 2 +- + drivers/acpi/acpica/utdecode.c | 4 +- + drivers/acpi/acpica/utmisc.c | 8 +- + drivers/acpi/acpica/utpredef.c | 4 +- + drivers/acpi/acpica/utstring.c | 6 +- + drivers/acpi/button.c | 5 +- + drivers/acpi/cppc_acpi.c | 34 +-- + drivers/acpi/device_pm.c | 3 + + drivers/acpi/dptf/dptf_power.c | 3 +- + drivers/acpi/event.c | 4 +- + drivers/acpi/power.c | 4 +- + drivers/acpi/pptt.c | 48 ++-- + drivers/acpi/processor_perflib.c | 2 +- + drivers/acpi/property.c | 1 + + drivers/acpi/scan.c | 21 +- + drivers/acpi/spcr.c | 2 +- + drivers/acpi/sysfs.c | 14 +- + drivers/acpi/tables.c | 22 +- + drivers/acpi/utils.c | 16 +- + drivers/acpi/video_detect.c | 10 +- + drivers/base/power/domain.c | 118 +++++++-- + drivers/base/power/domain_governor.c | 67 ++++- + drivers/base/power/main.c | 70 ++--- + drivers/base/power/wakeup.c | 6 +- + drivers/base/property.c | 75 ++++++ + drivers/cpufreq/Kconfig | 4 - + drivers/cpufreq/acpi-cpufreq.c | 19 +- + drivers/cpufreq/amd_freq_sensitivity.c | 2 +- + drivers/cpufreq/cpufreq.c | 99 +++++-- + drivers/cpufreq/cpufreq_stats.c | 15 +- + drivers/cpufreq/freq_table.c | 3 - + drivers/cpufreq/intel_pstate.c | 65 ++++- + drivers/cpufreq/powernow-k8.c | 2 +- + drivers/cpufreq/qoriq-cpufreq.c | 2 + + drivers/cpufreq/speedstep-centrino.c | 2 +- + drivers/cpuidle/cpuidle-exynos.c | 2 +- + drivers/cpuidle/cpuidle.c | 19 +- + drivers/devfreq/devfreq-event.c | 2 +- + drivers/devfreq/devfreq.c | 90 ++++--- + drivers/devfreq/event/exynos-ppmu.c | 2 +- + drivers/devfreq/event/rockchip-dfi.c | 25 +- + drivers/devfreq/exynos-bus.c | 8 + + drivers/devfreq/rk3399_dmc.c | 73 ++++- + drivers/devfreq/tegra-devfreq.c | 7 +- + drivers/extcon/extcon-axp288.c | 9 +- + drivers/firmware/Kconfig | 15 +- + drivers/firmware/Makefile | 3 +- + drivers/firmware/iscsi_ibft.c | 2 +- + drivers/firmware/psci/Kconfig | 13 + + drivers/firmware/psci/Makefile | 4 + + drivers/firmware/{ => psci}/psci.c | 110 +++++--- + drivers/firmware/{ => psci}/psci_checker.c | 0 + drivers/gpio/gpio-merrifield.c | 18 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 2 +- + include/acpi/acpi_bus.h | 8 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl.h | 4 +- + include/acpi/actypes.h | 12 +- + include/linux/acpi.h | 6 +- + include/linux/cpufreq.h | 14 + + include/linux/cpuhotplug.h | 1 + + include/linux/cpuidle.h | 1 + + include/linux/pm_domain.h | 22 +- + include/linux/property.h | 18 ++ + include/linux/suspend.h | 3 + + include/linux/tick.h | 7 +- + include/soc/rockchip/rk3399_grf.h | 21 ++ + include/soc/rockchip/rockchip_sip.h | 1 + + include/trace/events/devfreq.h | 40 +++ + include/uapi/linux/psci.h | 7 + + kernel/power/hibernate.c | 5 +- + kernel/power/main.c | 14 + + kernel/power/suspend.c | 13 +- + kernel/power/user.c | 5 +- + kernel/sched/cpufreq_schedutil.c | 21 +- + kernel/time/tick-sched.c | 12 + + sound/soc/intel/boards/bytcht_da7213.c | 9 +- + sound/soc/intel/boards/bytcht_es8316.c | 9 +- + sound/soc/intel/boards/bytcr_rt5640.c | 10 +- + sound/soc/intel/boards/bytcr_rt5651.c | 14 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 9 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 9 +- + .../acpi/os_specific/service_layers/oslinuxtbl.c | 48 ++-- + tools/power/acpi/tools/acpidump/apdump.c | 8 +- + tools/power/acpi/tools/acpidump/apfiles.c | 8 +- + 175 files changed, 3209 insertions(+), 1996 deletions(-) + delete mode 100644 Documentation/acpi/aml-debugger.txt + delete mode 100644 Documentation/acpi/apei/output_format.txt + delete mode 100644 Documentation/acpi/i2c-muxes.txt + delete mode 100644 Documentation/acpi/initrd_table_override.txt + delete mode 100644 Documentation/acpi/method-customizing.txt + delete mode 100644 Documentation/acpi/method-tracing.txt + delete mode 100644 Documentation/acpi/ssdt-overlays.txt + rename Documentation/{acpi/cppc_sysfs.txt => admin-guide/acpi/cppc_sysfs.rst} (51%) + rename Documentation/{acpi/dsdt-override.txt => admin-guide/acpi/dsdt-override.rst} (56%) + create mode 100644 Documentation/admin-guide/acpi/index.rst + create mode 100644 Documentation/admin-guide/acpi/initrd_table_override.rst + create mode 100644 Documentation/admin-guide/acpi/ssdt-overlays.rst + create mode 100644 Documentation/admin-guide/pm/intel_epb.rst + create mode 100644 Documentation/driver-api/acpi/index.rst + rename Documentation/{acpi/linuxized-acpica.txt => driver-api/acpi/linuxized-acpica.rst} (80%) + rename Documentation/{acpi/scan_handlers.txt => driver-api/acpi/scan_handlers.rst} (90%) + rename Documentation/{acpi/DSD-properties-rules.txt => firmware-guide/acpi/DSD-properties-rules.rst} (88%) + rename Documentation/{acpi/acpi-lid.txt => firmware-guide/acpi/acpi-lid.rst} (86%) + create mode 100644 Documentation/firmware-guide/acpi/aml-debugger.rst + rename Documentation/{acpi/apei/einj.txt => firmware-guide/acpi/apei/einj.rst} (67%) + create mode 100644 Documentation/firmware-guide/acpi/apei/output_format.rst + rename Documentation/{acpi/debug.txt => firmware-guide/acpi/debug.rst} (91%) + rename Documentation/{acpi/dsd/data-node-references.txt => firmware-guide/acpi/dsd/data-node-references.rst} (71%) + rename Documentation/{acpi/dsd/graph.txt => firmware-guide/acpi/dsd/graph.rst} (56%) + rename Documentation/{acpi/enumeration.txt => firmware-guide/acpi/enumeration.rst} (84%) + rename Documentation/{acpi/gpio-properties.txt => firmware-guide/acpi/gpio-properties.rst} (81%) + create mode 100644 Documentation/firmware-guide/acpi/i2c-muxes.rst + create mode 100644 Documentation/firmware-guide/acpi/index.rst + rename Documentation/{acpi/lpit.txt => firmware-guide/acpi/lpit.rst} (68%) + create mode 100644 Documentation/firmware-guide/acpi/method-customizing.rst + create mode 100644 Documentation/firmware-guide/acpi/method-tracing.rst + rename Documentation/{acpi/namespace.txt => firmware-guide/acpi/namespace.rst} (56%) + rename Documentation/{acpi/osi.txt => firmware-guide/acpi/osi.rst} (97%) + rename Documentation/{acpi/video_extension.txt => firmware-guide/acpi/video_extension.rst} (70%) + create mode 100644 Documentation/firmware-guide/index.rst + create mode 100644 arch/x86/kernel/cpu/intel_epb.c + create mode 100644 drivers/firmware/psci/Kconfig + create mode 100644 drivers/firmware/psci/Makefile + rename drivers/firmware/{ => psci}/psci.c (90%) + rename drivers/firmware/{ => psci}/psci_checker.c (100%) + create mode 100644 include/soc/rockchip/rk3399_grf.h + create mode 100644 include/trace/events/devfreq.h +Merging cpufreq-arm/cpufreq/arm/linux-next (8db82563451f cpufreq: armada-37xx: fix frequency calculation for opp) +$ git merge cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'recursive' strategy. + drivers/cpufreq/armada-37xx-cpufreq.c | 22 +++++++++++++++++++--- + drivers/cpufreq/armada-8k-cpufreq.c | 1 + + drivers/cpufreq/imx6q-cpufreq.c | 4 ++-- + drivers/cpufreq/kirkwood-cpufreq.c | 19 +++++++++++-------- + drivers/cpufreq/maple-cpufreq.c | 6 +----- + drivers/cpufreq/pasemi-cpufreq.c | 1 + + drivers/cpufreq/pmac32-cpufreq.c | 2 ++ + drivers/cpufreq/ppc_cbe_cpufreq.c | 1 + + 8 files changed, 38 insertions(+), 18 deletions(-) +Merging cpupower/cpupower (8c2ffd917477 Linux 5.1-rc2) +$ git merge cpupower/cpupower +Already up to date. +Merging opp/opp/linux-next (2f36bde0fc8f OPP: Introduce dev_pm_opp_find_freq_ceil_by_volt()) +$ git merge opp/opp/linux-next +Merge made by the 'recursive' strategy. + drivers/opp/core.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ + include/linux/pm_opp.h | 8 ++++++++ + 2 files changed, 62 insertions(+) +Merging thermal/next (c5e7be3b089d Merge branches 'thermal-core' and 'thermal-intel' into next) +$ git merge thermal/next +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/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 ++--- + 13 files changed, 34 insertions(+), 56 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 (8395c154abb7 swiotlb: dump used and total slots when swiotlb buffer is full (v2)) +$ git merge swiotlb/linux-next +Auto-merging kernel/dma/swiotlb.c +Merge made by the 'recursive' strategy. + kernel/dma/swiotlb.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging rdma/for-next (1d045aa76fe8 Merge branch 'mlx5_tir_icm' into rdma.git for-next) +$ git merge rdma/for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/infiniband/hw/qib/qib_iba7322.c +Auto-merging drivers/infiniband/hw/qedr/verbs.c +Auto-merging drivers/infiniband/hw/mthca/mthca_qp.c +Auto-merging drivers/infiniband/hw/mthca/mthca_cq.c +Auto-merging drivers/infiniband/hw/mlx5/qp.c +Auto-merging drivers/infiniband/hw/mlx4/qp.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_qp.c +Auto-merging drivers/infiniband/hw/hns/hns_roce_hw_v1.c +Auto-merging drivers/infiniband/hw/hfi1/chip.c +Auto-merging drivers/infiniband/core/uverbs_main.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + MAINTAINERS | 8 +- + drivers/infiniband/core/cache.c | 27 +- + drivers/infiniband/core/cm.c | 89 +--- + drivers/infiniband/core/cm_msgs.h | 22 +- + drivers/infiniband/core/cma.c | 71 ++- + drivers/infiniband/core/core_priv.h | 18 +- + drivers/infiniband/core/cq.c | 21 +- + drivers/infiniband/core/device.c | 555 ++++++++++++++++++++- + drivers/infiniband/core/mad.c | 87 +++- + drivers/infiniband/core/mad_priv.h | 4 +- + drivers/infiniband/core/nldev.c | 112 ++++- + drivers/infiniband/core/rdma_core.c | 124 ++--- + drivers/infiniband/core/rdma_core.h | 11 +- + drivers/infiniband/core/sa_query.c | 44 +- + drivers/infiniband/core/sysfs.c | 77 ++- + drivers/infiniband/core/ucm.c | 35 +- + drivers/infiniband/core/umem.c | 104 +++- + drivers/infiniband/core/umem_odp.c | 17 +- + drivers/infiniband/core/user_mad.c | 22 + + drivers/infiniband/core/uverbs.h | 3 +- + drivers/infiniband/core/uverbs_cmd.c | 96 ++-- + drivers/infiniband/core/uverbs_ioctl.c | 27 +- + 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 | 196 ++++---- + drivers/infiniband/hw/bnxt_re/Kconfig | 12 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 147 ++---- + 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 | 65 ++- + 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 | 46 +- + drivers/infiniband/hw/cxgb4/qp.c | 77 ++- + 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 | 56 +-- + 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 | 24 +- + 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 | 313 ++++++------ + 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 | 47 +- + drivers/infiniband/hw/mlx4/ah.c | 95 ++-- + 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 | 44 +- + drivers/infiniband/hw/mlx4/srq.c | 59 +-- + drivers/infiniband/hw/mlx5/ah.c | 33 +- + drivers/infiniband/hw/mlx5/cmd.c | 4 +- + drivers/infiniband/hw/mlx5/cq.c | 47 +- + drivers/infiniband/hw/mlx5/devx.c | 28 +- + 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 | 371 ++++++++------ + drivers/infiniband/hw/mlx5/mlx5_ib.h | 78 ++- + drivers/infiniband/hw/mlx5/mr.c | 16 +- + drivers/infiniband/hw/mlx5/odp.c | 132 +++-- + drivers/infiniband/hw/mlx5/qp.c | 142 ++++-- + 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 | 141 +++--- + drivers/infiniband/hw/ocrdma/ocrdma_ah.c | 25 +- + drivers/infiniband/hw/ocrdma/ocrdma_ah.h | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_hw.c | 11 +- + 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 | 32 +- + drivers/infiniband/hw/qedr/qedr.h | 11 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 10 +- + drivers/infiniband/hw/qedr/verbs.c | 124 ++--- + 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 | 37 +- + 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 | 28 +- + 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/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/net/ethernet/mellanox/mlx5/core/cmd.c | 22 +- + .../mellanox/mlx5/core/diag/fw_tracer_tracepoint.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 5 - + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/fpga/core.h | 21 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 44 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 473 ++++++++++-------- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/transobj.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/uar.c | 2 +- + include/linux/mlx5/cq.h | 2 +- + include/linux/mlx5/doorbell.h | 39 +- + include/linux/mlx5/driver.h | 4 +- + include/linux/mlx5/fs.h | 6 + + include/linux/mlx5/mlx5_ifc.h | 102 +++- + include/linux/mlx5/transobj.h | 3 + + include/linux/overflow.h | 12 +- + include/rdma/ib_mad.h | 4 +- + include/rdma/ib_smi.h | 2 +- + include/rdma/ib_umem.h | 2 +- + include/rdma/ib_umem_odp.h | 1 + + include/rdma/ib_verbs.h | 300 ++++++++--- + 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/trace/events/ib_mad.h | 390 +++++++++++++++ + include/trace/events/ib_umad.h | 126 +++++ + include/uapi/rdma/mlx5-abi.h | 2 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 1 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 1 + + include/uapi/rdma/rdma_netlink.h | 31 +- + samples/bpf/Makefile | 3 + + samples/bpf/ibumad_kern.c | 144 ++++++ + samples/bpf/ibumad_user.c | 122 +++++ + 237 files changed, 5870 insertions(+), 4436 deletions(-) + create mode 100644 drivers/infiniband/hw/hns/hns_roce_hw_v2_dfx.c + create mode 100644 drivers/infiniband/hw/hns/hns_roce_restrack.c + create mode 100644 include/trace/events/ib_mad.h + create mode 100644 include/trace/events/ib_umad.h + create mode 100644 samples/bpf/ibumad_kern.c + create mode 100644 samples/bpf/ibumad_user.c +Merging net-next/master (a658a3f2ecba Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next) +$ git merge net-next/master +Auto-merging tools/lib/bpf/.gitignore +Auto-merging tools/bpf/bpftool/map.c +Auto-merging net/xfrm/xfrm_user.c +Auto-merging net/xfrm/xfrm_state.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/xfrm/xfrm_interface.c +Auto-merging net/wireless/reg.c +Auto-merging net/tls/tls_device.c +Auto-merging net/netlink/genetlink.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/netfilter/nf_flow_table_ip.c +Auto-merging net/mac80211/iface.c +Removing net/ipv6/xfrm6_mode_tunnel.c +Removing net/ipv6/xfrm6_mode_transport.c +Removing net/ipv6/xfrm6_mode_ro.c +Removing net/ipv6/xfrm6_mode_beet.c +Auto-merging net/ipv6/route.c +Removing net/ipv6/netfilter/nft_chain_route_ipv6.c +Removing net/ipv6/netfilter/ip6t_MASQUERADE.c +Auto-merging net/ipv6/esp6_offload.c +Auto-merging net/ipv4/xfrm4_policy.c +CONFLICT (content): Merge conflict in net/ipv4/xfrm4_policy.c +Removing net/ipv4/xfrm4_mode_tunnel.c +Removing net/ipv4/xfrm4_mode_transport.c +Removing net/ipv4/xfrm4_mode_beet.c +Auto-merging net/ipv4/tcp_ipv4.c +Removing net/ipv4/netfilter/nft_chain_route_ipv4.c +Auto-merging net/ipv4/ip_vti.c +Auto-merging net/ipv4/esp4_offload.c +Auto-merging net/core/netpoll.c +Auto-merging net/appletalk/ddp.c +Auto-merging lib/Kconfig.debug +Auto-merging kernel/bpf/verifier.c +Auto-merging include/net/xfrm.h +Removing include/net/netfilter/ipv6/nf_nat_masquerade.h +Removing include/net/netfilter/ipv4/nf_nat_masquerade.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/bpf.h +Auto-merging fs/proc/proc_sysctl.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h +Auto-merging drivers/net/wireless/intel/iwlwifi/cfg/22000.c +Auto-merging drivers/net/usb/qmi_wwan.c +Auto-merging drivers/net/phy/marvell.c +Removing drivers/net/netdevsim/devlink.c +Auto-merging drivers/net/ethernet/renesas/ravb_main.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_fp.c +Auto-merging drivers/net/ethernet/qlogic/qede/qede_ethtool.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/net/ethernet/intel/igb/igb_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_txrx.c +Auto-merging drivers/net/ethernet/intel/iavf/iavf_txrx.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_txrx.c +Auto-merging drivers/net/ethernet/intel/fm10k/fm10k_main.c +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/net/ethernet/intel/e1000/e1000_main.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/broadcom/bnxt/bnxt.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h +Auto-merging drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +Auto-merging drivers/infiniband/hw/nes/nes_cm.c +Auto-merging drivers/infiniband/hw/hfi1/vnic_main.c +Auto-merging drivers/infiniband/core/sa_query.c +Auto-merging drivers/infiniband/core/nldev.c +Removing arch/x86/include/uapi/asm/sockios.h +Removing arch/sparc/include/uapi/asm/sockios.h +Removing arch/parisc/include/uapi/asm/sockios.h +Removing arch/ia64/include/uapi/asm/sockios.h +Auto-merging Makefile +Auto-merging MAINTAINERS +Auto-merging Documentation/networking/ip-sysctl.txt +Auto-merging .mailmap +CONFLICT (content): Merge conflict in .mailmap +Resolved '.mailmap' using previous resolution. +Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c' using previous resolution. +Resolved 'net/ipv4/xfrm4_policy.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master fbea6b1f4cde] Merge remote-tracking branch 'net-next/master' +$ git diff -M --stat --summary HEAD^.. + .clang-format | 8 +- + .mailmap | 9 + + .../sysfs-class-net-batman-adv | 2 + + .../ABI/{testing => obsolete}/sysfs-class-net-mesh | 2 + + Documentation/bpf/bpf_design_QA.rst | 29 +- + Documentation/bpf/btf.rst | 57 + + Documentation/bpf/index.rst | 10 + + Documentation/bpf/prog_cgroup_sysctl.rst | 125 ++ + .../prog_flow_dissector.rst} | 6 +- + .../bindings/net/mdio-mux-meson-g12a.txt | 48 + + Documentation/devicetree/bindings/net/phy.txt | 6 + + Documentation/networking/batman-adv.rst | 110 +- + Documentation/networking/devlink-info-versions.rst | 5 + + .../networking/dsa/{bcm_sf2.txt => bcm_sf2.rst} | 27 +- + Documentation/networking/dsa/{dsa.txt => dsa.rst} | 279 ++-- + Documentation/networking/dsa/index.rst | 10 + + .../networking/dsa/{lan9303.txt => lan9303.rst} | 6 +- + Documentation/networking/index.rst | 2 +- + Documentation/networking/ip-sysctl.txt | 32 +- + MAINTAINERS | 17 +- + Makefile | 3 +- + arch/alpha/include/uapi/asm/sockios.h | 4 +- + arch/arm64/include/asm/insn.h | 8 + + arch/arm64/kernel/insn.c | 40 + + arch/arm64/net/bpf_jit.h | 8 +- + arch/arm64/net/bpf_jit_comp.c | 29 +- + arch/ia64/include/uapi/asm/sockios.h | 21 - + arch/mips/include/uapi/asm/sockios.h | 4 +- + arch/parisc/include/uapi/asm/sockios.h | 14 - + arch/sh/include/uapi/asm/sockios.h | 5 +- + arch/sparc/include/uapi/asm/sockios.h | 15 - + arch/x86/include/uapi/asm/sockios.h | 1 - + arch/xtensa/include/uapi/asm/sockios.h | 4 +- + crypto/crypto_user_base.c | 4 +- + drivers/atm/iphase.c | 4 +- + drivers/block/drbd/drbd_nl.c | 8 +- + drivers/block/drbd/drbd_nla.c | 3 +- + drivers/block/nbd.c | 38 +- + drivers/bluetooth/Kconfig | 15 +- + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/btbcm.c | 5 +- + drivers/bluetooth/btmrvl_sdio.c | 36 + + drivers/bluetooth/btmtksdio.c | 1101 ++++++++++++++ + drivers/bluetooth/btmtkuart.c | 2 +- + drivers/bluetooth/btqca.h | 2 +- + drivers/bluetooth/btsdio.c | 15 +- + drivers/bluetooth/hci_bcm.c | 20 +- + drivers/bluetooth/hci_h5.c | 2 +- + drivers/bluetooth/hci_qca.c | 50 +- + drivers/infiniband/core/addr.c | 8 +- + drivers/infiniband/core/iwpm_util.c | 8 +- + drivers/infiniband/core/nldev.c | 45 +- + drivers/infiniband/core/sa_query.c | 8 +- + drivers/infiniband/hw/cxgb4/restrack.c | 8 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 3 +- + drivers/infiniband/hw/nes/nes_cm.c | 2 +- + drivers/infiniband/ulp/opa_vnic/opa_vnic_netdev.c | 6 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 6 +- + drivers/isdn/hisax/config.c | 6 +- + drivers/isdn/i4l/isdn_ppp.c | 9 +- + drivers/media/rc/bpf-lirc.c | 6 + + drivers/net/Kconfig | 1 + + drivers/net/appletalk/ipddp.c | 6 +- + drivers/net/bonding/bond_main.c | 3 +- + drivers/net/bonding/bond_netlink.c | 8 +- + drivers/net/dsa/bcm_sf2.c | 9 +- + drivers/net/dsa/microchip/ksz9477.c | 1 + + drivers/net/dsa/mv88e6060.c | 132 +- + drivers/net/dsa/mv88e6060.h | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 99 +- + drivers/net/dsa/mv88e6xxx/port.h | 1 - + drivers/net/dummy.c | 15 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 7 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 6 +- + drivers/net/ethernet/aquantia/Kconfig | 3 +- + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 10 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 + + drivers/net/ethernet/aquantia/atlantic/aq_ring.c | 188 ++- + drivers/net/ethernet/aquantia/atlantic/aq_ring.h | 34 +- + drivers/net/ethernet/aquantia/atlantic/aq_vec.c | 3 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 4 - + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 16 +- + .../aquantia/atlantic/hw_atl/hw_atl_b0_internal.h | 2 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.c | 15 + + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_llh.h | 6 + + .../aquantia/atlantic/hw_atl/hw_atl_llh_internal.h | 13 + + drivers/net/ethernet/aurora/nb8800.c | 8 +- + drivers/net/ethernet/broadcom/Kconfig | 1 + + drivers/net/ethernet/broadcom/bcmsysport.c | 69 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 10 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 5 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h | 3 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 21 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 52 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 58 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 4 + + drivers/net/ethernet/broadcom/bnxt/bnxt_vfr.c | 25 - + drivers/net/ethernet/broadcom/cnic.c | 13 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 5 +- + drivers/net/ethernet/cadence/macb_main.c | 6 +- + drivers/net/ethernet/cavium/Kconfig | 1 + + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_main.c | 2 +- + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 16 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.c | 4 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 4 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_ethtool.c | 23 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_filter.c | 41 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 15 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 5 +- + drivers/net/ethernet/chelsio/cxgb4/t4_hw.c | 107 +- + drivers/net/ethernet/chelsio/cxgb4/t4fw_version.h | 12 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 18 +- + drivers/net/ethernet/chelsio/cxgb4vf/t4vf_hw.c | 10 + + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 2 - + drivers/net/ethernet/emulex/benet/be_main.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 88 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 25 +- + .../net/ethernet/freescale/dpaa2/dpaa2-ethtool.c | 97 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 7 +- + drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 11 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 40 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 15 +- + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 9 + + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 472 ++++-- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 23 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 27 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.c | 17 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 6 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 110 ++ + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 1017 ++++++++----- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 5 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 500 +++++-- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 55 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 72 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 11 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 5 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 52 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 139 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 16 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 30 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 2 +- + drivers/net/ethernet/ibm/ehea/ehea_qmr.c | 6 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 108 +- + drivers/net/ethernet/ibm/ibmvnic.h | 20 +- + drivers/net/ethernet/intel/e100.c | 2 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 4 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 6 +- + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 4 +- + drivers/net/ethernet/intel/i40e/Makefile | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 29 + + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 286 +++- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 28 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 481 ++++++ + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 58 +- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 6 + + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 58 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 23 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 6 +- + drivers/net/ethernet/intel/iavf/i40e_adminq_cmd.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 4 +- + drivers/net/ethernet/intel/ice/Makefile | 1 + + drivers/net/ethernet/intel/ice/ice.h | 89 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 189 ++- + drivers/net/ethernet/intel/ice/ice_common.c | 242 +-- + drivers/net/ethernet/intel/ice/ice_common.h | 27 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 10 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 1392 +++++++++++++++++ + drivers/net/ethernet/intel/ice/ice_dcb.h | 179 +++ + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 551 +++++++ + drivers/net/ethernet/intel/ice/ice_dcb_lib.h | 61 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 180 ++- + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 20 + + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 56 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 337 ++++- + drivers/net/ethernet/intel/ice/ice_lib.h | 12 +- + drivers/net/ethernet/intel/ice/ice_main.c | 664 ++++++--- + drivers/net/ethernet/intel/ice/ice_nvm.c | 6 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 221 +-- + drivers/net/ethernet/intel/ice/ice_sched.h | 4 + + drivers/net/ethernet/intel/ice/ice_status.h | 1 + + drivers/net/ethernet/intel/ice/ice_switch.c | 443 +++++- + drivers/net/ethernet/intel/ice/ice_switch.h | 35 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 705 ++++++--- + drivers/net/ethernet/intel/ice/ice_txrx.h | 28 +- + drivers/net/ethernet/intel/ice/ice_type.h | 96 +- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c | 658 +++++--- + drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h | 28 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +- + drivers/net/ethernet/intel/igb/igb_main.c | 9 +- + drivers/net/ethernet/intel/igc/igc.h | 68 +- + drivers/net/ethernet/intel/igc/igc_base.h | 4 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 17 + + drivers/net/ethernet/intel/igc/igc_ethtool.c | 839 ++++++++++- + drivers/net/ethernet/intel/igc/igc_main.c | 451 +++++- + drivers/net/ethernet/intel/igc/igc_regs.h | 16 + + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 3 +- + drivers/net/ethernet/marvell/mvneta.c | 15 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 10 + + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.c | 212 +-- + drivers/net/ethernet/marvell/mvpp2/mvpp2_cls.h | 92 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c | 253 ++-- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 8 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 3 +- + drivers/net/ethernet/mellanox/mlx4/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx4/en_tx.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 74 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 104 ++ + .../net/ethernet/mellanox/mlx5/core/en/params.h | 22 + + .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 30 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 30 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 57 +- + .../mellanox/mlx5/core/en_accel/en_accel.h | 51 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.c | 36 +- + .../mellanox/mlx5/core/en_accel/tls_rxtx.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 214 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 130 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 361 ++++- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 11 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 3 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 75 + + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/lag_mp.c | 12 +- + .../net/ethernet/mellanox/mlx5/core/lib/port_tun.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/lib/vxlan.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 51 +- + drivers/net/ethernet/mellanox/mlx5/core/wq.h | 12 + + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlxsw/Makefile | 4 +- + drivers/net/ethernet/mellanox/mlxsw/core.c | 82 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 23 +- + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 55 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 35 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 8 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 36 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 388 +++-- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.h | 15 - + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 107 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/switchib.c | 23 +- + drivers/net/ethernet/mellanox/mlxsw/switchx2.c | 29 +- + drivers/net/ethernet/microchip/enc28j60.c | 541 ++++--- + drivers/net/ethernet/netronome/Kconfig | 1 + + drivers/net/ethernet/netronome/nfp/Makefile | 1 + + drivers/net/ethernet/netronome/nfp/abm/ctrl.c | 8 +- + drivers/net/ethernet/netronome/nfp/abm/main.c | 5 +- + drivers/net/ethernet/netronome/nfp/bpf/cmsg.c | 236 +-- + drivers/net/ethernet/netronome/nfp/bpf/fw.h | 33 +- + drivers/net/ethernet/netronome/nfp/bpf/main.c | 12 +- + drivers/net/ethernet/netronome/nfp/bpf/main.h | 17 +- + drivers/net/ethernet/netronome/nfp/bpf/offload.c | 3 +- + drivers/net/ethernet/netronome/nfp/ccm.c | 220 +++ + drivers/net/ethernet/netronome/nfp/ccm.h | 81 + + drivers/net/ethernet/netronome/nfp/flower/action.c | 203 ++- + drivers/net/ethernet/netronome/nfp/flower/cmsg.c | 55 +- + drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 19 + + drivers/net/ethernet/netronome/nfp/flower/main.c | 149 +- + drivers/net/ethernet/netronome/nfp/flower/main.h | 72 +- + drivers/net/ethernet/netronome/nfp/flower/match.c | 9 +- + .../net/ethernet/netronome/nfp/flower/metadata.c | 117 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 611 +++++++- + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 11 +- + drivers/net/ethernet/netronome/nfp/nfp_app.h | 15 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 29 +- + drivers/net/ethernet/netronome/nfp/nfp_main.c | 24 +- + drivers/net/ethernet/netronome/nfp/nfp_net.h | 23 +- + .../net/ethernet/netronome/nfp/nfp_net_common.c | 133 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 10 - + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 131 ++ + drivers/net/ethernet/netronome/nfp/nfp_net_main.c | 29 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 4 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.c | 27 +- + drivers/net/ethernet/netronome/nfp/nfp_net_sriov.h | 6 +- + .../net/ethernet/netronome/nfp/nfp_netvf_main.c | 11 +- + drivers/net/ethernet/netronome/nfp/nfp_port.c | 16 - + drivers/net/ethernet/netronome/nfp/nfp_port.h | 2 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.c | 62 + + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 8 + + drivers/net/ethernet/pasemi/pasemi_mac.c | 5 +- + drivers/net/ethernet/qlogic/qed/qed.h | 3 + + drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 4 +- + drivers/net/ethernet/qlogic/qed/qed_dev.c | 6 +- + drivers/net/ethernet/qlogic/qede/qede.h | 3 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 24 +- + drivers/net/ethernet/qlogic/qede/qede_fp.c | 9 +- + drivers/net/ethernet/rdc/r6040.c | 2 +- + drivers/net/ethernet/realtek/r8169.c | 429 ++---- + drivers/net/ethernet/renesas/ravb_main.c | 18 +- + drivers/net/ethernet/rocker/rocker_main.c | 9 + + drivers/net/ethernet/rocker/rocker_ofdpa.c | 10 +- + drivers/net/ethernet/sfc/falcon/tx.c | 4 +- + drivers/net/ethernet/sfc/tx.c | 12 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 5 + + drivers/net/ethernet/stmicro/stmmac/dwxgmac2_dma.c | 46 + + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/net/ethernet/sun/ldmvsw.c | 3 +- + drivers/net/ethernet/sun/sunvnet.c | 3 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c | 2 +- + drivers/net/ethernet/ti/Kconfig | 19 - + drivers/net/ethernet/ti/Makefile | 9 +- + drivers/net/ethernet/ti/cpmac.c | 14 +- + drivers/net/ethernet/ti/cpsw-common.c | 12 +- + drivers/net/ethernet/ti/cpsw-phy-sel.c | 9 +- + drivers/net/ethernet/ti/cpsw.c | 1542 ++----------------- + drivers/net/ethernet/ti/cpsw.h | 9 +- + drivers/net/ethernet/ti/cpsw_ale.c | 55 +- + drivers/net/ethernet/ti/cpsw_ale.h | 12 +- + drivers/net/ethernet/ti/cpsw_ethtool.c | 719 +++++++++ + drivers/net/ethernet/ti/cpsw_priv.c | 132 ++ + drivers/net/ethernet/ti/cpsw_priv.h | 429 ++++++ + drivers/net/ethernet/ti/cpsw_sl.c | 328 ++++ + drivers/net/ethernet/ti/cpsw_sl.h | 73 + + drivers/net/ethernet/ti/cpts.c | 14 +- + drivers/net/ethernet/ti/cpts.h | 14 +- + drivers/net/ethernet/ti/davinci_cpdma.c | 37 +- + drivers/net/ethernet/ti/davinci_cpdma.h | 13 +- + drivers/net/ethernet/ti/davinci_emac.c | 16 +- + drivers/net/ethernet/ti/davinci_mdio.c | 41 +- + drivers/net/ethernet/ti/netcp.h | 10 +- + drivers/net/ethernet/ti/netcp_core.c | 10 +- + drivers/net/ethernet/ti/netcp_ethss.c | 10 +- + drivers/net/ethernet/ti/netcp_sgmii.c | 9 +- + drivers/net/ethernet/ti/netcp_xgbepcsr.c | 9 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 40 + + drivers/net/geneve.c | 3 +- + drivers/net/gtp.c | 7 +- + drivers/net/hippi/rrunner.c | 4 +- + drivers/net/hyperv/netvsc.c | 2 +- + drivers/net/hyperv/netvsc_drv.c | 10 +- + drivers/net/ieee802154/mac802154_hwsim.c | 31 +- + drivers/net/loopback.c | 14 +- + drivers/net/macsec.c | 78 +- + drivers/net/macvlan.c | 50 +- + drivers/net/net_failover.c | 8 +- + drivers/net/netdevsim/Makefile | 6 +- + drivers/net/netdevsim/bpf.c | 107 +- + drivers/net/netdevsim/bus.c | 341 +++++ + drivers/net/netdevsim/dev.c | 447 ++++++ + drivers/net/netdevsim/devlink.c | 295 ---- + drivers/net/netdevsim/fib.c | 102 +- + drivers/net/netdevsim/ipsec.c | 3 +- + drivers/net/netdevsim/netdev.c | 428 ++---- + drivers/net/netdevsim/netdevsim.h | 145 +- + drivers/net/netdevsim/sdev.c | 69 + + drivers/net/phy/Kconfig | 19 +- + drivers/net/phy/Makefile | 1 + + drivers/net/phy/amd.c | 2 +- + drivers/net/phy/aquantia_main.c | 526 ++++++- + drivers/net/phy/asix.c | 2 +- + drivers/net/phy/at803x.c | 32 +- + drivers/net/phy/bcm-cygnus.c | 149 +- + drivers/net/phy/bcm-phy-lib.c | 52 + + drivers/net/phy/bcm-phy-lib.h | 20 + + drivers/net/phy/bcm63xx.c | 4 +- + drivers/net/phy/bcm7xxx.c | 82 +- + drivers/net/phy/broadcom.c | 34 +- + drivers/net/phy/cicada.c | 4 +- + drivers/net/phy/davicom.c | 8 +- + drivers/net/phy/dp83640.c | 2 +- + drivers/net/phy/dp83822.c | 2 +- + drivers/net/phy/dp83848.c | 2 +- + drivers/net/phy/dp83867.c | 2 +- + drivers/net/phy/dp83tc811.c | 2 +- + drivers/net/phy/et1011c.c | 2 +- + drivers/net/phy/icplus.c | 6 +- + drivers/net/phy/intel-xway.c | 20 +- + drivers/net/phy/lxt.c | 8 +- + drivers/net/phy/marvell.c | 142 +- + drivers/net/phy/marvell10g.c | 15 +- + drivers/net/phy/mdio-bcm-unimac.c | 7 +- + drivers/net/phy/mdio-mux-meson-g12a.c | 380 +++++ + drivers/net/phy/mdio_bus.c | 33 +- + drivers/net/phy/mdio_device.c | 13 +- + drivers/net/phy/meson-gxl.c | 19 +- + drivers/net/phy/micrel.c | 72 +- + drivers/net/phy/microchip.c | 2 +- + drivers/net/phy/mscc.c | 479 +++++- + drivers/net/phy/national.c | 2 +- + drivers/net/phy/phy-c45.c | 37 +- + drivers/net/phy/phy-core.c | 270 +--- + drivers/net/phy/phy.c | 12 +- + drivers/net/phy/phy_device.c | 161 +- + drivers/net/phy/qsemi.c | 2 +- + drivers/net/phy/realtek.c | 26 +- + drivers/net/phy/rockchip.c | 33 +- + drivers/net/phy/smsc.c | 12 +- + drivers/net/phy/ste10Xp.c | 4 +- + drivers/net/phy/uPD60620.c | 2 +- + drivers/net/phy/vitesse.c | 34 +- + drivers/net/sb1000.c | 9 +- + drivers/net/team/team.c | 34 +- + drivers/net/tun.c | 23 +- + drivers/net/usb/cdc_mbim.c | 1 + + drivers/net/usb/ipheth.c | 58 +- + drivers/net/usb/qmi_wwan.c | 65 +- + drivers/net/usb/r8152.c | 53 +- + drivers/net/veth.c | 14 +- + drivers/net/virtio_net.c | 21 +- + drivers/net/vrf.c | 12 +- + drivers/net/vxlan.c | 1 + + drivers/net/wimax/i2400m/control.c | 1 + + drivers/net/wireless/ath/ath10k/testmode.c | 4 +- + drivers/net/wireless/ath/ath6kl/testmode.c | 4 +- + drivers/net/wireless/ath/wcn36xx/testmode.c | 4 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 28 +- + drivers/net/wireless/broadcom/b43/phy_lp.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 11 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcdc.h | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 8 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/bus.h | 12 + + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 4 + + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 36 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 + + .../broadcom/brcm80211/brcmfmac/firmware.c | 5 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.c | 58 +- + .../broadcom/brcm80211/brcmfmac/fwsignal.h | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 37 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/proto.h | 3 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 8 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 44 +- + drivers/net/wireless/intel/iwlegacy/4965.c | 1 - + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 22 +- + drivers/net/wireless/intel/iwlwifi/cfg/9000.c | 10 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 177 ++- + drivers/net/wireless/intel/iwlwifi/fw/api/mac.h | 77 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 39 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 67 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 54 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 426 ++++-- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 27 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 39 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 12 + + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 146 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 6 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 90 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 91 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 47 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 232 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 32 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 44 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 25 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 7 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 9 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 37 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 14 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 48 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 6 +- + drivers/net/wireless/mac80211_hwsim.c | 29 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 10 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 6 + + drivers/net/wireless/marvell/mwifiex/main.c | 3 +- + drivers/net/wireless/marvell/mwifiex/sta_rx.c | 3 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 25 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 86 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 377 +++-- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 6 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 56 +- + drivers/net/wireless/quantenna/qtnfmac/core.h | 5 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 32 +- + .../wireless/quantenna/qtnfmac/pcie/pcie_priv.h | 3 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 23 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 31 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 85 +- + .../net/wireless/quantenna/qtnfmac/qlink_util.c | 117 ++ + .../net/wireless/quantenna/qtnfmac/qlink_util.h | 5 + + drivers/net/wireless/realtek/rtlwifi/base.c | 5 + + drivers/net/wireless/realtek/rtlwifi/pci.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/fw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 17 +- + .../wireless/realtek/rtlwifi/rtl8192c/fw_common.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 15 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/fw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8723be/fw.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 4 + + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 14 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 - + drivers/net/wireless/ti/wlcore/testmode.c | 4 +- + drivers/net/wireless/ti/wlcore/vendor_cmd.c | 8 +- + drivers/net/xen-netback/common.h | 18 + + drivers/net/xen-netback/interface.c | 6 +- + drivers/net/xen-netback/xenbus.c | 17 +- + drivers/net/xen-netfront.c | 5 +- + drivers/nfc/st95hf/core.c | 4 - + drivers/s390/net/qeth_core.h | 131 +- + drivers/s390/net/qeth_core_main.c | 919 ++++++------ + drivers/s390/net/qeth_core_mpc.h | 2 +- + drivers/s390/net/qeth_core_sys.c | 10 +- + drivers/s390/net/qeth_ethtool.c | 17 + + drivers/s390/net/qeth_l2_main.c | 99 +- + drivers/s390/net/qeth_l3_main.c | 263 ++-- + drivers/s390/net/qeth_l3_sys.c | 26 +- + drivers/staging/rtl8188eu/os_dep/os_intfs.c | 3 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 3 +- + drivers/target/target_core_user.c | 9 +- + fs/dlm/netlink.c | 1 + + fs/proc/proc_sysctl.c | 25 +- + include/linux/bpf-cgroup.h | 21 + + include/linux/bpf.h | 84 +- + include/linux/bpf_types.h | 3 + + include/linux/bpf_verifier.h | 32 + + include/linux/btf.h | 1 + + include/linux/etherdevice.h | 2 +- + include/linux/filter.h | 16 + + include/linux/genl_magic_func.h | 4 +- + include/linux/ieee80211.h | 14 +- + include/linux/if_bridge.h | 3 - + include/linux/inetdevice.h | 14 + + include/linux/jiffies.h | 1 + + include/linux/marvell_phy.h | 1 + + include/linux/mdio.h | 3 +- + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 1 + + include/linux/mlx5/qp.h | 1 + + include/linux/mmc/sdio_func.h | 12 + + include/linux/mmc/sdio_ids.h | 2 + + include/linux/net.h | 2 + + include/linux/netdevice.h | 95 +- + include/linux/netfilter.h | 9 +- + include/linux/netfilter/ipset/ip_set.h | 11 +- + include/linux/netfilter/nfnetlink_osf.h | 11 +- + include/linux/netfilter/x_tables.h | 1 - + include/linux/netfilter_ipv6.h | 15 + + include/linux/phy.h | 4 + + include/linux/rhashtable-types.h | 2 - + include/linux/rhashtable.h | 358 +++-- + include/linux/siphash.h | 5 + + include/linux/skbuff.h | 48 +- + include/linux/tracepoint-defs.h | 1 + + include/net/addrconf.h | 55 +- + include/net/bluetooth/hci_core.h | 3 + + include/net/bpf_sk_storage.h | 13 + + include/net/cfg80211.h | 104 ++ + include/net/compat.h | 3 - + include/net/devlink.h | 533 +------ + include/net/dsa.h | 111 +- + include/net/dst.h | 11 - + include/net/fib_notifier.h | 3 +- + include/net/flow_dissector.h | 7 + + include/net/fq_impl.h | 18 +- + include/net/genetlink.h | 34 +- + include/net/geneve.h | 2 + + include/net/ife.h | 1 - + include/net/ip.h | 4 + + include/net/ip6_fib.h | 62 +- + include/net/ip6_route.h | 20 +- + include/net/ip_fib.h | 116 +- + include/net/ip_vs.h | 5 + + include/net/ipv6_stubs.h | 68 + + include/net/lwtunnel.h | 7 +- + include/net/mac80211.h | 30 + + include/net/ndisc.h | 40 + + include/net/neighbour.h | 7 +- + include/net/netfilter/ipv4/nf_nat_masquerade.h | 15 - + include/net/netfilter/ipv6/nf_nat_masquerade.h | 11 - + include/net/netfilter/nf_conntrack_expect.h | 2 +- + include/net/netfilter/nf_conntrack_timeout.h | 15 + + include/net/netfilter/nf_nat.h | 7 +- + include/net/netfilter/nf_nat_masquerade.h | 19 + + include/net/netfilter/nf_queue.h | 3 + + include/net/netfilter/nf_tables.h | 4 +- + include/net/netlink.h | 363 ++++- + include/net/netns/ipv4.h | 2 + + include/net/netns/ipv6.h | 5 + + include/net/psample.h | 1 - + include/net/request_sock.h | 10 +- + include/net/route.h | 43 +- + include/net/{nexthop.h => rtnh.h} | 4 +- + include/net/sch_generic.h | 100 +- + include/net/sctp/sctp.h | 2 +- + include/net/sctp/ulpqueue.h | 2 +- + include/net/sock.h | 27 +- + include/net/tc_act/tc_ife.h | 3 +- + include/net/tcp.h | 2 +- + include/net/tls.h | 36 +- + include/net/udp.h | 6 +- + include/net/udp_tunnel.h | 2 +- + include/net/vxlan.h | 2 + + include/net/xfrm.h | 116 +- + include/trace/bpf_probe.h | 27 +- + include/trace/events/bpf_test_run.h | 50 + + include/trace/events/fib.h | 44 +- + include/trace/events/fib6.h | 16 +- + include/trace/events/mlxsw.h | 2 +- + include/trace/events/nbd.h | 107 ++ + include/uapi/asm-generic/sockios.h | 4 +- + include/uapi/linux/batadv_packet.h | 12 - + include/uapi/linux/batman_adv.h | 25 +- + include/uapi/linux/bpf.h | 291 +++- + include/uapi/linux/btf.h | 32 +- + include/uapi/linux/ethtool.h | 8 + + include/uapi/linux/fou.h | 6 + + include/uapi/linux/icmpv6.h | 4 + + include/uapi/linux/if_tun.h | 1 + + include/uapi/linux/if_vlan.h | 9 +- + include/uapi/linux/ip_vs.h | 11 + + include/uapi/linux/netfilter/nf_tables.h | 6 + + include/uapi/linux/nl80211.h | 86 +- + include/uapi/linux/openvswitch.h | 46 + + include/uapi/linux/sockios.h | 21 + + include/uapi/linux/tcp.h | 27 + + include/uapi/linux/tipc.h | 1 + + include/uapi/linux/tipc_netlink.h | 2 + + include/uapi/linux/tls.h | 15 + + ipc/util.c | 1 - + kernel/bpf/arraymap.c | 53 +- + kernel/bpf/btf.c | 419 +++++- + kernel/bpf/cgroup.c | 370 ++++- + kernel/bpf/core.c | 14 +- + kernel/bpf/cpumap.c | 53 +- + kernel/bpf/disasm.c | 5 +- + kernel/bpf/hashtab.c | 6 +- + kernel/bpf/helpers.c | 131 ++ + kernel/bpf/local_storage.c | 6 +- + kernel/bpf/lpm_trie.c | 3 +- + kernel/bpf/queue_stack_maps.c | 6 +- + kernel/bpf/syscall.c | 164 +- + kernel/bpf/verifier.c | 618 ++++++-- + kernel/sysctl.c | 6 + + kernel/taskstats.c | 33 +- + kernel/time/time.c | 10 + + kernel/trace/bpf_trace.c | 30 + + lib/Kconfig.debug | 8 + + lib/nlattr.c | 184 +-- + lib/rhashtable.c | 210 ++- + lib/test_rhashtable.c | 2 +- + net/6lowpan/nhc.c | 2 +- + net/8021q/vlan.c | 18 +- + net/8021q/vlan_dev.c | 22 +- + net/8021q/vlan_netlink.c | 11 +- + net/Kconfig | 7 +- + net/appletalk/ddp.c | 7 +- + net/atm/clip.c | 4 +- + net/atm/ioctl.c | 16 - + net/atm/pvc.c | 1 + + net/atm/svc.c | 1 + + net/ax25/af_ax25.c | 13 +- + net/batman-adv/Kconfig | 24 +- + net/batman-adv/Makefile | 15 +- + net/batman-adv/bat_algo.c | 12 - + net/batman-adv/bat_algo.h | 12 - + net/batman-adv/bat_iv_ogm.c | 12 - + net/batman-adv/bat_iv_ogm.h | 12 - + net/batman-adv/bat_v.c | 12 - + net/batman-adv/bat_v.h | 12 - + net/batman-adv/bat_v_elp.c | 12 - + net/batman-adv/bat_v_elp.h | 12 - + net/batman-adv/bat_v_ogm.c | 12 - + net/batman-adv/bat_v_ogm.h | 12 - + net/batman-adv/bitarray.c | 12 - + net/batman-adv/bitarray.h | 12 - + net/batman-adv/bridge_loop_avoidance.c | 13 - + net/batman-adv/bridge_loop_avoidance.h | 12 - + net/batman-adv/debugfs.c | 12 - + net/batman-adv/debugfs.h | 12 - + net/batman-adv/distributed-arp-table.c | 40 +- + net/batman-adv/distributed-arp-table.h | 12 - + net/batman-adv/fragmentation.c | 12 - + net/batman-adv/fragmentation.h | 12 - + net/batman-adv/gateway_client.c | 13 - + net/batman-adv/gateway_client.h | 12 - + net/batman-adv/gateway_common.c | 12 - + net/batman-adv/gateway_common.h | 12 - + net/batman-adv/hard-interface.c | 12 - + net/batman-adv/hard-interface.h | 12 - + net/batman-adv/hash.c | 12 - + net/batman-adv/hash.h | 12 - + net/batman-adv/icmp_socket.c | 12 - + net/batman-adv/icmp_socket.h | 12 - + net/batman-adv/log.c | 12 - + net/batman-adv/log.h | 12 - + net/batman-adv/main.c | 85 +- + net/batman-adv/main.h | 14 +- + net/batman-adv/multicast.c | 211 ++- + net/batman-adv/multicast.h | 30 +- + net/batman-adv/netlink.c | 60 +- + net/batman-adv/netlink.h | 12 - + net/batman-adv/network-coding.c | 12 - + net/batman-adv/network-coding.h | 12 - + net/batman-adv/originator.c | 12 - + net/batman-adv/originator.h | 12 - + net/batman-adv/routing.c | 12 - + net/batman-adv/routing.h | 12 - + net/batman-adv/send.c | 12 - + net/batman-adv/send.h | 12 - + net/batman-adv/soft-interface.c | 20 +- + net/batman-adv/soft-interface.h | 12 - + net/batman-adv/sysfs.c | 128 +- + net/batman-adv/sysfs.h | 50 +- + net/batman-adv/tp_meter.c | 12 - + net/batman-adv/tp_meter.h | 12 - + net/batman-adv/trace.c | 12 - + net/batman-adv/trace.h | 12 - + net/batman-adv/translation-table.c | 17 +- + net/batman-adv/translation-table.h | 16 +- + net/batman-adv/tvlv.c | 12 - + net/batman-adv/tvlv.h | 12 - + net/batman-adv/types.h | 18 +- + net/bluetooth/af_bluetooth.c | 8 - + net/bluetooth/hci_conn.c | 8 + + net/bluetooth/hci_core.c | 2 - + net/bluetooth/hci_event.c | 2 +- + net/bluetooth/hidp/sock.c | 1 + + net/bluetooth/l2cap_core.c | 9 +- + net/bluetooth/l2cap_sock.c | 8 +- + net/bluetooth/mgmt.c | 11 +- + net/bluetooth/rfcomm/sock.c | 1 + + net/bluetooth/sco.c | 1 + + net/bpf/Makefile | 2 +- + net/bpf/test_run.c | 203 ++- + net/bridge/br.c | 14 +- + net/bridge/br_arp_nd_proxy.c | 19 +- + net/bridge/br_fdb.c | 1 - + net/bridge/br_forward.c | 15 +- + net/bridge/br_if.c | 2 +- + net/bridge/br_input.c | 77 +- + net/bridge/br_mdb.c | 21 +- + net/bridge/br_multicast.c | 26 +- + net/bridge/br_netlink.c | 16 +- + net/bridge/br_netlink_tunnel.c | 6 +- + net/bridge/br_private.h | 35 +- + net/bridge/br_stp_if.c | 3 +- + net/bridge/br_vlan.c | 215 ++- + net/bridge/br_vlan_tunnel.c | 1 - + net/bridge/netfilter/ebtable_broute.c | 63 +- + net/bridge/netfilter/ebtables.c | 7 +- + net/caif/caif_dev.c | 12 +- + net/can/af_can.c | 6 - + net/can/bcm.c | 1 + + net/can/gw.c | 4 +- + net/can/raw.c | 1 + + net/compat.c | 57 - + net/core/Makefile | 1 + + net/core/bpf_sk_storage.c | 804 ++++++++++ + net/core/datagram.c | 29 +- + net/core/datagram.h | 15 + + net/core/dev.c | 82 +- + net/core/dev_ioctl.c | 3 +- + net/core/devlink.c | 325 ++-- + net/core/drop_monitor.c | 3 + + net/core/dst.c | 17 - + net/core/ethtool.c | 2 + + net/core/fib_rules.c | 6 +- + net/core/filter.c | 579 ++++++-- + net/core/flow_dissector.c | 131 +- + net/core/gen_stats.c | 2 + + net/core/lwt_bpf.c | 10 +- + net/core/lwtunnel.c | 9 +- + net/core/neighbour.c | 32 +- + net/core/net-sysfs.c | 4 +- + net/core/net_namespace.c | 21 +- + net/core/netpoll.c | 2 +- + net/core/netprio_cgroup.c | 2 - + net/core/pktgen.c | 2 +- + net/core/rtnetlink.c | 164 +- + net/core/skbuff.c | 76 +- + net/core/sock.c | 56 +- + net/core/sock_reuseport.c | 2 + + net/core/sysctl_net_core.c | 8 +- + net/dcb/dcbnl.c | 130 +- + net/dccp/ipv4.c | 1 + + net/dccp/ipv6.c | 1 + + net/decnet/af_decnet.c | 2 +- + net/decnet/dn_dev.c | 8 +- + net/decnet/dn_fib.c | 10 +- + net/decnet/dn_route.c | 4 +- + net/decnet/dn_table.c | 3 +- + net/dns_resolver/dns_query.c | 2 - + net/dsa/Kconfig | 84 +- + net/dsa/Makefile | 19 +- + net/dsa/dsa.c | 165 ++- + net/dsa/dsa2.c | 55 +- + net/dsa/dsa_priv.h | 34 +- + net/dsa/legacy.c | 4 +- + net/dsa/slave.c | 35 +- + net/dsa/tag_brcm.c | 41 +- + net/dsa/tag_dsa.c | 15 +- + net/dsa/tag_edsa.c | 15 +- + net/dsa/tag_gswip.c | 9 +- + net/dsa/tag_ksz.c | 29 +- + net/dsa/tag_lan9303.c | 20 +- + net/dsa/tag_mtk.c | 18 +- + net/dsa/tag_qca.c | 19 +- + net/dsa/tag_trailer.c | 15 +- + net/ethernet/eth.c | 8 +- + net/hsr/Makefile | 1 + + net/hsr/hsr_debugfs.c | 119 ++ + net/hsr/hsr_device.c | 66 +- + net/hsr/hsr_device.h | 6 +- + net/hsr/hsr_forward.c | 97 +- + net/hsr/hsr_forward.h | 6 +- + net/hsr/hsr_framereg.c | 127 +- + net/hsr/hsr_framereg.h | 18 +- + net/hsr/hsr_main.c | 16 +- + net/hsr/hsr_main.h | 64 +- + net/hsr/hsr_netlink.c | 64 +- + net/hsr/hsr_netlink.h | 6 +- + net/hsr/hsr_slave.c | 19 +- + net/hsr/hsr_slave.h | 7 +- + net/ieee802154/ieee802154.h | 2 - + net/ieee802154/netlink.c | 1 + + net/ieee802154/nl802154.c | 139 +- + net/ieee802154/socket.c | 6 +- + net/ipv4/Kconfig | 29 +- + net/ipv4/Makefile | 3 - + net/ipv4/af_inet.c | 15 +- + net/ipv4/bpfilter/sockopt.c | 3 +- + net/ipv4/devinet.c | 27 +- + net/ipv4/esp4_offload.c | 50 +- + net/ipv4/fib_frontend.c | 89 +- + net/ipv4/fib_lookup.h | 1 + + net/ipv4/fib_semantics.c | 988 +++++++----- + net/ipv4/fib_trie.c | 33 +- + net/ipv4/fou.c | 153 +- + net/ipv4/inet_connection_sock.c | 4 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_output.c | 20 +- + net/ipv4/ip_tunnel_core.c | 8 +- + net/ipv4/ip_vti.c | 66 +- + net/ipv4/ipmr.c | 21 +- + net/ipv4/ipmr_base.c | 2 +- + net/ipv4/netfilter/Kconfig | 20 +- + net/ipv4/netfilter/Makefile | 2 - + net/ipv4/netfilter/nft_chain_route_ipv4.c | 89 -- + net/ipv4/route.c | 194 ++- + net/ipv4/syncookies.c | 17 +- + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp.c | 49 +- + net/ipv4/tcp_input.c | 12 +- + net/ipv4/tcp_ipv4.c | 11 +- + net/ipv4/tcp_metrics.c | 7 +- + net/ipv4/tcp_output.c | 15 +- + net/ipv4/udp.c | 19 +- + net/ipv4/xfrm4_mode_beet.c | 155 -- + net/ipv4/xfrm4_mode_transport.c | 114 -- + net/ipv4/xfrm4_mode_tunnel.c | 152 -- + net/ipv4/xfrm4_output.c | 27 +- + net/ipv4/xfrm4_policy.c | 136 +- + net/ipv4/xfrm4_protocol.c | 3 +- + net/ipv6/Kconfig | 35 +- + net/ipv6/Makefile | 4 - + net/ipv6/addrconf.c | 65 +- + net/ipv6/addrconf_core.c | 40 +- + net/ipv6/addrlabel.c | 12 +- + net/ipv6/af_inet6.c | 24 +- + net/ipv6/esp6_offload.c | 40 +- + net/ipv6/fib6_rules.c | 53 +- + net/ipv6/icmp.c | 59 +- + net/ipv6/ila/ila_lwt.c | 3 +- + net/ipv6/ila/ila_main.c | 9 +- + net/ipv6/ip6_fib.c | 50 +- + net/ipv6/ip6_output.c | 2 +- + net/ipv6/ip6_vti.c | 6 +- + net/ipv6/ip6mr.c | 1 - + net/ipv6/ndisc.c | 25 +- + net/ipv6/netfilter/Kconfig | 19 +- + net/ipv6/netfilter/Makefile | 2 - + net/ipv6/netfilter/ip6t_MASQUERADE.c | 81 - + net/ipv6/netfilter/nft_chain_route_ipv6.c | 91 -- + net/ipv6/output_core.c | 30 +- + net/ipv6/raw.c | 1 + + net/ipv6/route.c | 1153 +++++++------- + net/ipv6/seg6.c | 9 +- + net/ipv6/seg6_iptunnel.c | 4 +- + net/ipv6/seg6_local.c | 11 +- + net/ipv6/tcp_ipv6.c | 57 +- + net/ipv6/udp.c | 10 +- + net/ipv6/xfrm6_mode_beet.c | 131 -- + net/ipv6/xfrm6_mode_ro.c | 85 -- + net/ipv6/xfrm6_mode_transport.c | 121 -- + net/ipv6/xfrm6_mode_tunnel.c | 151 -- + net/ipv6/xfrm6_output.c | 36 +- + net/ipv6/xfrm6_policy.c | 126 -- + net/ipv6/xfrm6_protocol.c | 3 +- + net/l2tp/l2tp_ip.c | 1 + + net/l2tp/l2tp_ip6.c | 1 + + net/l2tp/l2tp_netlink.c | 23 +- + net/l2tp/l2tp_ppp.c | 3 +- + net/mac80211/cfg.c | 46 + + net/mac80211/debugfs.c | 54 + + net/mac80211/driver-ops.c | 21 + + net/mac80211/driver-ops.h | 5 + + net/mac80211/ieee80211_i.h | 9 +- + net/mac80211/iface.c | 17 +- + net/mac80211/key.c | 87 +- + net/mac80211/key.h | 2 + + net/mac80211/main.c | 16 + + net/mac80211/mesh.h | 2 + + net/mac80211/mesh_hwmp.c | 34 +- + net/mac80211/mesh_pathtbl.c | 2 +- + net/mac80211/mlme.c | 3 - + net/mac80211/rc80211_minstrel_ht.c | 124 +- + net/mac80211/rc80211_minstrel_ht.h | 2 +- + net/mac80211/rx.c | 74 +- + net/mac80211/sta_info.c | 15 + + net/mac80211/tdls.c | 2 +- + net/mac80211/trace.h | 30 + + net/mac80211/tx.c | 113 +- + net/mac80211/util.c | 162 +- + net/mac80211/wme.c | 82 +- + net/mac80211/wme.h | 2 + + net/mpls/af_mpls.c | 32 +- + net/mpls/mpls_iptunnel.c | 16 +- + net/ncsi/ncsi-netlink.c | 29 +- + net/netfilter/Kconfig | 19 +- + net/netfilter/Makefile | 4 +- + net/netfilter/core.c | 1 + + net/netfilter/ipset/ip_set_bitmap_gen.h | 14 +- + net/netfilter/ipset/ip_set_core.c | 36 +- + net/netfilter/ipset/ip_set_hash_gen.h | 14 +- + net/netfilter/ipset/ip_set_list_set.c | 14 +- + net/netfilter/ipvs/ip_vs_ctl.c | 87 +- + net/netfilter/ipvs/ip_vs_xmit.c | 84 +- + net/netfilter/nf_conntrack_expect.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 101 +- + net/netfilter/nf_conntrack_proto_dccp.c | 6 +- + net/netfilter/nf_conntrack_proto_sctp.c | 6 +- + net/netfilter/nf_conntrack_proto_tcp.c | 6 +- + net/netfilter/nf_conntrack_sip.c | 2 +- + net/netfilter/nf_conntrack_timeout.c | 89 ++ + net/netfilter/nf_flow_table_ip.c | 10 +- + net/netfilter/nf_internals.h | 3 - + net/netfilter/nf_nat_core.c | 23 +- + net/netfilter/nf_nat_masquerade.c | 104 +- + net/netfilter/nf_nat_proto.c | 59 +- + net/netfilter/nf_queue.c | 1 + + net/netfilter/nf_tables_api.c | 94 +- + net/netfilter/nfnetlink.c | 15 +- + net/netfilter/nfnetlink_acct.c | 4 +- + net/netfilter/nfnetlink_cthelper.c | 29 +- + net/netfilter/nfnetlink_cttimeout.c | 11 +- + net/netfilter/nfnetlink_osf.c | 14 +- + net/netfilter/nfnetlink_queue.c | 7 +- + net/netfilter/nft_chain_nat.c | 36 + + net/netfilter/nft_chain_route.c | 169 +++ + net/netfilter/nft_compat.c | 4 +- + net/netfilter/nft_ct.c | 10 +- + net/netfilter/nft_masq.c | 83 +- + net/netfilter/nft_nat.c | 58 +- + net/netfilter/nft_osf.c | 30 +- + net/netfilter/nft_redir.c | 63 +- + net/netfilter/nft_tunnel.c | 27 +- + net/netfilter/x_tables.c | 3 +- + net/netfilter/xt_CT.c | 93 +- + .../ipt_MASQUERADE.c => netfilter/xt_MASQUERADE.c} | 84 +- + net/netlabel/netlabel_calipso.c | 9 +- + net/netlabel/netlabel_cipso_v4.c | 59 +- + net/netlabel/netlabel_mgmt.c | 25 +- + net/netlabel/netlabel_unlabeled.c | 17 +- + net/netlink/genetlink.c | 44 +- + net/netrom/af_netrom.c | 14 +- + net/nfc/netlink.c | 55 +- + net/openvswitch/actions.c | 48 + + net/openvswitch/conntrack.c | 67 +- + net/openvswitch/datapath.c | 41 +- + net/openvswitch/flow_netlink.c | 245 ++- + net/openvswitch/meter.c | 23 +- + net/openvswitch/vport-vxlan.c | 6 +- + net/openvswitch/vport.c | 2 +- + net/packet/af_packet.c | 23 +- + net/packet/diag.c | 2 +- + net/phonet/pn_netlink.c | 8 +- + net/psample/psample.c | 1 + + net/qrtr/qrtr.c | 7 +- + net/rose/af_rose.c | 7 +- + net/rxrpc/local_object.c | 2 +- + net/sched/act_api.c | 40 +- + net/sched/act_bpf.c | 3 +- + net/sched/act_connmark.c | 4 +- + net/sched/act_csum.c | 3 +- + net/sched/act_gact.c | 3 +- + net/sched/act_ife.c | 10 +- + net/sched/act_ipt.c | 3 +- + net/sched/act_mirred.c | 3 +- + net/sched/act_nat.c | 3 +- + net/sched/act_pedit.c | 13 +- + net/sched/act_police.c | 3 +- + net/sched/act_sample.c | 3 +- + net/sched/act_simple.c | 3 +- + net/sched/act_skbedit.c | 3 +- + net/sched/act_skbmod.c | 3 +- + net/sched/act_tunnel_key.c | 17 +- + net/sched/act_vlan.c | 3 +- + net/sched/cls_api.c | 25 +- + net/sched/cls_basic.c | 6 +- + net/sched/cls_bpf.c | 6 +- + net/sched/cls_cgroup.c | 7 +- + net/sched/cls_flow.c | 5 +- + net/sched/cls_flower.c | 620 +++++--- + net/sched/cls_fw.c | 5 +- + net/sched/cls_matchall.c | 6 +- + net/sched/cls_route.c | 5 +- + net/sched/cls_rsvp.h | 5 +- + net/sched/cls_tcindex.c | 5 +- + net/sched/cls_u32.c | 5 +- + net/sched/em_ipt.c | 4 +- + net/sched/em_meta.c | 3 +- + net/sched/ematch.c | 7 +- + net/sched/sch_api.c | 36 +- + net/sched/sch_atm.c | 5 +- + net/sched/sch_cake.c | 13 +- + net/sched/sch_cbq.c | 10 +- + net/sched/sch_cbs.c | 103 +- + net/sched/sch_choke.c | 5 +- + net/sched/sch_codel.c | 5 +- + net/sched/sch_drr.c | 5 +- + net/sched/sch_dsmark.c | 10 +- + net/sched/sch_etf.c | 5 +- + net/sched/sch_fq.c | 5 +- + net/sched/sch_fq_codel.c | 6 +- + net/sched/sch_generic.c | 70 +- + net/sched/sch_gred.c | 25 +- + net/sched/sch_hfsc.c | 5 +- + net/sched/sch_hhf.c | 5 +- + net/sched/sch_htb.c | 10 +- + net/sched/sch_ingress.c | 2 +- + net/sched/sch_mqprio.c | 9 +- + net/sched/sch_netem.c | 7 +- + net/sched/sch_pie.c | 5 +- + net/sched/sch_qfq.c | 6 +- + net/sched/sch_red.c | 5 +- + net/sched/sch_sfb.c | 5 +- + net/sched/sch_taprio.c | 186 ++- + net/sched/sch_tbf.c | 5 +- + net/sctp/ipv6.c | 1 + + net/sctp/protocol.c | 1 + + net/sctp/sm_statefuns.c | 6 +- + net/sctp/socket.c | 10 +- + net/sctp/stream_interleave.c | 60 +- + net/sctp/ulpevent.c | 19 +- + net/sctp/ulpqueue.c | 53 +- + net/smc/af_smc.c | 355 ++--- + net/smc/smc.h | 11 +- + net/smc/smc_clc.c | 10 +- + net/smc/smc_clc.h | 20 +- + net/smc/smc_core.c | 93 +- + net/smc/smc_core.h | 25 +- + net/smc/smc_pnet.c | 56 +- + net/smc/smc_pnet.h | 7 +- + net/socket.c | 65 +- + net/strparser/strparser.c | 16 +- + net/tipc/bcast.c | 275 +++- + net/tipc/bcast.h | 12 + + net/tipc/bearer.c | 50 +- + net/tipc/core.c | 2 + + net/tipc/core.h | 3 + + net/tipc/group.c | 2 +- + net/tipc/link.c | 290 +++- + net/tipc/monitor.c | 4 +- + net/tipc/msg.h | 62 + + net/tipc/name_table.c | 4 +- + net/tipc/net.c | 8 +- + net/tipc/netlink.c | 51 +- + net/tipc/netlink_compat.c | 88 +- + net/tipc/node.c | 65 +- + net/tipc/node.h | 8 +- + net/tipc/socket.c | 25 +- + net/tipc/udp_media.c | 27 +- + net/tls/tls_device.c | 44 +- + net/tls/tls_main.c | 31 +- + net/tls/tls_sw.c | 73 +- + net/unix/af_unix.c | 6 +- + net/wimax/stack.c | 9 +- + net/wireless/nl80211.c | 923 ++++++++---- + net/wireless/pmsr.c | 30 +- + net/wireless/rdev-ops.h | 29 +- + net/wireless/reg.c | 23 +- + net/wireless/scan.c | 173 ++- + net/wireless/trace.h | 87 +- + net/wireless/util.c | 21 +- + net/wireless/wext-compat.c | 3 - + net/x25/af_x25.c | 27 +- + net/xdp/xsk_queue.h | 56 +- + net/xfrm/Kconfig | 8 +- + net/xfrm/xfrm_device.c | 63 +- + net/xfrm/xfrm_inout.h | 38 + + net/xfrm/xfrm_input.c | 299 +++- + net/xfrm/xfrm_interface.c | 6 +- + net/xfrm/xfrm_output.c | 381 ++++- + net/xfrm/xfrm_policy.c | 280 +++- + net/xfrm/xfrm_state.c | 186 +-- + net/xfrm/xfrm_user.c | 10 +- + samples/bpf/.gitignore | 2 + + samples/bpf/asm_goto_workaround.h | 1 + + samples/bpf/offwaketime_user.c | 5 + + samples/bpf/sampleip_user.c | 5 + + samples/bpf/spintest_user.c | 7 +- + samples/bpf/trace_event_user.c | 5 + + scripts/link-vmlinux.sh | 20 +- + tools/arch/arm64/include/asm/barrier.h | 10 + + tools/arch/x86/include/asm/barrier.h | 7 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 222 +++ + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 10 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 5 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 5 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 5 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 5 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 18 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 5 +- + tools/bpf/bpftool/bash-completion/bpftool | 75 +- + tools/bpf/bpftool/btf.c | 586 ++++++++ + tools/bpf/bpftool/btf_dumper.c | 59 + + tools/bpf/bpftool/cgroup.c | 10 +- + tools/bpf/bpftool/main.c | 3 +- + tools/bpf/bpftool/main.h | 2 + + tools/bpf/bpftool/map.c | 64 +- + tools/bpf/bpftool/net.c | 54 + + tools/bpf/bpftool/prog.c | 8 +- + tools/bpf/bpftool/xlated_dumper.c | 3 + + tools/include/linux/filter.h | 21 +- + tools/include/uapi/linux/bpf.h | 291 +++- + tools/include/uapi/linux/btf.h | 32 +- + tools/lib/bpf/.gitignore | 1 + + tools/lib/bpf/Makefile | 20 +- + tools/lib/bpf/bpf.c | 36 +- + tools/lib/bpf/bpf.h | 9 +- + tools/lib/bpf/btf.c | 126 +- + tools/lib/bpf/btf.h | 3 + + tools/lib/bpf/libbpf.c | 654 ++++++-- + tools/lib/bpf/libbpf.h | 6 + + tools/lib/bpf/libbpf.map | 7 + + tools/lib/bpf/libbpf.pc.template | 12 + + tools/lib/bpf/libbpf_probes.c | 76 +- + tools/lib/bpf/libbpf_util.h | 30 + + tools/lib/bpf/xsk.c | 9 +- + tools/lib/bpf/xsk.h | 22 +- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/Makefile | 41 +- + tools/testing/selftests/bpf/bpf_helpers.h | 58 +- + tools/testing/selftests/bpf/config | 11 + + tools/testing/selftests/bpf/flow_dissector_load.c | 4 +- + tools/testing/selftests/bpf/flow_dissector_load.h | 24 +- + .../selftests/bpf/map_tests/sk_storage_map.c | 629 ++++++++ + .../testing/selftests/bpf/prog_tests/bpf_obj_id.c | 8 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 49 + + .../selftests/bpf/prog_tests/flow_dissector.c | 296 ++-- + .../bpf/prog_tests/flow_dissector_load_bytes.c | 48 + + .../selftests/bpf/prog_tests/get_stack_raw_tp.c | 4 +- + .../testing/selftests/bpf/prog_tests/global_data.c | 157 ++ + .../raw_tp_writable_reject_nbd_invalid.c | 42 + + .../bpf/prog_tests/raw_tp_writable_test_run.c | 80 + + tools/testing/selftests/bpf/prog_tests/skb_ctx.c | 89 ++ + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 16 +- + tools/testing/selftests/bpf/progs/bpf_flow.c | 79 +- + .../testing/selftests/bpf/progs/test_global_data.c | 106 ++ + tools/testing/selftests/bpf/progs/test_jhash.h | 70 + + tools/testing/selftests/bpf/progs/test_skb_ctx.c | 21 + + .../selftests/bpf/progs/test_sock_fields_kern.c | 53 + + .../testing/selftests/bpf/progs/test_sysctl_prog.c | 70 + + tools/testing/selftests/bpf/progs/test_tc_edt.c | 109 ++ + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 536 +++++++ + .../bpf/progs/test_tcp_check_syncookie_kern.c | 129 ++ + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 2 +- + .../selftests/bpf/progs/test_tcpnotify_kern.c | 2 +- + .../selftests/bpf/progs/test_verif_scale1.c | 30 + + .../selftests/bpf/progs/test_verif_scale2.c | 30 + + .../selftests/bpf/progs/test_verif_scale3.c | 30 + + tools/testing/selftests/bpf/test_btf.c | 799 +++++++++- + tools/testing/selftests/bpf/test_btf.h | 69 + + tools/testing/selftests/bpf/test_lwt_ip_encap.sh | 134 +- + tools/testing/selftests/bpf/test_maps.c | 18 +- + tools/testing/selftests/bpf/test_maps.h | 17 + + tools/testing/selftests/bpf/test_offload.py | 227 ++- + tools/testing/selftests/bpf/test_progs.c | 6 +- + tools/testing/selftests/bpf/test_progs.h | 1 + + tools/testing/selftests/bpf/test_section_names.c | 5 + + tools/testing/selftests/bpf/test_sock_fields.c | 115 +- + tools/testing/selftests/bpf/test_sysctl.c | 1567 ++++++++++++++++++++ + tools/testing/selftests/bpf/test_tc_edt.sh | 99 ++ + tools/testing/selftests/bpf/test_tc_tunnel.sh | 290 ++++ + .../selftests/bpf/test_tcp_check_syncookie.sh | 81 + + .../selftests/bpf/test_tcp_check_syncookie_user.c | 212 +++ + tools/testing/selftests/bpf/test_verifier.c | 215 ++- + tools/testing/selftests/bpf/trace_helpers.c | 4 + + tools/testing/selftests/bpf/urandom_read.c | 15 +- + .../testing/selftests/bpf/verifier/array_access.c | 159 ++ + tools/testing/selftests/bpf/verifier/ctx_skb.c | 1 - + .../selftests/bpf/verifier/direct_value_access.c | 347 +++++ + tools/testing/selftests/bpf/verifier/int_ptr.c | 160 ++ + tools/testing/selftests/bpf/verifier/ld_dw.c | 9 + + .../selftests/bpf/verifier/raw_tp_writable.c | 34 + + .../testing/selftests/bpf/verifier/ref_tracking.c | 126 +- + tools/testing/selftests/bpf/verifier/scale.c | 18 + + tools/testing/selftests/bpf/verifier/sock.c | 116 ++ + tools/testing/selftests/bpf/verifier/unpriv.c | 8 +- + tools/testing/selftests/bpf/verifier/var_off.c | 186 ++- + .../selftests/drivers/net/mlxsw/qos_ets_strict.sh | 311 ++++ + .../testing/selftests/drivers/net/mlxsw/qos_lib.sh | 98 ++ + .../selftests/drivers/net/mlxsw/qos_mc_aware.sh | 122 +- + .../selftests/drivers/net/mlxsw/rtnetlink.sh | 26 + + .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 1 + + .../net/mlxsw/spectrum/devlink_resources.sh | 3 + + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 5 +- + tools/testing/selftests/net/config | 2 - + tools/testing/selftests/net/fib_tests.sh | 70 +- + .../selftests/net/forwarding/bridge_igmp.sh | 152 ++ + .../selftests/net/forwarding/devlink_lib.sh | 110 +- + .../selftests/net/forwarding/router_multicast.sh | 107 +- + .../testing/selftests/net/forwarding/tc_flower.sh | 59 +- + .../selftests/net/forwarding/tc_vlan_modify.sh | 164 ++ + tools/testing/selftests/net/pmtu.sh | 213 +-- + tools/testing/selftests/net/rtnetlink.sh | 11 +- + tools/testing/selftests/netfilter/Makefile | 3 +- + .../testing/selftests/netfilter/bridge_brouter.sh | 146 ++ + tools/testing/selftests/netfilter/nft_nat.sh | 146 +- + .../tc-testing/tc-tests/actions/pedit.json | 903 +++++++++++ + .../tc-testing/tc-tests/filters/tests.json | 20 + + 1248 files changed, 53890 insertions(+), 20755 deletions(-) + rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-batman-adv (92%) + rename Documentation/ABI/{testing => obsolete}/sysfs-class-net-mesh (97%) + create mode 100644 Documentation/bpf/prog_cgroup_sysctl.rst + rename Documentation/{networking/bpf_flow_dissector.rst => bpf/prog_flow_dissector.rst} (98%) + create mode 100644 Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt + rename Documentation/networking/dsa/{bcm_sf2.txt => bcm_sf2.rst} (83%) + rename Documentation/networking/dsa/{dsa.txt => dsa.rst} (67%) + create mode 100644 Documentation/networking/dsa/index.rst + rename Documentation/networking/dsa/{lan9303.txt => lan9303.rst} (85%) + delete mode 100644 arch/ia64/include/uapi/asm/sockios.h + delete mode 100644 arch/parisc/include/uapi/asm/sockios.h + delete mode 100644 arch/sparc/include/uapi/asm/sockios.h + delete mode 100644 arch/x86/include/uapi/asm/sockios.h + create mode 100644 drivers/bluetooth/btmtksdio.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_ddp.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_dcb.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_dcb.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_dcb_lib.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_dcb_lib.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/params.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/params.h + create mode 100644 drivers/net/ethernet/netronome/nfp/ccm.c + create mode 100644 drivers/net/ethernet/netronome/nfp/ccm.h + create mode 100644 drivers/net/ethernet/ti/cpsw_ethtool.c + create mode 100644 drivers/net/ethernet/ti/cpsw_priv.c + create mode 100644 drivers/net/ethernet/ti/cpsw_priv.h + create mode 100644 drivers/net/ethernet/ti/cpsw_sl.c + create mode 100644 drivers/net/ethernet/ti/cpsw_sl.h + create mode 100644 drivers/net/netdevsim/bus.c + create mode 100644 drivers/net/netdevsim/dev.c + delete mode 100644 drivers/net/netdevsim/devlink.c + create mode 100644 drivers/net/netdevsim/sdev.c + create mode 100644 drivers/net/phy/mdio-mux-meson-g12a.c + create mode 100644 include/net/bpf_sk_storage.h + create mode 100644 include/net/ipv6_stubs.h + delete mode 100644 include/net/netfilter/ipv4/nf_nat_masquerade.h + delete mode 100644 include/net/netfilter/ipv6/nf_nat_masquerade.h + create mode 100644 include/net/netfilter/nf_nat_masquerade.h + rename include/net/{nexthop.h => rtnh.h} (94%) + create mode 100644 include/trace/events/bpf_test_run.h + create mode 100644 include/trace/events/nbd.h + create mode 100644 net/core/bpf_sk_storage.c + create mode 100644 net/core/datagram.h + create mode 100644 net/hsr/hsr_debugfs.c + delete mode 100644 net/ipv4/netfilter/nft_chain_route_ipv4.c + delete mode 100644 net/ipv4/xfrm4_mode_beet.c + delete mode 100644 net/ipv4/xfrm4_mode_transport.c + delete mode 100644 net/ipv4/xfrm4_mode_tunnel.c + delete mode 100644 net/ipv6/netfilter/ip6t_MASQUERADE.c + delete mode 100644 net/ipv6/netfilter/nft_chain_route_ipv6.c + delete mode 100644 net/ipv6/xfrm6_mode_beet.c + delete mode 100644 net/ipv6/xfrm6_mode_ro.c + delete mode 100644 net/ipv6/xfrm6_mode_transport.c + delete mode 100644 net/ipv6/xfrm6_mode_tunnel.c + create mode 100644 net/netfilter/nft_chain_route.c + rename net/{ipv4/netfilter/ipt_MASQUERADE.c => netfilter/xt_MASQUERADE.c} (52%) + create mode 100644 net/xfrm/xfrm_inout.h + create mode 100644 tools/bpf/bpftool/Documentation/bpftool-btf.rst + create mode 100644 tools/bpf/bpftool/btf.c + create mode 100644 tools/lib/bpf/libbpf.pc.template + create mode 100644 tools/testing/selftests/bpf/map_tests/sk_storage_map.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_verif_scale.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/flow_dissector_load_bytes.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/global_data.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/raw_tp_writable_reject_nbd_invalid.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/raw_tp_writable_test_run.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_ctx.c + create mode 100644 tools/testing/selftests/bpf/progs/test_global_data.c + create mode 100644 tools/testing/selftests/bpf/progs/test_jhash.h + create mode 100644 tools/testing/selftests/bpf/progs/test_skb_ctx.c + create mode 100644 tools/testing/selftests/bpf/progs/test_sysctl_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_edt.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tc_tunnel.c + create mode 100644 tools/testing/selftests/bpf/progs/test_tcp_check_syncookie_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/test_verif_scale1.c + create mode 100644 tools/testing/selftests/bpf/progs/test_verif_scale2.c + create mode 100644 tools/testing/selftests/bpf/progs/test_verif_scale3.c + create mode 100644 tools/testing/selftests/bpf/test_btf.h + create mode 100644 tools/testing/selftests/bpf/test_maps.h + create mode 100644 tools/testing/selftests/bpf/test_sysctl.c + create mode 100755 tools/testing/selftests/bpf/test_tc_edt.sh + create mode 100755 tools/testing/selftests/bpf/test_tc_tunnel.sh + create mode 100755 tools/testing/selftests/bpf/test_tcp_check_syncookie.sh + create mode 100644 tools/testing/selftests/bpf/test_tcp_check_syncookie_user.c + create mode 100644 tools/testing/selftests/bpf/verifier/direct_value_access.c + create mode 100644 tools/testing/selftests/bpf/verifier/int_ptr.c + create mode 100644 tools/testing/selftests/bpf/verifier/raw_tp_writable.c + create mode 100644 tools/testing/selftests/bpf/verifier/scale.c + create mode 100755 tools/testing/selftests/drivers/net/mlxsw/qos_ets_strict.sh + create mode 100644 tools/testing/selftests/drivers/net/mlxsw/qos_lib.sh + create mode 100755 tools/testing/selftests/net/forwarding/bridge_igmp.sh + create mode 100755 tools/testing/selftests/net/forwarding/tc_vlan_modify.sh + create mode 100755 tools/testing/selftests/netfilter/bridge_brouter.sh +Merging bpf-next/master (9076c49bdca2 Merge branch 'sk-local-storage') +$ 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. +$ 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 ce0b08fc71de] Merge remote-tracking branch 'net-next/master' + Date: Wed May 1 12:10:48 2019 +1000 +Merging mlx5-next/mlx5-next (b169e64a2444 net/mlx5: Geneve, Add flow table capabilities for Geneve decap with TLV options) +$ git merge mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/device.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/Makefile +Auto-merging drivers/infiniband/hw/mlx5/main.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/main.c +Resolved 'drivers/infiniband/hw/mlx5/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f628fd9fd587] Merge remote-tracking branch 'mlx5-next/mlx5-next' +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/hw/mlx5/main.c | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 19 ++- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 9 +- + .../mellanox/mlx5/core/diag/fw_tracer_tracepoint.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 8 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 4 + + .../net/ethernet/mellanox/mlx5/core/fpga/ipsec.c | 86 +++++----- + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 113 +++++++------ + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.h | 33 ++-- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 73 ++++++--- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 65 ++++---- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 20 +-- + drivers/net/ethernet/mellanox/mlx5/core/rdma.c | 182 +++++++++++++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/rdma.h | 20 +++ + include/linux/mlx5/device.h | 10 +- + include/linux/mlx5/driver.h | 10 +- + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 82 ++++++++-- + 26 files changed, 566 insertions(+), 238 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/rdma.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/rdma.h +Merging netfilter-next/master (1de6f3342191 netfilter: connlabels: fix spelling mistake "trackling" -> "tracking") +$ git merge netfilter-next/master +Merge made by the 'recursive' strategy. + include/net/netfilter/nf_conntrack_helper.h | 24 ++++++++ + include/net/netfilter/nf_tables.h | 20 +------ + include/net/netns/conntrack.h | 6 +- + include/uapi/linux/netfilter/nf_tables.h | 2 + + net/ipv4/netfilter/nf_nat_h323.c | 2 +- + net/ipv4/netfilter/nf_nat_pptp.c | 2 +- + net/netfilter/nf_conntrack_amanda.c | 8 ++- + net/netfilter/nf_conntrack_ftp.c | 18 +++--- + net/netfilter/nf_conntrack_helper.c | 86 +++++++++++++++++++++++++++++ + net/netfilter/nf_conntrack_irc.c | 6 +- + net/netfilter/nf_conntrack_sane.c | 12 ++-- + net/netfilter/nf_conntrack_sip.c | 28 +++++----- + net/netfilter/nf_conntrack_standalone.c | 48 +++++++++++----- + net/netfilter/nf_conntrack_tftp.c | 18 +++--- + net/netfilter/nf_nat_amanda.c | 9 ++- + net/netfilter/nf_nat_ftp.c | 9 ++- + net/netfilter/nf_nat_irc.c | 9 ++- + net/netfilter/nf_nat_sip.c | 9 ++- + net/netfilter/nf_nat_tftp.c | 9 ++- + net/netfilter/nf_tables_set_core.c | 1 + + net/netfilter/nft_ct.c | 8 +++ + net/netfilter/nft_dynset.c | 17 ++++++ + net/netfilter/xt_connlabel.c | 2 +- + net/openvswitch/conntrack.c | 26 +++++++-- + 24 files changed, 292 insertions(+), 87 deletions(-) +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 (e3037485c68e rtw88: new Realtek 802.11ac driver) +$ git merge wireless-drivers-next/master +Auto-merging drivers/net/wireless/marvell/mwifiex/sdio.c +Auto-merging drivers/net/wireless/intel/iwlwifi/pcie/trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/ops.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c +Auto-merging drivers/net/wireless/intel/iwlwifi/fw/file.h +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/fw/file.h +Auto-merging drivers/net/wireless/intel/iwlwifi/cfg/22000.c +Auto-merging drivers/net/wireless/ath/wil6210/cfg80211.c +Auto-merging MAINTAINERS +Resolved 'drivers/net/wireless/intel/iwlwifi/fw/file.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 617d5013b4fe] Merge remote-tracking branch 'wireless-drivers-next/master' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + drivers/net/wireless/ath/wil6210/cfg80211.c | 11 +- + drivers/net/wireless/ath/wil6210/debugfs.c | 38 +- + drivers/net/wireless/ath/wil6210/fw_inc.c | 6 +- + drivers/net/wireless/ath/wil6210/main.c | 78 +- + drivers/net/wireless/ath/wil6210/netdev.c | 10 +- + drivers/net/wireless/ath/wil6210/pcie_bus.c | 4 +- + drivers/net/wireless/ath/wil6210/pm.c | 35 +- + drivers/net/wireless/ath/wil6210/txrx_edma.c | 74 +- + drivers/net/wireless/ath/wil6210/txrx_edma.h | 47 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 11 +- + drivers/net/wireless/ath/wil6210/wil_crash_dump.c | 18 +- + drivers/net/wireless/ath/wil6210/wmi.c | 24 +- + drivers/net/wireless/ath/wil6210/wmi.h | 91 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 4 +- + drivers/net/wireless/broadcom/b43/phy_lp.c | 11 - + .../net/wireless/broadcom/brcm80211/brcmfmac/dmi.c | 26 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 7 +- + drivers/net/wireless/intel/iwlegacy/3945-debug.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 19 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 136 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 4 + + .../net/wireless/intel/iwlwifi/fw/api/location.h | 77 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 187 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 20 + + drivers/net/wireless/intel/iwlwifi/fw/img.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 2 + + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 +- + drivers/net/wireless/intel/iwlwifi/iwl-debug.h | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 26 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 58 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 33 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 50 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 11 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 3 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 6 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 5 - + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 8 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 9 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 7 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 13 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 8 +- + drivers/net/wireless/intersil/p54/p54pci.c | 3 +- + drivers/net/wireless/marvell/mwifiex/Kconfig | 4 +- + drivers/net/wireless/marvell/mwifiex/cfp.c | 3 + + drivers/net/wireless/marvell/mwifiex/sdio.c | 5 + + drivers/net/wireless/marvell/mwifiex/sdio.h | 69 + + drivers/net/wireless/marvell/mwifiex/sta_cmdresp.c | 7 +- + drivers/net/wireless/marvell/mwifiex/sta_event.c | 12 +- + drivers/net/wireless/marvell/mwifiex/uap_event.c | 8 +- + drivers/net/wireless/marvell/mwl8k.c | 24 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/commands.h | 3 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 35 + + drivers/net/wireless/quantenna/qtnfmac/core.h | 2 + + drivers/net/wireless/quantenna/qtnfmac/debug.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 16 +- + drivers/net/wireless/quantenna/qtnfmac/qlink.h | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800.h | 19 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 628 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.h | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.c | 124 +- + drivers/net/wireless/ralink/rt2x00/rt2800mmio.h | 1 + + drivers/net/wireless/ralink/rt2x00/rt2800pci.c | 2 +- + drivers/net/wireless/ralink/rt2x00/rt2800soc.c | 13 +- + drivers/net/wireless/ralink/rt2x00/rt2800usb.c | 28 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 7 +- + drivers/net/wireless/ralink/rt2x00/rt2x00dev.c | 4 + + drivers/net/wireless/ralink/rt2x00/rt2x00mmio.h | 2 - + drivers/net/wireless/ralink/rt2x00/rt2x00queue.c | 3 +- + drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 3 - + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 22 +- + drivers/net/wireless/ray_cs.c | 8 +- + drivers/net/wireless/realtek/Kconfig | 1 + + drivers/net/wireless/realtek/Makefile | 1 + + .../net/wireless/realtek/rtlwifi/rtl8192cu/rf.c | 3 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 + + drivers/net/wireless/realtek/rtw88/Kconfig | 54 + + drivers/net/wireless/realtek/rtw88/Makefile | 20 + + drivers/net/wireless/realtek/rtw88/debug.c | 637 + + drivers/net/wireless/realtek/rtw88/debug.h | 52 + + drivers/net/wireless/realtek/rtw88/efuse.c | 160 + + drivers/net/wireless/realtek/rtw88/efuse.h | 26 + + drivers/net/wireless/realtek/rtw88/fw.c | 633 + + drivers/net/wireless/realtek/rtw88/fw.h | 222 + + drivers/net/wireless/realtek/rtw88/hci.h | 211 + + drivers/net/wireless/realtek/rtw88/mac.c | 965 + + drivers/net/wireless/realtek/rtw88/mac.h | 35 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 481 + + drivers/net/wireless/realtek/rtw88/main.c | 1211 ++ + drivers/net/wireless/realtek/rtw88/main.h | 1104 + + drivers/net/wireless/realtek/rtw88/pci.c | 1211 ++ + drivers/net/wireless/realtek/rtw88/pci.h | 237 + + drivers/net/wireless/realtek/rtw88/phy.c | 1724 ++ + drivers/net/wireless/realtek/rtw88/phy.h | 134 + + drivers/net/wireless/realtek/rtw88/ps.c | 166 + + drivers/net/wireless/realtek/rtw88/ps.h | 20 + + drivers/net/wireless/realtek/rtw88/reg.h | 421 + + drivers/net/wireless/realtek/rtw88/regd.c | 391 + + drivers/net/wireless/realtek/rtw88/regd.h | 67 + + drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1594 ++ + drivers/net/wireless/realtek/rtw88/rtw8822b.h | 170 + + .../net/wireless/realtek/rtw88/rtw8822b_table.c | 20783 +++++++++++++++++++ + .../net/wireless/realtek/rtw88/rtw8822b_table.h | 18 + + drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1890 ++ + drivers/net/wireless/realtek/rtw88/rtw8822c.h | 186 + + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 11753 +++++++++++ + .../net/wireless/realtek/rtw88/rtw8822c_table.h | 17 + + drivers/net/wireless/realtek/rtw88/rx.c | 151 + + drivers/net/wireless/realtek/rtw88/rx.h | 41 + + drivers/net/wireless/realtek/rtw88/sec.c | 120 + + drivers/net/wireless/realtek/rtw88/sec.h | 39 + + drivers/net/wireless/realtek/rtw88/tx.c | 367 + + drivers/net/wireless/realtek/rtw88/tx.h | 89 + + drivers/net/wireless/realtek/rtw88/util.c | 72 + + drivers/net/wireless/realtek/rtw88/util.h | 34 + + drivers/net/wireless/rndis_wlan.c | 12 +- + drivers/net/wireless/rsi/rsi_91x_hal.c | 199 +- + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 30 +- + drivers/net/wireless/rsi/rsi_91x_mgmt.c | 232 +- + drivers/net/wireless/rsi/rsi_91x_sdio.c | 129 +- + drivers/net/wireless/rsi/rsi_91x_usb.c | 96 +- + drivers/net/wireless/rsi/rsi_boot_params.h | 63 + + drivers/net/wireless/rsi/rsi_hal.h | 44 +- + drivers/net/wireless/rsi/rsi_main.h | 21 +- + drivers/net/wireless/rsi/rsi_mgmt.h | 26 + + drivers/net/wireless/rsi/rsi_sdio.h | 5 +- + drivers/net/wireless/rsi/rsi_usb.h | 3 +- + drivers/net/wireless/st/cw1200/main.c | 5 + + drivers/net/wireless/ti/wlcore/cmd.c | 15 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 4 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 3 +- + drivers/ssb/bridge_pcmcia_80211.c | 9 +- + 144 files changed, 50177 insertions(+), 525 deletions(-) + create mode 100644 drivers/net/wireless/realtek/rtw88/Kconfig + create mode 100644 drivers/net/wireless/realtek/rtw88/Makefile + create mode 100644 drivers/net/wireless/realtek/rtw88/debug.c + create mode 100644 drivers/net/wireless/realtek/rtw88/debug.h + create mode 100644 drivers/net/wireless/realtek/rtw88/efuse.c + create mode 100644 drivers/net/wireless/realtek/rtw88/efuse.h + create mode 100644 drivers/net/wireless/realtek/rtw88/fw.c + create mode 100644 drivers/net/wireless/realtek/rtw88/fw.h + create mode 100644 drivers/net/wireless/realtek/rtw88/hci.h + create mode 100644 drivers/net/wireless/realtek/rtw88/mac.c + create mode 100644 drivers/net/wireless/realtek/rtw88/mac.h + create mode 100644 drivers/net/wireless/realtek/rtw88/mac80211.c + create mode 100644 drivers/net/wireless/realtek/rtw88/main.c + create mode 100644 drivers/net/wireless/realtek/rtw88/main.h + create mode 100644 drivers/net/wireless/realtek/rtw88/pci.c + create mode 100644 drivers/net/wireless/realtek/rtw88/pci.h + create mode 100644 drivers/net/wireless/realtek/rtw88/phy.c + create mode 100644 drivers/net/wireless/realtek/rtw88/phy.h + create mode 100644 drivers/net/wireless/realtek/rtw88/ps.c + create mode 100644 drivers/net/wireless/realtek/rtw88/ps.h + create mode 100644 drivers/net/wireless/realtek/rtw88/reg.h + create mode 100644 drivers/net/wireless/realtek/rtw88/regd.c + create mode 100644 drivers/net/wireless/realtek/rtw88/regd.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822b.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822b_table.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822b_table.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822c.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822c.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822c_table.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8822c_table.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rx.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rx.h + create mode 100644 drivers/net/wireless/realtek/rtw88/sec.c + create mode 100644 drivers/net/wireless/realtek/rtw88/sec.h + create mode 100644 drivers/net/wireless/realtek/rtw88/tx.c + create mode 100644 drivers/net/wireless/realtek/rtw88/tx.h + create mode 100644 drivers/net/wireless/realtek/rtw88/util.c + create mode 100644 drivers/net/wireless/realtek/rtw88/util.h +Merging bluetooth/master (632c59624302 dt-bindings: net: bluetooth: Add device tree bindings for QTI chip WCN3998) +$ git merge bluetooth/master +Merge made by the 'recursive' strategy. + .../devicetree/bindings/net/qualcomm-bluetooth.txt | 5 +-- + drivers/bluetooth/btqca.c | 7 ++-- + drivers/bluetooth/btqca.h | 11 +++++- + drivers/bluetooth/hci_qca.c | 40 ++++++++++++++-------- + 4 files changed, 43 insertions(+), 20 deletions(-) +Merging mac80211-next/master (88d6272acaaa net: phy: avoid unneeded MDIO reads in genphy_read_status) +$ git merge mac80211-next/master +Already up to date. +Merging gfs2/for-next (79dc625c5d06 gfs2: fix race between gfs2_freeze_func and unmount) +$ git merge gfs2/for-next +Auto-merging fs/gfs2/bmap.c +Merge made by the 'recursive' strategy. + fs/gfs2/bmap.c | 30 ++++++++++++++++++++++++++-- + fs/gfs2/bmap.h | 1 + + fs/gfs2/dir.c | 2 +- + fs/gfs2/glock.c | 25 +++++++++++++---------- + fs/gfs2/incore.h | 9 +++++---- + fs/gfs2/log.c | 43 +++++++++++++++++++++++++--------------- + fs/gfs2/log.h | 5 +++-- + fs/gfs2/lops.c | 49 ++++++++++++++++++++++++++++++--------------- + fs/gfs2/lops.h | 7 +------ + fs/gfs2/main.c | 1 - + fs/gfs2/ops_fstype.c | 4 ++-- + fs/gfs2/recovery.c | 10 ++++++---- + fs/gfs2/recovery.h | 2 +- + fs/gfs2/rgrp.c | 56 ++++++++++++++++++++++++---------------------------- + fs/gfs2/super.c | 15 ++++++-------- + fs/gfs2/trans.c | 4 ++-- + fs/gfs2/trans.h | 2 +- + fs/gfs2/xattr.c | 6 +++--- + 18 files changed, 161 insertions(+), 110 deletions(-) +Merging mtd/mtd/next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge mtd/mtd/next +Already up to date. +Merging nand/nand/next (1c14fe2167ef mtd: nandsim: switch to exec_op interface) +$ git merge nand/nand/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 +Auto-merging arch/mips/configs/generic/board-ocelot.config +Auto-merging arch/arm64/configs/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/multi_v7_defconfig +Auto-merging arch/arm/configs/mini2440_defconfig +Auto-merging arch/arm/configs/imx_v6_v7_defconfig +Auto-merging arch/arm/configs/imx_v4_v5_defconfig +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/nand-controller.yaml | 143 +++ + Documentation/devicetree/bindings/mtd/nand.txt | 75 -- + .../devicetree/bindings/mtd/sunxi-nand.txt | 48 - + 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 | 3 +- + drivers/mtd/devices/Kconfig | 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/sm_ftl.c | 12 +- + 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 +- + 163 files changed, 3942 insertions(+), 2409 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 + delete mode 100644 Documentation/devicetree/bindings/mtd/sunxi-nand.txt + 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 +Merging spi-nor/spi-nor/next (dcb4b22eeaf4 spi-nor: s25fl512s supports region locking) +$ git merge spi-nor/spi-nor/next +Merge made by the 'recursive' strategy. + drivers/mtd/spi-nor/intel-spi.c | 8 ++++++++ + drivers/mtd/spi-nor/spi-nor.c | 10 ++++++---- + 2 files changed, 14 insertions(+), 4 deletions(-) +Merging crypto/master (1036633e10f8 crypto: ecrdsa - select ASN1 and OID_REGISTRY for EC-RDSA) +$ git merge crypto/master +Auto-merging security/keys/trusted.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ecryptfs/keystore.c +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/crypto/keyinfo.c +Auto-merging fs/cifs/misc.c +Auto-merging drivers/md/dm-integrity.c +Removing drivers/crypto/mxc-scc.c +Auto-merging drivers/crypto/ixp4xx_crypto.c +Auto-merging drivers/block/drbd/drbd_receiver.c +Auto-merging crypto/xts.c +Auto-merging crypto/testmgr.h +Auto-merging crypto/lrw.c +Auto-merging arch/arm64/crypto/sha256-glue.c +Auto-merging arch/arm64/crypto/nhpoly1305-neon-glue.c +Auto-merging arch/arm64/crypto/ghash-ce-glue.c +Auto-merging arch/arm64/crypto/crct10dif-ce-glue.c +Auto-merging arch/arm64/crypto/chacha-neon-glue.c +Auto-merging arch/arm64/crypto/aes-neonbs-glue.c +Auto-merging arch/arm64/crypto/aes-ce-ccm-glue.c +Merge made by the 'recursive' strategy. + Documentation/crypto/api-samples.rst | 1 - + arch/arm/crypto/aes-neonbs-glue.c | 2 + + arch/arm/crypto/chacha-neon-glue.c | 5 +- + arch/arm/crypto/crc32-ce-glue.c | 5 +- + arch/arm/crypto/crct10dif-ce-glue.c | 3 +- + arch/arm/crypto/ghash-ce-glue.c | 10 +- + arch/arm/crypto/nhpoly1305-neon-glue.c | 3 +- + arch/arm/crypto/sha1-ce-glue.c | 5 +- + arch/arm/crypto/sha1_neon_glue.c | 5 +- + arch/arm/crypto/sha2-ce-glue.c | 5 +- + arch/arm/crypto/sha256_neon_glue.c | 5 +- + arch/arm/crypto/sha512-neon-glue.c | 5 +- + arch/arm64/crypto/aes-ce-ccm-glue.c | 7 +- + arch/arm64/crypto/aes-ce-glue.c | 5 +- + arch/arm64/crypto/aes-glue.c | 6 +- + arch/arm64/crypto/aes-neonbs-glue.c | 4 +- + arch/arm64/crypto/chacha-neon-glue.c | 5 +- + arch/arm64/crypto/crct10dif-ce-glue.c | 5 +- + arch/arm64/crypto/ghash-ce-glue.c | 17 +- + arch/arm64/crypto/nhpoly1305-neon-glue.c | 3 +- + arch/arm64/crypto/sha1-ce-glue.c | 7 +- + arch/arm64/crypto/sha2-ce-glue.c | 7 +- + arch/arm64/crypto/sha256-glue.c | 5 +- + arch/arm64/crypto/sha3-ce-glue.c | 5 +- + arch/arm64/crypto/sha512-ce-glue.c | 7 +- + arch/arm64/crypto/sm3-ce-glue.c | 7 +- + arch/arm64/crypto/sm4-ce-glue.c | 5 +- + arch/powerpc/crypto/crc32c-vpmsum_glue.c | 4 +- + arch/powerpc/crypto/crct10dif-vpmsum_glue.c | 4 +- + arch/powerpc/include/asm/Kbuild | 1 + + arch/s390/crypto/des_s390.c | 21 +- + arch/sparc/crypto/des_glue.c | 11 +- + arch/x86/crypto/aegis128-aesni-glue.c | 157 +-- + arch/x86/crypto/aegis128l-aesni-glue.c | 157 +-- + arch/x86/crypto/aegis256-aesni-glue.c | 157 +-- + arch/x86/crypto/aesni-intel_glue.c | 212 +--- + arch/x86/crypto/chacha_glue.c | 6 +- + arch/x86/crypto/crc32-pclmul_glue.c | 5 +- + arch/x86/crypto/crc32c-intel_glue.c | 7 +- + arch/x86/crypto/crct10dif-pclmul_glue.c | 20 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 11 +- + arch/x86/crypto/morus1280-avx2-glue.c | 12 +- + arch/x86/crypto/morus1280-sse2-glue.c | 12 +- + arch/x86/crypto/morus1280_glue.c | 85 -- + arch/x86/crypto/morus640-sse2-glue.c | 12 +- + arch/x86/crypto/morus640_glue.c | 85 -- + arch/x86/crypto/nhpoly1305-avx2-glue.c | 5 +- + arch/x86/crypto/nhpoly1305-sse2-glue.c | 5 +- + arch/x86/crypto/poly1305_glue.c | 4 +- + arch/x86/crypto/sha1_ssse3_glue.c | 7 +- + arch/x86/crypto/sha256_ssse3_glue.c | 7 +- + arch/x86/crypto/sha512_ssse3_glue.c | 10 +- + arch/x86/power/hibernate.c | 1 - + crypto/842.c | 2 +- + crypto/Kconfig | 85 +- + crypto/Makefile | 10 +- + crypto/adiantum.c | 3 +- + crypto/aegis128.c | 2 +- + crypto/aegis128l.c | 2 +- + crypto/aegis256.c | 2 +- + crypto/aes_generic.c | 10 +- + crypto/akcipher.c | 14 + + crypto/algboss.c | 8 +- + crypto/ansi_cprng.c | 2 +- + crypto/anubis.c | 2 +- + crypto/arc4.c | 2 +- + crypto/asymmetric_keys/asym_tpm.c | 43 +- + crypto/asymmetric_keys/pkcs7_verify.c | 1 - + crypto/asymmetric_keys/public_key.c | 105 +- + crypto/asymmetric_keys/verify_pefile.c | 1 - + crypto/asymmetric_keys/x509.asn1 | 2 +- + crypto/asymmetric_keys/x509_cert_parser.c | 57 +- + crypto/asymmetric_keys/x509_public_key.c | 1 - + crypto/authenc.c | 2 +- + crypto/authencesn.c | 2 +- + crypto/blowfish_generic.c | 2 +- + crypto/camellia_generic.c | 2 +- + crypto/cast5_generic.c | 2 +- + crypto/cast6_generic.c | 2 +- + crypto/cbc.c | 2 +- + crypto/ccm.c | 46 +- + crypto/cfb.c | 2 +- + crypto/chacha20poly1305.c | 6 +- + crypto/chacha_generic.c | 12 +- + crypto/cmac.c | 2 +- + crypto/crc32_generic.c | 2 +- + crypto/crc32c_generic.c | 2 +- + crypto/crct10dif_generic.c | 13 +- + crypto/cryptd.c | 252 ---- + crypto/crypto_null.c | 2 +- + crypto/ctr.c | 2 +- + crypto/cts.c | 20 +- + crypto/deflate.c | 2 +- + crypto/des_generic.c | 13 +- + crypto/dh.c | 2 +- + crypto/drbg.c | 3 +- + crypto/ecb.c | 2 +- + crypto/ecc.c | 417 ++++++- + crypto/ecc.h | 153 ++- + crypto/ecc_curve_defs.h | 15 - + crypto/ecdh.c | 2 +- + crypto/echainiv.c | 2 +- + crypto/ecrdsa.c | 296 +++++ + crypto/ecrdsa_defs.h | 225 ++++ + crypto/ecrdsa_params.asn1 | 4 + + crypto/ecrdsa_pub_key.asn1 | 1 + + crypto/fcrypt.c | 2 +- + crypto/fips.c | 2 +- + crypto/gcm.c | 36 +- + crypto/ghash-generic.c | 2 +- + crypto/hmac.c | 13 +- + crypto/jitterentropy-kcapi.c | 2 +- + crypto/keywrap.c | 2 +- + crypto/khazad.c | 2 +- + crypto/lrw.c | 6 +- + crypto/lz4.c | 2 +- + crypto/lz4hc.c | 2 +- + crypto/lzo-rle.c | 2 +- + crypto/lzo.c | 2 +- + crypto/md4.c | 2 +- + crypto/md5.c | 2 +- + crypto/michael_mic.c | 2 +- + crypto/morus1280.c | 2 +- + crypto/morus640.c | 2 +- + crypto/nhpoly1305.c | 2 +- + crypto/ofb.c | 2 +- + crypto/pcbc.c | 2 +- + crypto/pcrypt.c | 2 +- + crypto/poly1305_generic.c | 2 +- + crypto/rmd128.c | 2 +- + crypto/rmd160.c | 2 +- + crypto/rmd256.c | 2 +- + crypto/rmd320.c | 2 +- + crypto/rsa-pkcs1pad.c | 33 +- + crypto/rsa.c | 111 +- + crypto/salsa20_generic.c | 13 +- + crypto/scompress.c | 129 +- + crypto/seed.c | 2 +- + crypto/seqiv.c | 2 +- + crypto/serpent_generic.c | 2 +- + crypto/sha1_generic.c | 2 +- + crypto/sha256_generic.c | 2 +- + crypto/sha3_generic.c | 2 +- + crypto/sha512_generic.c | 2 +- + crypto/shash.c | 7 +- + crypto/simd.c | 273 ++++- + crypto/skcipher.c | 9 +- + crypto/sm3_generic.c | 2 +- + crypto/sm4_generic.c | 2 +- + crypto/streebog_generic.c | 27 +- + crypto/tcrypt.c | 2 +- + crypto/tea.c | 2 +- + crypto/testmgr.c | 1242 +++++++++++++++++--- + crypto/testmgr.h | 181 ++- + crypto/tgr192.c | 2 +- + crypto/twofish_generic.c | 2 +- + crypto/vmac.c | 2 +- + crypto/wp512.c | 2 +- + crypto/xcbc.c | 2 +- + crypto/xts.c | 2 +- + crypto/zstd.c | 2 +- + drivers/block/drbd/drbd_receiver.c | 1 - + drivers/block/drbd/drbd_worker.c | 2 - + drivers/char/hw_random/omap-rng.c | 1 + + drivers/char/hw_random/stm32-rng.c | 9 + + drivers/crypto/Kconfig | 9 - + drivers/crypto/Makefile | 1 - + drivers/crypto/atmel-tdes.c | 103 +- + drivers/crypto/axis/artpec6_crypto.c | 2 - + drivers/crypto/bcm/cipher.c | 22 +- + drivers/crypto/bcm/spu.c | 3 - + drivers/crypto/bcm/util.c | 1 - + drivers/crypto/caam/caamalg.c | 75 +- + drivers/crypto/caam/caamalg_qi.c | 66 +- + drivers/crypto/caam/caamalg_qi2.c | 66 +- + drivers/crypto/caam/caampkc.c | 2 - + drivers/crypto/caam/ctrl.c | 20 + + drivers/crypto/caam/error.c | 2 +- + drivers/crypto/caam/intern.h | 4 +- + drivers/crypto/caam/jr.c | 33 +- + drivers/crypto/caam/qi.c | 4 +- + drivers/crypto/caam/regs.h | 11 + + drivers/crypto/cavium/cpt/cptvf_algs.c | 30 +- + drivers/crypto/cavium/cpt/cptvf_main.c | 2 +- + drivers/crypto/cavium/cpt/cptvf_mbox.c | 17 - + drivers/crypto/cavium/cpt/cptvf_reqmanager.c | 6 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 337 ++++-- + drivers/crypto/cavium/nitrox/nitrox_hal.c | 65 +- + drivers/crypto/cavium/nitrox/nitrox_req.h | 46 +- + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 8 +- + drivers/crypto/cavium/zip/zip_crypto.c | 8 +- + drivers/crypto/ccp/ccp-crypto-des3.c | 21 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 8 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 2 - + drivers/crypto/ccp/psp-dev.c | 69 +- + drivers/crypto/ccree/Makefile | 1 + + drivers/crypto/ccree/cc_aead.c | 118 +- + drivers/crypto/ccree/cc_aead.h | 3 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 341 ++---- + drivers/crypto/ccree/cc_buffer_mgr.h | 2 +- + drivers/crypto/ccree/cc_cipher.c | 593 ++++++---- + drivers/crypto/ccree/cc_cipher.h | 3 +- + drivers/crypto/ccree/cc_crypto_ctx.h | 10 +- + drivers/crypto/ccree/cc_debugfs.c | 44 +- + drivers/crypto/ccree/cc_debugfs.h | 2 +- + drivers/crypto/ccree/cc_driver.c | 120 +- + drivers/crypto/ccree/cc_driver.h | 36 +- + drivers/crypto/ccree/cc_fips.c | 29 +- + drivers/crypto/ccree/cc_fips.h | 4 +- + drivers/crypto/ccree/cc_hash.c | 64 +- + drivers/crypto/ccree/cc_hash.h | 2 +- + drivers/crypto/ccree/cc_host_regs.h | 123 +- + drivers/crypto/ccree/cc_hw_queue_defs.h | 35 +- + drivers/crypto/ccree/cc_ivgen.c | 11 +- + drivers/crypto/ccree/cc_ivgen.h | 2 +- + drivers/crypto/ccree/cc_kernel_regs.h | 2 +- + drivers/crypto/ccree/cc_lli_defs.h | 4 +- + drivers/crypto/ccree/cc_pm.c | 11 +- + drivers/crypto/ccree/cc_pm.h | 2 +- + drivers/crypto/ccree/cc_request_mgr.c | 116 +- + drivers/crypto/ccree/cc_request_mgr.h | 2 +- + drivers/crypto/ccree/cc_sram_mgr.c | 7 +- + drivers/crypto/ccree/cc_sram_mgr.h | 2 +- + drivers/crypto/chelsio/chcr_algo.c | 2 - + drivers/crypto/hifn_795x.c | 31 +- + drivers/crypto/hisilicon/sec/sec_algs.c | 12 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 11 +- + drivers/crypto/ixp4xx_crypto.c | 64 +- + drivers/crypto/marvell/cipher.c | 11 +- + drivers/crypto/marvell/hash.c | 3 +- + drivers/crypto/mediatek/mtk-sha.c | 3 - + drivers/crypto/mxc-scc.c | 767 ------------ + drivers/crypto/mxs-dcp.c | 14 +- + drivers/crypto/n2_core.c | 15 +- + drivers/crypto/nx/nx-842-pseries.c | 6 +- + drivers/crypto/nx/nx-842.c | 3 +- + drivers/crypto/nx/nx-aes-xcbc.c | 12 +- + drivers/crypto/nx/nx-sha256.c | 6 +- + drivers/crypto/nx/nx-sha512.c | 6 +- + drivers/crypto/omap-des.c | 29 +- + drivers/crypto/omap-sham.c | 2 - + drivers/crypto/padlock-sha.c | 5 - + drivers/crypto/picoxcell_crypto.c | 33 +- + drivers/crypto/qat/qat_common/qat_algs.c | 1 - + drivers/crypto/qat/qat_common/qat_asym_algs.c | 2 - + drivers/crypto/qce/ablkcipher.c | 22 +- + drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c | 61 +- + drivers/crypto/s5p-sss.c | 1 - + drivers/crypto/sahara.c | 6 +- + drivers/crypto/stm32/stm32-cryp.c | 15 +- + drivers/crypto/stm32/stm32-hash.c | 4 +- + drivers/crypto/sunxi-ss/sun4i-ss-cipher.c | 78 +- + drivers/crypto/sunxi-ss/sun4i-ss-core.c | 19 +- + drivers/crypto/sunxi-ss/sun4i-ss-hash.c | 5 +- + drivers/crypto/sunxi-ss/sun4i-ss.h | 2 + + drivers/crypto/talitos.c | 108 +- + drivers/crypto/ux500/cryp/Makefile | 6 +- + drivers/crypto/ux500/cryp/cryp_core.c | 86 +- + drivers/crypto/vmx/aes.c | 14 +- + drivers/crypto/vmx/aes_cbc.c | 14 +- + drivers/crypto/vmx/aes_ctr.c | 10 +- + drivers/crypto/vmx/aes_xts.c | 14 +- + drivers/crypto/vmx/aesp8-ppc.pl | 4 +- + drivers/crypto/vmx/ghash.c | 10 +- + drivers/crypto/vmx/vmx.c | 4 +- + drivers/infiniband/sw/rxe/rxe.h | 1 - + drivers/md/dm-crypt.c | 3 - + drivers/md/dm-integrity.c | 2 - + drivers/net/ppp/ppp_mppe.c | 1 - + drivers/net/wireless/intersil/orinoco/mic.c | 1 - + drivers/nfc/s3fwrn5/firmware.c | 1 - + drivers/staging/ks7010/ks_hostif.c | 1 - + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 1 - + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 1 - + drivers/target/iscsi/iscsi_target_auth.c | 1 - + drivers/thunderbolt/domain.c | 1 - + fs/cifs/misc.c | 1 - + fs/crypto/keyinfo.c | 1 - + fs/ecryptfs/crypto.c | 1 - + fs/ecryptfs/keystore.c | 1 - + fs/ext4/ext4.h | 1 - + fs/f2fs/f2fs.h | 1 - + fs/nfsd/nfs4recover.c | 1 - + fs/ubifs/auth.c | 6 - + fs/ubifs/replay.c | 2 - + include/crypto/aes.h | 8 +- + include/crypto/akcipher.h | 54 +- + include/crypto/cryptd.h | 18 +- + include/crypto/des.h | 43 + + include/crypto/hash.h | 10 +- + include/crypto/internal/simd.h | 44 + + include/crypto/morus1280_glue.h | 79 +- + include/crypto/morus640_glue.h | 79 +- + include/crypto/public_key.h | 4 + + include/crypto/streebog.h | 5 +- + include/linux/jbd2.h | 1 - + include/linux/oid_registry.h | 18 + + include/linux/psp-sev.h | 3 +- + include/uapi/linux/psp-sev.h | 18 +- + kernel/kexec_file.c | 1 - + lib/crc-t10dif.c | 1 - + lib/digsig.c | 1 - + lib/libcrc32c.c | 1 - + net/bluetooth/amp.c | 1 - + net/bluetooth/smp.c | 1 - + net/sctp/auth.c | 1 - + net/sctp/sm_make_chunk.c | 2 - + net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 - + net/sunrpc/auth_gss/gss_krb5_mech.c | 1 - + net/wireless/lib80211_crypt_tkip.c | 1 - + security/apparmor/crypto.c | 2 - + security/integrity/digsig_asymmetric.c | 11 +- + security/integrity/evm/evm_crypto.c | 1 - + security/integrity/ima/ima_crypto.c | 4 - + security/keys/dh.c | 1 - + security/keys/encrypted-keys/encrypted.c | 1 - + security/keys/trusted.c | 1 - + 317 files changed, 5821 insertions(+), 4089 deletions(-) + create mode 100644 crypto/ecrdsa.c + create mode 100644 crypto/ecrdsa_defs.h + create mode 100644 crypto/ecrdsa_params.asn1 + create mode 100644 crypto/ecrdsa_pub_key.asn1 + delete mode 100644 drivers/crypto/mxc-scc.c +Merging drm/drm-next (7c13e5cc2391 Merge tag 'drm-intel-next-fixes-2019-04-25' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge drm/drm-next +Auto-merging include/drm/ttm/ttm_bo_driver.h +Removing include/drm/tinydrm/tinydrm.h +Removing drivers/staging/vboxvideo/TODO +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_prime.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.h +Auto-merging drivers/gpu/drm/virtio/virtgpu_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/virtio/virtgpu_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_crtc.c +Auto-merging drivers/gpu/drm/ttm/ttm_memory.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo.c +Removing drivers/gpu/drm/tinydrm/core/tinydrm-core.c +Removing drivers/gpu/drm/omapdrm/displays/panel-dpi.c +Removing drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c +Removing drivers/gpu/drm/omapdrm/displays/connector-dvi.c +Removing drivers/gpu/drm/meson/meson_canvas.h +Removing drivers/gpu/drm/meson/meson_canvas.c +Auto-merging drivers/gpu/drm/imx/ipuv3-crtc.c +Auto-merging drivers/gpu/drm/i915/intel_hdmi.c +Auto-merging drivers/gpu/drm/i915/intel_fbdev.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/intel_dp.c +Auto-merging drivers/gpu/drm/i915/intel_ddi.c +Removing drivers/gpu/drm/cirrus/cirrus_mode.c +Removing drivers/gpu/drm/cirrus/cirrus_main.c +Removing drivers/gpu/drm/cirrus/cirrus_fbdev.c +Removing drivers/gpu/drm/cirrus/cirrus_drv.c +Removing drivers/gpu/drm/amd/lib/chash.c +Removing drivers/gpu/drm/amd/lib/Makefile +Removing drivers/gpu/drm/amd/lib/Kconfig +Removing drivers/gpu/drm/amd/include/linux/chash.h +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_aux.h +Auto-merging drivers/gpu/drm/amd/display/dc/dce/dce_aux.c +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 MAINTAINERS +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +Resolved 'drivers/gpu/drm/i915/intel_fbdev.c' using previous resolution. +Resolved 'drivers/gpu/drm/virtio/virtgpu_drv.c' using previous resolution. +Resolved 'drivers/gpu/drm/virtio/virtgpu_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master f9d8d7cb5a91] Merge remote-tracking branch 'drm/drm-next' +$ git diff -M --stat --summary HEAD^.. + .../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/gpu/arm,mali-bifrost.txt | 92 + + .../devicetree/bindings/gpu/aspeed-gfx.txt | 41 + + .../devicetree/bindings/gpu/brcm,bcm-v3d.txt | 11 +- + .../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 +- + MAINTAINERS | 47 +- + arch/x86/kernel/early-quirks.c | 4 +- + 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/gpu/drm/Kconfig | 20 +- + drivers/gpu/drm/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 1 + + 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 | 49 +- + 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.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 | 49 + + 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/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 | 232 +- + 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 | 21 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 108 + + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 80 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 + + 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 | 1568 ++++++++----- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 15 +- + .../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 | 139 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 366 +-- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 195 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 98 + + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 13 + + drivers/gpu/drm/amd/display/dc/dc.h | 133 +- + 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 | 8 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 18 + + 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 | 7 +- + 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 | 38 +- + .../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 | 5 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 12 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 202 +- + .../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 | 8 +- + 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 | 29 +- + 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 | 4 + + 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 | 168 +- + .../drm/amd/display/modules/power/power_helpers.c | 15 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../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 | 97 +- + 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 | 13 +- + 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 | 40 +- + 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/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 | 1972 ++++++++++++++++ + .../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 ++ + drivers/gpu/drm/arm/display/include/malidp_utils.h | 31 + + drivers/gpu/drm/arm/display/komeda/Makefile | 3 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 684 ++++++ + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 377 ++- + 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 | 18 + + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 66 + + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 51 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 38 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 5 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 111 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 48 +- + 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_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 | 91 +- + 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 | 86 +- + 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_shmem_helper.c | 625 +++++ + drivers/gpu/drm/drm_internal.h | 10 + + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 83 +- + 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 | 1 - + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 - + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 16 +- + 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/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/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 | 180 +- + 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 | 3 +- + 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 | 62 +- + 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/Kconfig | 13 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 7 +- + 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/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 | 218 ++ + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 14 + + drivers/gpu/drm/panfrost/panfrost_device.c | 252 ++ + drivers/gpu/drm/panfrost/panfrost_device.h | 124 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 463 ++++ + 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 | 362 +++ + drivers/gpu/drm/panfrost/panfrost_gpu.h | 19 + + drivers/gpu/drm/panfrost/panfrost_issues.h | 176 ++ + drivers/gpu/drm/panfrost/panfrost_job.c | 560 +++++ + 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 | 2 + + 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 | 4 - + drivers/gpu/drm/virtio/virtgpu_drv.h | 48 +- + 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 | 22 +- + 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/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/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/vboxvideo/TODO | 10 - + 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 | 9 +- + 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/dma-fence-chain.h | 81 + + include/linux/dma-fence.h | 21 +- + include/linux/io-pgtable.h | 7 + + include/linux/reservation.h | 3 +- + include/media/vsp1.h | 19 +- + include/sound/hdaudio.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 43 + + include/uapi/drm/drm.h | 36 + + 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 +- + sound/hda/hdac_component.c | 18 +- + 971 files changed, 60961 insertions(+), 23446 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 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/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%) + 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/uapi/drm/lima_drm.h + create mode 100644 include/uapi/drm/panfrost_drm.h +$ git am -3 ../patches/0001-drm-virtio-fix-up-bad-merge-of-virtgpu_gem_prime_get.patch +Applying: drm/virtio: fix up bad merge of virtgpu_gem_prime_get_sg_table +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/virtio/virtgpu_prime.c +$ git add -A . +$ git commit -v -a --amend +[master b2c75cfb3c58] Merge remote-tracking branch 'drm/drm-next' + Date: Wed May 1 13:06:32 2019 +1000 +Merging amdgpu/drm-next (9cf211b86430 drm/amdkfd: Adjust weight to represent num_hops info when report xgmi iolink) +$ git merge amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc_link.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 59 ++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 16 ++ + 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 | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dpm.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 170 +++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 3 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 2 +- + 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/sdma_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 20 +- + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 302 ++++++++++++++++----- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 71 +++-- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 77 ++---- + drivers/gpu/drm/amd/display/dc/core/dc_link_hwss.c | 21 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 23 +- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 18 -- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 35 ++- + .../gpu/drm/amd/display/dc/dcn10/dcn10_clk_mgr.c | 27 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 49 ++-- + .../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 | 4 + + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 13 +- + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 23 -- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 1 - + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 6 +- + .../drm/amd/include/asic_reg/dcn/dcn_1_0_offset.h | 8 + + drivers/gpu/drm/amd/include/atomfirmware.h | 1 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 17 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 10 + + drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 30 ++ + .../gpu/drm/amd/powerplay/hwmgr/hardwaremanager.c | 18 +- + drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 114 ++++++-- + drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 28 +- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 99 +++++-- + drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.h | 3 + + drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 50 +++- + 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/rv_ppsmc.h | 1 - + drivers/gpu/drm/amd/powerplay/inc/smu10.h | 14 +- + drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 32 ++- + .../gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c | 21 ++ + include/uapi/linux/kfd_ioctl.h | 8 + + 68 files changed, 1273 insertions(+), 561 deletions(-) +Merging drm-intel/for-linux-next (9628e15ca9d5 drm/i915/icl: Whitelist GEN9_SLICE_COMMON_ECO_CHICKEN1) +$ git merge drm-intel/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/i915/intel_color.c | 6 +++--- + drivers/gpu/drm/i915/intel_workarounds.c | 7 +++---- + 2 files changed, 6 insertions(+), 7 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 (761e473f6b23 drm/gem: Fix sphinx warnings) +$ git merge drm-misc/for-linux-next +Merge made by the 'recursive' strategy. + drivers/gpu/drm/drm_gem.c | 10 +++++----- + include/drm/drm_vma_manager.h | 2 +- + 2 files changed, 6 insertions(+), 6 deletions(-) +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 (ed94cfab195f drm/komeda: Use memset to initialize config_id) +$ git merge mali-dp/for-upstream/mali-dp +Merge made by the 'recursive' strategy. + .../gpu/drm/arm/display/include/malidp_product.h | 12 + + drivers/gpu/drm/arm/display/komeda/Makefile | 1 + + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 9 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 54 ++ + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 395 ++++++++++++- + drivers/gpu/drm/arm/display/komeda/komeda_dev.c | 52 ++ + drivers/gpu/drm/arm/display/komeda/komeda_dev.h | 44 +- + 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 | 39 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 21 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 2 +- + .../gpu/drm/arm/display/komeda/komeda_pipeline.h | 81 ++- + .../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/drm_atomic.c | 45 +- + include/drm/drm_atomic.h | 6 + + 18 files changed, 1700 insertions(+), 48 deletions(-) + create mode 100644 drivers/gpu/drm/arm/display/komeda/komeda_pipeline_state.c +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 (fd2450a77d33 drm/etnaviv: clean up etnaviv_gem_new_handle) +$ git merge etnaviv/etnaviv/next +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_gem.c +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.h +Auto-merging drivers/gpu/drm/etnaviv/etnaviv_drv.c +Merge made by the 'recursive' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.c | 5 +++++ + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 24 +++++++++--------------- + 3 files changed, 15 insertions(+), 15 deletions(-) +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 +Merge made by the 'recursive' strategy. + drivers/base/regmap/internal.h | 5 +--- + drivers/base/regmap/regcache-flat.c | 18 +++++-------- + drivers/base/regmap/regcache-lzo.c | 18 +++++-------- + drivers/base/regmap/regcache-rbtree.c | 18 +++++-------- + drivers/base/regmap/regcache.c | 18 +++++-------- + drivers/base/regmap/regmap-ac97.c | 22 ++++------------ + drivers/base/regmap/regmap-debugfs.c | 48 ++++++++++++++++++++++------------- + drivers/base/regmap/regmap-i2c.c | 18 +++++-------- + drivers/base/regmap/regmap-irq.c | 18 +++++-------- + drivers/base/regmap/regmap-mmio.c | 22 ++++------------ + drivers/base/regmap/regmap-spi.c | 18 +++++-------- + drivers/base/regmap/regmap-spmi.c | 29 ++++++++------------- + drivers/base/regmap/regmap-w1.c | 16 +++++------- + drivers/base/regmap/regmap.c | 27 ++++++++------------ + 14 files changed, 118 insertions(+), 177 deletions(-) +Merging sound/for-next (f495222e2827 ALSA: hda - Register irq handler after the chip initialization) +$ git merge sound/for-next +Auto-merging sound/usb/quirks-table.h +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/core/init.c +Auto-merging include/sound/hdaudio.h +Merge made by the 'recursive' strategy. + .../sound/kernel-api/writing-an-alsa-driver.rst | 4 +- + include/sound/core.h | 16 +- + include/sound/hdaudio.h | 7 +- + include/sound/memalloc.h | 4 - + include/sound/seq_kernel.h | 3 +- + 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/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 | 6 +- + sound/pci/hda/patch_realtek.c | 3 +- + sound/ppc/snd_ps3.c | 4 - + sound/soc/codecs/hdac_hda.c | 6 + + sound/synth/emux/emux_hwdep.c | 5 + + 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 +- + 43 files changed, 504 insertions(+), 343 deletions(-) +Merging sound-asoc/for-next (7e0f9ae5e356 Merge branch 'asoc-5.2' into asoc-next) +$ git merge sound-asoc/for-next +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 020070431cbd] Merge remote-tracking branch 'sound-asoc/for-next' +$ git diff -M --stat --summary HEAD^.. + .../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 | 54 + + .../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 | 7 +- + .../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 + + MAINTAINERS | 2 + + include/sound/da7219.h | 8 +- + 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/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 + + sound/soc/Kconfig | 1 + + sound/soc/Makefile | 1 + + sound/soc/adi/axi-i2s.c | 68 +- + sound/soc/amd/acp-da7219-max98357a.c | 4 +- + sound/soc/atmel/Kconfig | 14 + + sound/soc/atmel/Makefile | 2 + + sound/soc/atmel/mchp-i2s-mcc.c | 974 ++++++ + 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/cs47l24.c | 4 +- + sound/soc/codecs/da7219.c | 523 +++- + sound/soc/codecs/da7219.h | 6 +- + sound/soc/codecs/es8316.c | 14 + + sound/soc/codecs/lochnagar-sc.c | 266 ++ + sound/soc/codecs/max98357a.c | 3 + + sound/soc/codecs/nau8810.c | 25 +- + sound/soc/codecs/rt5651.c | 47 +- + sound/soc/codecs/rt5651.h | 1 + + sound/soc/codecs/rt5677-spi.c | 8 + + 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 | 445 +-- + 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 | 1030 +++++-- + sound/soc/codecs/wm_adsp.h | 50 +- + sound/soc/codecs/wmfw.h | 30 + + sound/soc/fsl/Kconfig | 16 + + sound/soc/fsl/Makefile | 5 + + sound/soc/fsl/eukrea-tlv320.c | 30 +- + sound/soc/fsl/fsl_audmix.c | 576 ++++ + 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 | 21 +- + sound/soc/fsl/fsl_sai.c | 26 +- + sound/soc/fsl/fsl_utils.c | 1 + + sound/soc/fsl/imx-audmix.c | 327 ++ + 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 | 22 +- + 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_max98927.c | 52 +- + sound/soc/intel/haswell/sst-haswell-ipc.c | 8 +- + sound/soc/jz4740/Kconfig | 2 +- + sound/soc/mediatek/Kconfig | 26 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 51 +- + 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 | 20 - + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 471 +++ + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 381 +++ + 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/soc-core.c | 18 +- + sound/soc/soc-dapm.c | 2 +- + sound/soc/soc-pcm.c | 4 + + sound/soc/soc-topology.c | 330 +- + sound/soc/sof/Kconfig | 141 + + sound/soc/sof/Makefile | 18 + + sound/soc/sof/control.c | 552 ++++ + sound/soc/sof/core.c | 506 ++++ + sound/soc/sof/debug.c | 232 ++ + sound/soc/sof/intel/Kconfig | 230 ++ + sound/soc/sof/intel/Makefile | 19 + + sound/soc/sof/intel/apl.c | 109 + + sound/soc/sof/intel/bdw.c | 713 +++++ + sound/soc/sof/intel/byt.c | 874 ++++++ + sound/soc/sof/intel/cnl.c | 249 ++ + sound/soc/sof/intel/hda-bus.c | 108 + + sound/soc/sof/intel/hda-codec.c | 171 ++ + sound/soc/sof/intel/hda-ctrl.c | 181 ++ + sound/soc/sof/intel/hda-dai.c | 351 +++ + sound/soc/sof/intel/hda-dsp.c | 455 +++ + sound/soc/sof/intel/hda-ipc.c | 458 +++ + sound/soc/sof/intel/hda-loader.c | 371 +++ + sound/soc/sof/intel/hda-pcm.c | 240 ++ + sound/soc/sof/intel/hda-stream.c | 692 +++++ + sound/soc/sof/intel/hda-trace.c | 94 + + sound/soc/sof/intel/hda.c | 671 +++++ + sound/soc/sof/intel/hda.h | 560 ++++ + sound/soc/sof/intel/intel-ipc.c | 92 + + sound/soc/sof/intel/shim.h | 183 ++ + sound/soc/sof/ipc.c | 832 +++++ + sound/soc/sof/loader.c | 400 +++ + sound/soc/sof/nocodec.c | 109 + + sound/soc/sof/ops.c | 163 + + sound/soc/sof/ops.h | 399 +++ + sound/soc/sof/pcm.c | 719 +++++ + sound/soc/sof/pm.c | 385 +++ + sound/soc/sof/sof-acpi-dev.c | 312 ++ + sound/soc/sof/sof-pci-dev.c | 373 +++ + sound/soc/sof/sof-priv.h | 632 ++++ + sound/soc/sof/topology.c | 3164 ++++++++++++++++++++ + 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 | 2 +- + sound/soc/sprd/sprd-pcm-dma.h | 43 + + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_i2s.c | 25 +- + 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 | 42 +- + 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 +- + 245 files changed, 28198 insertions(+), 2623 deletions(-) + 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 + 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/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 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/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 +Merging modules/modules-next (7e470ea99bcd kernel/module: Reschedule while waiting for modules to finish loading) +$ git merge modules/modules-next +Merge made by the 'recursive' strategy. + include/asm-generic/vmlinux.lds.h | 1 - + include/linux/module.h | 18 ++++++++++++++++++ + kernel/module-internal.h | 2 +- + kernel/module.c | 25 ++++++++++++++++--------- + 4 files changed, 35 insertions(+), 11 deletions(-) +Merging input/next (7b5bb55d0dad Input: add support for Azoteq IQS550/572/525) +$ 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/hid/hid-input.c +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Recorded preimage for 'Documentation/devicetree/bindings/vendor-prefixes.txt' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'Documentation/devicetree/bindings/vendor-prefixes.txt'. +[master d52058812aab] 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/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/atkbd.c | 2 + + 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/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 + + 25 files changed, 1608 insertions(+), 74 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/gpio-vibrator.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/iqs5xx.txt + create mode 100644 drivers/input/misc/gpio-vibra.c + create mode 100644 drivers/input/touchscreen/iqs5xx.c +Merging block/for-next (e62243e75d22 Merge branch 'for-5.2/block' into for-next) +$ git merge block/for-next +Auto-merging lib/Kconfig.debug +Auto-merging fs/xfs/xfs_super.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/resize.c +Auto-merging fs/ext4/readpage.c +Auto-merging fs/crypto/bio.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/compression.c +Auto-merging fs/block_dev.c +Auto-merging drivers/md/dm-integrity.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/block/floppy.c +Auto-merging drivers/block/drbd/drbd_int.h +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/arm/configs/u300_defconfig +Auto-merging arch/arm/configs/omap1_defconfig +Auto-merging arch/arm/configs/multi_v4t_defconfig +Auto-merging arch/arm/configs/clps711x_defconfig +Auto-merging arch/arm/configs/at91_dt_defconfig +Merge made by the 'recursive' strategy. + Documentation/block/bfq-iosched.txt | 29 +- + Documentation/block/null_blk.txt | 4 + + Documentation/process/submit-checklist.rst | 27 +- + Documentation/translations/ja_JP/SubmitChecklist | 22 +- + arch/arc/configs/haps_hs_defconfig | 1 - + arch/arc/configs/haps_hs_smp_defconfig | 1 - + arch/arc/configs/nsim_700_defconfig | 1 - + arch/arc/configs/nsim_hs_defconfig | 1 - + arch/arc/configs/nsim_hs_smp_defconfig | 1 - + arch/arc/configs/nsimosci_defconfig | 1 - + arch/arc/configs/nsimosci_hs_defconfig | 1 - + arch/arc/configs/nsimosci_hs_smp_defconfig | 1 - + arch/arm/configs/aspeed_g4_defconfig | 1 - + arch/arm/configs/aspeed_g5_defconfig | 1 - + arch/arm/configs/at91_dt_defconfig | 1 - + arch/arm/configs/clps711x_defconfig | 1 - + arch/arm/configs/efm32_defconfig | 1 - + arch/arm/configs/ezx_defconfig | 1 - + arch/arm/configs/h3600_defconfig | 1 - + arch/arm/configs/imote2_defconfig | 1 - + arch/arm/configs/moxart_defconfig | 1 - + arch/arm/configs/multi_v4t_defconfig | 1 - + arch/arm/configs/omap1_defconfig | 1 - + arch/arm/configs/stm32_defconfig | 1 - + arch/arm/configs/u300_defconfig | 1 - + arch/arm/configs/vexpress_defconfig | 1 - + arch/m68k/configs/amcore_defconfig | 1 - + arch/m68k/configs/m5475evb_defconfig | 1 - + arch/m68k/configs/stmark2_defconfig | 1 - + arch/mips/configs/ar7_defconfig | 1 - + arch/mips/configs/decstation_defconfig | 1 - + arch/mips/configs/decstation_r4k_defconfig | 1 - + arch/mips/configs/loongson1b_defconfig | 1 - + arch/mips/configs/loongson1c_defconfig | 1 - + arch/mips/configs/rb532_defconfig | 1 - + arch/mips/configs/rbtx49xx_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + arch/sh/configs/apsh4ad0a_defconfig | 1 - + arch/sh/configs/ecovec24-romimage_defconfig | 1 - + arch/sh/configs/rsk7264_defconfig | 1 - + arch/sh/configs/rsk7269_defconfig | 1 - + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 - + block/Kconfig | 24 - + block/badblocks.c | 10 +- + block/bfq-cgroup.c | 16 +- + block/bfq-iosched.c | 811 +++++++++++++++++---- + block/bfq-iosched.h | 107 +-- + block/bfq-wf2q.c | 23 +- + block/bio-integrity.c | 16 +- + block/bio.c | 286 ++++---- + block/blk-cgroup.c | 1 + + block/blk-core.c | 1 + + block/blk-exec.c | 1 + + block/blk-flush.c | 3 +- + block/blk-integrity.c | 16 +- + block/blk-iolatency.c | 1 + + block/blk-merge.c | 147 ++-- + block/blk-mq-cpumap.c | 1 + + block/blk-mq-debugfs.c | 13 +- + block/blk-mq-pci.c | 10 +- + block/blk-mq-rdma.c | 10 +- + block/blk-mq-sched.c | 1 + + block/blk-mq-sysfs.c | 1 + + block/blk-mq-tag.c | 1 + + block/blk-mq-virtio.c | 10 +- + block/blk-mq.c | 1 + + block/blk-rq-qos.c | 2 + + block/blk-rq-qos.h | 1 + + block/blk-settings.c | 17 +- + block/blk-stat.c | 1 + + block/blk-sysfs.c | 30 +- + block/blk-timeout.c | 1 + + block/blk-wbt.c | 1 + + block/blk-zoned.c | 1 + + block/blk.h | 2 +- + block/bounce.c | 3 +- + block/bsg-lib.c | 16 +- + block/bsg.c | 9 +- + block/elevator.c | 7 +- + block/genhd.c | 68 +- + block/ioctl.c | 1 + + block/ioprio.c | 1 + + block/kyber-iosched.c | 13 +- + block/mq-deadline.c | 1 + + block/opal_proto.h | 12 +- + block/partition-generic.c | 7 + + block/partitions/acorn.c | 7 +- + block/partitions/aix.h | 1 + + block/partitions/amiga.h | 1 + + block/partitions/efi.c | 16 +- + block/partitions/efi.h | 16 +- + block/partitions/ibm.h | 1 + + block/partitions/karma.h | 1 + + block/partitions/ldm.c | 16 +- + block/partitions/ldm.h | 16 +- + block/partitions/msdos.h | 1 + + block/partitions/osf.h | 1 + + block/partitions/sgi.h | 1 + + block/partitions/sun.h | 1 + + block/partitions/sysv68.h | 1 + + block/partitions/ultrix.h | 1 + + block/scsi_ioctl.c | 16 +- + block/sed-opal.c | 726 ++++++++---------- + block/t10-pi.c | 19 +- + drivers/block/amiflop.c | 1 + + drivers/block/ataflop.c | 1 + + drivers/block/brd.c | 7 +- + drivers/block/drbd/drbd_int.h | 5 - + drivers/block/floppy.c | 1 + + drivers/block/loop.c | 35 +- + drivers/block/mtip32xx/mtip32xx.c | 89 --- + drivers/block/mtip32xx/mtip32xx.h | 17 - + drivers/block/paride/pcd.c | 1 + + drivers/block/paride/pd.c | 1 + + drivers/block/paride/pf.c | 1 + + drivers/block/pktcdvd.c | 1 - + drivers/block/ps3disk.c | 4 +- + drivers/block/swim.c | 1 + + drivers/block/swim3.c | 1 + + drivers/block/virtio_blk.c | 3 +- + drivers/block/xsysace.c | 1 + + drivers/cdrom/gdrom.c | 1 + + drivers/ide/ide-cd.c | 1 + + drivers/ide/ide-cd_ioctl.c | 5 +- + drivers/ide/ide-gd.c | 6 +- + drivers/md/bcache/alloc.c | 5 +- + drivers/md/bcache/btree.c | 12 +- + drivers/md/bcache/journal.c | 42 +- + drivers/md/bcache/request.c | 41 +- + drivers/md/bcache/request.h | 2 +- + drivers/md/bcache/super.c | 84 ++- + drivers/md/bcache/sysfs.c | 2 - + drivers/md/bcache/util.h | 26 +- + drivers/md/dm-crypt.c | 3 +- + drivers/md/dm-exception-store.h | 28 +- + drivers/md/dm-integrity.c | 8 +- + drivers/md/md-bitmap.c | 8 +- + drivers/md/md.c | 199 +++-- + drivers/md/md.h | 25 +- + drivers/md/raid1.c | 6 +- + drivers/md/raid5.c | 16 +- + drivers/nvdimm/pfn_devs.c | 4 +- + drivers/nvme/host/core.c | 13 +- + drivers/nvme/host/pci.c | 263 ++++--- + drivers/nvme/host/rdma.c | 10 +- + drivers/nvme/host/tcp.c | 18 +- + drivers/nvme/target/Kconfig | 1 + + drivers/nvme/target/configfs.c | 4 +- + drivers/nvme/target/core.c | 38 +- + drivers/nvme/target/discovery.c | 4 +- + drivers/nvme/target/fabrics-cmd.c | 16 +- + drivers/nvme/target/fc.c | 9 +- + drivers/nvme/target/io-cmd-bdev.c | 6 +- + drivers/nvme/target/io-cmd-file.c | 7 +- + drivers/nvme/target/loop.c | 22 +- + drivers/nvme/target/nvmet.h | 4 +- + drivers/nvme/target/rdma.c | 21 +- + drivers/nvme/target/tcp.c | 38 +- + drivers/scsi/sd.c | 33 +- + drivers/scsi/sr.c | 1 + + drivers/staging/erofs/data.c | 3 +- + drivers/staging/erofs/unzip_vle.c | 3 +- + drivers/xen/biomerge.c | 5 +- + fs/block_dev.c | 6 +- + fs/btrfs/compression.c | 3 +- + fs/btrfs/disk-io.c | 4 +- + fs/btrfs/extent_io.c | 10 +- + fs/btrfs/inode.c | 8 +- + fs/btrfs/raid56.c | 3 +- + fs/crypto/bio.c | 3 +- + fs/direct-io.c | 3 +- + fs/ext4/page-io.c | 3 +- + fs/ext4/readpage.c | 3 +- + fs/ext4/resize.c | 2 - + fs/ext4/super.c | 32 +- + fs/f2fs/data.c | 9 +- + fs/gfs2/Kconfig | 1 - + fs/gfs2/lops.c | 3 +- + fs/gfs2/meta_io.c | 3 +- + fs/iomap.c | 6 +- + fs/mpage.c | 3 +- + fs/nfs/Kconfig | 1 - + fs/ocfs2/super.c | 10 - + fs/stack.c | 15 +- + fs/xfs/Kconfig | 1 - + fs/xfs/xfs_aops.c | 3 +- + fs/xfs/xfs_super.c | 10 +- + include/linux/bio.h | 20 +- + include/linux/blk-mq-rdma.h | 1 + + include/linux/blk_types.h | 29 +- + include/linux/blkdev.h | 35 +- + include/linux/bsg-lib.h | 16 +- + include/linux/bvec.h | 38 +- + include/linux/genhd.h | 20 +- + include/linux/kernel.h | 14 +- + include/linux/nvme-rdma.h | 2 +- + include/linux/sed-opal.h | 10 +- + include/linux/types.h | 5 - + include/uapi/linux/sed-opal.h | 11 +- + include/xen/xen.h | 4 +- + lib/Kconfig.debug | 1 - + .../formal/srcu-cbmc/include/linux/types.h | 4 - + 202 files changed, 2117 insertions(+), 2118 deletions(-) +Merging device-mapper/for-next (940bc471780b dm mpath: always free attached_handler_name in parse_path()) +$ git merge device-mapper/for-next +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 ++++++++++++ + 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-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 ++ + 22 files changed, 1225 insertions(+), 207 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 (7a8b9daf7ea6 mmc: omap_hsmmc: Use dev_get_drvdata()) +$ git merge mmc/next +Auto-merging drivers/mmc/host/sdhci.c +Removing drivers/mmc/host/mmci_qcom_dml.h +Auto-merging drivers/mmc/host/alcor.c +Auto-merging drivers/memstick/host/tifm_ms.c +Auto-merging drivers/memstick/host/jmb38x_ms.c +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/mmc/mmc.txt | 2 + + .../bindings/mmc/nvidia,tegra20-sdhci.txt | 1 + + MAINTAINERS | 25 +- + drivers/memstick/host/jmb38x_ms.c | 3 - + drivers/memstick/host/tifm_ms.c | 3 - + drivers/mmc/core/host.c | 4 +- + drivers/mmc/core/mmc_ops.c | 16 +- + drivers/mmc/core/pwrseq_emmc.c | 38 ++- + drivers/mmc/host/Kconfig | 44 +-- + drivers/mmc/host/alcor.c | 57 ++-- + drivers/mmc/host/cqhci.c | 2 + + drivers/mmc/host/cqhci.h | 4 + + drivers/mmc/host/meson-gx-mmc.c | 26 +- + drivers/mmc/host/mmc_spi.c | 98 +++--- + drivers/mmc/host/mmci.c | 69 ++-- + drivers/mmc/host/mmci.h | 32 +- + drivers/mmc/host/mmci_qcom_dml.c | 17 +- + drivers/mmc/host/mmci_qcom_dml.h | 30 -- + drivers/mmc/host/mmci_stm32_sdmmc.c | 18 + + drivers/mmc/host/mtk-sd.c | 19 +- + drivers/mmc/host/mxs-mmc.c | 3 +- + drivers/mmc/host/of_mmc_spi.c | 6 +- + drivers/mmc/host/omap_hsmmc.c | 4 +- + drivers/mmc/host/renesas_sdhi.h | 2 +- + drivers/mmc/host/renesas_sdhi_core.c | 12 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 +- + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 6 +- + drivers/mmc/host/sdhci-of-arasan.c | 5 +- + drivers/mmc/host/sdhci-of-esdhc.c | 47 +++ + drivers/mmc/host/sdhci-omap.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 2 + + drivers/mmc/host/sdhci-pci.h | 2 + + drivers/mmc/host/sdhci-tegra.c | 362 ++++++++++++++++++++- + drivers/mmc/host/sdhci.c | 164 ++++++---- + drivers/mmc/host/sdhci.h | 4 +- + drivers/mmc/host/sdhci_am654.c | 22 ++ + drivers/mmc/host/tmio_mmc.h | 6 +- + drivers/mmc/host/tmio_mmc_core.c | 6 +- + include/linux/alcor_pci.h | 2 +- + 39 files changed, 825 insertions(+), 351 deletions(-) + delete mode 100644 drivers/mmc/host/mmci_qcom_dml.h +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 da6374645229] 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 (7f042743306c mfd: cros_ec: Instantiate the CrOS USB PD logger driver) +$ git merge mfd/for-mfd-next +Auto-merging drivers/mfd/Kconfig +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/stm32/stm32-syscon.txt | 2 + + .../devicetree/bindings/mfd/atmel-hlcdc.txt | 1 + + drivers/mfd/Kconfig | 62 +++++++++++----------- + drivers/mfd/atmel-hlcdc.c | 1 + + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x.c | 11 ++++ + drivers/mfd/cros_ec_dev.c | 16 +++++- + 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_soc_pmic_chtwc.c | 1 + + drivers/mfd/rk808.c | 9 ---- + drivers/mfd/sec-core.c | 59 +++++++------------- + drivers/mfd/sec-irq.c | 3 ++ + drivers/mfd/syscon.c | 19 +++++++ + drivers/mfd/twl6040.c | 13 ++++- + include/linux/mfd/cros_ec.h | 1 + + include/linux/mfd/cros_ec_commands.h | 2 + + include/linux/mfd/da9063/core.h | 7 +-- + include/linux/mfd/da9063/registers.h | 7 +-- + 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 +-- + 26 files changed, 139 insertions(+), 152 deletions(-) +Merging backlight/for-backlight-next (a6d6a589cb09 video: lcd: Remove useless BACKLIGHT_CLASS_DEVICE dependencies) +$ git merge backlight/for-backlight-next +Merge made by the 'recursive' strategy. + drivers/video/backlight/Kconfig | 25 ++++++++++++------------- + 1 file changed, 12 insertions(+), 13 deletions(-) +Merging battery/for-next (231a13d93d51 Merge tag 'psy-olpc-1.75-battery-signed' into psy-next) +$ git merge battery/for-next +Merge made by the 'recursive' strategy. + .../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/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 | 19 ++- + drivers/power/supply/Makefile | 3 +- + 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/charger-manager.c | 3 + + drivers/power/supply/cpcap-battery.c | 45 ++--- + 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 | 32 ++-- + include/linux/iio/consumer.h | 14 ++ + 26 files changed, 841 insertions(+), 259 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 drivers/power/supply/ingenic-battery.c + rename drivers/power/supply/{ltc3651-charger.c => lt3651-charger.c} (50%) +Merging regulator/for-next (68b13529a118 Merge branch 'regulator-5.2' into regulator-next) +$ git merge regulator/for-next +Merge made by the 'recursive' strategy. + .../bindings/regulator/gpio-regulator.txt | 30 ++- + .../bindings/regulator/st,stm32mp1-pwr-reg.txt | 43 +++ + drivers/mfd/wm831x-core.c | 2 +- + drivers/mfd/wm8400-core.c | 6 - + drivers/regulator/88pm800.c | 18 +- + drivers/regulator/88pm8607.c | 43 +-- + drivers/regulator/Kconfig | 11 +- + drivers/regulator/Makefile | 1 + + drivers/regulator/ab3100.c | 24 +- + drivers/regulator/ab8500-ext.c | 49 +--- + drivers/regulator/ab8500.c | 20 +- + drivers/regulator/act8865-regulator.c | 147 ++-------- + drivers/regulator/anatop-regulator.c | 63 ++--- + drivers/regulator/arizona-ldo1.c | 19 +- + drivers/regulator/arizona-micsupp.c | 19 +- + drivers/regulator/as3711-regulator.c | 37 +-- + drivers/regulator/as3722-regulator.c | 287 ++++++-------------- + drivers/regulator/axp20x-regulator.c | 23 +- + drivers/regulator/bcm590xx-regulator.c | 105 +------- + drivers/regulator/bd718x7-regulator.c | 4 +- + drivers/regulator/core.c | 11 +- + drivers/regulator/cpcap-regulator.c | 15 +- + drivers/regulator/da9052-regulator.c | 35 +-- + drivers/regulator/da9055-regulator.c | 69 +---- + drivers/regulator/da9062-regulator.c | 127 +++------ + drivers/regulator/da9063-regulator.c | 134 +++------ + drivers/regulator/da9211-regulator.c | 4 + + drivers/regulator/db8500-prcmu.c | 143 +++------- + drivers/regulator/dbx500-prcmu.h | 4 - + drivers/regulator/fan53555.c | 60 ++--- + drivers/regulator/gpio-regulator.c | 22 +- + drivers/regulator/hi6421-regulator.c | 208 ++++++-------- + drivers/regulator/hi655x-regulator.c | 15 +- + drivers/regulator/lm363x-regulator.c | 8 +- + drivers/regulator/lp8755.c | 15 +- + drivers/regulator/lp87565-regulator.c | 49 +--- + drivers/regulator/ltc3589.c | 269 ++++++------------ + drivers/regulator/ltc3676.c | 10 +- + drivers/regulator/max14577-regulator.c | 55 ---- + drivers/regulator/max77650-regulator.c | 2 +- + drivers/regulator/max8925-regulator.c | 76 +----- + drivers/regulator/max8998.c | 300 ++++----------------- + drivers/regulator/mcp16502.c | 67 ++--- + drivers/regulator/mt6311-regulator.c | 17 +- + drivers/regulator/mt6311-regulator.h | 10 +- + drivers/regulator/mt6323-regulator.c | 32 +-- + drivers/regulator/mt6380-regulator.c | 25 +- + drivers/regulator/mt6397-regulator.c | 33 +-- + drivers/regulator/of_regulator.c | 5 +- + drivers/regulator/palmas-regulator.c | 12 - + drivers/regulator/pv88060-regulator.c | 4 + + drivers/regulator/pv88080-regulator.c | 4 + + drivers/regulator/pv88090-regulator.c | 4 + + drivers/regulator/rc5t583-regulator.c | 25 +- + drivers/regulator/rn5t618-regulator.c | 8 +- + drivers/regulator/s2mpa01.c | 41 +-- + drivers/regulator/sc2731-regulator.c | 2 +- + drivers/regulator/sky81452-regulator.c | 26 +- + drivers/regulator/stm32-pwr.c | 190 +++++++++++++ + drivers/regulator/sy8106a-regulator.c | 40 +-- + drivers/regulator/tps6507x-regulator.c | 113 ++------ + drivers/regulator/tps65086-regulator.c | 4 +- + drivers/regulator/tps65132-regulator.c | 29 +- + drivers/regulator/tps65217-regulator.c | 7 +- + drivers/regulator/tps65218-regulator.c | 56 ++-- + drivers/regulator/tps6524x-regulator.c | 11 +- + drivers/regulator/tps80031-regulator.c | 48 ++-- + drivers/regulator/twl-regulator.c | 6 +- + drivers/regulator/vctrl-regulator.c | 4 +- + drivers/regulator/vexpress-regulator.c | 4 +- + drivers/regulator/wm831x-dcdc.c | 23 +- + drivers/regulator/wm831x-isink.c | 66 ++--- + drivers/regulator/wm831x-ldo.c | 21 +- + drivers/regulator/wm8350-regulator.c | 102 ++----- + drivers/regulator/wm8400-regulator.c | 39 ++- + drivers/regulator/wm8994-regulator.c | 19 +- + include/linux/mfd/palmas.h | 1 - + include/linux/mfd/wm831x/regulator.h | 2 +- + include/linux/mfd/wm8400-private.h | 8 - + include/linux/regulator/consumer.h | 5 + + sound/soc/codecs/ab8500-codec.c | 4 +- + 81 files changed, 1209 insertions(+), 2490 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/st,stm32mp1-pwr-reg.txt + create mode 100644 drivers/regulator/stm32-pwr.c +Merging security/next-testing (5664f5faac11 Merge branch 'next-smack' into next-testing) +$ git merge security/next-testing +Auto-merging security/keys/trusted.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/module.c +Auto-merging include/linux/module.h +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'recursive' strategy. + Documentation/admin-guide/kernel-parameters.txt | 5 +- + arch/x86/kernel/ima_arch.c | 10 +- + include/linux/cred.h | 2 +- + include/linux/lsm_hooks.h | 170 +++++++++++------------- + include/linux/module.h | 5 + + include/linux/sched/user.h | 7 + + kernel/module.c | 5 + + kernel/seccomp.c | 2 +- + security/keys/process_keys.c | 41 +++--- + security/keys/request_key.c | 14 +- + security/smack/smack.h | 1 + + security/smack/smack_lsm.c | 32 ++++- + security/smack/smackfs.c | 55 +++----- + security/tomoyo/Kconfig | 10 ++ + security/tomoyo/common.c | 13 +- + security/tomoyo/network.c | 4 + + security/tomoyo/realpath.c | 3 +- + 17 files changed, 207 insertions(+), 172 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 +Removing tools/testing/selftests/ima/test_kexec_load.sh +Removing tools/testing/selftests/ima/config +Merge made by the 'recursive' strategy. + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/ima/config | 4 - + tools/testing/selftests/ima/test_kexec_load.sh | 54 ----- + tools/testing/selftests/{ima => kexec}/Makefile | 5 +- + tools/testing/selftests/kexec/config | 3 + + tools/testing/selftests/kexec/kexec_common_lib.sh | 220 +++++++++++++++++++++ + .../selftests/kexec/test_kexec_file_load.sh | 208 +++++++++++++++++++ + tools/testing/selftests/kexec/test_kexec_load.sh | 47 +++++ + 8 files changed, 482 insertions(+), 61 deletions(-) + delete mode 100644 tools/testing/selftests/ima/config + delete mode 100755 tools/testing/selftests/ima/test_kexec_load.sh + rename tools/testing/selftests/{ima => kexec}/Makefile (59%) + create mode 100644 tools/testing/selftests/kexec/config + create mode 100755 tools/testing/selftests/kexec/kexec_common_lib.sh + create mode 100755 tools/testing/selftests/kexec/test_kexec_file_load.sh + create mode 100755 tools/testing/selftests/kexec/test_kexec_load.sh +Merging selinux/next (35a196bef449 proc: prevent changes to overridden credentials) +$ git merge selinux/next +Auto-merging scripts/selinux/mdp/mdp.c +CONFLICT (content): Merge conflict in scripts/selinux/mdp/mdp.c +Auto-merging include/linux/lsm_hooks.h +Auto-merging fs/proc/base.c +Auto-merging MAINTAINERS +Recorded preimage for 'scripts/selinux/mdp/mdp.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'scripts/selinux/mdp/mdp.c'. +[master 5ce431f3f8fa] Merge remote-tracking branch 'selinux/next' +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + fs/kernfs/dir.c | 24 ++-- + fs/kernfs/inode.c | 162 ++++++++++--------------- + fs/kernfs/kernfs-internal.h | 8 +- + fs/kernfs/symlink.c | 4 +- + fs/proc/base.c | 5 + + include/linux/kernfs.h | 13 ++ + include/linux/lsm_hooks.h | 13 ++ + include/linux/security.h | 9 ++ + scripts/selinux/install_policy.sh | 92 +++++++++------ + scripts/selinux/mdp/Makefile | 2 +- + scripts/selinux/mdp/mdp.c | 165 ++++++++++++++++++++++---- + security/security.c | 6 + + security/selinux/hooks.c | 229 ++++++++++++++++++++++++------------ + security/selinux/include/security.h | 1 + + security/selinux/netlabel.c | 14 +-- + security/selinux/ss/services.c | 7 +- + 17 files changed, 487 insertions(+), 269 deletions(-) +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 (458c8961c194 watchdog: w83877f_wdt: Mark expected switch fall-through) +$ git merge watchdog/master +Already up to date. +Merging iommu/next (398ece5bde7e 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/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 | 132 ++------- + 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 | 519 +++++++++++++++++++++++++++++------- + 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 +-- + 23 files changed, 1355 insertions(+), 378 deletions(-) +Merging dwmw2-iommu/master (d8a5b80568a9 Linux 4.15) +$ git merge dwmw2-iommu/master +Already up to date. +Merging vfio/next (41be3e261817 vfio: Fix WARNING "do not call blocking ops when !TASK_RUNNING") +$ git merge vfio/next +Auto-merging include/linux/pci.h +Merge made by the 'recursive' strategy. + drivers/vfio/pci/vfio_pci.c | 23 ++++----- + drivers/vfio/pci/vfio_pci_config.c | 29 +++++------ + .../vfio/platform/reset/vfio_platform_amdxgbe.c | 5 +- + drivers/vfio/platform/vfio_platform_common.c | 12 +++-- + drivers/vfio/vfio.c | 59 +++++++++------------- + include/linux/pci.h | 3 ++ + 6 files changed, 59 insertions(+), 72 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 +Auto-merging kernel/seccomp.c +CONFLICT (content): Merge conflict in kernel/seccomp.c +Auto-merging include/asm-generic/syscall.h +Auto-merging arch/xtensa/include/asm/syscall.h +Auto-merging arch/x86/include/asm/syscall.h +Auto-merging arch/sparc/include/asm/syscall.h +Auto-merging arch/sh/include/asm/syscall_64.h +Auto-merging arch/sh/include/asm/syscall_32.h +Auto-merging arch/s390/include/asm/syscall.h +Auto-merging arch/riscv/include/asm/syscall.h +Auto-merging arch/powerpc/include/asm/syscall.h +Auto-merging arch/parisc/include/asm/syscall.h +Auto-merging arch/openrisc/include/asm/syscall.h +Auto-merging arch/nios2/include/asm/syscall.h +Auto-merging arch/nds32/include/asm/syscall.h +Auto-merging arch/nds32/include/asm/elf.h +Auto-merging arch/mips/kernel/ptrace.c +CONFLICT (content): Merge conflict in arch/mips/kernel/ptrace.c +Auto-merging arch/mips/include/asm/syscall.h +Auto-merging arch/microblaze/include/asm/syscall.h +Auto-merging arch/ia64/include/asm/syscall.h +Auto-merging arch/hexagon/include/asm/syscall.h +Auto-merging arch/h8300/include/asm/syscall.h +Auto-merging arch/csky/include/asm/syscall.h +Auto-merging arch/c6x/include/asm/syscall.h +Auto-merging arch/arm64/include/asm/syscall.h +Auto-merging arch/arm/include/asm/syscall.h +Auto-merging arch/arc/include/asm/syscall.h +Resolved 'arch/mips/kernel/ptrace.c' using previous resolution. +Resolved 'kernel/seccomp.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 18d608dff852] Merge remote-tracking branch 'audit/next' +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/syscall.h | 2 +- + arch/arc/include/asm/elf.h | 6 +- + arch/arc/include/asm/syscall.h | 11 ++++ + arch/arm/include/asm/syscall.h | 2 +- + arch/arm64/include/asm/syscall.h | 4 +- + arch/c6x/include/asm/syscall.h | 7 +++ + arch/csky/include/asm/syscall.h | 2 +- + arch/h8300/include/asm/syscall.h | 6 ++ + arch/hexagon/include/asm/elf.h | 6 +- + arch/hexagon/include/asm/syscall.h | 8 +++ + arch/ia64/include/asm/syscall.h | 2 +- + arch/m68k/include/asm/syscall.h | 12 ++++ + arch/microblaze/include/asm/syscall.h | 2 +- + arch/mips/include/asm/syscall.h | 6 +- + arch/mips/kernel/ptrace.c | 2 +- + arch/nds32/include/asm/elf.h | 3 +- + arch/nds32/include/asm/syscall.h | 9 +++ + arch/nios2/include/asm/syscall.h | 6 ++ + arch/openrisc/include/asm/syscall.h | 2 +- + arch/parisc/include/asm/syscall.h | 4 +- + arch/powerpc/include/asm/syscall.h | 10 ++- + arch/riscv/include/asm/syscall.h | 2 +- + arch/s390/include/asm/syscall.h | 4 +- + arch/sh/include/asm/syscall_32.h | 2 +- + arch/sh/include/asm/syscall_64.h | 2 +- + arch/sparc/include/asm/syscall.h | 5 +- + arch/unicore32/include/asm/elf.h | 3 +- + arch/unicore32/include/asm/syscall.h | 12 ++++ + arch/x86/include/asm/syscall.h | 8 ++- + arch/x86/um/asm/syscall.h | 2 +- + arch/xtensa/include/asm/syscall.h | 2 +- + include/asm-generic/syscall.h | 5 +- + include/linux/audit.h | 75 ++++++++++++++++++++++ + include/uapi/linux/audit.h | 14 +++++ + include/uapi/linux/elf-em.h | 6 ++ + kernel/audit.c | 2 +- + kernel/auditfilter.c | 14 ++--- + kernel/auditsc.c | 115 +++++++++++++++++++++------------- + kernel/seccomp.c | 4 +- + kernel/time/ntp.c | 22 ++++++- + kernel/time/ntp_internal.h | 4 +- + kernel/time/timekeeping.c | 13 +++- + security/integrity/evm/evm_secfs.c | 10 +-- + 43 files changed, 331 insertions(+), 107 deletions(-) + create mode 100644 arch/m68k/include/asm/syscall.h + create mode 100644 arch/unicore32/include/asm/syscall.h +Merging devicetree/for-next (57ddd16b111b dt-bindings: Add isl68137 as a trivial device) +$ git merge devicetree/for-next +Removing Documentation/devicetree/bindings/display/simple-framebuffer.txt +Removing Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt +Removing Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../devicetree/bindings/arm/sunxi/sunxi-mbus.txt | 36 +++++ + .../bindings/connector/usb-connector.txt | 2 +- + .../display/amlogic,simple-framebuffer.txt | 33 ----- + .../bindings/display/simple-framebuffer-sunxi.txt | 36 ----- + .../bindings/display/simple-framebuffer.txt | 91 ------------ + .../bindings/display/simple-framebuffer.yaml | 160 +++++++++++++++++++++ + .../bindings/interconnect/interconnect.txt | 4 + + .../bindings/interrupt-controller/arm,gic.yaml | 1 + + Documentation/devicetree/bindings/mfd/axp20x.txt | 1 + + .../bindings/timer/arm,arch_timer_mmio.yaml | 1 + + .../devicetree/bindings/trivial-devices.yaml | 4 + + .../devicetree/bindings/writing-bindings.txt | 60 ++++++++ + drivers/of/address.c | 40 +++++- + drivers/of/base.c | 5 +- + drivers/of/fdt.c | 2 +- + drivers/of/of_reserved_mem.c | 22 ++- + drivers/of/property.c | 2 +- + include/linux/of.h | 3 +- + 19 files changed, 327 insertions(+), 177 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/sunxi/sunxi-mbus.txt + delete mode 100644 Documentation/devicetree/bindings/display/amlogic,simple-framebuffer.txt + delete mode 100644 Documentation/devicetree/bindings/display/simple-framebuffer-sunxi.txt + delete mode 100644 Documentation/devicetree/bindings/display/simple-framebuffer.txt + create mode 100644 Documentation/devicetree/bindings/display/simple-framebuffer.yaml + create mode 100644 Documentation/devicetree/bindings/writing-bindings.txt +Merging mailbox/mailbox-for-next (17b860bbfc84 mailbox: imx: keep MU irq working during suspend/resume) +$ git merge mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (b99fc29b3515 Merge branch 'spi-5.2' into spi-next) +$ git merge spi/for-next +Removing drivers/staging/mt7621-spi/TODO +Removing drivers/staging/mt7621-spi/Makefile +Removing drivers/staging/mt7621-spi/Kconfig +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/spi/fsl-spi.txt | 4 + + .../bindings/spi/nvidia,tegra114-spi.txt | 20 + + .../devicetree/bindings/spi/snps,dw-apb-ssi.txt | 10 +- + .../devicetree/bindings/spi/spi-fsl-lpspi.txt | 10 +- + .../devicetree/bindings/spi/spi-mt7621.txt | 26 + + .../devicetree/bindings/spi/spi-zynq-qspi.txt | 25 + + Documentation/spi/spi-summary | 6 + + arch/arm/mach-ep93xx/edb93xx.c | 13 +- + arch/arm/mach-ep93xx/simone.c | 11 +- + arch/arm/mach-ep93xx/ts72xx.c | 25 +- + arch/arm/mach-ep93xx/vision_ep9307.c | 15 +- + arch/sh/boards/mach-ecovec24/setup.c | 12 +- + drivers/spi/Kconfig | 16 +- + drivers/spi/Makefile | 2 + + drivers/spi/atmel-quadspi.c | 2 +- + drivers/spi/spi-at91-usart.c | 8 +- + drivers/spi/spi-bcm2835aux.c | 205 ++++-- + drivers/spi/spi-bitbang.c | 66 +- + drivers/spi/spi-dw-mmio.c | 12 + + drivers/spi/spi-ep93xx.c | 32 +- + drivers/spi/spi-fsl-lib.h | 2 + + drivers/spi/spi-fsl-lpspi.c | 569 +++++++++++++-- + drivers/spi/spi-fsl-qspi.c | 2 +- + drivers/spi/spi-fsl-spi.c | 81 ++- + drivers/spi/spi-gpio.c | 226 +++--- + drivers/spi/spi-imx.c | 7 + + drivers/spi/spi-mem.c | 8 +- + drivers/{staging/mt7621-spi => spi}/spi-mt7621.c | 83 ++- + drivers/spi/spi-mxic.c | 6 +- + drivers/spi/spi-orion.c | 4 + + drivers/spi/spi-pxa2xx-dma.c | 4 +- + drivers/spi/spi-pxa2xx-pci.c | 5 +- + drivers/spi/spi-pxa2xx.c | 24 +- + drivers/spi/spi-sh-msiof.c | 224 +++--- + drivers/spi/spi-stm32-qspi.c | 227 +++++- + drivers/spi/spi-tegra114.c | 97 ++- + drivers/spi/spi-zynq-qspi.c | 761 +++++++++++++++++++++ + drivers/spi/spi.c | 61 +- + drivers/spi/spidev.c | 4 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/mt7621-spi/Kconfig | 6 - + drivers/staging/mt7621-spi/Makefile | 1 - + drivers/staging/mt7621-spi/TODO | 5 - + include/linux/platform_data/spi-ep93xx.h | 4 - + include/linux/spi/pxa2xx_spi.h | 1 + + include/linux/spi/spi-mem.h | 3 + + include/linux/spi/spi.h | 18 +- + include/linux/spi/spi_bitbang.h | 1 + + include/uapi/linux/spi/spidev.h | 6 +- + sound/soc/codecs/adau1977-spi.c | 11 + + 51 files changed, 2369 insertions(+), 605 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/spi-mt7621.txt + create mode 100644 Documentation/devicetree/bindings/spi/spi-zynq-qspi.txt + rename drivers/{staging/mt7621-spi => spi}/spi-mt7621.c (88%) + create mode 100644 drivers/spi/spi-zynq-qspi.c + delete mode 100644 drivers/staging/mt7621-spi/Kconfig + delete mode 100644 drivers/staging/mt7621-spi/Makefile + delete mode 100644 drivers/staging/mt7621-spi/TODO +Merging tip/auto-latest (dbe37a300947 Merge branch 'core/core') +$ git merge tip/auto-latest +Auto-merging scripts/Makefile.build +Auto-merging net/xfrm/xfrm_state.c +Auto-merging mm/memory.c +Auto-merging mm/kasan/Makefile +CONFLICT (content): Merge conflict in mm/kasan/Makefile +Auto-merging lib/Kconfig +Auto-merging kernel/workqueue.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/time/timekeeping.c +Auto-merging kernel/time/time.c +Auto-merging kernel/time/tick-sched.c +Auto-merging kernel/time/sched_clock.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/module.c +Removing kernel/locking/rwsem-spinlock.c +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/irq/manage.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/Kconfig.locks +Auto-merging init/main.c +Auto-merging include/net/xfrm.h +Auto-merging include/linux/tick.h +Removing include/linux/rwsem-spinlock.h +Auto-merging include/linux/overflow.h +Auto-merging include/linux/filter.h +Removing include/asm-generic/rwsem.h +Auto-merging fs/proc/base.c +Auto-merging fs/btrfs/ref-verify.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/net/wireless/mac80211_hwsim.c +Auto-merging drivers/gpu/drm/i915/intel_runtime_pm.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/i915/i915_gem_execbuffer.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Auto-merging arch/xtensa/include/asm/Kbuild +Removing arch/x86/lib/rwsem.S +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kernel/tsc.c +Auto-merging arch/x86/kernel/irq_64.c +CONFLICT (content): Merge conflict in arch/x86/kernel/irq_64.c +Auto-merging arch/x86/kernel/cpu/common.c +Removing arch/x86/include/asm/rwsem.h +Auto-merging arch/sparc/include/asm/Kbuild +Auto-merging arch/s390/kernel/nospec-branch.c +Auto-merging arch/s390/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/s390/include/asm/Kbuild +Auto-merging arch/s390/Kconfig +Auto-merging arch/riscv/kernel/stacktrace.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/powerpc/kernel/setup_64.c +Auto-merging arch/powerpc/include/asm/Kbuild +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/parisc/Kconfig +Auto-merging arch/nds32/include/asm/tlbflush.h +Auto-merging arch/nds32/include/asm/tlb.h +Auto-merging arch/nds32/Kconfig +Auto-merging arch/mips/Kconfig +Auto-merging arch/m68k/Kconfig +Removing arch/ia64/include/asm/rwsem.h +Auto-merging arch/hexagon/include/asm/Kbuild +Auto-merging arch/h8300/Kconfig +Auto-merging arch/csky/Kconfig +Auto-merging arch/arm64/include/asm/tlb.h +Auto-merging arch/arm64/include/asm/Kbuild +CONFLICT (content): Merge conflict in arch/arm64/include/asm/Kbuild +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm/include/asm/Kbuild +Auto-merging arch/arm/Kconfig +Removing arch/alpha/include/asm/rwsem.h +Auto-merging MAINTAINERS +Auto-merging Documentation/kprobes.txt +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +Resolved 'arch/arm64/include/asm/Kbuild' using previous resolution. +Resolved 'arch/s390/include/asm/Kbuild' using previous resolution. +Resolved 'arch/x86/kernel/irq_64.c' using previous resolution. +Resolved 'mm/kasan/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 6c7fc7c720b7] Merge remote-tracking branch 'tip/auto-latest' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 10 +- + .../Design/Data-Structures/Data-Structures.html | 3 +- + .../Expedited-Grace-Periods.html | 4 +- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.html | 5 +- + Documentation/RCU/NMI-RCU.txt | 13 +- + Documentation/RCU/UP.txt | 6 +- + Documentation/RCU/checklist.txt | 91 +- + Documentation/RCU/rcu.txt | 8 +- + Documentation/RCU/rcu_dereference.txt | 103 + + Documentation/RCU/rcubarrier.txt | 27 +- + Documentation/RCU/whatisRCU.txt | 10 +- + Documentation/admin-guide/kernel-parameters.txt | 47 +- + Documentation/atomic_t.txt | 17 + + Documentation/core-api/cachetlb.rst | 10 - + Documentation/cputopology.txt | 46 +- + Documentation/kprobes.txt | 6 +- + Documentation/preempt-locking.txt | 1 - + .../translations/ko_KR/memory-barriers.txt | 49 +- + Documentation/x86/kernel-stacks | 13 +- + Documentation/x86/topology.txt | 2 +- + Documentation/x86/x86_64/mm.txt | 6 +- + MAINTAINERS | 19 +- + arch/Kconfig | 21 +- + arch/alpha/Kconfig | 8 +- + arch/alpha/include/asm/rwsem.h | 211 -- + arch/alpha/include/asm/tlb.h | 6 - + arch/arc/Kconfig | 3 - + arch/arc/include/asm/tlb.h | 32 - + arch/arm/Kconfig | 4 - + arch/arm/include/asm/Kbuild | 1 - + arch/arm/include/asm/tlb.h | 255 +-- + arch/arm/kernel/signal.c | 3 +- + arch/arm/kernel/stacktrace.c | 6 - + arch/arm64/Kconfig | 4 - + arch/arm64/include/asm/Kbuild | 1 - + arch/arm64/include/asm/tlb.h | 1 + + arch/arm64/kernel/stacktrace.c | 4 - + arch/c6x/Kconfig | 4 +- + arch/c6x/include/asm/tlb.h | 2 - + arch/csky/Kconfig | 3 - + arch/h8300/Kconfig | 3 - + arch/h8300/include/asm/tlb.h | 2 - + arch/hexagon/Kconfig | 6 - + arch/hexagon/include/asm/Kbuild | 1 - + arch/hexagon/include/asm/tlb.h | 12 - + arch/ia64/Kconfig | 4 - + arch/ia64/include/asm/machvec.h | 13 - + arch/ia64/include/asm/machvec_sn2.h | 2 - + arch/ia64/include/asm/rwsem.h | 172 -- + arch/ia64/include/asm/tlb.h | 259 +-- + arch/ia64/include/asm/tlbflush.h | 25 + + arch/ia64/kernel/setup.c | 4 +- + arch/ia64/mm/tlb.c | 23 +- + arch/ia64/sn/kernel/sn2/sn2_smp.c | 7 - + arch/m68k/Kconfig | 8 +- + arch/m68k/include/asm/tlb.h | 14 - + arch/microblaze/Kconfig | 7 +- + arch/microblaze/include/asm/tlb.h | 9 - + arch/mips/Kconfig | 7 - + arch/mips/include/asm/tlb.h | 17 - + arch/nds32/Kconfig | 3 - + arch/nds32/include/asm/tlb.h | 16 - + arch/nds32/include/asm/tlbflush.h | 1 - + arch/nios2/Kconfig | 4 +- + arch/nios2/include/asm/tlb.h | 14 +- + arch/openrisc/Kconfig | 7 +- + arch/openrisc/include/asm/tlb.h | 8 +- + arch/parisc/Kconfig | 6 - + arch/parisc/include/asm/tlb.h | 18 - + arch/parisc/kernel/stacktrace.c | 5 - + arch/powerpc/Kconfig | 9 +- + arch/powerpc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/tlb.h | 18 +- + arch/powerpc/kernel/security.c | 6 +- + arch/powerpc/kernel/setup_64.c | 2 +- + arch/riscv/Kconfig | 3 - + arch/riscv/include/asm/tlb.h | 1 + + arch/riscv/kernel/stacktrace.c | 2 - + arch/s390/Kconfig | 8 +- + arch/s390/include/asm/Kbuild | 1 - + arch/s390/include/asm/tlb.h | 130 +- + arch/s390/kernel/nospec-branch.c | 3 +- + arch/s390/kernel/stacktrace.c | 6 - + arch/s390/mm/pgalloc.c | 63 +- + arch/sh/Kconfig | 6 - + arch/sh/include/asm/Kbuild | 1 - + arch/sh/include/asm/pgalloc.h | 9 + + arch/sh/include/asm/tlb.h | 132 +- + arch/sh/kernel/stacktrace.c | 4 - + arch/sparc/Kconfig | 9 +- + arch/sparc/include/asm/Kbuild | 1 - + arch/sparc/include/asm/tlb_32.h | 18 - + arch/um/include/asm/tlb.h | 158 +- + arch/um/kernel/stacktrace.c | 2 - + arch/unicore32/Kconfig | 7 +- + arch/unicore32/include/asm/tlb.h | 7 +- + arch/unicore32/kernel/stacktrace.c | 2 - + arch/x86/Kconfig | 44 +- + arch/x86/Makefile | 2 +- + arch/x86/configs/i386_defconfig | 12 - + arch/x86/configs/x86_64_defconfig | 12 - + arch/x86/entry/common.c | 10 +- + arch/x86/entry/entry_32.S | 5 +- + arch/x86/entry/entry_64.S | 19 +- + arch/x86/entry/vdso/Makefile | 2 +- + arch/x86/entry/vdso/vdso2c.c | 3 - + arch/x86/entry/vdso/vdso2c.h | 13 +- + arch/x86/events/core.c | 95 +- + arch/x86/events/intel/core.c | 296 ++- + arch/x86/events/intel/cstate.c | 2 + + arch/x86/events/intel/ds.c | 505 ++++- + arch/x86/events/intel/lbr.c | 35 +- + arch/x86/events/intel/rapl.c | 2 + + arch/x86/events/intel/uncore.c | 6 + + arch/x86/events/intel/uncore.h | 1 + + arch/x86/events/intel/uncore_snb.c | 91 + + arch/x86/events/msr.c | 1 + + arch/x86/events/perf_event.h | 98 +- + arch/x86/hyperv/hv_apic.c | 5 + + arch/x86/hyperv/hv_spinlock.c | 2 +- + arch/x86/ia32/ia32_signal.c | 46 +- + arch/x86/include/asm/alternative-asm.h | 11 + + arch/x86/include/asm/alternative.h | 10 + + arch/x86/include/asm/asm.h | 24 - + arch/x86/include/asm/cpu_entry_area.h | 69 +- + arch/x86/include/asm/cpufeature.h | 11 +- + arch/x86/include/asm/debugreg.h | 2 - + arch/x86/include/asm/fixmap.h | 2 - + arch/x86/include/asm/fpu/api.h | 31 + + arch/x86/include/asm/fpu/internal.h | 140 +- + arch/x86/include/asm/fpu/signal.h | 2 +- + arch/x86/include/asm/fpu/types.h | 9 - + arch/x86/include/asm/fpu/xstate.h | 8 +- + arch/x86/include/asm/intel_ds.h | 2 +- + arch/x86/include/asm/irq.h | 6 +- + arch/x86/include/asm/irq_vectors.h | 4 +- + arch/x86/include/asm/mce.h | 25 +- + arch/x86/include/asm/mmu_context.h | 56 + + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/nospec-branch.h | 28 +- + arch/x86/include/asm/page_32_types.h | 8 +- + arch/x86/include/asm/page_64_types.h | 16 +- + arch/x86/include/asm/perf_event.h | 57 +- + arch/x86/include/asm/pgtable.h | 32 +- + arch/x86/include/asm/processor.h | 43 +- + arch/x86/include/asm/rwsem.h | 237 --- + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/smap.h | 37 +- + arch/x86/include/asm/smp.h | 2 +- + arch/x86/include/asm/special_insns.h | 19 +- + arch/x86/include/asm/stackprotector.h | 6 +- + arch/x86/include/asm/stacktrace.h | 15 +- + arch/x86/include/asm/switch_to.h | 1 + + arch/x86/include/asm/sync_bitops.h | 31 +- + arch/x86/include/asm/text-patching.h | 7 +- + arch/x86/include/asm/thread_info.h | 2 + + arch/x86/include/asm/tlb.h | 1 + + arch/x86/include/asm/tlbflush.h | 4 +- + arch/x86/include/asm/trace/fpu.h | 13 +- + arch/x86/include/asm/uaccess.h | 15 +- + arch/x86/include/asm/uaccess_64.h | 3 - + arch/x86/include/asm/vdso.h | 1 - + arch/x86/include/asm/xen/hypercall.h | 24 +- + arch/x86/include/uapi/asm/perf_regs.h | 23 +- + arch/x86/kernel/acpi/cstate.c | 12 + + arch/x86/kernel/alternative.c | 201 +- + arch/x86/kernel/apic/apic.c | 57 +- + arch/x86/kernel/apic/apic_numachip.c | 2 +- + arch/x86/kernel/asm-offsets_64.c | 4 +- + arch/x86/kernel/cpu/amd.c | 5 +- + arch/x86/kernel/cpu/aperfmperf.c | 6 +- + arch/x86/kernel/cpu/bugs.c | 11 +- + arch/x86/kernel/cpu/common.c | 67 +- + arch/x86/kernel/cpu/hygon.c | 5 + + arch/x86/kernel/cpu/mce/amd.c | 52 +- + arch/x86/kernel/cpu/mce/core.c | 102 +- + arch/x86/kernel/cpu/mce/genpool.c | 3 + + arch/x86/kernel/cpu/mce/inject.c | 16 +- + arch/x86/kernel/cpu/mce/internal.h | 9 + + arch/x86/kernel/cpu/microcode/core.c | 3 +- + arch/x86/kernel/cpu/microcode/intel.c | 71 +- + arch/x86/kernel/cpu/proc.c | 10 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 4 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 173 +- + arch/x86/kernel/crash.c | 3 +- + arch/x86/kernel/dumpstack_32.c | 8 +- + arch/x86/kernel/dumpstack_64.c | 99 +- + arch/x86/kernel/fpu/core.c | 195 +- + arch/x86/kernel/fpu/init.c | 2 - + arch/x86/kernel/fpu/regset.c | 24 +- + arch/x86/kernel/fpu/signal.c | 202 +- + arch/x86/kernel/fpu/xstate.c | 42 +- + arch/x86/kernel/ftrace.c | 22 +- + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/idt.c | 19 +- + arch/x86/kernel/irq_32.c | 41 +- + arch/x86/kernel/irq_64.c | 89 +- + arch/x86/kernel/irqinit.c | 4 +- + arch/x86/kernel/jump_label.c | 21 +- + arch/x86/kernel/kgdb.c | 25 +- + arch/x86/kernel/kprobes/core.c | 22 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/ldt.c | 14 +- + arch/x86/kernel/module.c | 2 +- + arch/x86/kernel/nmi.c | 20 +- + arch/x86/kernel/paravirt.c | 2 +- + arch/x86/kernel/perf_regs.c | 27 +- + arch/x86/kernel/process.c | 6 +- + arch/x86/kernel/process_32.c | 18 +- + arch/x86/kernel/process_64.c | 12 +- + arch/x86/kernel/reboot.c | 2 +- + arch/x86/kernel/setup.c | 38 +- + arch/x86/kernel/setup_percpu.c | 5 - + arch/x86/kernel/signal.c | 55 +- + arch/x86/kernel/smpboot.c | 21 +- + arch/x86/kernel/stacktrace.c | 128 +- + arch/x86/kernel/topology.c | 2 +- + arch/x86/kernel/traps.c | 2 +- + arch/x86/kernel/tsc.c | 5 +- + arch/x86/kernel/vm86_32.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 13 +- + arch/x86/kvm/vmx/vmx.c | 2 +- + arch/x86/kvm/x86.c | 48 +- + arch/x86/lib/Makefile | 1 - + arch/x86/lib/copy_user_64.S | 48 + + arch/x86/lib/delay.c | 2 +- + arch/x86/lib/error-inject.c | 1 + + arch/x86/lib/memcpy_64.S | 3 +- + arch/x86/lib/rwsem.S | 156 -- + arch/x86/lib/usercopy_64.c | 20 - + arch/x86/math-emu/fpu_entry.c | 3 - + arch/x86/mm/cpu_entry_area.c | 64 +- + arch/x86/mm/dump_pagetables.c | 4 +- + arch/x86/mm/fault.c | 58 +- + arch/x86/mm/init.c | 37 + + arch/x86/mm/kaslr.c | 94 +- + arch/x86/mm/mpx.c | 6 +- + arch/x86/mm/pageattr.c | 16 +- + arch/x86/mm/pgtable.c | 4 +- + arch/x86/mm/pkeys.c | 21 +- + arch/x86/mm/pti.c | 6 +- + arch/x86/mm/tlb.c | 116 +- + arch/x86/platform/uv/tlb_uv.c | 7 +- + arch/x86/tools/relocs.c | 76 +- + arch/x86/um/Kconfig | 6 - + arch/x86/um/Makefile | 4 +- + arch/x86/um/vdso/Makefile | 2 +- + arch/x86/xen/mmu_pv.c | 2 - + arch/x86/xen/smp_pv.c | 4 +- + arch/x86/xen/xen-head.S | 10 +- + arch/xtensa/Kconfig | 3 - + arch/xtensa/include/asm/Kbuild | 1 - + arch/xtensa/include/asm/tlb.h | 26 - + drivers/edac/mce_amd.c | 4 +- + drivers/firmware/dmi_scan.c | 28 +- + drivers/firmware/efi/arm-runtime.c | 6 +- + drivers/firmware/efi/libstub/Makefile | 14 +- + drivers/gpu/drm/drm_mm.c | 25 +- + drivers/gpu/drm/i915/i915_gem_execbuffer.c | 6 +- + drivers/gpu/drm/i915/i915_vma.c | 11 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 25 +- + drivers/md/dm-bufio.c | 15 +- + drivers/md/persistent-data/dm-block-manager.c | 19 +- + drivers/misc/mic/Kconfig | 4 +- + drivers/net/wireless/mac80211_hwsim.c | 46 +- + drivers/nvme/host/core.c | 2 +- + drivers/pci/controller/Kconfig | 1 + + drivers/pci/controller/vmd.c | 7 - + drivers/ras/cec.c | 4 +- + drivers/video/fbdev/efifb.c | 3 +- + drivers/xen/events/events_base.c | 1 - + fs/btrfs/ref-verify.c | 15 +- + fs/proc/base.c | 17 +- + include/asm-generic/rwsem.h | 140 -- + include/asm-generic/tlb.h | 297 ++- + include/linux/compiler.h | 2 +- + include/linux/cpu.h | 27 +- + include/linux/dmi.h | 8 +- + include/linux/filter.h | 18 +- + include/linux/ftrace.h | 18 +- + include/linux/interrupt.h | 25 - + include/linux/jump_label_ratelimit.h | 64 +- + include/linux/lockdep.h | 11 +- + include/linux/mm.h | 18 +- + include/linux/overflow.h | 8 +- + include/linux/perf_event.h | 19 +- + include/linux/rcupdate.h | 6 +- + include/linux/rcuwait.h | 2 +- + include/linux/rwsem-spinlock.h | 47 - + include/linux/rwsem.h | 37 +- + include/linux/sched.h | 4 - + include/linux/sched/task.h | 1 + + include/linux/sched/topology.h | 4 +- + include/linux/set_memory.h | 11 + + include/linux/smpboot.h | 2 +- + include/linux/srcu.h | 36 +- + include/linux/stackdepot.h | 8 +- + include/linux/stacktrace.h | 81 +- + include/linux/tick.h | 6 + + include/linux/time64.h | 21 + + include/linux/uaccess.h | 2 + + include/linux/uprobes.h | 5 + + include/linux/vmalloc.h | 15 + + include/net/xfrm.h | 2 +- + include/trace/events/timer.h | 17 +- + init/main.c | 3 + + kernel/Kconfig.locks | 2 +- + kernel/Makefile | 1 + + kernel/backtracetest.c | 11 +- + kernel/bpf/core.c | 1 - + kernel/cgroup/cpuset.c | 11 +- + kernel/cpu.c | 81 +- + kernel/dma/debug.c | 14 +- + kernel/events/core.c | 12 +- + kernel/events/uprobes.c | 8 +- + kernel/fork.c | 25 +- + kernel/iomem.c | 4 +- + kernel/irq/devres.c | 3 +- + kernel/irq/manage.c | 4 +- + kernel/irq/timings.c | 522 +++-- + kernel/irq_work.c | 75 +- + kernel/jump_label.c | 63 +- + kernel/latencytop.c | 29 +- + kernel/livepatch/transition.c | 22 +- + kernel/locking/Makefile | 5 +- + kernel/locking/lock_events.c | 179 ++ + kernel/locking/lock_events.h | 59 + + kernel/locking/lock_events_list.h | 67 + + kernel/locking/lockdep.c | 354 ++-- + kernel/locking/lockdep_internals.h | 34 +- + kernel/locking/locktorture.c | 2 + + kernel/locking/percpu-rwsem.c | 2 + + kernel/locking/qspinlock.c | 8 +- + kernel/locking/qspinlock_paravirt.h | 19 +- + kernel/locking/qspinlock_stat.h | 242 +-- + kernel/locking/rwsem-spinlock.c | 339 --- + kernel/locking/rwsem-xadd.c | 204 +- + kernel/locking/rwsem.c | 25 +- + kernel/locking/rwsem.h | 174 +- + kernel/module.c | 82 +- + kernel/power/snapshot.c | 5 +- + kernel/rcu/rcu.h | 1 + + kernel/rcu/rcuperf.c | 5 + + kernel/rcu/rcutorture.c | 21 +- + kernel/rcu/srcutiny.c | 9 +- + kernel/rcu/srcutree.c | 32 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 508 +---- + kernel/rcu/tree.h | 14 +- + kernel/rcu/tree_exp.h | 36 +- + kernel/rcu/tree_plugin.h | 257 +-- + kernel/rcu/tree_stall.h | 709 +++++++ + kernel/rcu/update.c | 59 +- + kernel/resource.c | 11 +- + kernel/rseq.c | 9 +- + kernel/sched/core.c | 126 +- + kernel/sched/cpufreq.c | 2 +- + kernel/sched/cpufreq_schedutil.c | 1 + + kernel/sched/debug.c | 2 +- + kernel/sched/fair.c | 25 +- + kernel/sched/rt.c | 5 + + kernel/sched/sched.h | 18 +- + kernel/sched/topology.c | 31 +- + kernel/softirq.c | 51 - + kernel/stacktrace.c | 333 ++- + kernel/time/clockevents.c | 18 +- + kernel/time/jiffies.c | 2 +- + kernel/time/sched_clock.c | 4 +- + kernel/time/tick-broadcast.c | 48 +- + kernel/time/tick-common.c | 2 +- + kernel/time/tick-internal.h | 10 +- + kernel/time/tick-sched.c | 3 +- + kernel/time/tick-sched.h | 13 +- + kernel/time/time.c | 2 +- + kernel/time/timekeeping.c | 24 +- + kernel/time/timer.c | 30 +- + kernel/torture.c | 2 + + kernel/trace/bpf_trace.c | 8 + + kernel/trace/trace.c | 105 +- + kernel/trace/trace.h | 8 - + kernel/trace/trace_branch.c | 4 + + kernel/trace/trace_events_hist.c | 14 +- + kernel/trace/trace_stack.c | 85 +- + kernel/watchdog.c | 2 +- + kernel/workqueue.c | 54 +- + kernel/workqueue_internal.h | 5 +- + lib/Kconfig | 4 + + lib/Makefile | 1 + + lib/fault-inject.c | 12 +- + lib/stackdepot.c | 54 +- + lib/strncpy_from_user.c | 5 +- + lib/strnlen_user.c | 4 +- + lib/ubsan.c | 4 + + mm/huge_memory.c | 4 +- + mm/hugetlb.c | 2 +- + mm/kasan/Makefile | 3 + + mm/kasan/common.c | 43 +- + mm/kasan/report.c | 10 +- + mm/kmemleak.c | 24 +- + mm/madvise.c | 2 +- + mm/memory.c | 6 +- + mm/mmu_gather.c | 129 +- + mm/page_alloc.c | 7 +- + mm/page_owner.c | 82 +- + mm/slab.c | 48 +- + mm/slub.c | 21 +- + mm/vmalloc.c | 113 +- + net/ipv4/netfilter/ipt_CLUSTERIP.c | 2 +- + net/xfrm/xfrm_state.c | 30 +- + scripts/Makefile.build | 3 + + tools/build/Makefile.feature | 2 + + tools/build/feature/Makefile | 6 +- + tools/build/feature/test-all.c | 5 + + tools/build/feature/test-libzstd.c | 12 + + tools/lib/traceevent/event-parse-api.c | 278 ++- + tools/lib/traceevent/event-parse-local.h | 6 +- + tools/lib/traceevent/event-parse.c | 909 ++++---- + tools/lib/traceevent/event-parse.h | 154 +- + tools/lib/traceevent/event-plugin.c | 32 +- + tools/lib/traceevent/kbuffer-parse.c | 49 + + tools/lib/traceevent/kbuffer.h | 13 + + tools/lib/traceevent/parse-filter.c | 216 +- + tools/lib/traceevent/plugin_cfg80211.c | 8 +- + tools/lib/traceevent/plugin_function.c | 14 +- + tools/lib/traceevent/plugin_hrtimer.c | 12 +- + tools/lib/traceevent/plugin_jbd2.c | 12 +- + tools/lib/traceevent/plugin_kmem.c | 32 +- + tools/lib/traceevent/plugin_kvm.c | 48 +- + tools/lib/traceevent/plugin_mac80211.c | 8 +- + tools/lib/traceevent/plugin_sched_switch.c | 18 +- + tools/lib/traceevent/plugin_scsi.c | 8 +- + tools/lib/traceevent/plugin_xen.c | 8 +- + tools/memory-model/Documentation/explanation.txt | 289 +-- + tools/memory-model/README | 33 +- + tools/memory-model/linux-kernel.bell | 35 +- + tools/memory-model/linux-kernel.cat | 39 +- + tools/memory-model/linux-kernel.def | 6 + + tools/memory-model/lock.cat | 3 - + tools/objtool/arch.h | 8 +- + tools/objtool/arch/x86/decode.c | 21 +- + tools/objtool/builtin-check.c | 4 +- + tools/objtool/builtin.h | 2 +- + tools/objtool/check.c | 400 +++- + tools/objtool/check.h | 4 +- + tools/objtool/elf.c | 15 +- + tools/objtool/elf.h | 3 +- + tools/objtool/special.c | 18 + + tools/objtool/special.h | 1 + + tools/objtool/warn.h | 8 + + tools/perf/Documentation/perf-record.txt | 19 + + tools/perf/Makefile.config | 20 + + tools/perf/Makefile.perf | 3 + + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-list.c | 6 +- + tools/perf/builtin-record.c | 65 +- + tools/perf/builtin-stat.c | 28 +- + tools/perf/builtin-version.c | 2 + + tools/perf/examples/bpf/augmented_raw_syscalls.c | 196 +- + tools/perf/perf.h | 1 + + .../perf/pmu-events/arch/s390/cf_z14/extended.json | 2 +- + .../perf/pmu-events/arch/x86/bonnell/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 2 +- + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 260 ++- + .../perf/pmu-events/arch/x86/broadwell/cache.json | 1630 +++++++-------- + .../arch/x86/broadwell/floating-point.json | 51 +- + .../pmu-events/arch/x86/broadwell/frontend.json | 4 +- + .../perf/pmu-events/arch/x86/broadwell/memory.json | 1640 +++++++-------- + .../pmu-events/arch/x86/broadwell/pipeline.json | 36 +- + .../pmu-events/arch/x86/broadwellde/cache.json | 4 +- + .../pmu-events/arch/x86/broadwellde/pipeline.json | 6 +- + .../arch/x86/broadwellx/bdx-metrics.json | 278 ++- + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 161 +- + .../arch/x86/broadwellx/floating-point.json | 16 +- + .../pmu-events/arch/x86/broadwellx/memory.json | 148 +- + .../pmu-events/arch/x86/broadwellx/pipeline.json | 50 +- + .../arch/x86/cascadelakex/clx-metrics.json | 304 ++- + tools/perf/pmu-events/arch/x86/goldmont/cache.json | 1244 +++-------- + .../perf/pmu-events/arch/x86/goldmont/memory.json | 260 --- + .../pmu-events/arch/x86/goldmont/pipeline.json | 5 +- + .../arch/x86/goldmont/virtual-memory.json | 9 +- + .../pmu-events/arch/x86/goldmontplus/cache.json | 74 +- + .../pmu-events/arch/x86/goldmontplus/pipeline.json | 5 +- + .../arch/x86/goldmontplus/virtual-memory.json | 9 +- + tools/perf/pmu-events/arch/x86/haswell/cache.json | 175 +- + .../arch/x86/haswell/floating-point.json | 33 +- + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 234 ++- + tools/perf/pmu-events/arch/x86/haswell/memory.json | 172 +- + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 33 +- + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 173 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 252 ++- + .../perf/pmu-events/arch/x86/haswellx/memory.json | 172 +- + .../pmu-events/arch/x86/haswellx/pipeline.json | 10 +- + .../perf/pmu-events/arch/x86/ivybridge/cache.json | 10 +- + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 250 ++- + .../pmu-events/arch/x86/ivybridge/pipeline.json | 4 - + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 256 ++- + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 4 - + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 6 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 150 +- + .../pmu-events/arch/x86/jaketown/pipeline.json | 12 +- + .../pmu-events/arch/x86/knightslanding/cache.json | 666 +++--- + .../pmu-events/arch/x86/knightslanding/memory.json | 268 +-- + .../arch/x86/knightslanding/pipeline.json | 15 +- + .../arch/x86/knightslanding/virtual-memory.json | 2 +- + .../pmu-events/arch/x86/sandybridge/cache.json | 680 +++--- + .../arch/x86/sandybridge/floating-point.json | 126 +- + .../pmu-events/arch/x86/sandybridge/frontend.json | 268 +-- + .../pmu-events/arch/x86/sandybridge/memory.json | 68 +- + .../pmu-events/arch/x86/sandybridge/other.json | 18 +- + .../pmu-events/arch/x86/sandybridge/pipeline.json | 1338 ++++++------ + .../arch/x86/sandybridge/snb-metrics.json | 144 +- + .../arch/x86/sandybridge/virtual-memory.json | 108 +- + .../perf/pmu-events/arch/x86/silvermont/cache.json | 2 +- + .../perf/pmu-events/arch/x86/silvermont/other.json | 20 + + .../pmu-events/arch/x86/silvermont/pipeline.json | 5 +- + tools/perf/pmu-events/arch/x86/skylake/cache.json | 2193 +++++++++++++++++++- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 14 +- + tools/perf/pmu-events/arch/x86/skylake/memory.json | 1121 +++++++++- + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 39 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 274 ++- + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 786 ++++--- + .../arch/x86/skylakex/floating-point.json | 2 - + .../pmu-events/arch/x86/skylakex/frontend.json | 234 +-- + .../perf/pmu-events/arch/x86/skylakex/memory.json | 751 +++---- + .../pmu-events/arch/x86/skylakex/pipeline.json | 173 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 304 ++- + tools/perf/trace/beauty/renameat.c | 1 - + tools/perf/trace/strace/groups/string | 65 + + tools/perf/util/data-convert-bt.c | 4 +- + tools/perf/util/event.h | 1 + + tools/perf/util/evlist.c | 6 +- + tools/perf/util/evlist.h | 3 +- + tools/perf/util/evsel.c | 11 +- + tools/perf/util/evsel.h | 6 + + tools/perf/util/mmap.c | 4 +- + tools/perf/util/mmap.h | 3 +- + tools/perf/util/parse-events.c | 58 +- + tools/perf/util/parse-events.h | 5 + + tools/perf/util/parse-events.l | 11 +- + tools/perf/util/parse-events.y | 12 + + tools/perf/util/python.c | 2 +- + .../perf/util/scripting-engines/trace-event-perl.c | 2 +- + .../util/scripting-engines/trace-event-python.c | 2 +- + tools/perf/util/stat-display.c | 18 - + tools/perf/util/trace-event-parse.c | 2 +- + tools/perf/util/trace-event-read.c | 2 +- + tools/perf/util/trace-event.c | 4 +- + .../selftests/rcutorture/bin/configNR_CPUS.sh | 17 +- + .../selftests/rcutorture/bin/config_override.sh | 17 +- + .../selftests/rcutorture/bin/configcheck.sh | 19 +- + .../testing/selftests/rcutorture/bin/configinit.sh | 17 +- + tools/testing/selftests/rcutorture/bin/cpus2use.sh | 17 +- + .../testing/selftests/rcutorture/bin/functions.sh | 17 +- + tools/testing/selftests/rcutorture/bin/jitter.sh | 17 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 17 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 5 + + .../selftests/rcutorture/bin/kvm-recheck-lock.sh | 17 +- + .../selftests/rcutorture/bin/kvm-recheck-rcu.sh | 17 +- + .../rcutorture/bin/kvm-recheck-rcuperf-ftrace.sh | 17 +- + .../rcutorture/bin/kvm-recheck-rcuperf.sh | 17 +- + .../selftests/rcutorture/bin/kvm-recheck.sh | 17 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 17 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 17 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 15 +- + .../selftests/rcutorture/bin/parse-build.sh | 17 +- + .../selftests/rcutorture/bin/parse-console.sh | 17 +- + .../rcutorture/configs/lock/ver_functions.sh | 17 +- + .../rcutorture/configs/rcu/ver_functions.sh | 17 +- + .../rcutorture/configs/rcuperf/ver_functions.sh | 17 +- + 569 files changed, 20485 insertions(+), 15733 deletions(-) + delete mode 100644 arch/alpha/include/asm/rwsem.h + delete mode 100644 arch/ia64/include/asm/rwsem.h + delete mode 100644 arch/x86/include/asm/rwsem.h + delete mode 100644 arch/x86/lib/rwsem.S + delete mode 100644 include/asm-generic/rwsem.h + delete mode 100644 include/linux/rwsem-spinlock.h + create mode 100644 kernel/locking/lock_events.c + create mode 100644 kernel/locking/lock_events.h + create mode 100644 kernel/locking/lock_events_list.h + delete mode 100644 kernel/locking/rwsem-spinlock.c + create mode 100644 kernel/rcu/tree_stall.h + create mode 100644 tools/build/feature/test-libzstd.c + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/other.json + create mode 100644 tools/perf/trace/strace/groups/string +Merging clockevents/clockevents/next (dbfc6db7ba46 soc/tegra: default select TEGRA_TIMER for Tegra210) +$ git merge clockevents/clockevents/next +Auto-merging include/linux/cpuhotplug.h +Auto-merging drivers/clocksource/timer-riscv.c +Auto-merging drivers/clocksource/arm_arch_timer.c +Auto-merging drivers/clocksource/Makefile +Auto-merging drivers/clocksource/Kconfig +Auto-merging Documentation/devicetree/bindings/timer/mediatek,mtk-timer.txt +Auto-merging Documentation/arm64/silicon-errata.txt +Merge made by the 'recursive' strategy. +Merging edac-amd/for-next (74676a8e247a arm64: dts: stratix10: Use new Stratix10 EDAC bindings) +$ git merge edac-amd/for-next +Auto-merging arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + .../devicetree/bindings/edac/socfpga-eccmgr.txt | 135 ++++++++++- + MAINTAINERS | 8 +- + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 25 +- + drivers/edac/altera_edac.c | 262 ++++++++++++--------- + drivers/edac/altera_edac.h | 69 +----- + drivers/edac/amd64_edac.c | 248 ++++++++++++------- + drivers/edac/amd64_edac.h | 16 +- + drivers/edac/i10nm_base.c | 52 +++- + drivers/edac/skx_base.c | 50 +++- + drivers/edac/skx_common.c | 57 +---- + drivers/edac/skx_common.h | 8 - + include/linux/firmware/intel/stratix10-smc.h | 19 ++ + 12 files changed, 599 insertions(+), 350 deletions(-) +Merging irqchip/irq/irqchip-next (89626d4bad81 irqchip/renesas-intc-irqpin: Remove devm_kzalloc() error printing) +$ git merge irqchip/irq/irqchip-next +Auto-merging drivers/irqchip/Kconfig +Merge made by the 'recursive' strategy. + drivers/irqchip/Kconfig | 6 - + 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-v3-its.c | 77 +++++----- + drivers/irqchip/irq-imx-irqsteer.c | 4 +- + drivers/irqchip/irq-renesas-intc-irqpin.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 233 ++++++++++++++++++------------ + include/linux/irqchip/arm-gic-v3.h | 12 +- + kernel/irq/irqdomain.c | 2 +- + 11 files changed, 233 insertions(+), 189 deletions(-) +Merging ftrace/for-next (070ea1a24f40 function_graph: Place ftrace_graph_entry_stub() prototype in include/linux/ftrace.h) +$ 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/fgraph.c | 9 +- + kernel/trace/ftrace.c | 7 +- + kernel/trace/ring_buffer.c | 2 +- + kernel/trace/trace.c | 312 +++++++++++++++++++-- + kernel/trace/trace.h | 10 +- + 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_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, 1082 insertions(+), 403 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/s390/kvm/interrupt.c +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 (21137301de5a arm64: KVM: Fix perf cycle counter support for VHE) +$ 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/platforms/powernv/opal-call.c +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging Documentation/virtual/kvm/api.txt +Recorded preimage for 'include/uapi/linux/kvm.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +Recorded resolution for 'include/uapi/linux/kvm.h'. +[master 51c9c1f4dd9a] Merge remote-tracking branch 'kvm-ppc/kvm-ppc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/powerpc/DAWR-POWER9.txt | 32 + + Documentation/virtual/kvm/api.txt | 10 + + Documentation/virtual/kvm/devices/xive.txt | 197 +++++ + arch/powerpc/include/asm/hw_breakpoint.h | 8 + + arch/powerpc/include/asm/kvm_host.h | 11 +- + arch/powerpc/include/asm/kvm_ppc.h | 41 +- + arch/powerpc/include/asm/opal-api.h | 7 +- + arch/powerpc/include/asm/opal.h | 7 + + arch/powerpc/include/asm/xive.h | 17 + + arch/powerpc/include/uapi/asm/kvm.h | 46 + + arch/powerpc/kernel/hw_breakpoint.c | 62 +- + arch/powerpc/kernel/process.c | 9 +- + arch/powerpc/kernel/ptrace.c | 3 +- + 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 | 155 ++-- + arch/powerpc/kvm/book3s_hv_builtin.c | 57 ++ + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 144 ++++ + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 103 +-- + 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/platforms/powernv/opal-call.c | 3 + + arch/powerpc/sysdev/xive/native.c | 110 +++ + include/linux/kvm_host.h | 10 + + include/uapi/linux/kvm.h | 3 + + virt/kvm/kvm_main.c | 24 + + 31 files changed, 2670 insertions(+), 285 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 (72813bfbf027 xen/pvh: correctly setup the PV EFI interface for dom0) +$ 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/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 -- + 9 files changed, 44 insertions(+), 20 deletions(-) +Merging percpu/for-next (cb453ce4846b Merge branch 'for-5.2' into for-next) +$ git merge percpu/for-next +Merge made by the 'recursive' strategy. + include/linux/percpu.h | 12 +- + mm/percpu-internal.h | 15 +- + mm/percpu-km.c | 2 +- + mm/percpu-stats.c | 5 +- + mm/percpu.c | 543 ++++++++++++++++++++++++++++++++++--------------- + 5 files changed, 400 insertions(+), 177 deletions(-) +Merging workqueues/for-next (24acfb718225 workqueue: Use normal rcu) +$ git merge workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'recursive' strategy. + kernel/workqueue.c | 95 ++++++++++++++++++++++++++++++------------------------ + 1 file changed, 53 insertions(+), 42 deletions(-) +Merging drivers-x86/for-next (98e2630284ab platform/x86: alienware-wmi: fix kfree on potentially uninitialized pointer) +$ git merge drivers-x86/for-next +Merge made by the 'recursive' strategy. + drivers/platform/x86/alienware-wmi.c | 17 ++--- + drivers/platform/x86/dell-rbtn.c | 2 + + drivers/platform/x86/intel_pmc_core.c | 2 +- + drivers/platform/x86/intel_pmc_ipc.c | 6 +- + drivers/platform/x86/thinkpad_acpi.c | 134 +++++++++++++++++++++++++++++---- + drivers/platform/x86/touchscreen_dmi.c | 25 ++++++ + 6 files changed, 160 insertions(+), 26 deletions(-) +Merging chrome-platform/for-next (cdb80268a6b5 platform/chrome: wilco_ec: Add property helper library) +$ git merge chrome-platform/for-next +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 (c37f5a41b0f9 leds: turris_omnia: add I2C and MACH_ARMADA_38X dependencies) +$ git merge leds/for-next +Auto-merging sound/usb/line6/toneport.c +Merge made by the 'recursive' strategy. + Documentation/acpi/dsd/leds.txt | 99 +++ + .../devicetree/bindings/leds/leds-lm3532.txt | 101 +++ + .../devicetree/bindings/leds/leds-turris-omnia.txt | 85 +++ + Documentation/devicetree/bindings/mfd/ti-lmu.txt | 20 - + arch/arm/boot/dts/omap4-droid4-xt894.dts | 27 +- + drivers/leds/Kconfig | 47 +- + drivers/leds/Makefile | 2 + + drivers/leds/leds-as3645a.c | 93 +-- + drivers/leds/leds-blinkm.c | 1 - + drivers/leds/leds-lm3532.c | 683 +++++++++++++++++++++ + drivers/leds/leds-lt3593.c | 64 +- + drivers/leds/leds-pca955x.c | 57 +- + drivers/leds/leds-pca963x.c | 66 +- + drivers/leds/leds-turris-omnia.c | 200 ++++++ + drivers/mfd/ti-lmu.c | 11 - + include/linux/mfd/ti-lmu-register.h | 44 -- + include/linux/mfd/ti-lmu.h | 1 - + sound/usb/line6/toneport.c | 8 +- + 18 files changed, 1317 insertions(+), 292 deletions(-) + create mode 100644 Documentation/acpi/dsd/leds.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-lm3532.txt + create mode 100644 Documentation/devicetree/bindings/leds/leds-turris-omnia.txt + create mode 100644 drivers/leds/leds-lm3532.c + create mode 100644 drivers/leds/leds-turris-omnia.c +Merging ipmi/for-next (ed6c3a6d8996 ipmi: Remove warning if no slave address is present) +$ git merge ipmi/for-next +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-devices-platform-ipmi | 2 +- + drivers/char/ipmi/ipmi_devintf.c | 3 --- + drivers/char/ipmi/ipmi_dmi.c | 2 ++ + drivers/char/ipmi/ipmi_msghandler.c | 4 ++-- + drivers/char/ipmi/ipmi_plat_data.c | 27 ++++++++++++---------- + drivers/char/ipmi/ipmi_plat_data.h | 3 +++ + drivers/char/ipmi/ipmi_si_hardcode.c | 1 + + drivers/char/ipmi/ipmi_si_hotmod.c | 1 + + drivers/char/ipmi/ipmi_si_intf.c | 2 -- + drivers/char/ipmi/ipmi_si_platform.c | 6 ++--- + drivers/char/ipmi/ipmi_ssif.c | 11 ++++++--- + 11 files changed, 35 insertions(+), 27 deletions(-) +Merging driver-core/driver-core-next (391c0325cc5f Revert "driver core: platform: Fix the usage of platform device name(pdev->name)") +$ git merge driver-core/driver-core-next +Auto-merging net/core/net-sysfs.c +Auto-merging kernel/sched/cpufreq_schedutil.c +Auto-merging kernel/irq/irqdesc.c +Auto-merging kernel/Makefile +Auto-merging include/linux/kernfs.h +Auto-merging include/linux/device.h +Auto-merging include/linux/acpi.h +Auto-merging fs/kernfs/dir.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/base/power/wakeup.c +Auto-merging drivers/base/power/main.c +Auto-merging drivers/base/power/domain_governor.c +Auto-merging drivers/base/power/domain.c +Auto-merging drivers/acpi/tables.c +Auto-merging drivers/acpi/scan.c +Auto-merging block/blk-sysfs.c +CONFLICT (content): Merge conflict in block/blk-sysfs.c +Auto-merging block/blk-mq-sysfs.c +Auto-merging block/blk-integrity.c +Resolved 'block/blk-sysfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master bdfe223f3b60] Merge remote-tracking branch 'driver-core/driver-core-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-devices-node | 87 +++- + Documentation/admin-guide/mm/numaperf.rst | 169 ++++++ + Documentation/filesystems/debugfs.txt | 16 +- + arch/arm64/kernel/acpi_numa.c | 2 +- + arch/arm64/kernel/smp.c | 4 +- + arch/ia64/kernel/acpi.c | 14 +- + arch/x86/kernel/acpi/boot.c | 36 +- + block/blk-integrity.c | 3 +- + block/blk-mq-sysfs.c | 8 +- + drivers/acpi/Kconfig | 1 + + drivers/acpi/Makefile | 1 + + drivers/acpi/hmat/Kconfig | 11 + + drivers/acpi/hmat/Makefile | 1 + + drivers/acpi/hmat/hmat.c | 666 ++++++++++++++++++++++++ + drivers/acpi/numa.c | 16 +- + drivers/acpi/scan.c | 4 +- + drivers/acpi/tables.c | 76 ++- + drivers/base/Kconfig | 9 +- + drivers/base/arch_topology.c | 36 +- + drivers/base/core.c | 5 + + drivers/base/dd.c | 5 +- + drivers/base/firmware_loader/Kconfig | 1 + + drivers/base/firmware_loader/builtin/.gitignore | 1 + + drivers/base/node.c | 352 ++++++++++++- + drivers/base/platform.c | 12 +- + drivers/base/power/clock_ops.c | 3 +- + drivers/base/power/common.c | 4 +- + drivers/base/power/domain.c | 4 +- + drivers/base/power/domain_governor.c | 4 +- + drivers/base/power/generic_ops.c | 4 +- + drivers/base/power/main.c | 4 +- + drivers/base/power/qos.c | 6 +- + drivers/base/power/runtime.c | 4 +- + drivers/base/power/sysfs.c | 6 +- + drivers/base/power/trace.c | 2 +- + drivers/base/power/wakeirq.c | 15 +- + drivers/base/power/wakeup.c | 4 +- + drivers/base/test/Makefile | 1 + + drivers/irqchip/irq-gic-v2m.c | 2 +- + drivers/irqchip/irq-gic-v3-its-pci-msi.c | 2 +- + drivers/irqchip/irq-gic-v3-its-platform-msi.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 6 +- + drivers/irqchip/irq-gic-v3.c | 10 +- + drivers/irqchip/irq-gic.c | 4 +- + drivers/mailbox/pcc.c | 2 +- + fs/debugfs/file.c | 77 ++- + fs/kernfs/dir.c | 5 +- + include/acpi/actbl1.h | 2 +- + include/linux/acpi.h | 6 +- + include/linux/device.h | 16 +- + include/linux/kernfs.h | 2 +- + include/linux/kobject.h | 3 +- + include/linux/node.h | 71 +++ + init/Kconfig | 11 +- + kernel/.gitignore | 1 + + kernel/Makefile | 10 + + kernel/gen_ikh_data.sh | 89 ++++ + kernel/irq/irqdesc.c | 3 +- + kernel/kheaders.c | 74 +++ + kernel/livepatch/core.c | 3 +- + kernel/padata.c | 3 +- + kernel/sched/cpufreq_schedutil.c | 5 +- + lib/kobject.c | 40 +- + lib/kobject_uevent.c | 11 +- + net/core/net-sysfs.c | 6 +- + samples/kobject/kset-example.c | 3 +- + 66 files changed, 1820 insertions(+), 246 deletions(-) + create mode 100644 Documentation/admin-guide/mm/numaperf.rst + create mode 100644 drivers/acpi/hmat/Kconfig + create mode 100644 drivers/acpi/hmat/Makefile + create mode 100644 drivers/acpi/hmat/hmat.c + create mode 100755 kernel/gen_ikh_data.sh + create mode 100644 kernel/kheaders.c +Merging usb/usb-next (e823d948b7e5 usb: musb: dsps: Use dev_get_drvdata()) +$ git merge usb/usb-next +Auto-merging include/linux/usb.h +Auto-merging drivers/usb/usbip/stub_rx.c +Auto-merging drivers/usb/gadget/udc/dummy_hcd.c +Auto-merging drivers/phy/ti/Kconfig +Auto-merging drivers/phy/qualcomm/phy-qcom-ufs.c +Auto-merging MAINTAINERS +Removing Documentation/devicetree/bindings/usb/usb-ohci.txt +Removing Documentation/devicetree/bindings/usb/usb-hcd.txt +Removing Documentation/devicetree/bindings/usb/usb-ehci.txt +Auto-merging Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt +Merge made by the 'recursive' strategy. + Documentation/ABI/testing/sysfs-driver-ucsi-ccg | 6 + + Documentation/ABI/testing/usb-uevent | 27 + + .../bindings/phy/brcm,stingray-usb-phy.txt | 32 + + .../devicetree/bindings/phy/fsl,imx8mq-usb-phy.txt | 3 + + .../bindings/phy/meson-g12a-usb2-phy.txt | 22 + + .../bindings/phy/meson-g12a-usb3-pcie-phy.txt | 22 + + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 9 + + .../devicetree/bindings/phy/phy-hi3660-usb3.txt | 26 + + .../devicetree/bindings/phy/phy-mtk-ufs.txt | 38 + + .../devicetree/bindings/phy/qcom-qmp-phy.txt | 14 +- + .../devicetree/bindings/phy/rcar-gen2-phy.txt | 57 +- + .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 14 +- + .../devicetree/bindings/phy/rockchip-emmc-phy.txt | 8 +- + .../bindings/phy/ti,phy-am654-serdes.txt | 82 ++ + Documentation/devicetree/bindings/ufs/ufs-qcom.txt | 5 +- + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 3 + + .../devicetree/bindings/usb/generic-ehci.yaml | 95 +++ + .../devicetree/bindings/usb/generic-ohci.yaml | 89 ++ + .../bindings/usb/ingenic,jz4740-musb.txt | 8 + + .../bindings/usb/nvidia,tegra124-xusb.txt | 4 + + .../devicetree/bindings/usb/renesas_usbhs.txt | 1 + + Documentation/devicetree/bindings/usb/usb-ehci.txt | 46 -- + Documentation/devicetree/bindings/usb/usb-hcd.txt | 9 - + Documentation/devicetree/bindings/usb/usb-hcd.yaml | 25 + + Documentation/devicetree/bindings/usb/usb-ohci.txt | 35 - + Documentation/devicetree/bindings/usb/usb-xhci.txt | 1 + + Documentation/usb/WUSB-Design-overview.txt | 56 +- + Documentation/usb/acm.txt | 164 ++-- + Documentation/usb/authorization.txt | 75 +- + Documentation/usb/chipidea.txt | 101 ++- + Documentation/usb/dwc3.txt | 12 +- + Documentation/usb/ehci.txt | 42 +- + Documentation/usb/functionfs.txt | 17 +- + Documentation/usb/gadget-testing.txt | 611 ++++++++------ + Documentation/usb/gadget_configfs.txt | 306 +++---- + Documentation/usb/gadget_hid.txt | 175 ++-- + Documentation/usb/gadget_multi.txt | 43 +- + Documentation/usb/gadget_printer.txt | 155 ++-- + Documentation/usb/gadget_serial.txt | 75 +- + Documentation/usb/iuu_phoenix.txt | 34 +- + Documentation/usb/mass-storage.txt | 19 +- + Documentation/usb/misc_usbsevseg.txt | 9 +- + Documentation/usb/mtouchusb.txt | 42 +- + Documentation/usb/ohci.txt | 5 +- + Documentation/usb/rio.txt | 83 +- + Documentation/usb/usb-help.txt | 21 +- + Documentation/usb/usb-serial.txt | 205 +++-- + Documentation/usb/usbip_protocol.txt | 552 +++++++------ + Documentation/usb/usbmon.txt | 100 ++- + MAINTAINERS | 13 + + drivers/i2c/busses/i2c-nvidia-gpu.c | 7 + + drivers/phy/amlogic/Kconfig | 22 + + drivers/phy/amlogic/Makefile | 2 + + drivers/phy/amlogic/phy-meson-g12a-usb2.c | 341 ++++++++ + drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c | 413 ++++++++++ + drivers/phy/amlogic/phy-meson-gxl-usb2.c | 11 +- + drivers/phy/broadcom/Kconfig | 11 + + drivers/phy/broadcom/Makefile | 1 + + drivers/phy/broadcom/phy-bcm-sr-usb.c | 394 +++++++++ + drivers/phy/freescale/phy-fsl-imx8mq-usb.c | 12 + + drivers/phy/hisilicon/Kconfig | 10 + + drivers/phy/hisilicon/Makefile | 1 + + drivers/phy/hisilicon/phy-hi3660-usb3.c | 233 ++++++ + drivers/phy/mediatek/Kconfig | 10 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-tphy.c | 10 +- + drivers/phy/mediatek/phy-mtk-ufs.c | 245 ++++++ + drivers/phy/mscc/phy-ocelot-serdes.c | 240 +++++- + drivers/phy/phy-core.c | 11 + + drivers/phy/qualcomm/phy-qcom-qmp.c | 222 +++-- + drivers/phy/qualcomm/phy-qcom-qmp.h | 12 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 11 +- + drivers/phy/qualcomm/phy-qcom-ufs-i.h | 5 +- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-14nm.c | 25 +- + drivers/phy/qualcomm/phy-qcom-ufs-qmp-20nm.c | 25 +- + drivers/phy/qualcomm/phy-qcom-ufs.c | 57 +- + drivers/phy/renesas/Kconfig | 2 +- + drivers/phy/renesas/phy-rcar-gen2.c | 130 ++- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 232 +++++- + drivers/phy/rockchip/phy-rockchip-emmc.c | 30 +- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 10 +- + drivers/phy/socionext/phy-uniphier-usb3ss.c | 10 +- + drivers/phy/tegra/Makefile | 1 + + drivers/phy/tegra/xusb-tegra186.c | 899 +++++++++++++++++++++ + drivers/phy/tegra/xusb.c | 67 +- + drivers/phy/tegra/xusb.h | 35 + + drivers/phy/ti/Kconfig | 12 + + drivers/phy/ti/Makefile | 1 + + drivers/phy/ti/phy-am654-serdes.c | 658 +++++++++++++++ + drivers/phy/ti/phy-ti-pipe3.c | 362 ++++++--- + drivers/scsi/ufs/Kconfig | 1 + + drivers/scsi/ufs/ufs-qcom.c | 114 ++- + drivers/scsi/ufs/ufs-qcom.h | 4 + + drivers/soc/sunxi/Kconfig | 1 + + drivers/usb/chipidea/ci_hdrc_msm.c | 9 +- + drivers/usb/class/cdc-acm.c | 63 +- + drivers/usb/class/cdc-acm.h | 3 +- + drivers/usb/common/common.c | 16 + + drivers/usb/core/hcd.c | 44 +- + drivers/usb/core/hub.c | 18 +- + drivers/usb/dwc2/platform.c | 6 +- + drivers/usb/dwc3/Kconfig | 6 +- + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 6 +- + drivers/usb/gadget/udc/dummy_hcd.c | 16 +- + drivers/usb/host/fhci-sched.c | 10 +- + drivers/usb/host/u132-hcd.c | 2 + + drivers/usb/host/xhci-hub.c | 44 +- + drivers/usb/host/xhci-mtk.c | 19 +- + drivers/usb/host/xhci-plat.c | 39 +- + drivers/usb/host/xhci-ring.c | 24 +- + drivers/usb/host/xhci-tegra.c | 68 +- + drivers/usb/host/xhci-trace.h | 30 + + drivers/usb/host/xhci.c | 40 +- + drivers/usb/host/xhci.h | 46 ++ + drivers/usb/misc/usb251xb.c | 62 ++ + drivers/usb/misc/usb3503.c | 48 +- + drivers/usb/mtu3/Makefile | 11 + + drivers/usb/mtu3/mtu3.h | 57 +- + drivers/usb/mtu3/mtu3_core.c | 27 +- + drivers/usb/mtu3/mtu3_debug.h | 50 ++ + drivers/usb/mtu3/mtu3_debugfs.c | 539 ++++++++++++ + drivers/usb/mtu3/mtu3_dr.c | 156 +--- + drivers/usb/mtu3/mtu3_dr.h | 4 + + drivers/usb/mtu3/mtu3_gadget.c | 20 +- + drivers/usb/mtu3/mtu3_gadget_ep0.c | 4 + + drivers/usb/mtu3/mtu3_hw_regs.h | 48 +- + drivers/usb/mtu3/mtu3_plat.c | 47 +- + drivers/usb/mtu3/mtu3_qmu.c | 118 ++- + drivers/usb/mtu3/mtu3_qmu.h | 1 + + drivers/usb/mtu3/mtu3_trace.c | 23 + + drivers/usb/mtu3/mtu3_trace.h | 279 +++++++ + drivers/usb/musb/Kconfig | 2 +- + drivers/usb/musb/jz4740.c | 19 +- + drivers/usb/musb/musb_core.c | 9 +- + drivers/usb/musb/musb_dsps.c | 6 +- + drivers/usb/musb/omap2430.c | 6 + + drivers/usb/storage/scsiglue.c | 26 +- + drivers/usb/storage/sierra_ms.c | 4 +- + drivers/usb/storage/uas.c | 35 +- + drivers/usb/typec/altmodes/Kconfig | 10 + + drivers/usb/typec/altmodes/Makefile | 2 + + drivers/usb/typec/altmodes/displayport.c | 14 +- + drivers/usb/typec/altmodes/displayport.h | 8 + + drivers/usb/typec/altmodes/nvidia.c | 44 + + drivers/usb/typec/mux/pi3usb30532.c | 3 +- + drivers/usb/typec/tcpm/fusb302.c | 438 +++++----- + drivers/usb/typec/tcpm/tcpci.c | 10 +- + drivers/usb/typec/tcpm/tcpm.c | 32 +- + drivers/usb/typec/tcpm/wcove.c | 39 +- + drivers/usb/typec/ucsi/Makefile | 15 +- + drivers/usb/typec/ucsi/displayport.c | 315 ++++++++ + drivers/usb/typec/ucsi/trace.c | 12 + + drivers/usb/typec/ucsi/trace.h | 26 + + drivers/usb/typec/ucsi/ucsi.c | 404 ++++++--- + drivers/usb/typec/ucsi/ucsi.h | 118 +++ + drivers/usb/typec/ucsi/ucsi_ccg.c | 884 +++++++++++++++++++- + drivers/usb/usbip/stub_rx.c | 6 +- + drivers/usb/usbip/vhci_hcd.c | 9 +- + include/dt-bindings/phy/phy-am654-serdes.h | 13 + + include/linux/phy/phy.h | 2 + + include/linux/usb.h | 2 +- + include/linux/usb/ch9.h | 8 + + include/linux/usb/hcd.h | 1 + + include/linux/usb/tcpm.h | 13 +- + include/linux/usb/typec_dp.h | 5 + + 165 files changed, 10461 insertions(+), 2579 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-ucsi-ccg + create mode 100644 Documentation/ABI/testing/usb-uevent + create mode 100644 Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/meson-g12a-usb3-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-hi3660-usb3.txt + create mode 100644 Documentation/devicetree/bindings/phy/phy-mtk-ufs.txt + create mode 100644 Documentation/devicetree/bindings/phy/ti,phy-am654-serdes.txt + create mode 100644 Documentation/devicetree/bindings/usb/generic-ehci.yaml + create mode 100644 Documentation/devicetree/bindings/usb/generic-ohci.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-ehci.txt + delete mode 100644 Documentation/devicetree/bindings/usb/usb-hcd.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-hcd.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-ohci.txt + create mode 100644 drivers/phy/amlogic/phy-meson-g12a-usb2.c + create mode 100644 drivers/phy/amlogic/phy-meson-g12a-usb3-pcie.c + create mode 100644 drivers/phy/broadcom/phy-bcm-sr-usb.c + create mode 100644 drivers/phy/hisilicon/phy-hi3660-usb3.c + create mode 100644 drivers/phy/mediatek/phy-mtk-ufs.c + create mode 100644 drivers/phy/tegra/xusb-tegra186.c + create mode 100644 drivers/phy/ti/phy-am654-serdes.c + create mode 100644 drivers/usb/mtu3/mtu3_debug.h + create mode 100644 drivers/usb/mtu3/mtu3_debugfs.c + create mode 100644 drivers/usb/mtu3/mtu3_trace.c + create mode 100644 drivers/usb/mtu3/mtu3_trace.h + create mode 100644 drivers/usb/typec/altmodes/displayport.h + create mode 100644 drivers/usb/typec/altmodes/nvidia.c + create mode 100644 drivers/usb/typec/ucsi/displayport.c + create mode 100644 include/dt-bindings/phy/phy-am654-serdes.h +Merging usb-gadget/next (5895d311d28f usb: phy: twl6030-usb: fix possible use-after-free on remove) +$ git merge usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (80ed53707bb3 USB: serial: drop unused iflag macro) +$ git merge usb-serial/usb-next +Merge made by the 'recursive' strategy. + drivers/usb/serial/ark3116.c | 11 ------ + drivers/usb/serial/cypress_m8.c | 49 ++++------------------- + drivers/usb/serial/digi_acceleport.c | 41 ++++++++++--------- + drivers/usb/serial/generic.c | 76 +++++++++++++++++++----------------- + drivers/usb/serial/iuu_phoenix.c | 4 +- + drivers/usb/serial/oti6858.c | 5 +-- + drivers/usb/serial/pl2303.c | 58 ++++++++++++++++++++++----- + drivers/usb/serial/spcp8x5.c | 5 +-- + drivers/usb/serial/usb-serial.c | 11 ++++-- + include/linux/usb/serial.h | 8 +--- + 10 files changed, 129 insertions(+), 139 deletions(-) +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 (45c054d0815b tty: serial: add driver for the SiFive UART) +$ git merge tty/tty-next +Auto-merging MAINTAINERS +Removing Documentation/serial/n_gsm.txt +Removing Documentation/serial/moxa-smartio +Merge made by the 'recursive' strategy. + .../devicetree/bindings/serial/cdns,uart.txt | 5 + + .../devicetree/bindings/serial/nxp,sc16is7xx.txt | 2 + + .../devicetree/bindings/serial/sifive-serial.txt | 33 + + .../devicetree/bindings/serial/sprd-uart.txt | 17 +- + .../serial/{README.cycladesZ => cyclades_z.rst} | 5 +- + Documentation/serial/{driver => driver.rst} | 115 ++- + Documentation/serial/index.rst | 32 + + Documentation/serial/moxa-smartio | 523 ---------- + Documentation/serial/moxa-smartio.rst | 615 ++++++++++++ + Documentation/serial/n_gsm.rst | 103 ++ + Documentation/serial/n_gsm.txt | 96 -- + Documentation/serial/{rocket.txt => rocket.rst} | 152 ++- + .../{serial-iso7816.txt => serial-iso7816.rst} | 21 +- + .../serial/{serial-rs485.txt => serial-rs485.rst} | 22 +- + Documentation/serial/{tty.txt => tty.rst} | 111 +- + MAINTAINERS | 4 +- + drivers/char/virtio_console.c | 3 +- + drivers/tty/Kconfig | 22 +- + drivers/tty/Makefile | 1 + + drivers/tty/hvc/Kconfig | 3 +- + drivers/tty/ipwireless/Makefile | 1 + + drivers/tty/ipwireless/main.c | 8 + + drivers/tty/n_tty.c | 4 +- + drivers/tty/rocket.c | 14 +- + drivers/tty/rocket.h | 1 - + drivers/tty/serdev/Kconfig | 1 + + drivers/tty/serdev/Makefile | 1 + + drivers/tty/serial/8250/8250_exar.c | 7 +- + drivers/tty/serial/8250/8250_fintek.c | 5 +- + drivers/tty/serial/8250/8250_men_mcb.c | 1 + + drivers/tty/serial/8250/8250_mtk.c | 162 ++- + drivers/tty/serial/8250/Kconfig | 1 + + drivers/tty/serial/Kconfig | 54 +- + drivers/tty/serial/Makefile | 2 + + drivers/tty/serial/cpm_uart/Makefile | 1 + + drivers/tty/serial/jsm/Makefile | 1 + + drivers/tty/serial/milbeaut_usio.c | 614 ++++++++++++ + drivers/tty/serial/sc16is7xx.c | 34 +- + drivers/tty/serial/serial_core.c | 30 +- + drivers/tty/serial/sifive.c | 1056 ++++++++++++++++++++ + drivers/tty/serial/sn_console.c | 1 + + drivers/tty/serial/sprd_serial.c | 501 +++++++++- + drivers/tty/serial/ucc_uart.c | 2 +- + drivers/tty/serial/xilinx_uartps.c | 12 + + drivers/tty/sysrq.c | 6 +- + drivers/tty/tty_io.c | 2 +- + drivers/tty/tty_jobctrl.c | 4 +- + drivers/tty/tty_port.c | 10 +- + drivers/tty/ttynull.c | 109 ++ + drivers/tty/vcc.c | 1 + + drivers/tty/vt/.gitignore | 1 + + drivers/tty/vt/consolemap.c | 8 +- + drivers/tty/vt/cp437.uni | 1 + + drivers/tty/vt/defkeymap.c_shipped | 1 + + drivers/tty/vt/defkeymap.map | 1 + + drivers/tty/vt/keyboard.c | 35 +- + drivers/tty/vt/vc_screen.c | 2 +- + drivers/tty/vt/vt.c | 2 - + include/linux/serial_core.h | 2 +- + include/uapi/linux/serial_core.h | 6 + + 60 files changed, 3679 insertions(+), 911 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/sifive-serial.txt + rename Documentation/serial/{README.cycladesZ => cyclades_z.rst} (85%) + rename Documentation/serial/{driver => driver.rst} (92%) + create mode 100644 Documentation/serial/index.rst + delete mode 100644 Documentation/serial/moxa-smartio + create mode 100644 Documentation/serial/moxa-smartio.rst + create mode 100644 Documentation/serial/n_gsm.rst + delete mode 100644 Documentation/serial/n_gsm.txt + rename Documentation/serial/{rocket.txt => rocket.rst} (68%) + rename Documentation/serial/{serial-iso7816.txt => serial-iso7816.rst} (85%) + rename Documentation/serial/{serial-rs485.txt => serial-rs485.rst} (89%) + rename Documentation/serial/{tty.txt => tty.rst} (74%) + create mode 100644 drivers/tty/serial/milbeaut_usio.c + create mode 100644 drivers/tty/serial/sifive.c + create mode 100644 drivers/tty/ttynull.c +Merging char-misc/char-misc-next (e21107aa6bf3 Merge tag 'soundwire-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into char-misc-next) +$ git merge char-misc/char-misc-next +Removing drivers/thunderbolt/tunnel_pci.h +Removing drivers/thunderbolt/tunnel_pci.c +Auto-merging drivers/misc/mei/hw-me.c +Auto-merging drivers/misc/cardreader/rts5260.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 +Removing drivers/hwtracing/coresight/coresight-dynamic-replicator.c +Auto-merging MAINTAINERS +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 4310f72d5063] Merge remote-tracking branch 'char-misc/char-misc-next' +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-bus-nvmem | 2 + + Documentation/ABI/testing/sysfs-class-mei | 15 + + .../devicetree/bindings/misc/aspeed-p2a-ctrl.txt | 47 ++ + .../bindings/nvmem/allwinner,sunxi-sid.txt | 3 +- + .../devicetree/bindings/nvmem/imx-ocotp.txt | 4 +- + .../devicetree/bindings/nvmem/st,stm32-romem.txt | 31 + + MAINTAINERS | 1 + + drivers/android/binder.c | 12 +- + drivers/char/hpet.c | 2 + + drivers/extcon/Kconfig | 9 +- + drivers/extcon/Makefile | 1 + + drivers/extcon/devres.c | 2 +- + drivers/extcon/extcon-arizona.c | 10 + + drivers/extcon/extcon-intel-cht-wc.c | 81 +- + drivers/extcon/extcon-intel-mrfld.c | 284 +++++++ + drivers/extcon/extcon-intel.h | 20 + + drivers/firmware/google/vpd.c | 4 +- + drivers/hwtracing/coresight/Kconfig | 9 +- + drivers/hwtracing/coresight/Makefile | 1 - + drivers/hwtracing/coresight/coresight-catu.c | 7 +- + drivers/hwtracing/coresight/coresight-catu.h | 5 - + .../coresight/coresight-dynamic-replicator.c | 255 ------ + drivers/hwtracing/coresight/coresight-etb10.c | 97 ++- + drivers/hwtracing/coresight/coresight-etm-perf.c | 37 +- + drivers/hwtracing/coresight/coresight-etm4x.c | 114 ++- + drivers/hwtracing/coresight/coresight-replicator.c | 232 +++++- + drivers/hwtracing/coresight/coresight-tmc-etf.c | 82 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 266 ++++++- + drivers/hwtracing/coresight/coresight-tmc.c | 17 +- + drivers/hwtracing/coresight/coresight-tmc.h | 12 + + drivers/hwtracing/coresight/coresight-tpiu.c | 18 +- + drivers/hwtracing/coresight/coresight.c | 29 +- + drivers/interconnect/core.c | 13 +- + drivers/misc/Kconfig | 8 + + drivers/misc/Makefile | 1 + + drivers/misc/aspeed-p2a-ctrl.c | 444 +++++++++++ + drivers/misc/cardreader/rts5260.c | 4 +- + drivers/misc/fastrpc.c | 235 ++++-- + drivers/misc/genwqe/card_debugfs.c | 4 +- + drivers/misc/habanalabs/Makefile | 2 +- + drivers/misc/habanalabs/command_buffer.c | 7 + + drivers/misc/habanalabs/command_submission.c | 5 +- + drivers/misc/habanalabs/debugfs.c | 96 ++- + drivers/misc/habanalabs/device.c | 77 +- + drivers/misc/habanalabs/firmware_if.c | 325 ++++++++ + drivers/misc/habanalabs/goya/Makefile | 3 +- + drivers/misc/habanalabs/goya/goya.c | 884 +++++---------------- + drivers/misc/habanalabs/goya/goyaP.h | 47 +- + drivers/misc/habanalabs/goya/goya_coresight.c | 620 +++++++++++++++ + drivers/misc/habanalabs/goya/goya_security.c | 15 +- + drivers/misc/habanalabs/habanalabs.h | 110 ++- + drivers/misc/habanalabs/habanalabs_drv.c | 7 +- + drivers/misc/habanalabs/habanalabs_ioctl.c | 139 +++- + drivers/misc/habanalabs/include/armcp_if.h | 10 +- + .../include/goya/asic_reg/cpu_ca53_cfg_masks.h | 1 - + .../include/goya/asic_reg/cpu_ca53_cfg_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/cpu_if_regs.h | 1 - + .../include/goya/asic_reg/cpu_pll_regs.h | 1 - + .../include/goya/asic_reg/dma_ch_0_regs.h | 1 - + .../include/goya/asic_reg/dma_ch_1_regs.h | 1 - + .../include/goya/asic_reg/dma_ch_2_regs.h | 1 - + .../include/goya/asic_reg/dma_ch_3_regs.h | 1 - + .../include/goya/asic_reg/dma_ch_4_regs.h | 1 - + .../include/goya/asic_reg/dma_macro_masks.h | 1 - + .../include/goya/asic_reg/dma_macro_regs.h | 1 - + .../include/goya/asic_reg/dma_nrtr_masks.h | 1 - + .../include/goya/asic_reg/dma_nrtr_regs.h | 1 - + .../include/goya/asic_reg/dma_qm_0_masks.h | 1 - + .../include/goya/asic_reg/dma_qm_0_regs.h | 1 - + .../include/goya/asic_reg/dma_qm_1_regs.h | 1 - + .../include/goya/asic_reg/dma_qm_2_regs.h | 1 - + .../include/goya/asic_reg/dma_qm_3_regs.h | 1 - + .../include/goya/asic_reg/dma_qm_4_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/goya_masks.h | 12 - + .../habanalabs/include/goya/asic_reg/goya_regs.h | 3 +- + .../habanalabs/include/goya/asic_reg/ic_pll_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/mc_pll_regs.h | 1 - + .../include/goya/asic_reg/mme1_rtr_masks.h | 1 - + .../include/goya/asic_reg/mme1_rtr_regs.h | 1 - + .../include/goya/asic_reg/mme2_rtr_regs.h | 1 - + .../include/goya/asic_reg/mme3_rtr_regs.h | 1 - + .../include/goya/asic_reg/mme4_rtr_regs.h | 1 - + .../include/goya/asic_reg/mme5_rtr_regs.h | 1 - + .../include/goya/asic_reg/mme6_rtr_regs.h | 1 - + .../include/goya/asic_reg/mme_cmdq_masks.h | 1 - + .../include/goya/asic_reg/mme_cmdq_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/mme_masks.h | 1 - + .../include/goya/asic_reg/mme_qm_masks.h | 1 - + .../habanalabs/include/goya/asic_reg/mme_qm_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/mme_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/mmu_masks.h | 1 - + .../habanalabs/include/goya/asic_reg/mmu_regs.h | 1 - + .../include/goya/asic_reg/pci_nrtr_masks.h | 1 - + .../include/goya/asic_reg/pci_nrtr_regs.h | 1 - + .../include/goya/asic_reg/pcie_aux_regs.h | 1 - + .../include/goya/asic_reg/pcie_wrap_regs.h | 306 +++++++ + .../include/goya/asic_reg/psoc_emmc_pll_regs.h | 1 - + .../include/goya/asic_reg/psoc_global_conf_masks.h | 1 - + .../include/goya/asic_reg/psoc_global_conf_regs.h | 1 - + .../include/goya/asic_reg/psoc_mme_pll_regs.h | 1 - + .../include/goya/asic_reg/psoc_pci_pll_regs.h | 1 - + .../include/goya/asic_reg/psoc_spi_regs.h | 1 - + .../include/goya/asic_reg/sram_y0_x0_rtr_regs.h | 1 - + .../include/goya/asic_reg/sram_y0_x1_rtr_regs.h | 1 - + .../include/goya/asic_reg/sram_y0_x2_rtr_regs.h | 1 - + .../include/goya/asic_reg/sram_y0_x3_rtr_regs.h | 1 - + .../include/goya/asic_reg/sram_y0_x4_rtr_regs.h | 1 - + .../habanalabs/include/goya/asic_reg/stlb_masks.h | 1 - + .../habanalabs/include/goya/asic_reg/stlb_regs.h | 1 - + .../include/goya/asic_reg/tpc0_cfg_masks.h | 1 - + .../include/goya/asic_reg/tpc0_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc0_cmdq_masks.h | 1 - + .../include/goya/asic_reg/tpc0_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc0_eml_cfg_masks.h | 1 - + .../include/goya/asic_reg/tpc0_eml_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc0_nrtr_masks.h | 1 - + .../include/goya/asic_reg/tpc0_nrtr_regs.h | 1 - + .../include/goya/asic_reg/tpc0_qm_masks.h | 1 - + .../include/goya/asic_reg/tpc0_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc1_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc1_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc1_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc1_rtr_regs.h | 1 - + .../include/goya/asic_reg/tpc2_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc2_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc2_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc2_rtr_regs.h | 1 - + .../include/goya/asic_reg/tpc3_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc3_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc3_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc3_rtr_regs.h | 1 - + .../include/goya/asic_reg/tpc4_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc4_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc4_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc4_rtr_regs.h | 1 - + .../include/goya/asic_reg/tpc5_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc5_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc5_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc5_rtr_regs.h | 1 - + .../include/goya/asic_reg/tpc6_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc6_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc6_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc6_rtr_regs.h | 1 - + .../include/goya/asic_reg/tpc7_cfg_regs.h | 1 - + .../include/goya/asic_reg/tpc7_cmdq_regs.h | 1 - + .../include/goya/asic_reg/tpc7_nrtr_regs.h | 1 - + .../include/goya/asic_reg/tpc7_qm_regs.h | 1 - + .../include/goya/asic_reg/tpc_pll_regs.h | 1 - + drivers/misc/habanalabs/include/goya/goya.h | 4 - + .../habanalabs/include/goya/goya_async_events.h | 9 + + .../misc/habanalabs/include/goya/goya_coresight.h | 199 +++++ + drivers/misc/habanalabs/include/goya/goya_fw_if.h | 2 + + drivers/misc/habanalabs/include/hl_boot_if.h | 3 +- + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 16 +- + .../habanalabs/include/hw_ip/pci/pci_general.h | 23 + + drivers/misc/habanalabs/memory.c | 193 ++--- + drivers/misc/habanalabs/mmu.c | 600 +++++++------- + drivers/misc/habanalabs/pci.c | 402 ++++++++++ + drivers/misc/kgdbts.c | 4 +- + drivers/misc/mei/Kconfig | 12 +- + drivers/misc/mei/Makefile | 2 +- + drivers/misc/mei/bus-fixup.c | 14 +- + drivers/misc/mei/bus.c | 13 +- + drivers/misc/mei/client.c | 16 +- + drivers/misc/mei/client.h | 14 +- + drivers/misc/mei/debugfs.c | 15 +- + drivers/misc/mei/dma-ring.c | 2 +- + drivers/misc/mei/hbm.c | 15 +- + drivers/misc/mei/hbm.h | 14 +- + drivers/misc/mei/hdcp/Kconfig | 13 + + drivers/misc/mei/hdcp/Makefile | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 2 +- + drivers/misc/mei/hdcp/mei_hdcp.h | 2 +- + drivers/misc/mei/hw-me-regs.h | 68 +- + drivers/misc/mei/hw-me.c | 14 +- + drivers/misc/mei/hw-me.h | 16 +- + drivers/misc/mei/hw-txe-regs.h | 63 +- + drivers/misc/mei/hw-txe.c | 14 +- + drivers/misc/mei/hw-txe.h | 14 +- + drivers/misc/mei/hw.h | 14 +- + drivers/misc/mei/init.c | 34 +- + drivers/misc/mei/interrupt.c | 15 +- + drivers/misc/mei/main.c | 80 +- + drivers/misc/mei/mei-trace.c | 14 +- + drivers/misc/mei/mei-trace.h | 14 +- + drivers/misc/mei/mei_dev.h | 17 +- + drivers/misc/mei/pci-me.c | 15 +- + drivers/misc/mei/pci-txe.c | 14 +- + drivers/misc/sgi-xp/xpc_uv.c | 1 + + drivers/net/thunderbolt.c | 3 + + drivers/nfc/mei_phy.c | 18 +- + drivers/nfc/microread/mei.c | 17 +- + drivers/nfc/pn544/mei.c | 15 +- + drivers/nvmem/Kconfig | 24 +- + drivers/nvmem/Makefile | 5 + + drivers/nvmem/core.c | 316 ++------ + drivers/nvmem/imx-iim.c | 4 +- + drivers/nvmem/imx-ocotp.c | 11 +- + drivers/nvmem/mxs-ocotp.c | 4 +- + drivers/nvmem/nvmem-sysfs.c | 256 ++++++ + drivers/nvmem/nvmem.h | 62 ++ + drivers/nvmem/stm32-romem.c | 202 +++++ + drivers/nvmem/sunxi_sid.c | 115 ++- + drivers/parport/ieee1284.c | 2 +- + drivers/parport/parport_cs.c | 5 +- + drivers/slimbus/qcom-ngd-ctrl.c | 4 + + drivers/soundwire/bus.c | 2 - + drivers/soundwire/intel.c | 5 +- + drivers/soundwire/intel_init.c | 2 + + drivers/soundwire/stream.c | 2 +- + drivers/thunderbolt/Makefile | 4 +- + drivers/thunderbolt/cap.c | 85 +- + drivers/thunderbolt/ctl.c | 2 +- + drivers/thunderbolt/icm.c | 65 +- + drivers/thunderbolt/lc.c | 179 +++++ + drivers/thunderbolt/nhi.c | 3 +- + drivers/thunderbolt/path.c | 420 ++++++++-- + drivers/thunderbolt/property.c | 16 +- + drivers/thunderbolt/switch.c | 557 ++++++++++--- + drivers/thunderbolt/tb.c | 608 ++++++++++---- + drivers/thunderbolt/tb.h | 227 +++++- + drivers/thunderbolt/tb_msgs.h | 11 + + drivers/thunderbolt/tb_regs.h | 50 +- + drivers/thunderbolt/tunnel.c | 691 ++++++++++++++++ + drivers/thunderbolt/tunnel.h | 78 ++ + drivers/thunderbolt/tunnel_pci.c | 226 ------ + drivers/thunderbolt/tunnel_pci.h | 31 - + drivers/thunderbolt/xdomain.c | 170 +++- + drivers/uio/uio_fsl_elbc_gpcm.c | 4 +- + drivers/virt/vboxguest/vboxguest_core.c | 31 + + drivers/w1/masters/ds2482.c | 18 +- + drivers/w1/slaves/w1_ds2408.c | 76 +- + drivers/w1/w1_io.c | 3 +- + fs/char_dev.c | 78 +- + include/linux/coresight-pmu.h | 2 + + include/linux/coresight.h | 7 +- + include/linux/mei_cl_bus.h | 3 + + include/linux/nvmem-consumer.h | 7 + + include/linux/thunderbolt.h | 8 + + include/linux/vmw_vmci_defs.h | 35 +- + include/uapi/linux/aspeed-p2a-ctrl.h | 62 ++ + include/uapi/linux/mei.h | 67 +- + include/uapi/misc/habanalabs.h | 158 +++- + tools/include/linux/coresight-pmu.h | 2 + + 244 files changed, 8844 insertions(+), 3389 deletions(-) + create mode 100644 Documentation/devicetree/bindings/misc/aspeed-p2a-ctrl.txt + create mode 100644 Documentation/devicetree/bindings/nvmem/st,stm32-romem.txt + create mode 100644 drivers/extcon/extcon-intel-mrfld.c + create mode 100644 drivers/extcon/extcon-intel.h + delete mode 100644 drivers/hwtracing/coresight/coresight-dynamic-replicator.c + create mode 100644 drivers/misc/aspeed-p2a-ctrl.c + create mode 100644 drivers/misc/habanalabs/firmware_if.c + create mode 100644 drivers/misc/habanalabs/goya/goya_coresight.c + create mode 100644 drivers/misc/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h + create mode 100644 drivers/misc/habanalabs/include/goya/goya_coresight.h + create mode 100644 drivers/misc/habanalabs/include/hw_ip/pci/pci_general.h + create mode 100644 drivers/misc/habanalabs/pci.c + create mode 100644 drivers/misc/mei/hdcp/Kconfig + create mode 100644 drivers/nvmem/nvmem-sysfs.c + create mode 100644 drivers/nvmem/nvmem.h + create mode 100644 drivers/nvmem/stm32-romem.c + create mode 100644 drivers/thunderbolt/lc.c + create mode 100644 drivers/thunderbolt/tunnel.c + create mode 100644 drivers/thunderbolt/tunnel.h + delete mode 100644 drivers/thunderbolt/tunnel_pci.c + delete mode 100644 drivers/thunderbolt/tunnel_pci.h + create mode 100644 include/uapi/linux/aspeed-p2a-ctrl.h +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 (39e8046240e2 staging: fieldbus: anybus-s: rename bus id field to avoid confusion) +$ git merge staging/staging-next +Auto-merging drivers/tty/vt/vt.c +Auto-merging drivers/staging/rtl8723bs/os_dep/os_intfs.c +Auto-merging drivers/staging/rtl8192u/ieee80211/ieee80211_crypt_tkip.c +Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c +Removing drivers/staging/rtl8192e/license +CONFLICT (modify/delete): drivers/staging/mt7621-spi/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Makefile left in tree. +CONFLICT (modify/delete): drivers/staging/mt7621-spi/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/mt7621-spi/Kconfig left in tree. +Removing drivers/staging/mt7621-mmc/sd.c +Removing drivers/staging/mt7621-mmc/mt6575_sd.h +Removing drivers/staging/mt7621-mmc/dbg.h +Removing drivers/staging/mt7621-mmc/dbg.c +Removing drivers/staging/mt7621-mmc/board.h +Removing drivers/staging/mt7621-mmc/TODO +Removing drivers/staging/mt7621-mmc/Makefile +Removing drivers/staging/mt7621-mmc/Kconfig +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36060.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36060.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36057.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36057.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36050.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36050.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zr36016.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zr36016.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_procfs.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_procfs.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_driver.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_driver.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_device.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_device.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran_card.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran_card.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/zoran.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/zoran.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.h left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/videocodec.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/videocodec.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/zoran/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/zoran/Kconfig left in tree. +CONFLICT (modify/delete): drivers/staging/media/mt9t031/Makefile deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Makefile left in tree. +CONFLICT (modify/delete): drivers/staging/media/mt9t031/Kconfig deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/media/mt9t031/Kconfig left in tree. +Auto-merging drivers/staging/media/ipu3/ipu3.c +Auto-merging drivers/staging/media/ipu3/Kconfig +Auto-merging drivers/staging/media/imx/imx-media.h +Auto-merging drivers/staging/media/imx/imx-media-vdic.c +Auto-merging drivers/staging/media/imx/imx-media-of.c +Auto-merging drivers/staging/media/imx/imx-media-internal-sd.c +Auto-merging drivers/staging/media/imx/imx-media-dev.c +Auto-merging drivers/staging/media/imx/imx-media-csi.c +Auto-merging drivers/staging/media/imx/imx-ic-common.c +Auto-merging drivers/staging/media/imx/Kconfig +Auto-merging drivers/staging/media/davinci_vpfe/dm365_resizer.c +Auto-merging drivers/staging/media/davinci_vpfe/Kconfig +Auto-merging drivers/staging/media/bcm2048/Kconfig +Auto-merging drivers/staging/media/Kconfig +Auto-merging drivers/staging/ks7010/ks_hostif.c +Auto-merging drivers/staging/erofs/unzip_vle.c +CONFLICT (content): Merge conflict in drivers/staging/erofs/unzip_vle.c +Auto-merging drivers/staging/erofs/data.c +CONFLICT (content): Merge conflict in drivers/staging/erofs/data.c +Auto-merging drivers/staging/comedi/drivers/ni_tio.c +Auto-merging drivers/staging/comedi/drivers/ni_mio_common.c +Auto-merging drivers/staging/Makefile +Auto-merging drivers/staging/Kconfig +Auto-merging drivers/spi/spi-mt7621.c +CONFLICT (content): Merge conflict in drivers/spi/spi-mt7621.c +Removing drivers/iio/imu/adis16400_buffer.c +Removing drivers/iio/imu/adis16400.h +Removing drivers/iio/counter/stm32-lptimer-cnt.c +Removing drivers/iio/counter/Makefile +Removing drivers/iio/counter/Kconfig +Removing drivers/iio/counter/104-quad-8.c +Auto-merging drivers/gpu/drm/vboxvideo/vbox_mode.c +Auto-merging arch/arm/boot/dts/ls1021a.dtsi +Auto-merging MAINTAINERS +Auto-merging Documentation/driver-api/index.rst +CONFLICT (content): Merge conflict in Documentation/driver-api/index.rst +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.txt +Removing Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt +Removing Documentation/devicetree/bindings/iio/pressure/bmp085.txt +Removing Documentation/devicetree/bindings/iio/adc/avia-hx711.txt +Auto-merging .mailmap +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.txt' using previous resolution. +Resolved 'Documentation/driver-api/index.rst' using previous resolution. +Resolved 'drivers/spi/spi-mt7621.c' using previous resolution. +Recorded preimage for 'drivers/staging/erofs/data.c' +Recorded preimage for 'drivers/staging/erofs/unzip_vle.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/staging/media/mt9t031/Kconfig drivers/staging/media/mt9t031/Makefile drivers/staging/mt7621-spi/Kconfig drivers/staging/mt7621-spi/Makefile drivers/staging/media/zoran/Kconfig drivers/staging/media/zoran/videocodec.c drivers/staging/media/zoran/videocodec.h drivers/staging/media/zoran/zoran.h drivers/staging/media/zoran/zoran_card.c drivers/staging/media/zoran/zoran_card.h drivers/staging/media/zoran/zoran_device.c drivers/staging/media/zoran/zoran_device.h drivers/staging/media/zoran/zoran_driver.c drivers/staging/media/zoran/zoran_procfs.c drivers/staging/media/zoran/zoran_procfs.h drivers/staging/media/zoran/zr36016.c drivers/staging/media/zoran/zr36016.h drivers/staging/media/zoran/zr36050.c drivers/staging/media/zoran/zr36050.h drivers/staging/media/zoran/zr36057.h drivers/staging/media/zoran/zr36060.c drivers/staging/media/zoran/zr36060.h +drivers/staging/media/mt9t031/Kconfig: needs merge +drivers/staging/media/mt9t031/Makefile: needs merge +drivers/staging/media/zoran/Kconfig: needs merge +drivers/staging/media/zoran/videocodec.c: needs merge +drivers/staging/media/zoran/videocodec.h: needs merge +drivers/staging/media/zoran/zoran.h: needs merge +drivers/staging/media/zoran/zoran_card.c: needs merge +drivers/staging/media/zoran/zoran_card.h: needs merge +drivers/staging/media/zoran/zoran_device.c: needs merge +drivers/staging/media/zoran/zoran_device.h: needs merge +drivers/staging/media/zoran/zoran_driver.c: needs merge +drivers/staging/media/zoran/zoran_procfs.c: needs merge +drivers/staging/media/zoran/zoran_procfs.h: needs merge +drivers/staging/media/zoran/zr36016.c: needs merge +drivers/staging/media/zoran/zr36016.h: needs merge +drivers/staging/media/zoran/zr36050.c: needs merge +drivers/staging/media/zoran/zr36050.h: needs merge +drivers/staging/media/zoran/zr36057.h: needs merge +drivers/staging/media/zoran/zr36060.c: needs merge +drivers/staging/media/zoran/zr36060.h: needs merge +drivers/staging/mt7621-spi/Kconfig: needs merge +drivers/staging/mt7621-spi/Makefile: needs merge +rm 'drivers/staging/media/mt9t031/Kconfig' +rm 'drivers/staging/media/mt9t031/Makefile' +rm 'drivers/staging/media/zoran/Kconfig' +rm 'drivers/staging/media/zoran/videocodec.c' +rm 'drivers/staging/media/zoran/videocodec.h' +rm 'drivers/staging/media/zoran/zoran.h' +rm 'drivers/staging/media/zoran/zoran_card.c' +rm 'drivers/staging/media/zoran/zoran_card.h' +rm 'drivers/staging/media/zoran/zoran_device.c' +rm 'drivers/staging/media/zoran/zoran_device.h' +rm 'drivers/staging/media/zoran/zoran_driver.c' +rm 'drivers/staging/media/zoran/zoran_procfs.c' +rm 'drivers/staging/media/zoran/zoran_procfs.h' +rm 'drivers/staging/media/zoran/zr36016.c' +rm 'drivers/staging/media/zoran/zr36016.h' +rm 'drivers/staging/media/zoran/zr36050.c' +rm 'drivers/staging/media/zoran/zr36050.h' +rm 'drivers/staging/media/zoran/zr36057.h' +rm 'drivers/staging/media/zoran/zr36060.c' +rm 'drivers/staging/media/zoran/zr36060.h' +rm 'drivers/staging/mt7621-spi/Kconfig' +rm 'drivers/staging/mt7621-spi/Makefile' +$ git commit -v -a +Recorded resolution for 'drivers/staging/erofs/data.c'. +Recorded resolution for 'drivers/staging/erofs/unzip_vle.c'. +[master 44d0c8d22a84] Merge remote-tracking branch 'staging/staging-next' +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/ABI/testing/sysfs-bus-counter | 230 +++ + .../ABI/testing/sysfs-bus-counter-104-quad-8 | 36 + + .../ABI/testing/sysfs-bus-counter-ftm-quaddec | 16 + + Documentation/ABI/testing/sysfs-bus-iio | 8 + + .../ABI/testing/sysfs-bus-iio-counter-104-quad-8 | 16 + + .../sysfs-bus-iio-impedance-analyzer-ad5933 | 19 +- + Documentation/ABI/testing/sysfs-bus-iio-sps30 | 2 +- + .../ABI/testing/sysfs-bus-iio-temperature-max31856 | 24 + + .../devicetree/bindings/counter/ftm-quaddec.txt | 18 + + .../{iio => }/counter/stm32-lptimer-cnt.txt | 8 +- + .../bindings/counter/stm32-timer-cnt.txt | 31 + + .../bindings/fieldbus/arcx,anybus-controller.txt | 71 + + .../bindings/iio/accel/kionix,kxcjk1013.txt | 17 + + .../devicetree/bindings/iio/adc/adi,ad7606.txt | 1 + + .../devicetree/bindings/iio/adc/adi,ad7780.txt | 48 + + .../bindings/iio/adc/amlogic,meson-saradc.txt | 1 + + .../devicetree/bindings/iio/adc/avia-hx711.txt | 24 - + .../devicetree/bindings/iio/adc/avia-hx711.yaml | 66 + + .../devicetree/bindings/iio/adc/lpc32xx-adc.txt | 5 + + .../devicetree/bindings/iio/adc/ti-ads8344.txt | 19 + + .../bindings/iio/chemical/plantower,pms7003.txt | 8 +- + .../devicetree/bindings/iio/gyroscope/bmg160.txt | 20 + + .../bindings/iio/gyroscope/nxp,fxas21002c.txt | 31 + + .../devicetree/bindings/iio/imu/adi,adis16480.txt | 85 + + .../devicetree/bindings/iio/imu/st_lsm6dsx.txt | 3 + + .../devicetree/bindings/iio/light/vcnl4000.txt | 24 + + .../devicetree/bindings/iio/pressure/bmp085.txt | 27 - + .../devicetree/bindings/iio/pressure/bmp085.yaml | 70 + + .../bindings/iio/proximity/devantech-srf04.txt | 28 - + .../bindings/iio/proximity/devantech-srf04.yaml | 66 + + .../bindings/iio/proximity/maxbotix,mb1232.txt | 29 + + .../devicetree/bindings/iio/st-sensors.txt | 1 + + .../bindings/iio/temperature/max31856.txt | 24 + + .../iio/temperature/temperature-bindings.txt | 7 + + .../devicetree/bindings/mfd/stm32-lptimer.txt | 2 +- + .../devicetree/bindings/mfd/stm32-timers.txt | 7 + + .../devicetree/bindings/vendor-prefixes.txt | 3 + + Documentation/driver-api/generic-counter.rst | 342 ++++ + Documentation/driver-api/index.rst | 1 + + MAINTAINERS | 35 +- + arch/arm/boot/dts/ls1021a.dtsi | 28 + + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/clocksource/timer-fsl-ftm.c | 15 +- + drivers/counter/104-quad-8.c | 1367 +++++++++++++++ + drivers/counter/Kconfig | 60 + + drivers/counter/Makefile | 10 + + drivers/counter/counter.c | 1567 +++++++++++++++++ + drivers/counter/ftm-quaddec.c | 356 ++++ + drivers/counter/stm32-lptimer-cnt.c | 754 ++++++++ + drivers/counter/stm32-timer-cnt.c | 390 ++++ + drivers/gpu/drm/vboxvideo/Kconfig | 1 + + drivers/gpu/drm/vboxvideo/vbox_mode.c | 3 +- + drivers/gpu/drm/vboxvideo/vbox_prime.c | 10 +- + drivers/iio/Kconfig | 25 +- + drivers/iio/Makefile | 1 - + drivers/iio/accel/Kconfig | 50 +- + drivers/iio/accel/bma180.c | 18 +- + drivers/iio/accel/bmc150-accel-core.c | 23 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 40 +- + drivers/iio/accel/kxcjk-1013.c | 13 +- + drivers/iio/accel/kxsd9.c | 4 +- + drivers/iio/accel/mma8452.c | 2 +- + drivers/iio/accel/st_accel.h | 2 + + drivers/iio/accel/st_accel_core.c | 78 +- + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/adc/Kconfig | 48 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad7124.c | 2 +- + drivers/iio/adc/ad7606.c | 120 +- + drivers/iio/adc/ad7606.h | 25 +- + drivers/iio/adc/ad7606_spi.c | 2 + + drivers/{staging => }/iio/adc/ad7780.c | 179 +- + drivers/iio/adc/ad7923.c | 24 +- + drivers/iio/adc/ad_sigma_delta.c | 16 +- + drivers/iio/adc/imx7d_adc.c | 175 +- + drivers/iio/adc/ingenic-adc.c | 4 +- + drivers/iio/adc/lpc32xx_adc.c | 60 +- + drivers/iio/adc/meson_saradc.c | 8 + + drivers/iio/adc/mxs-lradc-adc.c | 2 + + drivers/iio/adc/qcom-spmi-adc5.c | 1 + + drivers/iio/adc/stm32-dfsdm-adc.c | 628 +++++-- + drivers/iio/adc/stm32-dfsdm-core.c | 180 +- + drivers/iio/adc/stmpe-adc.c | 5 +- + drivers/iio/adc/ti-ads7950.c | 219 ++- + drivers/iio/adc/ti-ads8344.c | 204 +++ + drivers/iio/adc/ti-ads8688.c | 2 +- + drivers/iio/buffer/industrialio-buffer-cb.c | 10 +- + drivers/iio/chemical/Kconfig | 12 +- + drivers/iio/chemical/pms7003.c | 5 + + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 12 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 22 +- + drivers/iio/common/ms_sensors/Kconfig | 2 +- + drivers/iio/common/ssp_sensors/ssp_iio.c | 2 +- + drivers/iio/counter/104-quad-8.c | 631 ------- + drivers/iio/counter/Kconfig | 34 - + drivers/iio/counter/Makefile | 8 - + drivers/iio/counter/stm32-lptimer-cnt.c | 382 ---- + drivers/iio/dac/ad5064.c | 15 +- + drivers/iio/dac/ad5758.c | 55 +- + drivers/iio/dac/ti-dac5571.c | 2 +- + drivers/iio/dummy/iio_dummy_evgen.c | 5 +- + drivers/iio/frequency/ad9523.c | 16 +- + drivers/iio/gyro/Kconfig | 22 + + drivers/iio/gyro/Makefile | 3 + + drivers/iio/gyro/bmg160_core.c | 21 + + drivers/iio/gyro/bmg160_i2c.c | 9 + + drivers/iio/gyro/fxas21002c.h | 150 ++ + drivers/iio/gyro/fxas21002c_core.c | 1004 +++++++++++ + drivers/iio/gyro/fxas21002c_i2c.c | 69 + + drivers/iio/gyro/fxas21002c_spi.c | 70 + + drivers/iio/gyro/itg3200_core.c | 20 + + drivers/iio/gyro/mpu3050-core.c | 5 +- + drivers/iio/humidity/Kconfig | 20 +- + drivers/iio/imu/Makefile | 2 - + drivers/iio/imu/{adis16400_core.c => adis16400.c} | 232 ++- + drivers/iio/imu/adis16400.h | 215 --- + drivers/iio/imu/adis16400_buffer.c | 101 -- + drivers/iio/imu/adis16480.c | 435 ++++- + drivers/iio/imu/adis_buffer.c | 40 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 10 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 6 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 12 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 157 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 15 + + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 15 + + drivers/iio/industrialio-buffer.c | 20 +- + drivers/iio/industrialio-core.c | 46 +- + drivers/iio/industrialio-trigger.c | 5 +- + drivers/iio/light/Kconfig | 274 +-- + drivers/iio/light/cros_ec_light_prox.c | 12 +- + drivers/iio/light/vcnl4000.c | 77 +- + drivers/iio/magnetometer/ak8974.c | 5 +- + drivers/iio/magnetometer/ak8975.c | 13 +- + drivers/iio/magnetometer/bmc150_magn.c | 21 + + drivers/iio/magnetometer/hmc5843.h | 1 + + drivers/iio/magnetometer/hmc5843_core.c | 20 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 7 +- + drivers/iio/magnetometer/hmc5843_spi.c | 7 +- + drivers/iio/potentiometer/Kconfig | 34 +- + drivers/iio/potentiostat/lmp91000.c | 14 +- + drivers/iio/pressure/bmp280-core.c | 6 + + drivers/iio/pressure/cros_ec_baro.c | 11 +- + drivers/iio/proximity/Kconfig | 23 +- + drivers/iio/proximity/Makefile | 1 + + drivers/iio/proximity/as3935.c | 50 +- + drivers/iio/proximity/mb1232.c | 272 +++ + drivers/iio/proximity/srf04.c | 38 +- + drivers/iio/temperature/Kconfig | 24 +- + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/max31856.c | 356 ++++ + drivers/iio/trigger/iio-trig-loop.c | 2 +- + drivers/pwm/pwm-fsl-ftm.c | 44 +- + drivers/spi/spi-mt7621.c | 7 +- + drivers/staging/Kconfig | 12 +- + drivers/staging/Makefile | 3 +- + drivers/staging/android/Kconfig | 3 +- + drivers/staging/android/Makefile | 1 + + drivers/staging/android/ion/Kconfig | 1 + + drivers/staging/android/vsoc.c | 3 +- + drivers/staging/axis-fifo/Kconfig | 8 +- + drivers/staging/axis-fifo/Makefile | 1 + + drivers/staging/board/Kconfig | 1 + + drivers/staging/board/Makefile | 1 + + drivers/staging/clocking-wizard/Kconfig | 1 + + drivers/staging/clocking-wizard/Makefile | 1 + + drivers/staging/comedi/Kconfig | 255 +-- + drivers/staging/comedi/comedi_buf.c | 2 + + drivers/staging/comedi/comedi_fops.c | 32 + + drivers/staging/comedi/drivers.c | 11 +- + drivers/staging/comedi/drivers/adv_pci1710.c | 2 +- + drivers/staging/comedi/drivers/amplc_pci230.c | 2 +- + drivers/staging/comedi/drivers/comedi_isadma.c | 17 +- + drivers/staging/comedi/drivers/comedi_isadma.h | 3 + + drivers/staging/comedi/drivers/das08.c | 4 +- + drivers/staging/comedi/drivers/dt2811.c | 2 +- + drivers/staging/comedi/drivers/dt9812.c | 5 +- + drivers/staging/comedi/drivers/dyna_pci10xx.c | 12 +- + drivers/staging/comedi/drivers/ni_at_ao.c | 2 +- + drivers/staging/comedi/drivers/ni_daq_700.c | 2 +- + drivers/staging/comedi/drivers/ni_mio_common.c | 36 +- + .../comedi/drivers/ni_routing/tools/Makefile | 1 + + drivers/staging/comedi/drivers/ni_tio.c | 14 +- + drivers/staging/comedi/drivers/ni_usb6501.c | 4 +- + drivers/staging/comedi/drivers/quatech_daqp_cs.c | 1 + + .../staging/comedi/drivers/tests/ni_routes_test.c | 2 +- + drivers/staging/comedi/drivers/usbdux.c | 2 + + drivers/staging/comedi/drivers/usbduxfast.c | 2 + + drivers/staging/comedi/drivers/usbduxsigma.c | 2 + + drivers/staging/comedi/kcomedilib/Makefile | 1 + + drivers/staging/emxx_udc/Kconfig | 1 + + drivers/staging/emxx_udc/Makefile | 1 + + drivers/staging/emxx_udc/emxx_udc.c | 57 +- + .../erofs/Documentation/filesystems/erofs.txt | 1 + + drivers/staging/erofs/data.c | 18 +- + drivers/staging/erofs/inode.c | 18 +- + drivers/staging/erofs/internal.h | 19 +- + drivers/staging/erofs/namei.c | 3 +- + drivers/staging/erofs/super.c | 46 +- + drivers/staging/erofs/unzip_pagevec.h | 6 +- + drivers/staging/erofs/unzip_vle.c | 96 +- + drivers/staging/erofs/utils.c | 4 +- + drivers/staging/erofs/xattr.c | 50 +- + drivers/staging/fbtft/Kconfig | 1 + + drivers/staging/fbtft/fb_agm1264k-fl.c | 4 +- + drivers/staging/fbtft/fb_ra8875.c | 2 +- + drivers/staging/fbtft/fb_ssd1306.c | 3 +- + drivers/staging/fbtft/fb_ssd1331.c | 3 +- + drivers/staging/fbtft/fb_ssd1351.c | 4 +- + drivers/staging/fbtft/fb_watterott.c | 15 +- + drivers/staging/fbtft/fbtft-io.c | 12 +- + drivers/staging/fbtft/fbtft.h | 1 + + drivers/staging/fbtft/fbtft_device.c | 2 +- + drivers/staging/fbtft/flexfb.c | 7 +- + .../fieldbus/Documentation/ABI/fieldbus-dev-cdev | 31 + + .../Documentation/ABI/sysfs-class-fieldbus-dev | 62 + + .../fieldbus/Documentation/fieldbus_dev.txt | 66 + + drivers/staging/fieldbus/Kconfig | 18 + + drivers/staging/fieldbus/Makefile | 7 + + drivers/staging/fieldbus/TODO | 5 + + drivers/staging/fieldbus/anybuss/Kconfig | 39 + + drivers/staging/fieldbus/anybuss/Makefile | 10 + + drivers/staging/fieldbus/anybuss/anybuss-client.h | 102 ++ + .../staging/fieldbus/anybuss/anybuss-controller.h | 47 + + drivers/staging/fieldbus/anybuss/arcx-anybus.c | 399 +++++ + drivers/staging/fieldbus/anybuss/hms-profinet.c | 228 +++ + drivers/staging/fieldbus/anybuss/host.c | 1459 +++++++++++++++ + drivers/staging/fieldbus/dev_core.c | 351 ++++ + drivers/staging/fieldbus/fieldbus_dev.h | 108 ++ + drivers/staging/fsl-dpaa2/Kconfig | 1 + + drivers/staging/fsl-dpaa2/Makefile | 1 + + drivers/staging/fsl-dpaa2/ethsw/ethsw.c | 4 +- + drivers/staging/fwserial/Kconfig | 1 + + drivers/staging/fwserial/Makefile | 1 + + drivers/staging/fwserial/fwserial.c | 5 +- + drivers/staging/gasket/Kconfig | 1 + + drivers/staging/gasket/Makefile | 1 + + drivers/staging/gasket/apex_driver.c | 8 +- + drivers/staging/gasket/gasket_interrupt.c | 6 +- + drivers/staging/gasket/gasket_page_table.c | 5 +- + drivers/staging/gasket/gasket_sysfs.c | 9 +- + drivers/staging/gasket/gasket_sysfs.h | 4 +- + drivers/staging/gdm724x/Kconfig | 1 + + drivers/staging/gdm724x/gdm_lte.c | 1 - + drivers/staging/gdm724x/gdm_mux.c | 7 +- + drivers/staging/gdm724x/hci_packet.h | 2 +- + drivers/staging/goldfish/Kconfig | 1 + + drivers/staging/goldfish/Makefile | 1 + + drivers/staging/greybus/Kconfig | 1 + + drivers/staging/greybus/audio_codec.h | 122 +- + drivers/staging/greybus/audio_manager.c | 3 + + drivers/staging/greybus/bundle.c | 2 +- + drivers/staging/greybus/hid.c | 1 - + drivers/staging/greybus/power_supply.c | 4 +- + drivers/staging/greybus/sdio.c | 8 +- + drivers/staging/gs_fpgaboot/Kconfig | 2 +- + drivers/staging/gs_fpgaboot/Makefile | 1 + + drivers/staging/iio/Kconfig | 1 + + drivers/staging/iio/accel/Kconfig | 1 + + drivers/staging/iio/accel/Makefile | 1 + + drivers/staging/iio/accel/adis16203.c | 3 +- + drivers/staging/iio/accel/adis16240.c | 3 +- + drivers/staging/iio/adc/Kconfig | 14 +- + drivers/staging/iio/adc/Makefile | 1 - + drivers/staging/iio/adc/ad7192.c | 236 ++- + drivers/staging/iio/adc/ad7192.h | 12 +- + drivers/staging/iio/adc/ad7280a.c | 112 +- + drivers/staging/iio/adc/ad7280a.h | 3 +- + drivers/staging/iio/adc/ad7816.c | 5 +- + drivers/staging/iio/addac/Kconfig | 1 + + drivers/staging/iio/addac/Makefile | 1 + + drivers/staging/iio/addac/adt7316-i2c.c | 3 +- + drivers/staging/iio/addac/adt7316-spi.c | 3 +- + drivers/staging/iio/addac/adt7316.c | 7 +- + drivers/staging/iio/addac/adt7316.h | 3 +- + drivers/staging/iio/cdc/Kconfig | 1 + + drivers/staging/iio/cdc/Makefile | 1 + + drivers/staging/iio/cdc/ad7150.c | 3 +- + drivers/staging/iio/cdc/ad7746.c | 3 +- + drivers/staging/iio/cdc/ad7746.h | 3 +- + drivers/staging/iio/frequency/Kconfig | 1 + + drivers/staging/iio/frequency/Makefile | 1 + + drivers/staging/iio/frequency/ad9832.c | 54 +- + drivers/staging/iio/frequency/ad9832.h | 4 +- + drivers/staging/iio/frequency/ad9834.c | 5 +- + drivers/staging/iio/frequency/ad9834.h | 3 +- + drivers/staging/iio/frequency/dds.h | 3 +- + drivers/staging/iio/impedance-analyzer/Kconfig | 3 +- + drivers/staging/iio/impedance-analyzer/Makefile | 1 + + drivers/staging/iio/impedance-analyzer/ad5933.c | 58 +- + drivers/staging/iio/meter/Kconfig | 1 + + drivers/staging/iio/meter/ade7854-i2c.c | 3 +- + drivers/staging/iio/meter/ade7854-spi.c | 3 +- + drivers/staging/iio/meter/ade7854.c | 3 +- + drivers/staging/iio/resolver/Kconfig | 1 + + drivers/staging/iio/resolver/Makefile | 1 + + drivers/staging/iio/resolver/ad2s1210.c | 6 +- + drivers/staging/kpc2000/Kconfig | 57 + + drivers/staging/kpc2000/Makefile | 6 + + drivers/staging/kpc2000/TODO | 8 + + drivers/staging/kpc2000/kpc.h | 23 + + drivers/staging/kpc2000/kpc2000/Makefile | 4 + + drivers/staging/kpc2000/kpc2000/cell_probe.c | 470 +++++ + drivers/staging/kpc2000/kpc2000/core.c | 436 +++++ + drivers/staging/kpc2000/kpc2000/dma_common_defs.h | 43 + + drivers/staging/kpc2000/kpc2000/fileops.c | 130 ++ + drivers/staging/kpc2000/kpc2000/kp2000_module.c | 54 + + drivers/staging/kpc2000/kpc2000/pcie.h | 112 ++ + drivers/staging/kpc2000/kpc2000/uapi.h | 22 + + drivers/staging/kpc2000/kpc_dma/Makefile | 6 + + drivers/staging/kpc2000/kpc_dma/dma.c | 264 +++ + drivers/staging/kpc2000/kpc_dma/fileops.c | 420 +++++ + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c | 248 +++ + drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h | 220 +++ + drivers/staging/kpc2000/kpc_dma/uapi.h | 11 + + drivers/staging/kpc2000/kpc_i2c/Makefile | 4 + + drivers/staging/kpc2000/kpc_i2c/fileops.c | 181 ++ + drivers/staging/kpc2000/kpc_i2c/i2c_driver.c | 698 ++++++++ + drivers/staging/kpc2000/kpc_spi/Makefile | 4 + + drivers/staging/kpc2000/kpc_spi/spi_driver.c | 506 ++++++ + drivers/staging/kpc2000/kpc_spi/spi_parts.h | 48 + + drivers/staging/ks7010/Kconfig | 1 + + drivers/staging/ks7010/Makefile | 1 + + drivers/staging/ks7010/ks_hostif.c | 16 +- + drivers/staging/media/Kconfig | 1 + + drivers/staging/media/bcm2048/Kconfig | 1 + + drivers/staging/media/bcm2048/Makefile | 1 + + drivers/staging/media/davinci_vpfe/Kconfig | 1 + + drivers/staging/media/davinci_vpfe/Makefile | 1 + + drivers/staging/media/davinci_vpfe/dm365_ipipe.c | 6 +- + drivers/staging/media/davinci_vpfe/dm365_ipipe.h | 2 - + .../staging/media/davinci_vpfe/dm365_ipipe_hw.c | 24 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.c | 41 +- + drivers/staging/media/davinci_vpfe/dm365_ipipeif.h | 2 - + drivers/staging/media/davinci_vpfe/dm365_resizer.c | 4 +- + drivers/staging/media/imx/Kconfig | 1 + + drivers/staging/media/imx/imx-ic-common.c | 6 +- + drivers/staging/media/imx/imx-ic-prp.c | 6 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 6 +- + drivers/staging/media/imx/imx-ic.h | 6 +- + drivers/staging/media/imx/imx-media-capture.c | 11 +- + drivers/staging/media/imx/imx-media-csi.c | 6 +- + drivers/staging/media/imx/imx-media-dev.c | 6 +- + drivers/staging/media/imx/imx-media-fim.c | 6 +- + drivers/staging/media/imx/imx-media-internal-sd.c | 6 +- + drivers/staging/media/imx/imx-media-of.c | 6 +- + drivers/staging/media/imx/imx-media-utils.c | 6 +- + drivers/staging/media/imx/imx-media-vdic.c | 6 +- + drivers/staging/media/imx/imx-media.h | 6 +- + drivers/staging/media/imx/imx6-mipi-csi2.c | 10 +- + drivers/staging/media/ipu3/Kconfig | 1 + + drivers/staging/media/ipu3/Makefile | 1 + + drivers/staging/media/ipu3/ipu3.c | 1 - + drivers/staging/media/rockchip/vpu/Kconfig | 2 +- + drivers/staging/media/rockchip/vpu/Makefile | 1 + + drivers/staging/media/soc_camera/Kconfig | 1 + + drivers/staging/media/soc_camera/imx074.c | 6 +- + drivers/staging/media/soc_camera/mt9t031.c | 6 +- + drivers/staging/media/soc_camera/soc_camera.c | 6 +- + drivers/staging/media/soc_camera/soc_mediabus.c | 6 +- + drivers/staging/media/soc_camera/soc_mt9v022.c | 6 +- + drivers/staging/media/soc_camera/soc_ov5642.c | 6 +- + drivers/staging/media/soc_camera/soc_ov9740.c | 6 +- + drivers/staging/media/sunxi/Kconfig | 1 + + drivers/staging/media/sunxi/Makefile | 1 + + drivers/staging/media/sunxi/cedrus/Kconfig | 1 + + drivers/staging/media/sunxi/cedrus/Makefile | 1 + + drivers/staging/media/tegra-vde/Kconfig | 1 + + drivers/staging/media/tegra-vde/Makefile | 1 + + drivers/staging/media/tegra-vde/tegra-vde.c | 5 +- + drivers/staging/media/tegra-vde/uapi.h | 11 +- + .../most/Documentation/ABI/configfs-most.txt | 204 +++ + .../staging/most/Documentation/driver_usage.txt | 131 +- + drivers/staging/most/Kconfig | 3 +- + drivers/staging/most/Makefile | 1 + + drivers/staging/most/cdev/Kconfig | 1 + + drivers/staging/most/cdev/Makefile | 1 + + drivers/staging/most/cdev/cdev.c | 8 +- + drivers/staging/most/configfs.c | 676 +++++++ + drivers/staging/most/core.c | 305 ++-- + drivers/staging/most/core.h | 20 +- + drivers/staging/most/dim2/Kconfig | 1 + + drivers/staging/most/dim2/Makefile | 1 + + drivers/staging/most/dim2/errors.h | 2 +- + drivers/staging/most/dim2/hal.h | 2 +- + drivers/staging/most/dim2/reg.h | 2 +- + drivers/staging/most/dim2/sysfs.h | 2 +- + drivers/staging/most/i2c/Kconfig | 3 +- + drivers/staging/most/i2c/Makefile | 1 + + drivers/staging/most/net/Kconfig | 3 +- + drivers/staging/most/net/Makefile | 1 + + drivers/staging/most/net/net.c | 3 +- + drivers/staging/most/sound/Kconfig | 3 +- + drivers/staging/most/sound/Makefile | 1 + + drivers/staging/most/sound/sound.c | 61 +- + drivers/staging/most/usb/Kconfig | 3 +- + drivers/staging/most/usb/Makefile | 1 + + drivers/staging/most/usb/usb.c | 2 +- + drivers/staging/most/video/Kconfig | 3 +- + drivers/staging/most/video/Makefile | 1 + + drivers/staging/most/video/video.c | 3 +- + drivers/staging/mt7621-dma/Kconfig | 1 + + drivers/staging/mt7621-dma/Makefile | 1 + + drivers/staging/mt7621-dma/mtk-hsdma.c | 7 +- + drivers/staging/mt7621-dts/Kconfig | 1 + + drivers/staging/mt7621-dts/Makefile | 1 + + drivers/staging/mt7621-dts/mt7621.dtsi | 23 +- + drivers/staging/mt7621-mmc/Kconfig | 16 - + drivers/staging/mt7621-mmc/Makefile | 42 - + drivers/staging/mt7621-mmc/TODO | 8 - + drivers/staging/mt7621-mmc/board.h | 63 - + drivers/staging/mt7621-mmc/dbg.c | 304 ---- + drivers/staging/mt7621-mmc/dbg.h | 101 -- + drivers/staging/mt7621-mmc/mt6575_sd.h | 488 ----- + drivers/staging/mt7621-mmc/sd.c | 1855 -------------------- + drivers/staging/mt7621-pci-phy/Kconfig | 1 + + drivers/staging/mt7621-pci-phy/Makefile | 1 + + .../mt7621-pci-phy/mediatek,mt7621-pci-phy.txt | 44 +- + drivers/staging/mt7621-pci-phy/pci-mt7621-phy.c | 284 +-- + drivers/staging/mt7621-pci/Kconfig | 1 + + drivers/staging/mt7621-pci/Makefile | 1 + + drivers/staging/mt7621-pci/pci-mt7621.c | 2 +- + drivers/staging/mt7621-pinctrl/Kconfig | 1 + + drivers/staging/mt7621-pinctrl/Makefile | 1 + + drivers/staging/netlogic/Kconfig | 1 + + drivers/staging/netlogic/Makefile | 1 + + drivers/staging/netlogic/xlr_net.c | 11 +- + drivers/staging/nvec/Kconfig | 1 + + drivers/staging/octeon-usb/Kconfig | 1 + + drivers/staging/octeon-usb/octeon-hcd.c | 4 +- + drivers/staging/octeon-usb/octeon-hcd.h | 8 +- + drivers/staging/octeon/Kconfig | 1 + + drivers/staging/octeon/TODO | 9 + + drivers/staging/octeon/ethernet-tx.c | 20 +- + drivers/staging/olpc_dcon/Kconfig | 1 + + drivers/staging/olpc_dcon/Makefile | 1 + + drivers/staging/olpc_dcon/olpc_dcon.h | 5 + + drivers/staging/olpc_dcon/olpc_dcon_xo_1.c | 7 +- + drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c | 56 +- + drivers/staging/pi433/Kconfig | 1 + + drivers/staging/pi433/Makefile | 1 + + drivers/staging/pi433/pi433_if.c | 38 +- + drivers/staging/pi433/rf69.c | 49 +- + drivers/staging/ralink-gdma/Kconfig | 1 + + drivers/staging/ralink-gdma/Makefile | 1 + + drivers/staging/ralink-gdma/ralink-gdma.c | 105 +- + drivers/staging/rtl8188eu/Kconfig | 1 + + drivers/staging/rtl8188eu/core/rtw_ap.c | 28 +- + drivers/staging/rtl8188eu/core/rtw_cmd.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_ieee80211.c | 6 +- + drivers/staging/rtl8188eu/core/rtw_mlme.c | 5 +- + drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/rtl8188eu/core/rtw_recv.c | 70 +- + drivers/staging/rtl8188eu/core/rtw_wlan_util.c | 6 +- + drivers/staging/rtl8188eu/hal/odm.c | 4 +- + drivers/staging/rtl8188eu/hal/odm_hwconfig.c | 6 +- + drivers/staging/rtl8188eu/hal/rtl8188eu_xmit.c | 10 +- + drivers/staging/rtl8188eu/include/wifi.h | 130 -- + drivers/staging/rtl8188eu/os_dep/usb_ops_linux.c | 1 - + drivers/staging/rtl8192e/Kconfig | 10 +- + drivers/staging/rtl8192e/dot11d.c | 9 +- + drivers/staging/rtl8192e/license | 339 ---- + drivers/staging/rtl8192e/rtl8192e/Kconfig | 1 + + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 17 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.h | 17 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.h | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 40 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 22 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 17 +- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.h | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.c | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hwimg.h | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 37 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phyreg.h | 16 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 20 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 16 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.h | 21 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ethtool.c | 18 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 21 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 17 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pm.h | 17 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.h | 19 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 17 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.h | 17 +- + drivers/staging/rtl8192e/rtl819x_BA.h | 16 +- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 16 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 16 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 +- + drivers/staging/rtl8192e/rtl819x_Qos.h | 16 +- + drivers/staging/rtl8192e/rtl819x_TS.h | 16 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 16 +- + drivers/staging/rtl8192e/rtllib.h | 6 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 6 +- + drivers/staging/rtl8192e/rtllib_debug.h | 22 +- + drivers/staging/rtl8192e/rtllib_module.c | 21 +- + drivers/staging/rtl8192e/rtllib_rx.c | 20 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 5 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 5 +- + drivers/staging/rtl8192e/rtllib_tx.c | 22 +- + drivers/staging/rtl8192e/rtllib_wx.c | 19 +- + drivers/staging/rtl8192u/Kconfig | 1 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 40 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.c | 7 +- + .../staging/rtl8192u/ieee80211/ieee80211_crypt.h | 6 +- + .../rtl8192u/ieee80211/ieee80211_crypt_ccmp.c | 10 +- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 10 +- + .../rtl8192u/ieee80211/ieee80211_crypt_wep.c | 6 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 76 +- + .../staging/rtl8192u/ieee80211/ieee80211_softmac.c | 3 +- + .../rtl8192u/ieee80211/ieee80211_softmac_wx.c | 3 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_tx.c | 41 +- + drivers/staging/rtl8192u/ieee80211/ieee80211_wx.c | 40 +- + .../staging/rtl8192u/ieee80211/rtl819x_BAProc.c | 8 +- + drivers/staging/rtl8192u/ieee80211/rtl819x_HT.h | 4 +- + .../staging/rtl8192u/ieee80211/rtl819x_TSProc.c | 80 +- + drivers/staging/rtl8192u/r8180_93cx6.c | 26 +- + drivers/staging/rtl8192u/r8190_rtl8256.c | 2 +- + drivers/staging/rtl8192u/r8192U_core.c | 16 +- + drivers/staging/rtl8192u/r8192U_dm.c | 38 +- + drivers/staging/rtl8192u/r8192U_hw.h | 2 +- + drivers/staging/rtl8192u/r8192U_wx.c | 2 +- + drivers/staging/rtl8192u/r8192U_wx.h | 2 +- + drivers/staging/rtl8712/Kconfig | 11 +- + drivers/staging/rtl8712/drv_types.h | 6 +- + drivers/staging/rtl8712/hal_init.c | 3 +- + drivers/staging/rtl8712/ieee80211.c | 3 +- + drivers/staging/rtl8712/ieee80211.h | 3 +- + drivers/staging/rtl8712/os_intfs.c | 8 +- + drivers/staging/rtl8712/rtl8712_cmd.c | 6 +- + drivers/staging/rtl8712/rtl8712_cmd.h | 1 - + drivers/staging/rtl8712/rtl8712_efuse.c | 6 +- + drivers/staging/rtl8712/rtl8712_efuse.h | 3 +- + drivers/staging/rtl8712/rtl8712_io.c | 4 +- + drivers/staging/rtl8712/rtl8712_led.c | 13 +- + drivers/staging/rtl8712/rtl8712_recv.c | 28 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 12 +- + drivers/staging/rtl8712/rtl871x_eeprom.c | 23 +- + drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 18 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 14 +- + drivers/staging/rtl8712/rtl871x_mp.c | 5 +- + drivers/staging/rtl8712/rtl871x_pwrctrl.c | 4 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 8 +- + drivers/staging/rtl8712/usb_intf.c | 12 +- + drivers/staging/rtl8712/usb_ops_linux.c | 26 +- + drivers/staging/rtl8723bs/Kconfig | 1 + + drivers/staging/rtl8723bs/core/rtw_ap.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_cmd.c | 51 +- + drivers/staging/rtl8723bs/core/rtw_debug.c | 11 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 33 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 79 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 51 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 11 +- + drivers/staging/rtl8723bs/hal/hal_com.c | 32 +- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 20 +- + drivers/staging/rtl8723bs/hal/odm.c | 4 +- + drivers/staging/rtl8723bs/hal/odm.h | 20 +- + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 12 +- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 13 +- + drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 8 +- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 9 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 22 +- + drivers/staging/rtl8723bs/include/cmd_osdep.h | 6 +- + drivers/staging/rtl8723bs/include/drv_types.h | 10 +- + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 4 +- + drivers/staging/rtl8723bs/include/ieee80211.h | 15 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 31 +- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 30 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- + drivers/staging/rtl8723bs/include/wifi.h | 86 +- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 56 +- + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 57 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 19 +- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 29 +- + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 10 +- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 30 +- + drivers/staging/rtlwifi/Kconfig | 1 + + drivers/staging/rtlwifi/Makefile | 1 + + drivers/staging/rtlwifi/base.c | 20 +- + drivers/staging/rtlwifi/btcoexist/Makefile | 1 + + .../staging/rtlwifi/btcoexist/halbtc8822b1ant.c | 4 +- + drivers/staging/rtlwifi/btcoexist/halbtcoutsrc.c | 9 +- + drivers/staging/rtlwifi/core.c | 18 +- + .../halmac/halmac_88xx/halmac_api_88xx_sdio.c | 5 +- + .../halmac/halmac_88xx/halmac_api_88xx_usb.c | 5 +- + drivers/staging/rtlwifi/halmac/halmac_api.c | 7 +- + drivers/staging/rtlwifi/pci.c | 4 +- + drivers/staging/rtlwifi/phydm/phydm.c | 20 +- + drivers/staging/rtlwifi/phydm/phydm_adc_sampling.c | 4 +- + drivers/staging/rtlwifi/phydm/phydm_debug.c | 12 +- + drivers/staging/rtlwifi/phydm/phydm_hwconfig.c | 18 +- + drivers/staging/rtlwifi/phydm/phydm_rainfo.c | 5 +- + drivers/staging/rtlwifi/rtl8822be/Makefile | 1 + + drivers/staging/rtlwifi/rtl8822be/hw.c | 24 +- + drivers/staging/rtlwifi/rtl8822be/hw.h | 1 - + drivers/staging/rtlwifi/rtl8822be/phy.c | 15 +- + drivers/staging/rts5208/Kconfig | 1 + + drivers/staging/rts5208/Makefile | 1 + + drivers/staging/rts5208/rtsx_chip.h | 2 +- + drivers/staging/sm750fb/Kconfig | 1 + + drivers/staging/sm750fb/Makefile | 1 + + drivers/staging/sm750fb/ddk750.h | 1 + + drivers/staging/sm750fb/ddk750_chip.c | 27 +- + drivers/staging/sm750fb/ddk750_chip.h | 2 +- + drivers/staging/sm750fb/ddk750_display.c | 10 +- + drivers/staging/sm750fb/ddk750_display.h | 2 +- + drivers/staging/sm750fb/ddk750_dvi.c | 40 +- + drivers/staging/sm750fb/ddk750_power.h | 2 +- + drivers/staging/sm750fb/ddk750_sii164.c | 114 +- + drivers/staging/sm750fb/ddk750_swi2c.c | 1 + + drivers/staging/sm750fb/ddk750_swi2c.h | 1 + + drivers/staging/sm750fb/sm750.c | 7 +- + drivers/staging/sm750fb/sm750_accel.c | 32 +- + drivers/staging/sm750fb/sm750_hw.c | 2 +- + drivers/staging/speakup/Kconfig | 1 + + drivers/staging/speakup/kobjects.c | 14 +- + drivers/staging/speakup/main.c | 1 + + drivers/staging/speakup/selection.c | 212 +-- + drivers/staging/speakup/speakup.h | 1 + + drivers/staging/speakup/speakup_decpc.c | 2 +- + drivers/staging/speakup/speakup_keypc.c | 6 +- + drivers/staging/speakup/spk_ttyio.c | 2 +- + drivers/staging/unisys/Kconfig | 1 + + drivers/staging/unisys/Makefile | 1 + + drivers/staging/unisys/include/iochannel.h | 2 +- + drivers/staging/unisys/visorhba/Kconfig | 13 +- + drivers/staging/unisys/visorhba/Makefile | 1 + + drivers/staging/unisys/visorinput/Kconfig | 15 +- + drivers/staging/unisys/visorinput/Makefile | 1 + + drivers/staging/unisys/visornic/Kconfig | 15 +- + drivers/staging/unisys/visornic/Makefile | 1 + + drivers/staging/vc04_services/Kconfig | 1 + + .../staging/vc04_services/bcm2835-audio/Kconfig | 1 + + .../staging/vc04_services/bcm2835-audio/Makefile | 1 + + .../vc04_services/bcm2835-audio/bcm2835-ctl.c | 12 +- + .../staging/vc04_services/bcm2835-camera/Kconfig | 1 + + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 51 +- + .../vc04_services/bcm2835-camera/controls.c | 75 +- + .../staging/vc04_services/interface/vchi/vchi.h | 38 +- + .../vc04_services/interface/vchi/vchi_cfg.h | 34 +- + .../vc04_services/interface/vchi/vchi_common.h | 176 +- + .../vc04_services/interface/vchiq_arm/vchiq.h | 34 +- + .../interface/vchiq_arm/vchiq_2835_arm.c | 37 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 56 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 32 +- + .../vc04_services/interface/vchiq_arm/vchiq_cfg.h | 34 +- + .../interface/vchiq_arm/vchiq_connected.c | 34 +- + .../interface/vchiq_arm/vchiq_connected.h | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 50 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 34 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 32 +- + .../interface/vchiq_arm/vchiq_debugfs.h | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_if.h | 34 +- + .../interface/vchiq_arm/vchiq_ioctl.h | 34 +- + .../interface/vchiq_arm/vchiq_pagelist.h | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_shim.c | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.c | 34 +- + .../vc04_services/interface/vchiq_arm/vchiq_util.h | 34 +- + drivers/staging/vme/Makefile | 1 + + drivers/staging/vme/devices/Kconfig | 1 + + drivers/staging/vme/devices/Makefile | 1 + + drivers/staging/vt6655/Kconfig | 1 + + drivers/staging/vt6655/card.h | 6 +- + drivers/staging/vt6655/channel.h | 2 +- + drivers/staging/vt6655/desc.h | 2 +- + drivers/staging/vt6655/device.h | 2 +- + drivers/staging/vt6655/device_cfg.h | 2 +- + drivers/staging/vt6655/dpc.h | 2 +- + drivers/staging/vt6655/key.h | 2 +- + drivers/staging/vt6655/mac.c | 25 - + drivers/staging/vt6655/mac.h | 9 +- + drivers/staging/vt6655/power.c | 7 +- + drivers/staging/vt6655/power.h | 2 +- + drivers/staging/vt6655/rf.c | 35 +- + drivers/staging/vt6655/rf.h | 2 +- + drivers/staging/vt6655/rxtx.c | 18 +- + drivers/staging/vt6655/rxtx.h | 2 +- + drivers/staging/vt6655/srom.h | 2 +- + drivers/staging/vt6655/tmacro.h | 2 +- + drivers/staging/vt6655/upc.h | 4 +- + drivers/staging/vt6656/Kconfig | 1 + + drivers/staging/vt6656/baseband.h | 2 +- + drivers/staging/vt6656/card.h | 2 +- + drivers/staging/vt6656/channel.h | 2 +- + drivers/staging/vt6656/desc.h | 2 +- + drivers/staging/vt6656/device.h | 2 +- + drivers/staging/vt6656/dpc.h | 2 +- + drivers/staging/vt6656/firmware.h | 2 +- + drivers/staging/vt6656/int.h | 2 +- + drivers/staging/vt6656/key.h | 2 +- + drivers/staging/vt6656/power.h | 2 +- + drivers/staging/vt6656/rf.h | 2 +- + drivers/staging/vt6656/rxtx.h | 2 +- + drivers/staging/vt6656/usbpipe.h | 2 +- + drivers/staging/vt6656/wcmd.h | 2 +- + drivers/staging/wilc1000/Kconfig | 2 +- + drivers/staging/wilc1000/host_interface.c | 71 +- + drivers/staging/wilc1000/host_interface.h | 14 +- + drivers/staging/wilc1000/wilc_netdev.c | 2 +- + drivers/staging/wilc1000/wilc_spi.c | 13 +- + drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 72 +- + drivers/staging/wilc1000/wilc_wlan.c | 8 +- + drivers/staging/wlan-ng/Kconfig | 2 +- + drivers/staging/wlan-ng/hfa384x.h | 4 +- + drivers/staging/wlan-ng/hfa384x_usb.c | 4 +- + drivers/tty/vt/selection.c | 46 +- + drivers/tty/vt/vt.c | 7 +- + include/dt-bindings/iio/temperature/thermocouple.h | 16 + + include/linux/counter.h | 510 ++++++ + include/linux/counter_enum.h | 45 + + include/linux/fsl/ftm.h | 88 + + include/linux/iio/adc/ad_sigma_delta.h | 1 + + include/linux/iio/driver.h | 1 + + include/linux/iio/frequency/ad9523.h | 8 +- + include/linux/iio/gyro/itg3200.h | 1 + + include/linux/iio/iio.h | 4 +- + include/linux/iio/imu/adis.h | 14 + + include/linux/iio/timer/stm32-timer-trigger.h | 11 +- + include/linux/selection.h | 7 +- + 743 files changed, 22606 insertions(+), 10416 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-counter + create mode 100644 Documentation/ABI/testing/sysfs-bus-counter-104-quad-8 + create mode 100644 Documentation/ABI/testing/sysfs-bus-counter-ftm-quaddec + rename {drivers/staging/iio/Documentation => Documentation/ABI/testing}/sysfs-bus-iio-impedance-analyzer-ad5933 (56%) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-temperature-max31856 + create mode 100644 Documentation/devicetree/bindings/counter/ftm-quaddec.txt + rename Documentation/devicetree/bindings/{iio => }/counter/stm32-lptimer-cnt.txt (75%) + create mode 100644 Documentation/devicetree/bindings/counter/stm32-timer-cnt.txt + create mode 100644 Documentation/devicetree/bindings/fieldbus/arcx,anybus-controller.txt + create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kxcjk1013.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7780.txt + delete mode 100644 Documentation/devicetree/bindings/iio/adc/avia-hx711.txt + create mode 100644 Documentation/devicetree/bindings/iio/adc/avia-hx711.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti-ads8344.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/bmg160.txt + create mode 100644 Documentation/devicetree/bindings/iio/gyroscope/nxp,fxas21002c.txt + create mode 100644 Documentation/devicetree/bindings/iio/imu/adi,adis16480.txt + create mode 100644 Documentation/devicetree/bindings/iio/light/vcnl4000.txt + delete mode 100644 Documentation/devicetree/bindings/iio/pressure/bmp085.txt + create mode 100644 Documentation/devicetree/bindings/iio/pressure/bmp085.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.txt + create mode 100644 Documentation/devicetree/bindings/iio/proximity/devantech-srf04.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/maxbotix,mb1232.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/max31856.txt + create mode 100644 Documentation/devicetree/bindings/iio/temperature/temperature-bindings.txt + create mode 100644 Documentation/driver-api/generic-counter.rst + create mode 100644 drivers/counter/104-quad-8.c + create mode 100644 drivers/counter/Kconfig + create mode 100644 drivers/counter/Makefile + create mode 100644 drivers/counter/counter.c + create mode 100644 drivers/counter/ftm-quaddec.c + create mode 100644 drivers/counter/stm32-lptimer-cnt.c + create mode 100644 drivers/counter/stm32-timer-cnt.c + rename drivers/{staging => }/iio/adc/ad7780.c (63%) + create mode 100644 drivers/iio/adc/ti-ads8344.c + delete mode 100644 drivers/iio/counter/104-quad-8.c + delete mode 100644 drivers/iio/counter/Kconfig + delete mode 100644 drivers/iio/counter/Makefile + delete mode 100644 drivers/iio/counter/stm32-lptimer-cnt.c + create mode 100644 drivers/iio/gyro/fxas21002c.h + create mode 100644 drivers/iio/gyro/fxas21002c_core.c + create mode 100644 drivers/iio/gyro/fxas21002c_i2c.c + create mode 100644 drivers/iio/gyro/fxas21002c_spi.c + rename drivers/iio/imu/{adis16400_core.c => adis16400.c} (77%) + delete mode 100644 drivers/iio/imu/adis16400.h + delete mode 100644 drivers/iio/imu/adis16400_buffer.c + create mode 100644 drivers/iio/proximity/mb1232.c + create mode 100644 drivers/iio/temperature/max31856.c + create mode 100644 drivers/staging/fieldbus/Documentation/ABI/fieldbus-dev-cdev + create mode 100644 drivers/staging/fieldbus/Documentation/ABI/sysfs-class-fieldbus-dev + create mode 100644 drivers/staging/fieldbus/Documentation/fieldbus_dev.txt + create mode 100644 drivers/staging/fieldbus/Kconfig + create mode 100644 drivers/staging/fieldbus/Makefile + create mode 100644 drivers/staging/fieldbus/TODO + create mode 100644 drivers/staging/fieldbus/anybuss/Kconfig + create mode 100644 drivers/staging/fieldbus/anybuss/Makefile + create mode 100644 drivers/staging/fieldbus/anybuss/anybuss-client.h + create mode 100644 drivers/staging/fieldbus/anybuss/anybuss-controller.h + create mode 100644 drivers/staging/fieldbus/anybuss/arcx-anybus.c + create mode 100644 drivers/staging/fieldbus/anybuss/hms-profinet.c + create mode 100644 drivers/staging/fieldbus/anybuss/host.c + create mode 100644 drivers/staging/fieldbus/dev_core.c + create mode 100644 drivers/staging/fieldbus/fieldbus_dev.h + create mode 100644 drivers/staging/kpc2000/Kconfig + create mode 100644 drivers/staging/kpc2000/Makefile + create mode 100644 drivers/staging/kpc2000/TODO + create mode 100644 drivers/staging/kpc2000/kpc.h + create mode 100644 drivers/staging/kpc2000/kpc2000/Makefile + create mode 100644 drivers/staging/kpc2000/kpc2000/cell_probe.c + create mode 100644 drivers/staging/kpc2000/kpc2000/core.c + create mode 100644 drivers/staging/kpc2000/kpc2000/dma_common_defs.h + create mode 100644 drivers/staging/kpc2000/kpc2000/fileops.c + create mode 100644 drivers/staging/kpc2000/kpc2000/kp2000_module.c + create mode 100644 drivers/staging/kpc2000/kpc2000/pcie.h + create mode 100644 drivers/staging/kpc2000/kpc2000/uapi.h + create mode 100644 drivers/staging/kpc2000/kpc_dma/Makefile + create mode 100644 drivers/staging/kpc2000/kpc_dma/dma.c + create mode 100644 drivers/staging/kpc2000/kpc_dma/fileops.c + create mode 100644 drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.c + create mode 100644 drivers/staging/kpc2000/kpc_dma/kpc_dma_driver.h + create mode 100644 drivers/staging/kpc2000/kpc_dma/uapi.h + create mode 100644 drivers/staging/kpc2000/kpc_i2c/Makefile + create mode 100644 drivers/staging/kpc2000/kpc_i2c/fileops.c + create mode 100644 drivers/staging/kpc2000/kpc_i2c/i2c_driver.c + create mode 100644 drivers/staging/kpc2000/kpc_spi/Makefile + create mode 100644 drivers/staging/kpc2000/kpc_spi/spi_driver.c + create mode 100644 drivers/staging/kpc2000/kpc_spi/spi_parts.h + create mode 100644 drivers/staging/most/Documentation/ABI/configfs-most.txt + create mode 100644 drivers/staging/most/configfs.c + delete mode 100644 drivers/staging/mt7621-mmc/Kconfig + delete mode 100644 drivers/staging/mt7621-mmc/Makefile + delete mode 100644 drivers/staging/mt7621-mmc/TODO + delete mode 100644 drivers/staging/mt7621-mmc/board.h + delete mode 100644 drivers/staging/mt7621-mmc/dbg.c + delete mode 100644 drivers/staging/mt7621-mmc/dbg.h + delete mode 100644 drivers/staging/mt7621-mmc/mt6575_sd.h + delete mode 100644 drivers/staging/mt7621-mmc/sd.c + create mode 100644 drivers/staging/octeon/TODO + delete mode 100644 drivers/staging/rtl8192e/license + create mode 100644 include/dt-bindings/iio/temperature/thermocouple.h + create mode 100644 include/linux/counter.h + create mode 100644 include/linux/counter_enum.h + create mode 100644 include/linux/fsl/ftm.h +Merging mux/for-next (561eb7335f13 Merge branch 'i2c-mux/for-next' into for-next) +$ git merge mux/for-next +Removing include/linux/platform_data/pca954x.h +Auto-merging drivers/i2c/muxes/i2c-demux-pinctrl.c +Removing Documentation/devicetree/bindings/mux/mmio-mux.txt +Merge made by the 'recursive' strategy. + .../ABI/testing/sysfs-bus-i2c-devices-pca954x | 20 ++++ + Documentation/devicetree/bindings/mux/mmio-mux.txt | 60 ---------- + Documentation/devicetree/bindings/mux/reg-mux.txt | 129 +++++++++++++++++++++ + drivers/i2c/muxes/i2c-demux-pinctrl.c | 4 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 8 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 106 ++++++++++++----- + drivers/mux/Kconfig | 12 +- + drivers/mux/mmio.c | 6 +- + include/linux/platform_data/pca954x.h | 48 -------- + 9 files changed, 242 insertions(+), 151 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-i2c-devices-pca954x + delete mode 100644 Documentation/devicetree/bindings/mux/mmio-mux.txt + create mode 100644 Documentation/devicetree/bindings/mux/reg-mux.txt + delete mode 100644 include/linux/platform_data/pca954x.h +Merging icc/icc-next (83fdb2dfb0c2 interconnect: convert to DEFINE_SHOW_ATTRIBUTE) +$ git merge icc/icc-next +Already up to date. +Merging slave-dma/next (c6504be53972 dmaengine: stm32-dma: Fix unsigned variable compared with zero) +$ git merge slave-dma/next +Auto-merging drivers/spi/spi-pxa2xx.c +Auto-merging drivers/dma/sh/rcar-dmac.c +Auto-merging drivers/dma/bcm2835-dma.c +Merge made by the 'recursive' strategy. + .../devicetree/bindings/dma/adi,axi-dmac.txt | 4 +- + drivers/dma/Kconfig | 2 +- + drivers/dma/amba-pl08x.c | 22 ++-- + drivers/dma/at_xdmac.c | 67 ++++++++++-- + drivers/dma/bcm2835-dma.c | 1 - + drivers/dma/dma-axi-dmac.c | 116 +++++++++++++++------ + drivers/dma/idma64.c | 15 +-- + drivers/dma/idma64.h | 2 + + drivers/dma/imx-sdma.c | 15 ++- + drivers/dma/pl330.c | 61 ++++++++++- + drivers/dma/sh/rcar-dmac.c | 4 +- + drivers/dma/stm32-dma.c | 13 ++- + drivers/dma/tegra210-adma.c | 37 +++---- + drivers/dma/xgene-dma.c | 6 +- + drivers/mfd/intel-lpss.c | 4 +- + drivers/spi/spi-pxa2xx.c | 7 +- + drivers/tty/serial/8250/8250_dw.c | 4 +- + include/linux/dma/idma64.h | 14 +++ + 18 files changed, 289 insertions(+), 105 deletions(-) + create mode 100644 include/linux/dma/idma64.h +Merging cgroup/for-next (cd4f686eb6df Merge branch 'for-5.2' into for-next) +$ git merge cgroup/for-next +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging include/linux/sched.h +Merge made by the 'recursive' strategy. + Documentation/admin-guide/cgroup-v2.rst | 27 + + include/linux/cgroup-defs.h | 33 + + include/linux/cgroup.h | 43 ++ + include/linux/sched.h | 2 + + include/linux/sched/jobctl.h | 2 + + include/trace/events/cgroup.h | 55 ++ + kernel/cgroup/Makefile | 4 +- + kernel/cgroup/cgroup-internal.h | 8 +- + kernel/cgroup/cgroup-v1.c | 16 - + kernel/cgroup/cgroup.c | 156 ++++- + kernel/cgroup/freezer.c | 647 ++++++++------------ + kernel/cgroup/legacy_freezer.c | 481 +++++++++++++++ + kernel/fork.c | 2 + + kernel/signal.c | 70 ++- + 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 ++++++++++++++++++++++++++ + 19 files changed, 2027 insertions(+), 436 deletions(-) + create mode 100644 kernel/cgroup/legacy_freezer.c + create mode 100644 tools/testing/selftests/cgroup/test_freezer.c +Merging scsi/for-next (aec67294b839 Merge branch 'misc' into for-next) +$ git merge scsi/for-next +Removing include/scsi/osd_types.h +Removing include/scsi/osd_sense.h +Removing include/scsi/osd_sec.h +Removing include/scsi/osd_protocol.h +Removing include/scsi/osd_attributes.h +Auto-merging drivers/scsi/virtio_scsi.c +Auto-merging drivers/scsi/ufs/ufs-qcom.c +Auto-merging drivers/scsi/ufs/Kconfig +Auto-merging drivers/scsi/qedi/qedi_fw.c +Auto-merging drivers/scsi/qedf/qedf_io.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_fusion.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/lpfc/lpfc_scsi.c +Auto-merging drivers/scsi/lpfc/lpfc_nvme.c +Auto-merging drivers/scsi/lpfc/lpfc_nportdisc.c +Auto-merging drivers/scsi/lpfc/lpfc_hbadisc.c +Auto-merging drivers/scsi/lpfc/lpfc_els.c +CONFLICT (content): Merge conflict in drivers/scsi/lpfc/lpfc_els.c +Auto-merging drivers/scsi/lpfc/lpfc_ct.c +Auto-merging drivers/scsi/aic7xxx/aic7xxx_core.c +Auto-merging drivers/phy/mediatek/phy-mtk-ufs.c +CONFLICT (add/add): Merge conflict in drivers/phy/mediatek/phy-mtk-ufs.c +Auto-merging drivers/nvme/host/fc.c +Auto-merging MAINTAINERS +Auto-merging Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt +Resolved 'drivers/phy/mediatek/phy-mtk-ufs.c' using previous resolution. +Resolved 'drivers/scsi/lpfc/lpfc_els.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master 51f16565b880] Merge remote-tracking branch 'scsi/for-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/ufs/cdns,ufshc.txt | 5 +- + .../devicetree/bindings/ufs/ufs-mediatek.txt | 43 + + .../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 2 - + MAINTAINERS | 13 + + drivers/message/fusion/mptbase.c | 2 +- + drivers/message/fusion/mptctl.c | 2 +- + drivers/message/fusion/mptsas.c | 36 +- + drivers/message/fusion/mptscsih.c | 4 +- + drivers/message/fusion/mptspi.c | 5 - + drivers/nvme/host/fc.c | 2 +- + drivers/scsi/Kconfig | 21 + + drivers/scsi/Makefile | 2 + + drivers/scsi/NCR5380.c | 11 +- + drivers/scsi/aic7xxx/Kconfig.aic7xxx | 2 +- + drivers/scsi/aic7xxx/aic7xxx_core.c | 2 +- + drivers/scsi/atp870u.c | 7 +- + drivers/scsi/be2iscsi/be_cmds.c | 2 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 3 +- + drivers/scsi/csiostor/csio_isr.c | 28 +- + drivers/scsi/cxgbi/cxgb3i/cxgb3i.c | 14 +- + drivers/scsi/cxgbi/cxgb4i/cxgb4i.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.c | 22 +- + drivers/scsi/dpt_i2o.c | 12 +- + drivers/scsi/fdomain.c | 600 ++++++++ + drivers/scsi/fdomain.h | 63 + + drivers/scsi/fdomain_pci.c | 68 + + drivers/scsi/gdth.c | 5 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 104 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 21 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 49 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 473 +++--- + drivers/scsi/hpsa.c | 27 +- + drivers/scsi/libsas/sas_ata.c | 2 +- + drivers/scsi/libsas/sas_expander.c | 83 +- + drivers/scsi/libsas/sas_init.c | 42 +- + drivers/scsi/libsas/sas_phy.c | 7 +- + drivers/scsi/libsas/sas_port.c | 24 +- + drivers/scsi/lpfc/lpfc.h | 1 + + drivers/scsi/lpfc/lpfc_attr.c | 243 ++-- + drivers/scsi/lpfc/lpfc_bsg.c | 123 +- + drivers/scsi/lpfc/lpfc_bsg.h | 4 +- + drivers/scsi/lpfc/lpfc_ct.c | 41 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 486 +++---- + drivers/scsi/lpfc/lpfc_debugfs.h | 8 +- + drivers/scsi/lpfc/lpfc_els.c | 32 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 36 +- + drivers/scsi/lpfc/lpfc_hw.h | 4 + + drivers/scsi/lpfc/lpfc_hw4.h | 42 +- + drivers/scsi/lpfc/lpfc_init.c | 137 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 7 +- + drivers/scsi/lpfc/lpfc_nvme.c | 28 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 64 +- + drivers/scsi/lpfc/lpfc_nvmet.h | 3 +- + drivers/scsi/lpfc/lpfc_scsi.c | 15 +- + drivers/scsi/lpfc/lpfc_sli.c | 350 ++--- + drivers/scsi/lpfc/lpfc_sli.h | 19 +- + drivers/scsi/lpfc/lpfc_sli4.h | 54 +- + drivers/scsi/lpfc/lpfc_version.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/mpt3sas/Kconfig | 1 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 178 ++- + drivers/scsi/mpt3sas/mpt3sas_base.h | 22 +- + drivers/scsi/mvsas/mv_64xx.c | 3 +- + drivers/scsi/mvsas/mv_94xx.c | 3 +- + drivers/scsi/mvsas/mv_sas.c | 2 +- + drivers/scsi/mvumi.c | 6 +- + drivers/scsi/pm8001/pm8001_hwi.c | 37 +- + drivers/scsi/pm8001/pm8001_init.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.h | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 55 +- + drivers/scsi/qedf/qedf.h | 57 +- + drivers/scsi/qedf/qedf_dbg.c | 32 +- + drivers/scsi/qedf/qedf_debugfs.c | 57 +- + drivers/scsi/qedf/qedf_els.c | 82 +- + drivers/scsi/qedf/qedf_fip.c | 95 +- + drivers/scsi/qedf/qedf_io.c | 752 +++++++--- + drivers/scsi/qedf/qedf_main.c | 281 +++- + drivers/scsi/qedf/qedf_version.h | 6 +- + drivers/scsi/qedi/qedi_fw.c | 4 - + drivers/scsi/qedi/qedi_iscsi.c | 12 +- + drivers/scsi/qla2xxx/qla_attr.c | 329 +++-- + drivers/scsi/qla2xxx/qla_bsg.c | 84 +- + drivers/scsi/qla2xxx/qla_bsg.h | 11 + + drivers/scsi/qla2xxx/qla_dbg.c | 192 ++- + drivers/scsi/qla2xxx/qla_dbg.h | 10 +- + drivers/scsi/qla2xxx/qla_def.h | 267 ++-- + drivers/scsi/qla2xxx/qla_dfs.c | 9 +- + drivers/scsi/qla2xxx/qla_dsd.h | 30 + + drivers/scsi/qla2xxx/qla_fw.h | 98 +- + drivers/scsi/qla2xxx/qla_gbl.h | 107 +- + drivers/scsi/qla2xxx/qla_gs.c | 139 +- + drivers/scsi/qla2xxx/qla_init.c | 1498 ++++++++++++-------- + drivers/scsi/qla2xxx/qla_inline.h | 69 +- + drivers/scsi/qla2xxx/qla_iocb.c | 360 ++--- + drivers/scsi/qla2xxx/qla_isr.c | 144 +- + drivers/scsi/qla2xxx/qla_mbx.c | 336 +++-- + drivers/scsi/qla2xxx/qla_mid.c | 9 +- + drivers/scsi/qla2xxx/qla_mr.c | 111 +- + drivers/scsi/qla2xxx/qla_mr.h | 11 +- + drivers/scsi/qla2xxx/qla_nvme.c | 115 +- + drivers/scsi/qla2xxx/qla_nvme.h | 14 +- + drivers/scsi/qla2xxx/qla_nx.c | 38 +- + drivers/scsi/qla2xxx/qla_nx.h | 2 +- + drivers/scsi/qla2xxx/qla_nx2.c | 13 +- + drivers/scsi/qla2xxx/qla_os.c | 607 ++++---- + drivers/scsi/qla2xxx/qla_sup.c | 973 +++++++++---- + drivers/scsi/qla2xxx/qla_target.c | 201 +-- + drivers/scsi/qla2xxx/qla_target.h | 33 +- + drivers/scsi/qla2xxx/qla_tmpl.c | 447 +++--- + drivers/scsi/qla2xxx/qla_tmpl.h | 76 +- + drivers/scsi/qla2xxx/qla_version.h | 4 +- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 58 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/qlogicfas408.c | 4 +- + drivers/scsi/scsi_error.c | 1 - + drivers/scsi/scsi_lib.c | 30 +- + drivers/scsi/scsi_scan.c | 7 +- + drivers/scsi/scsi_transport_fc.c | 119 +- + drivers/scsi/smartpqi/Makefile | 1 + + drivers/scsi/smartpqi/smartpqi.h | 15 +- + drivers/scsi/smartpqi/smartpqi_init.c | 51 +- + drivers/scsi/smartpqi/smartpqi_sas_transport.c | 15 +- + drivers/scsi/smartpqi/smartpqi_sis.c | 15 +- + drivers/scsi/smartpqi/smartpqi_sis.h | 15 +- + drivers/scsi/ufs/Kconfig | 14 + + drivers/scsi/ufs/Makefile | 1 + + drivers/scsi/ufs/cdns-pltfrm.c | 74 +- + drivers/scsi/ufs/ufs-hisi.c | 113 +- + drivers/scsi/ufs/ufs-mediatek.c | 368 +++++ + drivers/scsi/ufs/ufs-mediatek.h | 53 + + drivers/scsi/ufs/ufs-qcom.c | 106 +- + drivers/scsi/ufs/ufs.h | 1 - + drivers/scsi/ufs/ufshcd-pltfrm.c | 112 +- + drivers/scsi/ufs/ufshcd-pltfrm.h | 21 + + drivers/scsi/ufs/ufshcd.c | 41 +- + drivers/scsi/ufs/unipro.h | 2 +- + drivers/scsi/virtio_scsi.c | 2 +- + drivers/target/iscsi/iscsi_target.c | 118 +- + drivers/target/iscsi/iscsi_target_login.c | 9 +- + drivers/target/iscsi/iscsi_target_util.c | 5 + + drivers/target/target_core_alua.c | 6 +- + drivers/target/target_core_configfs.c | 163 ++- + drivers/target/target_core_device.c | 4 +- + drivers/target/target_core_pr.c | 33 +- + drivers/target/target_core_pr.h | 1 + + drivers/target/target_core_tmr.c | 2 +- + drivers/target/target_core_xcopy.c | 92 +- + include/linux/nvme-fc-driver.h | 6 - + include/scsi/libsas.h | 13 +- + include/scsi/osd_attributes.h | 398 ------ + include/scsi/osd_protocol.h | 676 --------- + include/scsi/osd_sec.h | 45 - + include/scsi/osd_sense.h | 263 ---- + include/scsi/osd_types.h | 45 - + include/scsi/scsi_host.h | 6 +- + include/scsi/scsi_transport_fc.h | 18 +- + include/target/iscsi/iscsi_target_core.h | 1 + + include/target/target_core_base.h | 4 +- + include/target/target_core_fabric.h | 1 + + include/uapi/scsi/fc/fc_els.h | 33 + + 163 files changed, 8304 insertions(+), 6431 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/ufs-mediatek.txt + create mode 100644 drivers/scsi/fdomain.c + create mode 100644 drivers/scsi/fdomain.h + create mode 100644 drivers/scsi/fdomain_pci.c + create mode 100644 drivers/scsi/qla2xxx/qla_dsd.h + create mode 100644 drivers/scsi/ufs/ufs-mediatek.c + create mode 100644 drivers/scsi/ufs/ufs-mediatek.h + delete mode 100644 include/scsi/osd_attributes.h + delete mode 100644 include/scsi/osd_protocol.h + delete mode 100644 include/scsi/osd_sec.h + delete mode 100644 include/scsi/osd_sense.h + delete mode 100644 include/scsi/osd_types.h +Merging scsi-mkp/for-next (9bee24d08c08 scsi: fdomain: Resurrect driver - PCI support) +$ 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 54829dc029b3] 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 (93c6d8ca2807 Merge branch 'devel' into for-next) +$ git merge gpio/for-next +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/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 - + 57 files changed, 823 insertions(+), 880 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 (b7cd97cd140f Merge branch 'devel' into for-next) +$ git merge pinctrl/for-next +Auto-merging include/linux/gpio/driver.h +Auto-merging drivers/pinctrl/pinctrl-mcp23s08.c +Auto-merging drivers/gpio/gpiolib.h +Merge made by the 'recursive' strategy. + .../bindings/pinctrl/cirrus,lochnagar.txt | 141 +++ + .../bindings/pinctrl/fsl,imx7d-pinctrl.txt | 6 +- + .../devicetree/bindings/pinctrl/pinctrl-mt65xx.txt | 1 + + .../devicetree/bindings/pinctrl/pinctrl-mt8183.txt | 132 +++ + .../bindings/pinctrl/st,stm32-pinctrl.txt | 2 + + arch/sh/include/cpu-sh4/cpu/sh7786.h | 2 +- + drivers/gpio/gpiolib-devprop.c | 2 + + drivers/gpio/gpiolib.h | 3 - + drivers/pinctrl/cirrus/Kconfig | 10 + + drivers/pinctrl/cirrus/Makefile | 2 + + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 1235 ++++++++++++++++++++ + drivers/pinctrl/freescale/pinctrl-imx.c | 25 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 1 + + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 1 + + drivers/pinctrl/freescale/pinctrl-scu.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mt8183.c | 50 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.c | 49 + + drivers/pinctrl/mediatek/pinctrl-mtk-common-v2.h | 11 + + drivers/pinctrl/mediatek/pinctrl-paris.c | 21 + + drivers/pinctrl/pinctrl-amd.c | 4 +- + drivers/pinctrl/pinctrl-artpec6.c | 19 +- + drivers/pinctrl/pinctrl-axp209.c | 2 + + drivers/pinctrl/pinctrl-mcp23s08.c | 3 +- + drivers/pinctrl/pinctrl-rza1.c | 18 +- + drivers/pinctrl/pinctrl-st.c | 15 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 1 + + drivers/pinctrl/sh-pfc/Kconfig | 204 ++-- + drivers/pinctrl/sh-pfc/Makefile | 15 + + drivers/pinctrl/sh-pfc/core.c | 130 +++ + drivers/pinctrl/sh-pfc/gpio.c | 8 +- + drivers/pinctrl/sh-pfc/pfc-emev2.c | 67 +- + drivers/pinctrl/sh-pfc/pfc-r8a73a4.c | 64 +- + drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 56 +- + drivers/pinctrl/sh-pfc/pfc-r8a77470.c | 136 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7778.c | 101 +- + drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 235 +++- + drivers/pinctrl/sh-pfc/pfc-r8a7790.c | 132 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7791.c | 156 +-- + drivers/pinctrl/sh-pfc/pfc-r8a7792.c | 134 ++- + drivers/pinctrl/sh-pfc/pfc-r8a7794.c | 127 +- + drivers/pinctrl/sh-pfc/pfc-r8a7795-es1.c | 222 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 201 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a7796.c | 225 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a77965.c | 294 +++-- + drivers/pinctrl/sh-pfc/pfc-r8a77970.c | 123 +- + drivers/pinctrl/sh-pfc/pfc-r8a77980.c | 135 +-- + drivers/pinctrl/sh-pfc/pfc-r8a77990.c | 214 ++-- + drivers/pinctrl/sh-pfc/pfc-r8a77995.c | 120 +- + drivers/pinctrl/sh-pfc/pfc-sh7203.c | 152 +-- + drivers/pinctrl/sh-pfc/pfc-sh7264.c | 232 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7269.c | 252 ++-- + drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 52 +- + drivers/pinctrl/sh-pfc/pfc-sh7720.c | 144 +-- + drivers/pinctrl/sh-pfc/pfc-sh7722.c | 220 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7723.c | 200 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7724.c | 204 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7734.c | 140 ++- + drivers/pinctrl/sh-pfc/pfc-sh7757.c | 244 ++-- + drivers/pinctrl/sh-pfc/pfc-sh7785.c | 136 +-- + drivers/pinctrl/sh-pfc/pfc-sh7786.c | 80 +- + drivers/pinctrl/sh-pfc/pfc-shx3.c | 32 +- + drivers/pinctrl/sh-pfc/sh_pfc.h | 68 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 68 +- + drivers/pinctrl/stm32/pinctrl-stm32.h | 14 + + drivers/pinctrl/stm32/pinctrl-stm32mp157.c | 1089 +++++++++-------- + drivers/pinctrl/sunxi/Kconfig | 57 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 40 +- + include/dt-bindings/pinctrl/stm32-pinfunc.h | 6 + + include/linux/gpio/driver.h | 3 + + 69 files changed, 5329 insertions(+), 2961 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/cirrus,lochnagar.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-mt8183.txt + create mode 100644 drivers/pinctrl/cirrus/pinctrl-lochnagar.c +Merging pinctrl-samsung/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (9ff06679e109 pwm: sysfs: fix typo "its" -> "it's") +$ git merge pwm/for-next +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/pwm/pwm-tiehrpwm.txt | 1 + + drivers/pwm/Kconfig | 5 ++--- + drivers/pwm/core.c | 10 +++++----- + drivers/pwm/pwm-img.c | 2 +- + drivers/pwm/pwm-tiehrpwm.c | 2 ++ + drivers/pwm/sysfs.c | 16 ++-------------- + include/linux/pwm.h | 5 ----- + 7 files changed, 13 insertions(+), 28 deletions(-) +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 (6cd110a91f52 ktest: Take submenu into account for grub2 menus) +$ 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 +Auto-merging init/main.c +Merge made by the 'recursive' strategy. + drivers/char/random.c | 199 +++++++++++++++++++++++++++++------------- + include/linux/random.h | 1 + + include/trace/events/random.h | 13 ++- + init/main.c | 21 +++-- + 4 files changed, 156 insertions(+), 78 deletions(-) +Merging kselftest/next (d917fb876f6e selftests: build and run gpio when output directory is the src dir) +$ git merge kselftest/next +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Auto-merging tools/testing/selftests/kexec/Makefile +Auto-merging tools/testing/selftests/Makefile +Auto-merging lib/test_printf.c +Auto-merging lib/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging Documentation/dev-tools/kselftest.rst +Merge made by the 'recursive' strategy. + Documentation/dev-tools/kselftest.rst | 94 ++++++++++++- + include/linux/string.h | 4 + + lib/Kconfig.debug | 3 + + lib/Makefile | 1 + + lib/string.c | 47 ++++++- + lib/test_bitmap.c | 20 +-- + lib/test_printf.c | 17 +-- + lib/test_strscpy.c | 150 +++++++++++++++++++++ + tools/testing/selftests/Makefile | 61 +++++++-- + tools/testing/selftests/cgroup/test_memcontrol.c | 38 +++--- + tools/testing/selftests/efivarfs/efivarfs.sh | 28 ++-- + tools/testing/selftests/gpio/gpio-mockup-chardev.c | 1 - + tools/testing/selftests/ipc/msgque.c | 11 +- + tools/testing/selftests/kselftest_harness.h | 2 + + tools/testing/selftests/kselftest_module.h | 48 +++++++ + tools/testing/selftests/kselftest_module.sh | 84 ++++++++++++ + tools/testing/selftests/lib.mk | 38 +++++- + tools/testing/selftests/lib/Makefile | 2 +- + tools/testing/selftests/lib/bitmap.sh | 18 +-- + tools/testing/selftests/lib/config | 1 + + tools/testing/selftests/lib/prime_numbers.sh | 17 +-- + tools/testing/selftests/lib/printf.sh | 19 +-- + tools/testing/selftests/lib/strscpy.sh | 3 + + tools/testing/selftests/rseq/rseq.h | 1 - + tools/testing/selftests/rseq/run_param_test.sh | 7 +- + tools/testing/selftests/seccomp/seccomp_bpf.c | 43 +++--- + tools/testing/selftests/timers/skew_consistency.c | 1 - + tools/testing/selftests/x86/mpx-dig.c | 2 - + 28 files changed, 599 insertions(+), 162 deletions(-) + create mode 100644 lib/test_strscpy.c + create mode 100644 tools/testing/selftests/kselftest_module.h + create mode 100755 tools/testing/selftests/kselftest_module.sh + create mode 100755 tools/testing/selftests/lib/strscpy.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 (7df6a9f68d5d Merge branch 'for-5.2-core' into for-next) +$ git merge livepatching/for-next +Auto-merging kernel/livepatch/core.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 4 ++++ + kernel/livepatch/core.c | 5 ++--- + tools/testing/selftests/livepatch/Makefile | 3 ++- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging coresight/next (b627167ed8e6 coresight: funnel: Support static funnel) +$ git merge coresight/next +Merge made by the 'recursive' strategy. + .../devicetree/bindings/arm/coresight.txt | 60 +++++++++-- + drivers/hwtracing/coresight/coresight-funnel.c | 116 ++++++++++++++++----- + drivers/hwtracing/coresight/coresight-replicator.c | 6 +- + 3 files changed, 147 insertions(+), 35 deletions(-) +Merging rtc/rtc-next (87ccec4fd05d rtc: pcap: convert to SPDX identifier) +$ git merge rtc/rtc-next +Auto-merging drivers/rtc/rtc-sh.c +Auto-merging drivers/rtc/rtc-omap.c +CONFLICT (content): Merge conflict in drivers/rtc/rtc-omap.c +Auto-merging drivers/rtc/rtc-da9063.c +Auto-merging drivers/rtc/Kconfig +Resolved 'drivers/rtc/rtc-omap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit -v -a +[master c5a529adf2f2] Merge remote-tracking branch 'rtc/rtc-next' +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/rtc/nxp,pcf85063.txt | 6 +- + .../devicetree/bindings/rtc/rtc-aspeed.txt | 22 + + Documentation/devicetree/bindings/rtc/rtc.txt | 1 + + 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 | 113 +++--- + 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 | 49 +-- + 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 | 29 +- + 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 | 7 +- + include/linux/rtc.h | 4 +- + include/linux/rtc/ds1685.h | 2 - + 67 files changed, 1401 insertions(+), 1487 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/rtc-aspeed.txt + create mode 100644 drivers/rtc/rtc-aspeed.c +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 bb324e516f40] 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 +Auto-merging MAINTAINERS +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/eeprom/at24.txt | 1 + + MAINTAINERS | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +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 security/Kconfig +Auto-merging kernel/seccomp.c +Auto-merging Makefile +Merge made by the 'recursive' strategy. + Makefile | 5 ++ + scripts/gcc-plugins/Kconfig | 126 ++-------------------------------- + security/Kconfig | 2 + + security/Kconfig.hardening | 164 ++++++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 177 insertions(+), 120 deletions(-) + create mode 100644 security/Kconfig.hardening +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 +Merge made by the 'recursive' strategy. + Documentation/devicetree/bindings/gnss/u-blox.txt | 1 + + drivers/gnss/ubx.c | 1 + + 2 files changed, 2 insertions(+) +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 (97498c96a186 kgdb/treewide: constify struct kgdb_arch arch_kgdb_ops) +$ git merge kgdb-dt/kgdb/for-next +Auto-merging arch/x86/kernel/kgdb.c +Auto-merging arch/sparc/kernel/smp_64.c +Auto-merging arch/sh/kernel/kgdb.c +Auto-merging arch/powerpc/kernel/kgdb.c +Auto-merging arch/mips/kernel/kgdb.c +Auto-merging arch/arm64/kernel/kgdb.c +Merge made by the 'recursive' strategy. +Merging pidfd/for-next (eb364bbe6791 samples: show race-free pidfd metadata access) +$ git merge pidfd/for-next +Auto-merging kernel/signal.c +Auto-merging kernel/fork.c +Auto-merging init/Kconfig +Auto-merging fs/Makefile +Auto-merging drivers/iio/Kconfig +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/base/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/s390/kvm/Kconfig +Merge made by the 'recursive' strategy. + arch/arm/kvm/Kconfig | 1 - + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 1 - + arch/x86/kvm/Kconfig | 1 - + drivers/base/Kconfig | 1 - + drivers/char/tpm/Kconfig | 1 - + drivers/dma-buf/Kconfig | 1 - + drivers/gpio/Kconfig | 1 - + drivers/iio/Kconfig | 1 - + drivers/infiniband/Kconfig | 1 - + drivers/vfio/Kconfig | 1 - + fs/Makefile | 2 +- + fs/notify/fanotify/Kconfig | 1 - + fs/notify/inotify/Kconfig | 1 - + include/linux/pid.h | 2 + + include/uapi/linux/sched.h | 1 + + init/Kconfig | 10 ---- + kernel/fork.c | 108 +++++++++++++++++++++++++++++++++++++-- + kernel/signal.c | 12 +++-- + kernel/sys_ni.c | 3 -- + samples/Makefile | 2 +- + samples/pidfd/Makefile | 6 +++ + samples/pidfd/pidfd-metadata.c | 112 +++++++++++++++++++++++++++++++++++++++++ + 26 files changed, 236 insertions(+), 38 deletions(-) + create mode 100644 samples/pidfd/Makefile + create mode 100644 samples/pidfd/pidfd-metadata.c +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/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/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig +Auto-merging kernel/sysctl.c +Auto-merging kernel/signal.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 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/device.h +Auto-merging fs/proc/base.c +Auto-merging fs/orangefs/orangefs-bufmap.c +Auto-merging fs/io_uring.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/mtd/nand/raw/vf610_nfc.c +Auto-merging drivers/media/common/videobuf2/videobuf2-core.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 +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/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/mm/mmu_context_iommu.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/mmu_context_iommu.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/kvm/book3s_64_vio.c +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/include/asm/Kbuild +Auto-merging arch/powerpc/Kconfig +Auto-merging 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 +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/nios2/Kconfig' using previous resolution. +Resolved 'arch/powerpc/mm/mem.c' using previous resolution. +Resolved 'arch/powerpc/mm/mmu_context_iommu.c' using previous resolution. +Resolved 'arch/powerpc/platforms/Kconfig.cputype' using previous resolution. +Resolved 'kernel/fork.c' using previous resolution. +Recorded preimage for 'mm/vmalloc.c' +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 +Recorded resolution for 'mm/vmalloc.c'. +[master 1234c61382ce] 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/kernel/setup.c | 2 +- + 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/fault.c | 6 +- + arch/powerpc/mm/mem.c | 24 +- + arch/powerpc/mm/mmu_context_iommu.c | 33 +- + arch/powerpc/mm/tlb-radix.c | 12 +- + 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 | 26 +- + 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/debug/kdb/Makefile | 1 - + kernel/debug/kdb/kdb_main.c | 1 - + 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 +- + 357 files changed, 10010 insertions(+), 3861 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 + + 66e9502218a4...0095787e119c akpm -> akpm/master (forced update) +$ rm -rf ../rebase-tmp +Merging akpm/master (0095787e119c 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..c0bda86c2286 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20190501 |